From b4e5674c17c4271f270005b65e7e8f6cacb26060 Mon Sep 17 00:00:00 2001 From: cehua_LC <tingame100@163.com> Date: 星期一, 20 八月 2018 14:34:25 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0 db/PyMongoDataServer/PySysDB/tagStore.txt | 7 ++----- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc | 0 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc index a1c7602..f2901c9 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc index e3ae538..eb63251 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt index 518e542..c9abe57 100644 --- a/db/PyMongoDataServer/PySysDB/tagStore.txt +++ b/db/PyMongoDataServer/PySysDB/tagStore.txt @@ -5,7 +5,7 @@ 5 1 0 2213 1 1 [] 0 7 0|1|2|3|4|5|6|7|8|9|10 0 10|15|20|25|30|35|40|50|60|70|80 1 15 0 0 6 1 0 3504 1 1 [] 0 7 2 0 2 1 135 0 0 7 1 0 3514 1 1 [] 0 7 2 0 2 1 135 0 0 -8 1 0 2204 1 1 [] 0 7 3 190 6 1 100 0 0 +8 1 0 2204 1 1 [] 0 7 3 160 6 1 100 0 0 9 1 0 2203 1 1 [] 0 7 4|6|8 240 2|3|4 1 60 0 0 10 1 0 4187 1 1 [] 0 7 8 0 1 1 600 0 0 11 1 0 4188 1 1 [] 0 7 8 0 1 1 600 0 0 @@ -27,10 +27,8 @@ 65 2 0 982 1 0 [] 0 0 0 500 0 1 248 0 0 66 2 0 983 1 0 [] 0 0 0 500 0 1 98 0 0 101 3 0 181 1 0 [] 0 0 0 0 0 1 10 0 0 -102 3 0 966 1 0 [] 0 0 0 0 0 1 88 0 0 103 3 0 3501 1 0 [] 0 0 0 0 0 1 10 0 0 104 3 0 3511 1 0 [] 0 0 0 0 0 1 10 0 0 -105 3 0 967 1 0 [] 0 0 0 300 0 1 128 0 0 108 3 0 4205 1 1 [] 0 0 0 0 1 1 988 0 0 109 3 0 256 1 1 [] 0 0 0 0 1 1 988 0 0 110 3 0 4207 1 1 [] 0 0 0 150 1 1 3888 0 0 @@ -48,8 +46,6 @@ 163 4 0 4001 1 1 [] 0 0 0 0 0 2 30 0 0 164 4 0 4007 1 1 [] 0 0 0 200 0 2 80 0 0 165 4 0 4004 1 1 [] 0 0 0 250 0 2 20 0 0 -166 4 0 966 1 1 [] 0 0 0 0 0 2 88 0 0 -167 4 0 967 1 1 [] 0 0 0 300 0 2 128 0 0 201 5 0 12 1 1 [] 0 4 0 0 1 16 120 0 0 203 5 0 954 1 1 [] 0 4 0 0 20 16 5 0 0 204 5 0 181 1 1 [] 0 4 0 0 6 16 100 0 0 @@ -106,6 +102,7 @@ 561 13 0 4606 1 0 [] 0 0 0 0 0 25 5000 0 0 ShopBuyBroadcast_2 562 13 0 4608 1 0 [] 0 0 0 0 0 25 5000 0 0 ShopBuyBroadcast_2 563 13 0 912 1 0 [] 0 0 0 0 0 25 100 0 0 ShopBuyBroadcast_2 +651 14 0 58 1 1 [[194,1,1],[5,1,1],[912,1,1]] 58 0 0 0 1 1 188 0 0 ShopBuyBroadcast_1 652 14 0 4208 1 1 [[4151,60,1],[5,1,1],[913,1,1]] 4208 0 0 0 1 1 388 0 0 ShopBuyBroadcast_1 653 14 0 255 1 1 [[196,1,1],[181,140,1],[913,1,1]] 255 0 0 0 1 1 1088 0 0 ShopBuyBroadcast_1 701 15 0 4151 40 1 [] 0 0 0 106 1 1 88 400 1 OpenTakePreferential1 -- Gitblit v1.8.0