0.3.2.9
This commit is contained in:
SweetJJuya
parent
da35977888
commit
c58074df41
@ -2600,59 +2600,6 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1360757596}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &186139407
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 186139408}
|
||||
- component: {fileID: 186139409}
|
||||
m_Layer: 5
|
||||
m_Name: SelectCardUi
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &186139408
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 186139407}
|
||||
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: 737939132}
|
||||
m_Father: {fileID: 1049919592}
|
||||
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: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &186139409
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 186139407}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3dd7358ce993836479029d580437bb79, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
card01: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
card02: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
card03: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
upgradePopup: {fileID: 2044341158}
|
||||
--- !u!1 &194818728
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -8350,112 +8297,6 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1001 &737939131
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 186139408}
|
||||
m_Modifications:
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Card
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
--- !u!224 &737939132 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
m_PrefabInstance: {fileID: 737939131}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &738101929
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -9358,6 +9199,59 @@ RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3}
|
||||
m_PrefabInstance: {fileID: 810401071}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &812672355
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 812672356}
|
||||
- component: {fileID: 812672357}
|
||||
m_Layer: 5
|
||||
m_Name: SelectCardUi
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &812672356
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 812672355}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1.0007789, y: 1.0007789, z: 1.0007789}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1182441931}
|
||||
m_Father: {fileID: 1049919592}
|
||||
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 &812672357
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 812672355}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3dd7358ce993836479029d580437bb79, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
card01: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
card02: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
card03: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
_upgradePopup: {fileID: 2044341158}
|
||||
--- !u!1001 &842924126
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -11893,11 +11787,11 @@ RectTransform:
|
||||
- {fileID: 102499728}
|
||||
- {fileID: 1733600342}
|
||||
- {fileID: 1909799357}
|
||||
- {fileID: 812672356}
|
||||
- {fileID: 2032162537}
|
||||
- {fileID: 186139408}
|
||||
- {fileID: 1923064098}
|
||||
- {fileID: 1402684326}
|
||||
- {fileID: 2055805161}
|
||||
- {fileID: 1923064098}
|
||||
- {fileID: 2044341159}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -11924,6 +11818,7 @@ MonoBehaviour:
|
||||
<TycoonUpgradeUi>k__BackingField: {fileID: 1496452083}
|
||||
<TycoonManagementUi>k__BackingField: {fileID: 102499729}
|
||||
<TycoonStageUi>k__BackingField: {fileID: 1733600343}
|
||||
<ManualBook>k__BackingField: {fileID: 1923064099}
|
||||
_fadeImage: {fileID: 2055805162}
|
||||
--- !u!114 &1049919594
|
||||
MonoBehaviour:
|
||||
@ -12550,7 +12445,6 @@ GameObject:
|
||||
- component: {fileID: 1089977126}
|
||||
- component: {fileID: 1089977128}
|
||||
- component: {fileID: 1089977127}
|
||||
- component: {fileID: 1089977129}
|
||||
m_Layer: 5
|
||||
m_Name: Book
|
||||
m_TagString: Untagged
|
||||
@ -12565,7 +12459,7 @@ RectTransform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1089977125}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
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
|
||||
@ -12578,11 +12472,11 @@ RectTransform:
|
||||
- {fileID: 2107551723}
|
||||
m_Father: {fileID: 1923064098}
|
||||
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: -11}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1600, y: 1000}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!114 &1089977127
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -12621,26 +12515,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1089977125}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1089977129
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1089977125}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 8060041d8c8fb244cb07544f18cfb017, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_ManualCocktailsPrefabs: {fileID: 181779769155476833, guid: 52e209f6535e22848b973ed5de9cbc18, type: 3}
|
||||
LiquidA_Sprite: {fileID: 21300000, guid: a8c45767f0a3ec245a47087c7ada2b50, type: 3}
|
||||
LiquidB_Sprite: {fileID: 21300000, guid: 216cb30d7010e95499c22161ccfde634, type: 3}
|
||||
LiquidC_Sprite: {fileID: 21300000, guid: 404e93e2e77f60b49bbcbf1df18904d3, type: 3}
|
||||
LiquidD_Sprite: {fileID: 21300000, guid: a575a803ef0529e43bcbbe8ccdbb34b2, type: 3}
|
||||
LiquidE_Sprite: {fileID: 21300000, guid: 2fc24dca6ce6ac94da0187dfce24fa3a, type: 3}
|
||||
Garnish1_Sprite: {fileID: 21300000, guid: ddde5976023f9be4e83dc3d867c2dc30, type: 3}
|
||||
Garnish2_Sprite: {fileID: 21300000, guid: 1506abfb2ff26fa4aacdeb4b0efc9663, type: 3}
|
||||
--- !u!1 &1092164769
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -14105,6 +13979,81 @@ MonoBehaviour:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_IsOn: 1
|
||||
--- !u!1 &1182441930
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1182441931}
|
||||
- component: {fileID: 1182441933}
|
||||
- component: {fileID: 1182441932}
|
||||
m_Layer: 5
|
||||
m_Name: Panel
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1182441931
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1182441930}
|
||||
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: 812672356}
|
||||
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 &1182441932
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1182441930}
|
||||
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: 0, g: 0, b: 0, a: 0.78431374}
|
||||
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: 0}
|
||||
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 &1182441933
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1182441930}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1222400257 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 352929351692761553, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
|
||||
@ -25434,7 +25383,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1923064098
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -25450,10 +25399,10 @@ RectTransform:
|
||||
- {fileID: 1089977126}
|
||||
m_Father: {fileID: 1049919592}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1728, y: 1080}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1923064099
|
||||
MonoBehaviour:
|
||||
@ -25464,11 +25413,19 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1923064097}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b8498f6e06512424fb9f91596a3021b0, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 8060041d8c8fb244cb07544f18cfb017, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
SwitchMapsOpened: 2
|
||||
SwitchMapsClosed: 1
|
||||
_ManualCocktailsPrefabs: {fileID: 6667137138327223632, guid: 52e209f6535e22848b973ed5de9cbc18, type: 3}
|
||||
LiquidA_Sprite: {fileID: 21300000, guid: a8c45767f0a3ec245a47087c7ada2b50, type: 3}
|
||||
LiquidB_Sprite: {fileID: 21300000, guid: 216cb30d7010e95499c22161ccfde634, type: 3}
|
||||
LiquidC_Sprite: {fileID: 21300000, guid: 404e93e2e77f60b49bbcbf1df18904d3, type: 3}
|
||||
LiquidD_Sprite: {fileID: 21300000, guid: a575a803ef0529e43bcbbe8ccdbb34b2, type: 3}
|
||||
LiquidE_Sprite: {fileID: 21300000, guid: 2fc24dca6ce6ac94da0187dfce24fa3a, type: 3}
|
||||
Garnish1_Sprite: {fileID: 21300000, guid: ddde5976023f9be4e83dc3d867c2dc30, type: 3}
|
||||
Garnish2_Sprite: {fileID: 21300000, guid: 1506abfb2ff26fa4aacdeb4b0efc9663, type: 3}
|
||||
--- !u!1001 &1924794515
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -27096,6 +27053,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_animationController: {fileID: 1125211611}
|
||||
information: {fileID: 880125818}
|
||||
--- !u!1 &2048187805
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -112,6 +112,14 @@ namespace BlueWater.Players.Tycoons
|
||||
}
|
||||
}
|
||||
|
||||
public void OnManual(InputAction.CallbackContext context)
|
||||
{
|
||||
if (context.performed)
|
||||
{
|
||||
TycoonUiManager.Instance.ManualBook.Open(TycoonUiManager.Instance.PopupUiList);
|
||||
}
|
||||
}
|
||||
|
||||
// TycoonUi
|
||||
public void OnCancel(InputAction.CallbackContext context)
|
||||
{
|
||||
@ -121,6 +129,14 @@ namespace BlueWater.Players.Tycoons
|
||||
}
|
||||
}
|
||||
|
||||
public void OnCancelManual(InputAction.CallbackContext context)
|
||||
{
|
||||
if (context.performed)
|
||||
{
|
||||
TycoonUiManager.Instance.ManualBook.Close();
|
||||
}
|
||||
}
|
||||
|
||||
// Bar
|
||||
public void OnPour(InputAction.CallbackContext context)
|
||||
{
|
||||
|
||||
@ -547,6 +547,15 @@
|
||||
"processors": "",
|
||||
"interactions": "",
|
||||
"initialStateCheck": false
|
||||
},
|
||||
{
|
||||
"name": "Manual",
|
||||
"type": "Button",
|
||||
"id": "ef02b0fe-8d61-4bdb-bd1e-543575b67aa0",
|
||||
"expectedControlType": "",
|
||||
"processors": "",
|
||||
"interactions": "",
|
||||
"initialStateCheck": false
|
||||
}
|
||||
],
|
||||
"bindings": [
|
||||
@ -626,6 +635,17 @@
|
||||
"action": "DevelopKey01",
|
||||
"isComposite": false,
|
||||
"isPartOfComposite": false
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"id": "2659dfed-88b1-409d-adaf-2ea5c3c6ee2c",
|
||||
"path": "<Keyboard>/q",
|
||||
"interactions": "",
|
||||
"processors": "",
|
||||
"groups": ";Keyboard&Mouse",
|
||||
"action": "Manual",
|
||||
"isComposite": false,
|
||||
"isPartOfComposite": false
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -641,6 +661,15 @@
|
||||
"processors": "",
|
||||
"interactions": "",
|
||||
"initialStateCheck": false
|
||||
},
|
||||
{
|
||||
"name": "CancelManual",
|
||||
"type": "Button",
|
||||
"id": "c30fb3f3-d280-4b30-af6c-15f7483fd658",
|
||||
"expectedControlType": "",
|
||||
"processors": "",
|
||||
"interactions": "",
|
||||
"initialStateCheck": false
|
||||
}
|
||||
],
|
||||
"bindings": [
|
||||
@ -654,6 +683,17 @@
|
||||
"action": "Cancel",
|
||||
"isComposite": false,
|
||||
"isPartOfComposite": false
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"id": "3977d80c-8375-41ca-8f34-74a85d855963",
|
||||
"path": "<Keyboard>/q",
|
||||
"interactions": "",
|
||||
"processors": "",
|
||||
"groups": ";Keyboard&Mouse",
|
||||
"action": "CancelManual",
|
||||
"isComposite": false,
|
||||
"isPartOfComposite": false
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
@ -38,12 +38,10 @@ namespace BlueWater
|
||||
if (_selectedCard.ContainsKey(cardData.Idx))
|
||||
{
|
||||
_selectedCard[cardData.Idx] += 1;
|
||||
Debug.Log(_selectedCard[cardData.Idx]);
|
||||
}
|
||||
else // 신규
|
||||
{
|
||||
_selectedCard[cardData.Idx] = 1; // TryAdd를 사용하지 않고 대입
|
||||
Debug.Log(_selectedCard[cardData.Idx]);
|
||||
}
|
||||
}
|
||||
|
||||
@ -60,7 +58,6 @@ namespace BlueWater
|
||||
|
||||
if (levelIdx <= 5)
|
||||
{
|
||||
Debug.Log("<= 5");
|
||||
return null;
|
||||
}
|
||||
else if (cardData.Idx.Equals("AddAllLiquid"))
|
||||
|
||||
@ -4,6 +4,7 @@ using System.Linq;
|
||||
using BlueWater;
|
||||
using BlueWater.Items;
|
||||
using BlueWater.Tycoons;
|
||||
using BlueWater.Uis;
|
||||
using ExcelDataReader.Log;
|
||||
using TMPro;
|
||||
using Unity.VisualScripting;
|
||||
@ -13,7 +14,7 @@ using Sirenix.OdinInspector;
|
||||
using Spine;
|
||||
using UnityEngine.Android;
|
||||
|
||||
public class ManualBook : MonoBehaviour
|
||||
public class ManualBook : SwitchActionPopupUi
|
||||
{
|
||||
private Image _cocktailImage;
|
||||
private TextMeshProUGUI _cocktailName;
|
||||
@ -22,7 +23,7 @@ public class ManualBook : MonoBehaviour
|
||||
private GameObject _ingredientSlot3;
|
||||
|
||||
[field: SerializeField, CLabel("메뉴얼 CockTail Prefab")]
|
||||
private GameObject _ManualCocktailsPrefabs;
|
||||
private ManualCocktailButton _ManualCocktailsPrefabs;
|
||||
|
||||
[field: SerializeField, CLabel("리큐르A 이미지")]
|
||||
private Sprite LiquidA_Sprite;
|
||||
@ -87,18 +88,19 @@ public class ManualBook : MonoBehaviour
|
||||
|
||||
void Start()
|
||||
{
|
||||
_cocktailImage = transform.Find("CooktailPreview").Find("CocktailImage").GetComponent<Image>();
|
||||
_cocktailName = transform.Find("CocktailName").GetComponent<TextMeshProUGUI>();
|
||||
_ingredientSlot1 = transform.Find("IngredientSlot1").gameObject;
|
||||
_ingredientSlot2 = transform.Find("IngredientSlot2").gameObject;
|
||||
_ingredientSlot3 = transform.Find("IngredientSlot3").gameObject;
|
||||
var book = transform.Find("Book");
|
||||
_cocktailImage = book.Find("CooktailPreview").Find("CocktailImage").GetComponent<Image>();
|
||||
_cocktailName = book.Find("CocktailName").GetComponent<TextMeshProUGUI>();
|
||||
_ingredientSlot1 = book.Find("IngredientSlot1").gameObject;
|
||||
_ingredientSlot2 = book.Find("IngredientSlot2").gameObject;
|
||||
_ingredientSlot3 = book.Find("IngredientSlot3").gameObject;
|
||||
|
||||
_cocktailsBtn = new Dictionary<string,CocktailsBtn>();
|
||||
_cocktailName = transform.Find("CocktailName").GetComponent<TextMeshProUGUI>();
|
||||
_cocktailName = book.Find("CocktailName").GetComponent<TextMeshProUGUI>();
|
||||
|
||||
_ingredientSlot1 = transform.Find("IngredientSlot1").gameObject;
|
||||
_ingredientSlot2 = transform.Find("IngredientSlot2").gameObject;
|
||||
_ingredientSlot3 = transform.Find("IngredientSlot3").gameObject;
|
||||
_ingredientSlot1 = book.Find("IngredientSlot1").gameObject;
|
||||
_ingredientSlot2 = book.Find("IngredientSlot2").gameObject;
|
||||
_ingredientSlot3 = book.Find("IngredientSlot3").gameObject;
|
||||
|
||||
// private Image _ingredientSlot1Image;
|
||||
// private Image _ingredientSlot2Image;
|
||||
@ -109,11 +111,12 @@ public class ManualBook : MonoBehaviour
|
||||
{
|
||||
if (element.Idx.Equals("Cocktail000")) continue; //쓰레기는 메뉴얼에 표시하지 않기
|
||||
|
||||
var cocktail = Instantiate(_ManualCocktailsPrefabs, transform.Find("CocktailButtons"));
|
||||
var cocktail = Instantiate(_ManualCocktailsPrefabs, book.Find("CocktailButtons"));
|
||||
cocktail.Initialize(this);
|
||||
cocktail.name = element.Idx;
|
||||
cocktail.transform.Find("Image").GetComponent<Image>().sprite = element.Sprite;
|
||||
|
||||
var createCocktailMenu = new CocktailsBtn(element ,cocktail ,element.Idx,element.Name);
|
||||
var createCocktailMenu = new CocktailsBtn(element ,cocktail.gameObject ,element.Idx,element.Name);
|
||||
|
||||
foreach (var element2 in element.ValidIngredients) //들어가는 리큐르, 가니쉬 종류
|
||||
{
|
||||
@ -143,6 +146,18 @@ public class ManualBook : MonoBehaviour
|
||||
|
||||
}
|
||||
|
||||
public override void Open(List<PopupUi> popupUiList)
|
||||
{
|
||||
base.Open(popupUiList);
|
||||
VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f);
|
||||
}
|
||||
|
||||
public override void Close()
|
||||
{
|
||||
base.Close();
|
||||
VisualFeedbackManager.Instance.ResetTimeScale();
|
||||
}
|
||||
|
||||
private void Update_Cocktails()
|
||||
{
|
||||
int playerLv = TycoonManager.Instance.TycoonStatus.CurrentLevel;
|
||||
|
||||
@ -13,6 +13,11 @@ public class ManualCocktailButton : MonoBehaviour
|
||||
button.onClick.AddListener(() => OnButtonClicked());
|
||||
}
|
||||
|
||||
public void Initialize(ManualBook manualBook)
|
||||
{
|
||||
manual = manualBook;
|
||||
}
|
||||
|
||||
// 눌린 버튼을 매개변수로 받는 메서드
|
||||
public void OnButtonClicked()
|
||||
{
|
||||
|
||||
@ -147,7 +147,7 @@ public class TycoonCard : MonoBehaviour
|
||||
elapsedTime += Time.unscaledDeltaTime;
|
||||
|
||||
float t = elapsedTime / 0.5f;
|
||||
float easedT = easedT = EaseEffect.BounceOut(t);
|
||||
float easedT = EaseEffect.BounceOut(t);
|
||||
|
||||
_cardComTransform.localScale = Vector3.Lerp(initialScale, new Vector3(0.95f,0.95f,0.95f), easedT);
|
||||
|
||||
|
||||
@ -28,6 +28,11 @@ namespace BlueWater.Uis
|
||||
|
||||
private LevelData _lvData;
|
||||
|
||||
|
||||
[field: SerializeField, CLabel("업그레이드_스크립트")]
|
||||
private GameObject _upgradePopup;
|
||||
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
EventManager.OnLevelUp += Test;
|
||||
@ -291,9 +296,17 @@ namespace BlueWater.Uis
|
||||
|
||||
HideUi();
|
||||
|
||||
if (int.Parse(_lvData.Idx) %5 == 0)
|
||||
{
|
||||
_upgradePopup.SetActive(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
VisualFeedbackManager.Instance.ResetTimeScale();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void ShowUi() => _panel.SetActive(true);
|
||||
public void HideUi() => _panel.SetActive(false);
|
||||
}
|
||||
|
||||
@ -27,6 +27,9 @@ namespace BlueWater.Uis
|
||||
[field: SerializeField]
|
||||
public TycoonStageUi TycoonStageUi { get; private set; }
|
||||
|
||||
[field: SerializeField]
|
||||
public ManualBook ManualBook { get; private set; }
|
||||
|
||||
// [field: SerializeField]
|
||||
// public BrewingUi BrewingUi { get; private set; }
|
||||
|
||||
@ -81,6 +84,7 @@ namespace BlueWater.Uis
|
||||
TycoonManagementUi = GetComponentInChildren<TycoonManagementUi>(true);
|
||||
TycoonStageUi = GetComponentInChildren<TycoonStageUi>(true);
|
||||
//BrewingUi = GetComponentInChildren<BrewingUi>(true);
|
||||
ManualBook = GetComponentInChildren<ManualBook>(true);
|
||||
_fadeImage = MainCanvas.transform.Find("FadeImage").GetComponent<Image>();
|
||||
PopupUiList = new List<PopupUi>(8);
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
using System.Collections;
|
||||
using BlueWater;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class Upgrade_Popup : MonoBehaviour
|
||||
{
|
||||
@ -8,6 +9,10 @@ public class Upgrade_Popup : MonoBehaviour
|
||||
private AnimationController _animationController;
|
||||
private bool isReversing = false; // 애니메이션 상태를 체크할 변수
|
||||
|
||||
[SerializeField]
|
||||
private Image information; //정보를 알려주는 이미지
|
||||
|
||||
|
||||
// Start is called once before the first execution of Update after the MonoBehaviour is created
|
||||
void OnEnable()
|
||||
{
|
||||
@ -17,29 +22,59 @@ public class Upgrade_Popup : MonoBehaviour
|
||||
// ReSharper disable Unity.PerformanceAnalysis
|
||||
private IEnumerator StartUpgradePopup()
|
||||
{
|
||||
float normalizedTime = _animationController.GetCurrentAnimationNormalizedTime();
|
||||
Debug.Log(normalizedTime);
|
||||
|
||||
if (normalizedTime >= 1f)
|
||||
{
|
||||
yield return new WaitForSeconds(_animationController.GetCurrentAnimationLength());
|
||||
}
|
||||
|
||||
float timer = 0f;
|
||||
|
||||
while (timer < 3.0)
|
||||
while (timer < 1.0f)
|
||||
{
|
||||
timer += Time.unscaledDeltaTime;
|
||||
yield return null;
|
||||
}
|
||||
|
||||
_animationController.PlayAnimation("CardUpgrade_Reverse");
|
||||
normalizedTime = _animationController.GetCurrentAnimationNormalizedTime();
|
||||
Debug.Log(normalizedTime);
|
||||
timer = 0f;
|
||||
|
||||
if (normalizedTime >= 1f)
|
||||
while (timer < 0.5)
|
||||
{
|
||||
yield return new WaitForSeconds(_animationController.GetCurrentAnimationLength());
|
||||
timer += Time.unscaledDeltaTime;
|
||||
|
||||
float t = timer / 0.5f;
|
||||
float easedT = EaseEffect.BounceOut(t);
|
||||
|
||||
information.transform.localScale = Vector3.Lerp( new Vector3(0.0f,0.0f,0.0f), new Vector3(1.0f,1.0f,1.0f), easedT);
|
||||
yield return null;
|
||||
}
|
||||
|
||||
|
||||
timer = 0f;
|
||||
|
||||
while (timer < 2.0)
|
||||
{
|
||||
timer += Time.unscaledDeltaTime;
|
||||
yield return null;
|
||||
}
|
||||
|
||||
timer = 0f;
|
||||
|
||||
while (timer < 0.5)
|
||||
{
|
||||
timer += Time.unscaledDeltaTime;
|
||||
|
||||
float t = timer / 0.5f;
|
||||
float easedT = EaseEffect.BounceOut(t);
|
||||
|
||||
information.transform.localScale = Vector3.Lerp( new Vector3(1.0f,1.0f,1.0f), new Vector3(0.0f,0.0f,0.0f), easedT);
|
||||
yield return null;
|
||||
}
|
||||
|
||||
_animationController.PlayAnimation("CardUpgrade_Reverse");
|
||||
|
||||
timer = 0f;
|
||||
|
||||
while (timer < 1.0f)
|
||||
{
|
||||
timer += Time.unscaledDeltaTime;
|
||||
yield return null;
|
||||
}
|
||||
|
||||
VisualFeedbackManager.Instance.ResetTimeScale();
|
||||
|
||||
@ -540,6 +540,38 @@ MonoBehaviour:
|
||||
m_CallState: 2
|
||||
m_ActionId: 4752dd64-7a31-42ae-bfc9-45a01927bd07
|
||||
m_ActionName: 'Bar/EscapeBar[/Keyboard/escape]'
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 1674052485383758547}
|
||||
m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp
|
||||
m_MethodName: OnManual
|
||||
m_Mode: 0
|
||||
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_ActionId: ef02b0fe-8d61-4bdb-bd1e-543575b67aa0
|
||||
m_ActionName: 'Tycoon/Manual[/Keyboard/q]'
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 1674052485383758547}
|
||||
m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp
|
||||
m_MethodName: OnCancelManual
|
||||
m_Mode: 0
|
||||
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_ActionId: c30fb3f3-d280-4b30-af6c-15f7483fd658
|
||||
m_ActionName: 'TycoonUi/CancelManual[/Keyboard/q]'
|
||||
m_NeverAutoSwitchControlSchemes: 0
|
||||
m_DefaultControlScheme:
|
||||
m_DefaultActionMap: Tycoon
|
||||
|
||||
Loading…
Reference in New Issue
Block a user