From c1b5b1b8be8256a8a4fe57246afcee7785da77b6 Mon Sep 17 00:00:00 2001 From: cehua_hzl <648597270@qq.com> Date: 星期二, 04 九月 2018 19:57:38 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagItemCompound.txt | 4 ++-- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc | 0 db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc index 2b28328..d4a1f1f 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/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt index 8bfe2e1..6975772 100644 --- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt +++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt @@ -206,8 +206,8 @@ 205 9017 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5 1 206 9018 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5 1 207 9075 9074 3 0 0 0 10000 0 0 EquipComposeSuccess6 1 -208 9077 9075 3 0 0 0 10000 0 0 EquipComposeSuccess1 1 -209 9078 9077 3 0 0 0 10000 0 0 EquipComposeSuccess2 1 +208 9077 9075 3 5305 10 0 10000 0 0 EquipComposeSuccess1 1 +209 9078 9077 3 5306 20 0 10000 0 0 EquipComposeSuccess2 1 210 3502 0 0 3501 3 0 10000 0 0 0 1 211 3503 0 0 3502 3 0 10000 0 0 0 1 212 3504 0 0 3503 3 0 10000 0 0 0 1 diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index bb75700..213064b 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -809,7 +809,7 @@ 5202 1 0 强化套装石(防具) 34 0 1 0 0 9999 1 1 1 0 1 0 0 0 0 0 1 50 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 5206 1 0 强化套装石(龙牙) 34 0 1 0 0 9999 1 1 1 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5207 1 0 强化套装石(如意) 34 0 1 0 0 9999 1 1 1 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -5301 1 0 套装石碎片 35 0 1 0 0 9999 1 1 1 0 1 0 0 0 0 0 1 5 0 10 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 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +5301 1 0 套装石碎片 35 0 1 0 0 9999 1 1 1 0 1 0 0 0 0 0 1 5 0 10 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 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5302 1 0 七彩套装石 34 0 1 0 0 9999 1 1 1 0 1 0 0 0 0 0 1 2500 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 5303 1 0 洗炼石 36 0 1 0 0 9999 1 1 1 0 1 0 0 0 0 0 1 1 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 5304 1 0 通灵石 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 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 -- Gitblit v1.8.0