From ba55df302b6cf0218219ced833f22386397d8fa7 Mon Sep 17 00:00:00 2001 From: cehua_ZWJ <123456> Date: 星期一, 28 一月 2019 16:09:05 +0800 Subject: [PATCH] Merge branch '1.5.100' of http://192.168.0.87:10010/r/snxx_server into 1.5.100 --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4517.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.pyc | 0 db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 +- CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc | 0 4 files changed, 1 insertions(+), 1 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc index 86edcdd..df2e697 100644 --- a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc +++ b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.pyc index 5cf0c84..21f0b2f 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4517.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4517.pyc index c0bb8cc..961754f 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4517.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4517.pyc Binary files differ diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index a97d4ba..8f743a1 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -687,7 +687,7 @@ 2428 1 0 远古神兽大宝箱 81 0 0 0 0 999 260 1 1 0 1 0 0 1 0 0 1 150 0 5 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 5 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2429 1 0 精巧神兽小宝箱 81 0 0 0 0 999 260 1 1 0 1 0 0 1 0 0 1 150 0 5 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 3 0 0 0 0 0 0 0 0 0 0 20 0 0 0 0 0 0 0 0 2430 1 0 高级神兽祝福宝箱 81 0 0 0 0 999 260 1 1 0 1 0 0 1 0 0 1 150 0 5 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 5 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 -2431 1 0 灵宠丹超值礼包 81 0 0 0 0 999 260 1 1 0 1 0 0 1 0 0 1 150 0 5 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 +2431 1 0 灵宠丹超值礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 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 2432 1 0 神兽紫装礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1840 0 5 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2433 1 0 幸运草超值礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1840 0 5 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2434 1 0 幸运草礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1840 0 5 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- Gitblit v1.8.0