Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

liuzujun
2 parents a6dc627f b5481708
Showing 7 changed files with 38 additions and 14 deletions Show diff stats
src/actions/DinerAction.lua
src/actions/HeroAction.lua
src/adv/Adv.lua
src/adv/AdvTask.lua
src/models/Activity.lua
src/models/RoleBattle.lua
src/models/RoleLog.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"))
@@ -855,14 +855,17 @@ function _M.drawHeroRpc(agent, data)
 			floorHeroCount = 0
 		end
+		local logReward = {}
 		if role:isHaveHero(itemData.id - ItemStartId.Hero) then
 			local fragId = itemData.id - ItemStartId.Hero
 			local heroData = csvdb["unitCsv"][fragId]
 			local count = globalCsv.draw_unit_tofragment[heroData.rare]
 			role:award({[fragId] = count}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
+			logReward[fragId] = (logReward[fragId] or 0) + count
 			table.insert(reward, {id = fragId, count = count, from = itemId, fcount = 1})
 		else
 			role:award({[itemId] = 1}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
+			logReward[itemId] = (logReward[itemId] or 0) + 1
 			table.insert(reward, {id = itemId, count = 1})
 		end
 	end
@@ -884,14 +887,15 @@ function _M.drawHeroRpc(agent, data)
 		role:checkTaskEnter("DrawSSR", {count = ssrCount})
 	end
 	role:finishGuide(11)
-	
+
 	role:log("gacha", {
 		gacha_id = poolId, -- 卡池ID
 		gacha_type = btype, -- 卡池类型
 		gacha_up = 0, -- 卡池UP角色
 		gacha_times = drawCount[drawType], -- 抽卡次数
-		gacha_reward = reward, -- 抽卡结果，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		gacha_reward = logReward, -- 抽卡结果，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
 		currency = cost, -- 购买道具消耗的货币
+		gacha_cnt = floorHeroCount,
 	})
 	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
 	return true
@@ -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()
@@ -132,10 +132,21 @@ function AdvTask.bind(Adv)
 		end
 		local advEventOpenStatus = self.owner:advEventOpenStatus()
 		local pool = {}
-		for id, data in pairs(csvdb["event_questCsv"]) do
-			if data.levelchapter == chapterId and (data.unlockType == 0 or (advEventOpenStatus[etype] or {})[data.unlockType]) then
-				if AdvCommon.checkIsIn(level, data.leveltype, data.levellimit) then
-					pool[id] = {showup = data.showup}
+
+		local mapData = self:getCurMap():getMapInfoCsv()
+		for _, id in ipairs(mapData.quest:toArray(true, "=")) do
+			local data = csvdb["event_questCsv"][taskId]
+			if data then
+				pool[id] = {showup = data.showup}
+			end
+		end
+
+		if not next(pool) then
+			for id, data in pairs(csvdb["event_questCsv"]) do
+				if data.levelchapter == chapterId and (data.unlockType == 0 or (advEventOpenStatus[etype] or {})[data.unlockType]) then
+					if AdvCommon.checkIsIn(level, data.leveltype, data.levellimit) then
+						pool[id] = {showup = data.showup}
+					end
 				end
 			end
 		end
@@ -395,7 +395,7 @@ end
 -- 付费签到可领奖励
 function Activity:getPaySignReward()
-	local actGoodsFlag = self.storeData:getProperty("actGoodsFlag")
+	local actGoodsFlag = self.owner.storeData:getProperty("actGoodsFlag")
 	local index = GetActGoodsIndex("paySignIn")
 	local flag = actGoodsFlag[index] or 0
 	if flag == 0 then return {} end
@@ -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
@@ -266,6 +266,7 @@ local MethodType = {
 		gacha_times = true, -- 抽卡次数
 		gacha_reward = "json", -- 抽卡结果，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
 		currency = "json", -- 消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		gacha_cnt = true, -- 保底计数
 	},
 	equip_wear = { --装备穿戴与卸载
 		hero_id = true, --英雄ID