From ac5953f1ba61e75efa192f08e6d701dac2327d9a Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 07 三月 2019 14:30:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFBLine.txt | 2 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc | 0
db/PyMongoDataServer/PySysDB/tagFBFunc.txt | 4 +++-
db/PyMongoDataServer/SysDB/tagChinMap.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AddLegendAttr.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AuctionItem.pyc | 0
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 2 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItemCount.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt | 2 ++
CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt | 2 ++
CoreServerGroup/GameServer/PySysDB/tagAuctionItem.txt | 3 +++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagChinMap.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagAuctionItem.txt | 3 +++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Chests.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 10 +---------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPutInItem.pyc | 0
db/PyMongoDataServer/PySysDB/tagDailyQuest.txt | 1 +
db/PyMongoDataServer/PySysDB/tagFbEncourage.txt | 1 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItem.pyc | 0
db/PyMongoDataServer/PySysDB/tagFamilyBossAward.txt | 4 ++++
32 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagAuctionItem.txt b/CoreServerGroup/GameServer/PySysDB/tagAuctionItem.txt
index 72b6c28..775ac2f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagAuctionItem.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagAuctionItem.txt
@@ -83,3 +83,6 @@
2013080 5 30 30 500 2500 100 0 0
2014080 5 30 30 600 3000 100 0 9
2014081 10 60 60 700 3500 100 0 9
+1201 5 60 60 50 250 10 0 0
+1202 5 60 60 50 250 10 0 0
+1203 5 60 60 50 250 10 0 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
index 62f19dd..0a35937 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
@@ -35,7 +35,7 @@
31230 仙盟宴会 3 0
31240 VIPBoss 1 0
31250 守护副本 1 0
-31260 仙盟BOSS 3 0
+31260 仙盟BOSS 8 0
31340 幽暗迷森 1 0
31360 BOSS之家四层 8 0
32010 跨服竞技场 10 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
index 74ef754..62d71ad 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
@@ -25,3 +25,5 @@
32010 0
31380 0
31370 0
+1000 0
+31260 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
index cbe3878..9e9be3a 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
@@ -113,3 +113,5 @@
31380 8 31380
31380 9 31380
1000 0 1000
+31260 0 31260
+31260 1 31260
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt b/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
index 51685a3..44abbe2 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
@@ -30,3 +30,5 @@
29 31220 5 21 49 23 59 0 23 {}
30 31010 3 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
31 31010 7 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+32 31260 1 12 30 13 0 1 1
+33 31260 1 19 30 20 0 1 2
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index b3aa8e6..086f592 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc
index def9dbe..524d980 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc
index 0bafa20..d58bd58 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AddLegendAttr.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AddLegendAttr.pyc
index 2d16cba..03d6650 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AddLegendAttr.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AddLegendAttr.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AuctionItem.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AuctionItem.pyc
index c7ac8bf..1c4f1e9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AuctionItem.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AuctionItem.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItem.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItem.pyc
index 12b862b..0d97712 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItem.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItem.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItemCount.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItemCount.pyc
index f4015df..f990471 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItemCount.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItemCount.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index 9337fbf..2377b58 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/Item/ItemControler.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
index 28a1a13..c1da2c6 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
index 5a797e4..3915d3d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Chests.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Chests.pyc
index 451c1ca..a540e4e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Chests.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Chests.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
index 716ac10..b97fdc0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index ebdfa40..ee946e5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.pyc
index b7c5525..3759b23 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.pyc
index 7afbf2d..32362d9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc
index e7f228d..89ccfa9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.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 88d938a..807d29b 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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
index 6d1b6e3..b10b894 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPutInItem.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPutInItem.pyc
index a1885c5..bd6d2d0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPutInItem.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPutInItem.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagAuctionItem.txt b/db/PyMongoDataServer/PySysDB/tagAuctionItem.txt
index 8c7e01a..447ca6f 100644
--- a/db/PyMongoDataServer/PySysDB/tagAuctionItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAuctionItem.txt
@@ -83,3 +83,6 @@
2013080
2014080
2014081
+1201
+1202
+1203
diff --git a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
index f16866d..710467a 100644
--- a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
+++ b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
@@ -27,3 +27,4 @@
29 1 20 151 1 20 20
30 2 31340 156 1 20 40
31 1 21 157 1 5 50
+32 2 31260 139 1 30 60
diff --git a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
index b51e788..22efc84 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
@@ -24,4 +24,6 @@
31340 2 2 0 0 0 0 0 0 1 0 0 0 0
32010 0 2 0 0 0 0 0 0 0 0 0 0 0
31380 2 2 0 0 0 35 0 0 1 180 0 0 0
-31370 2 2 0 0 0 0 0 0 1 0 0 0 0
+31370 2 2 0 0 100|60|40|20|10 0 0 0 1 0 0 0 0
+1000 0 2 0 0 0 0 0 0 0 0 0 0 0
+31260 2 2 0 0 0 0 0 0 1 180 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index d5afb29..93e58a7 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -113,3 +113,5 @@
31380 8 31380 500 0 0 0 0 0 0 0 0 [17,19,8] 10 [[5414,4,1],[1158,1,1],[5500,5,1]]
31380 9 31380 500 0 0 0 0 0 0 0 0 [17,19,8] 10 [[5414,4,1],[1158,1,1],[5500,5,1]]
1000 0 1000 150 0 0 0 0 0 0 0 0 [26,6] [180,3,10]
+31260 0 31260 130 0 0 0 0 0 0 0 0 [18,18] [60,10] 60203025 [[5414,4,1],[1158,1,1],[5500,5,1]]
+31260 1 31260 130 0 0 0 0 0 0 0 0 [18,18] [120,10] 60203026 [[5414,4,1],[1158,1,1],[5500,5,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagFamilyBossAward.txt b/db/PyMongoDataServer/PySysDB/tagFamilyBossAward.txt
new file mode 100644
index 0000000..d2397bf
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagFamilyBossAward.txt
@@ -0,0 +1,4 @@
+WorldLV Rank Award
+[0,1000] [1,1] [[10000,[141,4,0]],[10000,[1011030,1,10]]]
+[0,1000] [2,2] [[10000,[141,4,0]],[10000,[1011030,1,10]]]
+[0,1000] [3,1000] [[10000,[141,4,0]],[10000,[1011030,1,10]]]
diff --git a/db/PyMongoDataServer/PySysDB/tagFbEncourage.txt b/db/PyMongoDataServer/PySysDB/tagFbEncourage.txt
index 69f6a0d..63d3f6c 100644
--- a/db/PyMongoDataServer/PySysDB/tagFbEncourage.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFbEncourage.txt
@@ -3,3 +3,4 @@
31080 5 10 5
52010 1 10 (min(encourageLV,4)+1)*2
31380 1 10 5
+31260 1 10 5
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 8bfa348..3177a52 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -163,8 +163,6 @@
FamilyMatchSRankOneReward {215:[[2300,1,0]],265:[[2280,1,0]],315:[[2282,1,0]],365:[[2284,1,0]],415:[[2286,1,0]]} {215:[[2398,1,0]],265:[[2399,1,0]],315:[[2400,1,0]],365:[[2401,1,0]],415:[[2402,1,0]]}
FamilyMatchDayReward [[914,1,1],[911,1,1],[2213,1,1]] 11|12 41
WingLV {"5":1,"6":2,"8":3,"10":4,"12":5}
-WingLegendAttrCount {5:1,6:1,8:1,10:2,12:2} 0 0 0
-WingLegendAttrValue {5:{30:[400,800],33:[200,400]},6:{30:[400,800,1200,1600],33:[200,400,600,800]},8:{30:[1600,2000,2400,2800],33:[800,1000,1200,1400]},10:{30:[2800,3200],33:[1400,1600]},12:{30:[3200,4000],33:[1600,2000]}} 0 0 0 0
WingRealmLimit 3711_1|3712_4|3713_8|3714_12|3715_16|3721_1|3722_4|3723_8|3724_12|3725_16
WingInitialWashValue [[6190,0],[7142,7],[7857,15],[8476,25],[9047,43],[10000,52]] 3711|3721
FightHappenRate 150
@@ -176,12 +174,6 @@
StrengthenLevelBroadCast 20|35|50|70|90|110|130|150|170|190
SkillPlusAttrID {102:[50000,55000,60000],103:[50100,55100,60100],104:[50400,55400,60400],105:[50200,55200,60200],106:[50300,55300,60300],107:[50800,55800,60800],108:[51000,56000,61000],109:[50000,55000,60000],110:[50100,55100,60100],111:[50400,55400,60400],112:[50200,55200,60200],113:[50300,55300,60300],114:[50800,55800,60800],115:[51000,56000,61000]} {"102":[50000,55000,60000],"103":[50100,55100,60100],"104":[50400,55400,60400],"105":[50200,55200,60200],"106":[50300,55300,60300],"107":[50800,55800,60800],"108":[51000,56000,61000],"109":[50000,55000,60000],"110":[50100,55100,60100],"111":[50400,55400,60400],"112":[50200,55200,60200],"113":[50300,55300,60300],"114":[50800,55800,60800],"115":[51000,56000,61000]}
EquipZhuXian {"1":[121,122,123,124], "2":[125,126,127,128], "3":[129,130,131,132]} {"45000":{"1":[121,122,123,124,125,126,127,128]},"45001":{"2":[121,122,123,124,125,126,127,128]},"45002":{"3":[129,130,131,132,125,126,127,128]},"45100":{"1":[121,122,123,124,125,126,127,128]},"45101":{"2":[121,122,123,124,125,126,127,128]},"45102":{"3":[129,130,131,132,125,126,127,128]},"45200":{"1":[121,122,123,124,125,126,127,128]},"45201":{"2":[121,122,123,124,125,126,127,128]},"45202":{"3":[129,130,131,132,125,126,127,128]}}
-LegendAttrRandRule {"1":[109,110,111,112,113,114,115],"2":[102,103,104,105,106,107,108]} {"128":[1], "129":[1], "130":[1], "131":[2], "132":[2], "133":[2], "134":[1, 2], "135":[1, 2], "136":[1, 2], "137":[1, 2]} {"1":{"0":[1,2]}, "2":{"0":[1,3]}, "3":{"0":[1,4]}, "4":{"0":[2,5]}, "5":{"0":[2,6]}, "6":{"0":[2,7]}} {"102":[1000,500,250],"103":[2000,1000,500],"104":[1500,750,375],"105":[2500,1250,625],"106":[3000,1500,750],"107":[3750,1875,937],"108":[7500,3750,1875],"109":[1000,500,250],"110":[2000,1000,500],"111":[1500,750,375],"112":[2500,1250,625],"113":[3000,1500,750],"114":[3750,1875,937],"115":[7500,3750,1875]} {(2,0):0, (3,0):0}
-LegendAttrCount {(3,0):[1,0,0],(3,1):[0,1,0],(4,0):[2,0,0],(4,1):[1,1,0],(4,2):[0,2,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,1]} {(1,0):[3,0,0],(2,0):[3,0,0],(2,1):[2,1,0],(2,2):[1,2,0],(3,0):[3,0,0],(3,1):[2,1,0],(3,2):[1,2,0],(3,3):[0,3,0],(4,0):[3,0,0],(4,1):[2,1,0],(4,2):[1,2,0],(4,3):[0,3,0],(5,0):[3,0,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,0]} 0 0 0
-LegendAttrRule {1:[[15,25,44,52,54,55],[11,51,19],0],2:[[15,25,44,52,54,55],[11,51,19],0],3:[[22,45,44,53,54,55],[20,50,49],18],4:[[22,45,44,53,54,55],[20,50,49],30],5:[[22,45,44,53,54,55],[20,50,49],29],6:[[22,45,44,53,54,55],[20,50,49],14],7:[[22,45,44,53,54,55],[20,50,49],71],8:[[15,25,44,52,54,55],[11,12,70],0],9:[[15,25,44,52,54,55],[20,12,70],0],10:[[15,25,44,52,54,55],[20,12,70],0],101:[[9,10,52,53,25,55],[30,26,27],0],102:[[9,10,52,53,25,55],[14,26,27],0],103:[[9,10,52,53,25,55],[14,70,29],0],104:[[9,10,52,53,25,55],[30,70,29],0],105:[[9,10,52,53,25,55],[30,70,26],0]} 0 0 0 0
-LegendAttrValueByColor {51:{3:300,4:525,5:750,6:750},19:{3:360,4:630,5:900,6:900},11:{3:600,4:1050,5:1500,6:1500},12:{3:200,4:350,5:500,6:500},70:{3:800,4:1400,5:2000,6:2000},20:{3:240,4:420,5:600,6:600},50:{3:240,4:420,5:600,6:600},49:{3:300,4:525,5:750,6:750},15:{3:500,4:800,5:1000,6:1000},25:{3:500,4:800,5:1000,6:1000},52:{3:20,4:25,5:33,6:33},45:{3:500,4:800,5:1000,6:1000},44:{3:500,4:800,5:1000,6:1000},22:{3:200,4:320,5:400,6:400},53:{3:3,4:4,5:5,6:5},54:{3:250,4:400,5:500,6:500},55:{3:250,4:400,5:500,6:500}} 0 0 0 0
-LegendAttrValueByColor2 {30:{2:100,3:140,4:180,5:200,6:220},26:{2:250,3:350,4:450,5:500,6:550},27:{2:250,3:350,4:450,5:500,6:550},14:{2:300,3:420,4:540,5:600,6:660},70:{2:300,3:420,4:540,5:600,6:660},29:{2:350,3:490,4:630,5:700,6:770},10:{1:450,2:750,3:1050,4:1125,5:1200},9:{1:450,2:750,3:1050,4:1125,5:1200},25:{1:120,2:200,3:280,4:300,5:320},55:{1:120,2:200,3:280,4:300,5:320},52:{1:6,2:10,3:14,4:15,5:16},53:{1:1,2:2,3:2,4:3,5:4}}
-LegendAttrValueByClassLV {29:{8:600,9:900,10:1200,11:1320,12:1425,13:1500,14:1575},30:{8:1200,9:1800,10:2400,11:2640,12:2850,13:3000,14:3150},14:{8:1600,9:2400,10:3200,11:3520,12:3800,13:4000,14:4200},18:{8:1000,9:1500,10:2000,11:2200,12:2375,13:2500,14:2625},71:{8:800,9:1200,10:1600,11:1760,12:1900,13:2000,14:2100}} 0 0 0 0
EquipGSTypeForSort 101|102|103|104|105|106|107|108|109|110|111|112|119|120|121|122|123|128|129|130|131|132|133|134|135|136|137 0 0 0 0
EquipGSFormula int(((MinAtk+MaxAtk)/2.0*10.0+Def*10.0+MaxHP/2.0+AtkPer/10000.0+DamagePer/10000.0+SuperHitRate/10000.0+SuperHitPer/10000.0+DamReducePer/10000.0+MaxHPPer/10000.0+DefPer/10000.0+LuckyHitRate/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+MissRate/10000.0+HitRate/10000.0+DamBackPer/10000.0+PerLVMaxHP+DropEquipPer/10000.0+DropMoneyPer/10000.0+IgnoreDefRateReduce/10000.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SkillAtkRate/10000.0+SpeedPer/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedC+OnlyFinalHurt*5.0+PVPAtkBackHP*5.0+SpeedPer/10000.0+SkillAtkRateReduce/10000.0)) [67,68,6,7,8,9,10,11,20,19,23] int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+IceAtk*10.0+IceDef*10.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SuperHitPer/10000.0+IgnoreDefRateReduce/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+PerLVMaxHP+Hit/10000.0+Miss/10000.0) int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+Hit/10000.0+Miss/10000.0+SkillAddPerA/10000.0+SkillAddPerB/10000.0+SkillAddPerC/10000.0+SkillAddPerD/10000.0+SkillAddPerE/10000.0+SkillAddPerF/10000.0+SkillAddPerG/10000.0+SkillReducePerA/10000.0+SkillReducePerB/10000.0+SkillReducePerC/10000.0+SkillReducePerD/10000.0+SkillReducePerE/10000.0+SkillReducePerF/10000.0+SkillReducePerG/10000.0) 0
HorseUpItem 181 100 0 0 0
@@ -229,7 +221,7 @@
DungeonDeliver 31020|31030|31150|31031
DungeonIntegral 2000
BuyFBCntCost {"31080":"35","31140":"20","52010":"20+min(max(hasBuyCnt-1,0),1)*10+min(max(hasBuyCnt-3,0),1)*10+min(max(hasBuyCnt-5,0),1)*10+min(max(hasBuyCnt-7,0),1)*10+min(max(hasBuyCnt-9,0),1)*20","31190":"30","51010":"50","31380":"50"}
-FBEncourageBuff {31080:20051,52010:20081,31380:20081} 31080_10|52010_10|31380_10 31080_10|52010_20|31380_10
+FBEncourageBuff {31080:20051,52010:20081,31380:20081,31260:20081} 31080_10|52010_10|31380_10|31260_10 31080_10|52010_20|31380_10|31260_10
DropRecordValue 4213|250|4202|2404|2405|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|5408|9074|9075|9077|9078|5409|5302
DropRecordEquipment {(1,2,3,4,5,6,7):[3,4,2],(8):[3,3,0],(101,102,103,104,105):[1,3,1],(121,122,123,124,125,126,127,128,129,130,131,132):[1,3,0]}
DropRecordNormal 2320|4606|4607|4608|4609|4610|3801|2339|2340|5302|5206|5207|5202|5006|5007|4182|4253|224|4252|222|4250|223|4251
diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt
index 7f53da8..985699a 100644
--- a/db/PyMongoDataServer/SysDB/tagChinMap.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt
@@ -35,7 +35,7 @@
31230 仙盟宴会 1 0 1200000 3 1 0 0 0 0 0 0 0 1 1 31230 12 23 0 1 0 0 1
31240 VIPBoss 1 0 0 1 1 0 0 0 0 0 0 0 1 1 31240 32 16 0 1 0 0 1
31250 守护副本 1 0 600000 1 1 0 0 0 0 0 0 0 1 1 31250 29 14 0 1 0 0 1
-31260 仙盟BOSS 1 0 3600000 3 1 0 0 0 0 0 0 0 1 1 31260 18 18 0 1 0 0 1
+31260 仙盟BOSS 1 0 3600000 8 0 0 0 0 0 0 0 0 1 1 31260 18 18 0 1 0 0 1
31340 幽暗迷森 1 0 3600000 1 1 0 0 0 0 0 0 0 1 1 31340 23 29 0 1 0 0 1
31360 BOSS之家四层 1 0 0 8 0 0 0 0 0 0 0 0 0 0 31360 53 7 0 1 0 5 35
32010 跨服竞技场 1 0 900000 10 1 0 0 0 0 0 0 0 1 1 10010 196 80 0 1 0 1 2
--
Gitblit v1.8.0