From 4695b48d72d1fd0a88bc99cf49d715c37a5148bf Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期四, 06 十二月 2018 10:56:42 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagItemCompound.txt | 2 ++ ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.pyc | 0 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.pyc index a813e48..c48f944 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt index 47111ba..1d7efb4 100644 --- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt +++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt @@ -237,8 +237,10 @@ 236 0 250 0 0 0 224 5 0 10000 0 0 0 EquipComposeSuccess3 2 237 0 260 0 0 0 222 10 0 10000 0 0 0 EquipComposeSuccess3 2 238 0 258 0 0 0 223 30 0 10000 0 0 0 EquipComposeSuccess3 2 +247 0 253 0 0 0 225 4 0 10000 0 0 0 EquipComposeSuccess3 2 239 0 4202 0 0 0 4253 3 0 10000 0 0 0 EquipComposeSuccess3 2 240 0 4213 0 0 0 4252 5 0 10000 0 0 0 EquipComposeSuccess3 2 241 0 4209 0 0 0 4250 10 0 10000 0 0 0 EquipComposeSuccess3 2 242 0 4210 0 0 0 4251 30 0 10000 0 0 0 EquipComposeSuccess3 2 +248 0 4206 0 0 0 4254 4 0 10000 0 0 0 EquipComposeSuccess3 2 243 0 4007 0 0 0 4011 10 5000 10000 0 0 0 0 1 -- Gitblit v1.8.0