From b8c1be12d86a6d0360ac1b3f827ffdbe754a1a4c Mon Sep 17 00:00:00 2001
From: zhouhaihai <zhhyf521@163.com>
Date: Thu, 3 Sep 2020 13:54:41 +0800
Subject: [PATCH] 一些 bug

---
 src/actions/DinerAction.lua | 12 ++++++++++--
 src/adv/Adv.lua             |  4 ++--
 src/models/RoleBattle.lua   |  6 +++---
 3 files changed, 15 insertions(+), 7 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/adv/Adv.lua b/src/adv/Adv.lua
index 01a734d..4cbb822 100644
--- a/src/adv/Adv.lua
+++ b/src/adv/Adv.lua
@@ -790,8 +790,8 @@ function Adv:over(success, rewardRatio, overType)
 			end)
 		end
 		-- 通关的时候要把引导步骤设定到成就引导
-		if not role:checkOverGuide(57) then
-			role:saveGuide(57,1,true)
+		if not self.owner:checkOverGuide(57) then
+			self.owner:saveGuide(57,1,true)
 		end
 	end
 	self:clearAdvUnlockCache()
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