Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
@ -2956,9 +2956,7 @@ MonoBehaviour:
|
||||
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}
|
||||
cardPrefab: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
--- !u!1 &194818728
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3075,11 +3073,6 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 28}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!224 &205579474 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
m_PrefabInstance: {fileID: 381841147}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &210400510
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -4798,111 +4791,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 360820267}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1001 &381841147
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 881847626}
|
||||
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_LocalScale.x
|
||||
value: 0.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 0.6
|
||||
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: -700
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 30
|
||||
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}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
--- !u!1 &389901520
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -6632,7 +6520,7 @@ 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: -230.00002}
|
||||
m_AnchoredPosition: {x: 0, y: -230}
|
||||
m_SizeDelta: {x: -80, y: -540}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &526767281
|
||||
@ -6805,7 +6693,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: 'Gold : 0000'
|
||||
m_text: 'Gold : 0'
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
|
||||
m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
|
||||
@ -7440,111 +7328,6 @@ RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3}
|
||||
m_PrefabInstance: {fileID: 567774568}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &569970141
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 881847626}
|
||||
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_LocalScale.x
|
||||
value: 0.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 0.6
|
||||
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: 700
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 30
|
||||
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 (4)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
--- !u!1001 &571403219
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -9188,111 +8971,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 677615678}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1001 &701646280
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 881847626}
|
||||
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: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 0.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 0.6
|
||||
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: 30
|
||||
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 (2)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
--- !u!1 &703711984
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -12190,11 +11868,6 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 321901674}
|
||||
- {fileID: 875947201}
|
||||
- {fileID: 205579474}
|
||||
- {fileID: 1163775007}
|
||||
- {fileID: 1254552567}
|
||||
- {fileID: 2113049399}
|
||||
- {fileID: 1549845944}
|
||||
- {fileID: 1312760591}
|
||||
m_Father: {fileID: 1071833446}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -14541,6 +14214,7 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 1071833446}
|
||||
- component: {fileID: 1071833448}
|
||||
- component: {fileID: 1071833449}
|
||||
m_Layer: 5
|
||||
m_Name: ShopUi
|
||||
m_TagString: Untagged
|
||||
@ -14576,6 +14250,21 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1071833445}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1071833449
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1071833445}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cfa9cbc5b043f24ab4261dbae11597d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
cardPerfab: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
soldOutImg: {fileID: 5042407487761732956, guid: c636a1fd92e0e934e89c55d8fd598414, type: 3}
|
||||
goldTextmesh: {fileID: 538502914}
|
||||
--- !u!1 &1078622232
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -16087,11 +15776,6 @@ RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3}
|
||||
m_PrefabInstance: {fileID: 1159737840}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &1163775007 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
m_PrefabInstance: {fileID: 2134643492}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1170066054
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -17025,11 +16709,6 @@ Transform:
|
||||
- {fileID: 218784750}
|
||||
m_Father: {fileID: 1006730365}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!224 &1254552567 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
m_PrefabInstance: {fileID: 701646280}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1256380695
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -18214,7 +17893,7 @@ GameObject:
|
||||
- component: {fileID: 1312760593}
|
||||
- component: {fileID: 1312760592}
|
||||
m_Layer: 5
|
||||
m_Name: Button
|
||||
m_Name: GameStartButton
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -18283,7 +17962,19 @@ MonoBehaviour:
|
||||
m_TargetGraphic: {fileID: 1312760593}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 1071833449}
|
||||
m_TargetAssemblyTypeName: BlueWater.Uis.TycoonShopUi, Assembly-CSharp
|
||||
m_MethodName: Close
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!114 &1312760593
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -22210,11 +21901,6 @@ Light:
|
||||
m_LightUnit: 1
|
||||
m_LuxAtDistance: 1
|
||||
m_EnableSpotReflector: 1
|
||||
--- !u!224 &1549845944 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
m_PrefabInstance: {fileID: 569970141}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1552262093
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -24837,111 +24523,6 @@ MonoBehaviour:
|
||||
_customerSpawnTransform: {fileID: 1463369138}
|
||||
_checkEmptySeatInterval: 0.5
|
||||
<InstanceCustomers>k__BackingField: []
|
||||
--- !u!1001 &1666191662
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 881847626}
|
||||
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_LocalScale.x
|
||||
value: 0.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 0.6
|
||||
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: 350
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 30
|
||||
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 (3)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
--- !u!1001 &1671460476
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -30501,7 +30082,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: Button
|
||||
m_text: "\uC7A5\uC0AC\uC2DC\uC791!"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
|
||||
m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
|
||||
@ -32211,11 +31792,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2108866538}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!224 &2113049399 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
m_PrefabInstance: {fileID: 1666191662}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &2130676465
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -32318,111 +31894,6 @@ RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3}
|
||||
m_PrefabInstance: {fileID: 2130676465}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &2134643492
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 881847626}
|
||||
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_LocalScale.x
|
||||
value: 0.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 0.6
|
||||
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: -350
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 30
|
||||
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 (1)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
|
||||
--- !u!1001 &604670658564826510
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -113,7 +113,7 @@ public class TycoonCardArea : MonoBehaviour, IPointerEnterHandler, IPointerExitH
|
||||
if (_enable)
|
||||
{
|
||||
_isPointerInside = false;
|
||||
_endRotationCoroutine = StartCoroutine(ReturnToZeroRotation());
|
||||
_endRotationCoroutine = StartCoroutine(ReturnToZeroRotation());
|
||||
}
|
||||
}
|
||||
|
||||
@ -127,6 +127,7 @@ public class TycoonCardArea : MonoBehaviour, IPointerEnterHandler, IPointerExitH
|
||||
if (selectAction != null)
|
||||
{
|
||||
selectAction?.Invoke(_tycoonCard);
|
||||
OnPointerExit(null);
|
||||
}
|
||||
|
||||
//해당 밑줄은 따로 메소드를 만들어주자... 여기서 호출하는게 아니라 SelectCardUi에서 호출받는 방식으로...
|
||||
|
@ -11,12 +11,8 @@ namespace BlueWater.Uis
|
||||
private GameObject _panel;
|
||||
private Camera uiCamera;
|
||||
|
||||
[field: SerializeField, CLabel("카드 1")]
|
||||
private GameObject card01;
|
||||
[field: SerializeField, CLabel("카드 2")]
|
||||
private GameObject card02;
|
||||
[field: SerializeField, CLabel("카드 3")]
|
||||
private GameObject card03;
|
||||
[field: SerializeField, CLabel("카드 프리펫")]
|
||||
private GameObject cardPrefab;
|
||||
|
||||
private GameObject _currentCard01;
|
||||
private GameObject _currentCard02;
|
||||
@ -95,13 +91,13 @@ namespace BlueWater.Uis
|
||||
Destroy(_currentCard03);
|
||||
}
|
||||
|
||||
_currentCard01 = Instantiate(card01, _panel.transform);
|
||||
_currentCard01 = Instantiate(cardPrefab, _panel.transform);
|
||||
_currentCard01.name = "Card01";
|
||||
|
||||
_currentCard02 = Instantiate(card02, _panel.transform);
|
||||
_currentCard02 = Instantiate(cardPrefab, _panel.transform);
|
||||
_currentCard02.name = "Card02";
|
||||
|
||||
_currentCard03 = Instantiate(card03, _panel.transform);
|
||||
_currentCard03 = Instantiate(cardPrefab, _panel.transform);
|
||||
_currentCard03.name = "Card03";
|
||||
|
||||
_currentCard01.transform.localPosition = new Vector3(-550, 0, 0);
|
||||
@ -401,7 +397,10 @@ namespace BlueWater.Uis
|
||||
Close();
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void ShowUi() => _panel.SetActive(true);
|
||||
public void HideUi() => _panel.SetActive(false);
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -1,21 +1,389 @@
|
||||
using System;
|
||||
using BlueWater.Tycoons;
|
||||
using UnityEngine;
|
||||
using Sirenix.OdinInspector;
|
||||
using TMPro;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class TycoonShopUi : MonoBehaviour
|
||||
namespace BlueWater.Uis
|
||||
{
|
||||
[field: SerializeField, CLabel("카드 프리펫")]
|
||||
private GameObject cardPerfab;
|
||||
|
||||
[field: SerializeField, CLabel("골드TextMesh")]
|
||||
private TextMeshProUGUI goldTextmesh;
|
||||
|
||||
//goldTextMesh.text =
|
||||
|
||||
[Button("Shop 열기")]
|
||||
private void CreateCard()
|
||||
public class TycoonShopUi : PopupUi
|
||||
{
|
||||
goldTextmesh.text = $"Gold : {ES3.Load("EndGold", 0)}";
|
||||
[field: SerializeField, CLabel("카드 프리펫")]
|
||||
private GameObject cardPerfab;
|
||||
|
||||
[field: SerializeField, CLabel("판매완료 이미지")]
|
||||
private GameObject soldOutImg;
|
||||
|
||||
[field: SerializeField, CLabel("골드TextMesh")]
|
||||
private TextMeshProUGUI goldTextmesh;
|
||||
|
||||
private GameObject _panel;
|
||||
|
||||
private GameObject _currentCard01;
|
||||
private GameObject _currentCard02;
|
||||
private GameObject _currentCard03;
|
||||
private GameObject _currentCard04;
|
||||
private GameObject _currentCard05;
|
||||
|
||||
private TycoonCard _tycoonCard01Componet;
|
||||
private TycoonCard _tycoonCard02Componet;
|
||||
private TycoonCard _tycoonCard03Componet;
|
||||
private TycoonCard _tycoonCard04Componet;
|
||||
private TycoonCard _tycoonCard05Componet;
|
||||
|
||||
private LevelData _lvData;
|
||||
private TycoonManager _tycoonManager;
|
||||
private TycoonStatus _tycoonStatus;
|
||||
|
||||
private bool _isSelectedPassive = false;
|
||||
|
||||
private int _gold;
|
||||
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
EventManager.OnOpenedNormalRewardBox += CreateCard;
|
||||
|
||||
_panel = transform.Find("Panel").gameObject;
|
||||
HideUi();
|
||||
}
|
||||
|
||||
void Start()
|
||||
{
|
||||
_gold = ES3.Load("EndGold", 0);
|
||||
_tycoonManager = TycoonManager.Instance;
|
||||
_tycoonStatus = _tycoonManager.TycoonStatus;
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
EventManager.OnOpenedNormalRewardBox -= CreateCard;
|
||||
}
|
||||
|
||||
public override void Open()
|
||||
{
|
||||
VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f);
|
||||
PlayerInputKeyManager.Instance.DisableAction("Manual");
|
||||
PopupUiController.RegisterPopup(this);
|
||||
ShowUi();
|
||||
IsOpened = true;
|
||||
}
|
||||
|
||||
public override void Close()
|
||||
{
|
||||
HideUi();
|
||||
PlayerInputKeyManager.Instance.EnableAction("Manual");
|
||||
PopupUiController.UnregisterPopup(this);
|
||||
IsOpened = false;
|
||||
|
||||
if (!PopupUiController.IsPopupListEmpty()) return;
|
||||
|
||||
VisualFeedbackManager.Instance.ResetTimeScale();
|
||||
}
|
||||
|
||||
[Button("Shop 열기")]
|
||||
private void CreateCard()
|
||||
{
|
||||
/*
|
||||
* 해당 기능에 대해서는 TycoonSelectCard와 유사한 기능이 많기에... 따로 분리시켜서 효율적으로 관리하도록하자...
|
||||
* SelectedCard(...) 에 대해서도 이하동문
|
||||
*/
|
||||
|
||||
_lvData = TycoonManager.Instance.GetCurrentLevelData();
|
||||
|
||||
if (!Application.isPlaying) return;
|
||||
|
||||
|
||||
|
||||
|
||||
// 기존 카드가 있으면 삭제
|
||||
if (_currentCard01 != null) { Destroy(_currentCard01); }
|
||||
if (_currentCard02 != null) { Destroy(_currentCard02); }
|
||||
if (_currentCard03 != null) { Destroy(_currentCard03); }
|
||||
if (_currentCard04 != null) { Destroy(_currentCard04); }
|
||||
if (_currentCard05 != null) { Destroy(_currentCard05); }
|
||||
|
||||
|
||||
_currentCard01 = Instantiate(cardPerfab, _panel.transform);
|
||||
_currentCard01.name = "Card01";
|
||||
|
||||
_currentCard02 = Instantiate(cardPerfab, _panel.transform);
|
||||
_currentCard02.name = "Card02";
|
||||
|
||||
_currentCard03 = Instantiate(cardPerfab, _panel.transform);
|
||||
_currentCard03.name = "Card03";
|
||||
|
||||
_currentCard04 = Instantiate(cardPerfab, _panel.transform);
|
||||
_currentCard04.name = "Card04";
|
||||
|
||||
_currentCard05 = Instantiate(cardPerfab, _panel.transform);
|
||||
_currentCard05.name = "Card05";
|
||||
|
||||
var scale = new Vector3(0.65f, 0.65f, 1f);
|
||||
|
||||
_currentCard01.transform.localPosition = new Vector3(-700, 30, 0);
|
||||
_currentCard01.transform.localScale = scale;
|
||||
_currentCard02.transform.localPosition = new Vector3(-350, 30, 0);
|
||||
_currentCard02.transform.localScale = scale;
|
||||
_currentCard03.transform.localPosition = new Vector3(0, 30, 0);
|
||||
_currentCard03.transform.localScale = scale;
|
||||
_currentCard04.transform.localPosition = new Vector3(350, 30, 0);
|
||||
_currentCard04.transform.localScale = scale;
|
||||
_currentCard05.transform.localPosition = new Vector3(700, 30, 0);
|
||||
_currentCard05.transform.localScale = scale;
|
||||
|
||||
_tycoonCard01Componet = _currentCard01.GetComponent<TycoonCard>();
|
||||
_tycoonCard02Componet = _currentCard02.GetComponent<TycoonCard>();
|
||||
_tycoonCard03Componet = _currentCard03.GetComponent<TycoonCard>();
|
||||
_tycoonCard04Componet = _currentCard04.GetComponent<TycoonCard>();
|
||||
_tycoonCard05Componet = _currentCard05.GetComponent<TycoonCard>();
|
||||
|
||||
|
||||
Open();
|
||||
|
||||
//----카드 값 지정 및 초기화----
|
||||
|
||||
bool PassiveCheck(CardData card)
|
||||
{
|
||||
return _isSelectedPassive && card.Type == CardType.Passive;
|
||||
}
|
||||
|
||||
CardData card;
|
||||
|
||||
var card01Key = "NULL VAL";
|
||||
do
|
||||
{
|
||||
card = _tycoonManager.CardDataSo.GetRandCardData();
|
||||
card = _tycoonManager.CardDataSo.SubstitutionLiquid(card, _lvData);
|
||||
|
||||
if (card != null)
|
||||
{
|
||||
card01Key = card.Idx;
|
||||
}
|
||||
|
||||
} while (card == null || _tycoonManager.CardDataSo.CardMaxCheck(card) //Max 검사
|
||||
|| card.Type == CardType.Passive);//패시브 검사
|
||||
_tycoonCard01Componet.SetCard(card01Key);
|
||||
|
||||
|
||||
|
||||
var card02Key = "NULL VAL";
|
||||
do
|
||||
{
|
||||
card = _tycoonManager.CardDataSo.GetRandCardData();
|
||||
card = _tycoonManager.CardDataSo.SubstitutionLiquid(card, _lvData);
|
||||
if (card != null)
|
||||
{
|
||||
card02Key = card.Idx;
|
||||
}
|
||||
|
||||
} while (card == null || _tycoonManager.CardDataSo.CardMaxCheck(card) //Max 검사
|
||||
|| card02Key.Equals(card01Key) //중복검사
|
||||
|| card.Shop != ShopType.Active //숍 등장 검사
|
||||
|| card.Type == CardType.Passive);//패시브 검사
|
||||
_tycoonCard02Componet.SetCard(card02Key);
|
||||
|
||||
|
||||
var card03Key = "NULL VAL";
|
||||
do
|
||||
{
|
||||
card = _tycoonManager.CardDataSo.GetRandCardData();
|
||||
card = _tycoonManager.CardDataSo.SubstitutionLiquid(card, _lvData);
|
||||
|
||||
if (card != null)
|
||||
{
|
||||
card03Key = card.Idx;
|
||||
}
|
||||
|
||||
} while (card == null || _tycoonManager.CardDataSo.CardMaxCheck(card) //Max 검사
|
||||
|| card03Key.Equals(card01Key) || card03Key.Equals(card02Key) //중복검사
|
||||
|| card.Shop != ShopType.Active //숍 등장 검사
|
||||
|| card.Type == CardType.Passive); //패시브 검사
|
||||
_tycoonCard03Componet.SetCard(card03Key);
|
||||
|
||||
|
||||
var card04Key = "NULL VAL";
|
||||
do
|
||||
{
|
||||
card = _tycoonManager.CardDataSo.GetRandCardData();
|
||||
card = _tycoonManager.CardDataSo.SubstitutionLiquid(card, _lvData);
|
||||
|
||||
if (card != null)
|
||||
{
|
||||
card04Key = card.Idx;
|
||||
}
|
||||
|
||||
} while (card == null || _tycoonManager.CardDataSo.CardMaxCheck(card) //Max 검사
|
||||
|| card04Key.Equals(card01Key) || card04Key.Equals(card02Key) //중복검사
|
||||
|| card04Key.Equals(card03Key) //중복검사
|
||||
|| card.Shop != ShopType.Active //숍 등장 검사
|
||||
|| card.Type == CardType.Passive); //패시브 검사
|
||||
_tycoonCard04Componet.SetCard(card04Key);
|
||||
|
||||
var card05Key = "NULL VAL";
|
||||
do
|
||||
{
|
||||
card = _tycoonManager.CardDataSo.GetRandCardData();
|
||||
card = _tycoonManager.CardDataSo.SubstitutionLiquid(card, _lvData);
|
||||
|
||||
if (card != null)
|
||||
{
|
||||
card05Key = card.Idx;
|
||||
}
|
||||
|
||||
} while (card == null || _tycoonManager.CardDataSo.CardMaxCheck(card) //Max 검사
|
||||
|| card05Key.Equals(card01Key) || card05Key.Equals(card02Key) //중복검사
|
||||
|| card05Key.Equals(card03Key) || card05Key.Equals(card04Key) //중복검사
|
||||
|| card.Shop != ShopType.Active //숍 등장 검사
|
||||
|| card.Type == CardType.Passive); //패시브 검사
|
||||
_tycoonCard05Componet.SetCard(card05Key);
|
||||
|
||||
//-------------
|
||||
|
||||
//여기에 선택했을때 호출할 함수를 등록하자!
|
||||
|
||||
_tycoonCard01Componet.Rotation_Start();
|
||||
_tycoonCard02Componet.Rotation_Start();
|
||||
_tycoonCard03Componet.Rotation_Start();
|
||||
_tycoonCard04Componet.Rotation_Start();
|
||||
_tycoonCard05Componet.Rotation_Start();
|
||||
|
||||
_tycoonCard01Componet.SetselectAction(SelectedCard);
|
||||
_tycoonCard02Componet.SetselectAction(SelectedCard);
|
||||
_tycoonCard03Componet.SetselectAction(SelectedCard);
|
||||
_tycoonCard04Componet.SetselectAction(SelectedCard);
|
||||
_tycoonCard05Componet.SetselectAction(SelectedCard);
|
||||
|
||||
|
||||
}
|
||||
|
||||
public void SelectedCard(TycoonCard currTycoonCard)
|
||||
{
|
||||
|
||||
//살 수 있는 가격이면 SOLD OUT 표시하기! 못사면 Gold를 빨갛게 표시하고 흔들임 효과 주기
|
||||
var cardSoldOutImg = Instantiate(soldOutImg, currTycoonCard.transform);
|
||||
cardSoldOutImg.transform.localPosition = new Vector3(0, 0, 0);
|
||||
cardSoldOutImg.transform.localScale = new Vector3(1f, 1f, 1f);
|
||||
|
||||
switch (currTycoonCard.CardDataForIdx.Idx) //탐색 후 행동...
|
||||
{
|
||||
case "HeartSlotPlus":
|
||||
_tycoonStatus.MaxPlayerHealth += 2;
|
||||
break;
|
||||
case "HeartRecovery":
|
||||
_tycoonStatus.CurrentPlayerHealth += 2;
|
||||
break;
|
||||
case "FullHeartRecovery":
|
||||
_tycoonStatus.CurrentPlayerHealth = _tycoonStatus.MaxPlayerHealth;
|
||||
break;
|
||||
case "AddLiquidB":
|
||||
_tycoonStatus.CurrentLiquidAmountB += 4000;
|
||||
break;
|
||||
case "AddLiquidC":
|
||||
_tycoonStatus.CurrentLiquidAmountC += 4000;
|
||||
break;
|
||||
case "AddLiquidD":
|
||||
_tycoonStatus.CurrentLiquidAmountD += 4000;
|
||||
break;
|
||||
case "AddLiquidE":
|
||||
_tycoonStatus.CurrentLiquidAmountE += 4000;
|
||||
break;
|
||||
case "AddGarnish1":
|
||||
_tycoonStatus.CurrentGarnishAmount1 += 4000;
|
||||
break;
|
||||
case "AddGarnish2":
|
||||
_tycoonStatus.CurrentGarnishAmount2 += 4000;
|
||||
break;
|
||||
case "AllLiquidAdd":
|
||||
EventManager.InvokeAddBarrels(1000);
|
||||
break;
|
||||
case "ServerNpcAdd":
|
||||
EventManager.InvokeCreateServerCrew();
|
||||
break;
|
||||
case "CleanerNpcAdd":
|
||||
EventManager.InvokeCreateCleanerCrew();
|
||||
break;
|
||||
case "BartenderNpcAdd":
|
||||
EventManager.InvokeCreateBartenderCrew();
|
||||
break;
|
||||
case "SpeedBoost":
|
||||
_tycoonStatus.PlayerMoveSpeedMultiplier += 0.1f;
|
||||
break;
|
||||
case "ExpBoost":
|
||||
_tycoonStatus.ExpMultiplier += 0.2f;
|
||||
break;
|
||||
case "GoldBoost":
|
||||
_tycoonStatus.GoldMultiplier += 0.2f;
|
||||
break;
|
||||
case "AllCleanUp":
|
||||
EventManager.InvokeCleaningAll();
|
||||
break;
|
||||
case "GaugeReset":
|
||||
EventManager.InvokeGaugeResetCustomers();
|
||||
break;
|
||||
case "DashCooldownReduction":
|
||||
_tycoonStatus.PlayerDashCooldownReduction += 1;
|
||||
break;
|
||||
case "TipBoost":
|
||||
_tycoonStatus.TipMultiplier += 0.2f;
|
||||
break;
|
||||
case "EndGoldBoost":
|
||||
_tycoonStatus.EndGoldMultiplier += 0.1f;
|
||||
break;
|
||||
case "AllCustomerPurification":
|
||||
EventManager.InvokePurifiedCustomerAll();
|
||||
break;
|
||||
case "GaugeTimeUp":
|
||||
_tycoonStatus.CustomerHurryTimeIncrease += 3;
|
||||
break;
|
||||
case "BarrelAutoSupply":
|
||||
if (_tycoonManager.CardDataSo.CardFirstCheck("BarrelAutoSupply"))
|
||||
{
|
||||
EventManager.InvokeAutoSupplyBarrels();
|
||||
}
|
||||
_tycoonStatus.BarrelAutoIncrease += 2;
|
||||
break;
|
||||
case "ServerNpcUpgrade":
|
||||
_tycoonStatus.ServerTipMultiplier += 0.1f;
|
||||
break;
|
||||
case "CleanerNpcUpgrade":
|
||||
_tycoonStatus.CleanerCleaningReduction += 1;
|
||||
break;
|
||||
case "BartenderNpcUpgrade":
|
||||
_tycoonStatus.BartenderMakingReduction += 1;
|
||||
break;
|
||||
case "PassiveDoubleServing":
|
||||
_tycoonStatus.CurrentPassiveCard = PassiveCard.DoubleServing;
|
||||
break;
|
||||
case "PassiveRandomChange":
|
||||
_tycoonStatus.CurrentPassiveCard = PassiveCard.RandomChange;
|
||||
EventManager.InvokeChangedRandomBox();
|
||||
break;
|
||||
case "PassiveGoldAutoGain":
|
||||
_tycoonStatus.CurrentPassiveCard = PassiveCard.GoldAutoGain;
|
||||
EventManager.InvokeGainAutoMoneyCounter(_tycoonManager.TycoonStageController.StageDataSo.AutoGainWaitTime);
|
||||
break;
|
||||
case "PassiveMakingBonus":
|
||||
_tycoonStatus.CurrentPassiveCard = PassiveCard.MakingBonus;
|
||||
break;
|
||||
case "PassiveServingBonus":
|
||||
_tycoonStatus.CurrentPassiveCard = PassiveCard.ServingBonus;
|
||||
break;
|
||||
case "PassiveCleaningBonus":
|
||||
_tycoonStatus.CurrentPassiveCard = PassiveCard.CleaningBonus;
|
||||
break;
|
||||
default: Debug.Log("Not Found Card : IDX" + currTycoonCard.CardDataForIdx.Idx); return;
|
||||
}
|
||||
|
||||
if (currTycoonCard.CardDataForIdx.Type == CardType.Passive) _isSelectedPassive = true;
|
||||
|
||||
TycoonManager.Instance.CardDataSo.AddToSelectedCard(currTycoonCard.CardDataForIdx);
|
||||
|
||||
}
|
||||
|
||||
public void ShowUi() => _panel.SetActive(true);
|
||||
public void HideUi() => _panel.SetActive(false);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
Before Width: | Height: | Size: 186 KiB After Width: | Height: | Size: 186 KiB |
Before Width: | Height: | Size: 137 KiB After Width: | Height: | Size: 137 KiB |
Before Width: | Height: | Size: 303 KiB After Width: | Height: | Size: 303 KiB |
Before Width: | Height: | Size: 417 KiB After Width: | Height: | Size: 417 KiB |
Before Width: | Height: | Size: 158 KiB After Width: | Height: | Size: 158 KiB |
Before Width: | Height: | Size: 222 KiB After Width: | Height: | Size: 222 KiB |
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 102 KiB |
Before Width: | Height: | Size: 235 KiB After Width: | Height: | Size: 235 KiB |
Before Width: | Height: | Size: 199 KiB After Width: | Height: | Size: 199 KiB |
Before Width: | Height: | Size: 197 KiB After Width: | Height: | Size: 197 KiB |
Before Width: | Height: | Size: 158 KiB After Width: | Height: | Size: 158 KiB |
Before Width: | Height: | Size: 544 KiB After Width: | Height: | Size: 544 KiB |
Before Width: | Height: | Size: 513 KiB After Width: | Height: | Size: 513 KiB |
Before Width: | Height: | Size: 127 KiB After Width: | Height: | Size: 127 KiB |
Before Width: | Height: | Size: 184 KiB After Width: | Height: | Size: 184 KiB |
Before Width: | Height: | Size: 179 KiB After Width: | Height: | Size: 179 KiB |
Before Width: | Height: | Size: 118 KiB After Width: | Height: | Size: 118 KiB |
Before Width: | Height: | Size: 315 KiB After Width: | Height: | Size: 315 KiB |
Before Width: | Height: | Size: 366 KiB After Width: | Height: | Size: 366 KiB |
Before Width: | Height: | Size: 494 KiB After Width: | Height: | Size: 494 KiB |
Before Width: | Height: | Size: 293 KiB After Width: | Height: | Size: 293 KiB |
Before Width: | Height: | Size: 315 KiB After Width: | Height: | Size: 315 KiB |
Before Width: | Height: | Size: 316 KiB After Width: | Height: | Size: 316 KiB |
Before Width: | Height: | Size: 315 KiB After Width: | Height: | Size: 315 KiB |
Before Width: | Height: | Size: 4.0 MiB After Width: | Height: | Size: 4.0 MiB |
Before Width: | Height: | Size: 289 KiB After Width: | Height: | Size: 289 KiB |
Before Width: | Height: | Size: 402 KiB After Width: | Height: | Size: 402 KiB |
Before Width: | Height: | Size: 158 KiB After Width: | Height: | Size: 158 KiB |
Before Width: | Height: | Size: 353 KiB After Width: | Height: | Size: 353 KiB |
Before Width: | Height: | Size: 116 KiB After Width: | Height: | Size: 116 KiB |
Before Width: | Height: | Size: 180 KiB After Width: | Height: | Size: 180 KiB |
Before Width: | Height: | Size: 157 KiB After Width: | Height: | Size: 157 KiB |
Before Width: | Height: | Size: 421 KiB After Width: | Height: | Size: 421 KiB |
Before Width: | Height: | Size: 425 KiB After Width: | Height: | Size: 425 KiB |
Before Width: | Height: | Size: 343 KiB After Width: | Height: | Size: 343 KiB |
Before Width: | Height: | Size: 368 KiB After Width: | Height: | Size: 368 KiB |
Before Width: | Height: | Size: 261 KiB After Width: | Height: | Size: 261 KiB |
Before Width: | Height: | Size: 358 KiB After Width: | Height: | Size: 358 KiB |
Before Width: | Height: | Size: 458 KiB After Width: | Height: | Size: 458 KiB |
Before Width: | Height: | Size: 278 KiB After Width: | Height: | Size: 278 KiB |
Before Width: | Height: | Size: 212 KiB After Width: | Height: | Size: 212 KiB |
Before Width: | Height: | Size: 144 KiB After Width: | Height: | Size: 144 KiB |
Before Width: | Height: | Size: 288 KiB After Width: | Height: | Size: 288 KiB |
Before Width: | Height: | Size: 284 KiB After Width: | Height: | Size: 284 KiB |
Before Width: | Height: | Size: 154 KiB After Width: | Height: | Size: 154 KiB |
Before Width: | Height: | Size: 147 KiB After Width: | Height: | Size: 147 KiB |