From 532f2c72e9d7d0765056d1e17f7c91a5378917fe Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期四, 08 十一月 2018 15:41:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index e5ed0e7..b774f8f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index e0a1339..13d78cb 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -233,7 +233,7 @@
MunekadoTrialStarTime {0:[[20],[40],[40,80,60,60]],1:[[20],[35],[30],[40,80,60,60]],2:[[20],[35],[30],[60,60,60,60]],3:[[25],[40],[80,80,80,80]],4:[[50],[50],[120,30,30,30]],5:[[50],[50],[120,30,30,30]]}
MunekadoLockLimit 5
ChaosDemonCfg [[(31801001,10)],[(31801004,10)],[(31803001,1)]] [101,102,103,104,105]
-ChaosDemonReward {103:1,102:3,101:5} 5_100|4_90|3_80|2_70|1_60 0*reExp {5:[(2406,10,1),(1141,1,1)],4:[(2407,8,1),(1140,1,1)],3:[(2408,6,1),(1139,1,1)],2:[(2409,4,1),(1138,1,1)],1:[(2410,2,1),(1137,1,1)]}
+ChaosDemonReward {103:1,102:3,101:5} 5_100|4_90|3_80|2_70|1_60 0*reExp {5:[(2406,1,1),(1141,1,1)],4:[(2407,1,1),(1140,1,1)],3:[(2408,1,1),(1139,1,1)],2:[(2409,1,1),(1138,1,1)],1:[(2410,2,1),(1137,1,1)]}
ElderBattlefieldCfg {31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200} 300 20 [200,600,1200,2000,3200,4800]
ElderBattlefieldPoint 500 500
ElderBattlefieldSys ['AncientBattlefield_2','AncientBattlefield_3','AncientBattlefield_4','AncientBattlefield_5','AncientBattlefield_6'] 20 10
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 609630f..5cd7ddf 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -267,7 +267,7 @@
1126 1 0 5000仙玉充值卡 80 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 5000 0 50 0 1 0 0 228 500 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1127 1 0 铜钱祈愿符 15 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 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
1128 1 0 疲劳丹 15 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 230 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 3 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0
-1129 1 0 高级疲劳丹 15 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 230 0 2 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 1 0 0 0 0 0 0 0 0
+1129 1 0 Boss疲劳丹 15 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 230 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 3 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0
1130 1 0 装备碎片 29 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 5 0 10 0 1 0 0 0 50 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
1131 3 0 3阶中级兑换令 29 0 0 0 0 999 1 1 0 0 1 0 0 0 0 0 1 10 0 50 0 1 0 0 0 25 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
1132 4 0 4阶高级兑换令 29 0 0 0 0 999 1 1 0 0 1 0 0 0 0 0 1 10 0 50 0 1 0 0 0 25 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