From f56f0be78d6f9ceff512f7274d51e900c64ee25d Mon Sep 17 00:00:00 2001 From: cehua_LC <tingame100@163.com> Date: 星期四, 15 十一月 2018 14:59:14 +0800 Subject: [PATCH] Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2 --- CoreServerGroup/GameServer/Script/PyGameData.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBourseTube.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerBourse.pyc | 0 db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 +- 4 files changed, 1 insertions(+), 1 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerBourse.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerBourse.pyc index 7cbe32a..c0e2222 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerBourse.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerBourse.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/PyGameData.pyc b/CoreServerGroup/GameServer/Script/PyGameData.pyc index 0a8765b..2d5dae8 100644 --- a/CoreServerGroup/GameServer/Script/PyGameData.pyc +++ b/CoreServerGroup/GameServer/Script/PyGameData.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBourseTube.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBourseTube.pyc index 8fb64c2..305ad36 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBourseTube.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBourseTube.pyc Binary files differ diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index 3ab5f04..894fa1d 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -147,7 +147,7 @@ 852 1 0 388绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 202 388 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 853 1 0 580绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 202 580 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 854 1 0 600绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 202 600 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 -880 1 0 50修行点 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 238 100 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 +880 1 0 50修行点 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 238 50 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 881 1 0 100修行点 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 238 100 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 901 1 0 气血散（小） 9 0 1 0 0 300 1 1 1 0 1 0 0 0 1 10000 1 1 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 6000 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 902 25 0 气血散（中） 9 0 1 0 0 300 25 1 1 0 1 0 0 0 1 10000 1 1 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 6001 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 -- Gitblit v1.8.0