From f3eee5165d2ec3eaabc3e979dc1c087a1bf1c1a5 Mon Sep 17 00:00:00 2001 From: tlk <werasdrsd@qq,com> Date: 星期四, 08 一月 2026 11:06:26 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server --- /dev/null | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Zhanling.txt | 20 ++++++++++---------- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Zhanling.txt | 20 ++++++++++---------- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_GiveMoney.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc | 0 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index 46c0c60..49a032b 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc index 76dc430..af97655 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc index 529db66..204de33 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc index 30033e4..19a3ea0 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_GiveMoney.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_GiveMoney.pyc index bf016f8..d56710a 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_GiveMoney.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_GiveMoney.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_WeekPartyPoint.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_WeekPartyPoint.pyc deleted file mode 100644 index d241546..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_WeekPartyPoint.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc index 7787bdd..4c67745 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc index 74daab1..395d3db 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc index a30d694..b34c2de 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Zhanling.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Zhanling.txt index 8f928a5..b485251 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Zhanling.txt +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Zhanling.txt @@ -37,16 +37,16 @@ 3 1310 10 [[5,1]] [[5,20]] [] 3 1410 11 [[5,1]] [[5,20]] [] 3 1510 12 [[5,1]] [[1000,1],[5,20]] [] -4 1 0 [[20,1]] [[20,30],[21,50]] [] -4 3 1 [[20,1]] [[20,30],[21,50]] [] -4 5 2 [[20,1]] [[1006,50],[21,50]] [] -4 10 3 [[20,1]] [[20,30],[21,50]] [] -4 15 4 [[20,1]] [[20,30],[21,50]] [] -4 20 5 [[20,1]] [[1006,50],[21,50]] [] -4 25 6 [[20,1]] [[20,30],[21,50]] [] -4 30 7 [[20,1]] [[20,30],[21,50]] [] -4 35 8 [[20,1]] [[20,30],[21,50]] [] -4 40 9 [[20,1]] [[1006,50],[21,50]] [] +4 1 0 [[20,1]] [[20,30],[21,500]] [] +4 3 1 [[20,1]] [[20,30],[21,500]] [] +4 5 2 [[20,1]] [[1006,50],[21,500]] [] +4 10 3 [[20,1]] [[20,30],[21,500]] [] +4 15 4 [[20,1]] [[20,30],[21,500]] [] +4 20 5 [[20,1]] [[1006,50],[21,500]] [] +4 25 6 [[20,1]] [[20,30],[21,500]] [] +4 30 7 [[20,1]] [[20,30],[21,500]] [] +4 35 8 [[20,1]] [[20,30],[21,500]] [] +4 40 9 [[20,1]] [[1006,50],[21,500]] [] 5 10 0 [[6,3]] [[12,50],[13,10]] [] 5 20 1 [[12,10]] [[8,300]] [] 5 30 2 [[6,3]] [[8,400],[7,50000]] [] diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Zhanling.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Zhanling.txt index 8f928a5..b485251 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Zhanling.txt +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Zhanling.txt @@ -37,16 +37,16 @@ 3 1310 10 [[5,1]] [[5,20]] [] 3 1410 11 [[5,1]] [[5,20]] [] 3 1510 12 [[5,1]] [[1000,1],[5,20]] [] -4 1 0 [[20,1]] [[20,30],[21,50]] [] -4 3 1 [[20,1]] [[20,30],[21,50]] [] -4 5 2 [[20,1]] [[1006,50],[21,50]] [] -4 10 3 [[20,1]] [[20,30],[21,50]] [] -4 15 4 [[20,1]] [[20,30],[21,50]] [] -4 20 5 [[20,1]] [[1006,50],[21,50]] [] -4 25 6 [[20,1]] [[20,30],[21,50]] [] -4 30 7 [[20,1]] [[20,30],[21,50]] [] -4 35 8 [[20,1]] [[20,30],[21,50]] [] -4 40 9 [[20,1]] [[1006,50],[21,50]] [] +4 1 0 [[20,1]] [[20,30],[21,500]] [] +4 3 1 [[20,1]] [[20,30],[21,500]] [] +4 5 2 [[20,1]] [[1006,50],[21,500]] [] +4 10 3 [[20,1]] [[20,30],[21,500]] [] +4 15 4 [[20,1]] [[20,30],[21,500]] [] +4 20 5 [[20,1]] [[1006,50],[21,500]] [] +4 25 6 [[20,1]] [[20,30],[21,500]] [] +4 30 7 [[20,1]] [[20,30],[21,500]] [] +4 35 8 [[20,1]] [[20,30],[21,500]] [] +4 40 9 [[20,1]] [[1006,50],[21,500]] [] 5 10 0 [[6,3]] [[12,50],[13,10]] [] 5 20 1 [[12,10]] [[8,300]] [] 5 30 2 [[6,3]] [[8,400],[7,50000]] [] -- Gitblit v1.8.0