Merge branch 'develop' into tr/publish

* develop: 拆解室功能重写世界Boss 增加行动点世界boss翻牌奖励活动卡池保底单独记录

Merge branch 'develop' into tr/publish
* develop: 拆解室功能重写世界Boss 增加行动点世界boss翻牌奖励活动卡池保底单独记录
zhouhaihai
2 parents c1af8329 89760dbe
Showing 9 changed files with 216 additions and 78 deletions Show diff stats
src/GlobalVar.lua
src/actions/ActivityAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/actions/StoreAction.lua
src/csvdata
src/models/Activity.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
@@ -134,7 +134,6 @@ ItemId = {
 	RuneFragment = 24,
 	HeroFC = {700, 701, 702, 703},  --通用角色碎片
 	AdvKey = 80, -- 冒险钥匙
-	BoxKey = 60, -- 拆解工具
 	AdvPower = 4701, -- 拾荒体力
 	CrisisScore = 8010, -- 积分
 }
@@ -703,6 +703,10 @@ function _M.endBattleRpc(agent, data)
 		role:checkStoryStatus(false, 5, id)
 	end
+	if battleCfg.worldBoss_award ~= 0 and msg.point then
+		battleInfo["bossP"] = (battleInfo["bossP"] or 0) + msg.point
+	end
+
 	reward, change  = role:award(reward, {log = {desc = "actBattle", int1 = actid, int2 = newStarNum}})
 	SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({
@@ -815,11 +819,42 @@ function _M.bossRewardRpc(agent, data)
 	local battleCfg = actCfg[id]
 	if not battleCfg then return 3 end
-	if battleCfg.boss_reward_id == 0 then return 4 end
+	if battleCfg.worldBoss_award == 0 then return 4 end
+
+	actCfg = csvdb["activity_wordboss_awardCsv"][battleCfg.worldBoss_award]
+	if not actCfg then return 5 end
+	local awardCfg = actCfg[index]
+	if not awardCfg then return 6 end
+
+	local preList = awardCfg.condition1:toArray(true, "=")
+
+	local actData = role.activity:getActData("ChallengeLevel") or {}
+	local battleInfo = actData[id] or {}
+	local bossPoint = battleInfo["bossP"] or 0
+	if bossPoint < 1 then return 7 end
+
+	local bossRecord = battleInfo["bossR"] or ""
+	local ok = false
+	if #preList == 0 then
+		ok = true
+	else
+		for _, i in ipairs(preList) do
+			local flag = string.char(string.getbit(bossRecord, i))
+			if flag == "1" then
+				ok = true
+				break
+			end
+		end
+	end
+	if not ok then return 8 end
+
+	battleInfo["bossR"] = string.setbit(bossRecord, index)
+	actData[id] = battleInfo
+	role.activity:updateActData("ChallengeLevel", actData)
-	--local award = mileCfg.reward:toNumMap()
-	--local reward, change = role:award(award, {log = {desc = "actMilestone", int1 = actid, int2 = index}})
-	--SendPacket(actionCodes.Activity_battleMilestoneRpc, MsgPack.pack(role:packReward(reward, change)))
+	local award = awardCfg.reward:toNumMap()
+	local reward, change = role:award(award, {log = {desc = "worldBossReward", int1 = actid, int2 = index}})
+	SendPacket(actionCodes.Activity_bossRewardRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -727,7 +727,7 @@ function _M.drawHeroRpc(agent, data)
 		end
 	end
-	-- 活动卡池
+	-- 另开活动卡池
 	if actid then
 		if not role.activity:isOpenById(actid, "ActHeroPool") then return end
 		local cfg = csvdb["activity_ctrlCsv"][actid]
@@ -974,11 +974,16 @@ function _M.drawHeroRpc(agent, data)
 	})
 	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
-	if (buildTypeData["can_feedback"] or 0) == 1 then
+	local feedbackId = buildTypeData["can_feedback"] or 0
+	if feedbackId ~= 0 then
 		-- 达到一定次数，给响应奖励
 		local oldVal = role:getProperty("repayHero") or 0
+		if actid then
+			local actData = role.activity:getActData("ActHeroPool")
+			oldVal = actData[btype] or 0
+		end
 		local newVal = oldVal + drawCount[drawType]
-		local drawCardReward, val = role:getDrawCardExtraReward(oldVal, newVal)
+		local drawCardReward, val = role:getDrawCardExtraReward(feedbackId, oldVal, newVal)
 		-- 空字符穿代表直接给英雄  走以前repayHeroRpc
 		if drawCardReward == "" then
 			local repayHeroMaxCount = role:getProperty("repayMaxC") or 0
@@ -992,7 +997,7 @@ function _M.drawHeroRpc(agent, data)
 			else
 				local giftHeroSet = {}
 				for gid, cfg in pairs(csvdb["build_giftCsv"]) do
-					if cfg["pool_1"] ~= 0 and not role:isHaveHero(gid - ItemStartId.Hero) then
+					if cfg["pool_"..feedbackId] ~= 0 and not role:isHaveHero(gid - ItemStartId.Hero) then
 						giftHeroSet[gid] = {1}
 					end
 				end
@@ -1021,7 +1026,13 @@ function _M.drawHeroRpc(agent, data)
 			r, change = role:award(drawCardReward, {log = {desc = "drawHeroExtraReward", int1 = oldVal, int2 = newVal}})
 			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack(role:packReward(r, change)))
 		end
-		role:updateProperty({field = "repayHero", value = val})
+		if not actid then
+			role:updateProperty({field = "repayHero", value = val})
+		else
+			local actData = role.activity:getActData("ActHeroPool")
+			actData[btype] = val
+			role.activity:updateActData("ActHeroPool", actData)
+		end
 	end
 	return true
 end
@@ -537,82 +537,129 @@ function _M.openTimeBoxRpc(agent, data)
 	local slot = msg.slot  -- 位置 1 - 6
 	-- 特权卡时间箱额外栏位
-	local privExtraCnt = role.storeData:getTimeBoxSlotExtraCount()
-	if oper == 1 then
-		if math.illegalNum(slot, 1, role:getFuncLv(FuncOpenType.TimeBoxSlot) + privExtraCnt) then return end
-	end
+	-- local privExtraCnt = role.storeData:getTimeBoxSlotExtraCount()
+	-- if oper == 1 then
+	-- 	if math.illegalNum(slot, 1, role:getFuncLv(FuncOpenType.TimeBoxSlot) + privExtraCnt) then return end
+	-- end
 	local boxL = role:getProperty("boxL")
-	local reward, change = {}
-	if oper == 1 then	-- 打开
+	local reward, change
+	if oper == 1 then -- 构建开始(包括切换构建的id)
 		local itemId = msg.itemId
-		if role:getItemCount(itemId) < 1 then return end
 		local itemData = csvdb["itemCsv"][itemId]
-		local randomData = csvdb["item_randomCsv"][itemId]
-		if not itemData or not randomData or randomData.openTime <= 0 then return end
-
-		if boxL[slot] then return end
-		role:costItems({[itemId] = 1}, {log = {desc = "openTimeBox"}})
-		boxL[slot] = {id = itemId, time = skynet.timex() + randomData.openTime}
-		role:pushMsg({type = "box", slot = slot, time = randomData.openTime})
-	elseif oper == 2 then -- 领取
+		if not itemData then return 1 end
+		if not boxL[slot] then
+			boxL[slot] = {}
+		else
+			local oldId, process, time = boxL[slot].id, boxL[slot].process, boxL[slot].time
+			local unitTime = globalCsv.box_key_time[oldId] * 60
+			local doneCnt = math.floor((process + skynet.timex() - time) / unitTime)
+			if doneCnt > 0 then
+				reward = role:award({[oldId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot}})
+			end
+		end
+		local limit = globalCsv.box_key_max[itemId] or 5
+		if role:getItemCount(itemId) >= limit then return 3 end
+
+		boxL[slot] = {id = itemId, process = 0, time = skynet.timex()}
+		role:pushMsg({type = "box", slot = slot, time = skynet.timex() + globalCsv.box_productLine_time * 3600})
+	elseif oper == 2 then -- 重置运行时间（可以使用加速）
 		local quick = msg.quick
-		if not boxL[slot] then return end
-		local costKey = 0
-		if boxL[slot].time > skynet.timex() then -- 没开完
-			if not quick then return end
+		if not boxL[slot] then return 4 end
+
+		local itemId, process, time = boxL[slot].id, boxL[slot].process, boxL[slot].time
+		local nowTime = skynet.timex()
+		local stopTime = nowTime
+		local itemData = csvdb["itemCsv"][itemId]
+		local unitTime = globalCsv.box_key_time[itemId] * 60
+		if quick then
+			stopTime = time + globalCsv.box_productLine_time * 3600
 			local cost_pre = globalCsv.box_timeOpen_diamond:toArray(true, "=")
-			costKey = math.ceil((boxL[slot].time - skynet.timex()) / (cost_pre[1] * 60)) * cost_pre[2]
-			if not role:checkItemEnough({[ItemId.BoxKey] = costKey}) then return end
-			role:costItems({[ItemId.BoxKey] = costKey}, {log = {desc = "openTimeBox"}})
-			role:pushCancel({type = "box", slot = slot})
+			local costKey = math.ceil((stopTime - nowTime) / (cost_pre[1] * 60)) * cost_pre[2]
+			if not role:checkItemEnough({[ItemId.Diamond] = costKey}) then return 5 end
+			role:costItems({[ItemId.Diamond] = costKey}, {log = {desc = "openTimeBox", int1 = slot}})
 		end
-		local boxId = boxL[slot].id
-		local itemData = csvdb["itemCsv"][boxId]
-		local randomData = csvdb["item_randomCsv"][itemData.id]
-		local costTime = skynet.timex() - (boxL[slot].time - randomData.openTime)
-		-- 随机奖励
+		role:pushCancel({type = "box", slot = slot})
+
+		local doneCnt = math.floor((process + stopTime - time) / unitTime)
+		if doneCnt > 0 then
+			reward = role:award({[itemId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot}})
+		end
+		if role:getItemCount(itemId) >= globalCsv.box_key_max[itemId] then
+			nowTime = 0
+		end
+
+		boxL[slot] = {id = itemId, process = (process + stopTime - time) % unitTime, time = nowTime}
+		role:pushMsg({type = "box", slot = slot, time = nowTime + globalCsv.box_productLine_time * 3600})
+	elseif oper == 3 then -- 开箱子
+		local costId = msg.costId
+		local costs = (msg.costs or ""):toNumMap()
+		if not costId or not csvdb["itemCsv"][costId] or not next(costs) then return 6 end
+		
+		local costIdData = csvdb["itemCsv"][costId]
+		local count = 0
+		for itemId, num in pairs(costs) do
+			local itemIdData = csvdb["itemCsv"][itemId]
+			if not itemIdData or not csvdb["item_randomCsv"][itemId] or costIdData.quality ~= itemIdData.quality then return 7 end
+			count = count + num
+		end
+
+		if role:getItemCount(costId) < count then return 8 end
+
+		role:costItems({[costId] = count}, {log = {desc = "openTimeBox"}})
+
 		reward = {}
-		for i = 1, 10 do
-			local num = randomData["num" .. i] 
-			local gift = randomData["gift" .. i]
-			if num and gift and num > 0 and gift ~= "" then
-				local pool = {}
-				for _, temp in ipairs(gift:toArray()) do
-					local set = temp:toArray(true, "=")
-					table.insert(pool, set)
+		for itemId, value in pairs(costs) do
+			local tempReward = {}
+			local randomData = csvdb["item_randomCsv"][itemId]
+			local itemData = csvdb["itemCsv"][itemId]
+			role:costItems({[itemId] = value}, {log = {desc = "openTimeBox"}})
+			for _ = 1, value do
+				for i = 1, 10 do
+					local num = randomData["num" .. i] 
+					local gift = randomData["gift" .. i]
+					if num and gift and num > 0 and gift ~= "" then
+						local pool = {}
+						for _, temp in ipairs(gift:toArray()) do
+							local set = temp:toArray(true, "=")
+							table.insert(pool, set)
+						end
+
+						local needCount = math.min(#pool, num)
+						for j = 1, needCount do
+							local idx = math.randWeight(pool, 3)
+							tempReward[pool[idx][1]] = (tempReward[pool[idx][1]] or 0) + pool[idx][2]
+							table.remove(pool, idx)
+						end
+					end
 				end
+			end
+			tempReward[0] = nil
+			role:checkTaskEnter("OpenBox", {id = itemId, count=value, quality=itemData.quality})
+			role:log("carriage_dismantle", {
+				item_id = itemId, -- 道具id
+				item_type = itemData.type, -- 道具类型，具体见枚举表中道具类型枚举表
+				item_level = 0, -- 道具等级
+				item_number = 1, -- 道具变化数量的绝对值
+				carriage_dismantle_type = 1, -- 拆解方式，时间到期:0，钥匙开启:1
+				carriage_dismantle_time = 0, -- 拆解耗时，填写实际耗时
+				carriage_dismantle_cost = value, -- 拆解花费钥匙数量，未使用填写0
+				carriage_dismantle_rwd = tempReward, -- 拆解获得物资，json格式记录，{'itemid1':2,'itemid2':3,…………..}
+			})
-				local needCount = math.min(#pool, num)
-				for j = 1, needCount do
-					local idx = math.randWeight(pool, 3)
-					reward[pool[idx][1]] = (reward[pool[idx][1]] or 0) + pool[idx][2]
-					table.remove(pool, idx)
-				end
+			for id, num in pairs(tempReward) do
+				reward[id] = (reward[id] or 0) + num
 			end
 		end
-		reward[0] = nil
-
-		boxL[slot] = nil
-		reward, change = role:award(reward, {log = {desc = "openTimeBox", int1 = boxId}})
-		role:checkTaskEnter("OpenBox", {id = boxId, count=1, quality=itemData.quality})
-
-		role:log("carriage_dismantle", {
-			item_id = boxId, -- 道具id
-			item_type = itemData.type, -- 道具类型，具体见枚举表中道具类型枚举表
-			item_level = 0, -- 道具等级
-			item_number = 1, -- 道具变化数量的绝对值
-			carriage_dismantle_type = quick and 1 or 0, -- 拆解方式，时间到期:0，钥匙开启:1
-			carriage_dismantle_time = costTime, -- 拆解耗时，填写实际耗时
-			carriage_dismantle_cost = costKey, -- 拆解花费钥匙数量，未使用填写0
-			carriage_dismantle_rwd = reward, -- 拆解获得物资，json格式记录，{'itemid1':2,'itemid2':3,…………..}
-		})
+		reward, change = role:award(reward, {log = {desc = "openTimeBox", int1 = costId}})
 	else
 		return
 	end
-	role:setProperty("boxL") --刷新
-	role:changeUpdates({{type = "boxL", field = slot, value = boxL[slot], isOnlyToC = true}}) -- 通知客户端
+	role:setProperty("boxL",boxL) --刷新
+	if slot then
+		role:changeUpdates({{type = "boxL", field = slot, value = boxL[slot], isOnlyToC = true}}) -- 通知客户端
+	end
 	SendPacket(actionCodes.Role_openTimeBoxRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -14,6 +14,9 @@ function _M.rechargeRpc(agent , data)
 	--创建订单号
 	local partnerOrderId = role:getPurchaseOrder(id)
+	if partnerOrderId == "" then
+		return 1
+	end
 	SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({ order = partnerOrderId }))
-Subproject commit 591f2b4097214f9f5bf3b746f86ac704cbc9ea44
+Subproject commit f6a626350c1f4039f0f677a1baf262f3493757d2
@@ -71,6 +71,7 @@ Activity.schema = {
 	act19		= {"number", 0},	  -- {挂机信息}
 	act20		= {"table", {}},	  -- {id=扭蛋抽出数量}
+	act24		= {"table", {}, true},	-- 活动卡池 {id=repaynum}
 	act26 		= {"table", {}},	-- {task = {id = count}, socre = {id = status}}
 }
@@ -493,6 +494,19 @@ activityFunc[Activity.ActivityType.Gachakon] = {
 	end,
 }
+-- 活动卡池
+activityFunc[Activity.ActivityType.ActHeroPool] = {
+	["init"] = function(self, actType, isCrossDay, notify, actId)
+	end,
+	["close"] = function(self, actType, notify, actId)
+		local actData = self:getActData(actType)
+		local cfg = csvdb["activity_ctrlCsv"][actId]
+		if not cfg then return end
+		actData[cfg.condition] = nil
+		self:updateActData(actType, actData, not notify)
+	end,
+}
+
 -- 挂机掉落
 activityFunc[Activity.ActivityType.HangDrop] = {
 	["init"] = function(self, actType, isCrossDay, notify, actId)
@@ -544,7 +558,9 @@ function Activity:closeActivity(actId, notify, notUpdateAct)
 		self:recycleActItem(actId)
 	end
 	if Activity.schema["act".. actType] then
-		self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct)
+		if not Activity.schema["act" .. actType][3] then 
+			self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct)
+		end
 	end
 end
@@ -50,6 +50,7 @@ local ItemReason = {
 	actHangDrop = 134, -- 掉落活动奖励
 	actBattle = 135, -- 活动关卡
 	actMilestone = 136,	-- 活动关卡boss伤害里程碑
+	worldBossReward = 137,	-- 世界boss翻牌奖励
 	advHang = 301, -- 拾荒挂机
@@ -362,10 +362,34 @@ function RolePlugin.bind(Role)
 			pms.itemId = itemId
 			pms.count = - count
 			self:addItem(pms)
+			self:itemDeltaEvent(pms)
 		end
 		return true
 	end
+	function Role:itemDeltaEvent(pms)
+		self:eventBoxL(pms)
+	end
+
+	-- 拆解室的生产线启动
+	function Role:eventBoxL(pms)
+		local limit = globalCsv.box_key_max[pms.itemId]
+		if not limit then return end
+
+		local update = false
+		local boxL = self:getProperty("boxL") or {}
+		for slot, data in pairs(boxL) do
+			if data.time == 0 and data.id == pms.itemId and self:getItemCount(pms.itemId) < limit then
+				update = true
+				data.time = skynet.timex()
+			end
+		end
+
+		if update then
+			self:updateProperty({field = "boxL", value = boxL})
+		end
+	end
+
 	function Role:getItemCount(itemId)
 		if itemId == ItemId.Diamond then
 			return self:getAllDiamond()
@@ -1580,15 +1604,17 @@ function RolePlugin.bind(Role)
 			return ""
 		end
 		local limit = rechargeData.limit
-	    local rechargeRecord = self:getProperty("payR") or {}
+	    local rechargeRecord = self.storeData:getProperty("payR") or {}
 	    if limit ~= 0 and limit <= (rechargeRecord[rechargeId] or 0) then
 	        return ""
 		end
 		--判断是否是活动商品
-		local actCfg = csvdb["activity_ctrlCsv"][rechargeData.activity_id]
-		if not actCfg then return "" end
-		if not self.activity:isOpenById(rechargeData.activity_id, "ActShopGoods") then return "" end
+		if rechargeData.activity_id ~= 0 then
+			local actCfg = csvdb["activity_ctrlCsv"][rechargeData.activity_id]
+			if not actCfg then return "" end
+			if not self.activity:isOpenById(rechargeData.activity_id, "ActShopGoods") then return "" end
+		end
 	    local orderId = redisproxy:hget(string.format(R_ORDERS, roleId), rechargeId)
 	    if orderId then
@@ -1835,10 +1861,10 @@ function RolePlugin.bind(Role)
 	end
 	-- 抽卡阶段奖励
-	function Role:getDrawCardExtraReward(oldVal, newVal)
+	function Role:getDrawCardExtraReward(feedbackId, oldVal, newVal)
 		local reward = nil
 		local maxCount = 0
-		for k, v in pairs(csvdb["build_extraRewardCsv"]) do
+		for k, v in pairs(csvdb["build_extraRewardCsv"][feedbackId]) do
 			if oldVal < k and newVal >= k then
 				reward = v["reward"] or ""
 			end