From 8635a61e78cb5d298431e74339e09d7bf4db8a7f Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 17 Oct 2020 13:48:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E7=9B=98=EF=BC=8Cboss=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua | 4 ++-- .../~Lua/Modules/XiaoYao/XiaoYaoManager.lua | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua index e120c35808..d1f764c3c5 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua @@ -181,8 +181,8 @@ function XiaoYaoLuckyBossPopup:SetSelectHero(monsterData) costId = cost[#cost][1] costNum = cost[#cost][2] else - costId = cost[monsterData.attackNum][1] - costNum = cost[monsterData.attackNum][2] + costId = cost[monsterData.attackNum+1][1] + costNum = cost[monsterData.attackNum+1][2] end LogGreen("costId:"..costId.." costNum:"..costNum) Util.GetGameObject(this.e_fightBtn,"Text").gameObject:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua index 0119e91eeb..8c57c1fa98 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua @@ -75,18 +75,22 @@ function this.InitLuckyTurnTables(msg) for i = 1, #msg.randomItem do table.insert(this.luckyTurnTableRewards,msg.randomItem[i]) end - this.luckyluckyTurnTableTimes = msg.randomNum - this.luckyluckyTurnTableRemainTime = msg.randomTime elseif msg.random and #msg.random > 0 then for i = 1, #msg.random do table.insert(this.luckyTurnTableRewards,msg.random[i]) end - this.luckyluckyTurnTableTimes = this.luckyluckyTurnTableTimes + 1 - this.luckyluckyTurnTableRemainTime = msg.overTime elseif msg.nextRandom and #msg.nextRandom > 0 then for i = 1, #msg.nextRandom do table.insert(this.luckyTurnTableRewards,msg.nextRandom[i]) end + end + if msg.randomTime then + this.luckyluckyTurnTableTimes = msg.randomNum + this.luckyluckyTurnTableRemainTime = msg.randomTime + elseif msg.overTime then + this.luckyluckyTurnTableTimes = this.luckyluckyTurnTableTimes + 1 + this.luckyluckyTurnTableRemainTime = msg.overTime + else this.luckyluckyTurnTableTimes = this.luckyluckyTurnTableTimes - 1 end end