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

测试
2 parents be697585 cd597363
Showing 6 changed files with 67 additions and 58 deletions Show diff stats
src/actions/HangAction.lua
src/adv/Adv.lua
src/models/RoleBattle.lua
src/models/RoleCross.lua
src/models/RolePlugin.lua
src/models/RolePvp.lua
@@ -498,46 +498,44 @@ function _M.buyBonusCountRpc(agent, data)
 	return true
 end
-local function bonusWinReward(role, bonusData, bwin, count)
+local function bonusWinReward(role, bonusData, rewardType, count)
 	count = count or 1
-	local open, actId = role.activity:isOpen("BonusDouble")
-	local actData = csvdb["activity_ctrlCsv"][actId]
-	local extraCnt = role.storeData:getBonusExtraFightCount()
-
-	local coef = 1
-	if open and actData then
-		coef = tonumber(actData.condition2)
-	end
-	local bonusC = role.dailyData:getProperty("bonusC")
-	bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
-	if globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"] < count then return false, 1 end
-	bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + count
-	role.dailyData:updateProperty({field = "bonusC", value = bonusC})
-	local reward, change
-	reward = bonusData.reward:toNumMap()
-	for itemId, c in pairs(reward) do
-		reward[itemId] = c * count
-	end
-	for i = 1, count do
-		local chance = bonusData.chance:randWeight(true)
-		if chance[1] ~= 0 then
-			reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
+	local reward, change = {}
+	if rewardType == 1 or rewardType == 4 then
+		for k, v in pairs(bonusData.clear_reward:toNumMap()) do
+			reward[k] = (reward[k] or 0) + v
 		end
 	end
-	for k, v  in pairs(reward) do
-		reward[k] = v * (coef > 1 and actData.condition or 1)
-	end
-	
-	if bwin then -- 满星 额外奖励
+	if rewardType == 2 or rewardType == 4 then
 		for k, v in pairs(bonusData.perfect_reward:toNumMap()) do
 			reward[k] = (reward[k] or 0) + v
 		end
 	end
-	reward, change = role:award(reward, {log = {desc = "bonusBattle", int1 = id}})
-	role:checkTaskEnter("BonusPass", {id = id, count = count})
-	return true, reward, change
+
+	if rewardType == 3 then
+		local open, actId = role.activity:isOpen("BonusDouble")
+		local actData = csvdb["activity_ctrlCsv"][actId]
+
+		reward = bonusData.reward:toNumMap()
+		for itemId, c in pairs(reward) do
+			reward[itemId] = c * count
+		end
+		for i = 1, count do
+			local chance = bonusData.chance:randWeight(true)
+			if chance[1] ~= 0 then
+				reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
+			end
+		end
+		for k, v  in pairs(reward) do
+			reward[k] = v * (actData.condition > 1 and actData.condition or 1)
+		end
+	end
+	
+	reward, change = role:award(reward, {log = {desc = "bonusBattle", int1 = bonusData.id}})
+	role:checkTaskEnter("BonusPass", {id = bonusData.id, count = count})
+	return reward, change
 end
 function _M.startBonusBattleRpc(agent, data)
@@ -559,23 +557,24 @@ function _M.startBonusBattleRpc(agent, data)
 	if not bonusData then return 3 end
 	if not role:checkHangPass(bonusData.unlock) then return 4 end
-	local bonusC = role.dailyData:getProperty("bonusC")
-	bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
-
-	local actData = csvdb["activity_ctrlCsv"][actId]
-
-	local extraCnt = role.storeData:getBonusExtraFightCount()
-	local coef = 1
-	if open and actData then
-		coef = tonumber(actData.condition2)
-	end
-	
-	if math.illegalNum(count, 1, globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"]) then return 7 end
 	local bonusStar = role:getProperty("bonusStar")
 	if bonusStar[id] and bonusStar[id] >= (1 << #bonusData.sweep_condition:toTableArray(true)) - 1 then 
-		local status, reward, change = bonusWinReward(role, bonusData, nil, count)
-		if not status then return 10 * (reward or 0) end
+			local bonusC = role.dailyData:getProperty("bonusC")
+			bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
+
+			local actData = csvdb["activity_ctrlCsv"][actId]
+			local extraCnt = role.storeData:getBonusExtraFightCount()
+			local coef = 1
+			if open and actData then
+				coef = tonumber(actData.condition2)
+			end
+			if math.illegalNum(count, 1, globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"]) then return 7 end
+
+			bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + count
+			role.dailyData:updateProperty({field = "bonusC", value = bonusC})
+
+		local reward, change = bonusWinReward(role, bonusData, 3, count)
 		SendPacket(actionCodes.Hang_startBonusBattleRpc, MsgPack.pack({reward = reward, change = change}))
 	else
 		local bTeam = role:getTeamFormatByType(TeamSystemType.BonusBattle)
@@ -608,6 +607,7 @@ function _M.endBonusBattleRpc(agent, data)
 	local reward, change
 	local bonusStar = role:getProperty("bonusStar")
+	local oldStar = bonusStar[id] or 0
 	local curStar = 0
  	if starNum and starNum > 0 then
  		-- 胜利扣除次数
@@ -671,12 +671,23 @@ function _M.endBonusBattleRpc(agent, data)
  			end
  		end
  		local status
- 		status, reward, change = bonusWinReward(role, bonusData, curStar >= (1 << #sweepConds) - 1)
- 		if not status then return 10 + (reward or 0) end
+ 		local rewardType = 0
+ 		if curStar >= (1 << #sweepConds) - 1 then -- 满星
+ 			rewardType = 2
+ 			if oldStar == 0 then  --通关
+ 				rewardType = 4
+ 			end
+ 		elseif oldStar == 0 then --通关
+ 			rewardType = 1
+ 		end
+
+ 		if rewardType ~= 0 then
+	 		reward, change = bonusWinReward(role, bonusData, rewardType)
+	 	end
  	else
- 		curStar = 0
+ 		curStar = oldStar
  	end
- 	if curStar ~= bonusStar[id] then
+ 	if curStar ~= oldStar then
  		bonusStar[id] = curStar
  		role:updateProperty({field = "bonusStar", value = bonusStar})
  	end
@@ -1129,8 +1129,8 @@ local function clickOut(self, room, block, params, isExit)
 				if curFloorData then
 					self:award({[ItemId.AdvPoint] = curFloorData.exp}, {log = {desc = "passReward", int1 = self.chapterId, int2 = self.level}}, {})
 				end
+				self:backNext() --下一关
 				local isHaveRelay = self:isHaveRelay(self.level)
-
 				if isHaveRelay and not self.isRelay then 
 					self:initByChapter({
 						chapterId = self.chapterId, 
@@ -1148,7 +1148,6 @@ local function clickOut(self, room, block, params, isExit)
 						notNotify = true,
 					})
 				end
-				self:backNext() --下一关
 			end
 		end
@@ -44,7 +44,7 @@ function Role:checkBattle(battleType, params)
 	local fixData = {
 		hang = function()
-			for slot, hero in pairs(self:getProperty("hangTS")) do
+			for slot, hero in pairs(self:getProperty("hangTS").heros) do
 				selflist[slot] = hero.type
 			end
 			heroscore = self:getProperty("hangTBV")
@@ -102,7 +102,7 @@ function Role:checkBattle(battleType, params)
 			end
 		end,
 		pvpc = function()
-			for slot, hero in pairs(self:getProperty("pvpTSC")) do
+			for slot, hero in pairs(self:getProperty("pvpTSC").heros) do
 				selflist[slot] = hero.type
 			end
 			heroscore = self:getProperty("pvpTBVC")
@@ -124,7 +124,7 @@ function Role:checkBattle(battleType, params)
 		pvph = function()
 			for idx, team in pairs(self:getProperty("pvpTSH")) do
 				selflist[idx] = selflist[idx] or {}
-				for slot, hero in pairs(team) do
+				for slot, hero in pairs(team.heros) do
 					selflist[idx][slot] = hero.type
 				end
 			end
@@ -19,8 +19,8 @@ RoleCross.bind = function (Role)
 	-- 好友详细队伍信息
 	function Role:friendInfo()
 		local info = self:friendSInfo()
-		local heros = self:getProperty("pvpTBVC") ~= 0 and self:getProperty("pvpTSC") or self:getProperty("hangTS")
-		info.heros = heros
+		local team = self:getProperty("pvpTBVC") ~= 0 and self:getProperty("pvpTSC") or self:getProperty("hangTS")
+		info.team = team
 		return info
 	end
@@ -1649,7 +1649,7 @@ function RolePlugin.bind(Role)
 		-- 开始下单
 		if status == "success" then
 		elseif status == "fail" then
-			redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
+			-- redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
 		elseif status == "finsh" then
 			orderObject:setProperty("finishTime", skynet.time())
 			redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
@@ -233,7 +233,6 @@ function Role:refreshPvpMatch(score, rank, rankKey)
 		if low < 0 then
 			low = 0
 		end
-		print(low, heigh)
 		local rangeIds = redisproxy:ZREVRANGE(dbKey, low, heigh)
 		local lastRangeIds = {}
 		for idx, one in ipairs(rangeIds) do