From 16df8778d4165fbfced2fc72b19e544740e32062 Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期四, 08 十一月 2018 14:42:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagChests.txt | 5 +++++
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 2 +-
db/PyMongoDataServer/SysDB/tagChinItem.txt | 7 +++++++
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
5 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index 3bac004..7fbc3de 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -31,7 +31,7 @@
78 60 0 0
79 2 0 0
80 36 0 0
-81 28 0 0
+81 22 0 0
82 155 0 0
83 180 0 0
84 110 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index f4dda32..9633c76 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -193,3 +193,8 @@
2403 0 0 0 1 0
2404 0 0 0 1 0
2405 0 0 0 1 0
+2406 0 0 0 1 1
+2407 0 0 0 1 1
+2408 0 0 0 1 1
+2409 0 0 0 1 1
+2410 0 0 0 1 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 6231b25..a3a7de0 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:[(181,10,1),(1141,1,1)],4:[(181,8,1),(1140,1,1)],3:[(181,6,1),(1139,1,1)],2:[(181,4,1),(1138,1,1)],1:[(181,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,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)]}
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/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index 9d21245..ed54d34 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -31,7 +31,7 @@
78 60 0 0 0 0
79 2 0 0 0 0
80 36 0 0 0 0
-81 28 0 0 0 0
+81 22 0 0 0 0
82 155 0 0 0 0
83 180 0 0 0 0
84 110 0 0 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 4a26085..8ea3fd7 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -267,6 +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
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
@@ -531,6 +532,11 @@
2403 1 0 联赛9阶2星宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 568 0 5 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2404 1 0 小幸运草袋 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 518 0 5 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
2405 1 0 大幸运草袋 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 568 0 5 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2406 1 0 S级妖丹宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 368 0 5 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
+2407 1 0 A级妖丹宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 368 0 5 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
+2408 1 0 B级妖丹宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 418 0 5 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
+2409 1 0 C级妖丹宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 468 0 5 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
+2410 1 0 D级妖丹宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 518 0 5 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
3501 1 0 1级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 1 1 3502 6 190 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
3502 1 0 2级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 1 2 3503 6 465 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
3503 1 0 3级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 1 3 3504 6 1160 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
@@ -826,6 +832,7 @@
4619 1 0 火之灵 17 0 1 0 0 999 0 0 0 0 1 0 0 0 0 0 1 10 0 1000 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
4620 1 0 土之灵 17 0 1 0 0 999 0 0 0 0 1 0 0 0 0 0 1 10 0 1000 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
4621 1 0 五行材料 45 0 1 0 0 999 150 1 1 0 1 0 0 0 0 0 1 10 0 1000 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
+4622 1 0 妖丹 45 0 1 0 0 999 150 1 1 0 1 0 0 0 0 0 1 10 0 1000 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
4651 1 0 增灵散(生命) 58 0 1 0 0 999 100 1 1 0 1 0 0 0 0 0 1 10 0 1000 0 1 0 0 6 100 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4652 1 0 增灵散(攻击) 58 0 1 0 0 999 100 1 1 0 1 0 0 0 0 0 1 10 0 1000 0 1 0 0 7 5 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4653 1 0 增灵散(防御) 58 0 1 0 0 999 100 1 1 0 1 0 0 0 0 0 1 5 0 1000 0 1 0 0 8 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0