From 74bb1229899625638a66f29eb32a7af64cf2d614 Mon Sep 17 00:00:00 2001
From: liuzujun <307836273@qq.com>
Date: Thu, 12 Aug 2021 17:12:31 +0800
Subject: [PATCH] 神稀扣门票逻辑修改

---
 src/actions/ActivityAction.lua | 18 ++++++++----------
 src/csvdata                    |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/actions/ActivityAction.lua b/src/actions/ActivityAction.lua
index 8202b84..7c5381f 100644
--- a/src/actions/ActivityAction.lua
+++ b/src/actions/ActivityAction.lua
@@ -605,6 +605,8 @@ function _M.startBattleRpc(agent, data)
                 end
 			end
             num = num * count
+        else
+            num = 0
 		end
 		if ticket < num then
 			return 6
@@ -799,18 +801,14 @@ function _M.endBattleRpc(agent, data)
 	if  newStarNum > oldStarNum then
 		battleInfo["star"] = curStar
 	end
-    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)
+        if battleCfg.type ~= "" then
+            -- 消耗门票
+            role.activity:getBattleTicket(actid)
+            local num = battleCfg.type:toArray(true, "=")[3]
+            actData["ticket"] = math.max(actData["ticket"] - num, 0)
+        end
 
 		-- 更新排行榜 最高伤害
 		battleInfo["top"] = math.max(battleInfo["top"] or 0, dmg)
diff --git a/src/csvdata b/src/csvdata
index 4d89427..55a28d1 160000
--- a/src/csvdata
+++ b/src/csvdata
@@ -1 +1 @@
-Subproject commit 4d894270d4aeb6352a29dfd3a8686cbaea5b427c
+Subproject commit 55a28d125f25a0d0b60e5a8cc74b40664aa98f8f
--
libgit2 0.21.2