From f0f443ec1d94980c282c6c8a2b6c8b0e693de979 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 03 十二月 2025 19:57:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index fa5c6c0..ba7e5e4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -1037,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"        # 玩家上下线状态同步
@@ -1236,7 +1253,7 @@
 # 阵容定义
 LineupList = (
 Lineup_Main, # 主阵容 1
-Lineup_Arena, # 竞技场进攻阵容 2
+Lineup_ArenaAtk, # 竞技场进攻阵容 2
 Lineup_ArenaDef, # 竞技场防守阵容 3
 ) = range(1, 1 + 3)
 

--
Gitblit v1.8.0