From 4cdaee035e0bf3d780aae2a93f36e3f3e08c83d7 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期二, 15 一月 2019 19:18:34 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagStore.txt | 1 + ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc | 0 db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 1 + ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0 CoreServerGroup/GameServer/PySysDB/tagStore.txt | 1 + 5 files changed, 3 insertions(+), 0 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt index 94efc15..692b15c 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt @@ -40,6 +40,7 @@ 71 2 0 0 72 2 0 0 73 2 0 0 +74 2 0 0 101 3 0 0 103 3 0 0 104 3 0 0 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc index cf44213..0a80394 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc index 3d58d75..12202bb 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt index 21f582d..2a2ab7e 100644 --- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt +++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt @@ -227,3 +227,4 @@ 2438 101_50|2437_1 2439 8209_1|8222_1|8235_1|8248_1|8261_1 [8209,8222,8235,8248,8261] 2440 2439_1 [2439] +2441 6006_1|6007_1|6008_1 [[6006,6206],[6007,6207],[6008,6208]] diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt index 4d620f5..2a93d75 100644 --- a/db/PyMongoDataServer/PySysDB/tagStore.txt +++ b/db/PyMongoDataServer/PySysDB/tagStore.txt @@ -40,6 +40,7 @@ 71 2 0 5411 1 0 [] 0 0 0 260 0 0 1 100 0 0 72 2 0 4103 1 0 [] 0 0 0 270 0 0 1 280 0 0 73 2 0 4104 1 0 [] 0 0 0 270 0 0 1 180 0 0 +74 2 0 2441 1 0 [] 0 0 0 0 0 0 1 680 0 0 101 3 0 181 1 0 [] 0 0 0 0 0 0 1 10 0 0 103 3 0 3501 1 0 [] 0 0 0 0 0 0 1 10 0 0 104 3 0 3511 1 0 [] 0 0 0 0 0 0 1 10 0 0 -- Gitblit v1.8.0