From fbe51d5b4941b5b8a5c146c97c1f21c5558decbf Mon Sep 17 00:00:00 2001 From: cehua-HWJ35 <hwj35@163.com> Date: 星期二, 15 一月 2019 20:58:51 +0800 Subject: [PATCH] Merge branch '1.4.100' of http://192.168.0.87:10010/r/snxx_server into 1.4.100 --- CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc | 0 db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 40 ++++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc index 41b0b9d..26811af 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt index abb151a..eb83dae 100644 --- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt +++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt @@ -471,23 +471,23 @@ taptap.android.jbch 904100357 18 111 0 taptap.android.ntlc 904100357 30 112 0 taptap.android.jszq 904100357 98 113 0 -yile_mhtj_bjsb_18 yilegame 18 101 0 -yile_mhtj_cz_6 yilegame 6 2 0 -yile_mhtj_cz_30 yilegame 30 103 0 -yile_mhtj_cz_98 yilegame 98 104 0 -yile_mhtj_cz_128 yilegame 128 105 0 -yile_mhtj_cz_198 yilegame 198 106 0 -yile_mhtj_cz_328 yilegame 328 107 0 -yile_mhtj_cz_648 yilegame 648 108 0 -yile_mhtj_cz_1 yilegame 1 110 0 -yile_mhtj_lb_6 yilegame 6 0 2 -yile_mhtj_lb_30 yilegame 30 0 4 -yile_mhtj_lb_68 yilegame 68 0 5 -yile_mhtj_lb_128 yilegame 128 0 7 -yile_mhtj_lb_168 yilegame 168 0 8 -yile_mhtj_lb_18 yilegame 18 0 3 -yile_mhtj_lb_98 yilegame 98 0 6 -yile_mhtj_lb_198 yilegame 198 0 9 -yile_mhtj_jbch_18 yilegame 18 111 0 -yile_mhtj_ntlc_30 yilegame 30 112 0 -yile_mhtj_jszq_98 yilegame 98 113 0 +yile_mhtj_bjsb_18 yileiOS 18 101 0 +yile_mhtj_cz_6 yileiOS 6 2 0 +yile_mhtj_cz_30 yileiOS 30 103 0 +yile_mhtj_cz_98 yileiOS 98 104 0 +yile_mhtj_cz_128 yileiOS 128 105 0 +yile_mhtj_cz_198 yileiOS 198 106 0 +yile_mhtj_cz_328 yileiOS 328 107 0 +yile_mhtj_cz_648 yileiOS 648 108 0 +yile_mhtj_cz_1 yileiOS 1 110 0 +yile_mhtj_lb_6 yileiOS 6 0 2 +yile_mhtj_lb_30 yileiOS 30 0 4 +yile_mhtj_lb_68 yileiOS 68 0 5 +yile_mhtj_lb_128 yileiOS 128 0 7 +yile_mhtj_lb_168 yileiOS 168 0 8 +yile_mhtj_lb_18 yileiOS 18 0 3 +yile_mhtj_lb_98 yileiOS 98 0 6 +yile_mhtj_lb_198 yileiOS 198 0 9 +yile_mhtj_jbch_18 yileiOS 18 111 0 +yile_mhtj_ntlc_30 yileiOS 30 112 0 +yile_mhtj_jszq_98 yileiOS 98 113 0 -- Gitblit v1.8.0