From 751f7cd84b465bb221e28b3ba021cda799ae681f Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 9 Jul 2021 15:22:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90ID1009609=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E6=97=A0=E5=B0=BD=E5=89=AF=E6=9C=AC?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit dd1f598515f5730f38d2a04edc2106103852ea56) --- .../{r_Map_JiuYuanLu.png => r_Map_JiuYuanLu_zh.png} | Bin ...uYuanLu.png.meta => r_Map_JiuYuanLu_zh.png.meta} | 0 .../~Lua/Modules/Map/EndLessMapManager.lua | 2 +- .../ManagedResources/~Lua/Modules/Map/MapPanel.lua | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename Assets/ManagedResources/Atlas/MapAtlas/ArtFont/{r_Map_JiuYuanLu.png => r_Map_JiuYuanLu_zh.png} (100%) rename Assets/ManagedResources/Atlas/MapAtlas/ArtFont/{r_Map_JiuYuanLu.png.meta => r_Map_JiuYuanLu_zh.png.meta} (100%) diff --git a/Assets/ManagedResources/Atlas/MapAtlas/ArtFont/r_Map_JiuYuanLu.png b/Assets/ManagedResources/Atlas/MapAtlas/ArtFont/r_Map_JiuYuanLu_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/MapAtlas/ArtFont/r_Map_JiuYuanLu.png rename to Assets/ManagedResources/Atlas/MapAtlas/ArtFont/r_Map_JiuYuanLu_zh.png diff --git a/Assets/ManagedResources/Atlas/MapAtlas/ArtFont/r_Map_JiuYuanLu.png.meta b/Assets/ManagedResources/Atlas/MapAtlas/ArtFont/r_Map_JiuYuanLu_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/MapAtlas/ArtFont/r_Map_JiuYuanLu.png.meta rename to Assets/ManagedResources/Atlas/MapAtlas/ArtFont/r_Map_JiuYuanLu_zh.png.meta diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index 5dd48f5073..95b0ff745b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -13,7 +13,7 @@ local endlessTreasure = ConfigManager.GetConfig(ConfigName.endlessTreasure) this.limiteLevel = 0 this.EndlessDrop = {} function this.Initialize() - this.JiuYaunLuId = 16 + this.JiuYaunLuId = 1227 this.hungery = false -- 没有行动力了 this.leftEnergy = 0 -- 剩余行动力 this.totalEnergy = 0 -- 总行动力 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua index 5a3979ba07..43c0c456dd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua @@ -51,7 +51,7 @@ function this:InitComponent() this.btnFormat=Util.GetGameObject(this.rightDown,"btnFormat") this.btnNode=Util.GetGameObject(this.rightDown,"btnNote") this.btnJiuYuanLu=Util.GetGameObject(this.rightDown,"btnJiuYuanLu") - this.btnJiuYuanLu:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_Map_JiuYuanLu") + this.btnJiuYuanLu:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_Map_JiuYuanLu_zh") this.centerDown = Util.GetGameObject(self.gameObject, "centerDown") this.BtnBack = Util.GetGameObject(this.centerDown,"bg/btnBack") this.selectHero = Util.GetGameObject(this.centerDown,"selectHero") From 36a4a6241f58957ea03dfea96d465e6f592b0b9a Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 9 Jul 2021 17:04:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E5=89=AF=E6=9C=AC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 2686f970d76112f4c1aa793d6862f1d32b7f8284) --- .../~Lua/Modules/Map/View/EndLessMapView.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua index 78c34ecd72..1cb5a6eeab 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua @@ -128,8 +128,8 @@ function EndLessMapView:BindEvent() end MsgPanel.ShowTwo("是否消耗一枚九元露,复活所有神将并将血量恢复为100%?", function()end, function() NetManager.UseAddHpItemRequest(tostring(-1),function () - PopupTipPanel.ShowTip("已将所有神将复活并恢复至满血!") - this:OnShow() + this.btnJiuYuanLuNum.text = (this.num - 1) + PopupTipPanel.ShowTip("已将所有神将复活并恢复至满血!") end) end, "取消", "确认", "提示",false) end) @@ -384,7 +384,8 @@ function EndLessMapView:OnShow() EndLessMapManager.RrefreshFormation() this:ShowHeroData() end) - this.btnJiuYuanLuNum.text = BagManager.GetItemCountById(EndLessMapManager.JiuYaunLuId) + this.num = BagManager.GetItemCountById(EndLessMapManager.JiuYaunLuId) + this.btnJiuYuanLuNum.text = this.num end function EndLessMapView:ShowHeroData()