diff --git a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationPurchase.unity b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationPurchase.unity index 1ddbf750..8312332b 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationPurchase.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationPurchase.unity @@ -124,82 +124,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &74022313 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 74022314} - - component: {fileID: 74022316} - - component: {fileID: 74022315} - m_Layer: 5 - m_Name: Window_mat_induction - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &74022314 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 74022313} - 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: 7029507892281395535} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 740, y: 900} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &74022315 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 74022313} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fe4a41cbdbe21dc43ba433bb83b51189, type: 3} - 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 &74022316 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 74022313} - m_CullTransparentMesh: 0 --- !u!1 &114351918 GameObject: m_ObjectHideFlags: 0 @@ -288,7 +212,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 695796914} + mTarget: {fileID: 0} +--- !u!114 &378941593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1918230667} --- !u!1 &434586921 GameObject: m_ObjectHideFlags: 0 @@ -369,58 +306,28 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 434586921} m_CullTransparentMesh: 0 ---- !u!1 &529529102 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 529529103} - m_Layer: 5 - m_Name: Item_induction - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &529529103 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 529529102} - 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: 1714354798} - - {fileID: 1018924470} - - {fileID: 783393993} - - {fileID: 968516459} - m_Father: {fileID: 703079871} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -7, y: -207.9} - m_SizeDelta: {x: 550, y: 230} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &628711926 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1420420143} + m_TransformParent: {fileID: 7029507893056145018} m_Modifications: - target: {fileID: 303287216037748863, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, type: 3} propertyPath: m_Name - value: Customize_iconTarget + value: Customize_iconTarget(x1.2 scale) objectReference: {fileID: 0} + - target: {fileID: 303287216037748863, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5581601667438571788, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, + type: 3} + propertyPath: mLocalizeTarget + value: + objectReference: {fileID: 1966070101} - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, type: 3} propertyPath: m_Pivot.x @@ -434,7 +341,7 @@ PrefabInstance: - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, type: 3} @@ -524,7 +431,7 @@ PrefabInstance: - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, type: 3} propertyPath: m_AnchoredPosition.y - value: 175 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, type: 3} @@ -549,178 +456,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 628711926} m_PrefabAsset: {fileID: 0} ---- !u!1 &695796911 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 695796912} - - component: {fileID: 695796915} - - component: {fileID: 695796914} - - component: {fileID: 695796913} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &695796912 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 695796911} - 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: 1229976081} - m_RootOrder: 0 - 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: 3} - m_SizeDelta: {x: 570, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &695796913 +--- !u!114 &628711928 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 8637195768259321094, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, + type: 3} + m_PrefabInstance: {fileID: 628711926} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 695796911} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - mTerm: '-' - mTermSecondary: Font/DFHannotateStdN-W7 - PrimaryTermModifier: 0 - SecondaryTermModifier: 0 - TermPrefix: - TermSuffix: - LocalizeOnAwake: 1 - IgnoreRTL: 0 - MaxCharactersInRTL: 0 - IgnoreNumbersInRTL: 1 - CorrectAlignmentForRTL: 1 - AddSpacesToJoinedLanguages: 0 - AllowLocalizedParameters: 1 - AllowParameters: 1 - TranslatedObjects: [] - LocalizeEvent: - m_PersistentCalls: - m_Calls: [] - AlwaysForceLocalize: 0 - LocalizeCallBack: - Target: {fileID: 0} - MethodName: - mGUI_ShowReferences: 0 - mGUI_ShowTems: 1 - mGUI_ShowCallback: 0 - mLocalizeTarget: {fileID: 358757616} - mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text ---- !u!114 &695796914 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 695796911} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.99607843, b: 0.81960785, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 40 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 32 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u306F\u3058\u3081\u306E\u30AB\u30FC\u30C8" ---- !u!222 &695796915 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 695796911} - m_CullTransparentMesh: 0 ---- !u!1 &703079870 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 703079871} - - component: {fileID: 703079872} - m_Layer: 5 - m_Name: InnnerObject_induction - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &703079871 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 703079870} - 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: 1229976081} - - {fileID: 529529103} - - {fileID: 1504798626} - m_Father: {fileID: 7029507892281395535} - m_RootOrder: 3 - 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: 160} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!225 &703079872 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 703079870} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!1 &775014326 GameObject: m_ObjectHideFlags: 0 @@ -801,145 +548,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 775014326} m_CullTransparentMesh: 0 ---- !u!1 &783393992 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 783393993} - - component: {fileID: 783393997} - - component: {fileID: 783393996} - - component: {fileID: 783393995} - - component: {fileID: 783393994} - m_Layer: 5 - m_Name: Button_close - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &783393993 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 783393992} - 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: 1801750420} - m_Father: {fileID: 529529103} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -152, y: -465} - m_SizeDelta: {x: 196, y: 110} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &783393994 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 783393992} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} - m_Name: - m_EditorClassIdentifier: - onClickPlaySEFilename: se_ButtonTap - randomPlaySEFilenames: [] - randomPlayVoiceFilenames: [] - vibrationType: 0 ---- !u!114 &783393995 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 783393992} - 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: 783393996} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &783393996 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 783393992} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: aa7d3d5ac0992464fb8f1491617b73bd, type: 3} - 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 &783393997 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 783393992} - m_CullTransparentMesh: 0 --- !u!1 &854297736 GameObject: m_ObjectHideFlags: 0 @@ -964,20 +572,20 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 854297736} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7029507892718514667} - {fileID: 9029787154552739325} - m_Father: {fileID: 7029507893056145018} - m_RootOrder: 3 + m_Father: {fileID: 1209948395} + m_RootOrder: 1 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 240, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &854297738 MonoBehaviour: @@ -994,126 +602,6 @@ MonoBehaviour: button: {fileID: 7029507892718514666} onObject: {fileID: 7029507892718514664} offObject: {fileID: 8336091249663688558} ---- !u!1 &889182433 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 889182434} - - component: {fileID: 889182437} - - component: {fileID: 889182436} - - component: {fileID: 889182435} - m_Layer: 5 - m_Name: explanation - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &889182434 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 889182433} - 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: 1504798626} - m_RootOrder: 0 - 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: 3} - m_SizeDelta: {x: 660, y: 200} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &889182435 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 889182433} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} - m_Name: - m_EditorClassIdentifier: - mTerm: '-' - mTermSecondary: Font/DFHannotateStdN-W7 - PrimaryTermModifier: 0 - SecondaryTermModifier: 0 - TermPrefix: - TermSuffix: - LocalizeOnAwake: 1 - IgnoreRTL: 0 - MaxCharactersInRTL: 0 - IgnoreNumbersInRTL: 1 - CorrectAlignmentForRTL: 1 - AddSpacesToJoinedLanguages: 0 - AllowLocalizedParameters: 1 - AllowParameters: 1 - TranslatedObjects: [] - LocalizeEvent: - m_PersistentCalls: - m_Calls: [] - AlwaysForceLocalize: 0 - LocalizeCallBack: - Target: {fileID: 0} - MethodName: - mGUI_ShowReferences: 0 - mGUI_ShowTems: 1 - mGUI_ShowCallback: 0 - mLocalizeTarget: {fileID: 1996607626} - mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text ---- !u!114 &889182436 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 889182433} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 300 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1.2 - m_Text: "\uFF5E\uFF5E\u30AB\u30FC\u30C8\u306E\u8AAC\u660E\u306A\u3069\u306A\u30693\u884C\u4EE5\u5185\uFF5E\uFF5E\r\n\uFF5E\uFF5E\u30AB\u30FC\u30C8\u306E\u8AAC\u660E\u306A\u3069\u306A\u30693\u884C\u4EE5\u5185\uFF5E\uFF5E\r\n\uFF5E\uFF5E\u30AB\u30FC\u30C8\u306E\u8AAC\u660E\u306A\u3069\u306A\u30693\u884C\u4EE5\u5185\uFF5E\uFF5E" ---- !u!222 &889182437 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 889182433} - m_CullTransparentMesh: 0 --- !u!114 &897450330 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1143,7 +631,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &968516459 RectTransform: m_ObjectHideFlags: 0 @@ -1151,19 +639,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 968516458} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1934136627} - m_Father: {fileID: 529529103} - m_RootOrder: 3 + m_Father: {fileID: 1209948395} + m_RootOrder: 2 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: -84.00006} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 716, y: -60} + m_SizeDelta: {x: 240, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &968516460 MonoBehaviour: @@ -1197,7 +685,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1018924470 RectTransform: m_ObjectHideFlags: 0 @@ -1215,12 +703,12 @@ RectTransform: - {fileID: 434586922} - {fileID: 2074442888} - {fileID: 775014327} - m_Father: {fileID: 529529103} - m_RootOrder: 1 + m_Father: {fileID: 7029507893617468949} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 4, y: -83} + m_AnchoredPosition: {x: -3, y: 494.09998} m_SizeDelta: {x: 500, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1018924471 @@ -1261,7 +749,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1018924469} m_CullTransparentMesh: 0 ---- !u!1 &1021454811 +--- !u!1 &1209948394 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1269,111 +757,101 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1021454812} - - component: {fileID: 1021454814} - - component: {fileID: 1021454813} + - component: {fileID: 1209948395} + - component: {fileID: 1209948396} m_Layer: 5 - m_Name: line + m_Name: Buttons m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1021454812 +--- !u!224 &1209948395 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1021454811} - 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: 1229976081} - m_RootOrder: 1 - 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: -23.1} - m_SizeDelta: {x: 580, y: 6} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1021454813 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1021454811} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: befe49c03955d3642a335e511312e1ba, type: 3} - 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 &1021454814 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1021454811} - m_CullTransparentMesh: 0 ---- !u!1 &1229976080 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1229976081} - m_Layer: 5 - m_Name: Text_title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1229976081 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1229976080} + m_GameObject: {fileID: 1209948394} 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: 695796912} - - {fileID: 1021454812} - m_Father: {fileID: 703079871} + - {fileID: 1304673655} + - {fileID: 854297737} + - {fileID: 968516459} + - {fileID: 1400119942} + m_Father: {fileID: 7029507893617468949} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 115} + m_SizeDelta: {x: 0, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1209948396 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1209948394} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 58 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &1304673654 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1304673655} + m_Layer: 5 + m_Name: Button_close(spacer) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1304673655 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1304673654} + 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: 7029507892046718506} + m_Father: {fileID: 1209948395} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -68} - m_SizeDelta: {x: 570, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 240, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1400119941 GameObject: @@ -1394,7 +872,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1400119942 RectTransform: m_ObjectHideFlags: 0 @@ -1408,12 +886,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1818491037} - m_Father: {fileID: 1420420143} - m_RootOrder: 1 + m_Father: {fileID: 1209948395} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -295} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 706, y: -60} m_SizeDelta: {x: 220, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1400119943 @@ -1514,121 +992,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1400119941} m_CullTransparentMesh: 0 ---- !u!1 &1420420142 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1420420143} - m_Layer: 5 - m_Name: item_explanation - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1420420143 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1420420142} - 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: 628711927} - - {fileID: 1400119942} - m_Father: {fileID: 7029507893617468949} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1504798625 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1504798626} - - component: {fileID: 1504798628} - - component: {fileID: 1504798627} - m_Layer: 0 - m_Name: explanation - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1504798626 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504798625} - 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: 889182434} - m_Father: {fileID: 703079871} - m_RootOrder: 2 - 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: -142} - m_SizeDelta: {x: 690, y: 250} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1504798627 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504798625} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4eac550dd25ea5f4c9f40b6245566b86, type: 3} - 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 &1504798628 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504798625} - m_CullTransparentMesh: 0 --- !u!114 &1564797273 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1641,7 +1004,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1801750422} + mTarget: {fileID: 7029507893702727189} --- !u!1 &1646589577 GameObject: m_ObjectHideFlags: 0 @@ -1718,248 +1081,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1646589577} m_CullTransparentMesh: 0 ---- !u!1001 &1714354797 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 529529103} - m_Modifications: - - target: {fileID: 303287216037748863, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_Name - value: Customize_iconTarget - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -21 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, type: 3} ---- !u!224 &1714354798 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - m_PrefabInstance: {fileID: 1714354797} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1801750419 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1801750420} - - component: {fileID: 1801750423} - - component: {fileID: 1801750422} - - component: {fileID: 1801750421} - m_Layer: 5 - m_Name: Image_text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1801750420 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1801750419} - 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: 783393993} - m_RootOrder: 0 - 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: 4} - m_SizeDelta: {x: 102, y: 42} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1801750421 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1801750419} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} - m_Name: - m_EditorClassIdentifier: - mTerm: ui_button_icon_stop_logo - mTermSecondary: - PrimaryTermModifier: 0 - SecondaryTermModifier: 0 - TermPrefix: - TermSuffix: - LocalizeOnAwake: 1 - IgnoreRTL: 0 - MaxCharactersInRTL: 0 - IgnoreNumbersInRTL: 1 - CorrectAlignmentForRTL: 1 - AddSpacesToJoinedLanguages: 0 - AllowLocalizedParameters: 1 - AllowParameters: 1 - TranslatedObjects: - - {fileID: 21300000, guid: 99fb76b36ecee354fb95912e34437775, type: 3} - LocalizeEvent: - m_PersistentCalls: - m_Calls: [] - AlwaysForceLocalize: 0 - LocalizeCallBack: - Target: {fileID: 0} - MethodName: - mGUI_ShowReferences: 0 - mGUI_ShowTems: 1 - mGUI_ShowCallback: 0 - mLocalizeTarget: {fileID: 1564797273} - mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &1801750422 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1801750419} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 99fb76b36ecee354fb95912e34437775, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1801750423 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1801750419} - m_CullTransparentMesh: 0 --- !u!1 &1818491036 GameObject: m_ObjectHideFlags: 0 @@ -2089,7 +1210,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1646589579} + mTarget: {fileID: 0} --- !u!1001 &1918230665 PrefabInstance: m_ObjectHideFlags: 0 @@ -2102,6 +1223,16 @@ PrefabInstance: propertyPath: m_Name value: Customize_iconTarget objectReference: {fileID: 0} + - target: {fileID: 303287216037748863, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5581601667438571788, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, + type: 3} + propertyPath: mLocalizeTarget + value: + objectReference: {fileID: 378941593} - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, type: 3} propertyPath: m_Pivot.x @@ -2170,17 +1301,17 @@ PrefabInstance: - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, type: 3} @@ -2190,7 +1321,7 @@ PrefabInstance: - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, type: 3} propertyPath: m_AnchoredPosition.y - value: 7 + value: 45 objectReference: {fileID: 0} - target: {fileID: 6255055778263112968, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, type: 3} @@ -2215,6 +1346,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1918230665} m_PrefabAsset: {fileID: 0} +--- !u!114 &1918230667 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8637195768259321094, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, + type: 3} + m_PrefabInstance: {fileID: 1918230665} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1934136626 GameObject: m_ObjectHideFlags: 0 @@ -2251,9 +1394,9 @@ RectTransform: m_Father: {fileID: 968516459} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 147, y: -446} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 240, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1934136628 @@ -2430,6 +1573,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1940702284} m_CullTransparentMesh: 0 +--- !u!114 &1966070101 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 628711928} --- !u!114 &1996607626 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2442,7 +1598,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 889182436} + mTarget: {fileID: 7029507893567348588} --- !u!114 &2058577851 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2695,7 +1851,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} + m_Sprite: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2781,12 +1937,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7029507893702727186} - m_Father: {fileID: 7029507893056145018} - m_RootOrder: 2 + m_Father: {fileID: 1304673655} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -152, y: -380.99997} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 196, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7029507892046718507 @@ -2961,12 +2117,12 @@ RectTransform: m_Children: - {fileID: 7029507893344967646} - {fileID: 7029507893569539751} - m_Father: {fileID: 7029507893056145018} - m_RootOrder: 1 + m_Father: {fileID: 7029507893617468949} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 4, y: -12} + m_AnchoredPosition: {x: 0, y: 490} m_SizeDelta: {x: 200, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7029507892281395532 @@ -2979,6 +2135,8 @@ GameObject: m_Component: - component: {fileID: 7029507892281395535} - component: {fileID: 7029507892281395533} + - component: {fileID: 7029507892281395537} + - component: {fileID: 7029507892281395536} m_Layer: 5 m_Name: Window m_TagString: Untagged @@ -3001,14 +2159,18 @@ MonoBehaviour: backgroundAnimator: {fileID: 7029507892730506303} closeButton: {fileID: 7029507892046718509} closeButton2: {fileID: 1400119944} + goToMiniGameButton: {fileID: 968516460} purchaseButton: {fileID: 854297738} nameText: {fileID: 7029507893250763409} textText: {fileID: 7029507893567348588} - priceText: {fileID: 7029507893569539750} + wingPriceText: {fileID: 7029507893569539750} + needScoreText: {fileID: 434586923} imageTransform: {fileID: 1918230666} detailImageTransform: {fileID: 628711927} - purchaseObject: {fileID: 7029507893056145019} - detailObject: {fileID: 1420420142} + wingPriceObject: {fileID: 7029507892193930844} + needScoreObject: {fileID: 1018924469} + defaultHeight: 820 + tallHeight: 900 --- !u!224 &7029507892281395535 RectTransform: m_ObjectHideFlags: 0 @@ -3021,71 +2183,22 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7029507892326923648} - - {fileID: 74022314} - {fileID: 7029507893617468949} - - {fileID: 703079871} m_Father: {fileID: 7029507892990664035} m_RootOrder: 1 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: 50} - m_SizeDelta: {x: 740, y: 740} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &7029507892326923648 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7029507892326923649} - 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: 7029507892281395535} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 740, y: 820} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &7029507892326923649 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7029507892326923648} - - component: {fileID: 7029507892326923650} - - component: {fileID: 7029507892326923651} - m_Layer: 5 - m_Name: Window_mat - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!222 &7029507892326923650 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7029507892326923649} - m_CullTransparentMesh: 0 ---- !u!114 &7029507892326923651 +--- !u!114 &7029507892281395536 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7029507892326923649} + m_GameObject: {fileID: 7029507892281395532} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -3109,6 +2222,14 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!222 &7029507892281395537 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7029507892281395532} + m_CullTransparentMesh: 1 --- !u!1 &7029507892718514664 GameObject: m_ObjectHideFlags: 0 @@ -3189,9 +2310,9 @@ RectTransform: m_Father: {fileID: 854297737} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 147, y: -446} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 240, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7029507892718514668 @@ -3343,12 +2464,12 @@ RectTransform: m_Children: - {fileID: 7029507893567348589} m_Father: {fileID: 7029507893617468949} - m_RootOrder: 3 + m_RootOrder: 4 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: -88} - m_SizeDelta: {x: 690, y: 250} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 318} + m_SizeDelta: {x: -50, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7029507892757504051 GameObject: @@ -3598,16 +2719,14 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1918230666} - - {fileID: 7029507892193930847} - - {fileID: 7029507892046718506} - - {fileID: 854297737} + - {fileID: 628711927} m_Father: {fileID: 7029507893617468949} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -7, y: -207.9} - m_SizeDelta: {x: 550, y: 230} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 176.50003} + m_SizeDelta: {x: -120, y: -567.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7029507893056145019 GameObject: @@ -3619,7 +2738,7 @@ GameObject: m_Component: - component: {fileID: 7029507893056145018} m_Layer: 5 - m_Name: Item_purchase + m_Name: Icon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4100,15 +3219,17 @@ RectTransform: m_Children: - {fileID: 7029507893067947991} - {fileID: 7029507893056145018} - - {fileID: 1420420143} + - {fileID: 7029507892193930847} + - {fileID: 1018924470} - {fileID: 7029507892757504050} + - {fileID: 1209948395} m_Father: {fileID: 7029507892281395535} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &7029507893702727186 RectTransform: @@ -4300,9 +3421,9 @@ RectTransform: m_Father: {fileID: 854297737} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 147, y: -446} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 240, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &9119010633734777629 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab index 750e3862..62f8cb72 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab @@ -1341,6 +1341,8 @@ MonoBehaviour: selectedObject: {fileID: 7345703844887354918} selectedFrameObject: {fileID: 1107814534788598305} unselectedObject: {fileID: 1101663351218072558} + iconWingObject: {fileID: 9136989294876732286} + iconChiliObject: {fileID: 1229513145285640295} unlockLevelText: {fileID: 2013268342774345650} priceText: {fileID: 9136989294777611129} iconTarget: {fileID: 1400898384260248944} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomizeItem.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomizeItem.cs index adfe0cc1..286955c6 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomizeItem.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomizeItem.cs @@ -22,6 +22,8 @@ namespace MyGame.Scenes.marketing.Scripts [SerializeField] private GameObject selectedObject; [SerializeField] private GameObject selectedFrameObject; [SerializeField] private GameObject unselectedObject; + [SerializeField] private GameObject iconWingObject; + [SerializeField] private GameObject iconChiliObject; [SerializeField] private Text unlockLevelText; [SerializeField] private Text priceText; [SerializeField] private Transform iconTarget; @@ -100,6 +102,8 @@ namespace MyGame.Scenes.marketing.Scripts priceText.text = customizeData.price.ToString(); iconTarget.DestroyAllChildrens(); Instantiate(customizeData.GetIconPrefab(), iconTarget); + iconWingObject.SetActive(customizeData.PriceType == ShopCustomizePriceType.Coin); + iconChiliObject.SetActive(customizeData.PriceType == ShopCustomizePriceType.TotalScore1); } } } \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomizePurchaseDialog.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomizePurchaseDialog.cs index d61863f7..c34103c7 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomizePurchaseDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomizePurchaseDialog.cs @@ -18,14 +18,18 @@ namespace MyGame.Scenes.marketing.Scripts [SerializeField] private Animator backgroundAnimator; [SerializeField] private Button closeButton; [SerializeField] private Button closeButton2; + [SerializeField] private ButtonOnOff goToMiniGameButton; [SerializeField] private ButtonOnOff purchaseButton; [SerializeField] private Text nameText; [SerializeField] private Text textText; - [SerializeField] private Text priceText; + [SerializeField] private Text wingPriceText; + [SerializeField] private Text needScoreText; [SerializeField] private Transform imageTransform; [SerializeField] private Transform detailImageTransform; - [SerializeField] private GameObject purchaseObject; - [SerializeField] private GameObject detailObject; + [SerializeField] private GameObject wingPriceObject; + [SerializeField] private GameObject needScoreObject; + [SerializeField] private float defaultHeight; + [SerializeField] private float tallHeight; private void Start() { @@ -47,18 +51,31 @@ namespace MyGame.Scenes.marketing.Scripts LocalCacheManager.Remove(PurchaseCallbackTag); TransitionManager.Instance.UnloadScene(GameScenes.CustomizationPurchase); }).AddTo(this); + goToMiniGameButton.OnClickObservable.Take(1).Subscribe(_ => + { + LocalCacheManager.Remove(PurchaseCallbackTag); + TransitionManager.Instance.UnloadScene(GameScenes.CustomizationPurchase); + TransitionManager.Instance.LoadScene(GameScenes.MiniGame); + }).AddTo(this); var detailMode = LocalCacheManager.Load(DetailModeTag); - purchaseObject.SetActive(!detailMode); - detailObject.SetActive(detailMode); + var windowRT = transform as RectTransform; + var windowDelta = windowRT.sizeDelta; + windowDelta.y = customizeData.PriceType == ShopCustomizePriceType.TotalScore1 ? tallHeight : defaultHeight; + windowRT.sizeDelta = windowDelta; + wingPriceObject.SetActive(!detailMode && customizeData.PriceType == ShopCustomizePriceType.Coin); + needScoreObject.SetActive(!detailMode && customizeData.PriceType == ShopCustomizePriceType.TotalScore1); purchaseButton.SetActive(GameDataManager.GameData.ShopCustomizeCoin >= customizeData.price); + purchaseButton.gameObject.SetActive(customizeData.PriceType == ShopCustomizePriceType.Coin); + goToMiniGameButton.gameObject.SetActive(customizeData.PriceType == ShopCustomizePriceType.TotalScore1); nameText.text = customizeData.Name; textText.text = customizeData.Text; - priceText.text = customizeData.price.ToString(); + wingPriceText.text = customizeData.price.ToString(); + needScoreText.text = customizeData.price.ToString(); imageTransform.DestroyAllChildrens(); - Instantiate(customizeData.GetIconPrefab(), imageTransform); detailImageTransform.DestroyAllChildrens(); - Instantiate(customizeData.GetIconPrefab(), detailImageTransform); + (detailMode ? detailImageTransform : imageTransform).gameObject.SetActive(true); + Instantiate(customizeData.GetIconPrefab(), detailMode ? detailImageTransform : imageTransform); } public static void ShowDialog(ShopCustomizeData customizeData, bool detailMode, Action onPurchase = null, Action onClose = null){