From ccb56d46fe87b6e3a8f917f5266935b74f80d85e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 09 五月 2025 19:42:59 +0800
Subject: [PATCH] 10367 【越南】【英语】【BT】【砍树】仙盟攻城战-服务端(修复击杀修罗城守卫后无法正常切换下一个守卫bug;)

---
 ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/Assist.py |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/Assist.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/Assist.py
index 2a212f9..ec4eb90 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/Assist.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/Assist.py
@@ -31,22 +31,20 @@
 #  @remarks 函数详细说明.
 def OnExec(curPlayer, gmList):
     
+    if not gmList:
+        GameWorld.DebugAnswer(curPlayer, "清除感谢: Assist t0")
+    
     isShowThanks = gmList[0] if len(gmList) > 0 else 0
     assistMgr = PyDataManager.GetPlayerAssistPyManager()
     GameWorld.Log("---------- 当前总协助条数: %s" % len(assistMgr.allAssistDict))
     for assist in assistMgr.allAssistDict.values():
         GameWorld.DebugLog("%s" % assist.outputString())
-        GameWorld.DebugLog("IsSaveDB=%s,ObjID=%s,AssistType=%s,AssistPlayerIDList=%s" % (assist.IsSaveDB, assist.ObjID, assist.AssistType, assist.AssistPlayerIDList))
+        GameWorld.DebugLog("IsSaveDB=%s,FamilyID=%s,ObjID=%s,AssistType=%s,AssistPlayerIDList=%s" 
+                           % (assist.IsSaveDB, assist.FamilyID, assist.ObjID, assist.AssistType, assist.AssistPlayerIDList))
         GameWorld.DebugLog("--- ")
         
     GameWorld.DebugLog("--- ")
-    for familyID, assistList in assistMgr.familyAssistDict.items():
-        GameWorld.DebugLog("仙盟协助列表: %s, 条数: %s" % (familyID, len(assistList)))
-        for assist in assistList:
-            GameWorld.DebugLog("    %s" % assist.GUID)
-        
-    GameWorld.DebugLog("--- ")
-    for playerID, assistList in assistMgr.playerNoSaveDBAssistDict.items():
+    for playerID, assistList in assistMgr.playerAssistDict.items():
         GameWorld.DebugLog("玩家协助列表: %s, 条数: %s" % (playerID, len(assistList)))
         for assist in assistList:
             GameWorld.DebugLog("    %s" % assist.GUID)
@@ -60,18 +58,24 @@
         return
     
     assistThanksMgr = PyDataManager.GetPlayerAssistThanksPyManager()
+    if isShowThanks == "t0":
+        assistThanksMgr.allAssistThanksList = []
+        assistThanksMgr.playerThanksDict = {}
+        assistThanksMgr.assistPlayerThanksDict = {}
+        GameWorld.DebugAnswer(curPlayer, "清除所有协助感谢!")
+            
     GameWorld.Log("---------- 未完结总感谢条数: %s" % len(assistThanksMgr.allAssistThanksList))
     for playerID, thanksList in assistThanksMgr.playerThanksDict.items():
-        GameWorld.DebugLog("玩家未发送感谢数: %s, %s" % (playerID, len(thanksList)))
+        GameWorld.DebugLog("--- 玩家未发送感谢数: %s, %s" % (playerID, len(thanksList)))
         for i, thanks in enumerate(thanksList):
-            GameWorld.DebugLog("    i=%s, %s" % (i, thanks.outputString()))
-            GameWorld.DebugLog("    %s" % thanks.AssistPlayerDict)
+            GameWorld.DebugLog("    %s itemID=%s,map(%s,%s,%s), %s %s" % (i, thanks.ItemID, thanks.MapID, thanks.LineID, thanks.NPCID, thanks.TimeStr, thanks.GUID), thanks.PlayerID)
+            GameWorld.DebugLog("        ThanksState=%s, %s" % (thanks.ThanksState, thanks.AssistPlayerDict), thanks.PlayerID)
             
     for playerID, thanksList in assistThanksMgr.assistPlayerThanksDict.items():
-        GameWorld.DebugLog("玩家未接收感谢数: %s, %s" % (playerID, len(thanksList)))
+        GameWorld.DebugLog("--- 玩家未接收感谢数: %s, %s" % (playerID, len(thanksList)))
         for i, thanks in enumerate(thanksList):
-            GameWorld.DebugLog("    i=%s, %s" % (i, thanks.outputString()))
-            GameWorld.DebugLog("    %s" % thanks.AssistPlayerDict)
+            GameWorld.DebugLog("    %s itemID=%s,map(%s,%s,%s), %s %s" % (i, thanks.ItemID, thanks.MapID, thanks.LineID, thanks.NPCID, thanks.TimeStr, thanks.GUID), thanks.PlayerID)
+            GameWorld.DebugLog("        ThanksState=%s, %s" % (thanks.ThanksState, thanks.AssistPlayerDict), thanks.PlayerID)
                     
     GameWorld.DebugLog("-----------------------------------------")
     return

--
Gitblit v1.8.0