From 6e85f0b43d92ae01de2432e8da0dd41646c7361c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 04 十二月 2025 14:54:38 +0800
Subject: [PATCH] 16 卡牌服务端(修复重读脚本后db报错: 重读后导致类继承出现问题,固重读时过滤掉py库及第三方库不重读;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py |   54 ++++++++++++++++++++++++++----------------------------
 1 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 010aabd..ba7e5e4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -239,8 +239,6 @@
 
 Def_Notify_WorldKey_HurtLog = 'HurtLog'  # 战斗伤害日志
 
-Def_Notify_WorldKey_AssistBoss = "AssistBoss"  # 协助boss
-
 Def_Notify_WorldKey_CoupleInfo = "CoupleInfo"  # 伴侣信息
 
 #活动类型定义
@@ -273,7 +271,6 @@
 OperationActionName_GrowupBuy = "ActGrowupBuy" # 成长必买活动
 OperationActionName_FeastLogin = "ActFeastLogin" # 节日登录活动
 OperationActionName_FeastWish = "ActFeastWish" # 节日祝福活动
-OperationActionName_FeastTravel = "ActFeastTravel" # 节日游历活动
 OperationActionName_ManyDayRecharge = "ActManyDayRecharge" # 多日连充活动
 OperationActionName_SingleRecharge = "ActSingleRecharge" # 单笔累充活动
 OperationActionName_Turntable = "ActTurntable" # 转盘活动
@@ -289,7 +286,7 @@
 FeastOperationActionNameList = [OperationActionName_FeastWeekParty,
                                 OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
                                 OperationActionName_FeastLogin,
-                                OperationActionName_FeastWish, OperationActionName_FeastTravel,
+                                OperationActionName_FeastWish,
                                 OperationActionName_RechargePrize,
                                 ]
 #所有的运营活动列表,含节日活动
@@ -320,7 +317,7 @@
                                    OperationActionName_WeekParty, OperationActionName_Turntable,
                                    OperationActionName_CollectWords,
                                    OperationActionName_FeastLogin,
-                                   OperationActionName_FeastWish, OperationActionName_FeastTravel,
+                                   OperationActionName_FeastWish,
                                    OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
                                    OperationActionName_GodGift,
                                    ]
@@ -693,7 +690,8 @@
 CDBPlayerRefresh_DOTPerDef, # 持续减伤 284
 CDBPlayerRefresh_GoldRushEnergy, # 淘金令 285
 CDBPlayerRefresh_ArenaTicket, # 挑战券 286
-) = range(146, 287)
+CDBPlayerRefresh_TehuiPoint, # 特惠印绶 287
+) = range(146, 288)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_FamilyExp = 6 # 战盟经验
@@ -735,12 +733,13 @@
 TYPE_Price_HeroScore = 51    # 招募积分
 TYPE_Price_GoldRushEnergy = 52    # 淘金令体力
 TYPE_Price_ArenaTicket = 53    # 演武场挑战券
+TYPE_Price_TehuiPoint = 54    # 特惠印绶
 TYPE_Price_PayCoinDay = 98    # 代币时效,每日过天重置
 TYPE_Price_PayCoin = 99    # 代币
 
 #key可用于遍历所有货币,value仅GM相关会用到
 MoneyNameDict = {
-                 1:"金币", 15:"公会贡献币", 41:"战锤", 42:"将星玉髓", 43:"将魂", 51:"招募积分", 52:"淘金令", 53:"挑战券",
+                 1:"金币", 15:"公会贡献币", 41:"战锤", 42:"将星玉髓", 43:"将魂", 51:"招募积分", 52:"淘金令", 53:"挑战券", 54:"特惠印绶",
                  98:"代币时效", 99:"代币"
                  }
 #MoneyNameDict = {
@@ -764,6 +763,7 @@
                            TYPE_Price_HeroScore:CDBPlayerRefresh_HeroScore,
                            TYPE_Price_GoldRushEnergy:CDBPlayerRefresh_GoldRushEnergy,
                            TYPE_Price_ArenaTicket:CDBPlayerRefresh_ArenaTicket,
+                           TYPE_Price_TehuiPoint:CDBPlayerRefresh_TehuiPoint,
                            TYPE_Price_PayCoinDay:CDBPlayerRefresh_PayCoinDay,
                            #TYPE_Price_Rune:CDBPlayerRefresh_Rune,
                            #TYPE_Price_RuneSplinters:CDBPlayerRefresh_RuneSplinters,
@@ -795,35 +795,16 @@
                          2:CDBPlayerRefresh_MoneyMinusGoldPaper,
                          }
 
-# 高效战斗状态
-Def_Battle_Status = (
-    Def_Battle_Start,    # 激活
-    Def_Battle_Stop,     # 停止
-    Def_Battle_Query     # 查询
-) = range(1, 4)
-
 # 游戏功能ID定义,需确保唯一,与PyGameFuncControl.txt中FuncId一致
 GameFuncID_Official = 10        # 官爵,境界
 GameFuncID_Family = 11          # 战盟,仙盟
 GameFuncID_Shop = 16            # 商城,坊市
 GameFuncID_Arena = 27           # 竞技场
 GameFuncID_Horse = 37           # 坐骑
+GameFuncID_Travel = 44          # 游历
 
 # 以下为暂时无用的
 GameFuncID_Pet = -1             # 宠物,灵宠 6
-GameFuncID_OSSail = -1          # 开服特惠 132
-GameFuncID_AddPoint = -1        # 加点功能/灵根功能 145
-
-#家族悬赏任务完成状态记录位标识
-Def_ArrestOverState_BitDic = {
-    5000:0,
-    5001:1,
-    5002:2,
-    5003:3,
-    5004:4,
-    5005:5,
-    5006:6,
-    }
 
 #背包类型
 (
@@ -1056,6 +1037,23 @@
 CampType_Evil,       #邪恶(与 Def_ID2Win 一致)
 ] = range(3)
 
+# json里的配表 服务器类型(0主服,1子服,2跨服,3战斗服)]
+serverType_Main = 0 # 0主服
+serverType_Child = 1 # 1子服
+serverType_Cross = 2 # 2跨服
+serverType_Battle = 3 # 3战斗服
+
+# dirType //0全广播,1通知主服务器排除合服子服,2通知服务器包含合服子服, 3通知跨服服务器 ,4通知战斗服务器
+dirType_All = 0 # 0全广播
+dirType_Main = 1 # 1通知主服务器排除合服子服
+dirType_Child = 2 # 2通知服务器包含合服子服
+dirType_Cross = 3 # 3通知跨服服务器
+dirType_Battle = 4 # 4通知战斗服务器
+
+# 服务器间的信息定义
+SSMsg_BattleRequest = "SS_BattleRequest"
+SSMsg_BattleResult = "SS_BattleResult"
+
 # 跨服服务器发送子服信息定义
 CrossServerMsg_CrossServerState = "CrossServerState"    # 跨服服务器状态变更
 CrossServerMsg_PlayerLoginout = "PlayerLoginout"        # 玩家上下线状态同步
@@ -1255,7 +1253,7 @@
 # 阵容定义
 LineupList = (
 Lineup_Main, # 主阵容 1
-Lineup_Arena, # 竞技场进攻阵容 2
+Lineup_ArenaAtk, # 竞技场进攻阵容 2
 Lineup_ArenaDef, # 竞技场防守阵容 3
 ) = range(1, 1 + 3)
 

--
Gitblit v1.8.0