From 0fe52fc29c253ec9f46cfb5177928b8bd27dcaa9 Mon Sep 17 00:00:00 2001
From: zhouhaihai <zhhyf521@163.com>
Date: Tue, 8 Sep 2020 20:39:29 +0800
Subject: [PATCH] 遴选bug

---
 src/actions/DinerAction.lua | 12 ++++++++++--
 src/actions/HeroAction.lua  |  2 +-
 src/models/RoleBattle.lua   |  6 +++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/actions/DinerAction.lua b/src/actions/DinerAction.lua
index 213826e..2cc8d12 100644
--- a/src/actions/DinerAction.lua
+++ b/src/actions/DinerAction.lua
@@ -139,7 +139,11 @@ function _M.removeSellRpc( agent, data )
 		return 5
 	end
 
-	local temp = role.dinerData:updateSell(slot)
+	local temp = role.dinerData:updateSell(slot) or {
+		deltaCount = 0,
+		deltaTime = 0,
+		lastCount = 0,
+	}
 	local reward, change = {}
 	local cost = dishData.material:toNumMap()
 	for k, n in pairs(cost) do
@@ -171,7 +175,11 @@ function _M.getSellRewardRpc( agent, data )
 
 	local deltaTimes = {}
 	for slot, _ in pairs(sells) do
-		local temp = role.dinerData:updateSell(slot)
+		local temp = role.dinerData:updateSell(slot) or {
+			deltaCount = 0,
+			deltaTime = 0,
+			lastCount = 0,
+		}
 		deltaTimes[slot] = temp.deltaTime
 	end
 	sells = json.decode(role.dinerData:getProperty("sells"))
diff --git a/src/actions/HeroAction.lua b/src/actions/HeroAction.lua
index 7a56809..37a4623 100644
--- a/src/actions/HeroAction.lua
+++ b/src/actions/HeroAction.lua
@@ -941,7 +941,7 @@ function _M.unlockPoolRpc(agent, data)
 	return true
 end
 
-function _M.changeCrown(agnet, data)
+function _M.changeCrown(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 
diff --git a/src/models/RoleBattle.lua b/src/models/RoleBattle.lua
index c0759c1..eabb6f6 100644
--- a/src/models/RoleBattle.lua
+++ b/src/models/RoleBattle.lua
@@ -80,7 +80,7 @@ function Role:checkBattle(battleType, params)
 			for slot , one in pairs(self:getTeamBattleInfo(bTeam).supports) do
 				teamskill[one[1]] = one[2]
 			end
-			local carbonData = csvdb["tower_battleCsv"][params.id]
+			local carbonData = csvdb["bonus_battleCsv"][params.id]
 			local monsterData = csvdb[carbonData.monster:match("/([^/]*)$") .. "Csv"]
 			for slot, one in pairs(monsterData[1]) do
 				enemylist[#enemylist + 1] = one["unitType"]
@@ -97,7 +97,7 @@ function Role:checkBattle(battleType, params)
 			if params.robotId then
 				local carbonData = csvdb["pvp_robotCsv"][params.robotId]
 				local monsterData = csvdb[carbonData.monster:match("/([^/]*)$") .. "Csv"]
-				for slot, one in pairs(monsterData[1]) do
+				for slot, one in pairs(monsterData) do
 					enemylist[#enemylist + 1] = one["unitType"]
 				end
 			else
@@ -127,7 +127,7 @@ function Role:checkBattle(battleType, params)
 				for idx = 1, 3 do
 					enemylist[idx] = enemylist[idx] or {}
 					local monsterData = csvdb[carbonData["monster" .. idx]:match("/([^/]*)$") .. "Csv"]
-					for slot, one in pairs(monsterData[1]) do
+					for slot, one in pairs(monsterData) do
 						enemylist[idx][#enemylist + 1] = one["unitType"]
 					end
 				end
--
libgit2 0.21.2