From b44a92f4bca3d5e21e71ae7e6cd47224d5fa79d9 Mon Sep 17 00:00:00 2001
From: gwj <123123@qq.com>
Date: 星期四, 24 九月 2026 10:47:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChServerToServerPyPack.pyc | 0
ServersRoute/main.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/SysDB/tagChinItem.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyCrossServerPack.ini | 6 +++++-
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/CrossMgr.pyc | 0
6 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ServersRoute/main.pyc b/ServersRoute/main.pyc
index da8bac5..8de9d55 100644
--- a/ServersRoute/main.pyc
+++ b/ServersRoute/main.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyCrossServerPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyCrossServerPack.ini
index 18991c9..4f4e1c3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyCrossServerPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyCrossServerPack.ini
@@ -7,7 +7,7 @@
Writer = hxp
Releaser = hxp
RegType = 0
-RegisterPackCount = 3
+RegisterPackCount = 4
PacketCMD_1=0xC2
PacketSubCMD_1=0x01
@@ -21,6 +21,10 @@
PacketSubCMD_3=0x03
PacketCallFunc_3=OnCrossCenterEvent
+PacketCMD_4=0xC2
+PacketSubCMD_4=0x05
+PacketCallFunc_4=OnServerConnSucc
+
[CrossMsg]
ScriptName = CrossMsg.py
Writer = hxp
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChServerToServerPyPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChServerToServerPyPack.pyc
index be285de..948bfd8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChServerToServerPyPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChServerToServerPyPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/CrossMgr.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/CrossMgr.pyc
index 927b1f7..7503a66 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/CrossMgr.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/CrossMgr.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
index e5046e4..977ca00 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
@@ -456,7 +456,7 @@
BeautyLVUP [200,201,202] [1,3,10] 10 20
TravelSet 60 10 6|5 32 1
TravelRate [1,8] 2000 [[60,1],[30,4],[10,6]]
-DailyTehui [220,221,222] 223 {"test":"36","sghy":"5.99"}
+DailyTehui [220,221,222] 223 {"xssg":"36","xssgdy":"36","xssgyh":"36","test":"36","sghy":"5.99"}
Dingjunge 2 [6,7,8,9,12,13,14,15,16,17,18,19,21,22,23,24,25,26,27,28,29,30,31,32,35,36,37,38,39,40,41,42,43,44,45,46,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80] [10,10,156] [10,10,156] 3
DingjungeEff [0,0,0,1010,2010,2510,3010,3510] 10 3 5
MinggeCfg [6,11,21] 30 31
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/SysDB/tagChinItem.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/SysDB/tagChinItem.txt
index f56b28c..07f58bd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/SysDB/tagChinItem.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/SysDB/tagChinItem.txt
@@ -47,7 +47,7 @@
47 1 0 转位仪 15 0 0 0 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 277 1 20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
48 1 0 升阶神锤 15 0 0 0 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 277 1 20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49 1 0 甘露灵液 15 0 0 0 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 277 1 20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-50 1 0 召魂令 15 0 0 0 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+50 1 0 唤魂令 15 0 0 0 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
51 1 0 天地残魂 15 0 0 0 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
100 1 0 战锤 15 0 0 0 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
101 1 0 将星玉髓 15 0 0 0 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0