diff --git a/Assets/01.Scenes/00.TycoonTitle.unity b/Assets/01.Scenes/00.TycoonTitle.unity index f41c4329e..5dddc4b7f 100644 --- a/Assets/01.Scenes/00.TycoonTitle.unity +++ b/Assets/01.Scenes/00.TycoonTitle.unity @@ -1947,13 +1947,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 191889754} serializedVersion: 2 - m_LocalRotation: {x: 0.060784396, y: -0, z: -0, w: 0.99815094} - m_LocalPosition: {x: 2.66, y: 2.25, z: -3.43} + m_LocalRotation: {x: 0.17213742, y: -0, z: -0, w: 0.985073} + m_LocalPosition: {x: 1.61, y: 7.54, z: -22.23} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 6.97, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 19.824, y: 0, z: 0} --- !u!1 &193579421 GameObject: m_ObjectHideFlags: 0 @@ -6635,6 +6635,55 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 +--- !u!1001 &690971627 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2700294535905665279, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2700294535905665279, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2700294535905665279, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040169690825224014, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: _instanceLocation + value: + objectReference: {fileID: 0} + - target: {fileID: 4119089025960676272, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7503695429122129295, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 7640850047456124134, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8858452115783968250, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_LocalPosition.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 9041926907780427371, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_Name + value: NewTycoonMap + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} --- !u!1 &706003668 GameObject: m_ObjectHideFlags: 0 @@ -17482,3 +17531,4 @@ SceneRoots: - {fileID: 550723026} - {fileID: 55913709} - {fileID: 1047375462} + - {fileID: 690971627} diff --git a/Assets/01.Scenes/_A.LMG.unity b/Assets/01.Scenes/_A.LMG.unity index e3bd9a1ab..298be5136 100644 --- a/Assets/01.Scenes/_A.LMG.unity +++ b/Assets/01.Scenes/_A.LMG.unity @@ -3075,6 +3075,11 @@ 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 @@ -4187,6 +4192,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &321901673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 321901674} + - component: {fileID: 321901676} + - component: {fileID: 321901675} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &321901674 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 321901673} + 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: 881847626} + 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 &321901675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 321901673} + 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 &321901676 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 321901673} + m_CullTransparentMesh: 1 --- !u!1 &327744319 GameObject: m_ObjectHideFlags: 0 @@ -4718,6 +4798,111 @@ 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 @@ -6447,7 +6632,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} + m_AnchoredPosition: {x: 0, y: -230.00002} m_SizeDelta: {x: -80, y: -540} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &526767281 @@ -6563,6 +6748,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 536447447} m_CullTransparentMesh: 1 +--- !u!1 &538502912 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 538502913} + - component: {fileID: 538502915} + - component: {fileID: 538502914} + m_Layer: 5 + m_Name: Gold_Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &538502913 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 538502912} + 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: 875947201} + 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: 167, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &538502914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 538502912} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Gold : 0000' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &538502915 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 538502912} + m_CullTransparentMesh: 1 --- !u!114 &538755283 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1795547803945282972, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} @@ -6640,7 +6961,7 @@ Transform: m_GameObject: {fileID: 545850347} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 2.145, y: 7.4278765, z: -16.466446} + m_LocalPosition: {x: 1.1, y: 7.4278765, z: -16.466446} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -7119,6 +7440,111 @@ 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 @@ -8762,6 +9188,111 @@ 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 @@ -11553,6 +12084,125 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 875700112} m_CullTransparentMesh: 1 +--- !u!1 &875947200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 875947201} + - component: {fileID: 875947203} + - component: {fileID: 875947202} + m_Layer: 5 + m_Name: Gold + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &875947201 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 875947200} + 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: 538502913} + m_Father: {fileID: 881847626} + 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: -145, y: 350} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &875947202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 875947200} + 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: 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 &875947203 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 875947200} + m_CullTransparentMesh: 1 +--- !u!1 &881847625 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 881847626} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &881847626 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 881847625} + 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: 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} + 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!4 &883069349 stripped Transform: m_CorrespondingSourceObject: {fileID: 1150836517969909917, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} @@ -13555,6 +14205,7 @@ RectTransform: - {fileID: 1909799357} - {fileID: 2032162537} - {fileID: 1701833860} + - {fileID: 1071833446} - {fileID: 186139408} - {fileID: 1086696076} - {fileID: 487445514} @@ -13880,6 +14531,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1070845212} m_CullTransparentMesh: 1 +--- !u!1 &1071833445 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1071833446} + - component: {fileID: 1071833448} + m_Layer: 5 + m_Name: ShopUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1071833446 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1071833445} + 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: 881847626} + 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!222 &1071833448 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1071833445} + m_CullTransparentMesh: 1 --- !u!1 &1078622232 GameObject: m_ObjectHideFlags: 0 @@ -15391,6 +16087,11 @@ 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 @@ -16324,6 +17025,11 @@ 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 @@ -17495,6 +18201,127 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &1312760590 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1312760591} + - component: {fileID: 1312760594} + - component: {fileID: 1312760593} + - component: {fileID: 1312760592} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1312760591 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312760590} + 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: 1970852973} + m_Father: {fileID: 881847626} + 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: -370} + m_SizeDelta: {x: 300, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1312760592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312760590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1312760593} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1312760593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312760590} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1312760594 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312760590} + m_CullTransparentMesh: 1 --- !u!1 &1321215892 GameObject: m_ObjectHideFlags: 0 @@ -17688,6 +18515,10 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 7503695429122129295, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 7640850047456124134, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_LocalPosition.x value: 1 @@ -21379,6 +22210,11 @@ 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 @@ -24001,6 +24837,111 @@ MonoBehaviour: _customerSpawnTransform: {fileID: 1463369138} _checkEmptySeatInterval: 0.5 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 @@ -25208,6 +26149,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fe2ca76abb7767459262e2c596bcebe, type: 3} m_Name: m_EditorClassIdentifier: + _panel: {fileID: 0} _openUiImage: {fileID: 1834176991} _openUiAnimator: {fileID: 1834176996} _closedUiImage: {fileID: 510358306} @@ -29502,6 +30444,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1966407669} m_CullTransparentMesh: 1 +--- !u!1 &1970852972 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1970852973} + - component: {fileID: 1970852975} + - component: {fileID: 1970852974} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1970852973 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1970852972} + 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: 1312760591} + 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 &1970852974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1970852972} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Button + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1970852975 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1970852972} + m_CullTransparentMesh: 1 --- !u!1 &1974283341 GameObject: m_ObjectHideFlags: 0 @@ -31133,6 +32211,11 @@ 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 @@ -31235,6 +32318,111 @@ 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 @@ -31848,7 +33036,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.x - value: 2.145 + value: 1.1 objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs index 7d59ec363..4a4e2771d 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs @@ -55,6 +55,8 @@ public class TycoonCard : MonoBehaviour private Transform _cardComTransform; private TycoonCardArea _cardArea; private Coroutine _changedLocaleInstance; + + private Action selectAction; private void Awake() { @@ -65,6 +67,11 @@ public class TycoonCard : MonoBehaviour _cardArea = transform.Find("Area").GetComponent(); } + public void SetselectAction(Action action) + { + _cardArea.SetselectAction(action); + } + private void Start() { LocalizationSettings.SelectedLocaleChanged += OnChangedLocale; diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs index a0436728f..8e36625ec 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs @@ -1,14 +1,8 @@ - +using System; using System.Collections; using BlueWater; -using BlueWater.Tycoons; -using BlueWater.Uis; -using Sirenix.OdinInspector; using UnityEngine; -using TMPro; -using UnityEngine.Android; using UnityEngine.EventSystems; -using UnityEngine.Serialization; using UnityEngine.UI; /* @@ -47,6 +41,8 @@ public class TycoonCardArea : MonoBehaviour, IPointerEnterHandler, IPointerExitH private Transform _cardComTransform; private Camera _uiCamera; + private Action selectAction; + private void Awake() { _tycoonCard = transform.parent.GetComponent(); @@ -62,6 +58,12 @@ public class TycoonCardArea : MonoBehaviour, IPointerEnterHandler, IPointerExitH _uiCamera = TycoonCameraManager.Instance.MainCamera; } + + public void SetselectAction(Action action) + { + selectAction = action; + } + // 마우스가 이미지 위에 올라갔을 때 호출 public void OnPointerEnter(PointerEventData eventData) { @@ -120,7 +122,12 @@ public class TycoonCardArea : MonoBehaviour, IPointerEnterHandler, IPointerExitH { if (_enable) { - _tycoonCard.transform.parent.parent.GetComponent().SelectedCard(_tycoonCard); + //_tycoonCard.transform.parent.parent.GetComponent().SelectedCard(_tycoonCard); + + if (selectAction != null) + { + selectAction?.Invoke(_tycoonCard); + } //해당 밑줄은 따로 메소드를 만들어주자... 여기서 호출하는게 아니라 SelectCardUi에서 호출받는 방식으로... this.SetEnable(false); @@ -171,6 +178,7 @@ public class TycoonCardArea : MonoBehaviour, IPointerEnterHandler, IPointerExitH } Quaternion startRotation = _cardComTransform.GetComponent().localRotation; + Quaternion startRotationImg = _image.GetComponent().localRotation; Quaternion endRotation = Quaternion.identity; Vector3 initialScale = _cardComTransform.localScale; @@ -179,6 +187,7 @@ public class TycoonCardArea : MonoBehaviour, IPointerEnterHandler, IPointerExitH while (_returnSpeedTime > 0.0f) { _cardComTransform.GetComponent().localRotation = Quaternion.Slerp(startRotation, endRotation, 1.0f - _returnSpeedTime); + _image.GetComponent().localRotation = Quaternion.Slerp(startRotationImg, endRotation, 1.0f - _returnSpeedTime); _returnSpeedTime -= Time.unscaledDeltaTime * _returnSpeed; float t = (1.0f - _returnSpeedTime); @@ -192,6 +201,7 @@ public class TycoonCardArea : MonoBehaviour, IPointerEnterHandler, IPointerExitH _returnSpeedTime = 0.0f; _cardComTransform.GetComponent().localRotation = Quaternion.identity; + _image.GetComponent().localRotation = Quaternion.identity; _endRotationCoroutine = null; } diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs index 94b476e84..0aef03dd6 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs @@ -76,6 +76,9 @@ namespace BlueWater.Uis [Button("카드 생성하기(레벨업)")] private void CreateCard() { + + _lvData = TycoonManager.Instance.GetCurrentLevelData(); + if (!Application.isPlaying) return; // 기존 카드가 있으면 삭제 @@ -171,8 +174,12 @@ namespace BlueWater.Uis //------------- + + _tycoonCard01Componet.SetselectAction(SelectedCard); _tycoonCard01Componet.Rotation_Start(); + _tycoonCard02Componet.SetselectAction(SelectedCard); _tycoonCard02Componet.Rotation_Start(); + _tycoonCard03Componet.SetselectAction(SelectedCard); _tycoonCard03Componet.Rotation_Start(); } diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonShopUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonShopUi.cs new file mode 100644 index 000000000..325cc9d1d --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonShopUi.cs @@ -0,0 +1,21 @@ +using UnityEngine; +using Sirenix.OdinInspector; +using TMPro; + +public class TycoonShopUi : MonoBehaviour +{ + [field: SerializeField, CLabel("카드 프리펫")] + private GameObject cardPerfab; + + [field: SerializeField, CLabel("골드TextMesh")] + private TextMeshProUGUI goldTextmesh; + + //goldTextMesh.text = + + [Button("Shop 열기")] + private void CreateCard() + { + goldTextmesh.text = $"Gold : {ES3.Load("EndGold", 0)}"; + } + +} diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonShopUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/TycoonShopUi.cs.meta new file mode 100644 index 000000000..30ce34173 --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonShopUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0cfa9cbc5b043f24ab4261dbae11597d \ No newline at end of file diff --git a/Assets/04.Materials/Ink.mat b/Assets/04.Materials/Ink.mat index e217c2771..dff7e2b86 100644 --- a/Assets/04.Materials/Ink.mat +++ b/Assets/04.Materials/Ink.mat @@ -104,7 +104,7 @@ Material: - _GlossyReflections: 0 - _Metallic: 0 - _OcclusionStrength: 1 - - _Opacity: 1 + - _Opacity: 0.89 - _Parallax: 0.005 - _Position: 0.38 - _QueueOffset: 0