From d3e6de38bb7633cae5c4543316d5da72894eb16f Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 1 Mar 2021 19:53:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E7=81=B5=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Expedition/View/MonsterFormationInfo.lua | 4 ++++ .../~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua index 80b0375566..c6fd67f804 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua @@ -42,6 +42,7 @@ function this:InitComponent(gameObject) this.fightBtn.gameObject:SetActive(true) this.returnLook=Util.GetGameObject(gameObject,"returnLook") this.returnLook.gameObject:SetActive(true) + this.tip = Util.GetGameObject(gameObject,"tip"):GetComponent("Text") end function this:BindEvent() @@ -118,6 +119,7 @@ function this:SetIcon() this.fightBtnNum.gameObject:SetActive(false) this.sureBtn:GetComponent("Image").sprite = Util.LoadSprite("r_hero_button_002") if waveId == data.monsterWave then + this.tip.text = "扫荡奖励" if freeTime > 0 then this.fightBtnText.text = string.format("%s","17232A","免费扫荡") else @@ -137,9 +139,11 @@ function this:SetIcon() end end elseif (waveId == data.monsterWave + 1) then + this.tip.text = "战斗奖励" this.sureBtn:GetComponent("Image").sprite = Util.LoadSprite("r_hero_button_001") this.fightBtnText.text = string.format("%s","17232A","挑 战") else + this.tip.text = "战斗奖励" this.fightBtnText.text =string.format("%s","17232A","确定") end end diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua index c173e41716..eae7656444 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua @@ -5,6 +5,7 @@ local orginLayer local monsterGroup = ConfigManager.GetConfig(ConfigName.MonsterGroup) local monsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig) local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetting,"Id",0) +local campTowerSetting = ConfigManager.GetConfigDataByKey(ConfigName.CampTowerSetting,"Id",1) local trails = {} local redTrailType = { [1] = RedPointType.PersonTrail, @@ -128,7 +129,12 @@ function MonsterCampMainPanel:SetSingleTrailData(go,data) local openTime = Util.GetGameObject(go, "openTime"):GetComponent("Text") title.sprite = Util.LoadSprite(FourElementNameImage[data.fourElementType]) curwave.text = (data.monsterWave + 1).."层" - canFightWave.text = "可挑战层数:"..data.canFightTime + if data.canFightTime >= campTowerSetting.TimesStoreMax then + canFightWave.text = string.format("可挑战层数:%s","FFD695",data.canFightTime) + else + canFightWave.text = string.format("可挑战层数:%s","FFEED3",data.canFightTime) + end + openTime.text = this:GetOpenTime(data.fourElementType).."开启" Util.SetGray(go, data.openState == 0) Util.AddOnceClick(go,function()