兑换活动支持兑换多个，新增卡池

liuzujun
1 parent 6a2b449c
Showing 5 changed files with 64 additions and 13 deletions Show diff stats
src/actions/ActivityAction.lua
src/actions/GmAction.lua
src/actions/HeroAction.lua
src/csvdata
src/models/Activity.lua
@@ -268,7 +268,8 @@ function _M.exchangeRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local actid = msg.actid
 	local id = msg.id
-	if not role.activity:isOpenById(actid) then return 1 end
+	local count = msg.count
+	if not role.activity:isOpenById(actid, "Exchange") then return 1 end
 	local exchangeCfg = csvdb["activity_exchangeCsv"][actid]
 	if not exchangeCfg then return 2 end
@@ -278,13 +279,16 @@ function _M.exchangeRpc(agent, data)
 	local curCount = exchangeData[id] or 0
 	local actCfg = exchangeCfg[id]
 	local limitArr = actCfg.limit:toArray(true, "=")
-	if curCount >= limitArr[2] then return 4 end
+	if curCount + count > limitArr[2] then return 4 end
 	local costs = actCfg.goods:toNumMap()
+	for k,v in pairs(costs) do
+		costs[k] = v * count
+	end
 	if not role:checkItemEnough(costs) then return 5 end
 	role:costItems(costs, {log = {desc = "actExchange", int1 = actid, int2 = id}})
-	curCount = curCount + 1
+	curCount = curCount + count
 	exchangeData[id] = curCount
 	curData[actid] = exchangeData
 	role.activity:updateActData("Exchange", curData)
@@ -304,7 +308,7 @@ function _M.gachakonRpc(agent, data)
 	if count > 10 then return end
-	if not role.activity:isOpenById(actid) then return 1 end
+	if not role.activity:isOpenById(actid, "Gachakon") then return 1 end
 	local actCtrlData = csvdb["activity_ctrlCsv"][actid]
 	if not actCtrlData then return 2 end
@@ -365,7 +369,7 @@ function _M.hangDropRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local actid = msg.actid
-	if not role.activity:isOpenById(actid) then return 1 end
+	if not role.activity:isOpenById(actid, "HangDrop") then return 1 end
 	local actCfg = csvdb["activity_putCsv"][actid]
 	if not actCfg then return 2 end
@@ -382,7 +386,7 @@ function _M.hangDropRpc(agent, data)
 			if type == 1 then
 				local actId = arr[2]
 				local carbonId = arr[3]
-				if not role.activity:isOpenById(actid) then return 3 end
+				if not role.activity:isOpenById(actid, "ChallengeLevel") then return 3 end
 				local clInfo = role.activity:getActData("ChallengeLevel") or {}
 				if not clInfo[carbonId] then
 					break
@@ -439,7 +443,7 @@ function _M.startBattleRpc(agent, data)
 	local actid = msg.actid
 	local id = msg.id
 	local count = msg.count
-	if not role.activity:isOpenById(actid) then return 1 end
+	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
 	local actCfg = csvdb["activity_battleCsv"][actid]
 	if not actCfg then return 2 end
@@ -542,7 +546,7 @@ function _M.endBattleRpc(agent, data)
 	local isWin = msg.isWin
 	local heros = msg.heros
 	local support = msg.support
-	if not role.activity:isOpenById(actid) then return 1 end
+	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
 	if not role.__actBattleCache then return 2 end
@@ -686,7 +690,7 @@ function _M.battleRankRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local actid = msg.actid
-	if not role.activity:isOpenById(actid) then return 1 end
+	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
 	local rankInfo = role:getRankInfoCommon(RANK_TYPE.ActBattleBoss)
@@ -701,7 +705,7 @@ function _M.battleMilestoneRpc(agent, data)
 	local id = msg.id
 	local index = msg.index
-	if not role.activity:isOpenById(actid) then return 1 end
+	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
 	local actCfg = csvdb["activity_mileageCsv"][actid]
 	if not actCfg then return 3 end
@@ -529,6 +529,16 @@ function _M.guide(role, pms)
 	return "成功"
 end
+table.insert(helpDes, {"挑战关卡次数", "actbattle"})
+function _M.actbattle(role, pms)
+	if not role.activity:isOpen("ChallengeLevel") then return end
+	local actData = role.activity:getActData("ChallengeLevel")
+	actData["ticket"] = 100
+	role.activity:updateActData("ChallengeLevel", actData)
+
+	return "成功"
+end
+
 function _M.helpRpc(agent, data)
 	SendPacket(actionCodes.Gm_helpRpc, MsgPack.pack({help = helpDes}))
 	return true
@@ -714,6 +714,7 @@ end
 function _M.drawHeroRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
 	if not role:isFuncUnlock(FuncUnlock.GetHero) then return 1 end
 	local btype = msg.pool	-- 1 2 3 4 5	卡池类型  4新手卡池 5心愿卡池
@@ -726,11 +727,32 @@ 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]
+		if not cfg then return end
+
+		btype = cfg.condition
+	end
+
 	if btype == 1 then
 		-- 判断定向卡池活动开启
 		if not role.activity:isOpen("RaceDraw") then
 			return
 		end
+	elseif btype == 2 then
+		if role:getProperty("newerGuide") ~= "8=1" then
+			-- 判断普通卡池
+			if role.activity:isOpen("WishHeroPool") then
+				return
+			end
+		end
+	elseif btype == 5 then
+		-- 判断心愿单卡池
+		if not role.activity:isOpen("WishHeroPool") then
+			return
+		end
 	end
 	local buildTypeData = csvdb["build_typeCsv"][btype]
@@ -952,7 +974,7 @@ function _M.drawHeroRpc(agent, data)
 	})
 	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
-	if btype == 1 or btype == 2 then
+	if (buildTypeData["can_feedback"] or 0) == 1 then
 		-- 达到一定次数，给响应奖励
 		local oldVal = role:getProperty("repayHero") or 0
 		local newVal = oldVal + drawCount[drawType]
-Subproject commit bb227076bc3bb79747546fdddc380c8018e7e82b
+Subproject commit 2930f3efda2c82192c931929584fd2bc3f66e647
@@ -24,6 +24,9 @@ Activity.ActivityType = {
 	Exchange = 18,	-- 兑换活动
 	HangDrop = 19,	-- 挂机掉落活动
 	Gachakon = 20,	-- 扭蛋活动
+
+	WishHeroPool = 23, 	-- 心愿卡池
+	ActHeroPool = 24, -- 活动卡池
 }
@@ -41,6 +44,13 @@ function Activity:ctor(properties)
 	self._isOpen = {}
 end
+function Activity:getType(actType)
+	if type(actType) == "string" then
+		actType = Activity.ActivityType[actType]
+	end
+	return actType or 0
+end
+
 Activity.schema = {
 	actime 		= {"table", {}},  -- 最近检查某项活动的开始时间  {id = time}
@@ -153,7 +163,12 @@ function Activity:isOpen(activityType)
 	return false
 end
-function Activity:isOpenById(id)
+function Activity:isOpenById(id, activityType)
+	activityType = checkActivityType(activityType)
+	local cfg = csvdb["activity_ctrlCsv"][id]
+	if not cfg then return false end
+	if cfg.showType ~= activityType then return false end
+
 	return self._isOpen[id]
 end