From 3edb49d3133ea21fb0d661ac824cb72c4b1c6030 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 20 十二月 2018 15:14:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map135_Llxg.col | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt | 2
db/PyMongoDataServer/PySysDB/tagResourcesBack.txt | 29 +++---
db/PyMongoDataServer/SysDB/tagEffectRefresh.txt | 3
CoreServerGroup/GameServer/PySysDB/tagFBLine.txt | 2
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 2
db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt | 10 +-
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 1
db/PyMongoDataServer/SysDB/tagChinItem.txt | 2
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 1
db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt | 76 +++++++++---------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 6
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2
db/PyMongoDataServer/PySysDB/tagFBFunc.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.pyc | 0
db/PyMongoDataServer/PySysDB/tagGatherSoulCompound.txt | 60 +++++++++------
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt | 2
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt | 6 +
23 files changed, 122 insertions(+), 90 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 3644705..5dd1311 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -284,6 +284,8 @@
11104016 神机子 350
50109001 幼龙 441
50109002 雏凤 441
+50109003 幼龙 1
+50109004 雏凤 1
50106001 雷霆幼龙 441
50106002 道士鼠 441
50106101 冰原狼妖 441
diff --git a/CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt b/CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt
index 201a59f..d90f5cc 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt
@@ -19,4 +19,4 @@
18 {} 0 {}
19 {} 0 {}
20 {} 0 {}
-21 {"0":[[12,0],[17,0]} 120 {}
+21 {"0":[[12,0],[17,0]]} 120 {}
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
index 19568eb..fc0ec94 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
@@ -95,3 +95,5 @@
31110 1 31110
31210 0 31210
31340 0 31340
+32010 0 32010
+32010 1 32011
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 3234ed0..5e0afe2 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -76,6 +76,6 @@
HelpBattlePoint 1400 {"1":[8, 8], "2":[8, 8]} 1|2
HelpBattleCheckIn 48 3 {3:[60010], 20:[60010], 60:[60010]}
PlayerViewCache 100 [0,4]
-CrossRealmPKMatch 5000 3 60000 [32010,32011] [(20, 20), (30,30)]
+CrossRealmPKMatch 5000 3 60000 [32010,32011] [(10, 7), (40,37)]
CrossRealmPKAward {} {} {"10":[[4010,2,1],[101,1,1],[3502,1,1]],"50":[[4010,2,1],[101,1,1],[3502,1,1]],"300":[[4010,2,1],[101,1,1],[3502,1,1]]}
CrossRealmPKScore 200 [20, 10] cWinCount*5
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index c045c83..c8610fe 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -104,3 +104,4 @@
155 300 0 0
156 300 0 0
157 150 0 0
+158 300 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map135_Llxg.col b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map135_Llxg.col
new file mode 100644
index 0000000..09fa723
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map135_Llxg.col
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
index 29eea88..01432d4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
@@ -28,8 +28,10 @@
Map117_Swrh 31170 守卫人皇 31170 0 0 0 30 1
Map201_Whmj 51010 娲皇遗迹 51010 0 0 0 50 1
Map111_Lqrz 41110 法宝挑战 41110 0 0 0 100 1
-Map601_Zmsl 60010 宗门试炼 60010 0 0 0 50 1
-Map118_Hlyy 31180 混乱妖域 31180 0 0 0 50 1
+Map601_Zmsl 60010 宗门试炼 60010 0 0 0 100 1
+Map118_Hlyy 31180 混乱妖域 31180 0 0 0 100 1
+Map135_Llxg 32010 跨服竞技场1 32010 0 0 0 50 1
+Map135_Llxg 32011 跨服竞技场2 32011 0 0 0 50 1
Map116_Sgzc 31160 上古战场 31160 0 0 0 20 1
Map125_Shfb 31250 守护副本 31250 0 0 0 100 1
Map301_Fmt 52010 封魔坛 52010 0 0 0 20 1
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index daf7906..1fd3cd5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -119,7 +119,7 @@
#BOSS境界压制公式
"PVE_1_3" :"int(SuppressValueRealmRate/10000.0*max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))-dDef*max(1-aIgnoreDefRate/10000.0,0),1))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+(aSuperHit if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)+aNPCHurtAddPer/10000.0*(aMinAtk+aMaxAtk)/2.0,(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))",
- "EVP_1_3" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV*1.3)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
+ "EVP_1_3" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV*1.3)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP)+min(max(suppressLV-50,0)*0.01,0.30)*dMaxHP,aMaxAtk*0.05+rand*aMaxAtk*0.05))",
#抢boss
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
index 45b6021..cf874a6 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
@@ -38,4 +38,6 @@
Map011_Hgdg_10110 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
Map010_Mzgc_10100 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
Map134_Yams_31340 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
+Map135_Llxg_32010 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
+Map135_Llxg_32011 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
Map133_Bzjsc_31031 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index 14ff630..34808fa 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc
index 8ef4080..536b337 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.pyc
index 9f28e13..d029a28 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt b/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
index 0ad95f3..45eaa04 100644
--- a/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
+++ b/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
@@ -64,42 +64,42 @@
8 4 2 289439 217079 477574 119393 446596 405996 41660 86831 39851 1500 209 2563 182698 75 0 0 156297 89319 53591 130247 117222 289439 357277 1550 1300
8 5 2 458690 344018 756838 189209 722490 656809 64344 137607 103545 1750 294 3691 295564 87 0 0 247692 144498 86698 206410 185769 458690 577992 1800 1550
8 5 3 675897 506923 1115230 278807 1030983 937257 92377 202769 189489 2000 396 5057 421766 100 0 0 364984 206196 123717 304153 273738 675897 824786 2050 1800
-8 6 3 857836 643377 1415429 353857 1232599 1120545 108360 257351 248256 2150 457 5924 504245 107 0 0 463231 246519 147911 386026 347423 857836 986079 2200 2050
-9 1 0 59126 44344 97557 24389 64323 58476 5751 17737 5532 855 48 444 26314 42 0 0 31928 12864 7718 26606 23946 59126 51459 905 825
-9 2 0 85799 64349 141568 35392 120281 109347 8301 25739 7937 995 64 595 49206 49 0 0 46331 24056 14433 38609 34748 85799 96225 1045 935
-9 3 0 138170 103627 227980 56995 199458 181326 11484 41451 10920 1145 103 1135 81596 57 0 0 74611 39891 23935 62176 55958 138170 159567 1195 1050
-9 3 1 192443 144332 317530 79382 278472 253156 19798 57732 17328 1300 143 1672 113920 65 0 0 103919 55694 33416 86599 77939 192443 222777 1350 1175
-9 4 1 289439 217079 477574 119393 446596 405996 41660 86831 39851 1500 209 2563 182698 75 0 0 156297 89319 53591 130247 117222 289439 357277 1550 1300
-9 4 2 458690 344018 756838 189209 722490 656809 64344 137607 103545 1750 294 3691 295564 87 0 0 247692 144498 86698 206410 185769 458690 577992 1800 1425
-9 5 1 675897 506923 1115230 278807 1030983 937257 92377 202769 189489 2000 396 5057 421766 100 0 0 364984 206196 123717 304153 273738 675897 824786 2050 1675
-9 5 2 675897 506923 1115230 278807 1030983 937257 92377 202769 189489 2000 396 5057 421766 100 0 0 364984 206196 123717 304153 273738 675897 824786 2050 1925
-9 5 3 1001499 751124 1652473 413118 1502953 1366321 122896 300449 291333 2250 500 6534 614844 112 0 0 540809 300590 180354 450674 405607 1001499 1202362 2300 2225
-9 6 3 1208393 906294 1993848 498462 1779693 1617903 141454 362517 361645 2400 567 7489 728056 120 0 0 652532 355938 213563 543776 489399 1208393 1423754 2450 940
+8 6 3 1177255 882941 1942470 485617 2226399 2023999 138593 353176 349472 2375 558 7830 910799 118 0 0 635718 445279 267167 529765 476788 1177255 1781119 2425 2425
+9 1 0 59126 44344 97557 24389 64323 58476 5751 17737 5532 855 48 444 26314 42 0 0 31928 12864 7718 26606 23946 59126 51459 905 905
+9 2 0 85799 64349 141568 35392 120281 109347 8301 25739 7937 995 64 595 49206 49 0 0 46331 24056 14433 38609 34748 85799 96225 1045 1045
+9 3 0 138170 103627 227980 56995 199458 181326 11484 41451 10920 1145 103 1135 81596 57 0 0 74611 39891 23935 62176 55958 138170 159567 1195 1195
+9 3 1 192443 144332 317530 79382 278472 253156 19798 57732 17328 1300 143 1672 113920 65 0 0 103919 55694 33416 86599 77939 192443 222777 1350 1350
+9 4 1 289439 217079 477574 119393 446596 405996 41660 86831 39851 1500 209 2563 182698 75 0 0 156297 89319 53591 130247 117222 289439 357277 1550 1550
+9 4 2 458690 344018 756838 189209 722490 656809 64344 137607 103545 1750 294 3691 295564 87 0 0 247692 144498 86698 206410 185769 458690 577992 1800 1800
+9 5 1 679313 509485 1120866 280216 1527334 1388485 92377 203794 189489 2000 396 5458 624818 100 0 0 366829 305466 183280 305691 275121 679313 1221867 2050 2050
+9 5 2 679313 509485 1120866 280216 1527334 1388485 92377 203794 189489 2000 396 5458 624818 100 0 0 366829 305466 183280 305691 275121 679313 1221867 2050 2050
+9 5 3 1007147 755360 1661792 415448 1999304 1817549 122896 302144 291333 2250 500 6984 817897 112 0 0 543859 399860 239916 453216 407894 1007147 1599443 2300 2300
+9 6 3 1575450 1181588 2599492 649873 2745535 2495941 176999 472635 478516 2625 681 9665 1123173 131 0 0 850743 549107 329464 708952 638057 1575450 2196428 2675 2675
10 1 0 88129 66097 145412 36353 127468 115880 8542 26438 8085 1005 66 618 52146 50 0 0 47589 25493 15296 39658 35692 88129 101974 1055 1055
-10 2 0 142505 106879 235133 58783 204632 186029 11692 42751 11201 1155 106 1175 83713 57 0 0 76952 40926 24555 64127 57714 142505 163706 1205 1175
-10 3 0 200217 150163 330358 82589 288795 262541 21169 60065 18656 1320 149 1750 118143 66 0 0 108117 57759 34655 90097 81087 200217 231036 1370 1300
-10 3 1 289439 217079 477574 119393 446596 405996 41660 86831 39851 1500 209 2563 182698 75 0 0 156297 89319 53591 130247 117222 289439 357277 1550 1425
-10 4 1 458690 344018 756838 189209 722490 656809 64344 137607 103545 1750 294 3691 295564 87 0 0 247692 144498 86698 206410 185769 458690 577992 1800 1550
-10 4 2 675897 506923 1115230 278807 1030983 937257 92377 202769 189489 2000 396 5057 421766 100 0 0 364984 206196 123717 304153 273738 675897 824786 2050 1800
-10 5 2 1001499 751124 1652473 413118 1502953 1366321 122896 300449 291333 2250 500 6534 614844 112 0 0 540809 300590 180354 450674 405607 1001499 1202362 2300 2050
-10 5 3 1370152 1027614 2260750 565187 1985398 1804907 158927 411045 412292 2500 617 8217 812208 125 0 0 739881 397079 238247 616568 554911 1370152 1588318 2550 2400
-10 6 3 1611508 1208631 2658988 664747 2301006 2091823 180457 483452 492043 2650 696 9368 941320 132 0 0 870214 460201 276120 725178 652660 1611508 1840804 2700 1055
-11 1 0 150296 112722 247988 61997 214151 194682 12078 45088 11799 1175 111 1237 87607 58 0 0 81159 42830 25698 67633 60869 150296 171321 1225 1175
-11 2 0 206740 155055 341121 85280 298041 270947 22744 62022 20533 1345 156 1844 121926 67 0 0 111639 59608 35764 93033 83729 206740 238433 1395 1300
-11 3 0 309851 232388 511254 127813 476882 433529 44763 92955 47144 1535 220 2718 195088 76 0 0 167319 95376 57225 139432 125489 309851 381506 1585 1425
-11 3 1 458690 344018 756838 189209 722490 656809 64344 137607 103545 1750 294 3691 295564 87 0 0 247692 144498 86698 206410 185769 458690 577992 1800 1550
-11 4 1 675897 506923 1115230 278807 1030983 937257 92377 202769 189489 2000 396 5057 421766 100 0 0 364984 206196 123717 304153 273738 675897 824786 2050 1675
-11 4 2 1001499 751124 1652473 413118 1502953 1366321 122896 300449 291333 2250 500 6534 614844 112 0 0 540809 300590 180354 450674 405607 1001499 1202362 2300 1925
-11 5 2 1370152 1027614 2260750 565187 1985398 1804907 158927 411045 412292 2500 617 8217 812208 125 0 0 739881 397079 238247 616568 554911 1370152 1588318 2550 2225
-11 5 3 1788595 1341446 2951181 737795 2524976 2295433 199282 536578 547932 2750 748 10128 1032944 137 0 0 965841 504995 302997 804867 724380 1788595 2019981 2800 2575
-11 6 3 1913273 1434955 3156900 789225 2795091 2540992 156839 573982 638940 2900 837 11440 1143446 145 0 0 1033167 559018 335410 860973 774875 1913273 2236073 2950 1175
-12 1 0 216074 162055 356522 89130 314648 286043 24738 64822 22228 1365 163 1927 128719 68 0 0 116679 62929 37757 97233 87509 216074 251718 1415 1300
-12 2 0 317427 238070 523754 130938 490684 446076 46081 95228 51493 1555 226 2787 200734 77 0 0 171410 98136 58882 142842 128557 317427 392547 1605 1425
-12 3 0 470842 353131 776889 194222 738116 671015 65971 141252 108380 1765 300 3766 301956 88 0 0 254254 147623 88573 211879 190691 470842 590493 1815 1550
-12 3 1 675897 506923 1115230 278807 1030983 937257 92377 202769 189489 2000 396 5057 421766 100 0 0 364984 206196 123717 304153 273738 675897 824786 2050 1675
-12 4 1 1001499 751124 1652473 413118 1502953 1366321 122896 300449 291333 2250 500 6534 614844 112 0 0 540809 300590 180354 450674 405607 1001499 1202362 2300 1800
-12 4 2 1370152 1027614 2260750 565187 1985398 1804907 158927 411045 412292 2500 617 8217 812208 125 0 0 739881 397079 238247 616568 554911 1370152 1588318 2550 2050
-12 5 2 1788595 1341446 2951181 737795 2524976 2295433 199282 536578 547932 2750 748 10128 1032944 137 0 0 965841 504995 302997 804867 724380 1788595 2019981 2800 2400
-12 5 3 1892664 1419498 3122895 780723 2921689 2656081 78943 567799 705266 3000 895 12301 1195236 150 0 0 1022038 584337 350602 851698 766528 1892664 2337351 3050 2750
-12 6 3 2271196 1703397 3747473 936868 3506026 3187297 94731 681358 846319 3600 1074 14761 1434283 180 0 0 1226445 701204 420722 1022037 919833 2271196 2804821 3660 3660
-13 5 3 2271196 1703397 3747473 936868 3506026 3187297 94731 681358 846319 3600 1074 14761 1434283 180 0 0 1226445 701204 420722 1022037 919833 2271196 2804821 3660 3660
+10 2 0 142505 106879 235133 58783 204632 186029 11692 42751 11201 1155 106 1175 83713 57 0 0 76952 40926 24555 64127 57714 142505 163706 1205 1205
+10 3 0 200217 150163 330358 82589 288795 262541 21169 60065 18656 1320 149 1750 118143 66 0 0 108117 57759 34655 90097 81087 200217 231036 1370 1370
+10 3 1 289439 217079 477574 119393 446596 405996 41660 86831 39851 1500 209 2563 182698 75 0 0 156297 89319 53591 130247 117222 289439 357277 1550 1550
+10 4 1 458690 344018 756838 189209 722490 656809 64344 137607 103545 1750 294 3691 295564 87 0 0 247692 144498 86698 206410 185769 458690 577992 1800 1800
+10 4 2 679313 509485 1120866 280216 1527334 1388485 92377 203794 189489 2000 396 5458 624818 100 0 0 366829 305466 183280 305691 275121 679313 1221867 2050 2050
+10 5 2 1007147 755360 1661792 415448 1999304 1817549 122896 302144 291333 2250 500 6984 817897 112 0 0 543859 399860 239916 453216 407894 1007147 1599443 2300 2300
+10 5 3 1376352 1032264 2270980 567745 2481748 2256135 158927 412905 412292 2500 617 8717 1015260 125 0 0 743230 496349 297809 619358 557422 1376352 1985399 2550 2550
+10 6 3 2016838 1512628 3327782 831945 3314037 3012761 216966 605051 623104 2875 820 11754 1355742 143 0 0 1089092 662807 397684 907577 816819 2016838 2651230 2925 2925
+11 1 0 150296 112722 247988 61997 214151 194682 12078 45088 11799 1175 111 1237 87607 58 0 0 81159 42830 25698 67633 60869 150296 171321 1225 1225
+11 2 0 206740 155055 341121 85280 298041 270947 22744 62022 20533 1345 156 1844 121926 67 0 0 111639 59608 35764 93033 83729 206740 238433 1395 1395
+11 3 0 309851 232388 511254 127813 476882 433529 44763 92955 47144 1535 220 2718 195088 76 0 0 167319 95376 57225 139432 125489 309851 381506 1585 1585
+11 3 1 458690 344018 756838 189209 722490 656809 64344 137607 103545 1750 294 3691 295564 87 0 0 247692 144498 86698 206410 185769 458690 577992 1800 1800
+11 4 1 679313 509485 1120866 280216 1527334 1388485 92377 203794 189489 2000 396 5458 624818 100 0 0 366829 305466 183280 305691 275121 679313 1221867 2050 2050
+11 4 2 1007147 755360 1661792 415448 1999304 1817549 122896 302144 291333 2250 500 6984 817897 112 0 0 543859 399860 239916 453216 407894 1007147 1599443 2300 2300
+11 5 2 1376352 1032264 2270980 567745 2481748 2256135 158927 412905 412292 2500 617 8717 1015260 125 0 0 743230 496349 297809 619358 557422 1376352 1985399 2550 2550
+11 5 3 1795163 1346372 2962018 740504 3021327 2746660 199282 538548 547932 2750 748 10676 1235997 137 0 0 969387 604265 362559 807823 727040 1795163 2417061 2800 2800
+11 6 3 2503088 1877316 4130095 1032523 3995372 3632157 266703 750926 775792 3125 984 14188 1634470 156 0 0 1351667 799074 479443 1126390 1013750 2503088 3196298 3355 3355
+12 1 0 216074 162055 356522 89130 314648 286043 24738 64822 22228 1365 163 1927 128719 68 0 0 116679 62929 37757 97233 87509 216074 251718 1415 1415
+12 2 0 317427 238070 523754 130938 493434 448576 46081 95228 51493 1555 226 2787 201859 77 0 0 171410 98686 59212 142842 128557 317427 394747 1605 1605
+12 3 0 474220 355665 782463 195615 1073902 976274 65971 142266 108380 1765 300 4121 439323 88 0 0 256078 214780 128868 213399 192059 474220 859121 1815 1815
+12 3 1 679313 509485 1120866 280216 1527334 1388485 92377 203794 189489 2000 396 5458 624818 100 0 0 366829 305466 183280 305691 275121 679313 1221867 2050 2050
+12 4 1 1007147 755360 1661792 415448 1999304 1817549 122896 302144 291333 2250 500 6984 817897 112 0 0 543859 399860 239916 453216 407894 1007147 1599443 2300 2300
+12 4 2 1376352 1032264 2270980 567745 2481748 2256135 158927 412905 412292 2500 617 8717 1015260 125 0 0 743230 496349 297809 619358 557422 1376352 1985399 2550 2550
+12 5 2 1795163 1346372 2962018 740504 3021327 2746660 199282 538548 547932 2750 748 10676 1235997 137 0 0 969387 604265 362559 807823 727040 1795163 2417061 2800 2800
+12 5 3 2275535 1706651 3754632 938658 3632157 3301961 242458 682660 705266 3000 895 12899 1485882 150 0 0 1228789 726431 435858 1023991 921591 2275535 2905726 3050 3050
+12 6 3 3185749 2389311 5256485 1314121 5085019 4622745 339441 955724 987372 3375 1253 18058 2080234 168 0 0 1720304 1017003 610201 1433587 1290227 3185749 4068016 4270 4270
+13 5 3 2730642 2047981 4505559 1126389 4358588 3962353 290949 819192 846319 3250 1074 15478 1783058 162 0 0 1474546 871717 523029 1228789 1105909 2730642 3486871 3660 3660
diff --git a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
index 11d7825..18a2bf5 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
@@ -22,4 +22,4 @@
52010 5 2 0 0 0 25 0 0 1 180 0 0 0
31010 3 2 0 0 0 0 0 0 0 180 0 0 0
31340 2 2 0 0 0 0 0 0 1 180 0 0 0
-32010 10 2 0 0 0 0 0 0 0 31 0 0 0
+32010 0 2 0 0 0 0 0 0 0 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index 140dd5f..0a00ab7 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -95,3 +95,5 @@
31110 1 31110 80 500 0 0 0 0 0 0 0 [59,13,3] [3, 180, 10, [360, 245, 185, 125], [51,13]] 102
31210 0 31210 0 500 0 0 0 0 0 0 0 [12,6,3] [10, 3600, 60, [1800, 900, 600, 300]] [101,30903001]
31340 0 31340 300 0 0 0 0 0 0 0 0 [23,29,3] [1800,10,33409003,16,102,5000,{33409001:8,33409002:8},33403001,40,101,5000,10000] [[33402001,33402001,33402001],[33402001,33402001,33402001],[33402001,33402001,33402001,33402001]]
+32010 0 32010 150 0 0 0 0 0 0 0 0 [26,6] [180,3,10]
+32010 1 32011 150 0 0 0 0 0 0 0 0 [26,6] [180,3,10]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 57d2e6b..cae4134 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -294,7 +294,7 @@
OpenServerRedPacketCfg 3 10 3600 50 5
PotentialSkillLearn {"50065":[15,47000],"50165":[15,47010],"50265":[15,47020],"1065":[15,47030],"50365":[15,47040],"50465":[15,47050],"50565":[15,47060],"50665":[15,47070],"50765":[15,47080],"50865":[15,47090],"51065":[15,47130],"51165":[15,47140],"55065":[15,47200],"55165":[15,47210],"55265":[15,47220],"2065":[15,47230],"55365":[15,47240],"55465":[15,47250],"55565":[15,47260],"55665":[15,47270],"55765":[15,47280],"55865":[15,47290],"56065":[15,47330],"56165":[15,47340]}
FirstGold {"1":[[6619,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]],"2":[[6620,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]]} {"1":388,"2":388} 1800
-CTG 20181218
+CTG 0
FirstGoldTryItem 1_6621|2_6622 1_10221|2_20221 9 100
ItemRecord 1 0
ItemRecordRule {0:4,39:3,111:2,45:3,9:2,58:3,22:3,28:3,8:3} [4,25,26,41,112] [947,948,949,950,953,982,983,986,1128] [] []
@@ -322,8 +322,8 @@
HelpBattleRobot 50105026 baseHurt*hpCoefficient
CrossRealmPKAward {} {} {"10":[[4010,2,1],[101,1,1],[3502,1,1]],"50":[[4010,2,1],[101,1,1],[3502,1,1]],"300":[[4010,2,1],[101,1,1],[3502,1,1]]}
CrossRealmPKMatchCount 5 5 (buyCnt+1)*20
-CrossRealmPKFB [30, 3, 60,30,10] [[40,66,40,83], [190,66,190,81]] 2
+CrossRealmPKFB [30, 3, 60,30,10] [[15,20,20,15], [33,25,25,33]] 2
GatherSoulHole 0_300|1_300|2_305|3_310|4_315|5_320|6_330 0_62|1_62|2_62|3_62|4_62|5_62|6_63
GatherSoulMaxLevel 1_50|2_50|3_50|4_50|5_50
-GatherSoulLevelUp int(4000000*(0.02*((level-1)/49.0)+0.08*pow(((level-1)/49.0),2)+0.2*pow(((level-1)/49.0),3)+0.3*pow(((level-1)/49.0),4)+0.4*pow(((level-1)/49.0),5)))-int(4000000*(0.02*((max((level-2),0))/49.0)+0.08*pow(((max((level-2),0))/49.0),2)+0.2*pow(((max((level-2),0))/49.0),3)+0.3*pow(((max((level-2),0))/49.0),4)+0.4*pow(((max((level-2),0))/49.0),5))) 1_0.5|2_0.7|3_0.8|4_0.9|5_1 1_0.5|2_0.7|3_0.8|4_0.9 1_100|2_300|3_3000|4_15000|5_30000
+GatherSoulLevelUp int(4000000*(0.02*((level-1)/49.0)+0.08*pow(((level-1)/49.0),2)+0.2*pow(((level-1)/49.0),3)+0.3*pow(((level-1)/49.0),4)+0.4*pow(((level-1)/49.0),5)))-int(4000000*(0.02*((max((level-2),0))/49.0)+0.08*pow(((max((level-2),0))/49.0),2)+0.2*pow(((max((level-2),0))/49.0),3)+0.3*pow(((max((level-2),0))/49.0),4)+0.4*pow(((max((level-2),0))/49.0),5))) 1_0.5|2_0.7|3_0.8|4_0.9|5_1 1_0.5|2_0.7|3_0.8|4_0.9 1_100|2_300|3_3000|4_15000|5_30000 0_1|1_1.2
GatherSoulPackCount 150
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index 5202488..dee0b17 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -104,3 +104,4 @@
155 300 0 0 0 0
156 300 0 0 0 0
157 150 0 0 0 0
+158 300 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagGatherSoulCompound.txt b/db/PyMongoDataServer/PySysDB/tagGatherSoulCompound.txt
index b8cbc10..51edb4e 100644
--- a/db/PyMongoDataServer/PySysDB/tagGatherSoulCompound.txt
+++ b/db/PyMongoDataServer/PySysDB/tagGatherSoulCompound.txt
@@ -1,25 +1,37 @@
TagItemID NeedLV NeedItem NeedSoulSplinters NeedSoulCore
-4398 4333|4393 384 0
-4399 4334|4394 1920 0
-4400 4335|4395 9600 0
-4413 4388|4363 384 0
-4414 4389|4364 1920 0
-4415 4390|4365 9600 0
-4403 4313|4378 384 0
-4404 4314|4379 1920 0
-4405 4315|4380 9600 0
-4408 4318|4373 384 0
-4409 4319|4374 1920 0
-4410 4320|4375 9600 0
-4448 4383|4428 384 0
-4449 4384|4429 1920 0
-4450 4385|4430 9600 0
-4453 4353|4433 384 0
-4454 4354|4434 1920 0
-4455 4355|4435 9600 0
-4458 4348|4438 384 0
-4459 4349|4439 1920 0
-4460 4350|4440 9600 0
-4463 4358|4443 384 0
-4464 4359|4444 1920 0
-4465 4360|4445 9600 0
+7263 300 7203|7223 1920 0
+7264 320 7204|7224 9600 0
+7265 300 7205|7225 1920 0
+7268 320 7208|7228 9600 0
+7269 300 7209|7229 1920 0
+7270 320 7210|7230 9600 0
+7273 300 7213|7233 1920 0
+7274 320 7214|7234 9600 0
+7275 300 7215|7235 1920 0
+7278 320 7218|7258 9600 0
+7279 300 7219|7259 1920 0
+7280 320 7220|7260 9600 0
+7283 300 7248|7253 1920 0
+7284 320 7249|7254 9600 0
+7285 300 7250|7255 1920 0
+7288 320 7238|7243 9600 0
+7289 300 7239|7244 1920 0
+7290 320 7240|7245 9600 0
+7128 300 7108|7113 1920 0
+7129 320 7109|7114 9600 0
+7130 300 7110|7115 1920 0
+7133 320 7108|7118 9600 0
+7134 300 7109|7119 1920 0
+7135 320 7110|7120 9600 0
+7138 300 7108|7123 1920 0
+7139 320 7109|7124 9600 0
+7140 300 7110|7125 1920 0
+7143 320 7113|7118 9600 0
+7144 300 7114|7119 1920 0
+7145 320 7115|7120 9600 0
+7148 300 7113|7123 1920 0
+7149 320 7114|7124 9600 0
+7150 300 7115|7125 1920 0
+7153 320 7118|7123 9600 0
+7154 300 7119|7124 1920 0
+7155 320 7120|7125 9600 0
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index d5433e9..355be8c 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -1,14 +1,15 @@
-ID RelatedID CanBackTimes NormalCostJade VipCostJade JadeReward CostCopper CopperReward
-1 0 0 5 0 {"exp":"tjgExp"} 0 {"exp":"tjgExp*80/100"}
-2 1 0 2 0 {"exp":"1080*reExp", "item":[{"ItemID":24,"ItemCount":"2"}], "money":"100000"} 0 {"exp":"864*reExp","item":[{"ItemID":24,"ItemCount":"2"}],"money":"55000"}
-3 2 0 10 0 {"exp":"1440*reExp","item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":5303,"ItemCount":"10"}]} 0 {"exp":"1152*reExp","item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":5303,"ItemCount":"10"}]}
-4 3 0 15 0 {"exp":"18000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"16000"}]} 0 {"exp":"14400*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"8800"}]}
-5 5 0 15 30 {"exp":"1800*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)*2+max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*2"}]} 0 {"exp":"1440*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)+max(min(2,extraData)-1,0)+max(min(3,extraData)-2,0)+max(min(4,extraData)-3,0)+max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)"}]}
-6 6 1 15 50 {"exp":"21600*reExp*expRate", "item":[{"ItemID":24,"ItemCount":"30"}]} 0 {"exp":"17280*reExp", "item":[{"ItemID":24,"ItemCount":"30"}]}
-7 10 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":4151,"ItemCount":"10"}]} 0 {"exp":"9600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":4151,"ItemCount":"5"}]}
-8 14 0 8 0 {"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"5"}]} 0 {"exp":"3200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"2"}]}
-9 8 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":2407,"ItemCount":"1"}]} 0 {"exp":"9600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":2410,"ItemCount":"1"}]}
-10 7 0 50 0 {"exp":"120000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"33000"}]} 0 {"exp":"96000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"18150"}]}
-11 11 0 25 50 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*634828+max(min(2,max((extraData-2),1))-1,0)*665472+max(min(3,max((extraData-2),1))-2,0)*814080+max(min(4,max((extraData-2),1))-3,0)*935424+max(min(5,max((extraData-2),1))-4,0)*1123776+max(min(6,max((extraData-2),1))-5,0)*1332864+max(min(7,max((extraData-2),1))-6,0)*1562688+max(min(8,max((extraData-2),1))-7,0)*1812672"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*24+max(min(2,max((extraData-2),1))-1,0)*20+max(min(3,max((extraData-2),1))-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*3+max(min(3,max((extraData-2),1))-2,0)*9+max(min(4,max((extraData-2),1))-3,0)*12+max(min(5,max((extraData-2),1))-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*2+max(min(4,max((extraData-2),1))-3,0)*4+max(min(5,max((extraData-2),1))-4,0)*8+max(min(6,max((extraData-2),1))-5,0)*9"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*3+max(min(6,max((extraData-2),1))-5,0)*4+max(min(7,max((extraData-2),1))-6,0)*8"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*8"}]} 0 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*436444+max(min(2,max((extraData-2),1))-1,0)*457512+max(min(3,max((extraData-2),1))-2,0)*559680+max(min(4,max((extraData-2),1))-3,0)*643104+max(min(5,max((extraData-2),1))-4,0)*772596+max(min(6,max((extraData-2),1))-5,0)*916344+max(min(7,max((extraData-2),1))-6,0)*1074348+max(min(8,max((extraData-2),1))-7,0)*1246212"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*17+max(min(2,max((extraData-2),1))-1,0)*13+max(min(3,max((extraData-2),1))-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*2+max(min(3,max((extraData-2),1))-2,0)*6+max(min(4,max((extraData-2),1))-3,0)*8+max(min(5,max((extraData-2),1))-4,0)*3"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*1+max(min(4,max((extraData-2),1))-3,0)*2+max(min(5,max((extraData-2),1))-4,0)*5+max(min(6,max((extraData-2),1))-5,0)*6"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*2+max(min(6,max((extraData-2),1))-5,0)*3+max(min(7,max((extraData-2),1))-6,0)*5"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*5"}]}
-12 9 0 25 0 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]} 0 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}
-13 12 0 20 0 {"exp":"1800*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"12"}], "money":"500000"} 0 {"exp":"1440*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"8"}]}
+ID RelatedID CanBackTimes NormalCostJade VipCostJade JadeReward CostCopper CopperReward JobItem
+1 0 0 5 0 {"exp":"tjgExp"} 0 {"exp":"tjgExp*80/100"}
+2 1 0 2 0 {"exp":"1080*reExp", "item":[{"ItemID":24,"ItemCount":"2"}], "money":"100000"} 0 {"exp":"864*reExp","item":[{"ItemID":24,"ItemCount":"2"}],"money":"55000"}
+3 2 0 10 0 {"exp":"1440*reExp","item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":5303,"ItemCount":"10"}]} 0 {"exp":"1152*reExp","item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":5303,"ItemCount":"10"}]}
+4 3 0 15 0 {"exp":"18000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"16000"}]} 0 {"exp":"14400*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"8800"}]}
+5 5 0 15 30 {"exp":"1800*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)*2+max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*2"}]} 0 {"exp":"1440*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)+max(min(2,extraData)-1,0)+max(min(3,extraData)-2,0)+max(min(4,extraData)-3,0)+max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)"}]}
+6 6 1 15 50 {"exp":"21600*reExp*expRate", "item":[{"ItemID":24,"ItemCount":"30"}]} 0 {"exp":"17280*reExp", "item":[{"ItemID":24,"ItemCount":"30"}]}
+7 10 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":4151,"ItemCount":"10"}]} 0 {"exp":"9600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":4151,"ItemCount":"5"}]}
+8 14 0 8 0 {"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"5"}]} 0 {"exp":"3200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"2"}]}
+9 8 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":2407,"ItemCount":"1"}]} 0 {"exp":"9600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":2410,"ItemCount":"1"}]}
+10 7 0 50 0 {"exp":"120000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"33000"}]} 0 {"exp":"96000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"18150"}]}
+11 11 0 25 50 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*634828+max(min(2,max((extraData-2),1))-1,0)*665472+max(min(3,max((extraData-2),1))-2,0)*814080+max(min(4,max((extraData-2),1))-3,0)*935424+max(min(5,max((extraData-2),1))-4,0)*1123776+max(min(6,max((extraData-2),1))-5,0)*1332864+max(min(7,max((extraData-2),1))-6,0)*1562688+max(min(8,max((extraData-2),1))-7,0)*1812672"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*24+max(min(2,max((extraData-2),1))-1,0)*20+max(min(3,max((extraData-2),1))-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*3+max(min(3,max((extraData-2),1))-2,0)*9+max(min(4,max((extraData-2),1))-3,0)*12+max(min(5,max((extraData-2),1))-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*2+max(min(4,max((extraData-2),1))-3,0)*4+max(min(5,max((extraData-2),1))-4,0)*8+max(min(6,max((extraData-2),1))-5,0)*9"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*3+max(min(6,max((extraData-2),1))-5,0)*4+max(min(7,max((extraData-2),1))-6,0)*8"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*8"}]} 0 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*436444+max(min(2,max((extraData-2),1))-1,0)*457512+max(min(3,max((extraData-2),1))-2,0)*559680+max(min(4,max((extraData-2),1))-3,0)*643104+max(min(5,max((extraData-2),1))-4,0)*772596+max(min(6,max((extraData-2),1))-5,0)*916344+max(min(7,max((extraData-2),1))-6,0)*1074348+max(min(8,max((extraData-2),1))-7,0)*1246212"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*17+max(min(2,max((extraData-2),1))-1,0)*13+max(min(3,max((extraData-2),1))-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*2+max(min(3,max((extraData-2),1))-2,0)*6+max(min(4,max((extraData-2),1))-3,0)*8+max(min(5,max((extraData-2),1))-4,0)*3"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*1+max(min(4,max((extraData-2),1))-3,0)*2+max(min(5,max((extraData-2),1))-4,0)*5+max(min(6,max((extraData-2),1))-5,0)*6"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*2+max(min(6,max((extraData-2),1))-5,0)*3+max(min(7,max((extraData-2),1))-6,0)*5"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*5"}]}
+12 9 0 25 0 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]} 0 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}
+13 12 0 20 0 {"exp":"1800*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"12"}], "money":"500000"} 0 {"exp":"1440*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"8"}]}
+14 17 0 20 20 {"exp":"1800*reExp", "item":[{"ItemID":5012,"ItemCount":"max(min(180,reLV)-179,0)+max(min(205,reLV)-204,0)+max(min(230,reLV)-229,0)+max(min(255,reLV)-254,0)+max(min(280,reLV)-279,0)+max(min(305,reLV)-304,0)+2*max(min(330,reLV)-329,0)+2*max(min(355,reLV)-354,0)+3*max(min(380,reLV)-379,0)+4*max(min(405,reLV)-404,0)+4*max(min(430,reLV)-429,0)"},{"ItemID":2211,"ItemCount":"5*max(min(85,reLV)-84,0)+max(min(110,reLV)-109,0)+2*max(min(130,reLV)-129,0)+2*max(min(155,reLV)-154,0)"}]} 0 {"exp":"1440*reExp", "item":[{"ItemID":5012,"ItemCount":"max(min(205,reLV)-204,0)+max(min(230,reLV)-229,0)+max(min(255,reLV)-254,0)+max(min(280,reLV)-279,0)+max(min(305,reLV)-304,0)+max(min(330,reLV)-329,0)+max(min(355,reLV)-354,0)+max(min(380,reLV)-379,0)+max(min(405,reLV)-404,0)+max(min(430,reLV)-429,0)"},{"ItemID":2211,"ItemCount":"2*max(min(85,reLV)-84,0)+max(min(110,reLV)-109,0)+max(min(130,reLV)-129,0)+max(min(155,reLV)-154,0)"}]} [[5012,5022]]
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
index 3192bcd..138fb38 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
@@ -1,9 +1,9 @@
TreasureType MinLV GridItemInfo JobItemList GridItemRateListFree FreeGridItemRateList2 FreeGridItemRateList3 GridItemRateList1 GridItemRateList2 GridItemRateList3 LuckyGridNum
-1 0 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2346,1],"6":[2324,1],"7":[5,1],"8":[4610,1],"9":[181,10],"10":[4609,1],"11":[101,10],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1157,1),(2305,1),(3452,10),(3552,1),(4700,1),(5847,1),(5947,1),(7095,10),(7495,1),(8642,10),(8652,1),(9800,1),(10000,1)] [(4000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1157,2),(2305,3),(3452,4),(3552,5),(4700,6),(5847,7),(5947,8),(7095,9),(7495,10),(8642,11),(8652,12),(9800,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
-1 180 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2346,1],"6":[2324,1],"7":[4610,1],"8":[5412,40],"9":[181,10],"10":[4609,1],"11":[101,10],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1321,1),(2632,1),(3944,10),(4044,1),(5355,1),(5555,1),(5655,40),(6967,10),(7167,1),(8478,10),(8488,1),(9800,1),(10000,1)] [(5000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1321,2),(2632,3),(3944,4),(4044,5),(5355,6),(5555,7),(5655,8),(6967,9),(7167,10),(8478,11),(8488,12),(9800,13),(10000,14)] [(5000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
-1 230 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[5412,30],"9":[104,10],"10":[4609,1],"11":[102,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,30),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(3000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(3000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
-1 260 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[104,10],"10":[4609,1],"11":[102,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
-1 300 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[105,3],"10":[4609,1],"11":[107,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,3),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 0 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2346,1],"6":[2324,1],"7":[5,1],"8":[4610,1],"9":[181,10],"10":[4609,1],"11":[102,10],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1157,1),(2305,1),(3452,10),(3552,1),(4700,1),(5847,1),(5947,1),(7095,10),(7495,1),(8642,10),(8652,1),(9800,1),(10000,1)] [(4000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1157,2),(2305,3),(3452,4),(3552,5),(4700,6),(5847,7),(5947,8),(7095,9),(7495,10),(8642,11),(8652,12),(9800,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 180 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2346,1],"6":[2324,1],"7":[4610,1],"8":[5412,40],"9":[181,10],"10":[4609,1],"11":[102,10],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1321,1),(2632,1),(3944,10),(4044,1),(5355,1),(5555,1),(5655,40),(6967,10),(7167,1),(8478,10),(8488,1),(9800,1),(10000,1)] [(5000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1321,2),(2632,3),(3944,4),(4044,5),(5355,6),(5555,7),(5655,8),(6967,9),(7167,10),(8478,11),(8488,12),(9800,13),(10000,14)] [(5000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 230 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[5412,30],"9":[105,10],"10":[4609,1],"11":[102,10],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,30),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(3000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(3000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 260 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[105,10],"10":[4609,1],"11":[102,10],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 300 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[105,10],"10":[4609,1],"11":[108,10],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,3),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
2 0 {"1":[4425,1],"2":[4394,1],"3":[4335,1],"4":[4369,1],"5":[4395,1],"6":[4303,5],"7":[4384,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,4],"12":[4385,1],"13":[2331,1],"14":[4305,3]} [] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] {} [(1,1),(1470,2),(1520,3),(1560,4),(1570,5),(3570,6),(5040,7),(5050,8),(5550,9),(6050,10),(7520,11),(7530,12),(9000,13),(10000,14)] [(2500,5),(7500,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
2 200 {"1":[4425,1],"2":[4354,1],"3":[4335,1],"4":[4369,1],"5":[4355,1],"6":[4303,5],"7":[4364,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,4],"12":[4360,1],"13":[2331,1],"14":[4305,3]} [] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] {} [(1,1),(1470,2),(1520,3),(1560,4),(1570,5),(3570,6),(5040,7),(5050,8),(5550,9),(6050,10),(7520,11),(7530,12),(9000,13),(10000,14)] [(2500,5),(7500,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
2 250 {"1":[4425,1],"2":[4379,1],"3":[4306,1920],"4":[4369,1],"5":[4335,1],"6":[4303,5],"7":[4375,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,4],"12":[4380,1],"13":[2331,1],"14":[4305,3]} [] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] {} [(1,1),(1914,2),(2014,3),(2054,4),(2104,5),(4104,6),(4154,7),(4164,8),(4664,9),(5164,10),(7077,11),(7087,12),(9000,13),(10000,14)] [(9000,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 06eb452..db647ab 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -631,6 +631,8 @@
4103 0 0 守护之石 49 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 280 0 20 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4104 0 0 神秘料理 49 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 180 0 20 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4105 0 0 幼龙 112 12 0 0 0 1 1 1 1 0 0 0 0 0 0 0 1 380 0 20 0 0 0 0 6 5000 0 0 46 5000 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 3 0 0 0 0 0 0 3600 0 0 0 0 0 0 0
+4106 0 0 巨龙 112 12 0 0 0 1 1 1 0 0 1 0 0 0 0 0 1 380 0 20 0 0 0 0 6 5000 0 0 46 5000 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 9 0 0 0 0 0 0 2592000 0 0 0 0 0 0 0
+4107 0 0 巨凤 112 12 0 0 0 1 1 1 0 0 1 0 0 0 0 0 1 280 0 20 0 0 0 0 8 50 0 0 20 2000 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 9 0 0 0 0 0 0 864000 0 0 0 0 0 0 0
4151 1 0 灵宠丹 27 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 1 0 0 0 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 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4171 1 0 宠物数据物品 29 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1 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 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
4181 1 0 金之魄 28 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 80 0 20 0 1 0 0 7 24 0 0 6 480 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
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 6b8eac9..57fc0ab 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -284,6 +284,8 @@
11104016 0 1 神机子 350 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
50109001 0 0 幼龙 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 300 2 0 0 0 0 0 0 0 0 0 0 10 2 48189 0 0 0 0 0 0 0 1 1 1
50109002 0 0 雏凤 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 300 2 0 0 0 0 0 0 0 0 0 0 10 2 48189 0 0 0 0 0 0 0 1 1 1
+50109003 0 0 幼龙 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 2 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 0 0 0 0 1 1 1
+50109004 0 0 雏凤 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 2 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 0 0 0 0 1 1 1
50106001 16 0 雷霆幼龙 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1
50106002 16 0 道士鼠 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1
50106101 16 0 冰原狼妖 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1
diff --git a/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt b/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt
index 84f3d61..79b607e 100644
--- a/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt
@@ -102,3 +102,6 @@
108521 31031 118 70 15 20008 0
108523 31031 98 38 10 20011 0
108525 31031 70 72 80 20010 0
+110951 40000 88 150 10 20008 0
+111323 32010 23 23 25 20010 0
+111324 32011 24 23 30 20010 0
--
Gitblit v1.8.0