From d5cd425061774b38e2bcba2548590c0c1aa9c311 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Dumont Date: Fri, 14 Aug 2015 01:02:28 -0400 Subject: [PATCH] Add Random Even(not finish). and some finalisation. --- Assets/Model/Evenement.cs | 76 +++++++++++++++++++ .../{Event.cs.meta => Evenement.cs.meta} | 0 Assets/Model/Event.cs | 6 -- Assets/Scene/MAScene.unity | 39 ++++++---- Assets/Scene/MikeScene.unity | 29 +++---- Assets/Script/ConfirmStatsScript.cs | 8 +- Assets/Script/Stats.cs | 16 +++- Assets/View/RessourceView.cs | 6 +- 8 files changed, 136 insertions(+), 44 deletions(-) create mode 100644 Assets/Model/Evenement.cs rename Assets/Model/{Event.cs.meta => Evenement.cs.meta} (100%) delete mode 100644 Assets/Model/Event.cs diff --git a/Assets/Model/Evenement.cs b/Assets/Model/Evenement.cs new file mode 100644 index 0000000..76e849e --- /dev/null +++ b/Assets/Model/Evenement.cs @@ -0,0 +1,76 @@ +using UnityEngine; +using System.Collections; + +public class Evenement +{ + + public int MultiWood { get; set; } + public int MutliRock { get; set; } + public int MultiCorps { get; set; } + public string descriptionEvent { get; set; } + + /* + * Pour les multiplicateur, 10 est la valeur de base, car il est divisé par 10 plus tard. + * + */ + public void GetEventForThisRound(int nbRound) + { + + System.Random rnd = new System.Random(); + int number = nbRound + rnd.Next(0, 5); + + + switch (number) + { + case 1: + descriptionEvent = "Sunny day"; + MultiWood = 12; + MutliRock = 10; + MultiCorps = 11; + break; + case 2: + descriptionEvent = "Raining day"; + MultiWood = 8; + MutliRock = 10; + MultiCorps = 10; + break; + case 3: + descriptionEvent = "Party day"; + MultiWood = 10; + MutliRock = 10; + MultiCorps = 10; + break; + case 4: + descriptionEvent = "Tornado"; + MultiWood = 8; + MutliRock = 8; + MultiCorps = 8; + break; + case 5: + descriptionEvent = "Eartquake"; + MultiWood = 10; + MutliRock = 2; + MultiCorps = 10; + break; + case 6: + descriptionEvent = "Wood Fire"; + MultiWood = 2; + MutliRock = 10; + MultiCorps = 10; + break; + case 7: + descriptionEvent = "Mutiny of Zombie"; + MultiWood = 0; + MutliRock = 0; + MultiCorps = 0; + break; + default: + descriptionEvent = "Normal day"; + MultiWood = 10; + MutliRock = 10; + MultiCorps = 10; + break; + } + + } +} diff --git a/Assets/Model/Event.cs.meta b/Assets/Model/Evenement.cs.meta similarity index 100% rename from Assets/Model/Event.cs.meta rename to Assets/Model/Evenement.cs.meta diff --git a/Assets/Model/Event.cs b/Assets/Model/Event.cs deleted file mode 100644 index 7228b1d..0000000 --- a/Assets/Model/Event.cs +++ /dev/null @@ -1,6 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class Event { - -} diff --git a/Assets/Scene/MAScene.unity b/Assets/Scene/MAScene.unity index 2aff67a..22c293c 100644 --- a/Assets/Scene/MAScene.unity +++ b/Assets/Scene/MAScene.unity @@ -690,7 +690,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &98902544 RectTransform: m_ObjectHideFlags: 0 @@ -1321,7 +1321,7 @@ RectTransform: m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 350, y: 200} + m_SizeDelta: {x: 500, y: 225} m_Pivot: {x: .5, y: .5} --- !u!114 &245257109 MonoBehaviour: @@ -1469,8 +1469,8 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -253, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -230, y: 0} + m_SizeDelta: {x: 114, y: 30} m_Pivot: {x: .5, y: .5} --- !u!114 &299751640 MonoBehaviour: @@ -2317,7 +2317,7 @@ RectTransform: m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 350, y: 200} + m_SizeDelta: {x: 500, y: 225} m_Pivot: {x: .5, y: .5} --- !u!114 &489787185 MonoBehaviour: @@ -2894,7 +2894,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &603257483 RectTransform: m_ObjectHideFlags: 0 @@ -2913,7 +2913,7 @@ RectTransform: m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 350, y: 200} + m_SizeDelta: {x: 500, y: 225} m_Pivot: {x: .5, y: .5} --- !u!114 &603257484 MonoBehaviour: @@ -3161,7 +3161,7 @@ RectTransform: m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 350, y: 200} + m_SizeDelta: {x: 500, y: 225} m_Pivot: {x: .5, y: .5} --- !u!114 &724116265 MonoBehaviour: @@ -3434,7 +3434,7 @@ RectTransform: m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 350, y: 200} + m_SizeDelta: {x: 500, y: 225} m_Pivot: {x: .5, y: .5} --- !u!114 &752797405 MonoBehaviour: @@ -4144,7 +4144,7 @@ RectTransform: m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 350, y: 200} + m_SizeDelta: {x: 500, y: 225} m_Pivot: {x: .5, y: .5} --- !u!114 &976571508 MonoBehaviour: @@ -6472,7 +6472,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 390929332} + - m_Target: {fileID: 98902547} m_MethodName: AddWorker m_Mode: 1 m_Arguments: @@ -6659,7 +6659,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 390929332} + - m_Target: {fileID: 98902547} m_MethodName: LessWorker m_Mode: 1 m_Arguments: @@ -6836,7 +6836,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1608526835 RectTransform: m_ObjectHideFlags: 0 @@ -7597,6 +7597,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 799974594} + m_MethodName: ModifieStats + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!114 &1822733250 @@ -7775,7 +7786,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1872249330 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scene/MikeScene.unity b/Assets/Scene/MikeScene.unity index 1aa157a..acc4203 100644 --- a/Assets/Scene/MikeScene.unity +++ b/Assets/Scene/MikeScene.unity @@ -117,7 +117,7 @@ RectTransform: m_Father: {fileID: 1868361017} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: .5, y: .5} @@ -984,7 +984,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &215832622 RectTransform: m_ObjectHideFlags: 0 @@ -2459,7 +2459,7 @@ RectTransform: m_Father: {fileID: 209847313} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: .5, y: .5} @@ -2519,8 +2519,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 111289959} m_RootOrder: 0 - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: .5, y: .5} @@ -3315,11 +3315,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b60a92ac520037b40981710a2e1564e4, type: 3} m_Name: m_EditorClassIdentifier: - nbWorker: {fileID: 2029532044} - zombieAvailable: {fileID: 1942301122} - nbRessourceExpected: {fileID: 1435342269} - AddButton: {fileID: 1264233908} - RemoveButton: {fileID: 487107436} --- !u!114 &976571509 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3378,8 +3373,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 1467273088} m_RootOrder: 0 - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: .5, y: .5} @@ -3785,7 +3780,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1128827416 RectTransform: m_ObjectHideFlags: 0 @@ -3802,10 +3797,10 @@ RectTransform: - {fileID: 1271591059} m_Father: {fileID: 1208919978} m_RootOrder: 10 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -337, y: 7.5} - m_SizeDelta: {x: -674, y: -125} + m_AnchorMin: {x: 0, y: .5} + m_AnchorMax: {x: 0, y: .5} + m_AnchoredPosition: {x: 50, y: 0} + m_SizeDelta: {x: 100, y: 180} m_Pivot: {x: .5, y: .5} --- !u!114 &1128827417 MonoBehaviour: diff --git a/Assets/Script/ConfirmStatsScript.cs b/Assets/Script/ConfirmStatsScript.cs index 5c0b5e1..cdfc895 100644 --- a/Assets/Script/ConfirmStatsScript.cs +++ b/Assets/Script/ConfirmStatsScript.cs @@ -7,10 +7,11 @@ public class ConfirmStatsScript : MonoBehaviour { public Text currentValues; public Text addedValues; public Text alertTitle; + private Stats stats; // Use this for initialization void Start () { - Stats stats = GameObject.Find("Stats").gameObject.GetComponent(); + stats = GameObject.Find("Stats").gameObject.GetComponent(); currentValues.text = stats.displayCurrentStats(); addedValues.text = stats.displayAddingStats(); alertTitle.text = "DAY " + stats.NbTurns; @@ -20,4 +21,9 @@ public class ConfirmStatsScript : MonoBehaviour { void Update () { } + + public void ModifieStats() + { + stats.UpdateStats(); + } } diff --git a/Assets/Script/Stats.cs b/Assets/Script/Stats.cs index caeb944..6f10147 100644 --- a/Assets/Script/Stats.cs +++ b/Assets/Script/Stats.cs @@ -394,11 +394,25 @@ public class Stats : MonoBehaviour // Use this for initialization void Start () { - resetStats(3, 6, 7, 8, 4, 1, 1, 5, 5, 5); + resetStats(3, 6, 7, 8, 4, 10, 6, 5, 5, 5); } // Update is called once per frame void Update () { } + + public String UpdateStats() + { + Evenement evenement = new Evenement(); + evenement.GetEventForThisRound(NbTurns); + + AmountOfWood = AmountOfWood + NbZombieAssigneWood * NbOfWoodByZombie * evenement.MultiWood/10; + AmountOfRock = AmountOfRock + NbZombieAssigneRock * NbOfRockByZombie * evenement.MutliRock/10; + AmountOfCorpse = AmountOfCorpse + NbZombieAssigneCorpse * NbOfCorpseByZombie * evenement.MultiCorps/10; + NbTurns++; + return evenement.descriptionEvent; + } + + } \ No newline at end of file diff --git a/Assets/View/RessourceView.cs b/Assets/View/RessourceView.cs index b0eaab7..4b5244f 100644 --- a/Assets/View/RessourceView.cs +++ b/Assets/View/RessourceView.cs @@ -14,16 +14,12 @@ public class RessourceView: MonoBehaviour{ { Stats stats = GameObject.Find("Stats").gameObject.GetComponent(); rc = new RessourceController(stats, corpseText, rockText, woodText, meatText); - setResources(); - } - public void setResources() { - rc.UpdateView(); } void Update() { - + rc.UpdateView(); } }