From 1ea73e1885835466265ce788d93556b7030ee0e8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 30 十二月 2018 18:42:00 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(GM工具增加子服服务器维护,文字翻译版)

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index cfd7eb2..ab8a4c2 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -167,6 +167,9 @@
 
 Def_Notify_WorldKey_FamilyPartyInfo = "FamilyPartyInfo"  # 仙盟宴会数据
 
+Def_Notify_WorldKey_CrossServerConnState = "CrossServerConnState"  # 跨服服务器链接状态
+Def_Notify_WorldKey_CrossServerOpen = "CrossServerOpen"  # 跨服服务器是否开启中
+
 Def_Notify_WorldKey_CrossPKZoneID = "CrossPKZoneID"  # 本服跨服PK所属赛区
 Def_Notify_WorldKey_CrossPKSeasonID = "CrossPKSeasonID"  # 本服跨服PK当前赛季
 Def_Notify_WorldKey_CrossPKSeasonState = "CrossPKSeasonState"  # 本服跨服PK赛季状态 0-关闭,1-开启中
@@ -779,7 +782,8 @@
 CDBPlayerRefresh_SoulDust,              # 魂尘 196
 CDBPlayerRefresh_SoulSplinters,         # 聚魂碎片 197
 CDBPlayerRefresh_SoulCore,              # 核心环 198
-) = range(146, 199)
+CDBPlayerRefresh_Honor,                 # 荣誉 199
+) = range(146, 200)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来)
@@ -789,6 +793,7 @@
 TYPE_Price_FamilyActivity = 15    # 仙盟活跃令
 TYPE_Price_FBHelpPoint = 16    # 副本助战积分, 废弃
 TYPE_Price_XianyuanCoin = 17    # 仙缘币
+TYPE_Price_Honor = 18    # 荣誉
 TYPE_Price_Rune = 23    # 符印精华点
 TYPE_Price_RuneSplinters = 24    # 符印碎片
 TYPE_Price_TreasureScore = 25    # 寻宝积分
@@ -804,7 +809,6 @@
 TYPE_Price_HighLadder_Currency = 102     # 天梯竞技场积分
 TYPE_Price_HighLadder_Signet = 103    # 物品兑换(圣光晶石)
 TYPE_Price_GongXun = 105    # 功勋点
-TYPE_Price_Honor = 108    # 荣誉商店积分
 TYPE_Price_ArrestPoint = 110    # 悬赏积分
 
 # 物品兑换
@@ -827,6 +831,7 @@
                            TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,
                            TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,
                            TYPE_Price_SoulCore:CDBPlayerRefresh_SoulCore,
+                           TYPE_Price_Honor:CDBPlayerRefresh_Honor,
                            }
 
 # 高效战斗状态
@@ -1180,6 +1185,7 @@
 ] = range(3)
 
 # 跨服服务器发送子服信息定义
+CrossServerMsg_CrossServerState = "CrossServerState"    # 跨服服务器状态变更
 CrossServerMsg_ExitCrossServer = "ExitCrossServer"      # 退出跨服服务器
 CrossServerMsg_Notify = "Notify"                        # 提示信息
 CrossServerMsg_ViewPlayerCacheRet = "ViewPlayerCacheRet"# 查看跨服玩家信息结果
@@ -1726,9 +1732,10 @@
     EntFBAskRet_InFB,           # 11 副本中
     EntFBAskRet_TJG,            # 12 脱机挂中
     EntFBAskRet_Sit,            # 13 打坐中
+    EntFBAskRet_CrossPKMatching,# 14 跨服匹配中
     EntFBAskRet_Other,          # xx 其他限制
     EntFBAskRet_Max,
-) = range(16)
+) = range(17)
 
 
 #增加仙盟活跃的活动类型

--
Gitblit v1.8.0