From 20d50b84f272e71744953b5b3ac40229fc041ded Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 9 Jun 2021 17:51:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?ID1009443=E3=80=91=20=E3=80=90=E6=97=A0?= =?UTF-8?q?=E5=B0=BD=E5=89=AF=E6=9C=AC=E3=80=91=E5=9C=B0=E5=9B=BE=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=E5=90=8C=E6=97=B6=E6=A0=B9=E6=8D=AE=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?ID=E5=92=8C=E5=BD=93=E5=89=8D=E7=8E=A9=E5=AE=B6=E6=89=80?= =?UTF-8?q?=E5=9C=A8=E7=AD=89=E7=BA=A7=E6=AE=B5=E6=9D=A5=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Carbon/EndLessCarbonPanel.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua index cc91372bb2..64c302770d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua @@ -174,7 +174,15 @@ function this.InitCompShow() this.rewardList[j].gameObject:SetActive(false) end end - this.bossGridText.text = ConfigManager.GetConfigDataByKey(ConfigName.endlessDifficulty,"MapPool",EndLessMapManager.openMapId).Desc + local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.endlessDifficulty,"MapPool",EndLessMapManager.openMapId) + local lv = PlayerManager.level + local config = nil + for i = 1,#configs do + if lv >= configs[i].WorldLevel[1] and lv <= configs[i].WorldLevel[2] then + config = configs[i] + end + end + this.bossGridText.text = config.Desc end function this.SetStaticData() From c40c6640c9551016287a89d3074f43ca23a4232f Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 9 Jun 2021 18:02:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90ID1009443=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E6=97=A0=E5=B0=BD=E5=89=AF=E6=9C=AC=E3=80=91=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=90=8C=E6=97=B6=E6=A0=B9=E6=8D=AE=E5=9C=B0?= =?UTF-8?q?=E5=9B=BEID=E5=92=8C=E5=BD=93=E5=89=8D=E7=8E=A9=E5=AE=B6?= =?UTF-8?q?=E6=89=80=E5=9C=A8=E7=AD=89=E7=BA=A7=E6=AE=B5=E6=9D=A5=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=EF=BC=8C=E5=B9=B6=E6=A0=B9=E6=8D=AE=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E6=AE=B5=E8=AF=BB=E5=8F=96=E5=89=AF=E6=9C=AC?= =?UTF-8?q?=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Carbon/EndLessCarbonPanel.prefab | 4 ++-- .../~Lua/Modules/Carbon/EndLessCarbonPanel.lua | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab index 28e1810716..41cba34043 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab @@ -338,9 +338,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 4 - m_MaxSize: 48 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua index 64c302770d..50a3aa892b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua @@ -183,6 +183,8 @@ function this.InitCompShow() end end this.bossGridText.text = config.Desc + local mapData = endLessConfig[EndLessMapManager.openMapId] + this.miniMapName.text = config.Title end function this.SetStaticData() @@ -202,7 +204,7 @@ function this.SetStaticData() PlayUIAnim(this.rewardList[i].gameObject) end, 0.001 * (i - 1)):Start() end - this.miniMapName.text = GetLanguageStrById(mapData.Info) + end -- 行动力是否显示倒计时