Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

hwj35

4 天以前 c5d0d3740dd8ae1786e45ae539967c822a6998a2

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini

@@ -766,6 +766,22 @@
PacketSubCMD_2=0x31

PacketCallFunc_2=OnZZBFBatBuy



;皇宫

[PlayerPalace]

ScriptName = Player\PlayerPalace.py

Writer = hxp

Releaser = hxp

RegType = 0

RegisterPackCount = 2



PacketCMD_1=0xC0

PacketSubCMD_1=0x37

PacketCallFunc_1=OnViewPalaceEmperor



PacketCMD_2=0xC0

PacketSubCMD_2=0x38

PacketCallFunc_2=OnPalaceBless



;古宝

[PlayerGubao]

ScriptName = Player\PlayerGubao.py


 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DB/DBDataMgr.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DB/DBStruct.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DB/StructData/DBPalace.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Palace.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/test_OnDay.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/test_OnMonth.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/test_OnWeek.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/test_OnYear.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/CrossMgr.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/CrossMsg.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Arena.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BatSpar.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BatTest.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dingjunge.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyAtkDefBat.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Qunying.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZZBF.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldAction.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHJG.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPalace.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/CollectionDefine.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/DataServerPlayerData.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ReadChConfig.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt

@@ -506,3 +506,8 @@
ZZBFBattle    5    {"1":[[1026,5]], "3":[[20,1]], "5":[[20,1]]}            

ZZBFZZ    30    50    [[3020,1]]    [[1,50]]    

SubscribeMsg    7|22                

PalaceLike    3    1|50			
PalaceBless    60    2000			
PalaceWorship    20|3    10|100    10		
PalaceCross    8				
BatSpar    30    60			

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt

@@ -70,3 +70,5 @@
70    20    0    0    0            

71    200    0    0    12            [[1, 20]]

72    20    0    0    0            

73    0    0    0    3			
74    0    0    0    0			

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Palace.txt

New file
@@ -0,0 +1 @@
PalaceID    TitleID    BlessMoneyTotal    BlessMoneyRange


 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/PalaceCross.txt

New file
@@ -0,0 +1,8 @@
AppID    StartDate    ZoneID    CrossServerID    ServerIDList

xssg    2026-1-5    1    10001    [[1,100]]

xssg    2026-1-5    2    10001    [[1001,1100]]

test    2026-1-1    1    10001    [[10, 100]]

test    2026-1-1    2    10001    [[101, 200]]

test    2026-1-1    3    10001    [[201, 300]]

test    2026-1-1    4    20001    [[1001, 2000]]

test    2026-1-1    5    20001    [[9000, 9999]]


 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Store.txt

@@ -18,6 +18,8 @@
17    1    3    200    []    0    0    25    0    1    0    0    0

18    1    3    400    []    0    0    26    0    1    0    0    0

19    1    8    10    []    1    20    0    1    200    0    0    0

20    1    200    1    []    1    100    0    1    20    0    0    0

21    1    50    1    []    1    50    0    1    200    0    0    0

100    2    3    10    []    1    1    0    15    0    0    0    

101    2    3    50    []    1    1    0    15    1000    0    0    

102    2    3    100    []    1    1    0    15    1800    0    1    2

@@ -71,6 +73,7 @@
501    20    2    20000    []    1    5    0    57    250    0    0    0

502    20    200    1    []    1    50    0    57    20    0    0    0

503    20    5    1    []    1    2    0    57    280    0    0    0

504    20    50    1    []    1    2    0    57    200    0    0    0

604    16    301    1    []    0    1    0    58    30    0    0    0

602    16    303    1    []    0    1    0    58    128    0    0    0

603    16    304    1    []    0    1    0    58    128    0    0    0