From 3ac863ebc8f55dd0838b4ee2f9d0c39234af25eb Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 09 二月 2026 10:46:00 +0800
Subject: [PATCH] 358 【内政】红颜系统-服务端(修改游历体力为DWORD;红颜时装升级改为使用背包物品;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py |  518 ++++++++++++++++++++++++++-------------------------------
 1 files changed, 236 insertions(+), 282 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 2091058..779b473 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -15,6 +15,8 @@
 #"""Version = 2013-10-30 15:20"""
 #---------------------------------------------------------------------
 
+import IPY_GameWorld
+
 # 游戏默认编码
 Def_Game_Character_Encoding = 'gbk'
 
@@ -31,6 +33,7 @@
 Def_MixServerDay = 'MixServerDay' #服务器已经合服多少天
 Def_IsMixServerInitOK = 'IsMixServerInitOK' #服务器合服首次启动OK
 Def_LastMixServerDay = 'LastMixServerDay' #上次合服时的开服天数
+Def_CrossCenterEvent = 'CrossCenterEvent' # 跨服中心事件值
 #首次开服时间,注意不要用该日期做开服天相关的功能逻辑,如果要用开服天,请用 Def_ServerDay
 ''' 原因: 
 因为目前开服天的逻辑大部分是用 Def_ServerDay,当出现服务器宕机超过24小时时,就会导致 Def_ServerDay 与 Def_InitOpenServerTime 不对应
@@ -40,7 +43,10 @@
 Def_InitOpenServerTime = 'InitOpenServerTime'
 Def_SetOpenServerTime = 'SetOpenServerTime' # GM工具预定的开服时间
 
-# ------------------------- WorldKey ------------------------- 
+Def_FamilyCrossState = 'FamilyCrossState' # 本服公会跨服状态, 0-未跨服;1-已跨服
+Def_FamilyTransDataTime = 'FamilyTransDataTime' # 本服公会首次跨服互通数据开始传输时间戳,不为0代表传输数据中
+Def_OSAAwardState = 'OSAAwardState' #开服冲榜活动结算状态
+Def_OperationActID = 'OperationActID_%s_%s' # 运营活动ID的标记,参数(运营活动名, actNum)
 
 #---奇迹, 职业枚举定义---
 (
@@ -62,8 +68,9 @@
 #支持超20亿数值的数值点单位数值, 1亿
 Def_PerPointValue = 100000000
 
-#真实玩家ID、仙盟ID是从 1000000 开始
-RealPlayerIDStart = 1000000
+#真实玩家起始ID
+RealPlayerIDStart = 3000000
+#真实公会起始ID
 RealFamilyIDStart = 1000000
 
 #机器人ID - 供功能用,线上版本支持的机器人
@@ -178,56 +185,7 @@
 Def_Notify_WorldKey_CrossZoneName = "CrossZoneName"  # 跨服分区名
 Def_Notify_WorldKey_CrossServerTime = "CrossServerTime"  # 跨服时间
 
-Def_Notify_WorldKey_CrossPKZoneID = "CrossPKZoneID"  # 本服跨服PK所属赛区
-Def_Notify_WorldKey_CrossPKSeasonID = "CrossPKSeasonID"  # 本服跨服PK当前赛季
-Def_Notify_WorldKey_CrossPKSeasonState = "CrossPKSeasonState"  # 本服跨服PK赛季状态 0-关闭,1-开启中
-
-Def_Notify_WorldKey_CrossChampionshipState = "CrossChampionshipState"  # 跨服排位赛状态
-Def_Notify_WorldKey_CrossChampionshipStateError = "CrossChampionshipStateError"  # 跨服排位赛状态是否已经异常
-
-Def_Notify_WorldKey_LuckyCloudBuyInfo = "LuckyCloudBuyInfo"  # 本服幸运云购最新一期信息
-
 Def_Notify_WorldKey_FuncTeamMemIDInfo = "FuncTeamMemIDInfo" # 功能队伍成员ID信息
-
-CrossChampionshipState_Guess8 = 80 #8强竞猜
-CrossChampionshipState_Group64 = 641 #64强分组
-CrossChampionshipState_Enter64 = 642 #64强进场
-CrossChampionshipState_Fight64 = 643 #64强战斗
-CrossChampionshipState_Group32 = 321 #32强分组
-CrossChampionshipState_Enter32 = 322 #32强进场
-CrossChampionshipState_Fight32 = 323 #32强战斗
-CrossChampionshipState_Group16 = 161 #16强分组
-CrossChampionshipState_Enter16 = 162 #16强进场
-CrossChampionshipState_Fight16 = 163 #16强战斗
-CrossChampionshipState_Guess4 = 40 #4强竞猜
-CrossChampionshipState_Group8 = 81 #8强分组
-CrossChampionshipState_Enter8 = 82 #8强进场
-CrossChampionshipState_Fight8 = 83 #8强战斗
-CrossChampionshipState_GroupSemi = 41 #半决赛分组
-CrossChampionshipState_EnterSemi = 42 #半决赛进场
-CrossChampionshipState_FightSemi = 43 #半决赛战斗
-CrossChampionshipState_GroupFinal = 21 #决赛分组
-CrossChampionshipState_EnterFinal = 22 #决赛进场
-CrossChampionshipState_FightFinal = 23 #决赛战斗
-#跨服排位争霸赛状态流程列表,必须按顺序,中间不可跳过步骤
-CrossChampionshipStateList = [CrossChampionshipState_Guess8, 
-                              CrossChampionshipState_Group64, CrossChampionshipState_Enter64, CrossChampionshipState_Fight64,
-                              CrossChampionshipState_Group32, CrossChampionshipState_Enter32, CrossChampionshipState_Fight32,
-                              CrossChampionshipState_Group16, CrossChampionshipState_Enter16, CrossChampionshipState_Fight16,
-                              CrossChampionshipState_Guess4,
-                              CrossChampionshipState_Group8, CrossChampionshipState_Enter8, CrossChampionshipState_Fight8,
-                              CrossChampionshipState_GroupSemi, CrossChampionshipState_EnterSemi, CrossChampionshipState_FightSemi,
-                              CrossChampionshipState_GroupFinal, CrossChampionshipState_EnterFinal, CrossChampionshipState_FightFinal
-                              ]
-
-#跨服排位可进入战斗的状态信息 {状态:对应分组标识, ...}
-CrossChampionshipEnterStateInfo = {CrossChampionshipState_Enter64:64,
-                                   CrossChampionshipState_Enter32:32,
-                                   CrossChampionshipState_Enter16:16,
-                                   CrossChampionshipState_Enter8:8,
-                                   CrossChampionshipState_EnterSemi:4,
-                                   CrossChampionshipState_EnterFinal:2,
-                                   }
 
 Def_Notify_WorldKey_GameWorldBossRebornCross = 'BossRebornCross_%s_%s'   # 跨服世界boss重生, 参数为(zoneID, bossID)
 Def_Notify_WorldKey_GameWorldBossReborn = 'BossReborn_%s'   # 世界boss重生, 参数为(bossID)
@@ -236,14 +194,13 @@
 Def_Notify_WorldKey_BossShuntPlayer = 'BossShuntPlayer'   # boss分流玩家信息
 Def_Notify_WorldKey_BossShuntLineState = 'BossShuntLineState'   # boss分流线路对应boss状态
 Def_Notify_WorldKey_BossOnlineHeroCnt = 'BossOnlineHeroCnt_%s'  # boss刷新时间用的在线人数, 参数为NPCID
-Def_Notify_WorldKey_FamilyKillHorsePetRobBossCnt = 'FamilyKillHorsePetRobBossCnt'   # 仙盟击杀骑宠boss数统计
-Def_Notify_WorldKey_HorsePetRobBossPlayerCount = 'HorsePetRobBossPlayerCount'   # 骑宠争夺活动有效参考人数
 
 Def_Notify_WorldKey_HurtLog = 'HurtLog'  # 战斗伤害日志
 
-Def_Notify_WorldKey_AssistBoss = "AssistBoss"  # 协助boss
-
 Def_Notify_WorldKey_CoupleInfo = "CoupleInfo"  # 伴侣信息
+
+Def_WorldKey_OperationActionState = "State_%s_%s"               #运营活动状态,参数为(运营活动名, actNum)
+Def_WorldKey_OperationActionStateJoin = "StateJoin_%s_%s"       #运营活动可参与状态,参数为(运营活动名, actNum)
 
 #活动类型定义
 ActTypeList = (
@@ -253,10 +210,13 @@
 ) = range(1, 1 + 3)
 
 #运营活动表名定义
+OperationActionName_Lunhuidian = "ActLunhuidian" # 轮回殿活动
+
+#所有的运营活动列表,默认都支持多活动分组编号的活动名
+OperationActionNameList = [OperationActionName_Lunhuidian]
+
 OperationActionName_ExpRate = "ActExpRate" # 多倍经验活动
-OperationActionName_CostRebate = "ActCostRebate" # 消费返利活动
 OperationActionName_SpringSale = "ActSpringSale" # 限时特惠活动
-OperationActionName_BossReborn = "ActBossReborn" # BOSS复活活动
 OperationActionName_FlashGiftbag = "ActFlashGiftbag" # 限时礼包活动
 OperationActionName_DailyGiftbag = "ActDailyGiftbag" # 每日礼包活动
 OperationActionName_FairyCeremony = "ActFairyCeremony" # 仙界盛典活动
@@ -265,17 +225,12 @@
 OperationActionName_FlashSale = "ActFlashSale" # 限时抢购活动
 OperationActionName_WishingWell = "ActWishingWell" # 许愿池活动
 OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
-OperationActionName_WeekParty = "ActWeekParty" # 周狂欢活动
 OperationActionName_LoginAward = "ActLoginAward" # 登录奖励活动
-OperationActionName_FeastWeekParty = "ActFeastWeekParty" # 节日巡礼狂欢活动
 OperationActionName_CollectWords = "ActCollectWords" # 集字活动
 OperationActionName_LuckyTreasure = "ActLuckyTreasure" # 幸运鉴宝活动
-OperationActionName_RechargePrize = "ActRechargePrize" # 充值返利活动(节日活动)
-OperationActionName_RechargeRebateGold = "ActRechargeRebateGold" # 充值返利仙玉活动(活动结束邮件发放,节日活动)
 OperationActionName_GrowupBuy = "ActGrowupBuy" # 成长必买活动
 OperationActionName_FeastLogin = "ActFeastLogin" # 节日登录活动
 OperationActionName_FeastWish = "ActFeastWish" # 节日祝福活动
-OperationActionName_FeastTravel = "ActFeastTravel" # 节日游历活动
 OperationActionName_ManyDayRecharge = "ActManyDayRecharge" # 多日连充活动
 OperationActionName_SingleRecharge = "ActSingleRecharge" # 单笔累充活动
 OperationActionName_Turntable = "ActTurntable" # 转盘活动
@@ -286,73 +241,53 @@
 OperationActionName_BuyCountGift = "ActBuyCountGift" # 购买次数礼包活动
 OperationActionName_FamilyCTGAssist = "ActFamilyCTGAssist" # 仙盟充值协助
 OperationActionName_Yunshi = "ActYunshi" # 运势活动
-OperationActionName_Lunhuidian = "ActLunhuidian" # 轮回殿活动
-#节日活动类型列表 - 该类型无视开服天,日期到了就开启
-FeastOperationActionNameList = [OperationActionName_FeastWeekParty,
-                                OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
-                                OperationActionName_FeastLogin,
-                                OperationActionName_FeastWish, OperationActionName_FeastTravel,
-                                OperationActionName_RechargePrize,
-                                ]
-#所有的运营活动列表,含节日活动
-OperationActionNameList = [OperationActionName_ExpRate, OperationActionName_CostRebate, 
-                           OperationActionName_BossReborn,OperationActionName_SpringSale, 
-                           OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
-                           OperationActionName_RealmPoint, OperationActionName_FlashSale,
-                           OperationActionName_WishingWell, OperationActionName_TotalRecharge,
-                           OperationActionName_WeekParty, OperationActionName_LoginAward, 
-                           OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure,
-                           OperationActionName_DailyGiftbag, OperationActionName_SingleRecharge,
-                           OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
-                           OperationActionName_Turntable,
-                           OperationActionName_GodGift,
-                           OperationActionName_BuyOne,
-                           OperationActionName_ActLoginNew, OperationActionName_ActTask,
-                           OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist,
-                           OperationActionName_Yunshi,
-                           OperationActionName_Lunhuidian,
-                           ] + FeastOperationActionNameList
-#需要记录开启活动时的世界等级的运营活动
-NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 
-                                   OperationActionName_NewFairyCeremony, OperationActionName_FlashSale,
-                                   OperationActionName_BossReborn, OperationActionName_TotalRecharge,
-                                   OperationActionName_CostRebate, OperationActionName_FlashGiftbag,
-                                   OperationActionName_SpringSale, OperationActionName_LuckyTreasure,
-                                   OperationActionName_DailyGiftbag, OperationActionName_GrowupBuy,
-                                   OperationActionName_WeekParty, OperationActionName_Turntable,
-                                   OperationActionName_CollectWords,
-                                   OperationActionName_FeastLogin,
-                                   OperationActionName_FeastWish, OperationActionName_FeastTravel,
-                                   OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
-                                   OperationActionName_GodGift,
-                                   ]
 
-#支持多活动分组编号的活动名
-MultiActNumOperationActNameList = [OperationActionName_TotalRecharge, OperationActionName_CollectWords,
-                                   OperationActionName_FlashGiftbag, OperationActionName_CostRebate,
-                                   OperationActionName_SpringSale, OperationActionName_FlashSale,
-                                   OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
-                                   OperationActionName_Turntable,
-                                   OperationActionName_GodGift,
-                                   OperationActionName_BuyOne,
-                                   OperationActionName_ActLoginNew, OperationActionName_ActTask,
-                                   OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist,
-                                   OperationActionName_Yunshi,
-                                   OperationActionName_Lunhuidian,
-                                   ]
+##节日活动类型列表 - 该类型无视开服天,日期到了就开启
+#FeastOperationActionNameList = [OperationActionName_GrowupBuy,
+#                                OperationActionName_FeastLogin,
+#                                OperationActionName_FeastWish,
+#                                ]
+##所有的运营活动列表,含节日活动
+#OperationActionNameList = [OperationActionName_ExpRate, 
+#                           OperationActionName_SpringSale, 
+#                           OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
+#                           OperationActionName_RealmPoint, OperationActionName_FlashSale,
+#                           OperationActionName_WishingWell, OperationActionName_TotalRecharge,
+#                           OperationActionName_LoginAward, 
+#                           OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure,
+#                           OperationActionName_DailyGiftbag, OperationActionName_SingleRecharge,
+#                           OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
+#                           OperationActionName_Turntable,
+#                           OperationActionName_GodGift,
+#                           OperationActionName_BuyOne,
+#                           OperationActionName_ActLoginNew, OperationActionName_ActTask,
+#                           OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist,
+#                           OperationActionName_Yunshi,
+#                           OperationActionName_Lunhuidian,
+#                           ] + FeastOperationActionNameList
+##需要记录开启活动时的世界等级的运营活动
+#NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 
+#                                   OperationActionName_NewFairyCeremony, OperationActionName_FlashSale,
+#                                   OperationActionName_TotalRecharge,
+#                                   OperationActionName_FlashGiftbag,
+#                                   OperationActionName_SpringSale, OperationActionName_LuckyTreasure,
+#                                   OperationActionName_DailyGiftbag, OperationActionName_GrowupBuy,
+#                                   OperationActionName_Turntable,
+#                                   OperationActionName_CollectWords,
+#                                   OperationActionName_FeastLogin,
+#                                   OperationActionName_FeastWish,
+#                                   OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
+#                                   OperationActionName_GodGift,
+#                                   ]
 
 #跨服运营活动表名定义
-CrossActName_CTGBillboard = "CrossActCTGBillboard" # 充值排行榜
-CrossActName_AllRecharge = "CrossActAllRecharge" # 全民充值
-CrossActName_LuckyCloudBuy = "CrossActLuckyCloudBuy" # 幸运云购
 CrossActName_Lianqi = "CrossActLianqi" # 炼器 - 跨服
 CrossActName_FamilyGCZ = "CrossActFamilyGCZ" # 仙盟攻城战
 
 #跨服运营活动列表
-CrossActNameList = [CrossActName_CTGBillboard, CrossActName_AllRecharge, CrossActName_LuckyCloudBuy, 
-                    CrossActName_Lianqi, CrossActName_FamilyGCZ]
+CrossActNameList = [CrossActName_Lianqi, CrossActName_FamilyGCZ]
 #需要锁定活动分区分配直到活动结束的跨服运营活动,即使热更分区配置,也不会改变正在活动中的分区设定,直到活动结束
-CrossActLockServerGroupIDList = [CrossActName_CTGBillboard, CrossActName_AllRecharge]
+CrossActLockServerGroupIDList = []
 
 #活动信息字典key定义
 ActKey_ID = "ID" # 活动ID,唯一标识的ID,一般是活动开启的time值
@@ -422,7 +357,9 @@
     Def_mitGatherSoulCompound,# 聚魂合成
     Def_mitGatherSoulDecompose,# 聚魂分解
     Def_mitMainDropItemOP,# 主线装备操作 25
-) = range(1, 1 + 25)
+    Def_mitMGTuiyan,          # 命格推演 26
+    Def_mitMinggeEquip,       # 命格装备 27
+) = range(1, 1 + 27)
 
 #---写死的技能ID---
 
@@ -434,7 +371,10 @@
 Def_BT_MainLevel,    # 主线关卡过关榜 0
 Def_BT_Arena,    # 演武场积分周榜 1
 Def_BT_Tianzi,    # 天子考验伤害榜 2
-) = range(0, 3) 
+Def_BT_OSA_MainLevel,    # 开服关卡榜 3
+Def_BT_OSA_HeroCall,    # 开服招募榜 4
+Def_BT_Dingjunge,    # 定军阁过关榜 5
+) = range(0, 6) 
 
 ''' 跨服排行榜类型, 从 150 开始,最大条数在功能配置表 CrossBillboardSet 配置,没配默认100
 与本服榜单存储的是不一样的数据库表格,理论上类型可以和本服榜单类型重复,为了做下区分防误导,跨服榜单从 150 开始
@@ -447,7 +387,8 @@
 
 BillboardTypeAllList = BillboardTypeList + CrossBillboardTypeList
 
-BillboardNameDict = {Def_BT_MainLevel:"主线过关榜", Def_BT_Arena:"演武场积分周榜", Def_BT_Tianzi:"天子考验伤害榜"}
+BillboardNameDict = {Def_BT_MainLevel:"主线过关榜", Def_BT_Arena:"演武场积分周榜", Def_BT_Tianzi:"天子考验伤害榜", 
+                     Def_BT_OSA_MainLevel:"开服关卡榜", Def_BT_OSA_HeroCall:"开服招募榜", Def_BT_Dingjunge:"定军阁过关榜"}
 
 #仙盟榜单类型
 FamilyBillboardList = []
@@ -695,7 +636,9 @@
 CDBPlayerRefresh_DOTPerDef, # 持续减伤 284
 CDBPlayerRefresh_GoldRushEnergy, # 淘金令 285
 CDBPlayerRefresh_ArenaTicket, # 挑战券 286
-) = range(146, 287)
+CDBPlayerRefresh_TehuiPoint, # 特惠印绶 287
+CDBPlayerRefresh_OSAPoint, # 开服庆典积分 288
+) = range(146, 289)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_FamilyExp = 6 # 战盟经验
@@ -737,12 +680,15 @@
 TYPE_Price_HeroScore = 51    # 招募积分
 TYPE_Price_GoldRushEnergy = 52    # 淘金令体力
 TYPE_Price_ArenaTicket = 53    # 演武场挑战券
+TYPE_Price_TehuiPoint = 54    # 特惠印绶
+TYPE_Price_OSAPoint = 55    # 开服庆典积分
 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:"特惠印绶", 
+                 55:"可用开服庆典积分",
                  98:"代币时效", 99:"代币"
                  }
 #MoneyNameDict = {
@@ -759,36 +705,38 @@
 
 # 自定义积分及通知字典 {货币类型:通知客户端刷新类型, ...} , 如果不通知的话刷新类型则配置 None
 TYPE_Price_CurrencyDict = {
-                           TYPE_Price_Rune:CDBPlayerRefresh_Rune,
-                           TYPE_Price_RuneSplinters:CDBPlayerRefresh_RuneSplinters,
-                           TYPE_Price_TreasureScore:CDBPlayerRefresh_TreasureScore,
-                           TYPE_Price_BourseMoney:None,
-                           TYPE_Price_RealmPoint:CDBPlayerRefresh_RealmPoint,
-                           TYPE_Price_Ysog:CDBPlayerRefresh_Ysog,
                            TYPE_Price_FamilyCoin:CDBPlayerRefresh_FamilyCoin,
-                           TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,
-                           TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,
-                           TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,
-                           TYPE_Price_SoulCore:CDBPlayerRefresh_SoulCore,
-                           TYPE_Price_Honor:CDBPlayerRefresh_Honor,
-                           TYPE_Price_BossActScore:CDBPlayerRefresh_BossActScore,
-                           TYPE_Price_FuncSysPrivilege:CDBPlayerRefresh_FuncSysPrivilege,
-                           TYPE_Price_Environment:CDBPlayerRefresh_Environment,
-                           TYPE_Price_BTGMPoint:CDBPlayerRefresh_BTGMPoint,
-                           TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,
-                           TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
                            TYPE_Price_Xiantao:CDBPlayerRefresh_Xiantao,
                            TYPE_Price_Lingyu:CDBPlayerRefresh_Lingyu,
                            TYPE_Price_HeroSoul:CDBPlayerRefresh_HeroSoul,
-                           TYPE_Price_FamilyFlagWarPoint:CDBPlayerRefresh_FamilyFlagWarPoint,
-                           TYPE_Price_GatherSoul:CDBPlayerRefresh_GatherSoul,
-                           TYPE_Price_TiandaoFruit:CDBPlayerRefresh_TiandaoFruit,
-                           TYPE_Price_XianyuanScore:CDBPlayerRefresh_XianyuanScore,
-                           TYPE_Price_HuanjinggeScore:CDBPlayerRefresh_HuanjinggeScore,
                            TYPE_Price_HeroScore:CDBPlayerRefresh_HeroScore,
                            TYPE_Price_GoldRushEnergy:CDBPlayerRefresh_GoldRushEnergy,
                            TYPE_Price_ArenaTicket:CDBPlayerRefresh_ArenaTicket,
+                           TYPE_Price_TehuiPoint:CDBPlayerRefresh_TehuiPoint,
+                           TYPE_Price_OSAPoint:CDBPlayerRefresh_OSAPoint,
                            TYPE_Price_PayCoinDay:CDBPlayerRefresh_PayCoinDay,
+                           #TYPE_Price_Rune:CDBPlayerRefresh_Rune,
+                           #TYPE_Price_RuneSplinters:CDBPlayerRefresh_RuneSplinters,
+                           #TYPE_Price_TreasureScore:CDBPlayerRefresh_TreasureScore,
+                           #TYPE_Price_BourseMoney:None,
+                           #TYPE_Price_RealmPoint:CDBPlayerRefresh_RealmPoint,
+                           #TYPE_Price_Ysog:CDBPlayerRefresh_Ysog,
+                           #TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,
+                           #TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,
+                           #TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,
+                           #TYPE_Price_SoulCore:CDBPlayerRefresh_SoulCore,
+                           #TYPE_Price_Honor:CDBPlayerRefresh_Honor,
+                           #TYPE_Price_BossActScore:CDBPlayerRefresh_BossActScore,
+                           #TYPE_Price_FuncSysPrivilege:CDBPlayerRefresh_FuncSysPrivilege,
+                           #TYPE_Price_Environment:CDBPlayerRefresh_Environment,
+                           #TYPE_Price_BTGMPoint:CDBPlayerRefresh_BTGMPoint,
+                           #TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,
+                           #TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
+                           #TYPE_Price_FamilyFlagWarPoint:CDBPlayerRefresh_FamilyFlagWarPoint,
+                           #TYPE_Price_GatherSoul:CDBPlayerRefresh_GatherSoul,
+                           #TYPE_Price_TiandaoFruit:CDBPlayerRefresh_TiandaoFruit,
+                           #TYPE_Price_XianyuanScore:CDBPlayerRefresh_XianyuanScore,
+                           #TYPE_Price_HuanjinggeScore:CDBPlayerRefresh_HuanjinggeScore,
                            }
 
 # 支持负值的货币及对应0418刷新类型
@@ -797,36 +745,20 @@
                          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_OSA_MainLevel = 45   # 开服关卡榜
+GameFuncID_OSA_HeroCall = 46    # 开服招募榜
+GameFuncID_OSA_Celebration = 47 # 开服庆典
+GameFuncID_Mingge = 54          # 命格
 
 # 以下为暂时无用的
-GameFuncID_Wing = -1            # 翅膀 3
 GameFuncID_Pet = -1             # 宠物,灵宠 6
-GameFuncID_Horse = -1           # 坐骑 8
-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,
-    }
 
 #背包类型
 (
@@ -838,8 +770,10 @@
 rptDogzEquip,       # 神兽装备背包 33
 rptGarbage,         # 垃圾分类背包 34
 rptHero,            # 武将英雄背包 35
+rptMGGuayu,         # 命格卦玉背包 36
+rptMGTuiyan,        # 命格推演背包 37
 rptMax,             # 最大背包类型数量,放在最后一个
-) = range(28, 28 + 9)  #C++定义的枚举到27
+) = range(28, 28 + 11)  #C++定义的枚举到27
 
 #虚拟背包类型, 从255递减
 Def_VPack_TypeList = (
@@ -847,6 +781,7 @@
 rptRune,            # 符印背包 255
 ) = range(256 - 2, 256)
 
+NeedRecordRPType = [IPY_GameWorld.rptItem, rptTreasure, rptHero, IPY_GameWorld.rptIdentify, rptMGTuiyan]
 
 #武器的手持形式
 (
@@ -889,13 +824,18 @@
                        Def_GameRecType_TalkCache, # 聊天缓存,频道 306
                        Def_GameRecType_PlayerOfflineUnprocessed, # 离线玩家待处理事件,playerID 307
                        Def_GameRecType_ArenaRecord, # 演武场玩家挑战记录,playerID 308
-                       ) = range(300, 1 + 308)
+                       Def_GameRecType_BatPreset, # 战斗方案预设额外存储信息,playerID 309
+                       Def_GameRecType_Setting, # 前端自定义存储的设置内容,playerID 310
+                       ) = range(300, 1 + 310)
 #通用信息记录新 - 字典key配置,如果有配置,则可额外按对应记录Value值存储字典,方便快速取值,可配置Value编号 1~8,配空默认 Value1
 Def_GameRecValueKeyDict = {
                            Def_GameRecType_Xiangong:[1],
                            }
 #仅查看自己的记录
-Def_ViewGameRecSelfList = [Def_GameRecType_ArenaRecord]
+Def_ViewGameRecSelfList = [Def_GameRecType_ArenaRecord, Def_GameRecType_BatPreset, Def_GameRecType_Setting]
+
+#UserData不使用json的记录类型
+UserDataNOJsonRecTypeList = []
 
 #通用信息记录类型
 Def_UniversalGameRecTypeList = (
@@ -920,8 +860,8 @@
                                 Def_UniversalGameRecType_ActWorldLVLimitInfo, # 运营活动世界等级限制开启信息 18
                                 Def_UniversalGameRecType_19,
                                 Def_UniversalGameRecType_20,
-                                Def_UniversalGameRecType_LuckyCloudBuyNum, # 幸运云购购买号码记录 21
-                                Def_UniversalGameRecType_LuckyCloudBuyLottery, # 幸运云购开奖记录 22
+                                Def_UniversalGameRecType_21,
+                                Def_UniversalGameRecType_22,
                                 Def_UniversalGameRecType_CrossBattlefieldBuy, # 玩家购买的跨服战场 23
                                 Def_UniversalGameRecType_24,
                                 Def_UniversalGameRecType_BossDropGoodItemInfo,  # boss掉落好物品信息记录25
@@ -930,17 +870,17 @@
                                 Def_UniversalGameRecType_28,
                                 Def_UniversalGameRecType_BossInfo,  # boss信息29
                                 Def_UniversalGameRecType_CrossBossInfo,  # 跨服boss信息 30
-                                Def_UniversalGameRecType_BossFirstKill, # boss首杀 31
+                                Def_UniversalGameRecType_31,
                                 Def_UniversalGameRecType_CrossCollect,  # 跨服采集记录信息 32             
-                                Def_UniversalGameRecType_CrossChampionshipGroup, # 跨服排位争霸赛分组信息 33
-                                Def_UniversalGameRecType_CrossChampionshipGuess, # 跨服排位争霸赛竞猜记录信息 34
-                                Def_UniversalGameRecType_CrossChampionshipOfficial, # 跨服排位争霸赛最终排名官职信息 35
-                                Def_UniversalGameRecType_CrossChampionshipOffChallenge, # 跨服排位争霸赛官职挑战信息 36
-                                Def_UniversalGameRecType_CrossActAllRecharge, # 跨服全服充值活动信息 37
+                                Def_UniversalGameRecType_33,
+                                Def_UniversalGameRecType_34,
+                                Def_UniversalGameRecType_35,
+                                Def_UniversalGameRecType_36,
+                                Def_UniversalGameRecType_37,
                                 Def_UniversalGameRecType_CrossBattleChampionGroup, # 跨服战场冠军赛分组信息 38
-                                Def_UniversalGameRecType_CrossYaomoBossHurtInfo, # 跨服妖魔boss伤血信息 39
+                                Def_UniversalGameRecType_39,
                                 Def_UniversalGameRecType_40,
-                                Def_UniversalGameRecType_41,   # 红包产出结果记录41
+                                Def_UniversalGameRecType_41,
                                 Def_UniversalGameRecType_42,
                                 Def_UniversalGameRecType_43,
                                 Def_UniversalGameRecType_44,
@@ -956,15 +896,15 @@
                                 Def_UniversalGameRecType_54,
                                 Def_UniversalGameRecType_55,
                                 Def_UniversalGameRecType_56,
-                                Def_UniversalGameRecType_57, # 抢红包总记录57
-                                Def_UniversalGameRecType_58, # 抢红包可抢信息记录58
-                                Def_UniversalGameRecType_59, # 抢红包已抢完信息记录59
+                                Def_UniversalGameRecType_57,
+                                Def_UniversalGameRecType_58,
+                                Def_UniversalGameRecType_59,
                                 Def_UniversalGameRecType_60,
                                 Def_UniversalGameRecType_61,
                                 Def_UniversalGameRecType_62,
                                 Def_UniversalGameRecType_63,
-                                Def_UniversalGameRecType_64, # 仙盟红包总记录64
-                                Def_UniversalGameRecType_65, # 仙盟红包已抢信息记录65
+                                Def_UniversalGameRecType_64,
+                                Def_UniversalGameRecType_65,
                                 Def_UniversalGameRecType_DujieHelpAllRecord, # 渡劫副本护法总记录66
                                 Def_UniversalGameRecType_DujieHelpRecord, # 渡劫副本护法详细记录67
                                 Def_UniversalGameRecType_FamilyWarBattle, # 仙盟联赛对战表68
@@ -985,7 +925,7 @@
 
 #家族行为类型 在GameServer.ChConfig.ActionTypeSaveCnt 中配置最高存储条数
 Def_ActionTypeList = (
-                      Def_ActionType_FamilyData, #仙盟额外记录信息0
+                      Def_ActionType_0,
                       Def_ActionType_1,
                       Def_ActionType_2,
                       Def_ActionType_FamilyAdd,    #申请进入家族3
@@ -1059,6 +999,72 @@
 CampType_Evil,       #邪恶(与 Def_ID2Win 一致)
 ] = range(3)
 
+# serverJosn里配置索引 ServersConfig.json目前配置规则{SeverID:[GroupName,MapID,服务器类型(0主服,1子服,2跨服)], ...}
+(
+serverCfgIndex_GroupName, # 所属 GroupName
+serverCfgIndex_MapID, # 服务器对应的地图ID
+serverCfgIndex_ServerType, # 服务器类型
+) = range(3)
+
+# json里的配表 服务器类型(0主服,1子服,2跨服,3战斗服,4跨服中心)]
+serverType_Main = 0 # 0主服
+serverType_Child = 1 # 1子服
+serverType_Cross = 2 # 2跨服
+serverType_Battle = 3 # 3战斗服
+serverType_CrossCenter = 4 # 4跨服中心,只允许最多1台
+
+# 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通知战斗服务器
+dirType_MainAndCross = 5 # 通知主服务器+跨服
+
+# 服务器间连接状态
+(
+ssConn_Unknown, # 未知 0
+ssConn_Normal, # 正常连接 1
+ssConn_Disconnected, # 断开 2
+) = range(3)
+
+# 服务器间的信息定义
+# 服务器类型简写: C - 跨服/跨服中心; CC - 跨服中心;S - 游戏服; B - 战斗服
+
+# 跨服中心 -> 其他跨服
+CC2C_FamilyCrossCfg = "CC2C_FamilyCrossCfg"             # 公会分区配置
+
+# 跨服  -> 游戏服
+#C2S_PlayerLoginOK = "C2S_PlayerLoginOK"                 # 跨服玩家处理登录成功
+C2S_SendFakePack = "C2S_SendFakePack"                   # 给玩家发送封包
+C2S_FamilyCrossInfo = "C2S_FamilyCrossInfo"             # 跨服同步给游戏服的公会信息
+C2S_FamilyDataRet = "C2S_FamilyDataRet"                 # 公会首次跨服互通时同步数据结果回复
+C2S_FamilyMapPlayer = "C2S_FamilyMapPlayer"             # 给公会玩家处理地图服务器逻辑
+C2S_FamilyPyPackRet = "C2S_FamilyPyPackRet"             # 公会功能玩家请求包处理结束回包,一般用于重置请求cd等
+C2S_GMDebugAnswer = "C2S_GMDebugAnswer"                 # 发给玩家的DebugAnswer
+C2S_NotifyCode = "C2S_NotifyCode"                       # 给玩家发送信息提示
+C2S_CostPlayerResources = "C2S_CostPlayerResources"     # 扣除玩家资源,货币、物品等
+C2S_GivePlayerResources = "C2S_GivePlayerResources"     # 奖励玩家资源,货币、物品等
+C2S_SetPlayerNomalDict = "C2S_SetPlayerNomalDict"       # 设置玩家字典值
+C2S_SendPlayerMail = "C2S_SendPlayerMail"               # 发送玩家个人邮件
+
+# 游戏服  -> 跨服
+S2C_OnlineState = "S2C_OnlineState"                     # 玩家在线状态同步
+S2C_PlayerBaseInfo = "S2C_PlayerBaseInfo"               # 玩家基础信息同步
+S2C_FamilyData = "S2C_FamilyData"                       # 公会首次跨服互通时同步数据
+S2C_FamilyPyPack = "S2C_FamilyPyPack"                   # 公会功能玩家请求包
+
+# 游戏服  -> 任意服务器
+S2S_ViewTagFamily = "S2S_ViewTagFamily"                 # 查看目标公会
+S2S_ViewTagPlayer = "S2S_ViewTagPlayer"                 # 查看目标玩家
+
+# 任意服务器 -> 战斗服务器
+S2B_BattleRequest = "S2B_BattleRequest"                 # 战斗请求
+B2S_BattleResult = "B2S_BattleResult"                   # 战斗结果
+
+# Debug日志不输出通讯数据明细的类型,debug模式下看,一些纯数据类的可不输出通讯数据明细
+NoLogDataSSMsgTypes = [S2B_BattleRequest, B2S_BattleResult, S2C_FamilyData, C2S_SendFakePack, S2C_FamilyPyPack]
+
 # 跨服服务器发送子服信息定义
 CrossServerMsg_CrossServerState = "CrossServerState"    # 跨服服务器状态变更
 CrossServerMsg_PlayerLoginout = "PlayerLoginout"        # 玩家上下线状态同步
@@ -1092,8 +1098,6 @@
 CrossServerMsg_CrossActInfo = "CrossActInfo"            # 跨服运营活动信息
 CrossServerMsg_MailPlayerIDList = "MailPlayerIDList"    # 跨服邮件玩家ID通知,玩家目标服务器可能无法知道,被动推送
 CrossServerMsg_MailContent = "MailContent"              # 跨服邮件内容通知
-CrossServerMsg_LuckyCloudBuyNum = "LuckyCloudBuyNum"    # 幸运云购购买记录通知
-CrossServerMsg_LuckyCloudBuyLottery = "LuckyCloudBuyLottery"    # 幸运云购开奖记录通知
 CrossServerMsg_CrossServerTime = "CrossServerTime"      # 跨服时间同步
 CrossServerMsg_BattlefieldBuy = "BattlefieldBuy"        # 跨服战场购买信息
 CrossServerMsg_BattlefieldState = "BattlefieldState"    # 跨服战场状态信息
@@ -1101,14 +1105,6 @@
 CrossServerMsg_DebugAnswer = "DebugAnswer"              # DebugAnswer
 CrossServerMsg_ActDropSpecItem = "ActDropSpecItem"      # 特殊掉落验证返回
 CrossServerMsg_CrossAssist = "CrossAssist"              # 跨服协助
-CrossServerMsg_ChampionshipState = "ChampionshipState"  # 跨服排位争霸赛状态信息
-CrossServerMsg_ChampionshipPlayer = "ChampionshipPlayer"# 跨服排位争霸赛参赛玩家信息
-CrossServerMsg_ChampionshipGroup = "ChampionshipGroup"  # 跨服排位争霸赛分组信息
-CrossServerMsg_ChampionshipGuess = "ChampionshipGuess"  # 跨服排位争霸赛竞猜信息
-CrossServerMsg_ChampionshipOfficial = "ChampionshipOfficial"  # 跨服排位争霸赛官职信息
-CrossServerMsg_ChampionshipDailyOfficial = "ChampionshipDailyOfficial"  # 跨服排位争霸赛每日官职信息
-CrossServerMsg_ActAllRechargeInfo = "ActAllRechargeInfo"# 跨服全民充值信息
-CrossServerMsg_CrossYaomoBossHurtInfo = "CrossYaomoBossHurtInfo" # 跨服妖魔boss玩家伤害信息
 CrossServerMsg_FamilyFlagwarOver = "FamilyFlagwarOver"  # 逐鹿万界结算信息
 CrossServerMsg_Worship = "Worship"  # 膜拜信息
 CrossServerMsg_Xiangong = "Xiangong"  # 仙宫信息
@@ -1139,23 +1135,12 @@
 ClientServerMsg_CollectNPC = "CollectNPC"               # 采集NPC
 ClientServerMsg_EnterFB = "EnterFB"                     # 请求进入跨服副本
 ClientServerMsg_AddBuff = "AddBuff"                     # 添加BUFF
-ClientServerMsg_LuckyCloudBuy = "LuckyCloudBuy"         # 幸运云购
 ClientServerMsg_BattlefieldBuyOpen = "BattlefieldBuyOpen"   # 跨服战场购买召集
 ClientServerMsg_BattlefieldCallChange = "BattlefieldCallChange"  # 跨服战场召集 - 修改
 ClientServerMsg_BattlefieldCallJoin = "BattlefieldCallJoin"   # 跨服战场召集 - 加入
 ClientServerMsg_BattlefieldCallKick = "BattlefieldCallKick"   # 跨服战场召集 - 踢出
 ClientServerMsg_ActDropSpecItem = "ActDropSpecItem"     # 活动特殊掉落
 ClientServerMsg_CrossAssist = "CrossAssist"             # 跨服协助
-ClientServerMsg_ChampionshipPKOver = "ChampionshipPKOver" # 跨服排位PK结束
-ClientServerMsg_ChampionshipOfficialApply = "ChampionshipOfficialApply" # 跨服排位申请官职
-ClientServerMsg_ChampionshipOfficialApplyReply = "ChampionshipOfficialApplyReply" # 跨服排位官职申请回应
-ClientServerMsg_ChampionshipOfficialKick = "ChampionshipOfficialKick" # 跨服排位辞退下级仙官
-ClientServerMsg_ChampionshipOfficialLeave = "ChampionshipOfficialLeave" # 跨服排位主动离任仙官
-ClientServerMsg_ChampionshipOfficialChallenge = "ChampionshipOfficialChallenge" # 跨服排位挑战仙官
-ClientServerMsg_ChampionshipGuess = "ChampionshipGuess" # 跨服排位竞猜
-ClientServerMsg_ChampionshipWorship = "ChampionshipWorship" # 跨服排位膜拜
-ClientServerMsg_ActAllRechargeValue = "ActAllRechargeValue" # 跨服全民充值额度
-ClientServerMsg_CrossYaomoBossHurtAward = "CrossYaomoBossHurtAward" # 跨服妖魔boss玩家伤害领奖
 ClientServerMsg_CreateFuncTeam = "CreateFuncTeam"   # 创建功能队伍
 ClientServerMsg_ChangeFuncTeam = "ChangeFuncTeam"   # 修改功能队伍
 ClientServerMsg_FuncTeamMemOP = "FuncTeamMemOP"   # 功能队伍成员操作
@@ -1202,24 +1187,17 @@
 Def_IudetBaseAttrID = 21  # 物品基础属性ID列表,适用于随机范围基础属性(非物品表配置的固定属性)
 Def_IudetBaseAttrValue = 23  # 物品基础属性值列表
 Def_IudetPartSuiteLV = 25  # 部位套装等级 [套装类型1等级, 套装类型2等级, ...]
-Def_IudetWingMaterialItemID = 27  # 翅膀精炼材料ID列表
-Def_IudetWingMaterialItemCount = 29  # 翅膀精炼材料个数列表
 Def_IudetDogzEquipPlus = 31  # 神兽装备强化信息列表 [强化等级, 累计总熟练度]
 Def_IudetItemDecompound = 33  # 拆解返还物品列表 [装备ID,材料1ID,个数,是否绑定,材料2ID,个数,是否绑定,...]
 Def_IudetLiantaiItemID = 35  # 合成该莲台的所有莲台ID [itemID, itemID, ...]
 Def_IudetAddSkillID = 37  # 可添加的技能ID列表  [skillID, skillID, ...]
-Def_IudetLegendAttrIDShen = 51  # 物品传奇属性ID列表 - 神
-Def_IudetLegendAttrValueShen = 61  # 物品传奇属性值列表 - 神
-Def_IudetLegendAttrIDXian = 53  # 物品传奇属性ID列表 - 仙
-Def_IudetLegendAttrValueXian = 63  # 物品传奇属性值列表 - 仙
-Def_IudetLegendAttrIDJi = 55  # 物品传奇属性ID列表 - 极
-Def_IudetLegendAttrValueJi = 65  # 物品传奇属性值列表 - 极
 Def_IudetHeroTalentID = 71  # 英雄天赋ID列表
 Def_IudetHeroTalentIDLV = 73  # 英雄天赋ID等级列表
 Def_IudetHeroTalentWashLock = 75  # 英雄天赋洗炼锁定索引列表
 Def_IudetHeroTalentWashID = 77  # 英雄天赋洗炼随机ID列表
 Def_IudetHeroTalentIDAwakeRand = 79  # 英雄觉醒时随机天赋选项ID列表
 Def_IudetHeroLineup = 81 # 所在阵容信息列表 [阵容类型*10000+阵型类型*100+位置编号, ...]
+Def_IudetHeroEffPresetID = 83 # 卡牌有生效的预设ID [预设ID, ...]
 
 Def_IudetItemColor = 16  # 物品颜色,如果该值没有就取物品
 #Def_IudetItemCount = 18  # 物品个数,支持20亿,目前仅特殊转化物品会用到
@@ -1232,7 +1210,6 @@
 Def_IudetLastOpenItemLoginDay = 36  # 上一次开启物品时的登录天数
 Def_IudetRuneLV = 38  # 符印等级
 Def_IudetRuneSource = 40  # 符印来源 老号0,默认1,合成2(主要用来区分是否合成获得)
-Def_IudetWingProgressValue = 42 #羽翼精炼值
 Def_IudetCreateTime = 44 # 时效物品的创建时间
 Def_IudetGatherSoulLV = 46  # 聚魂等级
 Def_IudetExpireTime = 48 # 时效物品指定有效时间,时间单位由时效类型决定
@@ -1242,6 +1219,7 @@
 Def_IudetHeroBreakLV = 74 # 英雄突破等级
 Def_IudetHeroAwakeLV = 76 # 英雄觉醒等级
 Def_IudetHeroSkin = 78 # 英雄使用的皮肤索引
+Def_IudetHeroCardEffective = 80 # 卡牌在主线预设中生效标识,每个武将在某一阵容预设中仅有一张卡牌生效,废弃,使用 Def_IudetHeroEffPresetID 代替
 
 # 200~300 宠物数据用
 Def_IudetPet_NPCID = 200  # npcID
@@ -1252,19 +1230,28 @@
 Def_IudetPet_Star = 210  # 星级
 Def_IudetPet_Skill = 201  # 技能列表
 
-Def_IudetHorsePetSkinIndex = 210  # 骑宠觉醒外观索引
-
 # 以下为自定义的设置物品属性key
 Def_CItemKey_AppointID = "AppointID"
 # ----------------------------------------------------
 
 LineupObjMax = 6 # 阵容最大上阵武将数
 
-# 阵容定义
-LineupList = (
-Lineup_Main, # 主阵容 1
-Lineup_Arena, # 竞技场进攻阵容 2
-Lineup_ArenaDef, # 竞技场防守阵容 3
+# 战斗功能预设定义
+BatPresetList = (
+BatPreset_Main, # 主线战斗 1
+BatPreset_ArenaDef, # 演武场防守 2
+) = range(1, 1 + 2)
+
+# 需要缓存的战斗功能预设,一般只要主线+防守功能预设,主动攻击的PVE功能可以不用,如某个副本的主动攻击预设
+NeedCacheBatPresetList = [BatPreset_Main, BatPreset_ArenaDef]
+
+BatPresetName = {BatPreset_Main:"主线", BatPreset_ArenaDef:"演武场防守"}
+
+# 功能预设定义
+FuncPresetList = (
+FuncPreset_Battle,  # 全局战斗预设 1
+FuncPreset_Hero,    # 武将预设 2
+FuncPreset_Mingge,  # 命格预设 3
 ) = range(1, 1 + 3)
 
 # 宠物物品数据状态
@@ -1338,70 +1325,37 @@
 ) = range(Def_MFPType_Max)
 
 #事件汇报用户行为-----------------------------------------------------------
-Def_UserAction_Conn = 3001  # 用户连接
 Def_UserAction_CreateRole = 1000  # 创角
 Def_UserAction_LostModel = 9001  # 流失模型 如登录流失(前端-后端)
-Def_UserAction_ChangeMap = 3003  # 切地图
-Def_UserAction_RoleInit = 3005  # 玩家登陆收到初始化信息
-Def_UserAction_VIPLvUP = 1402   # VIP等级提升
-Def_UserAction_CoinSuccess = 3007 # 充值成功记录, 金额统计
-Def_UserAction_UseGold = 3008 # 钻石纯消耗记录(不包含钻石转移,如交易所等),但计算交易所手续费
-Def_UserAction_ClientNetStatus = 3009 # 客户端网络状况
-Def_UserAction_CoinAccCnt = 3010 # 充值账号数统计
-Def_UserAction_KeepOnline = 1300 # 全服玩家在线统计,整5分钟发送总数
-Def_UserAction_CustomConcurrency = "DwzCw4q8cWTB_custom-concurrency" # 整5分钟分服区自定义在线玩家人数
 Def_UserAction_Login = 1100  # 玩家登陆成功
 Def_UserAction_Session = 1101  # 会话记录, 统计离线
-Def_UserAction_VirtualCost = "DwzCw4q8cWTB_virtual-cost"  # 虚拟币消费(钻石)
-Def_UserAction_VirtualReward = "DwzCw4q8cWTB_virtual-reward"  # 虚拟币赠送(钻石)
-Def_UserAction_VirtualResource = 1201  # 改成所有的货币产出和消费
-# 项目定义类型范围5000~5999
-Def_UserAction_CustomEvents = "DwzCw4q8cWTB_custom-events" # 自定义事件
-Def_UserAction_LVUP = 1401 # 玩家升级
-Def_UserAction_ChatLog = "DwzCw4q8cWTB_chat-log" # 聊天监控
-Def_UserAction_FightPower = 1403 # 玩家战斗力
-Def_UserAction_MissionLog = 1400 # 任务记录
-Def_UserAction_MissionOver = 5002 # 任务完成
-Def_UserAction_MissionAround = 5003 # 环任务参与
-Def_UserAction_ToCreateRole = 5004 # 进入创角
-Def_UserAction_IsAdult = 5005 # 是否成年
-Def_UserAction_OnlineTime = 5006 # 玩家在线时长统计
-Def_UserAction_FirstLogin = 5007 # 第一次进入地图
-Def_UserAction_GameMakeGold = 5009 # 游戏中产出的钻石
-Def_UserAction_GameMakeGoldPaper = 5010 # 游戏中产出的绑钻
-Def_UserAction_UseGoldPaper = 5011 # 绑钻消费
-Def_UserAction_TradeGold = 5012 # 交易钻石量
-Def_UserAction_TradeItem = 5013 # 物品交易记录
-Def_UserAction_ItemChange = 5014 # 物品使用,改变等记录,排除非贵重信息记录
-Def_UserAction_UseNewGuyCard = 5015 # 使用新手卡, 暂写死在代码中
-
-Def_UserAction_ExMissionLog = "DwzCw4q8cWTB_ex-mission-log" # 扩展任务记录
-Def_UserAction_HorseClass = "DwzCw4q8cWTB_ex-horse-class" # 坐骑进阶记录
-Def_UserAction_WingClass = "DwzCw4q8cWTB_ex-wing-class" # 翅膀进阶记录
-Def_UserAction_PetLV = "DwzCw4q8cWTB_ex-pet-lv" # 宠物升级记录
-Def_UserAction_PetClass = "DwzCw4q8cWTB_ex-pet-class" # 宠物进阶记录
-Def_UserAction_GiveMoney = "DwzCw4q8cWTB_ex-give-money" # 货币产出记录
-Def_UserAction_PayMoney = "DwzCw4q8cWTB_ex-pay-money" # 货币消耗记录
-Def_UserAction_EquipItem = "DwzCw4q8cWTB_ex-equip-item" # 玩家装备统计
-Def_UserAction_ItemRecord = 1404 # 物品流水记录
-Def_UserAction_CoinToGold = "DwzCw4q8cWTB_ex-coin-to-gold" # 兑换点券
-Def_UserAction_RuneLV = "DwzCw4q8cWTB_ex-wing-soul-lv" # 符印升级记录
-Def_UserAction_ChangeName = "DwzCw4q8cWTB_ex-change-name" # 改名记录
-Def_UserAction_AddZhenqi = "DwzCw4q8cWTB_ex-add-zhenqi" # 增加真气记录
-Def_UserAction_LostZhenqi = "DwzCw4q8cWTB_ex-lost-zhenqi" # 扣除真气记录
-Def_UserAction_CoatLV = "DwzCw4q8cWTB_ex-coat-lv" # 时装升级记录
-Def_UserAction_WingSkinLV = "DwzCw4q8cWTB_ex-wingskin-lv" # 幻化翅膀升级记录
-Def_UserAction_HorseSkinLV = "DwzCw4q8cWTB_ex-horseskin-lv" # 幻化坐骑升级记录
-
-
-Def_UserAction_Money_Use = 0    # 货币消费
-Def_UserAction_Money_Get = 1    # 货币产出
 #------------------------------------------------------------------------
 
 # 成就类型定义
 SuccessTypeList = (
 SuccType_MainLevel, # 通过主线关卡xxx 1
-) = range(1, 1 + 1)
+SuccType_OSAMainLevel, # 开服庆典 - 通过主线关卡xxx 2
+SuccType_OSACutTree, # 消耗X个战锤  3
+SuccType_OSARealmLV, # 官职达到X级 4
+SuccType_OSATreeLV, # 仙树达到X级 5
+SuccType_OSAEquipColor, # 穿戴x件x品质及以上装备 6
+SuccType_OSAHorseLVUP, # 坐骑升级x次 7
+SuccType_OSAHeroLVUP, # 武将升级X次 8
+SuccType_OSAHeroStarUP, # 武将升星x次 9
+SuccType_OSAHeroCall, # 武将招募x次 10
+SuccType_OSAHeroBook, # 武将图鉴激活x个  11
+SuccType_OSAArenaBattle, # 演武场战斗x次 12
+SuccType_OSAFBZhanchui, # 白骨盈野击败xx 13
+SuccType_OSAFBTianzi, # 挑战天子的考验x次 14
+SuccType_OSAGoldRush, # 淘金采集x次 15
+SuccType_OSAGoldRushWorkers, # 拥有x名监工 16
+SuccType_OSAKillNPC, # 击败X只怪物 17
+SuccType_OSAEquipDecompose, # 分解装备x次 18
+SuccType_OSAGetMoney, # 累计获得xx货币 19
+) = range(1, 1 + 19)
+
+# 开服庆典成就类型
+OSASuccTypeList = range(SuccType_OSAMainLevel, SuccType_OSAGetMoney + 1)
 
 # 不向下适配检查的成就类型(指相对较高成就条件不会增加较低成就条件的进度)
 UnDownCheckSuccessTypeList = []

--
Gitblit v1.8.0