From 4b3af1a8ba81a4d9e5ed2016ce9ae557e74b9f37 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期四, 25 十月 2018 19:59:30 +0800
Subject: [PATCH] Merge branch '1.1.0' of http://192.168.0.87:10010/r/snxx_server into 1.1.0
---
db/PyMongoDataServer/PySysDB/tagStore.txt | 4 +-
db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt | 4 +-
db/PyMongoDataServer/SysDB/tagChinItem.txt | 11 ++++-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc | 0
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 14 +++++++
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 9 ++--
CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt | 4 +-
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 6 +-
CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt | 1
db/PyMongoDataServer/PySysDB/tagAttrFruit.txt | 2
db/PyMongoDataServer/PySysDB/tagChests.txt | 5 ++
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 9 +++-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc | 0
Robot/AI/AIFile/AILoginout.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddMagicWeaponUpExp.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt | 4 +-
db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt | 28 +++++++-------
17 files changed, 67 insertions(+), 34 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
index d8fedef..3ec55ff 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
@@ -1,3 +1,4 @@
CfgID ActMark ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd LimitLV
1 test1 [] 2018-9-30 2018-10-1 1 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
2 test2 [] 2018-10-6 2018-10-7 1 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
+3 test3 [] 2018-10-26 2018-10-27 1 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
index 78c9378..6d8d8bf 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
@@ -17,10 +17,10 @@
10803001 10080 int(4800*(1-0.017*min(max(yesterdayCnt-20,0),40))) [330,400] 40 5 2004 100 世界BOSS
20203005 21100 int(5400*(1-0.032*min(max(yesterdayCnt-15,0),25))) [335,385] 40 5 2016 100 世界BOSS
20203006 21100 int(6000*(1-0.023*min(max(yesterdayCnt-15,0),35))) [340,390] 40 5 2017 100 世界BOSS
-10903001 10090 int(6000*(1-0.027*min(max(yesterdayCnt-15,0),25))) [380,450] 40 5 2004 100 世界BOSS
+10903001 10090 int(6000*(1-0.027*min(max(yesterdayCnt-15,0),25))) [380,450] 40 5 2048 100 世界BOSS
11003001 10100 int(6000*(1-0.027*min(max(yesterdayCnt-15,0),25))) [380,450] 40 5 2047 100 世界BOSS
20203007 21100 int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35))) [385,435] 40 5 2018 100 世界BOSS
-11103001 10110 int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35))) [430,500] 40 5 2004 100 世界BOSS
+11103001 10110 int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35))) [430,500] 40 5 2049 100 世界BOSS
20303001 21110 3000 [1,500] 40 5 2040 100 世界BOSS
20303002 21110 3600 [1,500] 40 5 2041 100 世界BOSS
20303003 21110 4200 [1,500] 40 5 2042 100 世界BOSS
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index ba1cd8c..aa67c45 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -45,12 +45,12 @@
DropRecordNum 40 1
KillBossCntLimit {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007,10903001):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1,(20303001,20303002,20303003,20303004,20303005,20303006,20303007):2} 0_3|1_0|2_3 {0:'WB_Limit',1:'BossHome_Limit',2:'DogzDungeonPL'} {1:27} {0:[21,'WorldBossNoHarm']}
CreateRoleMap {1:[10010,195,81],2:[10010,195,81],3:[10010,195,81]}
-SetWorldPosShunt {10010:10, 10020:10, 10030:10, 10040:10, 10050:25, 10060:25} 160
+SetWorldPosShunt {10010:10, 10020:10, 10030:10, 10040:10, 10050:10, 10060:10,10070:10,10080:10,10090:10} 350
DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',8,8,8], (161):[20302003,8,'7200',8,8,8], (162):[20302004,8,'7200',8,8,8], (163):[20302005,8,'7200',8,8,8], (164):[20302008,8,'7200',8,8,8], (165):[20302009,8,'7200',8,8,8], (166):[20302006,8,'7200',8,8,8], (167):[20302007,8,'7200',8,8,8]} 20303001 [20302002, 20302003]
XMZZBetCfg {}
XMZZAward {"3":[[104,3,1]],"6":[[105,1,1]],"9":[[105,2,1]],"12":[[106,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
XMZZDogFallLimit 1000
-XMZZPKPowerRange [[30,10],[50,50]] [4,5]
+XMZZPKPowerRange [[30,10],[50,50]] [4,5] 3
XMZZSpecialNPCRate min(5000,(conWinCnt*625+10)) max(0,(conWinCnt-10)*1000)
XMZZPKAward [0,10,20,30,40,50,60,70,80,90] addPer+100 + int(math.ceil(HPPer/10.0)) 50 reExp*216*(100+addPer)/100 reExp*108
XMZZPKRecord [3,5,8,10,15,20] 40
@@ -65,5 +65,5 @@
BossRebornNotify [50,80] [0,20,40]
ServerActivePlayerCnt 100 max(20,min(yesterdayPlayerCnt,150))
FirstDayActivePlayerCnt 1000
-CeremonyWorldLv {"1":[[0,100],[101,200],[201,900]],"2":[[0,100],[101,200],[201,900]],"3":[[0,100],[101,200],[201,900]],"4":[[0,100],[101,200],[201,900]]}
+CeremonyWorldLv {"1":[[0,250],[251,300],[301,900]],"2":[[0,250],[251,300],[301,900]],"3":[[0,250],[251,300],[301,900]],"4":[[0,250],[251,300],[301,900]]}
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]] -60
diff --git a/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt b/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt
index 1a5515d..1931820 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt
@@ -1,7 +1,7 @@
WorldLvNum Rank Award
0 1 {"1":[[2278,1,0]],"2":[[2278,1,0]]}
-0 2 {"1":[[10871,1,0]],"2":[[20871,1,0]]}
-0 3 {"1":[[10872,1,0]],"2":[[20872,1,0]]}
+0 2 {"1":[[10771,1,0]],"2":[[20771,1,0]]}
+0 3 {"1":[[10772,1,0]],"2":[[20772,1,0]]}
1 1 {"1":[[2278,1,0]],"2":[[2278,1,0]]}
1 2 {"1":[[10871,1,0]],"2":[[20871,1,0]]}
1 3 {"1":[[10872,1,0]],"2":[[20872,1,0]]}
diff --git a/Robot/AI/AIFile/AILoginout.pyc b/Robot/AI/AIFile/AILoginout.pyc
index 6f12828..471d694 100644
--- a/Robot/AI/AIFile/AILoginout.pyc
+++ b/Robot/AI/AIFile/AILoginout.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc
index 8207f5a..062b328 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddMagicWeaponUpExp.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddMagicWeaponUpExp.pyc
index 8195e91..9882cc1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddMagicWeaponUpExp.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddMagicWeaponUpExp.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
index b373a6b..7c0ecee 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt b/db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt
index 9a3eab4..1f39980 100644
--- a/db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt
@@ -1,16 +1,16 @@
WorldLvNum Index NeedPoint Award
0 0 120 {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}
-0 1 240 {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}
-0 2 320 {"1":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]],"2":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]]}
-0 3 420 {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
-0 4 520 {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
-1 0 120 {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}
-1 1 240 {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}
-1 2 320 {"1":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]],"2":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]]}
-1 3 420 {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
-1 4 520 {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
-2 0 120 {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}
-2 1 240 {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}
-2 2 320 {"1":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]],"2":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]]}
-2 3 420 {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
-2 4 520 {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
+0 1 240 {"1":[[3512,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3512,2,1],[181,10,1],[3,2,1],[4304,5,1]]}
+0 2 320 {"1":[[3503,2,1],[181,15,1],[4,1,1],[4304,5,1]],"2":[[3503,2,1],[181,15,1],[4,1,1],[4304,5,1]]}
+0 3 420 {"1":[[3514,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3514,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
+0 4 520 {"1":[[3505,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3505,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
+1 0 120 {"1":[[983,1,1],[181,5,1],[8352,1,1],[4305,5,1]],"2":[[983,1,1],[181,5,1],[8352,1,1],[4305,5,1]]}
+1 1 240 {"1":[[2389,1,1],[181,10,1],[8352,2,1],[4305,5,1]],"2":[[2389,1,1],[181,10,1],[8352,2,1],[4305,5,1]]}
+1 2 320 {"1":[[2390,1,1],[181,15,1],[8352,3,1],[4305,5,1]],"2":[[2390,1,1],[181,15,1],[8352,3,1],[4305,5,1]]}
+1 3 420 {"1":[[3515,2,1],[181,20,1],[8352,4,1],[4305,5,1]],"2":[[3515,2,1],[181,20,1],[8352,4,1],[4305,5,1]]}
+1 4 520 {"1":[[2397,1,1],[181,20,1],[8352,5,1],[4305,5,1]],"2":[[2397,1,1],[181,20,1],[8352,5,1],[4305,5,1]]}
+2 0 120 {"1":[[983,1,1],[181,5,1],[8353,1,1],[4305,5,1]],"2":[[983,1,1],[181,5,1],[8353,1,1],[4305,5,1]]}
+2 1 240 {"1":[[2389,1,1],[181,10,1],[8353,2,1],[4305,5,1]],"2":[[2389,1,1],[181,10,1],[8353,2,1],[4305,5,1]]}
+2 2 320 {"1":[[2390,1,1],[181,15,1],[8353,3,1],[4305,5,1]],"2":[[2390,1,1],[181,15,1],[8353,3,1],[4305,5,1]]}
+2 3 420 {"1":[[3516,2,1],[181,20,1],[8353,4,1],[4305,5,1]],"2":[[3516,2,1],[181,20,1],[8353,4,1],[4305,5,1]]}
+2 4 520 {"1":[[2397,1,1],[181,20,1],[8353,5,1],[4305,5,1]],"2":[[2397,1,1],[181,20,1],[8353,5,1],[4305,5,1]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
index dc79b77..545d270 100644
--- a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
@@ -4,7 +4,7 @@
4183 0 20 500
4184 0 200 100
4185 0 20 500
-4186 0 10 100
+4186 0 60 100
4187 0 15 100
4188 0 15 100
4189 0 1 100
diff --git a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
index c90c934..3bdfb5a 100644
--- a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
@@ -17,10 +17,10 @@
10803001 10080 90 0 0 0 2004
20203005 21100 94 0 0 0 2016
20203006 21100 95 0 0 0 2017
-10903001 10090 90 0 0 0 2004
+10903001 10090 90 0 0 0 2048
11003001 10100 90 0 0 0 2047
20203007 21100 96 0 0 0 2018
-11103001 10110 90 0 0 0 2004
+11103001 10110 90 0 0 0 2049
20303001 21110 90 0 0 0 2040
20303002 21110 91 0 0 0 2041
20303003 21110 92 0 0 0 2042
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index 9c92d9c..9eea8b1 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -180,3 +180,8 @@
2390 0 0 0 0 0
2391 0 0 0 1 0
2392 0 0 280 1 1
+2393 0 0 0 1 0
+2394 0 0 280 1 1
+2395 0 0 0 1 0
+2396 0 0 280 1 1
+2397 0 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 20d3a4d..15b6078 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -175,5 +175,10 @@
2388 0 [[2000,[8352,1]],[2500,[8201,1]],[3000,[8214,1]],[3500,[8227,1]],[4000,[8240,1]],[4500,[8253,1]],[5400,[8202,1]],[6300,[8215,1]],[7200,[8228,1]],[8100,[8241,1]],[9000,[8254,1]],[9200,[8203,1]],[9400,[8216,1]],[9600,[8229,1]],[9800,[8242,1]],[10000,[8255,1]]] 1
2389 0 8353_2 [[571,[8202,1]],[1142,[8215,1]],[1714,[8228,1]],[2285,[8241,1]],[2857,[8254,1]],[4057,[8203,1]],[5257,[8216,1]],[6457,[8229,1]],[7657,[8242,1]],[8857,[8255,1]],[9085,[8204,1]],[9314,[8217,1]],[9542,[8230,1]],[9771,[8243,1]],[10000,[8256,1]]] 7 [[1333,[8205,1]],[2666,[8218,1]],[4000,[8231,1]],[5333,[8244,1]],[6666,[8257,1]],[7111,[8206,1]],[7555,[8219,1]],[8000,[8232,1]],[8444,[8245,1]],[8888,[8258,1]],[8933,[8207,1]],[8977,[8220,1]],[9022,[8233,1]],[9066,[8246,1]],[9111,[8259,1]],[9288,[8209,1]],[9466,[8222,1]],[9644,[8235,1]],[9822,[8248,1]],[10000,[8261,1]]] [[7750,0],[10000,1]] {2:[[2000,[8209,1]],[4000,[8222,1]],[6000,[8235,1]],[8000,[8248,1]],[10000,[8261,1]]]} [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259,8209,8222,8235,8248,8261]
2390 [[1200,[8205,1]],[2400,[8218,1]],[3600,[8231,1]],[4800,[8244,1]],[6000,[8257,1]],[6760,[8206,1]],[7520,[8219,1]],[8280,[8232,1]],[9040,[8245,1]],[9800,[8258,1]],[9840,[8207,1]],[9880,[8220,1]],[9920,[8233,1]],[9960,[8246,1]],[10000,[8259,1]]] 1
-2391 [[100,[3803,1]],[110,[5409,1]],[130,[8067,1]],[230,[3505,1]],[330,[3515,1]],[350,[4607,1]],[550,[4606,1]],[590,[4608,1]],[990,[3504,1]],[1390,[3514,1]],[2890,[4151,8]],[4390,[181,8]],[5900,[2324,1]],[7300,[3503,1]],[8700,[3513,1]],[8950,[142,60]],[9200,[143,45]],[9450,[144,30]],[9700,[153,15]],[10000,[5303,50]]] 1 [5409,3803,8067,4607,4606,4608,3515,3505]
-2392 4184_2|1145_15|952_3|913_2
+2391 [[20,[3803,1]],[170,[3802,1]],[220,[4186,1]],[270,[199,1]],[320,[4606,1]],[370,[4608,1]],[570,[3504,1]],[770,[3514,1]],[1370,[4304,12]],[1570,[5303,60]],[3400,[2324,2]],[4700,[3503,1]],[6000,[3513,1]],[6300,[141,60]],[6600,[142,40]],[6900,[143,30]],[7200,[144,20]],[8600,[4151,8]],[10000,[181,8]]] 1 [3803,3802,4186,199,4606,4608,3504,3514]
+2392 4184_2|1145_15|952_3|913_1
+2393 [[100,[3803,1]],[120,[8067,1]],[140,[4607,1]],[190,[5206,1]],[290,[4606,1]],[540,[5006,2]],[690,[3505,1]],[840,[3515,1]],[1440,[4305,5]],[1740,[5303,60]],[3000,[2324,2]],[4400,[3503,1]],[5800,[3513,1]],[6100,[142,40]],[6400,[143,30]],[6700,[144,20]],[7000,[153,10]],[8500,[4151,8]],[10000,[181,8]]] 1 [3803,8067,4607,5206,4606,5006,3505,3515]
+2394 4184_2|1146_15|952_3|913_1
+2395 [[100,[3803,1]],[250,[5408,1]],[260,[5409,1]],[280,[4607,1]],[380,[4606,1]],[480,[4608,1]],[630,[3506,1]],[780,[3516,1]],[1380,[4305,5]],[1680,[5303,60]],[3180,[8353,6]],[4800,[2324,2]],[6200,[3503,1]],[7600,[3513,1]],[7900,[143,30]],[8200,[144,20]],[8500,[153,10]],[10000,[4151,8]]] 1 [3803,5408,5409,4607,4606,4608,3506,3516]
+2396 4184_2|1147_15|952_3|913_1
+2397 [[11800,[8209,1]],[13600,[8222,1]],[15400,[8235,1]],[17200,[8248,1]],[19000,[8261,1]],[19200,[8210,1]],[19400,[8223,1]],[19600,[8236,1]],[19800,[8249,1]],[20000,[8262,1]]] 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 5809eb5..3877712 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -77,7 +77,7 @@
ExpAttenuation max(baseExp*max(1-max(playerLV-npcLV-10,0)*0.02,0),1) 0 0 0 0
AtkInterval int(1000*max(1/math.sqrt(atkSpeed/10000.0),0.5)) 0 0 0 0
MoveSpeed max(int(1.0/(3+(math.sqrt(speed/100.0)-1)*2)/2.0*1000),100) 50 25 0 0
-FightpowerFormula int(((MinAtk+MaxAtk)*20/2.0+Def*20+MaxHP+IceAtk*20+IceDef*20+SuperHit*SuperHitRate/10000.0*40+Hit/10000.0+Miss/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedParameter+DamagePer/10000.0+DamReduce/10000.0+IgnoreDefRate/10000.0+LuckyHitRate/10000.0*LuckyHitParameter+LuckyHit/10000.0*LuckyHitParameter+DamBackPer/10000.0+DamagePerPVP/10000.0+DamagePerPVPReduce/10000.0+FinalHurt*10+FinalHurtReduce*10+(PetMinAtk+PetMaxAtk)/2.0*(1+PetDamPer/10000.0)*10+DamChanceDef/10000.0+AtkBackHP*20+BleedDamage/10000.0+FaintRate/10000.0+SuperHitReduce/10000.0+LuckyHitRateReduce/10000.0+IgnoreDefRateReduce/10000.0+SkillAtkRate/10000.0+SkillAtkRateReduce/10000.0+OnlyFinalHurt*10.0+PVPAtkBackHP*20.0+SpeedPer/10000.0+NPCHurtAddPer/10000.0*240000)) int(MinAtk*10+MaxAtk*10+MaxHP+Def*20) 0 0 0
+FightpowerFormula int(((MinAtk+MaxAtk)*20/2.0+Def*20+MaxHP+IceAtk*20+IceDef*20+SuperHit*SuperHitRate/10000.0*40+Hit/10000.0+Miss/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedParameter+DamagePer/10000.0+DamReduce/10000.0+IgnoreDefRate/10000.0+LuckyHitRate/10000.0*LuckyHitParameter+LuckyHit/10000.0*LuckyHitParameter+DamBackPer/10000.0+DamagePerPVP/10000.0+DamagePerPVPReduce/10000.0+FinalHurt*20+FinalHurtReduce*20+(PetMinAtk+PetMaxAtk)/2.0*(1+PetDamPer/10000.0)*10+DamChanceDef/10000.0+AtkBackHP*20+BleedDamage/10000.0+FaintRate/10000.0+SuperHitReduce/10000.0+LuckyHitRateReduce/10000.0+IgnoreDefRateReduce/10000.0+SkillAtkRate/10000.0+SkillAtkRateReduce/10000.0+OnlyFinalHurt*20.0+PVPAtkBackHP*20.0+SpeedPer/10000.0+NPCHurtAddPer/10000.0*240000)) int(MinAtk*10+MaxAtk*10+MaxHP+Def*20) 0 0 0
RealmFBHelpAttr {"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}} 10000 6
RealmFBHelpLimit 10
RealmSitNPCID 10000
@@ -232,7 +232,7 @@
ElderBattlefieldTopAward [[2214,1,1]]
ElderBattlefieldBuff [23001,23002,23003,23004] 31609001 [102,105,106,107,108] 3
CornerPresentedMoney 0 1
-SetWorldPosShunt {10010:10, 10020:10, 10030:10, 10040:10, 10050:25, 10060:25} 160
+SetWorldPosShunt {10010:10, 10020:10, 10030:10, 10040:10, 10050:10, 10060:10,10070:10,10080:10,10090:10} 350
TransportPay 954 1
GuardFBCageNPCID 32502001 32504001 3
FBCntRegainInterval 7200
@@ -285,8 +285,8 @@
ReloadQuests 0
DownReward [(2,1,1),(911,1,1)] 70
FreeGoodsOpenTime 259200
-CeremonyWorldLv {"1":[[0,100],[101,200],[201,900]],"2":[[0,100],[101,200],[201,900]],"3":[[0,100],[101,200],[201,900]],"4":[[0,100],[101,200],[201,900]]}
-CeremonyRecharge {"1":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]],"2":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]]}
+CeremonyWorldLv {"1":[[0,250],[251,300],[301,900]],"2":[[0,250],[251,300],[301,900]],"3":[[0,250],[251,300],[301,900]],"4":[[0,250],[251,300],[301,900]]}
+CeremonyRecharge {"0":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]],"1":[[4184,1,1],[2394,1,1],[912,1,1],[1146,5,1],[4609,1,1]],"2":[[4184,1,1],[2396,1,1],[912,1,1],[1147,5,1],[4609,1,1]]}
CeremonyFireParty {"0":801,"1":802,"2":803}
CeremonyRankLimit 3280
TJDropTaskItem {}
@@ -297,3 +297,4 @@
SamboSpecialUnlock 9001|9002|9003|9004|9005|9006|9007|9008|9009|9010|9011|9012|9013|9014|9015|9016|9017|9018
BindJadeWheelCfg 88 {"1":110,"2":300,"3":150,"4":200,"5":300,"6":150,"7":130,"8":200,"9":588} [(3879,1),(3889,2),(4889,3),(5189,4),(5199,5),(6199,6),(9699,7),(9999,8),(10000,9)] {1:[(6000,3),(10000,4)],30:[(10000,9)]} [[12.0,67.4],[67.4,103.0],[103.0,148.1],[148.1,186.2],[186.2,221.8],[221.8,267.0],[267.0,311.7],[311.7,348],[348,372]]
BindJadeWheelNotice 150
+WishingWellCfg 7200 refreshCnt+10 8 5
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index 129c64d..584cea1 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -228,3 +228,17 @@
wx.sgsbl.328 815035927 328 207 0
wx.sgsbl.648 815035927 648 208 0
wx.sgsbl.01 815035927 0.1 211 0
+com.price18.snxzlb spyxxzios 18 101 0
+com.price6.snxz spyxxzios 6 2 0
+com.price30.snxz spyxxzios 30 103 0
+com.price98.snxz spyxxzios 98 104 0
+com.price128.snxz spyxxzios 128 105 0
+com.price198.snxz spyxxzios 198 106 0
+com.price328.snxz spyxxzios 328 107 0
+com.price648.snxz spyxxzios 648 108 0
+com.price1.snxz spyxxzios 1 110 0
+com.price6.snxzlb spyxxzios 6 0 2
+com.price30.snxzlb spyxxzios 30 0 4
+com.price68.snxzlb spyxxzios 68 0 5
+com.price128.snxzlb spyxxzios 128 0 7
+com.price168.snxzlb spyxxzios 168 0 8
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 73c8eb6..f093444 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -163,8 +163,8 @@
779 36 1 15 1 1 [[1128,1,1]] 1128 0 0 0 1 0 1 388 1000 0 LimitGift7
780 37 1 263 1 1 [[181,120,1]] 263 0 0 0 1 0 1 988 2100 0 LimitGift8
801 19 0 2391 1 0 [] 0 0 0 0 0 0 1 60 0 0
-802 19 0 2391 1 0 [] 0 0 0 0 0 0 1 60 0 0
-803 19 0 2391 1 0 [] 0 0 0 0 0 0 1 60 0 0
+802 19 0 2393 1 0 [] 0 0 0 0 0 0 1 60 0 0
+803 19 0 2395 1 0 [] 0 0 0 0 0 0 1 60 0 0
901 30 0 2211 1 1 [] 0 7 0 0 50 0 27 50 0 0
902 30 0 4658 1 1 [] 0 7 0 0 2 0 27 500 0 0
903 30 0 4738 1 1 [] 0 7 0 0 3 0 27 800 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index c29831d..6e2c37b 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -277,13 +277,15 @@
1142 1 0 麒麟之府经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 1800 400 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
1143 1 0 麒麟之府经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 600 400 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
1144 1 0 异兽之地经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 3600 400 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
-1145 1 0 庆典经验丹 14 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1060 0 50 0 1 0 0 214 1 300 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
+1145 1 0 庆典经验丹 14 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1060 0 50 0 1 0 0 214 1 200 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
+1146 1 0 庆典经验丹 14 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1060 0 50 0 1 0 0 214 1 250 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
+1147 1 0 庆典经验丹 14 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1060 0 50 0 1 0 0 214 1 300 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
1500 1 0 麒麟魂魄 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 1 0 0 233 31190 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
1501 1 0 宗门令牌 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 25 0 10 0 1 0 0 233 60010 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
1502 1 0 封魔令牌 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 52010 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
1503 1 0 娲皇卷轴 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 51010 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
1504 1 0 矿脉钥匙 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 31140 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
-1600 1 0 后裔之魂 77 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 236 111 250 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
+1600 1 0 后羿之魂 77 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 236 111 250 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
2050 1 0 世界喇叭 48 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 50 0 5 0 0 0 0 2700 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2100 1 0 铜钱 43 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 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 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
2101 1 0 铜钱 43 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 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 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
@@ -509,6 +511,11 @@
2390 1 0 神兽紫装宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 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
2391 1 0 烟花 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 60 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
2392 1 0 庆典礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 280 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
+2393 1 0 烟花 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 60 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
+2394 1 0 庆典礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 280 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
+2395 1 0 烟花 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 60 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
+2396 1 0 庆典礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 280 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
+2397 1 0 神兽橙装宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 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
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
--
Gitblit v1.8.0