Merge branch 'tr/bugfix' into tr/publish/preview

熊润斐
2 parents 895903a9 1c1ea691
Showing 3 changed files with 12 additions and 2 deletions Show diff stats
src/actions/ActivityAction.lua
src/actions/StoreAction.lua
src/csvdata
@@ -568,7 +568,10 @@ function _M.endBattleRpc(agent, data)
 	local isWin = msg.isWin
 	local heros = msg.heros
 	local support = msg.support
-	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
+	if not role.activity:isOpenById(actid, "ChallengeLevel") then
+		SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({}))
+		return true
+	end
  
 	if not role.__actBattleCache then return 2 end
  
@@ -233,6 +233,13 @@ function _M.getFreeChestRpc(agent, data)
 	local config = csvdb["shop_rechargeCsv"][id]
 	if not config then return end
  
+	--判断是否是活动商品
+	if config.activity_id ~= 0 then
+		local actCfg = csvdb["activity_ctrlCsv"][config.activity_id]
+		if not actCfg then return 2 end
+		if not role.activity:isOpenById(config.activity_id, "ActShopGoods") then return 3 end
+	end
+
     local rechargeRecord = role.storeData:getProperty("payR")
 	local getCount = (rechargeRecord[id] or 0)
 	if getCount >= config.limit then
-Subproject commit 516f9d34ccb5dfc9a5fd40c251f3229e5a4651e6
+Subproject commit c820a5807bf24a342c40fcbb5def8a31899cc664