diff --git a/Assets/Contrôleur.meta b/Assets/Controller.meta similarity index 100% rename from Assets/Contrôleur.meta rename to Assets/Controller.meta diff --git a/Assets/Controller/RessourceController.cs b/Assets/Controller/RessourceController.cs new file mode 100644 index 0000000..f3f619d --- /dev/null +++ b/Assets/Controller/RessourceController.cs @@ -0,0 +1,15 @@ +using UnityEngine; +using System.Collections; + +public class RessourceController : MonoBehaviour { + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/Assets/Controller/RessourceController.cs.meta b/Assets/Controller/RessourceController.cs.meta new file mode 100644 index 0000000..738559d --- /dev/null +++ b/Assets/Controller/RessourceController.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 2b0d56f83cdc65642b3656925f1cad52 +timeCreated: 1439391955 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Modèle.meta b/Assets/Model.meta similarity index 100% rename from Assets/Modèle.meta rename to Assets/Model.meta diff --git a/Assets/Model/Bank.cs b/Assets/Model/Bank.cs new file mode 100644 index 0000000..7bb9738 --- /dev/null +++ b/Assets/Model/Bank.cs @@ -0,0 +1,43 @@ +using UnityEngine; +using System.Collections; + +public class Bank{ + + private int amountOfRock; + private int amountOfWood; + private int amountOfCorpse; + private int amountOfMeat; + + public Bank(int nbRock, int nbWood, int nbCorpse, int nbMeat) + { + AmountOfCorpse = nbCorpse; + AmountOfMeat = nbMeat; + AmountOfRock = nbRock; + AmountOfWood = nbWood; + } + + public int AmountOfMeat + { + get { return amountOfMeat; } + set { amountOfMeat = value; } + } + + + public int AmountOfRock + { + get { return amountOfRock; } + set { amountOfRock = value; } + } + + public int AmountOfWood + { + get { return amountOfWood; } + set { amountOfWood = value; } + } + + public int AmountOfCorpse + { + get { return amountOfCorpse; } + set { amountOfCorpse = value; } + } +} \ No newline at end of file diff --git a/Assets/Model/Bank.cs.meta b/Assets/Model/Bank.cs.meta new file mode 100644 index 0000000..f5fd6fb --- /dev/null +++ b/Assets/Model/Bank.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 8ffbbc24e223c6141b211cb7168d2d9c +timeCreated: 1439390939 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Model/Corpse.cs b/Assets/Model/Corpse.cs new file mode 100644 index 0000000..5d22bfd --- /dev/null +++ b/Assets/Model/Corpse.cs @@ -0,0 +1,6 @@ +using UnityEngine; +using System.Collections; + +public class Corpse : Ressource { + +} diff --git a/Assets/Model/Corpse.cs.meta b/Assets/Model/Corpse.cs.meta new file mode 100644 index 0000000..2fa106a --- /dev/null +++ b/Assets/Model/Corpse.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: f7d680cf9b1873649b2529ad57050850 +timeCreated: 1439307814 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Model/Event.cs b/Assets/Model/Event.cs new file mode 100644 index 0000000..7228b1d --- /dev/null +++ b/Assets/Model/Event.cs @@ -0,0 +1,6 @@ +using UnityEngine; +using System.Collections; + +public class Event { + +} diff --git a/Assets/Model/Event.cs.meta b/Assets/Model/Event.cs.meta new file mode 100644 index 0000000..889aee7 --- /dev/null +++ b/Assets/Model/Event.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 5032ac9b7dbebd34b85decc8c5c465c1 +timeCreated: 1439308343 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Model/Games.cs b/Assets/Model/Games.cs new file mode 100644 index 0000000..51c5df6 --- /dev/null +++ b/Assets/Model/Games.cs @@ -0,0 +1,15 @@ +using UnityEngine; +using System.Collections; + +public class Games { + + + private int nbRounds; + + public int NbRounds + { + get { return nbRounds; } + set { nbRounds = value; } + } + +} diff --git a/Assets/Model/Games.cs.meta b/Assets/Model/Games.cs.meta new file mode 100644 index 0000000..892d511 --- /dev/null +++ b/Assets/Model/Games.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 49ea7b6dc697c90479968dd9809f3dc8 +timeCreated: 1439308103 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Model/Human.cs b/Assets/Model/Human.cs new file mode 100644 index 0000000..a082785 --- /dev/null +++ b/Assets/Model/Human.cs @@ -0,0 +1,7 @@ +using UnityEngine; +using System.Collections; + +public class Human { + + +} diff --git a/Assets/Model/Human.cs.meta b/Assets/Model/Human.cs.meta new file mode 100644 index 0000000..1e3787a --- /dev/null +++ b/Assets/Model/Human.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 3fb42b30a74758548ac4f82927576ae1 +timeCreated: 1439307870 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Model/Meat.cs b/Assets/Model/Meat.cs new file mode 100644 index 0000000..e44c07a --- /dev/null +++ b/Assets/Model/Meat.cs @@ -0,0 +1,7 @@ +using UnityEngine; +using System.Collections; + +public class Meat : Ressource { + + +} diff --git a/Assets/Model/Meat.cs.meta b/Assets/Model/Meat.cs.meta new file mode 100644 index 0000000..205fcc5 --- /dev/null +++ b/Assets/Model/Meat.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 2413d1ddd063dd9469320c7d294a9ab9 +timeCreated: 1439307800 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Model/Ressource.cs b/Assets/Model/Ressource.cs new file mode 100644 index 0000000..bce1e63 --- /dev/null +++ b/Assets/Model/Ressource.cs @@ -0,0 +1,6 @@ +using UnityEngine; +using System.Collections; + +public abstract class Ressource{ + +} diff --git a/Assets/Model/Ressource.cs.meta b/Assets/Model/Ressource.cs.meta new file mode 100644 index 0000000..d0d2a4f --- /dev/null +++ b/Assets/Model/Ressource.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: ee5aad5fd1359a641acd2c76809de1c1 +timeCreated: 1439307577 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Model/Rock.cs b/Assets/Model/Rock.cs new file mode 100644 index 0000000..c4f0645 --- /dev/null +++ b/Assets/Model/Rock.cs @@ -0,0 +1,6 @@ +using UnityEngine; +using System.Collections; + +public class Rock : Ressource { + +} diff --git a/Assets/Model/Rock.cs.meta b/Assets/Model/Rock.cs.meta new file mode 100644 index 0000000..7023cb1 --- /dev/null +++ b/Assets/Model/Rock.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: d61f281b87ce1964dae3d79a3ef69e14 +timeCreated: 1439307671 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Model/Round.cs b/Assets/Model/Round.cs new file mode 100644 index 0000000..72e09ed --- /dev/null +++ b/Assets/Model/Round.cs @@ -0,0 +1,6 @@ +using UnityEngine; +using System.Collections; + +public class Round : MonoBehaviour { + +} diff --git a/Assets/Model/Round.cs.meta b/Assets/Model/Round.cs.meta new file mode 100644 index 0000000..eb91770 --- /dev/null +++ b/Assets/Model/Round.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 218a39754837b2541b93a983e5095019 +timeCreated: 1439308152 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Model/Wood.cs b/Assets/Model/Wood.cs new file mode 100644 index 0000000..53d2f90 --- /dev/null +++ b/Assets/Model/Wood.cs @@ -0,0 +1,6 @@ +using UnityEngine; +using System.Collections; + +public class Wood : Ressource { + +} diff --git a/Assets/Model/Wood.cs.meta b/Assets/Model/Wood.cs.meta new file mode 100644 index 0000000..fedf105 --- /dev/null +++ b/Assets/Model/Wood.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 137ac0e555cd0bf458ee7140217a016e +timeCreated: 1439307792 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Model/Zombie.cs b/Assets/Model/Zombie.cs new file mode 100644 index 0000000..7aa100f --- /dev/null +++ b/Assets/Model/Zombie.cs @@ -0,0 +1,19 @@ +using UnityEngine; +using System.Collections; + +public class Zombie{ + + private bool available; + + public bool getIsAvailable() + { + return available; + } + + public void setIsAvailable(bool a) + { + this.available = a; + } + + +} diff --git a/Assets/Model/Zombie.cs.meta b/Assets/Model/Zombie.cs.meta new file mode 100644 index 0000000..d6c8e93 --- /dev/null +++ b/Assets/Model/Zombie.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: cc4674a5fcfca2841998a098d581566c +timeCreated: 1439302233 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scene/GameBoard.unity b/Assets/Scene/GameBoard.unity index f803114..ac39fdd 100644 --- a/Assets/Scene/GameBoard.unity +++ b/Assets/Scene/GameBoard.unity @@ -112,7 +112,7 @@ AudioListener: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 7372799} - m_Enabled: 1 + m_Enabled: 0 --- !u!92 &7372801 Behaviour: m_ObjectHideFlags: 0 @@ -336,7 +336,7 @@ AudioListener: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1427683301} - m_Enabled: 1 + m_Enabled: 0 --- !u!92 &1427683303 Behaviour: m_ObjectHideFlags: 0 @@ -396,6 +396,169 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 +--- !u!1 &1660519655 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1660519659} + - 223: {fileID: 1660519658} + - 114: {fileID: 1660519657} + - 114: {fileID: 1660519656} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1660519656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1660519655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1660519657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1660519655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &1660519658 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1660519655} + m_Enabled: 1 + serializedVersion: 2 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!224 &1660519659 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1660519655} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &1897166384 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1897166388} + - 114: {fileID: 1897166387} + - 114: {fileID: 1897166386} + - 114: {fileID: 1897166385} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1897166385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1897166384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AllowActivationOnStandalone: 0 +--- !u!114 &1897166386 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1897166384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: .5 + m_AllowActivationOnMobileDevice: 0 +--- !u!114 &1897166387 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1897166384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!4 &1897166388 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1897166384} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 --- !u!1 &1937299790 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Vue.meta b/Assets/View.meta similarity index 100% rename from Assets/Vue.meta rename to Assets/View.meta diff --git a/Assets/View/RessourceView.cs b/Assets/View/RessourceView.cs new file mode 100644 index 0000000..f4918db --- /dev/null +++ b/Assets/View/RessourceView.cs @@ -0,0 +1,60 @@ +using UnityEngine; +using System.Collections; +using UnityEngine.UI; + +public class RessourceView{ + + Bank bank; + Text viewWood; + Text viewRock; + Text viewCorpse; + Text viewMeat; + + public RessourceView(Bank b, Text viewW, Text viewR, Text viewC, Text viewM) + { + this.bank = b; + this.viewCorpse = viewC; + this.viewWood = viewW; + this.viewRock = viewR; + this.viewMeat = viewM; + } + + public void setRock(int nbRock){ + bank.AmountOfRock = nbRock; + } + public int getRock(){ + return bank.AmountOfRock; + } + public void setWood(int nbWood) + { + bank.AmountOfWood = nbWood; + } + public int getWood() + { + return bank.AmountOfWood; + } + public void setCorpse(int nbCorpse) + { + bank.AmountOfCorpse = nbCorpse; + } + public int getCorpse() + { + return bank.AmountOfCorpse; + } + public void setMeat(int nbMeat) + { + bank.AmountOfMeat = nbMeat; + } + public int getMeat() + { + return bank.AmountOfMeat; + } + + public void UpdateView() + { + viewRock.text = ""+ getRock() +""; + viewMeat.text = "" + getMeat() + ""; + viewWood.text = "" + getWood() + ""; + viewCorpse.text = "" + getCorpse() + ""; + } +} diff --git a/Assets/View/RessourceView.cs.meta b/Assets/View/RessourceView.cs.meta new file mode 100644 index 0000000..9b63178 --- /dev/null +++ b/Assets/View/RessourceView.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 44becc0030afe7b4a93d4812ebd8d22a +timeCreated: 1439391648 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: