Merge branch 'cn/develop' into cn/publish/preview

jiyue
2 parents eb7ce1e7 d85ecb3f
Showing 1 changed file with 9 additions and 3 deletions Show diff stats
src/actions/ActivityAction.lua
@@ -799,12 +799,18 @@ function _M.endBattleRpc(agent, data)
 	if  newStarNum > oldStarNum then
 		battleInfo["star"] = curStar
 	end
-
-	if battleCfg.rank ~= 0 and isWin then
+    if battleCfg.type ~= "" then
 		-- 消耗门票
 		role.activity:getBattleTicket(actid)
 		local num = battleCfg.type:toArray(true, "=")[3]
 		actData["ticket"] = math.max(actData["ticket"] - num, 0)
+    end
+
+	if battleCfg.rank ~= 0 and isWin then
+		-- 消耗门票
+		--role.activity:getBattleTicket(actid)
+		--local num = battleCfg.type:toArray(true, "=")[3]
+		--actData["ticket"] = math.max(actData["ticket"] - num, 0)
 		-- 更新排行榜 最高伤害
 		battleInfo["top"] = math.max(battleInfo["top"] or 0, dmg)
@@ -1486,7 +1492,7 @@ function _M.buyBattleTicketRpc(agent, data)
     end
     local cost = globalCsv.activity_scrofa_tickets[curCount + 1]
 	if not role:checkItemEnough({[ItemId.Jade] = cost}) then return 3 end
-	role:costItems({[ItemId.Jade] = cost}, {log = {desc = "buyActivityBattleTicket", int1 = actid, int2 = count, cint1 = curCount}})
+	role:costItems({[ItemId.Jade] = cost}, {log = {desc = "buyActivityBattleTicket", int1 = actid, int2 = count, long1 = curCount}})
     actData["ticket"] = (actData["ticket"] or 0) + 1
     actData["buyC"] = curCount + count