diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 56f1fc18f..173bae287 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -5414,9 +5414,11 @@ MonoBehaviour: _panel: {fileID: 1620218770} _contents: {fileID: 757252201} _cardLocalScale_2: {x: 0.9, y: 0.9, z: 1} - _openSfxName: OpenRareRewardBox allOpenCardButton: {fileID: 1118217338} closeButton: {fileID: 2036761463} + _openSfxName: OpenRareRewardBox + _cardOpenSfxName: RareCardOpen + _cardOpenAllSfxName: SelectCard --- !u!114 &392193688 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7890,6 +7892,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2008525357997177803, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2048834764853359748, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -7910,9 +7916,13 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2048834764853359748, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 308.145 + objectReference: {fileID: 0} - target: {fileID: 2048834764853359748, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y - value: -470 + value: -550 objectReference: {fileID: 0} - target: {fileID: 2274939110991519697, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y @@ -7930,30 +7940,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2278777911101691336, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2278777911101691336, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2317189027346734039, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2317189027346734039, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2317189027346734039, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2317189027346734039, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2710979095233667429, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -7963,38 +7949,6 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 2710979095233667429, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2710979095233667429, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2710979095233667429, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2742217785717181297, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2742217785717181297, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3246875322959460806, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3246875322959460806, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3246875322959460806, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3246875322959460806, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} @@ -8018,65 +7972,61 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3452187879713479394, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3452187879713479394, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3452187879713479394, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 4068685103238789942, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4068685103238789942, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4068685103238789942, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_SizeDelta.x + value: 172.95 + objectReference: {fileID: 0} + - target: {fileID: 4068685103238789942, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4068685103238789942, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4068685103238789942, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 263.525 + objectReference: {fileID: 0} + - target: {fileID: 4068685103238789942, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -220 + objectReference: {fileID: 0} - target: {fileID: 4974788024565528179, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_Name value: TycoonGameMenuCanvas objectReference: {fileID: 0} - - target: {fileID: 5396671237980083295, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5396671237980083295, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5396671237980083295, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5396671237980083295, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5398594127069257378, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5398594127069257378, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5398594127069257378, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5398594127069257378, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5636345400492407289, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5636345400492407289, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5636345400492407289, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5636345400492407289, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5931833488459453868, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + - target: {fileID: 5585061895982209044, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 5931833488459453868, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.x - value: 0 + - target: {fileID: 5585061895982209044, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5585061895982209044, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 objectReference: {fileID: 0} - target: {fileID: 5978419739735855029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y @@ -8098,6 +8048,10 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5978419739735855029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 260.38 + objectReference: {fileID: 0} - target: {fileID: 5978419739735855029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y value: -110 @@ -8112,7 +8066,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6023463152304223989, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_SizeDelta.x - value: 179.24 + value: 174.73 objectReference: {fileID: 0} - target: {fileID: 6023463152304223989, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.x @@ -8122,41 +8076,33 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6023463152304223989, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 262.635 + objectReference: {fileID: 0} - target: {fileID: 6023463152304223989, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y - value: -350 + value: -360 objectReference: {fileID: 0} - - target: {fileID: 6433972966224036356, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + - target: {fileID: 6929699258986793115, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 6433972966224036356, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6530743971297909519, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6530743971297909519, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6606380146890122337, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6606380146890122337, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + - target: {fileID: 6929699258986793115, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 6606380146890122337, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 + - target: {fileID: 6929699258986793115, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_SizeDelta.x + value: 81.9 objectReference: {fileID: 0} - - target: {fileID: 6606380146890122337, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + - target: {fileID: 6929699258986793115, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 309.05 + objectReference: {fileID: 0} + - target: {fileID: 6929699258986793115, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -720 objectReference: {fileID: 0} - target: {fileID: 7239166237725364986, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y @@ -8179,81 +8125,93 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 7239166237725364986, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.y - value: -230 - objectReference: {fileID: 0} - - target: {fileID: 7899277849006502468, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7899277849006502468, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7899277849006502468, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7899277849006502468, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7899277849006502468, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7899277849006502468, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 308.145 objectReference: {fileID: 0} - - target: {fileID: 7899277849006502468, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + - target: {fileID: 7239166237725364986, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -330 objectReference: {fileID: 0} - - target: {fileID: 8010202116620661609, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + - target: {fileID: 7568419486990378733, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 8010202116620661609, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + - target: {fileID: 7568419486990378733, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7568419486990378733, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_SizeDelta.x + value: 81 + objectReference: {fileID: 0} + - target: {fileID: 7568419486990378733, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8241117163499134794, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8241117163499134794, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8241117163499134794, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8241117163499134794, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8241117163499134794, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8313491543228237080, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8313491543228237080, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8313491543228237080, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + - target: {fileID: 7568419486990378733, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8313491543228237080, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + - target: {fileID: 7568419486990378733, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 309.5 + objectReference: {fileID: 0} + - target: {fileID: 7568419486990378733, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y + value: -440 + objectReference: {fileID: 0} + - target: {fileID: 8241117163499134794, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8241117163499134794, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8241117163499134794, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 8278279587276051398, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8278279587276051398, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8278279587276051398, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_SizeDelta.x + value: 172.95 + objectReference: {fileID: 0} + - target: {fileID: 8278279587276051398, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 8278279587276051398, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8278279587276051398, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 263.525 + objectReference: {fileID: 0} + - target: {fileID: 8278279587276051398, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -110 + objectReference: {fileID: 0} + - target: {fileID: 8446992353823355261, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8446992353823355261, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8446992353823355261, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 + objectReference: {fileID: 0} - target: {fileID: 8537942234147632975, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_Pivot.x value: 0 @@ -8334,78 +8292,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8666470676510673224, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8666470676510673224, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8666470676510673224, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8666470676510673224, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8912241445425216240, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8912241445425216240, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8912241445425216240, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8912241445425216240, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8912241445425216240, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9169105514021984029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 9169105514021984029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + - target: {fileID: 8912241445425216240, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 9169105514021984029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_SizeDelta.x - value: 69.93 - objectReference: {fileID: 0} - - target: {fileID: 9169105514021984029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9169105514021984029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9169105514021984029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_AnchoredPosition.x - value: 139.965 - objectReference: {fileID: 0} - - target: {fileID: 9169105514021984029, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + - target: {fileID: 8912241445425216240, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} propertyPath: m_AnchoredPosition.y - value: -35 + value: -30 objectReference: {fileID: 0} - - target: {fileID: 9207469817372238632, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2} - - target: {fileID: 9207469817372238632, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -19164,6 +19062,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3972996534215875141, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 4044245481012058393, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -25256,7 +25158,6 @@ MonoBehaviour: k__BackingField: {fileID: 1665075876} k__BackingField: {fileID: 1665075875} k__BackingField: {fileID: 1665075877} - _dailyBgm: TycoonBgm01 k__BackingField: _maxLevel: 0 _currentLevel: 0 @@ -25334,6 +25235,7 @@ MonoBehaviour: k__BackingField: {fileID: 1035249716} k__BackingField: {fileID: 1979728764} k__BackingField: {fileID: 1853687859} + _createMoldySfxName: CreateMoldy --- !u!114 &1665075874 MonoBehaviour: m_ObjectHideFlags: 0 @@ -25410,6 +25312,7 @@ MonoBehaviour: k__BackingField: {fileID: 11400000, guid: ba5e48d235a2e144bb8d9a8f9a0573b0, type: 2} k__BackingField: {fileID: 11400000, guid: 2872d9c3372bbf744ba3a4c7a9506335, type: 2} _selectCardSfxName: SelectCard + _purifySfxName: Purify --- !u!1 &1669214244 GameObject: m_ObjectHideFlags: 0 @@ -26747,6 +26650,7 @@ MonoBehaviour: _openUiAnimator: {fileID: 1886163538} _closedUiImage: {fileID: 1790674787} _closedUiAnimator: {fileID: 1790674790} + _dailyBgm: TycoonBgm01 _gameStartSfxName: TycoonGameStart --- !u!222 &1733600345 CanvasRenderer: diff --git a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs index 959770f4a..b7a9c469e 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs @@ -485,6 +485,12 @@ namespace BlueWater.Npcs.Customers var gold = (int)(CurrentLevelData.Gold * TycoonManager.Instance.TycoonStatus.GoldMultiplier); _moneyCounter.AddCurrentGold(gold); + + if (!ES3.Load(SaveData.TutorialC, false)) + { + EventManager.InvokeTutorial(TutorialName.TutorialC); + ES3.Save(SaveData.TutorialC, true); + } } public void Vomit() @@ -520,6 +526,18 @@ namespace BlueWater.Npcs.Customers RegisterPlayerInteraction(); EventManager.InvokeOrderedCocktail(this); + + if (!ES3.Load(SaveData.TutorialB, false)) + { + EventManager.InvokeTutorial(TutorialName.TutorialB); + ES3.Save(SaveData.TutorialB, true); + } + + if (!ES3.Load(SaveData.TutorialJ, false) && OrderedCocktailData.Idx == "Cocktail006") + { + EventManager.InvokeTutorial(TutorialName.TutorialJ); + ES3.Save(SaveData.TutorialJ, true); + } } public void MovePosition(Vector3 targetPosition) diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs index 150b3f921..10b9b8f08 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs @@ -78,9 +78,11 @@ namespace BlueWater.Players.Tycoons public void OnDevelopKey01(InputAction.CallbackContext context) { +#if UNITY_EDITOR EventManager.InvokeCreateServerCrew(); EventManager.InvokeCreateCleanerCrew(); EventManager.InvokeCreateBartenderCrew(); +#endif } #endregion diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs index dc53e8ffe..aa581b944 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs @@ -38,14 +38,14 @@ namespace BlueWater.Players.Tycoons _isMoving = value; - if (_isMoving) - { - AudioManager.Instance.PlaySfx(_walkingSfxName, true); - } - else - { - AudioManager.Instance.StopSfx(_walkingSfxName); - } + // if (_isMoving) + // { + // AudioManager.Instance.PlaySfx(_walkingSfxName, true); + // } + // else + // { + // AudioManager.Instance.StopSfx(_walkingSfxName); + // } } } @@ -67,6 +67,9 @@ namespace BlueWater.Players.Tycoons [SerializeField] private string _walkingSfxName = "TycoonPlayerWalking"; + [SerializeField] + private string _dashSfxName = "TycoonPlayerDashing"; + public bool IsDashEnabled { get; private set; } = true; public bool IsDashing { get; private set; } @@ -242,6 +245,7 @@ namespace BlueWater.Players.Tycoons { _dashParticle.Play(); } + AudioManager.Instance.PlaySfx(_dashSfxName); var dashDirection = _inputDirection; if (dashDirection == Vector3.zero) diff --git a/Assets/02.Scripts/EventManager.cs b/Assets/02.Scripts/EventManager.cs index a89f963ee..e582732ac 100644 --- a/Assets/02.Scripts/EventManager.cs +++ b/Assets/02.Scripts/EventManager.cs @@ -321,6 +321,13 @@ namespace BlueWater OnCreateMold?.Invoke(); } + // 펌프 활성화 이벤트 + public static Action OnActivatePump; + public static void InvokeActivatePump() + { + OnActivatePump?.Invoke(); + } + // 계산대 골드 자동 회수 이벤트 public static Action OnGainAutoMoneyCounter; public static void InvokeGainAutoMoneyCounter(int gainWaitTime) @@ -355,6 +362,13 @@ namespace BlueWater { OnOpenedRareRewardBox?.Invoke(); } + + // 튜토리얼 + public static Action OnTutorial; + public static void InvokeTutorial(string tutorialName) + { + OnTutorial?.Invoke(tutorialName); + } #endregion } diff --git a/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs b/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs index 0d4566463..770ac4b4b 100644 --- a/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs @@ -6,6 +6,11 @@ using UnityEngine; namespace BlueWater.Tycoons { + public static class StatueBarrelSpineAnimation + { + public const string Idle = "Idle"; + } + public static class LiquidBarrelSpineAnimation { public const string IdleLevel0 = "Empty"; @@ -68,7 +73,11 @@ namespace BlueWater.Tycoons _liquidImage.sprite = IsActivated ? LiquidData.Sprite : DataManager.Instance.SpriteDataSo.BarrelLock; - if (!IsStatue) + if (IsStatue) + { + SpineController.PlayAnimation(StatueBarrelSpineAnimation.Idle, false); + } + else { SpineController.PlayAnimation(LiquidBarrelSpineAnimation.IdleLevel0, false); } @@ -167,30 +176,16 @@ namespace BlueWater.Tycoons InteractionMessage = $"{Utils.GetLocalizedString(LiquidData.Idx)} {Utils.GetLocalizedString("Pour")}"; } - if (IsStatue) - { - base.ShowInteractionUi(); - } - else - { - SpineController.EnableCustomMaterial(); - EventManager.InvokeShowInteractionUi(InteractionMessage); - IsShowing = true; - } + SpineController.EnableCustomMaterial(); + EventManager.InvokeShowInteractionUi(InteractionMessage); + IsShowing = true; } public override void HideInteractionUi() { - if (IsStatue) - { - base.HideInteractionUi(); - } - else - { - SpineController.DisableCustomMaterial(); - EventManager.InvokeHideInteractionUi(); - IsShowing = false; - } + SpineController.DisableCustomMaterial(); + EventManager.InvokeHideInteractionUi(); + IsShowing = false; } public override void Activate() diff --git a/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs b/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs index 202c33df6..72b473b78 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs @@ -1,4 +1,5 @@ using System; +using BlueWater.Audios; using UnityEngine; namespace BlueWater.Tycoons @@ -12,6 +13,9 @@ namespace BlueWater.Tycoons [SerializeField] private Sprite _heartSprite; + [SerializeField] + private string _cleaningSfxName = "CleaningFloor"; + private bool _isPlayerInteracting; private void Update() @@ -51,12 +55,14 @@ namespace BlueWater.Tycoons { GameManager.Instance.CurrentTycoonPlayer.IsCleaningFloor = true; _isPlayerInteracting = true; + AudioManager.Instance.PlaySfx(_cleaningSfxName); } public override void CancelInteraction() { GameManager.Instance.CurrentTycoonPlayer.IsCleaningFloor = false; _isPlayerInteracting = false; + AudioManager.Instance.StopSfx(_cleaningSfxName); } public override bool CanInteraction() diff --git a/Assets/02.Scripts/Prop/Tycoon/Pump.cs b/Assets/02.Scripts/Prop/Tycoon/Pump.cs index 66c9e2bee..7bc844919 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Pump.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Pump.cs @@ -9,6 +9,7 @@ namespace BlueWater.Tycoons public static class PumpSpineAnimation { public const string Idle = "Idle"; + public const string Stop = "IdleStop"; public const string Run = "Run"; } @@ -37,10 +38,13 @@ namespace BlueWater.Tycoons private string _playPumpSfxName = "PlayPump"; private bool _isPlayerInteracting; + private bool _isActivated; protected override void Awake() { base.Awake(); + + EventManager.OnActivatePump += Activate; _spineController = GetComponent(); } @@ -49,7 +53,7 @@ namespace BlueWater.Tycoons { base.Start(); - _spineController.PlayAnimation(PumpSpineAnimation.Idle, true); + _spineController.PlayAnimation(PumpSpineAnimation.Stop, false); } private void Update() @@ -83,6 +87,11 @@ namespace BlueWater.Tycoons } } + private void OnDestroy() + { + EventManager.OnActivatePump -= Activate; + } + public override void Interaction() { AudioManager.Instance.PlaySfx(_attackSfxName, true); @@ -103,7 +112,7 @@ namespace BlueWater.Tycoons public override bool CanInteraction() { - return !GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpAnything(); + return _isActivated && !GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpAnything(); } public override void ShowInteractionUi() @@ -119,5 +128,11 @@ namespace BlueWater.Tycoons EventManager.InvokeHideInteractionUi(); IsShowing = false; } + + public void Activate() + { + _isActivated = true; + _spineController.PlayAnimation(PumpSpineAnimation.Idle, true); + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs index e856f5ad1..465920f55 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs @@ -2,6 +2,7 @@ using BlueWater.Audios; using BlueWater.Interfaces; using BlueWater.Items; using BlueWater.Players; +using Sirenix.OdinInspector; using UnityEngine; namespace BlueWater.Tycoons @@ -34,9 +35,13 @@ namespace BlueWater.Tycoons [SerializeField] private bool _isChanged; + [Title("사운드")] [SerializeField] private string _discardSfxName = "DiscardCocktail"; + [SerializeField] + private string _changeRandomBoxSfxName = "ChangeRandomBox"; + private bool _isPlayerInteracting; private bool _canInteraction = true; @@ -121,6 +126,7 @@ namespace BlueWater.Tycoons { if (!_canRandomChange) return; + AudioManager.Instance.PlaySfx(_changeRandomBoxSfxName); _spineController.PlayAnimation(TrashCanSpineAnimation.ChangeRandomBox, false); _spineController.AddAnimation(TrashCanSpineAnimation.RandomBoxIdle, true); _isChanged = true; diff --git a/Assets/02.Scripts/SaveData.cs b/Assets/02.Scripts/SaveData.cs index f45bdb615..3e78e9c2a 100644 --- a/Assets/02.Scripts/SaveData.cs +++ b/Assets/02.Scripts/SaveData.cs @@ -12,5 +12,15 @@ namespace BlueWater public const string CompleteFirstGame = "CompleteFirstGame"; // 튜토리얼 데이터 + public const string TutorialA = "TutorialA"; + public const string TutorialB = "TutorialB"; + public const string TutorialC = "TutorialC"; + public const string TutorialD = "TutorialD"; + public const string TutorialE = "TutorialE"; + public const string TutorialF = "TutorialF"; + public const string TutorialG = "TutorialG"; + public const string TutorialH = "TutorialH"; + public const string TutorialI = "TutorialI"; + public const string TutorialJ = "TutorialJ"; } } diff --git a/Assets/02.Scripts/ScriptableObject/Audio/BgmData.asset b/Assets/02.Scripts/ScriptableObject/Audio/BgmData.asset index a778dd929..4ef7bccbb 100644 --- a/Assets/02.Scripts/ScriptableObject/Audio/BgmData.asset +++ b/Assets/02.Scripts/ScriptableObject/Audio/BgmData.asset @@ -36,4 +36,4 @@ MonoBehaviour: - k__BackingField: TycoonBgm02 k__BackingField: {fileID: 8300000, guid: 26776146cb587a74aa860cdac5318a39, type: 3} - k__BackingField: TycoonResult - k__BackingField: {fileID: 8300000, guid: 727c8fcf7bfe53744968a986ff7b43aa, type: 3} + k__BackingField: {fileID: 8300000, guid: e149ff3b8678af448a8e1f04cf55649c, type: 3} diff --git a/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset b/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset index 72941ee97..9033c8f26 100644 --- a/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset +++ b/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset @@ -82,7 +82,7 @@ MonoBehaviour: - k__BackingField: CleaningTable k__BackingField: {fileID: 8300000, guid: 717f06a127178564ab5ea8cdf9da3ef2, type: 3} - k__BackingField: OpenManualBook - k__BackingField: {fileID: 8300000, guid: a324e82da09f7f84cab40d74f755c9e8, type: 3} + k__BackingField: {fileID: 8300000, guid: 1b87c0475bbd52b429768eeffe0b6ff5, type: 3} - k__BackingField: CloseManualBook k__BackingField: {fileID: 8300000, guid: b1d132518b614a743ac3a571ac75718c, type: 3} - k__BackingField: SucceedServing @@ -116,10 +116,20 @@ MonoBehaviour: - k__BackingField: TycoonPlayerWalking k__BackingField: {fileID: 8300000, guid: 4b5f41d537a9a574b9520f50b39fb425, type: 3} - k__BackingField: SelectCard - k__BackingField: {fileID: 8300000, guid: 9f82d570d14d65b4a80fe00bae7bc0c0, type: 3} + k__BackingField: {fileID: 8300000, guid: 39e368c24fb04084ea3ba929f16a4e91, type: 3} - k__BackingField: CreateCrew - k__BackingField: {fileID: 8300000, guid: 557c74c78a72aac41ae6da3f8477169c, type: 3} + k__BackingField: {fileID: 8300000, guid: cbb6eb52c18da1c43bc2aa34def2df9c, type: 3} - k__BackingField: TycoonPlayerAttacked k__BackingField: {fileID: 8300000, guid: 416cb3dc1c8801f46a4a3b14d7665d8b, type: 3} - k__BackingField: RewardBoxInteractionFailed k__BackingField: {fileID: 8300000, guid: 5850aa1a011156841bed2ffc74d93bbd, type: 3} + - k__BackingField: TycoonPlayerDashing + k__BackingField: {fileID: 8300000, guid: 595646b0d77e94543bbf73c0236ae42f, type: 3} + - k__BackingField: ChangeRandomBox + k__BackingField: {fileID: 8300000, guid: 8fec2c602d8ae2b4ca2ab0f1c0f8a117, type: 3} + - k__BackingField: Purify + k__BackingField: {fileID: 8300000, guid: b554c7102f4142d46aad7dd333a2616b, type: 3} + - k__BackingField: CreateMoldy + k__BackingField: {fileID: 8300000, guid: a041f5ba1fec6304895b80091ebf431b, type: 3} + - k__BackingField: RareCardOpen + k__BackingField: {fileID: 8300000, guid: 28272de0f0479f94691b57e097565010, type: 3} diff --git a/Assets/02.Scripts/Tycoon/CrewController.cs b/Assets/02.Scripts/Tycoon/CrewController.cs index 6c596e1ee..ca2acb84b 100644 --- a/Assets/02.Scripts/Tycoon/CrewController.cs +++ b/Assets/02.Scripts/Tycoon/CrewController.cs @@ -70,6 +70,12 @@ namespace BlueWater.Tycoons Utils.RegisterList(Crews, newCrew); newCrew.Initialize(); EventManager.InvokeUpdateCrewUi(BartenderCrews.Count, ServerCrews.Count, CleanerCrews.Count); + + if (!ES3.Load(SaveData.TutorialF, false)) + { + EventManager.InvokeTutorial(TutorialName.TutorialF); + ES3.Save(SaveData.TutorialF, true); + } return newCrew; } @@ -81,6 +87,12 @@ namespace BlueWater.Tycoons Utils.RegisterList(Crews, newCrew); newCrew.Initialize(); EventManager.InvokeUpdateCrewUi(BartenderCrews.Count, ServerCrews.Count, CleanerCrews.Count); + + if (!ES3.Load(SaveData.TutorialD, false)) + { + EventManager.InvokeTutorial(TutorialName.TutorialD); + ES3.Save(SaveData.TutorialD, true); + } return newCrew; } @@ -97,6 +109,12 @@ namespace BlueWater.Tycoons newCrew.SetBartenderTable(spawnTransform.GetComponentInParent()); newCrew.Initialize(); EventManager.InvokeUpdateCrewUi(BartenderCrews.Count, ServerCrews.Count, CleanerCrews.Count); + + if (!ES3.Load(SaveData.TutorialE, false)) + { + EventManager.InvokeTutorial(TutorialName.TutorialE); + ES3.Save(SaveData.TutorialE, true); + } return newCrew; } diff --git a/Assets/02.Scripts/Tycoon/LiquidController.cs b/Assets/02.Scripts/Tycoon/LiquidController.cs index 6b24d06aa..aeafee57c 100644 --- a/Assets/02.Scripts/Tycoon/LiquidController.cs +++ b/Assets/02.Scripts/Tycoon/LiquidController.cs @@ -371,7 +371,7 @@ namespace BlueWater _elapsedTime = 0f; _isPouring = true; - AudioManager.Instance.PlaySfx(_pouringSfxName, loop: true); + AudioManager.Instance.PlaySfx(_pouringSfxName); // To Center 이동 코루틴이 활성화 중이지 않을 때 if (_movePanelToCenterInstance == null) diff --git a/Assets/02.Scripts/Tycoon/TycoonCardController.cs b/Assets/02.Scripts/Tycoon/TycoonCardController.cs index e1d6677b0..a9f9c6be9 100644 --- a/Assets/02.Scripts/Tycoon/TycoonCardController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonCardController.cs @@ -28,6 +28,9 @@ namespace BlueWater.Tycoons [Title("사운드")] [SerializeField] private string _selectCardSfxName = "SelectCard"; + + [SerializeField] + private string _purifySfxName = "Purify"; private TycoonManager _tycoonManager; private TycoonStatus _tycoonStatus; @@ -135,6 +138,7 @@ namespace BlueWater.Tycoons break; case "AllCustomerPurification": EventManager.InvokePurifiedCustomerAll(); + AudioManager.Instance.PlaySfx(_purifySfxName); break; case "GaugeTimeUp": _tycoonStatus.CustomerHurryTimeIncrease += 3; diff --git a/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs b/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs index 89d42c9dd..78d609236 100644 --- a/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using BlueWater.Audios; using BlueWater.Items; using Sirenix.OdinInspector; using UnityEngine; @@ -32,6 +33,9 @@ namespace BlueWater.Tycoons public GarnishBarrel GarnishBarrel2 { get; private set; } private List _barrels; + + [SerializeField] + private string _createMoldySfxName = "CreateMoldy"; private void Awake() { @@ -125,6 +129,8 @@ namespace BlueWater.Tycoons int randomIndex = Random.Range(0, moldableElements.Count); moldableElements[randomIndex].Mold(); + + AudioManager.Instance.PlaySfx(_createMoldySfxName); } } } diff --git a/Assets/02.Scripts/Tycoon/TycoonManager.cs b/Assets/02.Scripts/Tycoon/TycoonManager.cs index c3b0b3d70..0d7a31901 100644 --- a/Assets/02.Scripts/Tycoon/TycoonManager.cs +++ b/Assets/02.Scripts/Tycoon/TycoonManager.cs @@ -1,5 +1,3 @@ -using System; -using BlueWater.Audios; using UnityEngine; using Sirenix.OdinInspector; @@ -29,9 +27,6 @@ namespace BlueWater.Tycoons [field: SerializeField] public TycoonCardController TycoonCardController { get; private set; } - [SerializeField] - private string _dailyBgm; - [field: Title("타이쿤 플레이어 스탯")] [field: SerializeField] public TycoonStatus TycoonStatus { get; private set; } @@ -47,11 +42,6 @@ namespace BlueWater.Tycoons private void Start() { - if (!string.IsNullOrEmpty(_dailyBgm)) - { - AudioManager.Instance.PlayBgm(_dailyBgm); - } - TycoonStatus = new TycoonStatus(); TycoonStatus.Initialize(); } diff --git a/Assets/02.Scripts/Tycoon/TycoonStageController.cs b/Assets/02.Scripts/Tycoon/TycoonStageController.cs index 6563f8008..679940669 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStageController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStageController.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using BlueWater.Audios; using BlueWater.Items; using BlueWater.Utility; using Sirenix.OdinInspector; diff --git a/Assets/02.Scripts/Tycoon/TycoonStatus.cs b/Assets/02.Scripts/Tycoon/TycoonStatus.cs index 2ff4c1bda..023d1ca41 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStatus.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStatus.cs @@ -352,6 +352,7 @@ namespace BlueWater.Tycoons case "Upgrade1": tycoonManager.CustomerTableController.ShowCustomerTable(1); tycoonManager.TycoonIngredientController.LiquidBarrelB.Activate(); + EventManager.InvokeActivatePump(); break; case "Upgrade2": tycoonManager.CustomerTableController.ShowCustomerTable(2); diff --git a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs index 1c0a68c85..422ed1e07 100644 --- a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs +++ b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs @@ -81,6 +81,8 @@ namespace BlueWater.Titles _interactionEAction = _playerInputKeyManager.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.InteractionE); _openAction = _playerInputKeyManager.GetAction(InputActionMaps.Tycoon, TycoonActions.Options); _closeAction = _playerInputKeyManager.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel); + + EventManager.OnTutorial += ShowTutorialUiByName; if (_isTitleScene) { @@ -109,6 +111,8 @@ namespace BlueWater.Titles private void OnDestroy() { + EventManager.OnTutorial -= ShowTutorialUiByName; + if (_isTitleScene) { _startGameButton?.onClick.RemoveListener(() => SceneController.Instance?.LoadScene(SceneName.Tycoon)); @@ -273,14 +277,32 @@ namespace BlueWater.Titles Utils.StartUniqueCoroutine(this, ref _inkCoroutine, MoveInkBackground(1f)); } - public void HideTutorialUi() + public void HideTutorialUi(bool isMenu) { + if (!isMenu) + { + _panel.SetActive(false); + _playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.Tycoon); + VisualFeedbackManager.Instance.ResetTimeScale(); + } + _titleMenuUiPanel.SetActive(true); EventSystem.current.SetSelectedGameObject(_tutorialButton.gameObject); Utils.StartUniqueCoroutine(this, ref _inkCoroutine, MoveInkBackground(0.4f)); } + public void ShowTutorialUiByName(string tutorialName) + { + VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); + _playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.TycoonUi); + _titleMenuUiPanel.SetActive(false); + _tycoonTutorial.ShowUiByName(tutorialName); + _panel.SetActive(true); + + Utils.StartUniqueCoroutine(this, ref _inkCoroutine, MoveInkBackground(1f)); + } + private IEnumerator MoveInkBackground(float pos) { diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs index 2da27a983..b146fcfd6 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs @@ -23,15 +23,22 @@ namespace BlueWater.Uis private Vector3 _cardLocalScale_3 = new(0.8f, 0.8f, 1f); private Vector3 _cardLocalScale_4 = new(0.7f, 0.7f, 1f); private Vector3 _cardLocalScale_5 = new(0.65f, 0.65f, 1f); - - [SerializeField] - private string _openSfxName = "OpenRareRewardBox"; [SerializeField] private Button allOpenCardButton; [SerializeField] private Button closeButton; + [Title("사운드")] + [SerializeField] + private string _openSfxName = "OpenRareRewardBox"; + + [SerializeField] + private string _cardOpenSfxName = "RareCardOpen"; + + [SerializeField] + private string _cardOpenAllSfxName = "SelectCard"; + private List _tycoonCards = new(5); private int viewCardCount = 0; @@ -74,6 +81,7 @@ namespace BlueWater.Uis public override void Close() { + AudioManager.Instance.PlaySfx(_cardOpenAllSfxName, ignoreTimeScale: true); _panel.SetActive(false); PopupUiController.UnregisterPopup(this); PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon); @@ -154,6 +162,7 @@ namespace BlueWater.Uis private void OpenCard(TycoonCard tycoonCard) { + AudioManager.Instance.PlaySfx(_cardOpenSfxName, ignoreTimeScale: true); tycoonCard.Rotation_Start(); tycoonCard.SetSelectAction(null); viewCardCount--; @@ -168,6 +177,7 @@ namespace BlueWater.Uis [Button("카드 모두 열기")] public void AllOpenCard() { + AudioManager.Instance.PlaySfx(_cardOpenSfxName, ignoreTimeScale: true); viewCardCount = 0; //남은 카드가 열리는 연출만 추가하자 foreach (var element in _tycoonCards) diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs index 3d00ce4d6..9acbb8da4 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs @@ -196,6 +196,7 @@ namespace BlueWater.Uis private InputAction _pressAnyKeyAction; private float _playTime; + private bool _isSetData; private void Awake() { @@ -255,6 +256,7 @@ namespace BlueWater.Uis [Button("결과 연출 테스트")] public override void Open() { + AudioManager.Instance.StopSfx("TycoonGameOver"); AudioManager.Instance.PlayBgm(_bgmName); VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi); @@ -426,7 +428,8 @@ namespace BlueWater.Uis int percent = Mathf.RoundToInt(endGoldMultiplier * 100); char sign = percent >= 0 ? '+' : '-'; _minusPercentText.color = percent >= 0 ? Color.blue : Color.red; - _minusPercentText.text = $"{sign} {percent}%"; + _minusPercentText.text = $"{sign} {Mathf.Abs(percent)}%"; + _isSetData = true; } [Button("결과 즉시 테스트")] @@ -437,8 +440,11 @@ namespace BlueWater.Uis StopCoroutine(_showResultInstance); _showResultInstance = null; } - - SetResultData(); + + if (!_isSetData) + { + SetResultData(); + } SetActiveUi(true); } diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonStageUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonStageUi.cs index a2891596e..e80be5496 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonStageUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonStageUi.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using BlueWater.Audios; using DG.Tweening; using Sirenix.OdinInspector; @@ -27,6 +26,9 @@ namespace BlueWater.Uis [SerializeField] private Animator _closedUiAnimator; + [SerializeField] + private string _dailyBgm = "TycoonBgm01"; + [SerializeField] private string _gameStartSfxName = "TycoonGameStart"; @@ -104,6 +106,16 @@ namespace BlueWater.Uis _panel.SetActive(false); PlayerInputKeyManager.Instance.EnableCurrentPlayerInput(); PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon); + + if (!string.IsNullOrEmpty(_dailyBgm)) + { + AudioManager.Instance.PlayBgm(_dailyBgm); + } + + if (!ES3.Load(SaveData.TutorialA, false)) + { + Invoke(nameof(InvokeTutorialA), 1f); + } }); }); }); @@ -138,6 +150,12 @@ namespace BlueWater.Uis }); } + private void InvokeTutorialA() + { + EventManager.InvokeTutorial(TutorialName.TutorialA); + ES3.Save(SaveData.TutorialA, true); + } + #endregion } } diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonTutorial.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonTutorial.cs index f94d1ab31..dd692885b 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonTutorial.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonTutorial.cs @@ -7,6 +7,20 @@ using UnityEngine.UI; namespace BlueWater { + public static class TutorialName + { + public const string TutorialA = "TutorialA"; + public const string TutorialB = "TutorialB"; + public const string TutorialC = "TutorialC"; + public const string TutorialD = "TutorialD"; + public const string TutorialE = "TutorialE"; + public const string TutorialF = "TutorialF"; + public const string TutorialG = "TutorialG"; + public const string TutorialH = "TutorialH"; + public const string TutorialI = "TutorialI"; + public const string TutorialJ = "TutorialJ"; + } + public class TycoonTutorial : MonoBehaviour { [SerializeField, Required] @@ -60,7 +74,7 @@ namespace BlueWater private bool _isInMenu; private bool _isUpdatingToggle; - public Action CloseAction; + public Action CloseAction; private void Start() { @@ -149,41 +163,47 @@ namespace BlueWater _closeAction = null; } + public void SetCurrentTutorialLink(string tutorialName = null) + { + if (tutorialName == null) + { + _currentTutorialLink = _tutorialLinks[0]; + } + else + { + _currentTutorialLink = _tutorialLinks.Find(link => link.TutorialName == tutorialName); + } + _currentTutorialLink?.OnToggle(true); + _tutorialPanel.SetActive(true); + } + public void ShowUi(bool isInMenu) { _isInMenu = isInMenu; - UpdateKeyPanels(); - - _currentTutorialLink = _tutorialLinks[0]; - _currentTutorialLink.OnToggle(true); - _togglePanel.SetActive(true); - _tutorialPanel.SetActive(true); - - _pressQAction.performed += OnMovePreviousToggle; - _pressRAction.performed += OnMovNextToggle; - _pressAAction.performed += OnMovePreviousPage; - _pressDAction.performed += OnMoveNextPage; if (_isInMenu) { - FocusOnToggle(_currentTutorialLink.TutorialPageToggle); + SetCurrentTutorialLink(); + _togglePanel.SetActive(true); + UpdateKeyPanels(); + + _pressQAction.performed += OnMovePreviousToggle; + _pressRAction.performed += OnMovNextToggle; _closeAction.performed += OnClose; } - } - - public void ShowUiByIdx(string tutorialName) - { - CloseKeyPanels(); - - _togglePanel.SetActive(false); - _currentTutorialLink = _tutorialLinks.Find(link => link.TutorialName == tutorialName); - _currentTutorialLink?.OnToggle(true); - _tutorialPanel.SetActive(true); - UpdateKeyPanels(); _pressAAction.performed += OnMovePreviousPage; _pressDAction.performed += OnMoveNextPage; } + + public void ShowUiByName(string tutorialName = null) + { + SetCurrentTutorialLink(tutorialName); + _togglePanel.SetActive(false); + UpdateKeyPanels(); + + ShowUi(false); + } public void HideUi() { @@ -199,10 +219,7 @@ namespace BlueWater _currentTutorialLink?.OnToggle(false); CloseKeyPanels(); - if (_isInMenu) - { - CloseAction?.Invoke(); - } + CloseAction?.Invoke(_isInMenu); _isInMenu = false; } diff --git a/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs b/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs index 17927d7b1..701f07b12 100644 --- a/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs @@ -1,5 +1,6 @@ using System.Collections; using BlueWater.Items; +using BlueWater.Tycoons; using UnityEngine; using UnityEngine.UI; using Spine.Unity; @@ -151,7 +152,45 @@ namespace BlueWater.Uis _paperAnimation.AnimationState.SetAnimation(0, "Back", false).Complete += (trackEntry) => { Close(); + + int currentLevel = int.Parse(TycoonManager.Instance.GetCurrentLevelData().Idx); + if (currentLevel == 5) + { + if (!ES3.Load(SaveData.TutorialG, false)) + { + EventManager.InvokeTutorial(TutorialName.TutorialG); + ES3.Save(SaveData.TutorialG, true); + } + + if (!ES3.Load(SaveData.TutorialH, false)) + { + Invoke(nameof(InvokeTutorialH), 0.1f); + } + + if (!ES3.Load(SaveData.TutorialI, false)) + { + Invoke(nameof(InvokeTutorialI), 0.2f); + } + } }; } + + private void InvokeTutorialH() + { + if (!ES3.Load(SaveData.TutorialH, false)) + { + EventManager.InvokeTutorial(TutorialName.TutorialH); + ES3.Save(SaveData.TutorialH, true); + } + } + + private void InvokeTutorialI() + { + if (!ES3.Load(SaveData.TutorialI, false)) + { + EventManager.InvokeTutorial(TutorialName.TutorialI); + ES3.Save(SaveData.TutorialI, true); + } + } } } \ No newline at end of file diff --git a/Assets/04.Materials/Outline/StatueBarrelOutlineUnlit.mat b/Assets/04.Materials/Outline/StatueBarrelOutlineUnlit.mat new file mode 100644 index 000000000..786b15240 --- /dev/null +++ b/Assets/04.Materials/Outline/StatueBarrelOutlineUnlit.mat @@ -0,0 +1,153 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: StatueBarrelOutlineUnlit + m_Shader: {fileID: -6465566751694194690, guid: 8daa1b13f763ae74f8630c7a631dd327, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 0cc0edfb67329844796a5e3089996d28, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaThreshold: 0.5 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _FadeDistance: 150 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _ISCORNER: 0 + - _IsCorner: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _StencilComp: 8 + - _StencilRef: 1 + - _Surface: 0 + - _Thickness: 0.01 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &6323663459513743005 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Material.mat.meta b/Assets/04.Materials/Outline/StatueBarrelOutlineUnlit.mat.meta similarity index 79% rename from Assets/08.Spines/Characters/Npcs/Customers/Guest01_Material.mat.meta rename to Assets/04.Materials/Outline/StatueBarrelOutlineUnlit.mat.meta index 16bdfcf02..52d2a7c54 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Material.mat.meta +++ b/Assets/04.Materials/Outline/StatueBarrelOutlineUnlit.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eaf5a1e524cd8ae439ec7b6036090474 +guid: ebf812e229d16a148aad2358233be9ef NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab index a99d11f66..34ea31664 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab @@ -382,8 +382,10 @@ PrefabInstance: propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedComponents: + - {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_RemovedGameObjects: + - {fileID: 8884531212319162473, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 @@ -395,15 +397,128 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 addedObject: {fileID: 223172209862223209} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 9065337600065633788} - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 addedObject: {fileID: 7478245182548380060} + - targetCorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 7485507781608699139} + - targetCorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 6948082795751297154} + - targetCorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 3229405889651544752} m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} --- !u!4 &203741387490724426 stripped Transform: m_CorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} m_PrefabInstance: {fileID: 7343451337687172630} m_PrefabAsset: {fileID: 0} +--- !u!1 &672328621937310823 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!23 &7485507781608699139 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672328621937310823} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: bcc5ad5df297813478be2411a0f258c0, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &6948082795751297154 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672328621937310823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: ec503376674bceb48a7d173fb4cb3422, type: 2} + initialSkinName: + fixPrefabOverrideViaMeshFilter: 2 + initialFlipX: 0 + initialFlipY: 0 + updateWhenInvisible: 3 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + fixDrawOrder: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 + _animationName: Idle + loop: 1 + timeScale: 1 +--- !u!33 &3229405889651544752 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672328621937310823} + m_Mesh: {fileID: 0} --- !u!1 &5897095096647521783 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} @@ -422,15 +537,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: k__BackingField: {fileID: 5927803667513949971} - k__BackingField: {fileID: 6077686033771388879} + k__BackingField: {fileID: 0} k__BackingField: {fileID: 6533109861150454071} - k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} + k__BackingField: {fileID: 0} k__BackingField: {fileID: 7478245182548380060} k__BackingField: 1 k__BackingField: 1.5 k__BackingField: IsOpened: 0 - SpineController: {fileID: 0} + SpineController: {fileID: 9065337600065633788} Idx: LiquidData: k__BackingField: @@ -447,6 +562,27 @@ MonoBehaviour: _liquidImage: {fileID: 6817574259189873408} k__BackingField: 0 _playerHoldingTime: 3 + _attackMoldSfxName: AttackMold +--- !u!114 &9065337600065633788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 6948082795751297154} + _originalMaterial: {fileID: 2100000, guid: bcc5ad5df297813478be2411a0f258c0, type: 2} + _replacementMaterial: {fileID: 2100000, guid: ebf812e229d16a148aad2358233be9ef, type: 2} + _initialSkinName: default + _isRandomSkin: 0 + _isRandomRange: 0 + _randomRange: {x: 0, y: 0} + _randomStrings: [] --- !u!114 &7478245182548380060 MonoBehaviour: m_ObjectHideFlags: 0 @@ -480,11 +616,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} m_PrefabInstance: {fileID: 7343451337687172630} m_PrefabAsset: {fileID: 0} ---- !u!212 &6077686033771388879 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - m_PrefabInstance: {fileID: 7343451337687172630} - m_PrefabAsset: {fileID: 0} --- !u!114 &6533109861150454071 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4558604739080582945, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} diff --git a/Assets/05.Prefabs/Uis/Tycoons/TycoonGameMenuCanvas.prefab b/Assets/05.Prefabs/Uis/Tycoons/TycoonGameMenuCanvas.prefab index 2b2081d6c..bdce8561b 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/TycoonGameMenuCanvas.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/TycoonGameMenuCanvas.prefab @@ -1,428 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1783093215036953515 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3406864863717099403} - - component: {fileID: 7007680036530545365} - - component: {fileID: 9207469817372238632} - - component: {fileID: 7135868163081440694} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3406864863717099403 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783093215036953515} - 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: 1 - m_Children: [] - m_Father: {fileID: 6023463152304223989} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -60} - m_SizeDelta: {x: 179.24, y: 65.17} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &7007680036530545365 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783093215036953515} - m_CullTransparentMesh: 1 ---- !u!114 &9207469817372238632 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783093215036953515} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\uBA54\uC778 \uBA54\uB274" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2} - m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 45 - m_fontSizeBase: 45 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 36 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &7135868163081440694 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783093215036953515} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StringReference: - m_TableReference: - m_TableCollectionName: GUID:0f00ef9cea8f57e4e952e1881becfed7 - m_TableEntryReference: - m_KeyId: 6091734157950976 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_FormatArguments: [] - m_UpdateString: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 9207469817372238632} - m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro - m_MethodName: set_text - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 - references: - version: 2 - RefIds: [] ---- !u!1 &6636453121499202241 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2282892633984535475} - - component: {fileID: 5393267343056684930} - - component: {fileID: 1004229113393079187} - - component: {fileID: 6327958462794368542} - m_Layer: 5 - m_Name: SelectedImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2282892633984535475 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6636453121499202241} - 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: 6023463152304223989} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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: 0.5, y: 0.5} ---- !u!222 &5393267343056684930 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6636453121499202241} - m_CullTransparentMesh: 1 ---- !u!114 &1004229113393079187 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6636453121499202241} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5a6a33286645736499caef60e479872d, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &6327958462794368542 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6636453121499202241} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!1 &7743520951332944107 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6023463152304223989} - - component: {fileID: 1841050712205587428} - - component: {fileID: 4330707241455583970} - - component: {fileID: 9048322436433618005} - - component: {fileID: 3360581519817642802} - - component: {fileID: 2507619975434679060} - m_Layer: 5 - m_Name: LobbyButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6023463152304223989 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7743520951332944107} - 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: 2282892633984535475} - - {fileID: 3406864863717099403} - m_Father: {fileID: 4307839890443455075} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -350} - m_SizeDelta: {x: 179.24, y: 120} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &1841050712205587428 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7743520951332944107} - m_CullTransparentMesh: 1 ---- !u!114 &4330707241455583970 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7743520951332944107} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 4 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 5137543705323593814} - m_SelectOnDown: {fileID: 8544529456743054919} - 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: 1, g: 1, b: 1, a: 1} - m_PressedColor: {r: 1, g: 1, b: 1, a: 1} - m_SelectedColor: {r: 1, g: 1, b: 1, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 9207469817372238632} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &9048322436433618005 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7743520951332944107} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5ca384211ab6ab4cbf2a58b976108c8, type: 3} - m_Name: - m_EditorClassIdentifier: - _targetButton: {fileID: 4330707241455583970} - _selectedImage: {fileID: 1004229113393079187} - _highlightedColor: {r: 1, g: 1, b: 1, a: 0.19607843} - _selectedSfxName: SelectedButton01 ---- !u!114 &3360581519817642802 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7743520951332944107} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &2507619975434679060 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7743520951332944107} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!1001 &2932361312694498582 PrefabInstance: m_ObjectHideFlags: 0 @@ -431,12 +8,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 470647636669570379, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_IsActive + - target: {fileID: 529583648781627380, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 727273970019514715, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_IsActive + - target: {fileID: 529583648781627380, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 529583648781627380, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 949839561363117171, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} @@ -457,7 +38,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 949839561363117171, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y - value: -60 + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.x + value: 172.95 + objectReference: {fileID: 0} + - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 263.525 + objectReference: {fileID: 0} + - target: {fileID: 1208944476940684832, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -220 objectReference: {fileID: 0} - target: {fileID: 1868574217747462661, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_IsActive @@ -470,26 +79,14 @@ PrefabInstance: - target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: _exitButton value: - objectReference: {fileID: 4330707241455583970} - - target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: _lobbyButton - value: - objectReference: {fileID: 4330707241455583970} + objectReference: {fileID: 0} - target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: _isTitleScene value: 0 objectReference: {fileID: 0} - - target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: _startGameButton - value: - objectReference: {fileID: 0} - - target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: _resumeGameButton - value: - objectReference: {fileID: 8317783694176110988} - target: {fileID: 3706005337972264669, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y @@ -512,13 +109,49 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: -470 + propertyPath: m_AnchoredPosition.x + value: 308.145 objectReference: {fileID: 0} - - target: {fileID: 4219885209247321089, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -550 + objectReference: {fileID: 0} + - target: {fileID: 4244875843920652600, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4736021538945651707, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4736021538945651707, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4736021538945651707, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.x + value: 81 + objectReference: {fileID: 0} + - target: {fileID: 4736021538945651707, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4736021538945651707, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4736021538945651707, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 309.5 + objectReference: {fileID: 0} + - target: {fileID: 4736021538945651707, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -440 + objectReference: {fileID: 0} + - target: {fileID: 5500819087084403754, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_Navigation.m_SelectOnUp + value: + objectReference: {fileID: 5137543705323593814} - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -539,17 +172,21 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 308.145 + objectReference: {fileID: 0} - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y - value: -230 + value: -330 objectReference: {fileID: 0} - target: {fileID: 5989632971468279782, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5989632971468279782, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5989632971468279782, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_SizeDelta.x @@ -561,20 +198,52 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5989632971468279782, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y - value: -60 + value: 0 objectReference: {fileID: 0} + - target: {fileID: 6153442028292892462, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_Navigation.m_SelectOnUp + value: + objectReference: {fileID: 2866375261261098624} - target: {fileID: 6221531896277863998, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_text value: "\uAC8C\uC784 \uC7AC\uAC1C" objectReference: {fileID: 0} - - target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + - target: {fileID: 6508700365627860688, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + - target: {fileID: 6508700365627860688, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 6508700365627860688, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.x + value: 172.95 + objectReference: {fileID: 0} + - target: {fileID: 6508700365627860688, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6508700365627860688, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6508700365627860688, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 263.525 + objectReference: {fileID: 0} + - target: {fileID: 6508700365627860688, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -110 + objectReference: {fileID: 0} + - target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_SizeDelta.x value: 83.71 @@ -585,7 +254,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y - value: -60 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6620118968858819738, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_Navigation.m_SelectOnUp @@ -619,10 +288,26 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 6739753225006875755, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6739753225006875755, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6739753225006875755, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6783990415546059601, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_Navigation.m_SelectOnUp value: - objectReference: {fileID: 4330707241455583970} + objectReference: {fileID: 7270783161953044796} + - target: {fileID: 6783990415546059601, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_Navigation.m_SelectOnDown + value: + objectReference: {fileID: 2866375261261098624} - target: {fileID: 6831127385420350041, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_Pivot.x value: 0 @@ -707,8 +392,20 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 7889889950549031734, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + - target: {fileID: 7279075649354788755, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7292443971921784066, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7292443971921784066, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7292443971921784066, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 7906113444432610149, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} @@ -718,16 +415,8 @@ PrefabInstance: - target: {fileID: 8069869802901706048, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_Navigation.m_SelectOnDown value: - objectReference: {fileID: 4330707241455583970} - - target: {fileID: 8301518409121166474, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} + objectReference: {fileID: 7270783161953044796} - target: {fileID: 8454452712375467706, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_Name - value: ResumeGameButton - objectReference: {fileID: 0} - - target: {fileID: 8656956398806999588, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} @@ -751,6 +440,10 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 260.38 + objectReference: {fileID: 0} - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.y value: -110 @@ -761,10 +454,7 @@ PrefabInstance: - {fileID: 7517694980150805072, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - {fileID: 1952684284530658331, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - {fileID: 6376414689570651598, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 1403243596108480373, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - insertIndex: 2 - addedObject: {fileID: 6023463152304223989} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} --- !u!114 &1794702731584971318 stripped @@ -778,11 +468,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ea8c10e9f7ec1834ca9d8152c4c0cdae, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &4307839890443455075 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1403243596108480373, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} +--- !u!114 &2866375261261098624 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1114286928719485846, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} m_PrefabInstance: {fileID: 2932361312694498582} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &5137543705323593814 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8069869802901706048, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} @@ -794,9 +490,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &8317783694176110988 stripped +--- !u!114 &7270783161953044796 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6620118968858819738, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + m_CorrespondingSourceObject: {fileID: 5500819087084403754, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} m_PrefabInstance: {fileID: 2932361312694498582} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} diff --git a/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab b/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab index 52f83e2c3..c38720e44 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab @@ -1222,6 +1222,183 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1189623611901601286 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 529583648781627380} + - component: {fileID: 6005771347326397059} + - component: {fileID: 2567702323424464999} + - component: {fileID: 4119981959773562775} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &529583648781627380 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189623611901601286} + 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: 1 + m_Children: [] + m_Father: {fileID: 6508700365627860688} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -30} + m_SizeDelta: {x: 172.95, y: 60} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &6005771347326397059 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189623611901601286} + m_CullTransparentMesh: 1 +--- !u!114 &2567702323424464999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189623611901601286} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uAC8C\uC784 \uC7AC\uAC1C" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 36 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &4119981959773562775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189623611901601286} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StringReference: + m_TableReference: + m_TableCollectionName: GUID:0f00ef9cea8f57e4e952e1881becfed7 + m_TableEntryReference: + m_KeyId: 2961027900911616 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_FormatArguments: [] + m_UpdateString: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2567702323424464999} + m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro + m_MethodName: set_text + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 + references: + version: 2 + RefIds: [] --- !u!1 &1334216451080744749 GameObject: m_ObjectHideFlags: 0 @@ -4504,6 +4681,183 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &2674298648528952849 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6739753225006875755} + - component: {fileID: 4586820348604791229} + - component: {fileID: 668604389507884601} + - component: {fileID: 6449528857765432335} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6739753225006875755 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2674298648528952849} + 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: 1 + m_Children: [] + m_Father: {fileID: 4736021538945651707} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -30} + m_SizeDelta: {x: 81, y: 60} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &4586820348604791229 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2674298648528952849} + m_CullTransparentMesh: 1 +--- !u!114 &668604389507884601 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2674298648528952849} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uBA54\uC778 \uBA54\uB274" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 36 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &6449528857765432335 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2674298648528952849} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StringReference: + m_TableReference: + m_TableCollectionName: GUID:0f00ef9cea8f57e4e952e1881becfed7 + m_TableEntryReference: + m_KeyId: 6091734157950976 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_FormatArguments: [] + m_UpdateString: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 668604389507884601} + m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro + m_MethodName: set_text + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 + references: + version: 2 + RefIds: [] --- !u!1 &2773878840412301108 GameObject: m_ObjectHideFlags: 0 @@ -4640,6 +4994,102 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2796258333657410891 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3012067957633358106} + - component: {fileID: 1943718501325178316} + - component: {fileID: 9206916765794506415} + - component: {fileID: 8367731725041349894} + m_Layer: 5 + m_Name: SelectedImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3012067957633358106 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2796258333657410891} + 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: 4736021538945651707} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -5} + m_SizeDelta: {x: 30, y: -30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1943718501325178316 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2796258333657410891} + m_CullTransparentMesh: 1 +--- !u!114 &9206916765794506415 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2796258333657410891} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 1688200871, guid: 5a6a33286645736499caef60e479872d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8367731725041349894 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2796258333657410891} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &2884435889030291541 GameObject: m_ObjectHideFlags: 0 @@ -5759,6 +6209,102 @@ MonoBehaviour: _selectedImage: {fileID: 291649057069062016} _highlightedColor: {r: 1, g: 1, b: 1, a: 0.19607843} _selectedSfxName: SelectedButton01 +--- !u!1 &3508987263069363047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 327723079210987711} + - component: {fileID: 6551139024110862242} + - component: {fileID: 4632553072779605575} + - component: {fileID: 4206311145894234101} + m_Layer: 5 + m_Name: SelectedImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &327723079210987711 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3508987263069363047} + 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: 6508700365627860688} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -5} + m_SizeDelta: {x: 30, y: -30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6551139024110862242 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3508987263069363047} + m_CullTransparentMesh: 1 +--- !u!114 &4632553072779605575 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3508987263069363047} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 1688200871, guid: 5a6a33286645736499caef60e479872d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4206311145894234101 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3508987263069363047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &3564625175819087402 GameObject: m_ObjectHideFlags: 0 @@ -7332,6 +7878,155 @@ MonoBehaviour: references: version: 2 RefIds: [] +--- !u!1 &4244875843920652600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6508700365627860688} + - component: {fileID: 468380910157357877} + - component: {fileID: 1114286928719485846} + - component: {fileID: 5946593474056897388} + - component: {fileID: 2804907171189802070} + - component: {fileID: 7533539597575288327} + m_Layer: 5 + m_Name: ResumeGameButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6508700365627860688 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4244875843920652600} + 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: 327723079210987711} + - {fileID: 529583648781627380} + m_Father: {fileID: 1403243596108480373} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 263.525, y: -220} + m_SizeDelta: {x: 172.95, y: 60} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &468380910157357877 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4244875843920652600} + m_CullTransparentMesh: 1 +--- !u!114 &1114286928719485846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4244875843920652600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 4 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 6783990415546059601} + m_SelectOnDown: {fileID: 6153442028292892462} + 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: 1, g: 1, b: 1, a: 1} + m_PressedColor: {r: 1, g: 1, b: 1, a: 1} + m_SelectedColor: {r: 1, g: 1, b: 1, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: 5a6a33286645736499caef60e479872d, type: 3} + m_PressedSprite: {fileID: 21300000, guid: 5a6a33286645736499caef60e479872d, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: 5a6a33286645736499caef60e479872d, type: 3} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2567702323424464999} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &5946593474056897388 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4244875843920652600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5ca384211ab6ab4cbf2a58b976108c8, type: 3} + m_Name: + m_EditorClassIdentifier: + _selectedImage: {fileID: 4632553072779605575} + _highlightedColor: {r: 1, g: 1, b: 1, a: 0.19607843} + _selectedSfxName: SelectedButton01 +--- !u!114 &2804907171189802070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4244875843920652600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &7533539597575288327 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4244875843920652600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &4253581069941728644 GameObject: m_ObjectHideFlags: 0 @@ -12240,8 +12935,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8810811118502247075} + - {fileID: 6508700365627860688} - {fileID: 1208944476940684832} - {fileID: 5532522907040737260} + - {fileID: 4736021538945651707} - {fileID: 3809829019576091026} m_Father: {fileID: 5750355406028635963} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -13061,6 +13758,167 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7279075649354788755 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4736021538945651707} + - component: {fileID: 248545092022887931} + - component: {fileID: 5500819087084403754} + - component: {fileID: 3468127658355324792} + - component: {fileID: 1007473718961508987} + - component: {fileID: 5312192804754218829} + m_Layer: 5 + m_Name: LobbyButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4736021538945651707 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7279075649354788755} + 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: 3012067957633358106} + - {fileID: 6739753225006875755} + m_Father: {fileID: 1403243596108480373} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 309.5, y: -440} + m_SizeDelta: {x: 81, y: 60} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &248545092022887931 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7279075649354788755} + m_CullTransparentMesh: 1 +--- !u!114 &5500819087084403754 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7279075649354788755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 4 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 6153442028292892462} + m_SelectOnDown: {fileID: 6783990415546059601} + 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: 1, g: 1, b: 1, a: 1} + m_PressedColor: {r: 1, g: 1, b: 1, a: 1} + m_SelectedColor: {r: 1, g: 1, b: 1, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 668604389507884601} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3484035362484606752} + m_TargetAssemblyTypeName: BlueWater.Titles.TycoonTitle, Assembly-CSharp + m_MethodName: ShowSettingUi + m_Mode: 1 + 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 +--- !u!114 &3468127658355324792 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7279075649354788755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5ca384211ab6ab4cbf2a58b976108c8, type: 3} + m_Name: + m_EditorClassIdentifier: + _selectedImage: {fileID: 9206916765794506415} + _highlightedColor: {r: 1, g: 1, b: 1, a: 0.19607843} + _selectedSfxName: SelectedButton01 +--- !u!114 &1007473718961508987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7279075649354788755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &5312192804754218829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7279075649354788755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &7305646191043262511 GameObject: m_ObjectHideFlags: 0 @@ -14188,9 +15046,9 @@ MonoBehaviour: titleQuitUi: {fileID: 2087503127898626585} _startGameButton: {fileID: 6620118968858819738} _tutorialButton: {fileID: 6153442028292892462} - _resumeGameButton: {fileID: 0} + _resumeGameButton: {fileID: 1114286928719485846} _optionsButton: {fileID: 8069869802901706048} - _lobbyButton: {fileID: 0} + _lobbyButton: {fileID: 5500819087084403754} _quitGameButton: {fileID: 6783990415546059601} _isTitleScene: 1 _versionText: {fileID: 408792858244141541} diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Card_Slide.mp3 b/Assets/06.Sounds/Sfx/Tycoon/SFX_Card_Slide.mp3 new file mode 100644 index 000000000..999ab07f9 Binary files /dev/null and b/Assets/06.Sounds/Sfx/Tycoon/SFX_Card_Slide.mp3 differ diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Card_Slide.mp3.meta b/Assets/06.Sounds/Sfx/Tycoon/SFX_Card_Slide.mp3.meta new file mode 100644 index 000000000..451f8bf6b --- /dev/null +++ b/Assets/06.Sounds/Sfx/Tycoon/SFX_Card_Slide.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 28272de0f0479f94691b57e097565010 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest.atlas.txt b/Assets/08.Spines/Characters/Npcs/Customers/Guest.atlas.txt new file mode 100644 index 000000000..c9655107e --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest.atlas.txt @@ -0,0 +1,170 @@ +Guest.png +size:2033,2033 +filter:Linear,Linear +scale:0.65 +BigCat/Body +bounds:2,795,429,595 +BigCat/Eyes +bounds:523,1545,486,339 +rotate:90 +BigCat/Eyes_upset +bounds:864,1545,486,339 +rotate:90 +BigCat/Hand_Left +bounds:1194,1399,144,189 +rotate:90 +BigCat/Hand_Right +bounds:1538,685,136,196 +rotate:90 +BigCat/Mouse +bounds:627,803,220,85 +BigCat/Upset_mouse +bounds:1531,1348,127,53 +Black/Body +bounds:421,293,400,500 +Black/Eyes +bounds:1901,80,227,100 +rotate:90 +Black/Gliter +bounds:1736,618,291,157 +Black/Gliter2 +bounds:1619,526,157,103 +rotate:90 +Black/Hand_Left +bounds:1063,804,139,185 +Black/Hand_Right +bounds:1342,662,139,185 +rotate:90 +Black/Mouse +bounds:1973,1575,112,51 +rotate:90 +Black/Sword +bounds:1712,1341,307,203 +Cat/Body +bounds:2,259,534,417 +rotate:90 +Cat/Eyes +bounds:1273,6,304,118 +rotate:90 +Cat/Eyes_vomiting +bounds:1453,1546,304,142 +Cat/Eyes_vomiting2 +bounds:1267,312,304,176 +rotate:90 +Cat/Face +bounds:1646,1691,198,181 +rotate:90 +Cat/Tail +bounds:1204,803,213,332 +rotate:90 +Cat/vomitiong1 +bounds:594,42,139,249 +Cat/vomitiong2 +bounds:297,7,149,250 +Cat/vomitiong3 +bounds:448,41,144,250 +Guest2/Pumkinhead +bounds:2,7,293,250 +Heart +bounds:1863,450,166,166 +Reaper/Body +bounds:823,304,442,497 +Reaper/Eyes +bounds:1538,921,205,96 +Reaper/Eyes_Upset +bounds:1538,823,205,96 +Reaper/Eyes_Vomiting +bounds:1759,1891,244,140 +Reaper/Gliter1 +bounds:735,45,246,132 +rotate:90 +Reaper/Gliter2 +bounds:1205,1546,246,132 +Reaper/Hand_Left +bounds:1807,309,139,185 +rotate:90 +Reaper/Hand_Right +bounds:1619,195,139,185 +rotate:90 +Reaper/Mask +bounds:1205,1680,351,225 +rotate:90 +Reaper/Scythe +bounds:2,1392,519,639 +Upset01 +bounds:1445,529,124,131 +Upset02 +bounds:1385,1401,111,143 +Witch/Accessory +bounds:1588,336,217,188 +Witch/Body +bounds:869,2,300,402 +rotate:90 +Witch/Body_upset +bounds:835,991,300,402 +Witch/Eyes +bounds:523,1394,149,137 +rotate:90 +Witch/Eyes_upset1 +bounds:1498,1403,212,141 +Witch/Eyes_upset2 +bounds:1759,1546,212,141 +Witch/Eyes_upset3 +bounds:1445,312,212,141 +rotate:90 +Witch/Hair_Back +bounds:1531,1019,320,213 +rotate:90 +Witch/Hair_Front +bounds:1393,13,297,224 +rotate:90 +Witch/Hat +bounds:1137,1018,375,211 +rotate:90 +Witch/Hat_Back +bounds:1350,1023,374,179 +rotate:90 +Witch/Head +bounds:1829,1689,202,200 +casper/Eyes +bounds:835,891,226,98 +casper/Eyes_Vomiting +bounds:1746,1214,244,125 +casper/Face_Upset +bounds:1746,935,227,156 +casper/Gliter1 +bounds:1432,1690,341,212 +rotate:90 +casper/Gliter2 +bounds:1724,539,137,77 +casper/Mouse +bounds:1646,1982,111,49 +casper/Mouse_Upset +bounds:1975,979,112,51 +rotate:90 +casper/Mouse_Vomiting +bounds:1120,1395,148,72 +rotate:90 +casper/Vomiting/01 +bounds:433,800,192,88 +casper/Vomiting/02 +bounds:849,808,209,81 +casper/Vomiting/03 +bounds:1267,624,177,73 +rotate:90 +casper/Vomiting/Eyes_Vomiting2 +bounds:1746,1093,244,119 +casper/Vomiting/Vomiting +bounds:662,1395,148,227 +rotate:90 +casper/Vomiting/Vomiting2 +bounds:891,1395,148,227 +rotate:90 +casper/body +bounds:433,890,400,500 +casper/face +bounds:1745,777,227,156 +casper/left +bounds:1619,8,139,185 +casper/right +bounds:1760,8,139,185 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest01.skel.bytes.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest.atlas.txt.meta similarity index 75% rename from Assets/08.Spines/Characters/Npcs/Customers/Guest01.skel.bytes.meta rename to Assets/08.Spines/Characters/Npcs/Customers/Guest.atlas.txt.meta index edf7a70bb..356cf2d83 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Guest01.skel.bytes.meta +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest.atlas.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d1e49c07997c1e24ab298d4ed814d780 +guid: 4aec2ab48721652439bb877430ab355a TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest.png b/Assets/08.Spines/Characters/Npcs/Customers/Guest.png new file mode 100644 index 000000000..a45099ced Binary files /dev/null and b/Assets/08.Spines/Characters/Npcs/Customers/Guest.png differ diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest01.png.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest.png.meta similarity index 98% rename from Assets/08.Spines/Characters/Npcs/Customers/Guest01.png.meta rename to Assets/08.Spines/Characters/Npcs/Customers/Guest.png.meta index 8dd71fd33..c3968f943 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Guest01.png.meta +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1a4f3c20594f16b49ba571734aa21edd +guid: f8793b351e8b00242aa8e46a47765795 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest.skel.bytes b/Assets/08.Spines/Characters/Npcs/Customers/Guest.skel.bytes new file mode 100644 index 000000000..3a32b4c13 Binary files /dev/null and b/Assets/08.Spines/Characters/Npcs/Customers/Guest.skel.bytes differ diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest01.atlas.txt.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest.skel.bytes.meta similarity index 75% rename from Assets/08.Spines/Characters/Npcs/Customers/Guest01.atlas.txt.meta rename to Assets/08.Spines/Characters/Npcs/Customers/Guest.skel.bytes.meta index da23e3e2a..1fac1bede 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Guest01.atlas.txt.meta +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest.skel.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 365b60be853946e4f968c1b8721bc730 +guid: acf01b6c27b441946b118a4b68e9b602 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest01.atlas.txt b/Assets/08.Spines/Characters/Npcs/Customers/Guest01.atlas.txt deleted file mode 100644 index 378291c6c..000000000 --- a/Assets/08.Spines/Characters/Npcs/Customers/Guest01.atlas.txt +++ /dev/null @@ -1,53 +0,0 @@ -Guest01.png -size:1834,927 -filter:Linear,Linear -Guest2/Pumkinhead -bounds:619,474,451,385 -rotate:90 -Heart -bounds:1352,15,256,256 -Upset01 -bounds:1608,324,191,201 -rotate:90 -Upset02 -bounds:1610,151,171,220 -rotate:90 -casper/Eyes -bounds:2,2,347,151 -casper/Eyes_Vomiting -bounds:1321,733,376,192 -casper/Face_Upset -bounds:619,232,349,240 -casper/Mouse -bounds:1610,73,171,76 -casper/Mouse_Upset -bounds:1699,752,173,78 -rotate:90 -casper/Mouse_Vomiting -bounds:1317,620,228,111 -casper/Vomiting/01 -bounds:351,17,295,136 -casper/Vomiting/02 -bounds:1191,603,322,124 -rotate:90 -casper/Vomiting/03 -bounds:1191,489,273,112 -casper/Vomiting/Eyes_Vomiting2 -bounds:1006,549,376,183 -rotate:90 -casper/Vomiting/Vomiting -bounds:648,2,228,350 -rotate:90 -casper/Vomiting/Vomiting2 -bounds:1000,2,228,350 -rotate:90 -casper/body -bounds:2,155,615,770 -casper/face -bounds:970,232,349,240 -casper/left -bounds:1321,273,214,285 -rotate:90 -casper/right -bounds:1547,517,214,285 -rotate:90 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest01.png b/Assets/08.Spines/Characters/Npcs/Customers/Guest01.png deleted file mode 100644 index e929a5a91..000000000 Binary files a/Assets/08.Spines/Characters/Npcs/Customers/Guest01.png and /dev/null differ diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest01.skel.bytes b/Assets/08.Spines/Characters/Npcs/Customers/Guest01.skel.bytes deleted file mode 100644 index 1d2d6d381..000000000 Binary files a/Assets/08.Spines/Characters/Npcs/Customers/Guest01.skel.bytes and /dev/null differ diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Atlas.asset b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Atlas.asset similarity index 73% rename from Assets/08.Spines/Characters/Npcs/Customers/Guest01_Atlas.asset rename to Assets/08.Spines/Characters/Npcs/Customers/Guest_Atlas.asset index 418279701..1dd4a9d85 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Atlas.asset +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Atlas.asset @@ -10,10 +10,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: Guest01_Atlas + m_Name: Guest_Atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} - atlasFile: {fileID: 4900000, guid: 365b60be853946e4f968c1b8721bc730, type: 3} + atlasFile: {fileID: 4900000, guid: 4aec2ab48721652439bb877430ab355a, type: 3} materials: - - {fileID: 2100000, guid: eaf5a1e524cd8ae439ec7b6036090474, type: 2} + - {fileID: 2100000, guid: 86834288f1ca9884daab639810d1ddef, type: 2} diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest01_SkeletonData.asset.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Atlas.asset.meta similarity index 79% rename from Assets/08.Spines/Characters/Npcs/Customers/Guest01_SkeletonData.asset.meta rename to Assets/08.Spines/Characters/Npcs/Customers/Guest_Atlas.asset.meta index 928dd9881..a48e4b3f2 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Guest01_SkeletonData.asset.meta +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Atlas.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 90f596bc1a735a544985584af0b4180a +guid: 62de5342effc1a04c8da3a3b926d1044 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Material.mat b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Material.mat similarity index 68% rename from Assets/08.Spines/Characters/Npcs/Customers/Guest01_Material.mat rename to Assets/08.Spines/Characters/Npcs/Customers/Guest_Material.mat index cec4e1194..c10973a23 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Material.mat +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Material.mat @@ -7,15 +7,13 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Guest01_Material + m_Name: Guest_Material m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _RECEIVE_SHADOWS - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -27,7 +25,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 1a4f3c20594f16b49ba571734aa21edd, type: 3} + m_Texture: {fileID: 2800000, guid: f8793b351e8b00242aa8e46a47765795, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] @@ -35,23 +33,14 @@ Material: - _Cutoff: 0.1 - _DoubleSidedLighting: 0 - _LightAffectsAdditive: 0 - - _OutlineMipLevel: 0 - - _OutlineOpaqueAlpha: 1 - - _OutlineReferenceTexWidth: 1024 - - _OutlineSmoothness: 1 - - _OutlineWidth: 3 - - _ReceiveShadows: 1 + - _ReceiveShadows: 0 - _StencilComp: 8 - _StencilRef: 1 - _StraightAlphaInput: 1 - - _ThresholdEnd: 0.25 - _TintBlack: 0 - - _Use8Neighbourhood: 1 - - _UseScreenSpaceOutlineWidth: 0 - _ZWrite: 0 m_Colors: - _Black: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Material.mat.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Material.mat.meta new file mode 100644 index 000000000..fa2f4c0fc --- /dev/null +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 86834288f1ca9884daab639810d1ddef +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest01_SkeletonData.asset b/Assets/08.Spines/Characters/Npcs/Customers/Guest_SkeletonData.asset similarity index 78% rename from Assets/08.Spines/Characters/Npcs/Customers/Guest01_SkeletonData.asset rename to Assets/08.Spines/Characters/Npcs/Customers/Guest_SkeletonData.asset index 316e13214..a5bc44283 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Guest01_SkeletonData.asset +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_SkeletonData.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: Guest01_SkeletonData + m_Name: Guest_SkeletonData m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: 20060a2c2207f3d46850db03d6cad991, type: 2} - scale: 0.001 - skeletonJSON: {fileID: 4900000, guid: d1e49c07997c1e24ab298d4ed814d780, type: 3} + - {fileID: 11400000, guid: 62de5342effc1a04c8da3a3b926d1044, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: acf01b6c27b441946b118a4b68e9b602, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 diff --git a/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Atlas.asset.meta b/Assets/08.Spines/Characters/Npcs/Customers/Guest_SkeletonData.asset.meta similarity index 79% rename from Assets/08.Spines/Characters/Npcs/Customers/Guest01_Atlas.asset.meta rename to Assets/08.Spines/Characters/Npcs/Customers/Guest_SkeletonData.asset.meta index c26915316..49674f260 100644 --- a/Assets/08.Spines/Characters/Npcs/Customers/Guest01_Atlas.asset.meta +++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_SkeletonData.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 20060a2c2207f3d46850db03d6cad991 +guid: 90ef4d2128c770b4cb83806c33867a79 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/08.Spines/Props/Pump/Pump.atlas.txt b/Assets/08.Spines/Props/Pump/Pump.atlas.txt index 661d9bd48..4c4c4f03e 100644 --- a/Assets/08.Spines/Props/Pump/Pump.atlas.txt +++ b/Assets/08.Spines/Props/Pump/Pump.atlas.txt @@ -1,33 +1,24 @@ Pump.png -size:1307,1075 +size:1885,729 filter:Linear,Linear +Down1 +bounds:908,216,486,511 +Down2 +bounds:410,216,496,511 Rat00 -bounds:961,323,325,262 +bounds:1396,33,325,262 Rat01 -bounds:473,3,344,198 -rotate:90 +bounds:287,15,344,198 Rat02 -bounds:673,16,331,189 -rotate:90 +bounds:943,25,331,189 Rat03 -bounds:1063,38,283,211 -rotate:90 +bounds:2,2,283,211 Rat04 -bounds:864,13,308,197 -rotate:90 +bounds:633,17,308,197 buttom -bounds:473,667,512,406 -down1 -bounds:2,587,486,469 -rotate:90 -down2 -bounds:2,101,484,469 +bounds:2,215,512,406 rotate:90 rat_tail -bounds:2,2,97,246 -rotate:90 +bounds:1723,49,97,246 up1 -bounds:987,587,486,318 -rotate:90 -up2 -bounds:473,349,486,316 +bounds:1396,297,487,430 diff --git a/Assets/08.Spines/Props/Pump/Pump.png b/Assets/08.Spines/Props/Pump/Pump.png index 4f629ac80..bd0622de6 100644 Binary files a/Assets/08.Spines/Props/Pump/Pump.png and b/Assets/08.Spines/Props/Pump/Pump.png differ diff --git a/Assets/08.Spines/Props/Pump/Pump.skel.bytes b/Assets/08.Spines/Props/Pump/Pump.skel.bytes index ad6c59556..fc40f440c 100644 Binary files a/Assets/08.Spines/Props/Pump/Pump.skel.bytes and b/Assets/08.Spines/Props/Pump/Pump.skel.bytes differ diff --git a/Assets/Resources/Excel/~$LevelDataTable.xlsx.meta b/Assets/08.Spines/Props/StatueBarrel.meta similarity index 67% rename from Assets/Resources/Excel/~$LevelDataTable.xlsx.meta rename to Assets/08.Spines/Props/StatueBarrel.meta index 0a1efe1a7..6c155ab2f 100644 --- a/Assets/Resources/Excel/~$LevelDataTable.xlsx.meta +++ b/Assets/08.Spines/Props/StatueBarrel.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 91c4c233d1371764f92eb6575e9000f7 +guid: b0d1fdc2ad9dd174ea272c51a75bccde +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/08.Spines/Props/StatueBarrel/Statue.atlas.txt b/Assets/08.Spines/Props/StatueBarrel/Statue.atlas.txt new file mode 100644 index 000000000..26aad231c --- /dev/null +++ b/Assets/08.Spines/Props/StatueBarrel/Statue.atlas.txt @@ -0,0 +1,24 @@ +Statue.png +size:2038,1529 +filter:Linear,Linear +scale:0.99 +Statue06000 +bounds:2,1020,507,507 +Statue06001 +bounds:511,1020,507,507 +Statue06002 +bounds:1020,1020,507,507 +Statue06003 +bounds:1529,1020,507,507 +Statue06004 +bounds:2,511,507,507 +Statue06005 +bounds:511,511,507,507 +Statue06006 +bounds:1020,511,507,507 +Statue06007 +bounds:1529,511,507,507 +Statue06008 +bounds:2,2,507,507 +Statue06009 +bounds:511,2,507,507 diff --git a/Assets/08.Spines/Props/StatueBarrel/Statue.atlas.txt.meta b/Assets/08.Spines/Props/StatueBarrel/Statue.atlas.txt.meta new file mode 100644 index 000000000..53e39f9e6 --- /dev/null +++ b/Assets/08.Spines/Props/StatueBarrel/Statue.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d753c8f9b44b07b4791aa925332c273c +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/StatueBarrel/Statue.png b/Assets/08.Spines/Props/StatueBarrel/Statue.png new file mode 100644 index 000000000..029376af4 Binary files /dev/null and b/Assets/08.Spines/Props/StatueBarrel/Statue.png differ diff --git a/Assets/08.Spines/Props/StatueBarrel/Statue.png.meta b/Assets/08.Spines/Props/StatueBarrel/Statue.png.meta new file mode 100644 index 000000000..6263145fc --- /dev/null +++ b/Assets/08.Spines/Props/StatueBarrel/Statue.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 0cc0edfb67329844796a5e3089996d28 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/StatueBarrel/Statue.skel.bytes b/Assets/08.Spines/Props/StatueBarrel/Statue.skel.bytes new file mode 100644 index 000000000..f7cf1454d Binary files /dev/null and b/Assets/08.Spines/Props/StatueBarrel/Statue.skel.bytes differ diff --git a/Assets/08.Spines/Props/StatueBarrel/Statue.skel.bytes.meta b/Assets/08.Spines/Props/StatueBarrel/Statue.skel.bytes.meta new file mode 100644 index 000000000..98dec4ae2 --- /dev/null +++ b/Assets/08.Spines/Props/StatueBarrel/Statue.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8a4067754b4b7de46a7cdffb01e0b54d +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/StatueBarrel/Statue_Atlas.asset b/Assets/08.Spines/Props/StatueBarrel/Statue_Atlas.asset new file mode 100644 index 000000000..809f6389d --- /dev/null +++ b/Assets/08.Spines/Props/StatueBarrel/Statue_Atlas.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: Statue_Atlas + m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} + atlasFile: {fileID: 4900000, guid: d753c8f9b44b07b4791aa925332c273c, type: 3} + materials: + - {fileID: 2100000, guid: bcc5ad5df297813478be2411a0f258c0, type: 2} diff --git a/Assets/08.Spines/Props/StatueBarrel/Statue_Atlas.asset.meta b/Assets/08.Spines/Props/StatueBarrel/Statue_Atlas.asset.meta new file mode 100644 index 000000000..c2f797983 --- /dev/null +++ b/Assets/08.Spines/Props/StatueBarrel/Statue_Atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e45e92e46e2f414ba432cb8ec345be8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/StatueBarrel/Statue_Material.mat b/Assets/08.Spines/Props/StatueBarrel/Statue_Material.mat new file mode 100644 index 000000000..ce6a62cd9 --- /dev/null +++ b/Assets/08.Spines/Props/StatueBarrel/Statue_Material.mat @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Statue_Material + m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 0cc0edfb67329844796a5e3089996d28, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _DoubleSidedLighting: 0 + - _LightAffectsAdditive: 0 + - _ReceiveShadows: 0 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _TintBlack: 0 + - _ZWrite: 0 + m_Colors: + - _Black: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/08.Spines/Props/StatueBarrel/Statue_Material.mat.meta b/Assets/08.Spines/Props/StatueBarrel/Statue_Material.mat.meta new file mode 100644 index 000000000..fd02cb2a9 --- /dev/null +++ b/Assets/08.Spines/Props/StatueBarrel/Statue_Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bcc5ad5df297813478be2411a0f258c0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/StatueBarrel/Statue_SkeletonData.asset b/Assets/08.Spines/Props/StatueBarrel/Statue_SkeletonData.asset new file mode 100644 index 000000000..627f794cc --- /dev/null +++ b/Assets/08.Spines/Props/StatueBarrel/Statue_SkeletonData.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: Statue_SkeletonData + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 2e45e92e46e2f414ba432cb8ec345be8, type: 2} + scale: 0.002 + skeletonJSON: {fileID: 4900000, guid: 8a4067754b4b7de46a7cdffb01e0b54d, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 1 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/08.Spines/Props/StatueBarrel/Statue_SkeletonData.asset.meta b/Assets/08.Spines/Props/StatueBarrel/Statue_SkeletonData.asset.meta new file mode 100644 index 000000000..d971097a8 --- /dev/null +++ b/Assets/08.Spines/Props/StatueBarrel/Statue_SkeletonData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ec503376674bceb48a7d173fb4cb3422 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/google-services-desktop.json.meta b/Assets/StreamingAssets/google-services-desktop.json.meta index cb67f1422..be6f0c8fa 100644 --- a/Assets/StreamingAssets/google-services-desktop.json.meta +++ b/Assets/StreamingAssets/google-services-desktop.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c664020d0dfcaf24caef18b69b470af6 +guid: d2662f94c98933845b25bbc92ec4d21c DefaultImporter: externalObjects: {} userData: diff --git a/ProjectSettings/GvhProjectSettings.xml b/ProjectSettings/GvhProjectSettings.xml index 49d387157..bd6c841bb 100644 --- a/ProjectSettings/GvhProjectSettings.xml +++ b/ProjectSettings/GvhProjectSettings.xml @@ -1,5 +1,7 @@ + + \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index f3d547eb8..28c9a6464 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.3.5.14 + bundleVersion: 0.3.5.17 preloadedAssets: - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} - {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}