From a85dd596762b62d741e0ae0d2427c7562100cd15 Mon Sep 17 00:00:00 2001 From: "xiaohui.wang" Date: Thu, 2 Feb 2023 19:15:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E5=AF=BC=E5=A4=9A=E6=AC=A1=E6=97=A0?= =?UTF-8?q?=E9=87=91=E5=B8=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/CornField/CornField.unity | 232 +++++++++++++++++- .../MyGame/Scenes/recipe/Prefabs/Frame.prefab | 63 +++-- .../Scenes/recipe/Scripts/RecipeDetailView.cs | 5 + .../Assets/MyGame/Scripts/GetRewardDialog.cs | 1 + .../MyGame/Scripts/TransitionManager.cs | 2 + popcorn/Assets/Resources/I2Languages.asset | 4 +- 6 files changed, 283 insertions(+), 24 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 89bb3747..f5929f8a 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -124,6 +124,43 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &10052682 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 10052683} + m_Layer: 5 + m_Name: tutoobject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &10052683 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 10052682} + 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: 1886769626} + m_Father: {fileID: 1995963085} + 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: -150} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &24537252 GameObject: m_ObjectHideFlags: 0 @@ -1557,6 +1594,11 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1339603270, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 741f033558955407a8e984177cdaa542, + type: 3} - target: {fileID: 1453424322, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Sprite value: @@ -1595,6 +1637,18 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e644184ee7cac4454a2ebc1fc479ecb4, + type: 3} + - target: {fileID: 521511634720853184, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 75660155791874c1a90201391c63b5c1, + type: 3} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -1705,6 +1759,18 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 3e8106fd24f7946e2a20ebd081ebb0b9, + type: 3} + - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: dab0cd6adf1694bd6b96c224ad8c38e6, + type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y @@ -1850,6 +1916,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 0469694e83769479fa737c3a3b9f6b06, + type: 3} - target: {fileID: 3664916832909534300, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.x @@ -1880,6 +1952,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: afb06cd566c9b4c0eba30dd082477478, + type: 3} - target: {fileID: 3664916834121473267, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -1905,15 +1983,32 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4466880344787820340, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f0d95384ae70e49898e6133bbf35d0c0, + type: 3} + - target: {fileID: 4486994142522989318, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e259fa4d2057bac429e800d9dac78aae, + type: 3} - target: {fileID: 4852160585447148657, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: onClickPlaySEFilename value: se_ButtonTap objectReference: {fileID: 0} + - target: {fileID: 6119163445458718855, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: tutoobject + value: + objectReference: {fileID: 10052682} - target: {fileID: 6205448659049427752, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -2265,7 +2360,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3e6395a0cda798a47a6ddcc17370e27a, type: 3} + m_Sprite: {fileID: 21300000, guid: 909dbdbc1bab04cd480030ddb03c14a6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16660,6 +16755,131 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1881129198} m_CullTransparentMesh: 0 +--- !u!1001 &1886769625 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 10052683} + m_Modifications: + - target: {fileID: 570203512630255811, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_Name + value: tutorial_Arrow + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.7833333 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_SizeDelta.x + value: 192 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_SizeDelta.y + value: 177.66667 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -134.16666 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4c15a47e1d920844fad7ca50f3885536, type: 3} +--- !u!224 &1886769626 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8182262933506378416, guid: 4c15a47e1d920844fad7ca50f3885536, + type: 3} + m_PrefabInstance: {fileID: 1886769625} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1958951427 PrefabInstance: m_ObjectHideFlags: 0 @@ -17200,6 +17420,12 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!224 &1995963085 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 118497225, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + m_PrefabAsset: {fileID: 0} --- !u!1 &1998181882 GameObject: m_ObjectHideFlags: 0 @@ -17965,7 +18191,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 33965d17844ba2f4a813cf42bf932db0, + objectReference: {fileID: 21300000, guid: 8ad8575772ae2472ea7e1378ce241fe8, type: 3} - target: {fileID: 1507187604136703914, guid: 21599f8e6d1104a07b0b14b49f8c1429, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab index 060f30a8..15b89b1e 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab @@ -28,6 +28,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: 2646634445844468798} m_RootOrder: 2 @@ -60,6 +61,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: @@ -104,6 +106,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: 8815894619366199284} - {fileID: 2929932626576346080} @@ -141,6 +144,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: @@ -169,6 +173,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -242,6 +247,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.38, y: 0.38, z: 0.38} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2929932626910560293} m_RootOrder: 0 @@ -274,6 +280,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: @@ -314,6 +321,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: -0.067144625, w: 0.9977433} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3383784790555608151} m_Father: {fileID: 2646634445844468798} @@ -350,6 +358,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: 2929932626910560293} m_Father: {fileID: 2646634445844468798} @@ -389,6 +398,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: 2646634445844468798} m_RootOrder: 4 @@ -421,6 +431,7 @@ MonoBehaviour: 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: @@ -506,6 +517,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: 2929932626248606812} - {fileID: 2929932627123125674} @@ -540,6 +552,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: @@ -582,6 +595,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: 2929932626910560293} m_RootOrder: 1 @@ -614,6 +628,7 @@ MonoBehaviour: 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: @@ -659,6 +674,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2646634445844468798} - {fileID: 5518194748275484553} @@ -722,6 +738,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: 2969128505512012149} - {fileID: 8440980752897465212} @@ -772,6 +789,7 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &3261803197014340250 GameObject: m_ObjectHideFlags: 0 @@ -800,6 +818,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: 9097260142390357153} m_Father: {fileID: 2929932627350163026} @@ -833,6 +852,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: @@ -873,6 +893,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: 2929932625336302236} - {fileID: 367551539495355423} @@ -914,6 +935,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: 9097260142390357153} m_RootOrder: 1 @@ -921,7 +943,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 108, y: 0} - m_SizeDelta: {x: 128, y: 50} + m_SizeDelta: {x: 128, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7841468932949581945 CanvasRenderer: @@ -946,6 +968,7 @@ MonoBehaviour: 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: @@ -1031,6 +1054,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: 9097260142390357153} m_RootOrder: 0 @@ -1063,6 +1087,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: @@ -1242,6 +1267,12 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2814970099097301159, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} +--- !u!224 &2929932625336302236 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 1133216431126940221} + m_PrefabAsset: {fileID: 0} --- !u!114 &2929932625557648441 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, @@ -1254,12 +1285,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &2929932625336302236 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, - type: 3} - m_PrefabInstance: {fileID: 1133216431126940221} - m_PrefabAsset: {fileID: 0} --- !u!224 &7519072249774920432 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7485231107204569293, guid: e2818e79d8fc1f34388aff1b8969d340, @@ -1541,6 +1566,18 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2814970099097301159, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} +--- !u!1 &367551539495355422 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2814970099097301152, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 2452498385069847742} + m_PrefabAsset: {fileID: 0} +--- !u!224 &367551539495355423 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 2452498385069847742} + m_PrefabAsset: {fileID: 0} --- !u!114 &367551539734858426 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, @@ -1559,18 +1596,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2452498385069847742} m_PrefabAsset: {fileID: 0} ---- !u!224 &367551539495355423 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, - type: 3} - m_PrefabInstance: {fileID: 2452498385069847742} - m_PrefabAsset: {fileID: 0} ---- !u!1 &367551539495355422 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2814970099097301152, guid: e2818e79d8fc1f34388aff1b8969d340, - type: 3} - m_PrefabInstance: {fileID: 2452498385069847742} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8101979052737494168 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs index 3f174043..88b030ba 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs @@ -209,10 +209,15 @@ public class RecipeDetailView : MonoBehaviour else if (CoinManager.Instance.OwnCoin < shopData.price) { + if (!TransitionManager.Instance.showUncoin) + { GetRewardDialog.ShowUnColdDialog(()=> { Debug.Log("金币不足"); }, null); + TransitionManager.Instance.showUncoin = true; + + } } else if (!ShopItemPurchaseView.jumpPurchase) { diff --git a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs index 9dc84778..8ad076d0 100644 --- a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs +++ b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs @@ -203,6 +203,7 @@ namespace MyGame.Scripts LocalCacheManager.Load(CloseCallbackTag, null)?.Invoke(); LocalCacheManager.Remove(CloseCallbackTag); TransitionManager.Instance.UnloadScene(GameScenes.WatchMovieCoin); + TransitionManager.Instance.showUncoin = false; }); }).AddTo(this); okButton.OnClickAsObservable().Take(1).Subscribe(_ => diff --git a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs index 2c3f20ac..ff4f46d3 100644 --- a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs +++ b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs @@ -106,6 +106,8 @@ public sealed class TransitionManager : SingletonMonoBehaviour