0.3.5.0
This commit is contained in:
Nam Tae Gun
parent
b5dc9b0f91
commit
9d4c461d07
@ -137,6 +137,7 @@ GameObject:
|
||||
- component: {fileID: 191889759}
|
||||
- component: {fileID: 191889758}
|
||||
- component: {fileID: 191889757}
|
||||
- component: {fileID: 191889763}
|
||||
m_Layer: 0
|
||||
m_Name: Main Camera
|
||||
m_TagString: MainCamera
|
||||
@ -302,6 +303,20 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 19.824, y: 0, z: 0}
|
||||
--- !u!114 &191889763
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 191889754}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dec61aec08a92c54282e06819b88a31c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_canvasRectTransforms:
|
||||
- {fileID: 8401317452346303362}
|
||||
--- !u!1001 &225733419
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -480,44 +495,6 @@ Light:
|
||||
m_LightUnit: 1
|
||||
m_LuxAtDistance: 1
|
||||
m_EnableSpotReflector: 1
|
||||
--- !u!1 &555448121
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 555448122}
|
||||
m_Layer: 5
|
||||
m_Name: TitleEmpty
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &555448122
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 555448121}
|
||||
m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -12.330473}
|
||||
m_LocalScale: {x: 0.0053499998, y: 0.0053499998, z: 0.0053499998}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1126145270}
|
||||
- {fileID: 623912210}
|
||||
- {fileID: 1472887923}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0.5, y: 4.974551}
|
||||
m_SizeDelta: {x: 1921.3599, y: 1080}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &582179848
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 1
|
||||
@ -567,96 +544,6 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &623912209
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 623912210}
|
||||
- component: {fileID: 623912213}
|
||||
- component: {fileID: 623912212}
|
||||
- component: {fileID: 623912211}
|
||||
m_Layer: 5
|
||||
m_Name: Character
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &623912210
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 623912209}
|
||||
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: 555448122}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 450, y: 0}
|
||||
m_SizeDelta: {x: 1100, y: 1100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &623912211
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 623912209}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 101a55adb2ae5424a8c6d0efbc862503, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
parentRectTransform: {fileID: 555448122}
|
||||
smoothSpeed: 5
|
||||
--- !u!114 &623912212
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 623912209}
|
||||
m_Enabled: 1
|
||||
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: caee1616acbdbb9488a107b0894e9d0d, 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!222 &623912213
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 623912209}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &652021011
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -763,81 +650,6 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 1614514235215fe4b877ab0945881d27, type: 3}
|
||||
--- !u!1 &1126145269
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1126145270}
|
||||
- component: {fileID: 1126145272}
|
||||
- component: {fileID: 1126145271}
|
||||
m_Layer: 5
|
||||
m_Name: Background
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1126145270
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1126145269}
|
||||
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: 555448122}
|
||||
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!114 &1126145271
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1126145269}
|
||||
m_Enabled: 1
|
||||
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: db3faf3bbc689a045b900709a21b024d, 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!222 &1126145272
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1126145269}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1196361497
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -973,96 +785,6 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e4f3702d2bd51af41ac161d64cfc9ba5, type: 3}
|
||||
--- !u!1 &1472887922
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1472887923}
|
||||
- component: {fileID: 1472887926}
|
||||
- component: {fileID: 1472887925}
|
||||
- component: {fileID: 1472887924}
|
||||
m_Layer: 5
|
||||
m_Name: Table
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1472887923
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1472887922}
|
||||
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: 555448122}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: -5, y: 0}
|
||||
m_SizeDelta: {x: 2400, y: 500}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!114 &1472887924
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1472887922}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4a810d0a847a60841803b0aed975f42c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
parentRectTransform: {fileID: 555448122}
|
||||
smoothSpeed: 5
|
||||
--- !u!114 &1472887925
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1472887922}
|
||||
m_Enabled: 1
|
||||
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: 542969911f9d133438e8db6b05d4ee15, 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!222 &1472887926
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1472887922}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1001 &1532114149
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1335,7 +1057,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -320
|
||||
value: -350
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3949558785420068140, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
@ -1435,7 +1157,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -200
|
||||
value: -230
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5833474583663148126, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -1771,7 +1493,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -80
|
||||
value: -110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855145811590553786, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -1806,6 +1528,11 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
--- !u!224 &8401317452346303362 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 7869185857112310372, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
m_PrefabInstance: {fileID: 8401317452346303361}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &8887082685865409626
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1879,4 +1606,3 @@ SceneRoots:
|
||||
- {fileID: 8401317452346303361}
|
||||
- {fileID: 582179850}
|
||||
- {fileID: 8887082685865409626}
|
||||
- {fileID: 555448122}
|
||||
|
||||
@ -1912,6 +1912,7 @@ GameObject:
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 128638924}
|
||||
- component: {fileID: 128638925}
|
||||
m_Layer: 5
|
||||
m_Name: Bills
|
||||
m_TagString: Untagged
|
||||
@ -1938,6 +1939,20 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &128638925
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 128638923}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Softness: {x: 0, y: 0}
|
||||
--- !u!1 &130732687
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5001,7 +5016,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
_goldAnimator: {fileID: 1308258170}
|
||||
_goldText: {fileID: 677143483}
|
||||
_animationTime: 1
|
||||
_animationTime: 0.3
|
||||
--- !u!114 &437358695
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -18258,7 +18273,7 @@ MonoBehaviour:
|
||||
_panel: {fileID: 1054626872}
|
||||
_contents: {fileID: 2028799953}
|
||||
_cardLocalScale: {x: 0.65, y: 0.65, z: 1}
|
||||
_endGoldChangeDuration: 0.5
|
||||
_endGoldChangeDuration: 0.3
|
||||
_soldOutSfxName: SoldOut
|
||||
_targetColor: {r: 1, g: 0, b: 0, a: 1}
|
||||
_duration: 0.3
|
||||
@ -21529,7 +21544,6 @@ MonoBehaviour:
|
||||
_serverTipMultiplier: 0
|
||||
_cleanerCleaningReduction: 0
|
||||
_bartenderMakingReduction: 0
|
||||
_currentPassiveCard: 0
|
||||
<LevelDataSo>k__BackingField: {fileID: 11400000, guid: 702b1ed0ce71d1b4aa1ddbce67e475a1, type: 2}
|
||||
--- !u!114 &1665075870
|
||||
MonoBehaviour:
|
||||
|
||||
@ -20,6 +20,11 @@ namespace BlueWater
|
||||
EventManager.OnChangedDisplay += ChangeResolution;
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
_canvasRectTransforms.Add(SceneController.Instance.Panel.GetComponent<RectTransform>());
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
EventManager.OnChangedDisplay -= ChangeResolution;
|
||||
|
||||
@ -180,7 +180,7 @@ namespace BlueWater.Npcs.Crews
|
||||
|
||||
public virtual bool CanInteractionPosition()
|
||||
{
|
||||
if (CrewInteraction.CenterTransform == null) return false;
|
||||
if (CrewInteraction == null || CrewInteraction.CenterTransform == null) return false;
|
||||
|
||||
return AIMovement.HasReachedDestination() ||
|
||||
Vector3.Distance(CrewInteraction.CenterTransform.position, transform.position) <=
|
||||
|
||||
@ -171,7 +171,7 @@ namespace BlueWater.Players.Tycoons
|
||||
|
||||
private void Die()
|
||||
{
|
||||
var saveGold = (int)(TycoonManager.Instance.TycoonStatus.CurrentGold * TycoonManager.Instance.TycoonStatus.EndGoldMultiplier);
|
||||
int saveGold = Mathf.RoundToInt(TycoonManager.Instance.TycoonStatus.CurrentGold * TycoonManager.Instance.TycoonStatus.EndGoldMultiplier);
|
||||
ES3.Save(SaveData.EndGold, saveGold);
|
||||
}
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ namespace BlueWater.Titles
|
||||
private void Start()
|
||||
{
|
||||
AudioManager.Instance.PlayBgm(_dailyBgm);
|
||||
_startGameButton.onClick.AddListener(SceneController.Instance.FadeIn);
|
||||
_startGameButton.onClick.AddListener(() => SceneController.Instance.LoadScene(SceneName.Combat));
|
||||
}
|
||||
|
||||
private void OnApplicationQuit()
|
||||
@ -45,7 +45,7 @@ namespace BlueWater.Titles
|
||||
{
|
||||
if (_isQuitting) return;
|
||||
|
||||
_startGameButton.onClick.RemoveListener(SceneController.Instance.FadeIn);
|
||||
_startGameButton.onClick.RemoveListener(() => SceneController.Instance.LoadScene(SceneName.Combat));
|
||||
}
|
||||
|
||||
[Button("컴포넌트 초기화")]
|
||||
|
||||
@ -10,11 +10,17 @@ namespace BlueWater
|
||||
public enum InputActionMaps
|
||||
{
|
||||
None = 0,
|
||||
Tycoon,
|
||||
TycoonUi,
|
||||
CombatTitle,
|
||||
Combat,
|
||||
CombatUi,
|
||||
UI = 1,
|
||||
Tycoon = 2,
|
||||
TycoonUi = 3,
|
||||
CombatTitle = 4,
|
||||
Combat = 5,
|
||||
CombatUi = 6
|
||||
}
|
||||
|
||||
public static class UiActions
|
||||
{
|
||||
public const string Navigate = "Navigate";
|
||||
}
|
||||
|
||||
public static class TycoonActions
|
||||
@ -62,29 +68,29 @@ namespace BlueWater
|
||||
SceneManager.sceneLoaded += OnSceneLoaded;
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
bool CheckMouse(){return Input.GetMouseButtonDown(0) || Input.GetMouseButtonDown(1)||Input.GetMouseButtonDown(2);}
|
||||
|
||||
if(!_isKey && Input.anyKeyDown && !CheckMouse()) //키보드 감지 (최초)
|
||||
{
|
||||
foreach (var element in _onActionKeyboard)
|
||||
{
|
||||
element?.Invoke();
|
||||
}
|
||||
_lastMousePosition = Input.mousePosition;
|
||||
_isKey = true;
|
||||
}
|
||||
else if (_isKey && (Input.anyKeyDown && CheckMouse() || (_isKey && Input.mousePosition != _lastMousePosition))) //마우스 감지 (최초)
|
||||
{
|
||||
foreach (var element in _onActionMouse)
|
||||
{
|
||||
element?.Invoke();
|
||||
}
|
||||
_lastMousePosition = Input.mousePosition;
|
||||
_isKey = false;
|
||||
}
|
||||
}
|
||||
// public void Update()
|
||||
// {
|
||||
// bool CheckMouse(){return Input.GetMouseButtonDown(0) || Input.GetMouseButtonDown(1)||Input.GetMouseButtonDown(2);}
|
||||
//
|
||||
// if(!_isKey && Input.anyKeyDown && !CheckMouse()) //키보드 감지 (최초)
|
||||
// {
|
||||
// foreach (var element in _onActionKeyboard)
|
||||
// {
|
||||
// element?.Invoke();
|
||||
// }
|
||||
// _lastMousePosition = Input.mousePosition;
|
||||
// _isKey = true;
|
||||
// }
|
||||
// else if (_isKey && (Input.anyKeyDown && CheckMouse() || (_isKey && Input.mousePosition != _lastMousePosition))) //마우스 감지 (최초)
|
||||
// {
|
||||
// foreach (var element in _onActionMouse)
|
||||
// {
|
||||
// element?.Invoke();
|
||||
// }
|
||||
// _lastMousePosition = Input.mousePosition;
|
||||
// _isKey = false;
|
||||
// }
|
||||
// }
|
||||
|
||||
private async void OnSceneLoaded(Scene scene, LoadSceneMode mode)
|
||||
{
|
||||
|
||||
@ -17,7 +17,7 @@ namespace BlueWater.Tycoons
|
||||
protected LiquidData LiquidData;
|
||||
|
||||
[SerializeField]
|
||||
protected float VisualMaxFill = 4000f;
|
||||
protected int VisualMaxFill = 4000;
|
||||
|
||||
[field: SerializeField]
|
||||
public int CurrentAmount { get; private set; }
|
||||
@ -42,8 +42,11 @@ namespace BlueWater.Tycoons
|
||||
|
||||
SpineController = GetComponent<SpineController>();
|
||||
LiquidData = ItemManager.Instance.LiquidDataSo.GetDataByIdx(Idx);
|
||||
|
||||
EventManager.OnAddBarrels += AddCurrentAmount;
|
||||
|
||||
if (!IsStatue)
|
||||
{
|
||||
EventManager.OnAddBarrels += AddCurrentAmount;
|
||||
}
|
||||
EventManager.OnAutoSupplyBarrels += AutoSupply;
|
||||
}
|
||||
|
||||
@ -56,7 +59,10 @@ namespace BlueWater.Tycoons
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
EventManager.OnAddBarrels -= AddCurrentAmount;
|
||||
if (!IsStatue)
|
||||
{
|
||||
EventManager.OnAddBarrels -= AddCurrentAmount;
|
||||
}
|
||||
EventManager.OnAutoSupplyBarrels -= AutoSupply;
|
||||
}
|
||||
|
||||
@ -67,7 +73,7 @@ namespace BlueWater.Tycoons
|
||||
|
||||
public bool CanConsume(int amount)
|
||||
{
|
||||
return CurrentAmount - amount > 0;
|
||||
return CurrentAmount > 0 && CurrentAmount - amount >= 0;
|
||||
}
|
||||
|
||||
public virtual void Consume(int amount)
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
using System;
|
||||
using BlueWater.Utility;
|
||||
using UnityEngine;
|
||||
|
||||
@ -17,9 +18,19 @@ namespace BlueWater.Tycoons
|
||||
public const string UnFillToLevel2 = "Change50to10";
|
||||
public const string UnFillToLevel3 = "Change100to50";
|
||||
}
|
||||
|
||||
public enum GarnishType
|
||||
{
|
||||
None = 0,
|
||||
Slime = 1,
|
||||
LimeTree = 2
|
||||
}
|
||||
|
||||
public class GarnishBarrel : Barrel
|
||||
{
|
||||
[SerializeField]
|
||||
private GarnishType _garnishType;
|
||||
|
||||
private int _currentLevel;
|
||||
|
||||
protected override void Start()
|
||||
@ -47,11 +58,11 @@ namespace BlueWater.Tycoons
|
||||
{
|
||||
OnBarrelInteracted?.Invoke(this);
|
||||
|
||||
if (LiquidData.Idx == "Garnish1")
|
||||
if (_garnishType == GarnishType.Slime)
|
||||
{
|
||||
GameManager.Instance.CurrentTycoonPlayer.IsInteractedSlimeGarnish = true;
|
||||
}
|
||||
else if (LiquidData.Idx == "Garnish2")
|
||||
else if (_garnishType == GarnishType.LimeTree)
|
||||
{
|
||||
GameManager.Instance.CurrentTycoonPlayer.IsInteractedLimeTreeGarnish = true;
|
||||
}
|
||||
@ -61,11 +72,11 @@ namespace BlueWater.Tycoons
|
||||
{
|
||||
OnBarrelCancelInteracted?.Invoke();
|
||||
|
||||
if (LiquidData.Idx == "Garnish1")
|
||||
if (_garnishType == GarnishType.Slime)
|
||||
{
|
||||
GameManager.Instance.CurrentTycoonPlayer.IsInteractedSlimeGarnish = false;
|
||||
}
|
||||
else if (LiquidData.Idx == "Garnish2")
|
||||
else if (_garnishType == GarnishType.LimeTree)
|
||||
{
|
||||
GameManager.Instance.CurrentTycoonPlayer.IsInteractedLimeTreeGarnish = false;
|
||||
}
|
||||
@ -114,17 +125,21 @@ namespace BlueWater.Tycoons
|
||||
{
|
||||
base.Activate();
|
||||
|
||||
FillAnimation();
|
||||
_currentLevel = GetCurrentLevel();
|
||||
IdleAnimation();
|
||||
}
|
||||
|
||||
public override void Consume(int amount)
|
||||
{
|
||||
if (!IsActivated) return;
|
||||
|
||||
base.Consume(amount);
|
||||
|
||||
var newLevel = GetCurrentLevel();
|
||||
if (_currentLevel != newLevel)
|
||||
{
|
||||
UnfillAnimation();
|
||||
UnfillAnimation(newLevel);
|
||||
_currentLevel = newLevel;
|
||||
}
|
||||
}
|
||||
|
||||
@ -137,81 +152,80 @@ namespace BlueWater.Tycoons
|
||||
var newLevel = GetCurrentLevel();
|
||||
if (_currentLevel != newLevel)
|
||||
{
|
||||
FillAnimation();
|
||||
}
|
||||
}
|
||||
|
||||
private int GetCurrentLevel()
|
||||
{
|
||||
int max = (int)VisualMaxFill;
|
||||
if (CurrentAmount >= max)
|
||||
{
|
||||
return 4;
|
||||
}
|
||||
if (CurrentAmount >= max / 2)
|
||||
{
|
||||
return 3;
|
||||
}
|
||||
if (CurrentAmount > 0)
|
||||
{
|
||||
return 2;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
private void FillAnimation()
|
||||
{
|
||||
int max = (int)VisualMaxFill;
|
||||
if (CurrentAmount >= max)
|
||||
{
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.FillToLevel4, false);
|
||||
SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel4, true);
|
||||
_currentLevel = 4;
|
||||
}
|
||||
else if (CurrentAmount >= max / 2)
|
||||
{
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.FillToLevel3, false);
|
||||
SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel3, true);
|
||||
_currentLevel = 3;
|
||||
}
|
||||
else if (CurrentAmount > 0)
|
||||
{
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.FillToLevel2, false);
|
||||
SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel2, true);
|
||||
_currentLevel = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.IdleLevel1, true);
|
||||
_currentLevel = 1;
|
||||
FillAnimation(newLevel);
|
||||
_currentLevel = newLevel;
|
||||
}
|
||||
}
|
||||
|
||||
private void UnfillAnimation()
|
||||
private int GetCurrentLevel()
|
||||
{
|
||||
int max = (int)VisualMaxFill;
|
||||
if (CurrentAmount >= max)
|
||||
if (CurrentAmount <= 0) return 0;
|
||||
if (CurrentAmount >= VisualMaxFill) return 4;
|
||||
|
||||
float range = VisualMaxFill / 3f;
|
||||
return (int)(CurrentAmount / range) + 1;
|
||||
}
|
||||
|
||||
private void IdleAnimation()
|
||||
{
|
||||
switch (_currentLevel)
|
||||
{
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.IdleLevel4, true);
|
||||
_currentLevel = 4;
|
||||
case 0:
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.IdleLevel1, false);
|
||||
break;
|
||||
case 1:
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.IdleLevel2, false);
|
||||
break;
|
||||
case 2:
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.IdleLevel3, false);
|
||||
break;
|
||||
case 3:
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.IdleLevel4, false);
|
||||
break;
|
||||
default:
|
||||
throw new Exception("_currentLevel 존재하지 않는 값");
|
||||
}
|
||||
else if (CurrentAmount >= max / 2)
|
||||
}
|
||||
|
||||
private void FillAnimation(int newLevel)
|
||||
{
|
||||
switch (newLevel)
|
||||
{
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.UnFillToLevel3, false);
|
||||
SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel3, true);
|
||||
_currentLevel = 3;
|
||||
case 2:
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.FillToLevel2, false);
|
||||
SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel2, true);
|
||||
break;
|
||||
case 3:
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.FillToLevel3, false);
|
||||
SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel3, true);
|
||||
break;
|
||||
case 4:
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.FillToLevel4, false);
|
||||
SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel4, true);
|
||||
break;
|
||||
default:
|
||||
throw new Exception("_currentLevel 존재하지 않는 값");
|
||||
}
|
||||
else if (CurrentAmount > 0)
|
||||
}
|
||||
|
||||
private void UnfillAnimation(int newLevel)
|
||||
{
|
||||
switch (newLevel)
|
||||
{
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.UnFillToLevel2, false);
|
||||
SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel2, true);
|
||||
_currentLevel = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.UnFillToLevel1, false);
|
||||
SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel1, true);
|
||||
_currentLevel = 1;
|
||||
case 1:
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.UnFillToLevel1, false);
|
||||
SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel1, true);
|
||||
break;
|
||||
case 2:
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.UnFillToLevel2, false);
|
||||
SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel2, true);
|
||||
break;
|
||||
case 3:
|
||||
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.UnFillToLevel3, false);
|
||||
SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel3, true);
|
||||
break;
|
||||
default:
|
||||
throw new Exception("_currentLevel 존재하지 않는 값");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
using System;
|
||||
using BlueWater.Utility;
|
||||
using Sirenix.OdinInspector;
|
||||
using UnityEngine;
|
||||
@ -6,22 +7,47 @@ namespace BlueWater.Tycoons
|
||||
{
|
||||
public static class LiquidBarrelSpineAnimation
|
||||
{
|
||||
public const string Idle = "IdleNormal";
|
||||
public const string Mold = "IdleDirty";
|
||||
public const string ChangeIdle = "ChangeClean";
|
||||
public const string ChangeMold = "ChangeDirty";
|
||||
public const string IdleLevel0 = "Empty";
|
||||
public const string IdleLevel1 = "Idle1";
|
||||
public const string IdleLevel2 = "Idle2";
|
||||
public const string IdleLevel3 = "Idle3";
|
||||
public const string IdleLevel4 = "Idle4";
|
||||
public const string IdleLevel5 = "Idle5";
|
||||
public const string MoldIdle = "IdleDirty";
|
||||
public const string ChangeCleanLevel0 = "ChangeClean0";
|
||||
public const string ChangeCleanLevel1 = "ChangeClean1";
|
||||
public const string ChangeCleanLevel2 = "ChangeClean2";
|
||||
public const string ChangeCleanLevel3 = "ChangeClean3";
|
||||
public const string ChangeCleanLevel4 = "ChangeClean4";
|
||||
public const string ChangeCleanLevel5 = "ChangeClean5";
|
||||
public const string ChangeMoldLevel0 = "ChangeDirty0";
|
||||
public const string ChangeMoldLevel1 = "ChangeDirty1";
|
||||
public const string ChangeMoldLevel2 = "ChangeDirty2";
|
||||
public const string ChangeMoldLevel3 = "ChangeDirty3";
|
||||
public const string ChangeMoldLevel4 = "ChangeDirty4";
|
||||
public const string ChangeMoldLevel5 = "ChangeDirty5";
|
||||
public const string FillLevel1 = "FillBeer0to1";
|
||||
public const string FillLevel2 = "FillBeer1to2";
|
||||
public const string FillLevel3 = "FillBeer2to3";
|
||||
public const string FillLevel4 = "FillBeer3to4";
|
||||
public const string FillLevel5 = "FillBeer4to5";
|
||||
public const string UnfillLevel0 = "EmptyBeer1to0";
|
||||
public const string UnfillLevel1 = "EmptyBeer2to1";
|
||||
public const string UnfillLevel2 = "EmptyBeer3to2";
|
||||
public const string UnfillLevel3 = "EmptyBeer4to3";
|
||||
public const string UnfillLevel4 = "EmptyBeer5to4";
|
||||
public const string InteractionLevel0 = "ServingBeer0";
|
||||
public const string InteractionLevel1 = "ServingBeer1";
|
||||
public const string InteractionLevel2 = "ServingBeer2";
|
||||
public const string InteractionLevel3 = "ServingBeer3";
|
||||
public const string InteractionLevel4 = "ServingBeer4";
|
||||
public const string InteractionLevel5 = "ServingBeer5";
|
||||
}
|
||||
|
||||
public class LiquidBarrel : Barrel
|
||||
{
|
||||
[SerializeField, Required]
|
||||
private SpriteRenderer _liquidImage;
|
||||
|
||||
[SerializeField, Required]
|
||||
private SpriteRenderer _fill;
|
||||
|
||||
[SerializeField, Range(1f, 5f), Tooltip("목표 색상 * 밝기")]
|
||||
private float _colorIntensity = 2f;
|
||||
|
||||
[field: SerializeField]
|
||||
public bool IsMoldy { get; private set; }
|
||||
@ -29,31 +55,18 @@ namespace BlueWater.Tycoons
|
||||
[SerializeField]
|
||||
private float _playerHoldingTime = 3f;
|
||||
|
||||
private Material _instanceMaterial;
|
||||
private bool _isPlayerInteracting;
|
||||
|
||||
// Hashes
|
||||
private static readonly int LiquidAmountHash = Shader.PropertyToID("_LiquidAmount");
|
||||
private static readonly int LiquidColorHash = Shader.PropertyToID("_LiquidColor");
|
||||
|
||||
protected override void Awake()
|
||||
{
|
||||
base.Awake();
|
||||
|
||||
_instanceMaterial = Instantiate(_fill.material);
|
||||
_fill.material = _instanceMaterial;
|
||||
}
|
||||
private int _currentLevel;
|
||||
|
||||
protected override void Start()
|
||||
{
|
||||
base.Start();
|
||||
|
||||
_liquidImage.sprite = IsActivated ? LiquidData.Sprite : DataManager.Instance.SpriteDataSo.BarrelLock;
|
||||
_instanceMaterial.SetColor(LiquidColorHash, LiquidData.Color * _colorIntensity);
|
||||
|
||||
if (!IsStatue)
|
||||
{
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.Idle, false);
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.IdleLevel0, false);
|
||||
}
|
||||
}
|
||||
|
||||
@ -182,9 +195,6 @@ namespace BlueWater.Tycoons
|
||||
}
|
||||
|
||||
base.SetCurrentAmount(amount);
|
||||
|
||||
var liquidAmount = CurrentAmount / VisualMaxFill;
|
||||
_instanceMaterial.SetFloat(LiquidAmountHash, liquidAmount);
|
||||
}
|
||||
|
||||
public override void Activate()
|
||||
@ -192,6 +202,39 @@ namespace BlueWater.Tycoons
|
||||
base.Activate();
|
||||
|
||||
_liquidImage.sprite = IsActivated ? LiquidData.Sprite : DataManager.Instance.SpriteDataSo.BarrelLock;
|
||||
|
||||
if (IsStatue) return;
|
||||
|
||||
_currentLevel = GetCurrentLevel();
|
||||
IdleAnimation();
|
||||
}
|
||||
|
||||
public override void Consume(int amount)
|
||||
{
|
||||
if (!IsActivated || IsMoldy) return;
|
||||
|
||||
base.Consume(amount);
|
||||
|
||||
int newLevel = GetCurrentLevel();
|
||||
if (_currentLevel != newLevel)
|
||||
{
|
||||
UnfillAnimation(newLevel);
|
||||
_currentLevel = newLevel;
|
||||
}
|
||||
}
|
||||
|
||||
public override void AddCurrentAmount(int addedValue)
|
||||
{
|
||||
if (!IsActivated) return;
|
||||
|
||||
base.AddCurrentAmount(addedValue);
|
||||
|
||||
int newLevel = GetCurrentLevel();
|
||||
if (_currentLevel != newLevel)
|
||||
{
|
||||
FillAnimation(newLevel);
|
||||
_currentLevel = newLevel;
|
||||
}
|
||||
}
|
||||
|
||||
public override bool CanMakingCocktailCrew(int amount)
|
||||
@ -207,16 +250,185 @@ namespace BlueWater.Tycoons
|
||||
public override void Mold()
|
||||
{
|
||||
IsMoldy = true;
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeMold, false);
|
||||
SpineController.AddAnimation(LiquidBarrelSpineAnimation.Mold, true);
|
||||
MoldAnimation();
|
||||
}
|
||||
|
||||
public void Recovery()
|
||||
{
|
||||
CancelInteraction();
|
||||
IsMoldy = false;
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeIdle, false);
|
||||
SpineController.AddAnimation(LiquidBarrelSpineAnimation.Idle, false);
|
||||
RecoveryAnimation();
|
||||
}
|
||||
|
||||
private int GetCurrentLevel()
|
||||
{
|
||||
if (CurrentAmount <= 0) return 0;
|
||||
if (CurrentAmount >= VisualMaxFill) return 5;
|
||||
|
||||
int range = VisualMaxFill / 5;
|
||||
return CurrentAmount / range + 1;
|
||||
}
|
||||
|
||||
private void IdleAnimation()
|
||||
{
|
||||
switch (_currentLevel)
|
||||
{
|
||||
case 0:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.IdleLevel0, false);
|
||||
break;
|
||||
case 1:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.IdleLevel1, false);
|
||||
break;
|
||||
case 2:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.IdleLevel2, false);
|
||||
break;
|
||||
case 3:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.IdleLevel3, false);
|
||||
break;
|
||||
case 4:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.IdleLevel4, false);
|
||||
break;
|
||||
case 5:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.IdleLevel5, false);
|
||||
break;
|
||||
default:
|
||||
throw new Exception("_currentLevel 존재하지 않는 값");
|
||||
}
|
||||
}
|
||||
|
||||
private void FillAnimation(int newLevel)
|
||||
{
|
||||
if (IsMoldy) return;
|
||||
|
||||
switch (newLevel)
|
||||
{
|
||||
case 1:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.FillLevel1, false);
|
||||
break;
|
||||
case 2:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.FillLevel2, false);
|
||||
break;
|
||||
case 3:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.FillLevel3, false);
|
||||
break;
|
||||
case 4:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.FillLevel4, false);
|
||||
break;
|
||||
case 5:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.FillLevel5, false);
|
||||
break;
|
||||
default:
|
||||
throw new Exception("_currentLevel 존재하지 않는 값");
|
||||
}
|
||||
}
|
||||
|
||||
private void UnfillAnimation(int newLevel)
|
||||
{
|
||||
if (IsMoldy) return;
|
||||
|
||||
switch (newLevel)
|
||||
{
|
||||
case 0:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.UnfillLevel0, false);
|
||||
break;
|
||||
case 1:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.UnfillLevel1, false);
|
||||
break;
|
||||
case 2:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.UnfillLevel2, false);
|
||||
break;
|
||||
case 3:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.UnfillLevel3, false);
|
||||
break;
|
||||
case 4:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.UnfillLevel4, false);
|
||||
break;
|
||||
default:
|
||||
throw new Exception("_currentLevel 존재하지 않는 값");
|
||||
}
|
||||
}
|
||||
|
||||
private void MoldAnimation()
|
||||
{
|
||||
switch (_currentLevel)
|
||||
{
|
||||
case 0:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeMoldLevel0, false);
|
||||
break;
|
||||
case 1:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeMoldLevel1, false);
|
||||
break;
|
||||
case 2:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeMoldLevel2, false);
|
||||
break;
|
||||
case 3:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeMoldLevel3, false);
|
||||
break;
|
||||
case 4:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeMoldLevel4, false);
|
||||
break;
|
||||
case 5:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeMoldLevel5, false);
|
||||
break;
|
||||
default:
|
||||
throw new Exception("_currentLevel 존재하지 않는 값");
|
||||
}
|
||||
|
||||
SpineController.AddAnimation(LiquidBarrelSpineAnimation.MoldIdle, true);
|
||||
}
|
||||
|
||||
private void RecoveryAnimation()
|
||||
{
|
||||
switch (_currentLevel)
|
||||
{
|
||||
case 0:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeCleanLevel0, false);
|
||||
break;
|
||||
case 1:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeCleanLevel1, false);
|
||||
break;
|
||||
case 2:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeCleanLevel2, false);
|
||||
break;
|
||||
case 3:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeCleanLevel3, false);
|
||||
break;
|
||||
case 4:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeCleanLevel4, false);
|
||||
break;
|
||||
case 5:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeCleanLevel5, false);
|
||||
break;
|
||||
default:
|
||||
throw new Exception("_currentLevel 존재하지 않는 값");
|
||||
}
|
||||
}
|
||||
|
||||
private void InteractionAnimation()
|
||||
{
|
||||
switch (_currentLevel)
|
||||
{
|
||||
case 0:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.InteractionLevel0, false, trackIndex:1);
|
||||
break;
|
||||
case 1:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.InteractionLevel1, false, trackIndex:1);
|
||||
break;
|
||||
case 2:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.InteractionLevel2, false, trackIndex:1);
|
||||
break;
|
||||
case 3:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.InteractionLevel3, false, trackIndex:1);
|
||||
break;
|
||||
case 4:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.InteractionLevel4, false, trackIndex:1);
|
||||
break;
|
||||
case 5:
|
||||
SpineController.PlayAnimation(LiquidBarrelSpineAnimation.InteractionLevel5, false, trackIndex:1);
|
||||
break;
|
||||
default:
|
||||
throw new Exception("_currentLevel 존재하지 않는 값");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,6 @@
|
||||
using System.Threading.Tasks;
|
||||
using DG.Tweening;
|
||||
using Sirenix.OdinInspector;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
using UnityEngine.UI;
|
||||
@ -15,78 +17,90 @@ namespace BlueWater
|
||||
|
||||
public class SceneController : Singleton<SceneController>
|
||||
{
|
||||
[field: SerializeField]
|
||||
public GameObject Panel { get; private set; }
|
||||
|
||||
[SerializeField]
|
||||
private Image _fadeImage;
|
||||
|
||||
[SerializeField]
|
||||
private CanvasGroup _loadingPanelCanvasGroup;
|
||||
|
||||
[Title("연출")]
|
||||
[SerializeField]
|
||||
private float _fadeInTime = 0.5f;
|
||||
|
||||
[SerializeField]
|
||||
private float _fadeOutTime = 0.5f;
|
||||
|
||||
[SerializeField]
|
||||
private float _loadingWaitTime = 2f;
|
||||
|
||||
private Tween _fadeIn;
|
||||
private Tween _fadeOut;
|
||||
|
||||
private bool _isMovedCombatScene;
|
||||
private Tween _loadingPanelFadeIn;
|
||||
private Tween _loadingPanelFadeOut;
|
||||
|
||||
protected override void OnAwake()
|
||||
{
|
||||
_fadeIn = _fadeImage.DOFade(1f, 1f).From(0f).SetUpdate(true).SetAutoKill(false).Pause().OnComplete(MoveCombatScene);
|
||||
_fadeOut = _fadeImage.DOFade(0f, 0.5f).From(1f).SetUpdate(true).SetAutoKill(false).Pause().SetDelay(3f);
|
||||
_fadeIn = _fadeImage.DOFade(1f, _fadeInTime).From(0f).SetUpdate(true).SetAutoKill(false).Pause();
|
||||
_fadeOut = _fadeImage.DOFade(0f, _fadeOutTime).From(1f).SetUpdate(true).SetAutoKill(false).Pause();
|
||||
_loadingPanelFadeIn = _loadingPanelCanvasGroup.DOFade(1f, _fadeInTime).From(0f).SetUpdate(true).SetAutoKill(false).Pause();
|
||||
_loadingPanelFadeOut = _loadingPanelCanvasGroup.DOFade(0f, _fadeOutTime).From(1f).SetUpdate(true).SetAutoKill(false).Pause();
|
||||
_fadeImage.color = new Color(0, 0, 0, 0);
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
SceneManager.sceneLoaded += OnSceneLoaded;
|
||||
_loadingPanelCanvasGroup.alpha = 0f;
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
if (Quitting) return;
|
||||
|
||||
SceneManager.sceneLoaded -= OnSceneLoaded;
|
||||
|
||||
_fadeIn.Kill();
|
||||
_fadeOut.Kill();
|
||||
}
|
||||
|
||||
public void FadeIn()
|
||||
{
|
||||
_fadeIn.Restart();
|
||||
_fadeIn?.Kill();
|
||||
_fadeOut?.Kill();
|
||||
_loadingPanelFadeIn?.Kill();
|
||||
_loadingPanelFadeOut?.Kill();
|
||||
}
|
||||
|
||||
public void RestartCurrentScene()
|
||||
{
|
||||
VisualFeedbackManager.Instance.ResetTimeScale();
|
||||
string currentSceneName = SceneManager.GetActiveScene().name;
|
||||
SceneManager.LoadScene(currentSceneName);
|
||||
LoadScene(SceneManager.GetActiveScene().name);
|
||||
}
|
||||
|
||||
public void LoadScene(string sceneName)
|
||||
public async void LoadScene(string sceneName)
|
||||
{
|
||||
VisualFeedbackManager.Instance.ResetTimeScale();
|
||||
SceneManager.LoadScene(sceneName);
|
||||
}
|
||||
|
||||
public void MoveMainMenu()
|
||||
{
|
||||
VisualFeedbackManager.Instance.ResetTimeScale();
|
||||
SceneManager.LoadScene("00.TycoonTitle");
|
||||
}
|
||||
|
||||
private void MoveCombatScene()
|
||||
{
|
||||
_isMovedCombatScene = true;
|
||||
SceneManager.LoadScene("01.Tycoon");
|
||||
}
|
||||
|
||||
private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
|
||||
{
|
||||
PopupUiController.ClearPopup();
|
||||
_fadeIn.Restart();
|
||||
await _fadeIn.AsyncWaitForCompletion();
|
||||
|
||||
if (scene.name == "01.Tycoon")
|
||||
_loadingPanelFadeIn.Restart();
|
||||
await _loadingPanelFadeIn.AsyncWaitForCompletion();
|
||||
|
||||
AsyncOperation asyncOperation = SceneManager.LoadSceneAsync(sceneName);
|
||||
asyncOperation.allowSceneActivation = false;
|
||||
|
||||
while (!asyncOperation.isDone)
|
||||
{
|
||||
if (_isMovedCombatScene)
|
||||
if (asyncOperation.progress >= 0.9f) // 로딩 완료 상태
|
||||
{
|
||||
_fadeOut.Restart();
|
||||
_isMovedCombatScene = false;
|
||||
break;
|
||||
}
|
||||
await Task.Yield();
|
||||
}
|
||||
|
||||
asyncOperation.allowSceneActivation = true;
|
||||
await Task.Delay((int)(_loadingWaitTime * 1000));
|
||||
|
||||
_fadeOut.Restart();
|
||||
_loadingPanelFadeOut.Restart();
|
||||
Task[] fadeOutTasks =
|
||||
{
|
||||
_fadeOut.AsyncWaitForCompletion(),
|
||||
_loadingPanelFadeOut.AsyncWaitForCompletion()
|
||||
};
|
||||
|
||||
await Task.WhenAll(fadeOutTasks);
|
||||
|
||||
PopupUiController.ClearPopup();
|
||||
VisualFeedbackManager.Instance.ResetTimeScale();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -195,10 +195,9 @@ namespace BlueWater
|
||||
|
||||
while (_elapsedTime >= _timeInterval)
|
||||
{
|
||||
// 술이 완성되었을 때
|
||||
if (_instanceLiquidCount >= _maxLiquidCount)
|
||||
if (!currentBarrel.CanConsume(1))
|
||||
{
|
||||
StartCoroutine(nameof(CompleteCocktail));
|
||||
HandleBarrelCancelInteraction();
|
||||
return;
|
||||
}
|
||||
|
||||
@ -224,6 +223,13 @@ namespace BlueWater
|
||||
|
||||
currentBarrel.Consume(1);
|
||||
_elapsedTime -= _timeInterval;
|
||||
|
||||
// 술이 완성되었을 때
|
||||
if (_instanceLiquidCount >= _maxLiquidCount)
|
||||
{
|
||||
StartCoroutine(nameof(CompleteCocktail));
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -25,6 +25,7 @@ namespace BlueWater.Tycoons
|
||||
private TycoonManager _tycoonManager;
|
||||
private TycoonStatus _tycoonStatus;
|
||||
|
||||
[ShowInInspector]
|
||||
public Dictionary<string, int> SelectedCard { get; private set; }
|
||||
|
||||
private void Start()
|
||||
|
||||
@ -27,6 +27,7 @@ namespace BlueWater
|
||||
{
|
||||
if (PopupUis.Contains(popup))
|
||||
{
|
||||
popup.DisableInput();
|
||||
PopupUis.Remove(popup);
|
||||
|
||||
if (PopupUis.Count > 0)
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
using System;
|
||||
using BlueWater.Tycoons;
|
||||
using Sirenix.OdinInspector;
|
||||
using UnityEngine;
|
||||
@ -25,6 +26,18 @@ namespace BlueWater.Titles
|
||||
_isQuitting = true;
|
||||
}
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
if (EventSystem.current.currentSelectedGameObject != gameObject) return;
|
||||
|
||||
_selectedImage.enabled = true;
|
||||
}
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
_selectedImage.enabled = false;
|
||||
}
|
||||
|
||||
public void OnSelect(BaseEventData eventData)
|
||||
{
|
||||
_selectedImage.color = _originalColor;
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
using System;
|
||||
using BlueWater;
|
||||
using BlueWater.Uis;
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.InputSystem;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class TitleQuit : PopupUi
|
||||
{
|
||||
[SerializeField]
|
||||
private GameObject _panel;
|
||||
|
||||
private InputAction _interactionEAction;
|
||||
private InputAction _closeOptionsAction;
|
||||
public Action CloseQuit;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
_interactionEAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.InteractionE);
|
||||
_closeOptionsAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel);
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
if (_interactionEAction != null)
|
||||
{
|
||||
_interactionEAction.performed -= OnInteractionE;
|
||||
}
|
||||
|
||||
if (_closeOptionsAction != null)
|
||||
{
|
||||
_closeOptionsAction.performed -= OnCloseOptions;
|
||||
}
|
||||
}
|
||||
|
||||
public override void Open()
|
||||
{
|
||||
PopupUiController.RegisterPopup(this);
|
||||
_panel.SetActive(true);
|
||||
IsOpened = true;
|
||||
}
|
||||
|
||||
public override void Close()
|
||||
{
|
||||
_panel.SetActive(false);
|
||||
PopupUiController.UnregisterPopup(this);
|
||||
IsOpened = false;
|
||||
}
|
||||
|
||||
public override void EnableInput()
|
||||
{
|
||||
_interactionEAction.performed += OnInteractionE;
|
||||
_closeOptionsAction.performed += OnCloseOptions;
|
||||
}
|
||||
|
||||
public override void DisableInput()
|
||||
{
|
||||
_interactionEAction.performed -= OnInteractionE;
|
||||
_closeOptionsAction.performed -= OnCloseOptions;
|
||||
}
|
||||
|
||||
public void OnInteractionE(InputAction.CallbackContext context)
|
||||
{
|
||||
var current = EventSystem.current.currentSelectedGameObject;
|
||||
if (!current) return;
|
||||
|
||||
var currenButton = current.GetComponent<Button>();
|
||||
currenButton.onClick.Invoke();
|
||||
}
|
||||
|
||||
public void OnCloseOptions(InputAction.CallbackContext context)
|
||||
{
|
||||
CloseQuit?.Invoke();
|
||||
}
|
||||
}
|
||||
94
Assets/02.Scripts/Ui/Title/TitleQuitUi.cs
Normal file
94
Assets/02.Scripts/Ui/Title/TitleQuitUi.cs
Normal file
@ -0,0 +1,94 @@
|
||||
using System;
|
||||
using BlueWater.Uis;
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.InputSystem;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace BlueWater
|
||||
{
|
||||
public class TitleQuitUi : PopupUi
|
||||
{
|
||||
[SerializeField]
|
||||
private GameObject _panel;
|
||||
|
||||
[SerializeField]
|
||||
private Button _confirmButton;
|
||||
|
||||
[SerializeField]
|
||||
private Button _cancelButton;
|
||||
|
||||
[SerializeField]
|
||||
private UiNavigationController _uiNavigationController;
|
||||
|
||||
private InputAction _interactionEAction;
|
||||
private InputAction _closeOptionsAction;
|
||||
public Action CloseQuit;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
_interactionEAction =
|
||||
PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.InteractionE);
|
||||
_closeOptionsAction =
|
||||
PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel);
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
if (_interactionEAction != null)
|
||||
{
|
||||
_interactionEAction.performed -= OnInteractionE;
|
||||
}
|
||||
|
||||
if (_closeOptionsAction != null)
|
||||
{
|
||||
_closeOptionsAction.performed -= OnCloseOptions;
|
||||
}
|
||||
}
|
||||
|
||||
public override void Open()
|
||||
{
|
||||
PopupUiController.RegisterPopup(this);
|
||||
_panel.SetActive(true);
|
||||
IsOpened = true;
|
||||
EventSystem.current.SetSelectedGameObject(_cancelButton.gameObject);
|
||||
}
|
||||
|
||||
public override void Close()
|
||||
{
|
||||
_panel.SetActive(false);
|
||||
PopupUiController.UnregisterPopup(this);
|
||||
IsOpened = false;
|
||||
}
|
||||
|
||||
public override void EnableInput()
|
||||
{
|
||||
_interactionEAction.performed += OnInteractionE;
|
||||
_closeOptionsAction.performed += OnCloseOptions;
|
||||
|
||||
_uiNavigationController.Enable(_cancelButton.gameObject);
|
||||
}
|
||||
|
||||
public override void DisableInput()
|
||||
{
|
||||
_interactionEAction.performed -= OnInteractionE;
|
||||
_closeOptionsAction.performed -= OnCloseOptions;
|
||||
|
||||
_uiNavigationController.Disable();
|
||||
}
|
||||
|
||||
public void OnInteractionE(InputAction.CallbackContext context)
|
||||
{
|
||||
var current = EventSystem.current.currentSelectedGameObject;
|
||||
if (!current) return;
|
||||
|
||||
var currenButton = current.GetComponent<Button>();
|
||||
currenButton?.onClick?.Invoke();
|
||||
}
|
||||
|
||||
public void OnCloseOptions(InputAction.CallbackContext context)
|
||||
{
|
||||
CloseQuit?.Invoke();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,12 +1,13 @@
|
||||
using System.Collections;
|
||||
using BlueWater.Audios;
|
||||
using BlueWater.Uis;
|
||||
using BlueWater.Utility;
|
||||
using TMPro;
|
||||
using UnityEditor;
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.InputSystem;
|
||||
using UnityEngine.SceneManagement;
|
||||
using UnityEngine.Serialization;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace BlueWater.Titles
|
||||
@ -22,8 +23,9 @@ namespace BlueWater.Titles
|
||||
[SerializeField]
|
||||
private TitleOptions titleOptions;
|
||||
|
||||
[FormerlySerializedAs("titleQuit")]
|
||||
[SerializeField]
|
||||
private TitleQuit titleQuit;
|
||||
private TitleQuitUi titleQuitUi;
|
||||
|
||||
[SerializeField]
|
||||
private Button _startGameButton;
|
||||
@ -52,17 +54,20 @@ namespace BlueWater.Titles
|
||||
[SerializeField]
|
||||
private Image _ink;
|
||||
|
||||
[SerializeField]
|
||||
private UiNavigationController _uiNavigationController;
|
||||
|
||||
public Material inkMaterialInstance { get; private set; }
|
||||
|
||||
|
||||
private PlayerInputKeyManager _playerInputKeyManager;
|
||||
private SceneController _sceneController;
|
||||
private InputAction _interactionEAction;
|
||||
private InputAction _openAction;
|
||||
private InputAction _closeAction;
|
||||
private GameObject _previousClickedObject;
|
||||
private bool _isQuitting;
|
||||
private bool _onButtonClicked;
|
||||
|
||||
private Coroutine _InkCoroutine;
|
||||
private Coroutine _inkCoroutine;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
@ -73,30 +78,22 @@ namespace BlueWater.Titles
|
||||
|
||||
if (_isTitleScene)
|
||||
{
|
||||
_sceneController = SceneController.Instance;
|
||||
_startGameButton.onClick.AddListener(_sceneController.FadeIn);
|
||||
_startGameButton.onClick.AddListener(() => SceneController.Instance.LoadScene(SceneName.Tycoon));
|
||||
//수정
|
||||
AudioManager.Instance.PlayBgm(_dailyBgm);
|
||||
|
||||
Open();
|
||||
EventSystem.current.SetSelectedGameObject(_startGameButton.gameObject);
|
||||
}
|
||||
else
|
||||
{
|
||||
_lobbyButton.onClick.AddListener(() => SceneController.Instance.LoadScene(SceneName.TycoonTile));
|
||||
_panel.SetActive(false);
|
||||
_openAction.performed += OnOpen;
|
||||
}
|
||||
|
||||
_startGameButton?.onClick.AddListener(() => { _onButtonClicked = true; });
|
||||
_resumeGameButton?.onClick.AddListener(() => { _onButtonClicked = true; });
|
||||
_optionsButton?.onClick.AddListener(() => { _onButtonClicked = true; });
|
||||
_lobbyButton?.onClick.AddListener(() => { _onButtonClicked = true; });
|
||||
_quitGameButton?.onClick.AddListener(() => { _onButtonClicked = true; });
|
||||
|
||||
_playerInputKeyManager.AddOnActionKeyboard(OnKeyboard);
|
||||
_playerInputKeyManager.AddOnActionMouse(OnMouse);
|
||||
|
||||
titleOptions.CloseOptions = HideSettingUi;
|
||||
titleQuit.CloseQuit = HideQuitUi;
|
||||
titleQuitUi.CloseQuit = HideQuitUi;
|
||||
_versionText.text = GetVersion();
|
||||
|
||||
inkMaterialInstance = Instantiate(_ink.material);
|
||||
@ -107,19 +104,13 @@ namespace BlueWater.Titles
|
||||
{
|
||||
if (_isTitleScene)
|
||||
{
|
||||
if (_startGameButton != null && _sceneController != null)
|
||||
{
|
||||
_startGameButton.onClick.RemoveListener(_sceneController.FadeIn);
|
||||
//수정
|
||||
}
|
||||
_startGameButton?.onClick.RemoveListener(() => SceneController.Instance?.LoadScene(SceneName.Tycoon));
|
||||
}
|
||||
|
||||
if (_playerInputKeyManager != null)
|
||||
else
|
||||
{
|
||||
_playerInputKeyManager.RemoveOnActionKeyboard(OnKeyboard);
|
||||
_playerInputKeyManager.RemoveOnActionMouse(OnMouse);
|
||||
_lobbyButton?.onClick.AddListener(() => SceneController.Instance?.LoadScene(SceneName.TycoonTile));
|
||||
}
|
||||
|
||||
|
||||
if (_interactionEAction != null)
|
||||
{
|
||||
_interactionEAction.performed -= OnInteractionE;
|
||||
@ -141,14 +132,20 @@ namespace BlueWater.Titles
|
||||
|
||||
public override void Open()
|
||||
{
|
||||
if (!_isTitleScene)
|
||||
{
|
||||
VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f);
|
||||
}
|
||||
|
||||
_playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.TycoonUi);
|
||||
PopupUiController.RegisterPopup(this);
|
||||
_panel.SetActive(true);
|
||||
|
||||
if (_isTitleScene)
|
||||
{
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f);
|
||||
_playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.TycoonUi);
|
||||
EventSystem.current.SetSelectedGameObject(_resumeGameButton.gameObject);
|
||||
}
|
||||
|
||||
IsOpened = true;
|
||||
}
|
||||
|
||||
@ -159,12 +156,17 @@ namespace BlueWater.Titles
|
||||
|
||||
public override void Close()
|
||||
{
|
||||
if (!_isTitleScene)
|
||||
_panel.SetActive(false);
|
||||
PopupUiController.UnregisterPopup(this);
|
||||
IsOpened = false;
|
||||
|
||||
if (_isTitleScene)
|
||||
{
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
_panel.SetActive(false);
|
||||
PopupUiController.UnregisterPopup(this);
|
||||
_playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.Tycoon);
|
||||
IsOpened = false;
|
||||
VisualFeedbackManager.Instance.ResetTimeScale();
|
||||
}
|
||||
}
|
||||
@ -173,10 +175,11 @@ namespace BlueWater.Titles
|
||||
{
|
||||
if (_isTitleScene)
|
||||
{
|
||||
|
||||
_uiNavigationController.Enable(_startGameButton.gameObject);
|
||||
}
|
||||
else
|
||||
{
|
||||
_uiNavigationController.Enable(_resumeGameButton.gameObject);
|
||||
_closeAction.performed += OnClose;
|
||||
}
|
||||
|
||||
@ -195,26 +198,7 @@ namespace BlueWater.Titles
|
||||
}
|
||||
|
||||
_interactionEAction.performed -= OnInteractionE;
|
||||
}
|
||||
|
||||
private void OnKeyboard()
|
||||
{
|
||||
if (_isTitleScene)
|
||||
{
|
||||
EventSystem.current.SetSelectedGameObject(_startGameButton.gameObject);
|
||||
}
|
||||
else
|
||||
{
|
||||
EventSystem.current.SetSelectedGameObject(_resumeGameButton.gameObject);
|
||||
}
|
||||
}
|
||||
|
||||
private void OnMouse()
|
||||
{
|
||||
if (!_onButtonClicked)
|
||||
{
|
||||
EventSystem.current.SetSelectedGameObject(null);
|
||||
}
|
||||
_uiNavigationController.Disable();
|
||||
}
|
||||
|
||||
private string GetVersion()
|
||||
@ -232,7 +216,7 @@ namespace BlueWater.Titles
|
||||
if (!current) return;
|
||||
|
||||
var currenButton = current.GetComponent<Button>();
|
||||
currenButton.onClick.Invoke();
|
||||
currenButton?.onClick?.Invoke();
|
||||
}
|
||||
|
||||
public void QuitGame()
|
||||
@ -254,34 +238,24 @@ namespace BlueWater.Titles
|
||||
{
|
||||
titleOptions.Close();
|
||||
_titleMenuUiPanel.SetActive(true);
|
||||
EventSystem.current.SetSelectedGameObject(_optionsButton.gameObject);
|
||||
}
|
||||
|
||||
|
||||
public void ShowQuitUi()
|
||||
{
|
||||
_titleMenuUiPanel.SetActive(false);
|
||||
titleQuit.Open();
|
||||
titleQuitUi.Open();
|
||||
|
||||
if (_InkCoroutine != null)
|
||||
{
|
||||
StopCoroutine(_InkCoroutine);
|
||||
}
|
||||
|
||||
_InkCoroutine = StartCoroutine(MoveInkBackground(1.0f));
|
||||
|
||||
Utils.StartUniqueCoroutine(this, ref _inkCoroutine, MoveInkBackground(1f));
|
||||
}
|
||||
|
||||
public void HideQuitUi()
|
||||
{
|
||||
titleQuit.Close();
|
||||
titleQuitUi.Close();
|
||||
_titleMenuUiPanel.SetActive(true);
|
||||
EventSystem.current.SetSelectedGameObject(_quitGameButton.gameObject);
|
||||
|
||||
if (_InkCoroutine != null)
|
||||
{
|
||||
StopCoroutine(_InkCoroutine);
|
||||
}
|
||||
|
||||
_InkCoroutine = StartCoroutine(MoveInkBackground(0.4f));
|
||||
Utils.StartUniqueCoroutine(this, ref _inkCoroutine, MoveInkBackground(0.4f));
|
||||
}
|
||||
|
||||
private IEnumerator MoveInkBackground(float pos)
|
||||
@ -306,10 +280,5 @@ namespace BlueWater.Titles
|
||||
// 마지막에 정확히 목표값 설정.
|
||||
inkMaterialInstance.SetFloat("_Position", pos);
|
||||
}
|
||||
|
||||
public void MoveLobbyScene()
|
||||
{
|
||||
SceneManager.LoadScene("00.TycoonTitle");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -13,7 +13,6 @@ public class TycoonResultCard : MonoBehaviour
|
||||
[field: SerializeField]
|
||||
private TextMeshProUGUI count;
|
||||
|
||||
|
||||
public void SetText(string str)
|
||||
{
|
||||
text.text = str;
|
||||
@ -29,9 +28,9 @@ public class TycoonResultCard : MonoBehaviour
|
||||
image.sprite = spr;
|
||||
}
|
||||
|
||||
public void SetCount(int vel)
|
||||
public void SetCount(int value)
|
||||
{
|
||||
count.text = "X" + vel;
|
||||
count.text = $"x{value}";
|
||||
}
|
||||
|
||||
//해당 버튼을 클릭했을때 커지는 효과 넣어주기...
|
||||
|
||||
@ -212,7 +212,7 @@ namespace BlueWater.Uis
|
||||
Destroy(element.gameObject);
|
||||
}
|
||||
|
||||
_mainMenuButton.onClick.AddListener(SceneController.Instance.MoveMainMenu);
|
||||
_mainMenuButton.onClick.AddListener(() => SceneController.Instance.LoadScene(SceneName.TycoonTile));
|
||||
_restartButton.onClick.AddListener(SceneController.Instance.RestartCurrentScene);
|
||||
|
||||
_casperCount = 0;
|
||||
@ -241,7 +241,7 @@ namespace BlueWater.Uis
|
||||
|
||||
if (SceneController.Instance)
|
||||
{
|
||||
_mainMenuButton?.onClick.RemoveListener(SceneController.Instance.MoveMainMenu);
|
||||
_mainMenuButton?.onClick.RemoveListener(() => SceneController.Instance.LoadScene(SceneName.TycoonTile));
|
||||
_restartButton?.onClick.RemoveListener(SceneController.Instance.RestartCurrentScene);
|
||||
}
|
||||
|
||||
@ -279,11 +279,6 @@ namespace BlueWater.Uis
|
||||
_pressAnyKeyAction.performed -= OnShowImmediately;
|
||||
ShowImmediately();
|
||||
}
|
||||
|
||||
private void OnPressAnyKey(InputAction.CallbackContext context)
|
||||
{
|
||||
SceneController.Instance.MoveMainMenu();
|
||||
}
|
||||
|
||||
private IEnumerator ShowResultCoroutine()
|
||||
{
|
||||
@ -421,7 +416,7 @@ namespace BlueWater.Uis
|
||||
_tipGainedText.text = _tipGained.ToString("N0");
|
||||
_goldSpentText.text = _goldSpent.ToString("N0");
|
||||
_totalGoldText.text = $"{Utils.GetLocalizedString("TotalGold")} : {ES3.Load(SaveData.EndGold, 0):N0}";
|
||||
_minusPercentText.text = $"- {(int)((1 - TycoonManager.Instance.TycoonStatus.EndGoldMultiplier) * 100)}%";
|
||||
_minusPercentText.text = $"- {Mathf.RoundToInt((1f - TycoonManager.Instance.TycoonStatus.EndGoldMultiplier) * 100)}%";
|
||||
}
|
||||
|
||||
[Button("결과 즉시 테스트")]
|
||||
|
||||
56
Assets/02.Scripts/Ui/UiNavigationController.cs
Normal file
56
Assets/02.Scripts/Ui/UiNavigationController.cs
Normal file
@ -0,0 +1,56 @@
|
||||
using System;
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.InputSystem;
|
||||
using UnityEngine.InputSystem.UI;
|
||||
|
||||
namespace BlueWater
|
||||
{
|
||||
public class UiNavigationController: MonoBehaviour
|
||||
{
|
||||
[SerializeField]
|
||||
private GameObject _selectObject;
|
||||
|
||||
[SerializeField]
|
||||
private bool _isEnable;
|
||||
|
||||
private InputSystemUIInputModule _inputModule;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
_inputModule = EventSystem.current.GetComponent<InputSystemUIInputModule>();
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
_inputModule.move.action.performed -= OnNavigate;
|
||||
}
|
||||
|
||||
private void OnNavigate(InputAction.CallbackContext context)
|
||||
{
|
||||
if (EventSystem.current.currentSelectedGameObject == null)
|
||||
{
|
||||
EventSystem.current.SetSelectedGameObject(_selectObject);
|
||||
}
|
||||
}
|
||||
|
||||
public void Enable(GameObject selectObject)
|
||||
{
|
||||
_selectObject = selectObject;
|
||||
_inputModule.move.action.performed += OnNavigate;
|
||||
_isEnable = true;
|
||||
}
|
||||
|
||||
public void Enable()
|
||||
{
|
||||
_inputModule.move.action.performed += OnNavigate;
|
||||
_isEnable = true;
|
||||
}
|
||||
|
||||
public void Disable()
|
||||
{
|
||||
_inputModule.move.action.performed -= OnNavigate;
|
||||
_isEnable = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
2
Assets/02.Scripts/Ui/UiNavigationController.cs.meta
Normal file
2
Assets/02.Scripts/Ui/UiNavigationController.cs.meta
Normal file
@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 44fd527766f4ac945ad8aaa085cb1932
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 123 KiB After Width: | Height: | Size: 95 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 121 KiB After Width: | Height: | Size: 94 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 51 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 63 KiB After Width: | Height: | Size: 57 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 146 KiB After Width: | Height: | Size: 143 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 177 KiB After Width: | Height: | Size: 163 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 219 KiB After Width: | Height: | Size: 184 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 122 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 115 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 49 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 31 KiB |
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8c4b435ee4066134f8150ed44ebe72f0
|
||||
guid: d2ba40b4f14eca14e816e51ee69cf81a
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 35 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 28 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 26 KiB |
BIN
Assets/03.Images/Ui/Balloon/HeartBalloon.png
Normal file
BIN
Assets/03.Images/Ui/Balloon/HeartBalloon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d2ba40b4f14eca14e816e51ee69cf81a
|
||||
guid: 95412b86b013e7a4ca0c86dcd801b80e
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
@ -46,9 +46,9 @@ TextureImporter:
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 7
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 512
|
||||
spritePixelsToUnits: 256
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
BIN
Assets/03.Images/Ui/Balloon/HeartBalloonFilled.png
Normal file
BIN
Assets/03.Images/Ui/Balloon/HeartBalloonFilled.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 27 KiB |
143
Assets/03.Images/Ui/Balloon/HeartBalloonFilled.png.meta
Normal file
143
Assets/03.Images/Ui/Balloon/HeartBalloonFilled.png.meta
Normal file
@ -0,0 +1,143 @@
|
||||
fileFormatVersion: 2
|
||||
guid: dab2a247be6173643860ce5c7632e734
|
||||
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: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 256
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
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: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WindowsStoreApps
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8
Assets/03.Images/Ui/Tycoon/Loading.meta
Normal file
8
Assets/03.Images/Ui/Tycoon/Loading.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 310d87d90e58190498f59953b7ff150d
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/03.Images/Ui/Tycoon/Loading/LineBlue.png
Normal file
BIN
Assets/03.Images/Ui/Tycoon/Loading/LineBlue.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 27 KiB |
166
Assets/03.Images/Ui/Tycoon/Loading/LineBlue.png.meta
Normal file
166
Assets/03.Images/Ui/Tycoon/Loading/LineBlue.png.meta
Normal file
@ -0,0 +1,166 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a48f54066af47d5458b6ab505dd412b2
|
||||
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: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
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: 8
|
||||
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: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WindowsStoreApps
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: LineBlue_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 193
|
||||
width: 501
|
||||
height: 126
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: c7ec032e2956ee54b8a0222e81cc7fae
|
||||
internalID: 1050489585
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 99503e0188ce71744acbe8650a9b2119
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
LineBlue_0: 1050489585
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/03.Images/Ui/Tycoon/Loading/Loading01.png
Normal file
BIN
Assets/03.Images/Ui/Tycoon/Loading/Loading01.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
166
Assets/03.Images/Ui/Tycoon/Loading/Loading01.png.meta
Normal file
166
Assets/03.Images/Ui/Tycoon/Loading/Loading01.png.meta
Normal file
@ -0,0 +1,166 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 178457aaf91324c41acddbceb592e060
|
||||
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: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
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: 8
|
||||
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: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WindowsStoreApps
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: Loading01_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 180
|
||||
width: 512
|
||||
height: 140
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 49ec34f8b36d4fe4594b22c13e003706
|
||||
internalID: 1904124557
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
Loading01_0: 1904124557
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/03.Images/Ui/Tycoon/Loading/Loading02.png
Normal file
BIN
Assets/03.Images/Ui/Tycoon/Loading/Loading02.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
166
Assets/03.Images/Ui/Tycoon/Loading/Loading02.png.meta
Normal file
166
Assets/03.Images/Ui/Tycoon/Loading/Loading02.png.meta
Normal file
@ -0,0 +1,166 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4742ea007da88f34a830405fbd8ba537
|
||||
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: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
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: 8
|
||||
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: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WindowsStoreApps
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: Loading02_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 180
|
||||
width: 512
|
||||
height: 140
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 63efb1607954df34da66746a6a92bfe3
|
||||
internalID: 1391326846
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
Loading02_0: 1391326846
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/03.Images/Ui/Tycoon/Loading/Loading03.png
Normal file
BIN
Assets/03.Images/Ui/Tycoon/Loading/Loading03.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
166
Assets/03.Images/Ui/Tycoon/Loading/Loading03.png.meta
Normal file
166
Assets/03.Images/Ui/Tycoon/Loading/Loading03.png.meta
Normal file
@ -0,0 +1,166 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 539b219a787d2904db462dc5b737dda4
|
||||
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: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
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: 8
|
||||
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: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WindowsStoreApps
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: Loading03_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 180
|
||||
width: 512
|
||||
height: 140
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: f980a3aac861b6e4fa7834801ca607ae
|
||||
internalID: -34333619
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
Loading03_0: -34333619
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/03.Images/Ui/Tycoon/Loading/Loading04.png
Normal file
BIN
Assets/03.Images/Ui/Tycoon/Loading/Loading04.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
166
Assets/03.Images/Ui/Tycoon/Loading/Loading04.png.meta
Normal file
166
Assets/03.Images/Ui/Tycoon/Loading/Loading04.png.meta
Normal file
@ -0,0 +1,166 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0c1125cfec44fc2419b09df8586a05ee
|
||||
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: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
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: 8
|
||||
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: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WindowsStoreApps
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: Loading04_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 180
|
||||
width: 512
|
||||
height: 140
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: a140a75552de1c848af6ba7f873932de
|
||||
internalID: -6202561
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
Loading04_0: -6202561
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/03.Images/Ui/Tycoon/Loading/LoadingBackGround.png
Normal file
BIN
Assets/03.Images/Ui/Tycoon/Loading/LoadingBackGround.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 MiB |
143
Assets/03.Images/Ui/Tycoon/Loading/LoadingBackGround.png.meta
Normal file
143
Assets/03.Images/Ui/Tycoon/Loading/LoadingBackGround.png.meta
Normal file
@ -0,0 +1,143 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1fdba6b88a252b745bc804081a8136c4
|
||||
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: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
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: 8
|
||||
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: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WindowsStoreApps
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,5 +1,55 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &26621141038901120
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2375486821606005183}
|
||||
- component: {fileID: 7926818151944606596}
|
||||
m_Layer: 5
|
||||
m_Name: LoadingPanel
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2375486821606005183
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 26621141038901120}
|
||||
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: 7978809748708284181}
|
||||
- {fileID: 201204786341572344}
|
||||
m_Father: {fileID: 3703920745757631303}
|
||||
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!225 &7926818151944606596
|
||||
CanvasGroup:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 26621141038901120}
|
||||
m_Enabled: 1
|
||||
m_Alpha: 0
|
||||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!1 &339983480389662661
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -46,7 +96,12 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_persistent: 1
|
||||
<Panel>k__BackingField: {fileID: 6879251386686393001}
|
||||
_fadeImage: {fileID: 1442357617191146581}
|
||||
_loadingPanelCanvasGroup: {fileID: 7926818151944606596}
|
||||
_fadeInTime: 0.5
|
||||
_fadeOutTime: 0.5
|
||||
_loadingWaitTime: 3
|
||||
--- !u!1 &1875279861051038239
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -78,7 +133,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7697863254794900725}
|
||||
- {fileID: 3703920745757631303}
|
||||
m_Father: {fileID: 4841526513753854054}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
@ -149,6 +204,401 @@ MonoBehaviour:
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 131071
|
||||
--- !u!1 &2614399967161705425
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7978809748708284181}
|
||||
- component: {fileID: 555291672992892953}
|
||||
- component: {fileID: 2168318989863813258}
|
||||
m_Layer: 5
|
||||
m_Name: Background
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7978809748708284181
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2614399967161705425}
|
||||
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: 7442800727538058747}
|
||||
m_Father: {fileID: 2375486821606005183}
|
||||
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 &555291672992892953
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2614399967161705425}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &2168318989863813258
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2614399967161705425}
|
||||
m_Enabled: 1
|
||||
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: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 1fdba6b88a252b745bc804081a8136c4, 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!1 &3359435900205883463
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 148434821084098710}
|
||||
- component: {fileID: 4117546242712489030}
|
||||
- component: {fileID: 1093723952135778768}
|
||||
- component: {fileID: 3007154784386509482}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &148434821084098710
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3359435900205883463}
|
||||
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: 7442800727538058747}
|
||||
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: -100, y: -30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4117546242712489030
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3359435900205883463}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1093723952135778768
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3359435900205883463}
|
||||
m_Enabled: 1
|
||||
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: 1904124557, guid: 178457aaf91324c41acddbceb592e060, 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!95 &3007154784386509482
|
||||
Animator:
|
||||
serializedVersion: 7
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3359435900205883463}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 0a71dea97300b8342b412cb7a8e85216, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_StabilizeFeet: 0
|
||||
m_AnimatePhysics: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorStateOnDisable: 0
|
||||
m_WriteDefaultValuesOnDisable: 0
|
||||
--- !u!1 &3503376886528117013
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 201204786341572344}
|
||||
- component: {fileID: 3159238400736391384}
|
||||
- component: {fileID: 1774853969214613770}
|
||||
m_Layer: 0
|
||||
m_Name: SkeletonGraphic (Pump)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &201204786341572344
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3503376886528117013}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 2, y: 2, z: 2}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2375486821606005183}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -150}
|
||||
m_SizeDelta: {x: 154.20001, y: 156.39142}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3159238400736391384
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3503376886528117013}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1774853969214613770
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3503376886528117013}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 9c6ec24bca5fc42489fe47358fef0d4a, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
skeletonDataAsset: {fileID: 11400000, guid: a74f9c634f9ac2c4ba4660414394ff61, type: 2}
|
||||
additiveMaterial: {fileID: 2100000, guid: 2e8245019faeb8c43b75f9ca3ac8ee34, type: 2}
|
||||
multiplyMaterial: {fileID: 2100000, guid: e74a1f8978a7da348a721508d0d58834, type: 2}
|
||||
screenMaterial: {fileID: 2100000, guid: bab24c479f34eec45be6ea8595891569, type: 2}
|
||||
m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
initialSkinName: default
|
||||
initialFlipX: 0
|
||||
initialFlipY: 0
|
||||
startingAnimation: Run
|
||||
startingLoop: 1
|
||||
timeScale: 1
|
||||
freeze: 0
|
||||
layoutScaleMode: 0
|
||||
referenceSize: {x: 154.20001, y: 156.39142}
|
||||
pivotOffset: {x: 0, y: 0}
|
||||
referenceScale: 1
|
||||
layoutScale: 1
|
||||
rectTransformSize: {x: 154.20001, y: 156.39142}
|
||||
editReferenceRect: 0
|
||||
updateWhenInvisible: 3
|
||||
allowMultipleCanvasRenderers: 0
|
||||
canvasRenderers: []
|
||||
separatorSlotNames: []
|
||||
enableSeparatorSlots: 0
|
||||
separatorParts: []
|
||||
updateSeparatorPartLocation: 1
|
||||
updateSeparatorPartScale: 0
|
||||
disableMeshAssignmentOnOverride: 1
|
||||
physicsPositionInheritanceFactor: {x: 1, y: 1}
|
||||
physicsRotationInheritanceFactor: 1
|
||||
physicsMovementRelativeTo: {fileID: 0}
|
||||
meshGenerator:
|
||||
settings:
|
||||
useClipping: 1
|
||||
zSpacing: 0
|
||||
tintBlack: 0
|
||||
canvasGroupCompatible: 0
|
||||
pmaVertexColors: 1
|
||||
addNormals: 0
|
||||
calculateTangents: 0
|
||||
immutableTriangles: 0
|
||||
updateTiming: 1
|
||||
unscaledTime: 1
|
||||
--- !u!1 &6879251386686393001
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3703920745757631303}
|
||||
m_Layer: 5
|
||||
m_Name: Panel
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3703920745757631303
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6879251386686393001}
|
||||
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: 7697863254794900725}
|
||||
- {fileID: 2375486821606005183}
|
||||
m_Father: {fileID: 510409880402970474}
|
||||
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!1 &7809732640072073699
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7442800727538058747}
|
||||
- component: {fileID: 1954384967415307868}
|
||||
- component: {fileID: 6865152761585608990}
|
||||
m_Layer: 5
|
||||
m_Name: Loading
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7442800727538058747
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7809732640072073699}
|
||||
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: 148434821084098710}
|
||||
m_Father: {fileID: 7978809748708284181}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 50, y: 50}
|
||||
m_SizeDelta: {x: 300, y: 80}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!222 &1954384967415307868
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7809732640072073699}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &6865152761585608990
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7809732640072073699}
|
||||
m_Enabled: 1
|
||||
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: 1050489585, guid: a48f54066af47d5458b6ab505dd412b2, 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!1 &8981839400951833881
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -179,7 +629,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 510409880402970474}
|
||||
m_Father: {fileID: 3703920745757631303}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
||||
@ -6624,6 +6624,10 @@ PrefabInstance:
|
||||
propertyPath: m_StringReference.m_TableEntryReference.m_KeyId
|
||||
value: 41096481878016
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3688680572007923171, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3}
|
||||
propertyPath: _initialSkinName
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5897095096647521783, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: LiquidD
|
||||
@ -9250,6 +9254,10 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: SlimeGarnish
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7890117756044024871, guid: 18213e533ac275e429ee601785bff676, type: 3}
|
||||
propertyPath: _garnishType
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
@ -12353,6 +12361,10 @@ PrefabInstance:
|
||||
propertyPath: m_StringReference.m_TableEntryReference.m_KeyId
|
||||
value: 41088755970048
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3688680572007923171, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3}
|
||||
propertyPath: _initialSkinName
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5897095096647521783, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: LiquidC
|
||||
@ -13216,6 +13228,10 @@ PrefabInstance:
|
||||
propertyPath: m_StringReference.m_TableEntryReference.m_KeyId
|
||||
value: 41071488020480
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3688680572007923171, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3}
|
||||
propertyPath: _initialSkinName
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5897095096647521783, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: LiquidB
|
||||
@ -13806,6 +13822,10 @@ PrefabInstance:
|
||||
propertyPath: m_StringReference.m_TableEntryReference.m_KeyId
|
||||
value: 41098067324928
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3688680572007923171, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3}
|
||||
propertyPath: _initialSkinName
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5897095096647521783, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: LiquidE
|
||||
@ -13880,6 +13900,10 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: LimeTreeGarnish
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7890117756044024871, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3}
|
||||
propertyPath: _garnishType
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
@ -14567,6 +14591,10 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: MoneyCounter
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7103883662070814397, guid: 9e5375e8c94af9f49a9661227294f024, type: 3}
|
||||
propertyPath: m_sharedMaterial
|
||||
value:
|
||||
objectReference: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
||||
@ -57,7 +57,7 @@ Transform:
|
||||
m_GameObject: {fileID: 6373979881487551315}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0.369, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 0.333, z: -0}
|
||||
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children: []
|
||||
|
||||
@ -201,8 +201,8 @@ Transform:
|
||||
m_GameObject: {fileID: 6581422458203868687}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -0.01, y: 0.18, z: 0}
|
||||
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
|
||||
m_LocalPosition: {x: -0.01, y: 0.22, z: -0}
|
||||
m_LocalScale: {x: 0.15, y: 0.15, z: 0.15}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3774058579297377381}
|
||||
@ -251,7 +251,7 @@ SpriteRenderer:
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 4
|
||||
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: a8c45767f0a3ec245a47087c7ada2b50, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
@ -278,7 +278,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!4 &3246572212746126634
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -52,6 +52,10 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 80
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2313114958873670484, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
@ -76,17 +80,21 @@ PrefabInstance:
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: a327d1fc80d90bd438cfcd1ad2b219c7, type: 3}
|
||||
- target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
- target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: dab2a247be6173643860ce5c7632e734, type: 3}
|
||||
- target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||
propertyPath: m_Color.g
|
||||
value: 0.026785713
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||
propertyPath: m_Color.r
|
||||
@ -128,6 +136,10 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7555773783659772986, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 0.5
|
||||
@ -183,7 +195,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8780093359852370517, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: b93d1d9adc811a74fb4192ade70fd3cc, type: 3}
|
||||
objectReference: {fileID: 21300000, guid: dab2a247be6173643860ce5c7632e734, type: 3}
|
||||
- target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
|
||||
@ -26,7 +26,7 @@ Transform:
|
||||
m_GameObject: {fileID: 6373979881487551315}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0.437, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 0.36, z: 0}
|
||||
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children: []
|
||||
|
||||
@ -26,16 +26,16 @@ RectTransform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1188553356229883033}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -0.000039024068}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1301142170621799481}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 39.999966}
|
||||
m_SizeDelta: {x: 120, y: 120}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 30}
|
||||
m_SizeDelta: {x: -40, y: -100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5435184559151138951
|
||||
CanvasRenderer:
|
||||
@ -109,8 +109,8 @@ RectTransform:
|
||||
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: -25}
|
||||
m_SizeDelta: {x: 0, y: 50}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1902740841703408668
|
||||
GameObject:
|
||||
@ -149,8 +149,8 @@ RectTransform:
|
||||
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: 25}
|
||||
m_SizeDelta: {x: 0, y: -50}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3987507136697198223
|
||||
CanvasRenderer:
|
||||
@ -353,8 +353,8 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: New Text
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
|
||||
m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
|
||||
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
@ -378,7 +378,7 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 29.6
|
||||
m_fontSize: 29.4
|
||||
m_fontSizeBase: 20
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 1
|
||||
@ -456,8 +456,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 75}
|
||||
m_SizeDelta: {x: 0, y: 50}
|
||||
m_AnchoredPosition: {x: 0, y: 15}
|
||||
m_SizeDelta: {x: -40, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!222 &3704132316340448211
|
||||
CanvasRenderer:
|
||||
@ -487,10 +487,10 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: X5
|
||||
m_text: x5
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
|
||||
m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
|
||||
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
@ -552,7 +552,7 @@ MonoBehaviour:
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 20.932396, y: 0, z: 26.981346, w: 0}
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
|
||||
@ -36,7 +36,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -60}
|
||||
m_SizeDelta: {x: 83.71, y: 65.17}
|
||||
m_SizeDelta: {x: 179.24, y: 65.17}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &7007680036530545365
|
||||
CanvasRenderer:
|
||||
@ -312,8 +312,8 @@ RectTransform:
|
||||
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: -320}
|
||||
m_SizeDelta: {x: 83.71, y: 120}
|
||||
m_AnchoredPosition: {x: 0, y: -350}
|
||||
m_SizeDelta: {x: 179.24, y: 120}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &1841050712205587428
|
||||
CanvasRenderer:
|
||||
@ -366,19 +366,7 @@ MonoBehaviour:
|
||||
m_TargetGraphic: {fileID: 9207469817372238632}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 1794702731584971318}
|
||||
m_TargetAssemblyTypeName: BlueWater.Titles.TycoonTitle, Assembly-CSharp
|
||||
m_MethodName: MoveLobbyScene
|
||||
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
|
||||
m_Calls: []
|
||||
--- !u!114 &9048322436433618005
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -442,6 +430,10 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 146274224066469419, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 414015556802972880, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
@ -512,7 +504,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2905220476270864484, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 83.71
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2905220476270864484, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -524,7 +516,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3190523722978597758, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 83.71
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3190523722978597758, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -584,28 +576,12 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -440
|
||||
value: -470
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3949558785420068140, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3973267797173742279, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3973267797173742279, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3973267797173742279, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3973267797173742279, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -615
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3976132546625396958, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
@ -672,7 +648,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -200
|
||||
value: -230
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5833474583663148126, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -956,23 +932,23 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7973872587360361026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7973872587360361026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7973872587360361026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 83.71
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7973872587360361026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 65.17
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7973872587360361026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -60
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8069869802901706048, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_Navigation.m_SelectOnDown
|
||||
@ -1036,7 +1012,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -80
|
||||
value: -110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855145811590553786, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -1048,23 +1024,23 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8965111959608574307, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8965111959608574307, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8965111959608574307, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 83.71
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8965111959608574307, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 65.17
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8965111959608574307, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -60
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects:
|
||||
|
||||
@ -2133,8 +2133,8 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: "\uC815\uB9D0\uB85C \uAC8C\uC784\uC744 \uC885\uB8CC\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
|
||||
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
|
||||
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
@ -2257,7 +2257,7 @@ GameObject:
|
||||
- component: {fileID: 482401147689031712}
|
||||
- component: {fileID: 4675757235514813761}
|
||||
m_Layer: 5
|
||||
m_Name: DeclineButton
|
||||
m_Name: CancelButton
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -2282,7 +2282,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 250, y: -50}
|
||||
m_SizeDelta: {x: 82.81, y: 120}
|
||||
m_SizeDelta: {x: 83.71, y: 120}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &4836823861702163095
|
||||
CanvasRenderer:
|
||||
@ -2309,7 +2309,7 @@ MonoBehaviour:
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 3216032435282479604}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
@ -7123,7 +7123,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -60}
|
||||
m_SizeDelta: {x: 82.81, y: 65.17}
|
||||
m_SizeDelta: {x: 83.71, y: 65.17}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &7811033350861598820
|
||||
CanvasRenderer:
|
||||
@ -7155,8 +7155,8 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: "\uD655\uC778"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
|
||||
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
|
||||
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
@ -10164,7 +10164,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -60}
|
||||
m_SizeDelta: {x: 82.81, y: 65.17}
|
||||
m_SizeDelta: {x: 83.71, y: 65.17}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &1150131768555001774
|
||||
CanvasRenderer:
|
||||
@ -10196,8 +10196,8 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: "\uCDE8\uC18C"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
|
||||
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
|
||||
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
@ -11243,6 +11243,7 @@ GameObject:
|
||||
- component: {fileID: 3484035362484606752}
|
||||
- component: {fileID: 9207272460605448926}
|
||||
- component: {fileID: 2087503127898626585}
|
||||
- component: {fileID: 2548041128191055270}
|
||||
m_Layer: 5
|
||||
m_Name: TycoonTitleMenuCanvas
|
||||
m_TagString: Untagged
|
||||
@ -11348,7 +11349,7 @@ MonoBehaviour:
|
||||
_panel: {fileID: 3706005337972264669}
|
||||
_titleMenuUiPanel: {fileID: 7860688818721824856}
|
||||
titleOptions: {fileID: 9207272460605448926}
|
||||
titleQuit: {fileID: 2087503127898626585}
|
||||
titleQuitUi: {fileID: 2087503127898626585}
|
||||
_startGameButton: {fileID: 6620118968858819738}
|
||||
_resumeGameButton: {fileID: 0}
|
||||
_optionsButton: {fileID: 8069869802901706048}
|
||||
@ -11358,6 +11359,7 @@ MonoBehaviour:
|
||||
_versionText: {fileID: 408792858244141541}
|
||||
_dailyBgm: TycoonTitleBgm01
|
||||
_ink: {fileID: 8241840109796323035}
|
||||
_uiNavigationController: {fileID: 2548041128191055270}
|
||||
--- !u!114 &9207272460605448926
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -11390,6 +11392,23 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_panel: {fileID: 146274224066469419}
|
||||
_confirmButton: {fileID: 3216032435282479604}
|
||||
_cancelButton: {fileID: 6216237321367475084}
|
||||
_uiNavigationController: {fileID: 2548041128191055270}
|
||||
--- !u!114 &2548041128191055270
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7906113444432610149}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 44fd527766f4ac945ad8aaa085cb1932, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_selectObject: {fileID: 8454452712375467706}
|
||||
_isEnable: 0
|
||||
--- !u!1 &7939965459843172077
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -12504,7 +12523,7 @@ GameObject:
|
||||
- component: {fileID: 1028646957849718496}
|
||||
- component: {fileID: 436952857356203930}
|
||||
m_Layer: 5
|
||||
m_Name: 'AcceptButton '
|
||||
m_Name: 'ConfirmButton '
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -12529,7 +12548,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -250, y: -50}
|
||||
m_SizeDelta: {x: 82.81, y: 120}
|
||||
m_SizeDelta: {x: 83.71, y: 120}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &5347865266708652903
|
||||
CanvasRenderer:
|
||||
@ -12557,7 +12576,7 @@ MonoBehaviour:
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 6216237321367475084}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
@ -13755,8 +13774,8 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: "\uACBD\uACE0"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
|
||||
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
|
||||
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
||||
84
Assets/07.Animations/Uis/Loading.anim
Normal file
84
Assets/07.Animations/Uis/Loading.anim
Normal file
@ -0,0 +1,84 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!74 &7400000
|
||||
AnimationClip:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Loading
|
||||
serializedVersion: 7
|
||||
m_Legacy: 0
|
||||
m_Compressed: 0
|
||||
m_UseHighQualityCurve: 1
|
||||
m_RotationCurves: []
|
||||
m_CompressedRotationCurves: []
|
||||
m_EulerCurves: []
|
||||
m_PositionCurves: []
|
||||
m_ScaleCurves: []
|
||||
m_FloatCurves: []
|
||||
m_PPtrCurves:
|
||||
- serializedVersion: 2
|
||||
curve:
|
||||
- time: 0
|
||||
value: {fileID: 1904124557, guid: 178457aaf91324c41acddbceb592e060, type: 3}
|
||||
- time: 0.33333334
|
||||
value: {fileID: 1391326846, guid: 4742ea007da88f34a830405fbd8ba537, type: 3}
|
||||
- time: 0.6666667
|
||||
value: {fileID: -34333619, guid: 539b219a787d2904db462dc5b737dda4, type: 3}
|
||||
- time: 1
|
||||
value: {fileID: -6202561, guid: 0c1125cfec44fc2419b09df8586a05ee, type: 3}
|
||||
- time: 1.3333334
|
||||
value: {fileID: 1904124557, guid: 178457aaf91324c41acddbceb592e060, type: 3}
|
||||
attribute: m_Sprite
|
||||
path:
|
||||
classID: 114
|
||||
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
flags: 2
|
||||
m_SampleRate: 60
|
||||
m_WrapMode: 0
|
||||
m_Bounds:
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
m_Extent: {x: 0, y: 0, z: 0}
|
||||
m_ClipBindingConstant:
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
attribute: 2015549526
|
||||
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
typeID: 114
|
||||
customType: 0
|
||||
isPPtrCurve: 1
|
||||
isIntCurve: 0
|
||||
isSerializeReferenceCurve: 0
|
||||
pptrCurveMapping:
|
||||
- {fileID: 1904124557, guid: 178457aaf91324c41acddbceb592e060, type: 3}
|
||||
- {fileID: 1391326846, guid: 4742ea007da88f34a830405fbd8ba537, type: 3}
|
||||
- {fileID: -34333619, guid: 539b219a787d2904db462dc5b737dda4, type: 3}
|
||||
- {fileID: -6202561, guid: 0c1125cfec44fc2419b09df8586a05ee, type: 3}
|
||||
- {fileID: 1904124557, guid: 178457aaf91324c41acddbceb592e060, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
m_AdditiveReferencePoseTime: 0
|
||||
m_StartTime: 0
|
||||
m_StopTime: 1.35
|
||||
m_OrientationOffsetY: 0
|
||||
m_Level: 0
|
||||
m_CycleOffset: 0
|
||||
m_HasAdditiveReferencePose: 0
|
||||
m_LoopTime: 1
|
||||
m_LoopBlend: 0
|
||||
m_LoopBlendOrientation: 0
|
||||
m_LoopBlendPositionY: 0
|
||||
m_LoopBlendPositionXZ: 0
|
||||
m_KeepOriginalOrientation: 0
|
||||
m_KeepOriginalPositionY: 1
|
||||
m_KeepOriginalPositionXZ: 0
|
||||
m_HeightFromFeet: 0
|
||||
m_Mirror: 0
|
||||
m_EditorCurves: []
|
||||
m_EulerEditorCurves: []
|
||||
m_HasGenericRootTransform: 0
|
||||
m_HasMotionFloatCurves: 0
|
||||
m_Events: []
|
||||
8
Assets/07.Animations/Uis/Loading.anim.meta
Normal file
8
Assets/07.Animations/Uis/Loading.anim.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b1b688043720106439415bc097bd69b2
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
72
Assets/07.Animations/Uis/Loading.controller
Normal file
72
Assets/07.Animations/Uis/Loading.controller
Normal file
@ -0,0 +1,72 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1102 &-5927494118591603477
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Loading
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
m_StateMachineBehaviours: []
|
||||
m_Position: {x: 50, y: 50, z: 0}
|
||||
m_IKOnFeet: 0
|
||||
m_WriteDefaultValues: 1
|
||||
m_Mirror: 0
|
||||
m_SpeedParameterActive: 0
|
||||
m_MirrorParameterActive: 0
|
||||
m_CycleOffsetParameterActive: 0
|
||||
m_TimeParameterActive: 0
|
||||
m_Motion: {fileID: 7400000, guid: b1b688043720106439415bc097bd69b2, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1107 &-1588401849712826424
|
||||
AnimatorStateMachine:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Base Layer
|
||||
m_ChildStates:
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -5927494118591603477}
|
||||
m_Position: {x: 400, y: 150, z: 0}
|
||||
m_ChildStateMachines: []
|
||||
m_AnyStateTransitions: []
|
||||
m_EntryTransitions: []
|
||||
m_StateMachineTransitions: {}
|
||||
m_StateMachineBehaviours: []
|
||||
m_AnyStatePosition: {x: 50, y: 20, z: 0}
|
||||
m_EntryPosition: {x: 50, y: 120, z: 0}
|
||||
m_ExitPosition: {x: 800, y: 120, z: 0}
|
||||
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
||||
m_DefaultState: {fileID: -5927494118591603477}
|
||||
--- !u!91 &9100000
|
||||
AnimatorController:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Loading
|
||||
serializedVersion: 5
|
||||
m_AnimatorParameters: []
|
||||
m_AnimatorLayers:
|
||||
- serializedVersion: 5
|
||||
m_Name: Base Layer
|
||||
m_StateMachine: {fileID: -1588401849712826424}
|
||||
m_Mask: {fileID: 0}
|
||||
m_Motions: []
|
||||
m_Behaviours: []
|
||||
m_BlendingMode: 0
|
||||
m_SyncedLayerIndex: -1
|
||||
m_DefaultWeight: 0
|
||||
m_IKPass: 0
|
||||
m_SyncedLayerAffectsTiming: 0
|
||||
m_Controller: {fileID: 9100000}
|
||||
8
Assets/07.Animations/Uis/Loading.controller.meta
Normal file
8
Assets/07.Animations/Uis/Loading.controller.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0a71dea97300b8342b412cb7a8e85216
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 9100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@ -1,18 +1,23 @@
|
||||
Barrel.png
|
||||
size:2019,507
|
||||
size:1522,945
|
||||
filter:Linear,Linear
|
||||
Back
|
||||
bounds:2,465,509,478
|
||||
Barrel_Clean
|
||||
bounds:2,2,503,473
|
||||
rotate:90
|
||||
bounds:2,2,489,461
|
||||
Barrel_Dirty
|
||||
bounds:477,2,503,473
|
||||
rotate:90
|
||||
bounds:513,465,509,478
|
||||
Blue
|
||||
bounds:986,133,132,330
|
||||
DirtyLine01
|
||||
bounds:1413,21,484,459
|
||||
rotate:90
|
||||
bounds:1024,484,484,459
|
||||
DirtyLine02
|
||||
bounds:952,14,491,459
|
||||
rotate:90
|
||||
bounds:493,4,491,459
|
||||
Green
|
||||
bounds:1120,152,132,330
|
||||
Head
|
||||
bounds:1874,326,179,143
|
||||
rotate:90
|
||||
bounds:1120,7,179,143
|
||||
Pink
|
||||
bounds:1254,152,132,330
|
||||
Yellow
|
||||
bounds:1388,152,132,330
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 521 KiB After Width: | Height: | Size: 816 KiB |
Binary file not shown.
@ -1,20 +1,20 @@
|
||||
LimeTree.png
|
||||
size:1273,998
|
||||
size:1263,986
|
||||
filter:Linear,Linear
|
||||
10
|
||||
bounds:1018,24,304,236
|
||||
bounds:1008,12,304,236
|
||||
rotate:90
|
||||
100
|
||||
bounds:1018,664,332,253
|
||||
bounds:1008,652,332,253
|
||||
rotate:90
|
||||
50
|
||||
bounds:1018,330,332,246
|
||||
bounds:1008,318,332,246
|
||||
rotate:90
|
||||
LimeTree0
|
||||
bounds:2,2,506,496
|
||||
bounds:2,2,501,490
|
||||
LimeTree0-
|
||||
bounds:2,500,506,496
|
||||
bounds:2,494,501,490
|
||||
LimeTree100
|
||||
bounds:510,500,506,496
|
||||
bounds:505,494,501,490
|
||||
LimeTree50
|
||||
bounds:510,2,506,496
|
||||
bounds:505,2,501,490
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 580 KiB After Width: | Height: | Size: 436 KiB |
Binary file not shown.
@ -1,14 +1,14 @@
|
||||
Slime.png
|
||||
size:794,524
|
||||
size:791,523
|
||||
filter:Linear,Linear
|
||||
Back
|
||||
bounds:2,144,506,378
|
||||
bounds:2,148,504,373
|
||||
Front
|
||||
bounds:510,58,464,282
|
||||
bounds:508,57,464,281
|
||||
rotate:90
|
||||
Slime1
|
||||
bounds:456,3,69,53
|
||||
bounds:454,2,69,53
|
||||
Slime2
|
||||
bounds:232,2,222,140
|
||||
bounds:231,6,221,140
|
||||
Slime3
|
||||
bounds:2,2,228,140
|
||||
bounds:2,7,227,139
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 233 KiB After Width: | Height: | Size: 174 KiB |
Binary file not shown.
@ -1,27 +1,29 @@
|
||||
Trashcan.png
|
||||
size:2015,800
|
||||
size:1967,828
|
||||
filter:Linear,Linear
|
||||
01/Body
|
||||
bounds:1212,368,430,379
|
||||
bounds:418,390,436,384
|
||||
rotate:90
|
||||
01/Body_White
|
||||
bounds:826,368,430,384
|
||||
bounds:1602,2,408,363
|
||||
rotate:90
|
||||
01/Eye
|
||||
bounds:2,14,270,155
|
||||
bounds:2,54,256,147
|
||||
rotate:90
|
||||
01/White
|
||||
bounds:826,2,410,364
|
||||
bounds:838,3,388,344
|
||||
rotate:90
|
||||
01/쓰레기통
|
||||
bounds:1238,2,410,364
|
||||
bounds:1184,21,416,370
|
||||
01/쓰레기통02
|
||||
bounds:414,3,410,365
|
||||
bounds:1220,412,414,369
|
||||
rotate:90
|
||||
01/쓰레기통03
|
||||
bounds:1650,14,410,363
|
||||
bounds:1591,412,414,365
|
||||
rotate:90
|
||||
01/쓰레기통04
|
||||
bounds:1593,426,410,372
|
||||
bounds:418,8,418,380
|
||||
01/쓰레기통05
|
||||
bounds:414,370,410,428
|
||||
bounds:804,393,414,433
|
||||
01/쓰레기통06
|
||||
bounds:2,286,410,512
|
||||
bounds:2,312,414,514
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 514 KiB After Width: | Height: | Size: 642 KiB |
Binary file not shown.
24
Assets/AddressableAssetsData/link.xml
Normal file
24
Assets/AddressableAssetsData/link.xml
Normal file
@ -0,0 +1,24 @@
|
||||
<linker>
|
||||
<assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
|
||||
<type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
|
||||
</assembly>
|
||||
<assembly fullname="Unity.Localization, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
||||
<type fullname="UnityEngine.Localization.Locale" preserve="all" />
|
||||
<type fullname="UnityEngine.Localization.Tables.SharedTableData" preserve="all" />
|
||||
<type fullname="UnityEngine.Localization.Tables.StringTable" preserve="all" />
|
||||
<type fullname="UnityEngine.Localization.LocaleIdentifier" preserve="nothing" serialized="true" />
|
||||
<type fullname="UnityEngine.Localization.Metadata.MetadataCollection" preserve="nothing" serialized="true" />
|
||||
<type fullname="UnityEngine.Localization.Tables.TableEntryData" preserve="nothing" serialized="true" />
|
||||
<type fullname="UnityEngine.Localization.Tables.DistributedUIDGenerator" preserve="nothing" serialized="true" />
|
||||
<type fullname="UnityEngine.Localization.Tables.SharedTableData/SharedTableEntry" preserve="nothing" serialized="true" />
|
||||
</assembly>
|
||||
<assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
|
||||
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
|
||||
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
|
||||
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
|
||||
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
|
||||
</assembly>
|
||||
<assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
||||
<type fullname="UnityEngine.Object" preserve="all" />
|
||||
</assembly>
|
||||
</linker>
|
||||
7
Assets/AddressableAssetsData/link.xml.meta
Normal file
7
Assets/AddressableAssetsData/link.xml.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0a10b6b885a6b3747ad095c3e0a07009
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -140,7 +140,7 @@ PlayerSettings:
|
||||
loadStoreDebugModeEnabled: 0
|
||||
visionOSBundleVersion: 1.0
|
||||
tvOSBundleVersion: 1.0
|
||||
bundleVersion: 0.3.4.24
|
||||
bundleVersion: 0.3.5.0
|
||||
preloadedAssets:
|
||||
- {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
|
||||
- {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user