Skip to content

Commit b58408c

Browse files
committed
hot fixes - Questline integration
1 parent c5dbd4c commit b58408c

File tree

17 files changed

+392
-167
lines changed

17 files changed

+392
-167
lines changed

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

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ MonoBehaviour:
123123
_popupPanel: {fileID: 2221699335589323001}
124124
_dialogueController: {fileID: 5434846252492230143}
125125
_inventoryPanel: {fileID: 3875863410152603130}
126-
_interactionPanel: {fileID: 0}
126+
_interactionPanel: {fileID: 2999915212724989254}
127127
_pauseScreen: {fileID: 5235689906329165859}
128128
_settingScreen: {fileID: 5966779880233791231}
129129
_gameState: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
@@ -132,7 +132,7 @@ MonoBehaviour:
132132
_onSceneReady: {fileID: 11400000, guid: b729e40fc41dd8b4ea7aaf5c857f7186, type: 2}
133133
_openUIDialogueEvent: {fileID: 11400000, guid: d987db4881d794f2da0013a89588d890,
134134
type: 2}
135-
_closeUIDialogueEvent: {fileID: 11400000, guid: 53a7f1f01ef364704b1d45d01f2421ae,
135+
_closeUIDialogueEvent: {fileID: 11400000, guid: 42c4c250df06bf84b97d11a23c36d47c,
136136
type: 2}
137137
_openInventoryScreenForCookingEvent: {fileID: 11400000, guid: 146c579dca5c2f248a607ef66a36d765,
138138
type: 2}
@@ -141,6 +141,7 @@ MonoBehaviour:
141141
_loadMenuEvent: {fileID: 11400000, guid: 33cec85652903d245b99985f9cec9841, type: 2}
142142
_onInteractionEndedEvent: {fileID: 11400000, guid: c499d87f35465124f8fb2751b150430d,
143143
type: 2}
144+
_mainProtagonist: {fileID: 11400000, guid: c7902af5c8e25244f94914ce51e7ea8a, type: 2}
144145
--- !u!114 &5434846252280455341
145146
MonoBehaviour:
146147
m_ObjectHideFlags: 0
@@ -164,6 +165,31 @@ PrefabInstance:
164165
m_Modification:
165166
m_TransformParent: {fileID: 5434846252280455342}
166167
m_Modifications:
168+
- target: {fileID: 5405141848621952428, guid: 1d09c349511c34e2d8b16f139aadb731,
169+
type: 3}
170+
propertyPath: m_AnchorMax.y
171+
value: 1
172+
objectReference: {fileID: 0}
173+
- target: {fileID: 5405141848621952428, guid: 1d09c349511c34e2d8b16f139aadb731,
174+
type: 3}
175+
propertyPath: m_AnchorMin.y
176+
value: 1
177+
objectReference: {fileID: 0}
178+
- target: {fileID: 5405141848621952428, guid: 1d09c349511c34e2d8b16f139aadb731,
179+
type: 3}
180+
propertyPath: m_SizeDelta.y
181+
value: 83.05115
182+
objectReference: {fileID: 0}
183+
- target: {fileID: 5405141848621952428, guid: 1d09c349511c34e2d8b16f139aadb731,
184+
type: 3}
185+
propertyPath: m_AnchoredPosition.x
186+
value: 653.8782
187+
objectReference: {fileID: 0}
188+
- target: {fileID: 5405141848621952428, guid: 1d09c349511c34e2d8b16f139aadb731,
189+
type: 3}
190+
propertyPath: m_AnchoredPosition.y
191+
value: -93.05115
192+
objectReference: {fileID: 0}
167193
- target: {fileID: 6822594373627009028, guid: 1d09c349511c34e2d8b16f139aadb731,
168194
type: 3}
169195
propertyPath: m_Pivot.x
@@ -274,6 +300,11 @@ PrefabInstance:
274300
propertyPath: m_Name
275301
value: InGameScreen
276302
objectReference: {fileID: 0}
303+
- target: {fileID: 8320703179963651321, guid: 1d09c349511c34e2d8b16f139aadb731,
304+
type: 3}
305+
propertyPath: m_IsActive
306+
value: 0
307+
objectReference: {fileID: 0}
277308
m_RemovedComponents: []
278309
m_SourcePrefab: {fileID: 100100000, guid: 1d09c349511c34e2d8b16f139aadb731, type: 3}
279310
--- !u!224 &5434846252551575277 stripped
@@ -282,6 +313,18 @@ RectTransform:
282313
type: 3}
283314
m_PrefabInstance: {fileID: 1568038478660161257}
284315
m_PrefabAsset: {fileID: 0}
316+
--- !u!114 &2999915212724989254 stripped
317+
MonoBehaviour:
318+
m_CorrespondingSourceObject: {fileID: 4351352784699630511, guid: 1d09c349511c34e2d8b16f139aadb731,
319+
type: 3}
320+
m_PrefabInstance: {fileID: 1568038478660161257}
321+
m_PrefabAsset: {fileID: 0}
322+
m_GameObject: {fileID: 0}
323+
m_Enabled: 1
324+
m_EditorHideFlags: 0
325+
m_Script: {fileID: 11500000, guid: 8f5450ac502f84bd89a993767b4d01e0, type: 3}
326+
m_Name:
327+
m_EditorClassIdentifier:
285328
--- !u!1001 &3875863411324803208
286329
PrefabInstance:
287330
m_ObjectHideFlags: 0
@@ -1094,8 +1137,7 @@ PrefabInstance:
10941137
propertyPath: m_IsActive
10951138
value: 0
10961139
objectReference: {fileID: 0}
1097-
m_RemovedComponents:
1098-
- {fileID: 2340965687570063786, guid: 42ed5ae1f90714c4488cfabda2298591, type: 3}
1140+
m_RemovedComponents: []
10991141
m_SourcePrefab: {fileID: 100100000, guid: 42ed5ae1f90714c4488cfabda2298591, type: 3}
11001142
--- !u!224 &5434846252994748354 stripped
11011143
RectTransform:

0 commit comments

Comments
 (0)