Skip to content
Snippets Groups Projects
Commit 0d43598c authored by Putinabillaa's avatar Putinabillaa
Browse files

fix: attach shop table to main scene controller

parent 099e77d3
Branches
Tags
No related merge requests found
...@@ -38,7 +38,7 @@ RenderSettings: ...@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_IndirectSpecularColor: {r: 0.18028326, g: 0.22571333, b: 0.30692202, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
...@@ -663,9 +663,10 @@ MonoBehaviour: ...@@ -663,9 +663,10 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
playableDirector: {fileID: 1246334938} playableDirector: {fileID: 1246334938}
markCount: 17 markCount: 0
framePerMark: 5 framePerMark: 5
allowContinue: 1 allowContinue: 1
isPlaying: 0
unityChan_1: {fileID: 333902892} unityChan_1: {fileID: 333902892}
unityChan_2: {fileID: 1588135801} unityChan_2: {fileID: 1588135801}
unityChan_3: {fileID: 1026839485} unityChan_3: {fileID: 1026839485}
...@@ -4773,9 +4774,11 @@ MonoBehaviour: ...@@ -4773,9 +4774,11 @@ MonoBehaviour:
playerHealth: 0 playerHealth: 0
lastQuestIndex: 0 lastQuestIndex: 0
difficulty: 0 difficulty: 0
spawnedPets:
lastQCompleted: 0 lastQCompleted: 0
player: {fileID: 1734600098} player: {fileID: 1734600098}
shop: {fileID: 1982473862} shop: {fileID: 1982473862}
shopTabel: {fileID: 1982473862}
managers: {fileID: 1692862993} managers: {fileID: 1692862993}
saveGameManager: {fileID: 640774429} saveGameManager: {fileID: 640774429}
gamePlayUI: {fileID: 2036252845} gamePlayUI: {fileID: 2036252845}
...@@ -6778,6 +6781,7 @@ MonoBehaviour: ...@@ -6778,6 +6781,7 @@ MonoBehaviour:
playerHealth: 0 playerHealth: 0
lastQuestIndex: 0 lastQuestIndex: 0
difficulty: 0 difficulty: 0
spawnedPets:
safeHousePrefab: {fileID: 400716903824990860, guid: 00d6c6705cb31ab47bab79a3f1bf9aec, type: 3} safeHousePrefab: {fileID: 400716903824990860, guid: 00d6c6705cb31ab47bab79a3f1bf9aec, type: 3}
--- !u!4 &640774431 --- !u!4 &640774431
Transform: Transform:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment