From 88a9eda1278acaa0b0f66b35e2319d59a3e38eca Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 29 八月 2025 16:03:35 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(修复主线战斗中重登时会自动重新开始战斗bug;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 081a20f..04f875a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -198,8 +198,6 @@
 Def_Notify_WorldKey_VSFamilyInfo = "VSFamilyInfo"  # 仙盟联赛对战仙盟信息
 Def_Notify_WorldKey_ChampionFamilyID = "ChampionFamilyID"  # 仙盟联赛上次冠军仙盟ID
 
-Def_Notify_WorldKey_FamilyPartyInfo = "FamilyPartyInfo"  # 仙盟宴会数据
-Def_Notify_WorldKey_FamilyPartyAddFamilyActivity = "FamilyPartyAddFamilyActivity"  # 仙盟宴会地图成员增加仙盟活跃令
 Def_Notify_WorldKey_FamilyZhenfaInfo = "FamilyZhenfaInfo"  # 仙盟阵法数据
 
 Def_Notify_WorldKey_AddFamilyAuctionItem = "AddFamilyAuctionItem"  # 添加仙盟拍品
@@ -218,9 +216,6 @@
 Def_Notify_WorldKey_CrossChampionshipStateError = "CrossChampionshipStateError"  # 跨服排位赛状态是否已经异常
 
 Def_Notify_WorldKey_LuckyCloudBuyInfo = "LuckyCloudBuyInfo"  # 本服幸运云购最新一期信息
-
-Def_Notify_WorldKey_CrossBattlefieldCallTeamInfo = "CrossBattlefieldCallTeamInfo" # 跨服战场召集队伍信息
-Def_Notify_WorldKey_CrossBattlefieldSysCallBuyInfo = "CrossBattlefieldSysCallBuyInfo" # 跨服战场系统场次购买召集信息
 
 Def_Notify_WorldKey_FuncTeamMemIDInfo = "FuncTeamMemIDInfo" # 功能队伍成员ID信息
 
@@ -278,7 +273,6 @@
 
 Def_Notify_WorldKey_RedPacketOutput = 'RedPacketOutput'  # 红包产出信息
 Def_Notify_WorldKey_HurtLog = 'HurtLog'  # 战斗伤害日志
-Def_Notify_WorldKey_FairyDomainLimit = "FairyDomainLimit"  # 缥缈仙域限制事件
 
 Def_Notify_WorldKey_AssistBoss = "AssistBoss"  # 协助boss
 
@@ -929,23 +923,25 @@
 ) = range(1, 4)
 
 # 游戏功能ID定义,需确保唯一,与PyGameFuncControl.txt中FuncId一致
+GameFuncID_Official = 12        # 官爵,境界
+GameFuncID_Family = 15          # 战盟,仙盟
+GameFuncID_Billboard = 72       # 排行榜
+GameFuncID_SignDay = 81         # 签到
+GameFuncID_Treasure = 99        # 寻宝
+GameFuncID_Arena = 195          # 竞技场
+
 GameFuncID_Wing = 3             # 翅膀
 GameFuncID_Pet = 6              # 宠物,灵宠
 GameFuncID_MagicWeapon = 7      # 法宝
 GameFuncID_Horse = 8            # 坐骑
-GameFuncID_Official = 12        # 官爵,境界
-GameFuncID_Family = 15          # 战盟,仙盟
 GameFuncID_GodWeapon = 20       # 神器
 GameFuncID_Talent = 149         # 天赋
 GameFuncID_RefineExp = 60       # 经验炼制,祈愿
 GameFuncID_RefineMoney = 61     # 金币炼制,祈愿
 GameFuncID_WorldLV = 71         # 世界等级
-GameFuncID_Billboard = 72       # 排行榜
 GameFuncID_Friend = 73          # 好友
-GameFuncID_SignDay = 81         # 签到
 GameFuncID_RefineStove = 87     # 炼丹炉
 GameFuncID_EquipWash = 91       # 洗练
-GameFuncID_Treasure = 99        # 寻宝
 GameFuncID_FirstGoldTip = 128      # 首充优势提示
 GameFuncID_EquipDecompose = 123 # 装备分解
 GameFuncID_DailyQuest = 78      # 日常
@@ -959,7 +955,6 @@
 GameFuncID_CrossRealmPK = 157   # 跨服天梯
 GameFuncID_PenglaiBoss = 162    # 蓬莱仙境
 GameFuncID_ZhuXianBoss = 163    # 诛仙BOSS
-GameFuncID_Arena = 195          # 竞技场
 GameFuncID_FaQi = 199           # 法器
 GameFuncID_LianTi = 207         # 炼体
 GameFuncID_CrossBattlefield = 208   # 跨服古神战场

--
Gitblit v1.8.0