mirror of
https://github.com/ConjureETS/Human-Farm-Tycoon.git
synced 2026-03-24 02:11:07 +00:00
Random event and end turn work.
This commit is contained in:
parent
d5cd425061
commit
57513d7d77
@ -351,6 +351,72 @@ CanvasRenderer:
|
|||||||
m_PrefabParentObject: {fileID: 0}
|
m_PrefabParentObject: {fileID: 0}
|
||||||
m_PrefabInternal: {fileID: 0}
|
m_PrefabInternal: {fileID: 0}
|
||||||
m_GameObject: {fileID: 25367852}
|
m_GameObject: {fileID: 25367852}
|
||||||
|
--- !u!1 &42113445
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
serializedVersion: 4
|
||||||
|
m_Component:
|
||||||
|
- 224: {fileID: 42113446}
|
||||||
|
- 222: {fileID: 42113448}
|
||||||
|
- 114: {fileID: 42113447}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: DescriptionEvent
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &42113446
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 42113445}
|
||||||
|
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: 642970302}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_AnchorMin: {x: 0, y: .5}
|
||||||
|
m_AnchorMax: {x: 1, y: .5}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 7}
|
||||||
|
m_SizeDelta: {x: 0, y: 44}
|
||||||
|
m_Pivot: {x: .5, y: .5}
|
||||||
|
--- !u!114 &42113447
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 42113445}
|
||||||
|
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: 1
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 0
|
||||||
|
m_VerticalOverflow: 0
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: New Text
|
||||||
|
--- !u!222 &42113448
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 42113445}
|
||||||
--- !u!1 &60924484
|
--- !u!1 &60924484
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -404,7 +470,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 10, y: 10, z: 1}
|
m_LocalScale: {x: 10, y: 10, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 2
|
||||||
--- !u!1 &66170010
|
--- !u!1 &66170010
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1317,7 +1383,7 @@ RectTransform:
|
|||||||
- {fileID: 382500510}
|
- {fileID: 382500510}
|
||||||
- {fileID: 343888221}
|
- {fileID: 343888221}
|
||||||
m_Father: {fileID: 1208919978}
|
m_Father: {fileID: 1208919978}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 2
|
||||||
m_AnchorMin: {x: .5, y: .5}
|
m_AnchorMin: {x: .5, y: .5}
|
||||||
m_AnchorMax: {x: .5, y: .5}
|
m_AnchorMax: {x: .5, y: .5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
@ -2313,7 +2379,7 @@ RectTransform:
|
|||||||
- {fileID: 1393432354}
|
- {fileID: 1393432354}
|
||||||
- {fileID: 67541192}
|
- {fileID: 67541192}
|
||||||
m_Father: {fileID: 1208919978}
|
m_Father: {fileID: 1208919978}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 3
|
||||||
m_AnchorMin: {x: .5, y: .5}
|
m_AnchorMin: {x: .5, y: .5}
|
||||||
m_AnchorMax: {x: .5, y: .5}
|
m_AnchorMax: {x: .5, y: .5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
@ -2418,7 +2484,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 10, y: 10, z: 1}
|
m_LocalScale: {x: 10, y: 10, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 3
|
||||||
--- !u!1 &513445124
|
--- !u!1 &513445124
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -2909,7 +2975,7 @@ RectTransform:
|
|||||||
- {fileID: 98902544}
|
- {fileID: 98902544}
|
||||||
- {fileID: 390929331}
|
- {fileID: 390929331}
|
||||||
m_Father: {fileID: 1208919978}
|
m_Father: {fileID: 1208919978}
|
||||||
m_RootOrder: 7
|
m_RootOrder: 6
|
||||||
m_AnchorMin: {x: .5, y: .5}
|
m_AnchorMin: {x: .5, y: .5}
|
||||||
m_AnchorMax: {x: .5, y: .5}
|
m_AnchorMax: {x: .5, y: .5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
@ -3127,6 +3193,69 @@ CanvasRenderer:
|
|||||||
type: 2}
|
type: 2}
|
||||||
m_PrefabInternal: {fileID: 0}
|
m_PrefabInternal: {fileID: 0}
|
||||||
m_GameObject: {fileID: 622548618}
|
m_GameObject: {fileID: 622548618}
|
||||||
|
--- !u!1 &642970301
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
serializedVersion: 4
|
||||||
|
m_Component:
|
||||||
|
- 224: {fileID: 642970302}
|
||||||
|
- 222: {fileID: 642970304}
|
||||||
|
- 114: {fileID: 642970303}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: PanelEvent
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 0
|
||||||
|
--- !u!224 &642970302
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 642970301}
|
||||||
|
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: 42113446}
|
||||||
|
- {fileID: 1619477044}
|
||||||
|
m_Father: {fileID: 799974593}
|
||||||
|
m_RootOrder: 5
|
||||||
|
m_AnchorMin: {x: .5, y: .5}
|
||||||
|
m_AnchorMax: {x: .5, y: .5}
|
||||||
|
m_AnchoredPosition: {x: 18, y: -4}
|
||||||
|
m_SizeDelta: {x: 377, y: 201}
|
||||||
|
m_Pivot: {x: .5, y: .5}
|
||||||
|
--- !u!114 &642970303
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 642970301}
|
||||||
|
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: .823529422, g: .139273345, b: .139273345, a: 1}
|
||||||
|
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 &642970304
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 642970301}
|
||||||
--- !u!1 &724116263
|
--- !u!1 &724116263
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -3157,7 +3286,7 @@ RectTransform:
|
|||||||
- {fileID: 1961814004}
|
- {fileID: 1961814004}
|
||||||
- {fileID: 1312327243}
|
- {fileID: 1312327243}
|
||||||
m_Father: {fileID: 1208919978}
|
m_Father: {fileID: 1208919978}
|
||||||
m_RootOrder: 8
|
m_RootOrder: 7
|
||||||
m_AnchorMin: {x: .5, y: .5}
|
m_AnchorMin: {x: .5, y: .5}
|
||||||
m_AnchorMax: {x: .5, y: .5}
|
m_AnchorMax: {x: .5, y: .5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
@ -3430,7 +3559,7 @@ RectTransform:
|
|||||||
- {fileID: 1869570714}
|
- {fileID: 1869570714}
|
||||||
- {fileID: 130894283}
|
- {fileID: 130894283}
|
||||||
m_Father: {fileID: 1208919978}
|
m_Father: {fileID: 1208919978}
|
||||||
m_RootOrder: 6
|
m_RootOrder: 5
|
||||||
m_AnchorMin: {x: .5, y: .5}
|
m_AnchorMin: {x: .5, y: .5}
|
||||||
m_AnchorMax: {x: .5, y: .5}
|
m_AnchorMax: {x: .5, y: .5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
@ -3690,7 +3819,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 5
|
||||||
--- !u!1 &799974592
|
--- !u!1 &799974592
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -3724,12 +3853,13 @@ RectTransform:
|
|||||||
- {fileID: 328316461}
|
- {fileID: 328316461}
|
||||||
- {fileID: 1183047612}
|
- {fileID: 1183047612}
|
||||||
- {fileID: 1822733248}
|
- {fileID: 1822733248}
|
||||||
|
- {fileID: 642970302}
|
||||||
m_Father: {fileID: 1208919978}
|
m_Father: {fileID: 1208919978}
|
||||||
m_RootOrder: 10
|
m_RootOrder: 9
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 2, y: 0}
|
||||||
m_SizeDelta: {x: -506, y: -140}
|
m_SizeDelta: {x: -351, y: -140}
|
||||||
m_Pivot: {x: .5, y: .5}
|
m_Pivot: {x: .5, y: .5}
|
||||||
--- !u!114 &799974594
|
--- !u!114 &799974594
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -3745,6 +3875,7 @@ MonoBehaviour:
|
|||||||
currentValues: {fileID: 328316462}
|
currentValues: {fileID: 328316462}
|
||||||
addedValues: {fileID: 1183047613}
|
addedValues: {fileID: 1183047613}
|
||||||
alertTitle: {fileID: 1510152492}
|
alertTitle: {fileID: 1510152492}
|
||||||
|
descrEvent: {fileID: 42113447}
|
||||||
--- !u!114 &799974595
|
--- !u!114 &799974595
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -4140,7 +4271,7 @@ RectTransform:
|
|||||||
- {fileID: 1099539905}
|
- {fileID: 1099539905}
|
||||||
- {fileID: 589745979}
|
- {fileID: 589745979}
|
||||||
m_Father: {fileID: 1208919978}
|
m_Father: {fileID: 1208919978}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 4
|
||||||
m_AnchorMin: {x: .5, y: .5}
|
m_AnchorMin: {x: .5, y: .5}
|
||||||
m_AnchorMax: {x: .5, y: .5}
|
m_AnchorMax: {x: .5, y: .5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
@ -4542,7 +4673,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 1
|
||||||
--- !u!1 &1114603899
|
--- !u!1 &1114603899
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -4611,6 +4742,72 @@ CanvasRenderer:
|
|||||||
m_PrefabParentObject: {fileID: 0}
|
m_PrefabParentObject: {fileID: 0}
|
||||||
m_PrefabInternal: {fileID: 0}
|
m_PrefabInternal: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1114603899}
|
m_GameObject: {fileID: 1114603899}
|
||||||
|
--- !u!1 &1121673704
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
serializedVersion: 4
|
||||||
|
m_Component:
|
||||||
|
- 224: {fileID: 1121673705}
|
||||||
|
- 222: {fileID: 1121673707}
|
||||||
|
- 114: {fileID: 1121673706}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Text
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1121673705
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1121673704}
|
||||||
|
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: 1619477044}
|
||||||
|
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 &1121673706
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1121673704}
|
||||||
|
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: OK
|
||||||
|
--- !u!222 &1121673707
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1121673704}
|
||||||
--- !u!1 &1129960151
|
--- !u!1 &1129960151
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -5083,7 +5280,6 @@ RectTransform:
|
|||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 215832622}
|
- {fileID: 215832622}
|
||||||
- {fileID: 204520198}
|
- {fileID: 204520198}
|
||||||
- {fileID: 1914682507}
|
|
||||||
- {fileID: 245257108}
|
- {fileID: 245257108}
|
||||||
- {fileID: 489787184}
|
- {fileID: 489787184}
|
||||||
- {fileID: 976571507}
|
- {fileID: 976571507}
|
||||||
@ -5093,7 +5289,7 @@ RectTransform:
|
|||||||
- {fileID: 1872249330}
|
- {fileID: 1872249330}
|
||||||
- {fileID: 799974593}
|
- {fileID: 799974593}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 4
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
@ -7014,6 +7210,143 @@ CanvasRenderer:
|
|||||||
type: 2}
|
type: 2}
|
||||||
m_PrefabInternal: {fileID: 0}
|
m_PrefabInternal: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1615688322}
|
m_GameObject: {fileID: 1615688322}
|
||||||
|
--- !u!1 &1619477043
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
serializedVersion: 4
|
||||||
|
m_Component:
|
||||||
|
- 224: {fileID: 1619477044}
|
||||||
|
- 222: {fileID: 1619477047}
|
||||||
|
- 114: {fileID: 1619477046}
|
||||||
|
- 114: {fileID: 1619477045}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: ConfirmRead
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1619477044
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1619477043}
|
||||||
|
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: 1121673705}
|
||||||
|
m_Father: {fileID: 642970302}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_AnchorMin: {x: 1, y: 0}
|
||||||
|
m_AnchorMax: {x: 1, y: 0}
|
||||||
|
m_AnchoredPosition: {x: -37, y: 38}
|
||||||
|
m_SizeDelta: {x: 30, y: 30}
|
||||||
|
m_Pivot: {x: .5, y: .5}
|
||||||
|
--- !u!114 &1619477045
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1619477043}
|
||||||
|
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: 1619477046}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 799974592}
|
||||||
|
m_MethodName: SetActive
|
||||||
|
m_Mode: 6
|
||||||
|
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_Target: {fileID: 642970301}
|
||||||
|
m_MethodName: SetActive
|
||||||
|
m_Mode: 6
|
||||||
|
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_Target: {fileID: 1872249329}
|
||||||
|
m_MethodName: SetActive
|
||||||
|
m_Mode: 6
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 1
|
||||||
|
m_CallState: 2
|
||||||
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
|
Culture=neutral, PublicKeyToken=null
|
||||||
|
--- !u!114 &1619477046
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1619477043}
|
||||||
|
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 &1619477047
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1619477043}
|
||||||
--- !u!1 &1639175013
|
--- !u!1 &1639175013
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -7596,7 +7929,7 @@ MonoBehaviour:
|
|||||||
m_FloatArgument: 0
|
m_FloatArgument: 0
|
||||||
m_StringArgument:
|
m_StringArgument:
|
||||||
m_BoolArgument: 0
|
m_BoolArgument: 0
|
||||||
m_CallState: 2
|
m_CallState: 0
|
||||||
- m_Target: {fileID: 799974594}
|
- m_Target: {fileID: 799974594}
|
||||||
m_MethodName: ModifieStats
|
m_MethodName: ModifieStats
|
||||||
m_Mode: 1
|
m_Mode: 1
|
||||||
@ -7608,6 +7941,17 @@ MonoBehaviour:
|
|||||||
m_StringArgument:
|
m_StringArgument:
|
||||||
m_BoolArgument: 0
|
m_BoolArgument: 0
|
||||||
m_CallState: 2
|
m_CallState: 2
|
||||||
|
- m_Target: {fileID: 642970301}
|
||||||
|
m_MethodName: SetActive
|
||||||
|
m_Mode: 6
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 1
|
||||||
|
m_CallState: 2
|
||||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
Culture=neutral, PublicKeyToken=null
|
Culture=neutral, PublicKeyToken=null
|
||||||
--- !u!114 &1822733250
|
--- !u!114 &1822733250
|
||||||
@ -7802,8 +8146,9 @@ RectTransform:
|
|||||||
- {fileID: 2119485817}
|
- {fileID: 2119485817}
|
||||||
- {fileID: 405726817}
|
- {fileID: 405726817}
|
||||||
- {fileID: 1166895813}
|
- {fileID: 1166895813}
|
||||||
|
- {fileID: 1914682507}
|
||||||
m_Father: {fileID: 1208919978}
|
m_Father: {fileID: 1208919978}
|
||||||
m_RootOrder: 9
|
m_RootOrder: 8
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
@ -8069,8 +8414,8 @@ RectTransform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1447040572}
|
- {fileID: 1447040572}
|
||||||
m_Father: {fileID: 1208919978}
|
m_Father: {fileID: 1872249330}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 5
|
||||||
m_AnchorMin: {x: .5, y: .5}
|
m_AnchorMin: {x: .5, y: .5}
|
||||||
m_AnchorMax: {x: .5, y: .5}
|
m_AnchorMax: {x: .5, y: .5}
|
||||||
m_AnchoredPosition: {x: 219, y: -93}
|
m_AnchoredPosition: {x: 219, y: -93}
|
||||||
@ -8126,6 +8471,28 @@ MonoBehaviour:
|
|||||||
m_StringArgument:
|
m_StringArgument:
|
||||||
m_BoolArgument: 1
|
m_BoolArgument: 1
|
||||||
m_CallState: 2
|
m_CallState: 2
|
||||||
|
- m_Target: {fileID: 799974594}
|
||||||
|
m_MethodName: UpdateView
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 1
|
||||||
|
m_CallState: 2
|
||||||
|
- m_Target: {fileID: 1872249329}
|
||||||
|
m_MethodName: SetActive
|
||||||
|
m_Mode: 6
|
||||||
|
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,
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
Culture=neutral, PublicKeyToken=null
|
Culture=neutral, PublicKeyToken=null
|
||||||
--- !u!114 &1914682509
|
--- !u!114 &1914682509
|
||||||
@ -8588,7 +8955,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 0
|
||||||
--- !u!1 &2029532042
|
--- !u!1 &2029532042
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -7,14 +7,17 @@ public class ConfirmStatsScript : MonoBehaviour {
|
|||||||
public Text currentValues;
|
public Text currentValues;
|
||||||
public Text addedValues;
|
public Text addedValues;
|
||||||
public Text alertTitle;
|
public Text alertTitle;
|
||||||
|
public Text descrEvent;
|
||||||
private Stats stats;
|
private Stats stats;
|
||||||
|
|
||||||
|
|
||||||
|
void Awake()
|
||||||
|
{
|
||||||
|
stats = GameObject.Find("Stats").gameObject.GetComponent<Stats>();
|
||||||
|
}
|
||||||
|
|
||||||
// Use this for initialization
|
// Use this for initialization
|
||||||
void Start () {
|
void Start () {
|
||||||
stats = GameObject.Find("Stats").gameObject.GetComponent<Stats>();
|
|
||||||
currentValues.text = stats.displayCurrentStats();
|
|
||||||
addedValues.text = stats.displayAddingStats();
|
|
||||||
alertTitle.text = "DAY " + stats.NbTurns;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update is called once per frame
|
// Update is called once per frame
|
||||||
@ -22,8 +25,16 @@ public class ConfirmStatsScript : MonoBehaviour {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void UpdateView()
|
||||||
|
{
|
||||||
|
currentValues.text = stats.displayCurrentStats();
|
||||||
|
addedValues.text = stats.displayAddingStats();
|
||||||
|
alertTitle.text = "DAY " + stats.NbTurns;
|
||||||
|
}
|
||||||
|
|
||||||
public void ModifieStats()
|
public void ModifieStats()
|
||||||
{
|
{
|
||||||
stats.UpdateStats();
|
|
||||||
|
descrEvent.text = stats.UpdateStats();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -402,6 +402,8 @@ public class Stats : MonoBehaviour
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//Do at the end of a turn
|
||||||
public String UpdateStats()
|
public String UpdateStats()
|
||||||
{
|
{
|
||||||
Evenement evenement = new Evenement();
|
Evenement evenement = new Evenement();
|
||||||
@ -410,9 +412,20 @@ public class Stats : MonoBehaviour
|
|||||||
AmountOfWood = AmountOfWood + NbZombieAssigneWood * NbOfWoodByZombie * evenement.MultiWood/10;
|
AmountOfWood = AmountOfWood + NbZombieAssigneWood * NbOfWoodByZombie * evenement.MultiWood/10;
|
||||||
AmountOfRock = AmountOfRock + NbZombieAssigneRock * NbOfRockByZombie * evenement.MutliRock/10;
|
AmountOfRock = AmountOfRock + NbZombieAssigneRock * NbOfRockByZombie * evenement.MutliRock/10;
|
||||||
AmountOfCorpse = AmountOfCorpse + NbZombieAssigneCorpse * NbOfCorpseByZombie * evenement.MultiCorps/10;
|
AmountOfCorpse = AmountOfCorpse + NbZombieAssigneCorpse * NbOfCorpseByZombie * evenement.MultiCorps/10;
|
||||||
|
|
||||||
|
ResetZombieAssigne();
|
||||||
NbTurns++;
|
NbTurns++;
|
||||||
return evenement.descriptionEvent;
|
return evenement.descriptionEvent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ResetZombieAssigne()
|
||||||
|
{
|
||||||
|
NbZombieAssigneCorpse = 0;
|
||||||
|
NbZombieAssigneWood = 0;
|
||||||
|
NbZombieAssigneRock =0;
|
||||||
|
nbZombieAssigneMakeEatHuman =0;
|
||||||
|
AmountOfZombiesAvail = AmountOfZombies;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user