From 627954ae3fa188c7d46e61ba31a7f7189ff8f9d0 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 23 Jul 2021 17:26:24 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB?= =?UTF-8?q?=E3=80=91=E5=B1=82=E6=95=B0=E9=94=99=E8=AF=AF=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index 880868d643..0357931a95 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -2,6 +2,14 @@ require("Base/BasePanel") local CarbonsPanel = Inherit(BasePanel) local systemConfig = ConfigManager.GetConfig(ConfigName.GlobalSystemConfig) +local expeditionLevel = { + [1] = 1, + [2] = 2, + [3] = 3, + [-1] = 2, + [4] = 3, +} + local carbonData = { [FUNCTION_OPEN_TYPE.EXPEDITION] = { id = FUNCTION_OPEN_TYPE.EXPEDITION, --大闹天宫 @@ -202,7 +210,9 @@ function CarbonsPanel:TipShow(_go,_value) elseif _value.id == FUNCTION_OPEN_TYPE.EXPEDITION then freetimes:SetActive(true) buytimes:SetActive(false) - local free = ExpeditionManager.GetCurNodeInfo().lay-1+(ExpeditionManager.expeditionLeve-1)*10 + LogGreen("ExpeditionManager.GetCurNodeInfo().lay:"..tostring(ExpeditionManager.GetCurNodeInfo().lay)) + LogGreen("ExpeditionManager.expeditionLeve:"..tostring(ExpeditionManager.expeditionLeve)) + local free = ExpeditionManager.GetCurNodeInfo().lay-1+(expeditionLevel[ExpeditionManager.expeditionLeve]-1)*10 local num = free <= 30 and free or 30 freetimesText.text = string.format("进度:%s/%s",num,30) end