diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index ef5db91b..320e54bb 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -701,6 +701,18 @@ Transform: m_Father: {fileID: 767719702} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &328956019 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916833546693946, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 3664916832445709976} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3664916832445709980} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &344110475 PrefabInstance: m_ObjectHideFlags: 0 @@ -6313,6 +6325,8 @@ MonoBehaviour: refreshRewardCoin: 100 cookingButton: {fileID: 414580708} adButton: {fileID: 445566315} + DisableObject: {fileID: 1967400434} + remainTimeText: {fileID: 82006170} kitchenView: {fileID: 1870432536} orderIndicatorView: {fileID: 2021031102} autoCookView: {fileID: 2088316432} @@ -7498,6 +7512,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Text + value: '0 ' + objectReference: {fileID: 0} - target: {fileID: 3664916832564167473, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Name @@ -7650,6 +7669,12 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916833546693946, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 582b70d53a85e4e74be0fb9ca6be120c, + type: 3} - target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_LocalPosition.x @@ -7782,6 +7807,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 8 objectReference: {fileID: 0} + - target: {fileID: 6797590389832684696, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: coinvideoButton + value: + objectReference: {fileID: 3664916832445709983} - target: {fileID: 6969874152703327186, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.y @@ -7893,6 +7923,28 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7402670efed5410e894680a6e865ce23, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &3664916832445709980 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3664916833546693944, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 3664916832445709976} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3664916832445709981 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3664916832445709980} + 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 &3664916832445709982 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1443457894132347966, guid: caaa748dbeed576499e8cae74d33f689, @@ -7905,6 +7957,50 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &3664916832445709983 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3664916832445709980} + 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: 328956019} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1001 &7698191610787656521 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab index 67a3d448..cca1a0cc 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab @@ -538,7 +538,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 12345 + m_Text: '0 ' --- !u!1 &137127163584464918 GameObject: m_ObjectHideFlags: 0 @@ -938,6 +938,8 @@ GameObject: - component: {fileID: 137127164258565648} - component: {fileID: 137127164258565655} - component: {fileID: 137127164258565654} + - component: {fileID: 7950306860356820311} + - component: {fileID: 1215404186933780397} m_Layer: 5 m_Name: StockCoin m_TagString: Untagged @@ -988,6 +990,8 @@ MonoBehaviour: coinUpDuration: 0.5 coinMoveDuration: 0.5 rootTransform: {fileID: 0} + coinvideoButton: {fileID: 7950306860356820311} + refreshRewardCoin: 100 --- !u!222 &137127164258565649 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1016,7 +1020,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ff4d597826f53ac49821fc3d60148965, type: 3} + m_Sprite: {fileID: 21300000, guid: 582b70d53a85e4e74be0fb9ca6be120c, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1066,6 +1070,66 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!114 &7950306860356820311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137127164258565650} + 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1215404186933780397 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137127164258565650} + 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!1 &137127164298331672 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity index 3c3e43f8..bed82f98 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity @@ -747,6 +747,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 4559813503860727171} +--- !u!114 &926930581 +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: 4559813503860727174} --- !u!114 &963314161 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2428,6 +2441,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4036044297164371458, guid: 041c0f3d96c90d64094cc76c5c87c26f, + type: 3} + propertyPath: mLocalizeTarget + value: + objectReference: {fileID: 926930581} - target: {fileID: 4195013710213225661, guid: 041c0f3d96c90d64094cc76c5c87c26f, type: 3} propertyPath: mLocalizeTarget @@ -2699,6 +2717,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &4559813503860727174 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3644085666299868797, guid: 041c0f3d96c90d64094cc76c5c87c26f, + type: 3} + m_PrefabInstance: {fileID: 4559813503860727169} + 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!1001 &5034752974072861411 PrefabInstance: m_ObjectHideFlags: 0 @@ -3425,7 +3455,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: fb63ee5957e15004eb27aaf367103806, + objectReference: {fileID: 21300000, guid: d6cfa824ddebb7040955770d58d8e523, type: 3} - target: {fileID: 7328251775215910467, guid: b46e011db918bbe42a91795497f90b9c, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index e5f570f0..a82876cb 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -2076,7 +2076,7 @@ MonoBehaviour: backgroundAnimator: {fileID: 858120093} cancelButton: {fileID: 843133640} nextButton: {fileID: 1853630204} - disabledNextButton: {fileID: 1037294270} + disabledNextButton: {fileID: 1037294272} tankCaution: {fileID: 1464412873} panSelector: {fileID: 1160535648} flavorName: {fileID: 707887860} @@ -2228,7 +2228,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/shopmatvideo.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/shopmatvideo.prefab index abc61ad0..f47514f4 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/shopmatvideo.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/shopmatvideo.prefab @@ -30,6 +30,7 @@ RectTransform: 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: 8728189482977067555} - {fileID: 7591060974965528362} @@ -39,7 +40,7 @@ RectTransform: 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: 186, y: 104} + m_SizeDelta: {x: 216, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2314072855486321136 CanvasRenderer: @@ -64,6 +65,7 @@ MonoBehaviour: 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: @@ -92,6 +94,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -165,6 +168,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6062703037900737235} m_RootOrder: 0 @@ -197,6 +201,7 @@ MonoBehaviour: 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: @@ -237,6 +242,7 @@ RectTransform: 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: 1830576227029005156} m_Father: {fileID: 0} @@ -278,6 +284,7 @@ RectTransform: 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: 6062703037900737235} m_RootOrder: 1 @@ -310,6 +317,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.9811321, g: 0.9765041, b: 0.9765041, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -423,6 +431,7 @@ RectTransform: 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: 6062703037900737235} m_Father: {fileID: 1833305669461938315}