From d9b465c7cf2029819cc4f4b54ab1b6fc3e283174 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 24 May 2021 12:02:20 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E8=A1=8C=E3=80=91=E8=8B=B1?= =?UTF-8?q?=E9=9B=84=E9=80=89=E6=8B=A9=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GeneralPanel/GeneralBigPopup.prefab | 81 ++++++++++++++++++- .../~Lua/Modules/Practice/PracticeManager.lua | 10 +-- 2 files changed, 83 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 8ade1f9b6e..ae66d42493 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -2655,6 +2655,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &2095578116326476647 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1915557116560887742} + - component: {fileID: 6724660429874909238} + - component: {fileID: 908926187445182751} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1915557116560887742 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095578116326476647} + 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_Children: [] + m_Father: {fileID: 1234173661531444072} + m_RootOrder: 3 + 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: -503} + m_SizeDelta: {x: 900, y: 6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6724660429874909238 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095578116326476647} + m_CullTransparentMesh: 0 +--- !u!114 &908926187445182751 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095578116326476647} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 26ce1a2f8851e004e88e569a15a5a1f8, 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 --- !u!1 &2252907647811771510 GameObject: m_ObjectHideFlags: 0 @@ -5232,7 +5306,7 @@ RectTransform: m_Children: - {fileID: 1297378177353145215} m_Father: {fileID: 1234173661531444072} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5578,7 +5652,7 @@ RectTransform: m_Children: - {fileID: 4124221650990893700} m_Father: {fileID: 1234173661531444072} - 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} @@ -7692,6 +7766,7 @@ RectTransform: - {fileID: 8369931834587041866} - {fileID: 1031297484074503371} - {fileID: 7656265836104597532} + - {fileID: 1915557116560887742} - {fileID: 7223015060704331990} - {fileID: 6806249098429226119} - {fileID: 1309844718863455023} @@ -8841,7 +8916,7 @@ RectTransform: m_Children: - {fileID: 8229610283058382897} m_Father: {fileID: 1234173661531444072} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua index 12eee57bff..a076755673 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua @@ -335,14 +335,14 @@ function this.PracticeCheckUpgrade() for i = 1, #configData.LevelUpCost do local data = configData.LevelUpCost[i] if BagManager.GetTotalItemNum(data[1]) < data[2] then - LogRed("return false Upgrade 1") + -- LogRed("return false Upgrade 1") return false end end - LogGreen("return true Upgrade") + -- LogGreen("return true Upgrade") return true end - LogRed("return false Upgrade 2") + -- LogRed("return false Upgrade 2") return false end @@ -352,12 +352,12 @@ function this.PracticeCheckImprint() if this.ImprintServerData[v.Id] then local str = PlayerPrefs.GetInt(PlayerManager.uid.."Imprint"..v.Id) if str == 0 then - LogGreen("return true Imprint") + -- LogGreen("return true Imprint") return true end end end - LogRed("return false Imprint") + -- LogRed("return false Imprint") return false end