From 45de3d5c991ca1ae590179def598ee6f9702983e Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 15 Sep 2021 18:09:21 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=83=E7=95=8C=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Formation/View/QiJieFormation.lua | 2 +- .../Modules/QiJieShiLian/QiJieShiLianManager.lua | 12 ++++++------ .../~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/QiJieFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/QiJieFormation.lua index b6e84f7bac..e9ffb8c177 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/QiJieFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/QiJieFormation.lua @@ -69,7 +69,7 @@ function this.RefreshConditon(choosedList) for i = 1, #this.goalList do local text = Util.GetGameObject(this.goalList[i],"Text"):GetComponent("Text") local image = Util.GetGameObject(this.goalList[i],"Image"):GetComponent("Image") - local state = QiJieShiLianManager.CheckGoalIsFinish(this.nodeData.ConditionValue[i],text,choosedList)--检测是否完成此条目(顺便设置文字) + local state = QiJieShiLianManager.CheckGoalIsFinish(this.nodeData.ConditionValue[i][1],text,choosedList)--检测是否完成此条目(顺便设置文字) local imgname = state and "q_qjsl_wfzjm_yjh" or "q_qjsl_wfzjm_wjh" image.sprite = this.spLoader:LoadSprite(imgname) end diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua index a764f55548..c8854fc33c 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua @@ -35,7 +35,7 @@ function this.InitTreasureData() data.Position = configInfo.Position data.AttriType = configInfo.AttriType data.Cost = configInfo.Cost - data.Addition = configInfo.Addition + -- data.ConditionValue[1][2] = configInfo.ConditionValue[1][2] data.Desc = configInfo.Desc data.Buff = configInfo.Buff data.state = 2 --0未激活,1已激活,2未购买 @@ -75,7 +75,7 @@ end function this.CheckCurStageNum() local data = ConfigManager.GetAllConfigsDataByKey(ConfigName.QijieStage,"QijieType",this.QijieType) - LogGreen(tostring(#data)..LengthOfTable(data)) + -- LogGreen(tostring(#data)..LengthOfTable(data)) -- return ConfigManager.GetAllConfigsDataByKey(ConfigName.QijieStage,"QijieType",this.QijieType) end @@ -102,9 +102,9 @@ function this.CheckGoalIsFinish(_dataId,_obj,_formationList) -- LogYellow("final = false0") final = false end - LogRed("##heroList:"..tostring(#heroList)) + -- LogRed("##heroList:"..tostring(#heroList)) for i = 1, #heroList do - LogGreen("heroList[i].heroId:"..tostring(heroList[i].heroId)) + -- LogGreen("heroList[i].heroId:"..tostring(heroList[i].heroId)) table.insert(tempList,HeroConfig[HeroManager.GetSingleHeroData(heroList[i].heroId).id]) end if #tempList > 0 and final and goalData.PropertyName and goalData.PropertyName > 0 then @@ -192,7 +192,7 @@ end function this.GetBattleResult() local config = QijieStage[this.curLevelId] local data = {} - data[1] = string.format( "阵容加成: %s%\n(%s条)",(#this.battleResult.teamBuffIds)*(config.Addition[2]/100),#this.battleResult.teamBuffIds) + data[1] = string.format( "阵容加成: %s%\n(%s条)",(#this.battleResult.teamBuffIds)*(config.ConditionValue[1][2]/100),#this.battleResult.teamBuffIds) data[2] = string.format( "遗物加成: %s%\n(%s条)",(#this.battleResult.relicIds)*10,#this.battleResult.relicIds) local bonue = config.RoundReward[1][2] for i = 1, #config.RoundReward do @@ -216,7 +216,7 @@ function this.GetTreasureEffect(treasureList) -- LogYellow("treasureList[i]"..tostring(treasureList[i])) local tData = QijieHolyConfig[treasureList[i]] --界灵数量加成 - moneyNum = moneyNum + tData.Addition[2] + moneyNum = moneyNum + tData.Addition -- LogYellow("moneyNum"..tostring(moneyNum)) --属性加成 if not attriList1[tData.AttriType] then diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua index 939f9c7a50..57a55c7e3a 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua @@ -229,18 +229,18 @@ end --设置下方挑战信息和奖励信息 function QiJieShiLianPanel:SetBottomBar() --设置挑战加成数据 - self.addNum.text = string.format( "能满足一种获得界灵数量+%s",self.configData.Addition[2]/100).."%" + self.addNum.text = string.format( "能满足一种获得界灵数量+%s",self.configData.ConditionValue[1][2]/100).."%" for i = 1, #self.goalList do local text = Util.GetGameObject(self.goalList[i],"Text"):GetComponent("Text") local image = Util.GetGameObject(self.goalList[i],"Image"):GetComponent("Image") - local state = QiJieShiLianManager.CheckGoalIsFinish(self.configData.ConditionValue[i],text)--检测是否完成此条目(顺便设置文字) + local state = QiJieShiLianManager.CheckGoalIsFinish(self.configData.ConditionValue[i][1],text)--检测是否完成此条目(顺便设置文字) local imgname = state and "q_qjsl_wfzjm_yjh" or "q_qjsl_wfzjm_wjh" image.sprite = self.spLoader:LoadSprite(imgname) end --拿取奖励列表 local rewardList = {} - table.insert(rewardList,self.configData.JielingReward) + table.insert(rewardList,self.configData.JielingReward[1]) for i = 1, #self.configData.Reward do table.insert(rewardList,self.configData.Reward[i]) end