From 5a99b49c44e6549d1c6376b826ebf8b67af7daf4 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期四, 24 一月 2019 12:00:30 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagItemCompound.txt | 10 +++++----- db/PyMongoDataServer/PySysDB/tagDailyQuest.txt | 2 +- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 db/PyMongoDataServer/SysDB/tagChinItem.txt | 1 + ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc | 0 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index 3392644..66668af 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc index 5e08d8e..0bafa20 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc index c221289..719b65a 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt index 822ea09..1b69be8 100644 --- a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt +++ b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt @@ -28,5 +28,5 @@ 29 1 20 151 1 20 20 30 2 31340 156 1 20 40 31 1 21 157 1 5 50 -32 1 22 163 1 10 0 +32 1 22 163 1 20 0 33 1 23 164 1 10 0 diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt index 98598c4..5dde85c 100644 --- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt +++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt @@ -235,11 +235,11 @@ 269 0 8238 0 8211|8224|8237|8250|8263 3 0 0 0 10000 0 0 0 XianComposeSucces6 1 270 0 8251 0 8211|8224|8237|8250|8263 3 0 0 0 10000 0 0 0 XianComposeSucces6 1 271 0 8264 0 8211|8224|8237|8250|8263 3 0 0 0 10000 0 0 0 XianComposeSucces6 1 -272 0 8213 0 8212|8225|8238|8251|8264 3 5408 1 0 10000 0 0 0 EquipComposeSuccess8 1 -273 0 8226 0 8212|8225|8238|8251|8264 3 5408 1 0 10000 0 0 0 EquipComposeSuccess8 1 -274 0 8239 0 8212|8225|8238|8251|8264 3 5408 1 0 10000 0 0 0 EquipComposeSuccess8 1 -275 0 8252 0 8212|8225|8238|8251|8264 3 5408 1 0 10000 0 0 0 EquipComposeSuccess8 1 -276 0 8265 0 8212|8225|8238|8251|8264 3 5408 1 0 10000 0 0 0 EquipComposeSuccess8 1 +272 0 8213 0 8212|8225|8238|8251|8264 3 5417 1 0 10000 0 0 0 EquipComposeSuccess8 1 +273 0 8226 0 8212|8225|8238|8251|8264 3 5417 1 0 10000 0 0 0 EquipComposeSuccess8 1 +274 0 8239 0 8212|8225|8238|8251|8264 3 5417 1 0 10000 0 0 0 EquipComposeSuccess8 1 +275 0 8252 0 8212|8225|8238|8251|8264 3 5417 1 0 10000 0 0 0 EquipComposeSuccess8 1 +276 0 8265 0 8212|8225|8238|8251|8264 3 5417 1 0 10000 0 0 0 EquipComposeSuccess8 1 277 0 8410 0 8411|8412|8414|8415 2 5413 30 0 10000 0 0 0 EquipComposeSuccess9 1 278 0 8413 0 8411|8412|8414|8415 2 5413 30 0 10000 0 0 0 EquipComposeSuccess9 1 279 0 8416 0 8411|8412|8414|8415 2 5413 500 0 10000 0 0 0 EquipComposeSuccess9 1 diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index bb9e7f0..3d5d7a6 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -1153,6 +1153,7 @@ 5414 1 0 雷尘 138 0 1 0 0 999 1 1 0 0 1 0 0 0 0 0 1 2 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5415 1 0 高阶原石 138 0 1 0 0 999 1 1 0 0 1 0 0 0 0 0 1 250 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5416 1 0 高阶雷尘 138 0 1 0 0 999 1 1 0 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +5417 1 0 厉兽魂石 139 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1000 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5700 1 0 熊猫公仔时装碎片 82 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5701 1 0 魔幻大师时装碎片 82 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 0 0 0 0 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5702 1 0 夏日狂欢时装碎片 82 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 0 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- Gitblit v1.8.0