Compare commits

...

4 Commits

22 changed files with 593 additions and 51 deletions

Binary file not shown.

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 44a099190c52447f7a3254e3679ecfd8
guid: 25dd9172f3ed8497bb638d649e5309f0
AudioImporter:
externalObjects: {}
serializedVersion: 6

Binary file not shown.

View File

@ -239,7 +239,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
m_PresetInfoIsWorld: 1
--- !u!114 &2739169735767897497
MonoBehaviour:
m_ObjectHideFlags: 0
@ -347,8 +347,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4282166768
m_fontColor: {r: 0.9411765, g: 0.6784314, b: 0.23529412, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:

View File

@ -838,6 +838,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0.018799989
objectReference: {fileID: 0}
- target: {fileID: 3602798964023338093, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3876540017062383922, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 27.564117
@ -1078,6 +1082,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7994886322184003359, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8499714619200364116, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 12.69047
@ -1417,6 +1425,14 @@ PrefabInstance:
propertyPath: m_Name
value: Pirate (Grey) (4)
objectReference: {fileID: 0}
- target: {fileID: 2763190456090391756, guid: d26746f94e9bc44998992db177b0926d, type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8742875858490740670, guid: d26746f94e9bc44998992db177b0926d, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d26746f94e9bc44998992db177b0926d, type: 3}
--- !u!1 &86529552
@ -1514,7 +1530,7 @@ RectTransform:
m_Children:
- {fileID: 953941043}
m_Father: {fileID: 0}
m_RootOrder: 17
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -1550,7 +1566,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 15
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &102349499
GameObject:
@ -1648,7 +1664,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 16
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &114937259
PrefabInstance:
@ -1659,7 +1675,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1362559069547619857, guid: a3b911323d72e425693591d838971931, type: 3}
propertyPath: m_RootOrder
value: 40
value: 39
objectReference: {fileID: 0}
- target: {fileID: 1362559069547619857, guid: a3b911323d72e425693591d838971931, type: 3}
propertyPath: m_LocalPosition.x
@ -1778,6 +1794,14 @@ PrefabInstance:
propertyPath: m_Name
value: Pirate (Grey) (2)
objectReference: {fileID: 0}
- target: {fileID: 2763190456090391756, guid: d26746f94e9bc44998992db177b0926d, type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8742875858490740670, guid: d26746f94e9bc44998992db177b0926d, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d26746f94e9bc44998992db177b0926d, type: 3}
--- !u!1 &136321829
@ -2289,6 +2313,38 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &209700806
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 209700807}
m_Layer: 0
m_Name: Music
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &209700807
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 209700806}
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1949154630}
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &218245202
GameObject:
m_ObjectHideFlags: 0
@ -3323,6 +3379,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1841959051}
m_Modifications:
- target: {fileID: 3205706632183164804, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4643894104949937496, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
propertyPath: m_Name
value: Pirate (Blue) (2)
@ -3371,6 +3431,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8318369940466668790, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
--- !u!4 &327414285 stripped
@ -3457,7 +3521,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_RootOrder
value: 51
value: 50
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_LocalPosition.x
@ -3872,7 +3936,7 @@ Transform:
- {fileID: 2046376691}
- {fileID: 1193188584}
m_Father: {fileID: 0}
m_RootOrder: 26
m_RootOrder: 27
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &403482847
GameObject:
@ -4304,7 +4368,7 @@ Transform:
- {fileID: 987201644}
- {fileID: 1251876827}
m_Father: {fileID: 0}
m_RootOrder: 24
m_RootOrder: 25
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &433034051
MonoBehaviour:
@ -4914,6 +4978,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1094154913}
m_Modifications:
- target: {fileID: 1011126093537271578, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5040387473618948274, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
propertyPath: m_Name
value: Pirate (Green) (2)
@ -4962,6 +5030,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5837792678171075688, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
--- !u!1001 &515214452
@ -5168,6 +5240,14 @@ PrefabInstance:
propertyPath: m_Name
value: Pirate (Grey) (3)
objectReference: {fileID: 0}
- target: {fileID: 2763190456090391756, guid: d26746f94e9bc44998992db177b0926d, type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8742875858490740670, guid: d26746f94e9bc44998992db177b0926d, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d26746f94e9bc44998992db177b0926d, type: 3}
--- !u!1 &543219273
@ -5260,6 +5340,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1841959051}
m_Modifications:
- target: {fileID: 3205706632183164804, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4643894104949937496, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
propertyPath: m_Name
value: Pirate (Blue) (4)
@ -5308,6 +5392,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8318369940466668790, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
--- !u!4 &573724676 stripped
@ -5704,7 +5792,7 @@ Transform:
m_Children:
- {fileID: 777143461}
m_Father: {fileID: 0}
m_RootOrder: 25
m_RootOrder: 26
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &591083575
GameObject:
@ -5833,7 +5921,7 @@ Transform:
- {fileID: 1105711058}
- {fileID: 1889666521}
m_Father: {fileID: 0}
m_RootOrder: 21
m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &612889230 stripped
MonoBehaviour:
@ -5859,7 +5947,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_RootOrder
value: 46
value: 45
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_LocalPosition.x
@ -6025,7 +6113,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_RootOrder
value: 50
value: 49
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_LocalPosition.x
@ -6212,7 +6300,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_RootOrder
value: 45
value: 44
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_LocalPosition.x
@ -6481,7 +6569,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_RootOrder
value: 43
value: 42
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_LocalPosition.x
@ -7299,7 +7387,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_RootOrder
value: 48
value: 47
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_LocalPosition.x
@ -7593,6 +7681,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1373272158}
m_Modifications:
- target: {fileID: 3602798964023338093, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6954059691668741325, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
propertyPath: m_Name
value: Pirate (Red) (3)
@ -7641,6 +7733,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7994886322184003359, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
--- !u!1 &832604100
@ -8586,6 +8682,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -0.022962524
objectReference: {fileID: 0}
- target: {fileID: 3205706632183164804, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3355085080137322900, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 72.00588
@ -8862,6 +8962,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 164.47597
objectReference: {fileID: 0}
- target: {fileID: 8318369940466668790, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 9177389804466720770, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 2.6976361
@ -10073,7 +10177,7 @@ Transform:
m_Children:
- {fileID: 1406544797}
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &972828285
GameObject:
@ -10252,7 +10356,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2840576771603088635, guid: da37421badcbd4576a24a3ab7b36ecd9, type: 3}
propertyPath: m_RootOrder
value: 22
value: 23
objectReference: {fileID: 0}
- target: {fileID: 2840576771603088635, guid: da37421badcbd4576a24a3ab7b36ecd9, type: 3}
propertyPath: m_LocalPosition.x
@ -10309,7 +10413,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_RootOrder
value: 44
value: 43
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_LocalPosition.x
@ -10794,6 +10898,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0.018799989
objectReference: {fileID: 0}
- target: {fileID: 3602798964023338093, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3876540017062383922, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 27.815733
@ -11034,6 +11142,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7994886322184003359, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8499714619200364116, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 3.9168587
@ -11191,7 +11303,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1005647491
GameObject:
@ -13211,7 +13323,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_RootOrder
value: 47
value: 46
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_LocalPosition.x
@ -13269,7 +13381,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 692350080486519524, guid: a8e3aa2657cf941969f210f066c2be8c, type: 3}
propertyPath: m_RootOrder
value: 13
value: 14
objectReference: {fileID: 0}
- target: {fileID: 692350080486519524, guid: a8e3aa2657cf941969f210f066c2be8c, type: 3}
propertyPath: m_LocalPosition.x
@ -13610,7 +13722,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_RootOrder
value: 53
value: 52
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_LocalPosition.x
@ -13744,6 +13856,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1094154913}
m_Modifications:
- target: {fileID: 1011126093537271578, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5040387473618948274, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
propertyPath: m_Name
value: Pirate (Green) (4)
@ -13792,6 +13908,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5837792678171075688, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
--- !u!1 &1251876826
@ -14151,7 +14271,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1292754754 stripped
MonoBehaviour:
@ -14250,7 +14370,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_RootOrder
value: 38
value: 37
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_LocalPosition.x
@ -14362,7 +14482,7 @@ Transform:
- {fileID: 1107252689}
- {fileID: 247469678}
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1314254205
GameObject:
@ -14794,6 +14914,9 @@ MonoBehaviour:
- {fileID: 5608193481705990350}
- {fileID: 5608193482405246781}
- {fileID: 5608193483424667983}
- {fileID: 5608193481910428233}
- {fileID: 5608193482973815120}
- {fileID: 5608193482197189505}
baseObjects:
- {fileID: 2095159703}
- {fileID: 247469677}
@ -15048,7 +15171,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_RootOrder
value: 37
value: 36
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_LocalPosition.x
@ -15447,6 +15570,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1841959051}
m_Modifications:
- target: {fileID: 3205706632183164804, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4643894104949937496, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
propertyPath: m_Name
value: Pirate (Blue) (3)
@ -15495,6 +15622,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8318369940466668790, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3}
--- !u!4 &1449273730 stripped
@ -15745,7 +15876,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_RootOrder
value: 40
value: 41
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_LocalPosition.x
@ -16019,7 +16150,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_RootOrder
value: 39
value: 38
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_LocalPosition.x
@ -16113,6 +16244,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1094154913}
m_Modifications:
- target: {fileID: 1011126093537271578, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5040387473618948274, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
propertyPath: m_Name
value: Pirate (Green) (3)
@ -16161,6 +16296,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5837792678171075688, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
--- !u!1 &1545603096
@ -16664,7 +16803,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5543862162727244199, guid: ac6c492cc5bc64ab58060047f5198136, type: 3}
propertyPath: m_RootOrder
value: 12
value: 13
objectReference: {fileID: 0}
- target: {fileID: 5543862162727244199, guid: ac6c492cc5bc64ab58060047f5198136, type: 3}
propertyPath: m_LocalPosition.x
@ -17712,7 +17851,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1732821612
GameObject:
@ -17959,6 +18098,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1373272158}
m_Modifications:
- target: {fileID: 3602798964023338093, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6954059691668741325, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
propertyPath: m_Name
value: Pirate (Red) (1)
@ -18007,6 +18150,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7994886322184003359, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3}
--- !u!1 &1772548174
@ -18875,7 +19022,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 23
m_RootOrder: 24
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1887957727
GameObject:
@ -18926,7 +19073,7 @@ Transform:
- {fileID: 1545603097}
- {fileID: 7686822008443127058}
m_Father: {fileID: 0}
m_RootOrder: 19
m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1889666520
PrefabInstance:
@ -19442,7 +19589,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_RootOrder
value: 42
value: 40
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_LocalPosition.x
@ -19590,7 +19737,7 @@ Transform:
- {fileID: 75716810}
- {fileID: 1711642273}
m_Father: {fileID: 0}
m_RootOrder: 20
m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1943884392
GameObject:
@ -19717,6 +19864,158 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1948153070}
m_Mesh: {fileID: 4300004, guid: 25e0b84f10949354b96b98b3742acdde, type: 3}
--- !u!1 &1949154629
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1949154630}
- component: {fileID: 1949154632}
- component: {fileID: 1949154631}
m_Layer: 0
m_Name: MusicManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1949154630
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1949154629}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 209700807}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &1949154631
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1949154629}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: -176124199341068130, guid: 12870a2f915674f679b5025697171155, type: 2}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &1949154632
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1949154629}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6f598c418041d4a9e89aa7a25efc1185, type: 3}
m_Name:
m_EditorClassIdentifier:
audioSource: {fileID: 1949154631}
musicDatas:
- musicType: 0
priority: 1
musicClip: {fileID: 8300000, guid: 2aaeabf9c4da5458d99bb9210024afaf, type: 3}
- musicType: 1
priority: 1
musicClip: {fileID: 8300000, guid: 3fef0c7922e3840f79c05fb9a520dde3, type: 3}
- musicType: 2
priority: 1
musicClip: {fileID: 8300000, guid: 25dd9172f3ed8497bb638d649e5309f0, type: 3}
--- !u!1 &1954289399
GameObject:
m_ObjectHideFlags: 0
@ -20321,7 +20620,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_RootOrder
value: 52
value: 51
objectReference: {fileID: 0}
- target: {fileID: 8564956122812130069, guid: 515d8b1f77d464a81b58cf47b8f04768, type: 3}
propertyPath: m_LocalPosition.x
@ -20923,7 +21222,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 18
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2076908155
PrefabInstance:
@ -22074,6 +22373,14 @@ PrefabInstance:
propertyPath: m_Name
value: Pirate (Grey) (1)
objectReference: {fileID: 0}
- target: {fileID: 2763190456090391756, guid: d26746f94e9bc44998992db177b0926d, type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8742875858490740670, guid: d26746f94e9bc44998992db177b0926d, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d26746f94e9bc44998992db177b0926d, type: 3}
--- !u!1 &1835930482367990250
@ -22237,7 +22544,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1003433482227882326, guid: f7fae8d587c2e4afcbcd76b417afc521, type: 3}
propertyPath: m_RootOrder
value: 14
value: 15
objectReference: {fileID: 0}
- target: {fileID: 1003433482227882326, guid: f7fae8d587c2e4afcbcd76b417afc521, type: 3}
propertyPath: m_LocalPosition.x
@ -22940,7 +23247,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0553fd5dfa2fe448ab50cc371257cc20, type: 3}
m_Name:
m_EditorClassIdentifier:
screenType: 3
screenType: 6
shouldFade: 0
pvpModeBtn: {fileID: 5608193482123643063}
pvaiModeBtn: {fileID: 5608193482885172035}
@ -23719,6 +24026,7 @@ GameObject:
m_Component:
- component: {fileID: 5608193481910428232}
- component: {fileID: 5608193481910428234}
- component: {fileID: 5608193481910428235}
m_Layer: 5
m_Name: Main Menu
m_TagString: Untagged
@ -23734,6 +24042,20 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5608193481910428233}
m_CullTransparentMesh: 1
--- !u!114 &5608193481910428235
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5608193481910428233}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 81101c7d4c55a4f1e982f266e7298763, type: 3}
m_Name:
m_EditorClassIdentifier:
screenType: 0
shouldFade: 0
--- !u!224 &5608193481924487018
RectTransform:
m_ObjectHideFlags: 0
@ -24452,6 +24774,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5608193482197189504}
- component: {fileID: 5608193482197189506}
m_Layer: 5
m_Name: Game Over
m_TagString: Untagged
@ -24459,6 +24782,20 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!114 &5608193482197189506
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5608193482197189505}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 14661c82e227e4988a4ad90d300c6e40, type: 3}
m_Name:
m_EditorClassIdentifier:
screenType: 2
shouldFade: 0
--- !u!222 &5608193482210820768
CanvasRenderer:
m_ObjectHideFlags: 0
@ -24734,7 +25071,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ac108e78c738f433e8186c831e351d82, type: 3}
m_Name:
m_EditorClassIdentifier:
screenType: 2
screenType: 5
shouldFade: 0
diceBtn: {fileID: 1100918534}
pauseBtn: {fileID: 5608193482794695415}
@ -24756,7 +25093,7 @@ RectTransform:
- {fileID: 5608193482973815123}
- {fileID: 5608193482197189504}
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -26195,13 +26532,14 @@ GameObject:
m_Component:
- component: {fileID: 5608193482973815123}
- component: {fileID: 5608193482973815122}
- component: {fileID: 5608193482973815124}
m_Layer: 5
m_Name: Game
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!222 &5608193482973815122
CanvasRenderer:
m_ObjectHideFlags: 0
@ -26232,6 +26570,20 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5608193482973815124
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5608193482973815120}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c92cd673ccb28491c89a3d28d8707e79, type: 3}
m_Name:
m_EditorClassIdentifier:
screenType: 1
shouldFade: 0
--- !u!224 &5608193482985030356
RectTransform:
m_ObjectHideFlags: 0
@ -27412,7 +27764,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!222 &5608193483354237948
CanvasRenderer:
m_ObjectHideFlags: 0
@ -27871,6 +28223,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1094154913}
m_Modifications:
- target: {fileID: 1011126093537271578, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5040387473618948274, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
propertyPath: m_Name
value: Pirate (Green) (1)
@ -27919,6 +28275,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5837792678171075688, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3}
--- !u!4 &7686822008443127058

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6e82d850a90884a54a07beff74d9a324
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,65 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public enum MusicType
{
HomeMusic,
GameMusic,
GameOverMusic
}
[System.Serializable]
public class MusicData
{
public MusicType musicType;
public int priority;
public AudioClip musicClip;
}
public class MusicManager : MonoBehaviour, IBootLoader, IBase, IDataLoader
{
[SerializeField] AudioSource audioSource;
[SerializeField] private MusicData[] musicDatas;
public bool IsGamemusicOn
{
get;
private set;
}
private Dictionary<MusicType, MusicData> musicDataDict = new Dictionary<MusicType, MusicData>();
public void Initialize()
{
InterfaceManager.Instance?.RegisterInterface<MusicManager>(this);
}
public void InitializeData()
{
audioSource.priority = 0;
for (int idx = 0; idx < musicDatas.Length; idx++)
{
if (musicDataDict.ContainsKey(musicDatas[idx].musicType))
musicDataDict[musicDatas[idx].musicType] = musicDatas[idx];
else
musicDataDict.Add(musicDatas[idx].musicType, musicDatas[idx]);
}
}
public void SetGamemusic(bool state)
{
IsGamemusicOn = state;
}
public void PlayMusicClip(MusicType musicType)
{
if (!enabled) return;
MusicData musicData = musicDataDict[musicType];
audioSource.priority = musicData.priority;
audioSource.clip = musicData.musicClip;
audioSource.Play();
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 6f598c418041d4a9e89aa7a25efc1185
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -31,6 +31,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
[SerializeField] private PlayerBaseHandler playerBaseHandler;
private PlayerType currentPlayerTypeTurn;
public PlayerType CurrentPlayerTypeTurn => currentPlayerTypeTurn;
private int currentPlayerTurnIndex = 0;
private List<PlayerType> allPlayerTypes = new List<PlayerType>();
@ -43,6 +44,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
private Dictionary<PlayerType, Dictionary<int, BotMove>> botRuntimeMovementData = new Dictionary<PlayerType, Dictionary<int, BotMove>>();
private TilesManager tilesManager;
private UIManager uIManager;
private GameManager gameManager;
private int diceRolledValue;
@ -75,6 +77,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
public void InitializeData()
{
tilesManager = InterfaceManager.Instance.GetInterfaceInstance<TilesManager>();
uIManager = InterfaceManager.Instance.GetInterfaceInstance<UIManager>();
gameManager = InterfaceManager.Instance.GetInterfaceInstance<GameManager>();
}
@ -729,6 +732,8 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
currentPlayerTypeTurn = allPlayerTypes[currentPlayerTurnIndex];
}
uIManager.UpdatePlayerTurnText(currentPlayerTypeTurn);
diceSixRollCounter = 0;
diceText.text = $"{0}";

View File

@ -28,17 +28,26 @@ public class UIManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
{
screenManager = screenManager == null ? InterfaceManager.Instance.GetInterfaceInstance<ScreenManager>() : screenManager;
screenManager.HideAllScreens();
screenManager.ShowScreen(ScreenType.MainMenuScreen);
screenManager.ShowScreen(ScreenType.MenuScreen);
}
public void OnInGameScreen()
{
screenManager.HideAllScreens();
screenManager.ShowScreen(ScreenType.GameScreen);
screenManager.ShowScreen(ScreenType.InGameHUDScreen);
}
public void UpdatePlayerTurnText(PlayerType type)
{
screenManager.GetScreen<GameHUDS>(ScreenType.InGameHUDScreen).UpdatePlayerTurnText(type);
}
public void OnGameOver()
{
screenManager.HideAllScreens();
screenManager.ShowScreen(ScreenType.GameOverScreen);
popupManager.GetPopup<GameOverPopup>(PopupType.GameOverPopup).InitData(gameplayManager.PlayerDatas);
popupManager.ShowPopup(PopupType.GameOverPopup);
}

View File

@ -7,10 +7,13 @@ using UnityEngine;
public enum ScreenType
{
MainMenuScreen,
GameScreen,
GameOverScreen,
LoadingScreen,
LevelsScreen,
InGameHUDScreen,
MenuScreen,
MenuScreen
}
public class ScreenBase : UIBase, IUIBase

View File

@ -36,7 +36,6 @@ public class GameOverPopup : PopupBase
private void HidePopup()
{
popupManager = popupManager == null ? InterfaceManager.Instance.GetInterfaceInstance<PopupManager>() : popupManager;
popupManager.HidePopup(popupType);
}
@ -58,7 +57,7 @@ public class GameOverPopup : PopupBase
continue;
}
texts[i].text = $"{(i+1)}. {playerDatas[i].playerName}";
texts[i].text = $"{(i + 1)}. {playerDatas[i].playerName}";
}
}
}

View File

@ -105,9 +105,11 @@ public class PvAIModePopup : PopupBase
Debug.Log($"Player 1: {playerName}");
popupManager.HidePopup(popupType);
screenManager = screenManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<ScreenManager>() : screenManager;
screenManager.HideScreen(ScreenType.MainMenuScreen);
gameModeHandler = gameModeHandler == null ? InterfaceManager.Instance.GetInterfaceInstance<GameModeHandler>() : gameModeHandler;
gameModeHandler.InitBotModeData(new PlayerData{ playerType = playerType, playerName = playerName }, selectedPlayerCount - 1);
gameModeHandler.InitBotModeData(new PlayerData { playerType = playerType, playerName = playerName }, selectedPlayerCount - 1);
gameManager = gameManager == null ? InterfaceManager.Instance.GetInterfaceInstance<GameManager>() : gameManager;
gameManager.OnGameStateChanged(GameState.InGame);

View File

@ -43,4 +43,27 @@ public class GameHUDS : ScreenBase
uiManager = uiManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<UIManager>() : uiManager;
uiManager.OnDiceViewInteracted();
}
public void UpdatePlayerTurnText(PlayerType playerType)
{
Debug.Log($"GameHUDS: UpdatePlayerTurnText: {playerType}");
switch (playerType)
{
case PlayerType.Player1:
playerTurnText.text = "Turn : Red";
break;
case PlayerType.Player2:
playerTurnText.text = "Turn : Blue";
break;
case PlayerType.Player3:
playerTurnText.text = "Turn : Grey";
break;
case PlayerType.Player4:
playerTurnText.text = "Turn : Green";
break;
default:
playerTurnText.text = "Turn";
break;
}
}
}

View File

@ -0,0 +1,8 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class GameOverScreen : ScreenBase
{
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 14661c82e227e4988a4ad90d300c6e40
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class GameScreen : ScreenBase
{
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c92cd673ccb28491c89a3d28d8707e79
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class MainMenuScreen : ScreenBase
{
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 81101c7d4c55a4f1e982f266e7298763
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: