Skip to content

Commit 60a1543

Browse files
uChemauChema
committed
Small fixes in Game State System
1 parent 5c2bad8 commit 60a1543

File tree

56 files changed

+563
-2077
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+563
-2077
lines changed

‎UOP1_Project/Assets/Prefabs/Characters/NPCs_BasePrefabs/Townsfolk_F.prefab

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ MonoBehaviour:
115115
_actor: {fileID: 11400000, guid: b8d80efffb7881e4ebeb39806d2c6d18, type: 2}
116116
_defaultDialogue: {fileID: 11400000, guid: 2fd04d8b4cba82e42809169526c6cee1, type: 2}
117117
_questData: {fileID: 11400000, guid: dacb138678b7c2344b59c68de5dc18db, type: 2}
118+
_gameStateManager: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
118119
_interactionEvent: {fileID: 11400000, guid: 5f20ccd3e97527a44a6bf34644f85011, type: 2}
119120
_winDialogueEvent: {fileID: 11400000, guid: dc2da1754c28ab9499cb6c7d72465e69, type: 2}
120121
_loseDialogueEvent: {fileID: 11400000, guid: fcc99784052e5cc469b8c22c0674b051, type: 2}

‎UOP1_Project/Assets/Prefabs/Characters/NPCs_BasePrefabs/Townsfolk_M.prefab

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ MonoBehaviour:
8787
_actor: {fileID: 11400000, guid: b8d80efffb7881e4ebeb39806d2c6d18, type: 2}
8888
_defaultDialogue: {fileID: 11400000, guid: 2fd04d8b4cba82e42809169526c6cee1, type: 2}
8989
_questData: {fileID: 11400000, guid: dacb138678b7c2344b59c68de5dc18db, type: 2}
90+
_gameStateManager: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
9091
_interactionEvent: {fileID: 11400000, guid: 5f20ccd3e97527a44a6bf34644f85011, type: 2}
9192
_winDialogueEvent: {fileID: 11400000, guid: dc2da1754c28ab9499cb6c7d72465e69, type: 2}
9293
_loseDialogueEvent: {fileID: 11400000, guid: fcc99784052e5cc469b8c22c0674b051, type: 2}

‎UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare.prefab

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ MonoBehaviour:
150150
_actor: {fileID: 11400000, guid: 027d026cf519df04eb8b7bf251472e13, type: 2}
151151
_defaultDialogue: {fileID: 11400000, guid: f7ead55387bac6d4a9ba9bf10c5c3ee5, type: 2}
152152
_questData: {fileID: 11400000, guid: dacb138678b7c2344b59c68de5dc18db, type: 2}
153+
_gameStateManager: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
153154
_interactionEvent: {fileID: 11400000, guid: 5f20ccd3e97527a44a6bf34644f85011, type: 2}
154155
_winDialogueEvent: {fileID: 11400000, guid: dc2da1754c28ab9499cb6c7d72465e69, type: 2}
155156
_loseDialogueEvent: {fileID: 11400000, guid: fcc99784052e5cc469b8c22c0674b051, type: 2}
@@ -2476,37 +2477,37 @@ PrefabInstance:
24762477
- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
24772478
type: 3}
24782479
propertyPath: m_LocalPosition.x
2479-
value: 2.7000084
2480+
value: 0.0000009536743
24802481
objectReference: {fileID: 0}
24812482
- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
24822483
type: 3}
24832484
propertyPath: m_LocalPosition.y
2484-
value: 1.4000001
2485+
value: 0
24852486
objectReference: {fileID: 0}
24862487
- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
24872488
type: 3}
24882489
propertyPath: m_LocalPosition.z
2489-
value: 0.5999985
2490+
value: -10
24902491
objectReference: {fileID: 0}
24912492
- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
24922493
type: 3}
24932494
propertyPath: m_LocalRotation.w
2494-
value: -0.71813005
2495+
value: 0.9989147
24952496
objectReference: {fileID: 0}
24962497
- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
24972498
type: 3}
24982499
propertyPath: m_LocalRotation.x
2499-
value: -0.052869886
2500+
value: -0.04657678
25002501
objectReference: {fileID: 0}
25012502
- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
25022503
type: 3}
25032504
propertyPath: m_LocalRotation.y
2504-
value: 0.6920248
2505+
value: -0
25052506
objectReference: {fileID: 0}
25062507
- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
25072508
type: 3}
25082509
propertyPath: m_LocalRotation.z
2509-
value: -0.05094798
2510+
value: -0
25102511
objectReference: {fileID: 0}
25112512
- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
25122513
type: 3}
@@ -2546,7 +2547,7 @@ PrefabInstance:
25462547
- target: {fileID: 5170601539462982588, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
25472548
type: 3}
25482549
propertyPath: m_Lens.m_SensorSize.x
2549-
value: 1.7781904
2550+
value: 1.8098959
25502551
objectReference: {fileID: 0}
25512552
m_RemovedComponents: []
25522553
m_SourcePrefab: {fileID: 100100000, guid: 2f2b34bb9de172f478cdd8e33a4589a9, type: 3}

‎UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/ChefComb.prefab

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ MonoBehaviour:
341341
_actor: {fileID: 11400000, guid: 2f14ee79b2fa2574480372fff57ec101, type: 2}
342342
_defaultDialogue: {fileID: 11400000, guid: de0c5f70bf8e19743a163583c1b560f1, type: 2}
343343
_questData: {fileID: 11400000, guid: dacb138678b7c2344b59c68de5dc18db, type: 2}
344+
_gameStateManager: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
344345
_interactionEvent: {fileID: 11400000, guid: 5f20ccd3e97527a44a6bf34644f85011, type: 2}
345346
_winDialogueEvent: {fileID: 11400000, guid: dc2da1754c28ab9499cb6c7d72465e69, type: 2}
346347
_loseDialogueEvent: {fileID: 11400000, guid: fcc99784052e5cc469b8c22c0674b051, type: 2}
@@ -611,7 +612,7 @@ PrefabInstance:
611612
- target: {fileID: 919132149155446097, guid: 499877971136c0e42ba83dae6746f47d,
612613
type: 3}
613614
propertyPath: m_Name
614-
value: FryKing
615+
value: ChefComb
615616
objectReference: {fileID: 0}
616617
- target: {fileID: 919132149155446097, guid: 499877971136c0e42ba83dae6746f47d,
617618
type: 3}

‎UOP1_Project/Assets/Prefabs/UI/GameplayScene/Canvas-Gameplay.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ MonoBehaviour:
126126
_interactionPanel: {fileID: 2999915212724989254}
127127
_pauseScreen: {fileID: 5235689906329165859}
128128
_settingScreen: {fileID: 5966779880233791231}
129-
_gameState: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
129+
_gameStateManager: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
130130
_mainMenu: {fileID: 11400000, guid: 431ff81b74b48fb4d9301fb76ca633dd, type: 2}
131131
_inputReader: {fileID: 11400000, guid: 945ec0365077176418488737deed54be, type: 2}
132132
_onSceneReady: {fileID: 11400000, guid: b729e40fc41dd8b4ea7aaf5c857f7186, type: 2}

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Mesh:
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
9-
m_Name: pb_Mesh-50002
9+
m_Name: 02a28a9c355f4fac879be8ab591f1a6a
1010
serializedVersion: 10
1111
m_SubMeshes:
1212
- serializedVersion: 2

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/0f35a51a6d884c8ab30219b5a3b05de7.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Mesh:
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
9-
m_Name: pb_Mesh-50074
9+
m_Name: 0f35a51a6d884c8ab30219b5a3b05de7
1010
serializedVersion: 10
1111
m_SubMeshes:
1212
- serializedVersion: 2

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/108b5a6e887748a1875141cf7eefbf8e.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Mesh:
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
9-
m_Name: pb_Mesh-51572
9+
m_Name: 108b5a6e887748a1875141cf7eefbf8e
1010
serializedVersion: 10
1111
m_SubMeshes:
1212
- serializedVersion: 2

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/177f1a363471462daaaa7e27712e2b77.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Mesh:
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
9-
m_Name: pb_Mesh-51122
9+
m_Name: 177f1a363471462daaaa7e27712e2b77
1010
serializedVersion: 10
1111
m_SubMeshes:
1212
- serializedVersion: 2

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/17f9a240deb94feb8a71fae200bf7ff1.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Mesh:
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
9-
m_Name: pb_Mesh-51648
9+
m_Name: 17f9a240deb94feb8a71fae200bf7ff1
1010
serializedVersion: 10
1111
m_SubMeshes:
1212
- serializedVersion: 2

0 commit comments

Comments
 (0)