From 73a9fd2cbc86f55339b3fab2f5f3dafb5ab92616 Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期六, 24 十一月 2018 13:51:40 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt | 8 ++++---- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc | 0 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0 db/PyMongoDataServer/PySysDB/tagFBFunc.txt | 6 +++--- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc index a28ae92..bf78a5d 100644 --- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc +++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc index 7fd9159..90ba154 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc index bffba03..9ecc3b3 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc index 2159bb2..febf14a 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt index f1768c6..2b05443 100644 --- a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt +++ b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt @@ -4,7 +4,7 @@ 31090 0 0 0 0 0 0 0 0 0 0 0 41110 0 0 0 0 0 0 0 0 0 0 0 31080 2 2 0 0 75|60|45|30|21 21 0 0 1 0 0 -31110 0 0 0 0 75|60|45|30|17 0 0 0 1 0 180 +31110 0 0 0 0 75|60|45|30|17 0 0 0 1 0 0 31130 0 0 0 0 75|60|45|30|16 0 0 0 1 0 0 31140 10 2 0 0 0 0 0 0 1 0 0 31150 1 2 0 0 0 0 19 0 1 180 0 @@ -15,8 +15,8 @@ 31220 2 2 0 0 0 0 0 0 0 0 0 31230 1 2 0 0 0 0 0 0 0 0 0 31240 0 2 0 0 0 0 15 0 1 0 0 -51010 2 2 0 0 100|80|70|60|40 29 0 0 1 0 100 -60010 3 2 0 0 75|60|45|30|21 0 0 0 1 0 120 +51010 2 2 0 0 100|80|70|60|40 29 0 0 1 0 0 +60010 3 2 0 0 75|60|45|30|21 0 0 0 1 0 0 31160 1 2 0 0 0 0 0 0 1 0 0 31250 0 0 0 0 0 0 0 0 0 0 0 52010 5 2 0 0 0 25 0 0 1 180 0 diff --git a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt index 08503b9..34de11e 100644 --- a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt +++ b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt @@ -53,28 +53,28 @@ 10080 10801003 320 340 6697 10080 10801004 330 350 8223 10080 10801005 340 360 12124 -10080 10802001 340 360 14548 +10080 10802001 345 365 14548 10080 10803001 0 0 0 10090 10901001 350 370 12510 10090 10901002 360 380 13052 10090 10901003 370 390 14110 10090 10901004 380 400 14873 10090 10901005 390 410 16232 -10090 10902001 390 410 18394 +10090 10902001 395 415 18394 10090 10903001 0 0 0 10100 11001001 400 420 17343 10100 11001002 410 430 18058 10100 11001003 420 440 18932 10100 11001004 430 450 19857 10100 11001005 440 460 21459 -10100 11002001 440 460 24349 +10100 11002001 445 465 24349 10100 11003001 0 0 0 10110 11101001 450 470 22783 10110 11101002 460 480 23635 10110 11101003 470 490 24601 10110 11101004 480 500 25806 10110 11101005 490 510 27697 -10110 11102001 490 510 32059 +10110 11102001 495 515 32059 10110 11103001 0 0 0 21070 20102001 110 130 767 21070 20102002 120 140 867 -- Gitblit v1.8.0