From a3c24ee4b790b020c0731a830a63fdf2b23e281e Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 10 Dec 2021 15:29:03 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=91=BD=E6=A0=BC=E3=80=91=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab | 8 ++++---- Assets/ManagedResources/~Lua/Modules/Gem/GemManager.lua | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index c47df80024..e1442e3578 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -17960,8 +17960,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_Color: {r: 1, g: 1, b: 1, a: 0.78431374} + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -32998,8 +32998,8 @@ RectTransform: 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: -2.13, y: -62.3} - m_SizeDelta: {x: 900.74, y: 1226.9} + m_AnchoredPosition: {x: -2.13, y: -65.28} + m_SizeDelta: {x: 900.7, y: 1213.26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2611804464083557781 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/GemManager.lua b/Assets/ManagedResources/~Lua/Modules/Gem/GemManager.lua index 49a39150f4..f86897454d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/GemManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/GemManager.lua @@ -223,7 +223,13 @@ function this.FastConpound(id) end end totalMoney = totalMoney + gemConfig[id].UpgradeCost[2] - return true,lastGNum==1,finalList,totalMoney + local tempList = {} + for key, value in pairs(finalList) do--存在数据为0的情况,剔除 + if value > 0 then + tempList[key] = value + end + end + return true,lastGNum==1,tempList,totalMoney end function this.DoCircle2(type,curLevel,targetLevel)