From 8b5b1e8c7d3ffb2acfb1b8bb64ae9dc2a0a93737 Mon Sep 17 00:00:00 2001 From: CeHua_ZWJ <ceh@163.com> Date: 星期一, 17 九月 2018 15:53:52 +0800 Subject: [PATCH] Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15 --- CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc | 0 db/PyMongoDataServer/PySysDB/tagSuccess.txt | 2 +- 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc index 89c2ccf..3654398 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt index 924348e..0a9f598 100644 --- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt +++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt @@ -37,7 +37,7 @@ 244 42 1 202 0 3_50000 0 0 106 10 246 50 2 0 0 3_50000 0 0 106 10 247 54 1 1|1|1 0 3_50000 0 0 106 10 -248 39 1 3|4 0 3_50000 0 0 106 10 +248 82 1 3|1|3 0 3_50000 0 0 106 10 249 36 1 60203006 0 3_50000 0 0 106 10 301 46 2 0 0 3_100000 0 0 107 10 302 7 4 0 0 3_100000 0 0 107 10 -- Gitblit v1.8.0