diff --git a/Assets/Controller.meta b/Assets/Controller.meta index 427edd2..76853dc 100644 --- a/Assets/Controller.meta +++ b/Assets/Controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 93c396a0b8c6a3d44b74f64bc6221aa2 +guid: 0a29d6c59b8f49d4b9f629284bd1371a folderAsset: yes timeCreated: 1439243466 licenseType: Free diff --git a/Assets/Controller/RessourceController.cs b/Assets/Controller/RessourceController.cs index 62ac7b4..2213d28 100644 --- a/Assets/Controller/RessourceController.cs +++ b/Assets/Controller/RessourceController.cs @@ -3,15 +3,15 @@ using System.Collections; using UnityEngine.UI; public class RessourceController{ - Bank bank; + Stats stats; Text viewWood; Text viewRock; Text viewCorpse; Text viewMeat; - public RessourceController(Bank b, Text viewW, Text viewR, Text viewC, Text viewM) + public RessourceController(Stats stats, Text viewW, Text viewR, Text viewC, Text viewM) { - this.bank = b; + this.stats = stats; this.viewCorpse = viewC; this.viewWood = viewW; this.viewRock = viewR; @@ -19,34 +19,34 @@ public class RessourceController{ } public void setRock(int nbRock){ - bank.AmountOfRock = nbRock; + stats.AmountOfRock = nbRock; } public int getRock(){ - return bank.AmountOfRock; + return stats.AmountOfRock; } public void setWood(int nbWood) { - bank.AmountOfWood = nbWood; + stats.AmountOfWood = nbWood; } public int getWood() { - return bank.AmountOfWood; + return stats.AmountOfWood; } public void setCorpse(int nbCorpse) { - bank.AmountOfCorpse = nbCorpse; + stats.AmountOfCorpse = nbCorpse; } public int getCorpse() { - return bank.AmountOfCorpse; + return stats.AmountOfCorpse; } public void setMeat(int nbMeat) { - bank.AmountOfMeat = nbMeat; + stats.AmountOfMeat = nbMeat; } public int getMeat() { - return bank.AmountOfMeat; + return stats.AmountOfMeat; } public void UpdateView() diff --git a/Assets/Model.meta b/Assets/Model.meta index 2011811..35c2314 100644 --- a/Assets/Model.meta +++ b/Assets/Model.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6abd43b843a489e4eac423c91e32c4d9 +guid: 527ed8bbb838e464d9bc0ae54764cc06 folderAsset: yes timeCreated: 1439243432 licenseType: Free diff --git a/Assets/Model/MaisonHumain.cs b/Assets/Model/MaisonHumain.cs new file mode 100644 index 0000000..b7647f4 --- /dev/null +++ b/Assets/Model/MaisonHumain.cs @@ -0,0 +1,26 @@ +using UnityEngine; +using System.Collections; + +public class MaisonHumain : Maison { + + private int nbHumans; + + void addHuman(int amount) + { + if (nbHumans < MAX_CARACTERES) + { + //TODO: assign zombie to this house or decrement houseless zombie + nbHumans++; + } + + else + { + //TODO: alert to player: Too many zombies in one house! You must construct additional zombie houses. + } + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/Assets/Model/MaisonHumain.cs.meta b/Assets/Model/MaisonHumain.cs.meta new file mode 100644 index 0000000..a7215b4 --- /dev/null +++ b/Assets/Model/MaisonHumain.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 2cf8889da2b6ec647a1728ca48468468 +timeCreated: 1439409332 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Model/MaisonZombie.cs b/Assets/Model/MaisonZombie.cs index cd5f275..fdd7d82 100644 --- a/Assets/Model/MaisonZombie.cs +++ b/Assets/Model/MaisonZombie.cs @@ -3,15 +3,14 @@ using System.Collections; public class MaisonZombie : Maison{ - - private int nbZombie; + private int nbZombies; void addZombie(int montant) { - if (nbZombie < MAX_CARACTERES) + if (nbZombies < MAX_CARACTERES) { - //TODO: assign zombie to this house or decrement houseless zombie - nbZombie++; + //TODO: assign zombie to this house OR decrement houseless zombie + nbZombies++; } else diff --git a/Assets/Scene/GameBoard.unity b/Assets/Scene/GameBoard.unity index dc5c43d..525678e 100644 --- a/Assets/Scene/GameBoard.unity +++ b/Assets/Scene/GameBoard.unity @@ -741,6 +741,45 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 185914044} +--- !u!1 &244493135 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 244493137} + - 114: {fileID: 244493136} + m_Layer: 0 + m_Name: Stats + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &244493136 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 244493135} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 421bd3d6d3f0fe54d880c48c723f225d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &244493137 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 244493135} + 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: 7 --- !u!1 &300026248 GameObject: m_ObjectHideFlags: 0 @@ -1574,6 +1613,72 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 +--- !u!1 &632523897 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 632523898} + - 222: {fileID: 632523900} + - 114: {fileID: 632523899} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &632523898 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 632523897} + 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: 1086781101} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &632523899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 632523897} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: AddWoodTest +--- !u!222 &632523900 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 632523897} --- !u!1 &658097876 GameObject: m_ObjectHideFlags: 0 @@ -2272,6 +2377,132 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 958674897} +--- !u!1 &1086781100 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1086781101} + - 222: {fileID: 1086781104} + - 114: {fileID: 1086781103} + - 114: {fileID: 1086781102} + m_Layer: 5 + m_Name: AddWood + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1086781101 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1086781100} + 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: + - {fileID: 632523898} + m_Father: {fileID: 1660519659} + m_RootOrder: 4 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -465, y: 65} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1086781102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1086781100} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1086781103} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 244493136} + m_MethodName: addWood + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 3 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1402754312} + m_MethodName: setResources + 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 &1086781103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1086781100} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1086781104 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1086781100} --- !u!1 &1108173177 GameObject: m_ObjectHideFlags: 0 @@ -3116,6 +3347,153 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1322036842} +--- !u!1 &1392426460 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1392426461} + - 222: {fileID: 1392426463} + - 114: {fileID: 1392426462} + m_Layer: 5 + m_Name: Meat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1392426461 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1392426460} + 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: 1402754311} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -253, y: 124} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1392426462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1392426460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &1392426463 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1392426460} +--- !u!1 &1402754310 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1402754311} + - 222: {fileID: 1402754314} + - 114: {fileID: 1402754313} + - 114: {fileID: 1402754312} + m_Layer: 5 + m_Name: PanelResources + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1402754311 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1402754310} + 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: + - {fileID: 1791556017} + - {fileID: 1392426461} + - {fileID: 1668775494} + - {fileID: 1957368565} + m_Father: {fileID: 1660519659} + m_RootOrder: 3 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1402754312 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1402754310} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44becc0030afe7b4a93d4812ebd8d22a, type: 3} + m_Name: + m_EditorClassIdentifier: + corpseText: {fileID: 1957368566} + rockText: {fileID: 1668775495} + woodText: {fileID: 1791556018} + meatText: {fileID: 1392426462} +--- !u!114 &1402754313 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1402754310} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: .39199999} + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1402754314 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1402754310} --- !u!1 &1427683301 GameObject: m_ObjectHideFlags: 0 @@ -3423,6 +3801,8 @@ RectTransform: - {fileID: 1746096028} - {fileID: 177481968} - {fileID: 1291037626} + - {fileID: 1402754311} + - {fileID: 1086781101} m_Father: {fileID: 0} m_RootOrder: 5 m_AnchorMin: {x: 0, y: 0} @@ -3430,6 +3810,72 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1668775493 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1668775494} + - 222: {fileID: 1668775496} + - 114: {fileID: 1668775495} + m_Layer: 5 + m_Name: Rock + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1668775494 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1668775493} + 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: 1402754311} + m_RootOrder: 2 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 72, y: 124} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1668775495 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1668775493} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &1668775496 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1668775493} --- !u!1 &1677356958 GameObject: m_ObjectHideFlags: 0 @@ -3511,7 +3957,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1746096028 RectTransform: m_ObjectHideFlags: 0 @@ -3707,6 +4153,72 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1775933165} +--- !u!1 &1791556016 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1791556017} + - 222: {fileID: 1791556019} + - 114: {fileID: 1791556018} + m_Layer: 5 + m_Name: Wood + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1791556017 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1791556016} + 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: 1402754311} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 232, y: 124} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1791556018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1791556016} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &1791556019 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1791556016} --- !u!1 &1897166384 GameObject: m_ObjectHideFlags: 0 @@ -3896,6 +4408,72 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 +--- !u!1 &1957368564 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1957368565} + - 222: {fileID: 1957368567} + - 114: {fileID: 1957368566} + m_Layer: 5 + m_Name: Corpse + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1957368565 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1957368564} + 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: 1402754311} + m_RootOrder: 3 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -93, y: 124} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1957368566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1957368564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &1957368567 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1957368564} --- !u!1 &1962833727 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Stats.cs b/Assets/Script/Stats.cs new file mode 100644 index 0000000..6a7c55e --- /dev/null +++ b/Assets/Script/Stats.cs @@ -0,0 +1,96 @@ +using UnityEngine; +using System.Collections; + +public class Stats : MonoBehaviour { + + private int amountOfRock; + private int amountOfWood; + private int amountOfCorpse; + private int amountOfMeat; + private int amountOfZombies; + private int amountOfHumans; + private int amountOfZombiesAvail; + + public Stats(int nbRock, int nbWood, int nbCorpse, int nbMeat, int nbHumans, int nbZombies) + { + 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; } + } + + public int AmountOfZombies + { + get { return amountOfZombies; } + set { amountOfZombies = value; } + } + + public int AmountOfHumans + { + get { return amountOfHumans; } + set { amountOfHumans = value; } + } + + public int AmountOfZombiesAvail + { + get { return amountOfZombiesAvail; } + set { amountOfZombiesAvail = value; } + } + + public void addCorpse() + { + amountOfCorpse++; + } + + public void addWood() + { + amountOfWood++; + } + + public void addMeat() + { + amountOfMeat++; + } + + public void addRock() + { + amountOfRock++; + } + + // Use this for initialization + void Start () { + AmountOfCorpse = 1; + AmountOfMeat = 2; + AmountOfRock = 3; + AmountOfWood = 4; + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/Assets/Script/Stats.cs.meta b/Assets/Script/Stats.cs.meta new file mode 100644 index 0000000..62c47a8 --- /dev/null +++ b/Assets/Script/Stats.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 421bd3d6d3f0fe54d880c48c723f225d +timeCreated: 1439402537 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/View.meta b/Assets/View.meta index a5bbc89..c8c191a 100644 --- a/Assets/View.meta +++ b/Assets/View.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c04b4b26963de7d4bb24d42917431e9d +guid: 441d9c4a385c0a842983ef0453d8db82 folderAsset: yes timeCreated: 1439243454 licenseType: Free diff --git a/Assets/View/RessourceView.cs b/Assets/View/RessourceView.cs index 56aec85..b0eaab7 100644 --- a/Assets/View/RessourceView.cs +++ b/Assets/View/RessourceView.cs @@ -1,7 +1,29 @@ using UnityEngine; using System.Collections; +using UnityEngine.UI; -public class RessourceView{ +public class RessourceView: MonoBehaviour{ - + private RessourceController rc; + public Text corpseText; + public Text rockText; + public Text woodText; + public Text meatText; + + void Start() + { + Stats stats = GameObject.Find("Stats").gameObject.GetComponent(); + rc = new RessourceController(stats, corpseText, rockText, woodText, meatText); + setResources(); + } + + public void setResources() { + rc.UpdateView(); + } + + void Update() + { + + + } }