From 5dbba3ab610a323bcd6e86711f9937f0a8156b43 Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期一, 22 十月 2018 14:21:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagStore.txt | 20 +++---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 4
db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 12 ++--
db/PyMongoDataServer/SysDB/tagChinItem.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 3
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc | 0
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 4
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 60 ++++++++++---------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc | 0
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 60 ++++++++++---------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc | 0
15 files changed, 85 insertions(+), 80 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 6ba4a94..0560312 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,30 +1,32 @@
CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime AdvanceMinutes NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV IsDayReset
-1 OpenServer01 [] 3 4 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-2 OpenServer02 [] 5 6 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-3 OpenServer03 [] 7 8 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-4 OpenServer04 [] 9 10 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-5 NationalDay [] 2018-9-1 2018-9-3 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
-6 NationalDay [(1,10), (100, 110), 120] 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
-7 1OpenServer01 [7001] 2018-9-7 2018-9-7 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-8 1OpenServer02 [7001] 2018-9-9 2018-9-9 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-9 1OpenServer03 [7001] 2018-9-11 2018-9-11 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-10 1OpenServer04 [7001] 2018-9-12 2018-9-12 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
-11 1OpenServer05 [7001] 2018-9-15 2018-9-15 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
-12 2OpenServer01 [7002] 2018-9-8 2018-9-8 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-13 2OpenServer02 [7002] 2018-9-10 2018-9-10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-14 2OpenServer03 [7002] 2018-9-12 2018-9-12 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-15 2OpenServer04 [7002] 2018-9-13 2018-9-13 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
-16 2OpenServer05 [7002] 2018-9-16 2018-9-16 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
-17 3OpenServer01 [7003] 2018-9-12 2018-9-12 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-18 3OpenServer02 [7003] 2018-9-14 2018-9-14 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-19 3OpenServer03 [7003] 2018-9-16 2018-9-16 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-20 3OpenServer04 [7003] 2018-9-17 2018-9-17 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
-21 3OpenServer05 [7003] 2018-9-20 2018-9-20 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
-22 NationalDay01 [(7001,7003), (8002, 8004)] 2018-10-1 2018-10-1 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-23 NationalDay02 [(7001,7003), (8002, 8004)] 2018-10-2 2018-10-2 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-24 NationalDay03 [(7001,7003), (8002, 8004)] 2018-10-3 2018-10-3 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-25 NationalDay04 [(7001,7003), (8002, 8004)] 2018-10-4 2018-10-4 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-26 NationalDay05 [(7001,7003), (8002, 8004)] 2018-10-5 2018-10-5 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-27 NationalDay06 [(7001,7003), (8002, 8004)] 2018-10-6 2018-10-6 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-28 NationalDay07 [(7001,7003), (8002, 8004)] 2018-10-7 2018-10-7 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-29 NationalDay08 [(7001,7003), (8002, 8004)] 2018-10-8 2018-10-8 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+1 OpenServer01 [] 2 3 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+2 OpenServer02 [] 4 4 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+3 OpenServer03 [] 5 5 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+4 OpenServer04 [] 6 6 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+5 OpenServer05 [] 7 7 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+5 OpenServer06 [] 9 10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+7 NationalDay [] 2018-9-1 2018-9-3 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
+8 NationalDay [(1,10), (100, 110), 120] 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
+9 1OpenServer01 [7001] 2018-9-7 2018-9-7 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+10 1OpenServer02 [7001] 2018-9-9 2018-9-9 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+11 1OpenServer03 [7001] 2018-9-11 2018-9-11 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+12 1OpenServer04 [7001] 2018-9-12 2018-9-12 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
+13 1OpenServer05 [7001] 2018-9-15 2018-9-15 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
+14 2OpenServer01 [7002] 2018-9-8 2018-9-8 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+15 2OpenServer02 [7002] 2018-9-10 2018-9-10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+16 2OpenServer03 [7002] 2018-9-12 2018-9-12 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+17 2OpenServer04 [7002] 2018-9-13 2018-9-13 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
+18 2OpenServer05 [7002] 2018-9-16 2018-9-16 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
+19 3OpenServer01 [7003] 2018-9-12 2018-9-12 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+20 3OpenServer02 [7003] 2018-9-14 2018-9-14 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+21 3OpenServer03 [7003] 2018-9-16 2018-9-16 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+22 3OpenServer04 [7003] 2018-9-17 2018-9-17 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
+23 3OpenServer05 [7003] 2018-9-20 2018-9-20 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
+24 NationalDay01 [(7001,7003), (8002, 8004)] 2018-10-1 2018-10-1 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+25 NationalDay02 [(7001,7003), (8002, 8004)] 2018-10-2 2018-10-2 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+26 NationalDay03 [(7001,7003), (8002, 8004)] 2018-10-3 2018-10-3 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+27 NationalDay04 [(7001,7003), (8002, 8004)] 2018-10-4 2018-10-4 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+28 NationalDay05 [(7001,7003), (8002, 8004)] 2018-10-5 2018-10-5 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+29 NationalDay06 [(7001,7003), (8002, 8004)] 2018-10-6 2018-10-6 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+30 NationalDay07 [(7001,7003), (8002, 8004)] 2018-10-7 2018-10-7 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+31 NationalDay08 [(7001,7003), (8002, 8004)] 2018-10-8 2018-10-8 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 07f02d5..2800503 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -438,9 +438,9 @@
20203007 荒漠巨兽 405
20302001 小宝箱 1
20302002 大宝箱 1
-20302003 秘境守卫 260
+20302003 金甲蛮牛 260
20302004 食灵鱼 275
-20302005 金甲蛮牛 290
+20302005 秘境守卫 290
20302006 灵鲛斗士 310
20302007 紫炎灵狮 330
20302008 金甲剑士 350
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 554ecc6..ef8bf66 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index bbfabc6..57e4688 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/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
index 60dce0f..7046c39 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc
index 6853af5..36f59c9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
index b114ede..8bb46e5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
index 077f25a..51bf66f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index aebd1f9..762f91b 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,30 +1,32 @@
CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset GiftbagList MailKey MailItemPrize
-1 3 4 120 50 0 [[6]] SellMail4
-2 5 6 0 50 0 [[7]] SellMail4
-3 7 8 0 50 0 [[8]] SellMail4
-4 9 10 0 50 0 [[9]] SellMail4
-5 2018-9-1 2018-9-3 120 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
-6 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 120 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
-7 2018-9-7 2018-9-7 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
-8 2018-9-9 2018-9-9 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
-9 2018-9-11 2018-9-11 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
-10 2018-9-12 2018-9-12 120 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
-11 2018-9-15 2018-9-15 120 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
-12 2018-9-8 2018-9-8 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
-13 2018-9-10 2018-9-10 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
-14 2018-9-12 2018-9-12 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
-15 2018-9-13 2018-9-13 120 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
-16 2018-9-16 2018-9-16 120 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
-17 2018-9-12 2018-9-12 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
-18 2018-9-14 2018-9-14 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
-19 2018-9-16 2018-9-16 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
-20 2018-9-17 2018-9-17 120 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
-21 2018-9-20 2018-9-20 120 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
-22 2018-10-1 2018-10-1 120 110 0 [[9]] SellMail4
-23 2018-10-2 2018-10-2 110 0 [[10]] SellMail4
-24 2018-10-3 2018-10-3 110 0 [[13]] SellMail4
-25 2018-10-4 2018-10-4 110 0 [[10]] SellMail4
-26 2018-10-5 2018-10-5 110 0 [[8]] SellMail4
-27 2018-10-6 2018-10-6 110 0 [[11]] SellMail4
-28 2018-10-7 2018-10-7 110 0 [[14]] SellMail4
-29 2018-10-8 2018-10-8 110 0 [[12]] SellMail4
+1 2 3 120 50 0 [[9]] SellMail4
+2 4 4 0 50 0 [[6]] SellMail4
+3 5 5 0 50 0 [[3]] SellMail4
+4 6 6 0 50 0 [[7]] SellMail4
+5 7 7 0 50 0 [[8]] SellMail4
+5 9 10 120 50 0 [[4]] SellMail4
+7 2018-9-1 2018-9-3 120 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
+8 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 120 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+9 2018-9-7 2018-9-7 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
+10 2018-9-9 2018-9-9 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
+11 2018-9-11 2018-9-11 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
+12 2018-9-12 2018-9-12 120 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+13 2018-9-15 2018-9-15 120 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
+14 2018-9-8 2018-9-8 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
+15 2018-9-10 2018-9-10 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
+16 2018-9-12 2018-9-12 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
+17 2018-9-13 2018-9-13 120 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+18 2018-9-16 2018-9-16 120 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
+19 2018-9-12 2018-9-12 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
+20 2018-9-14 2018-9-14 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
+21 2018-9-16 2018-9-16 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
+22 2018-9-17 2018-9-17 120 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+23 2018-9-20 2018-9-20 120 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
+24 2018-10-1 2018-10-1 120 110 0 [[9]] SellMail4
+25 2018-10-2 2018-10-2 110 0 [[10]] SellMail4
+26 2018-10-3 2018-10-3 110 0 [[13]] SellMail4
+27 2018-10-4 2018-10-4 110 0 [[10]] SellMail4
+28 2018-10-5 2018-10-5 110 0 [[8]] SellMail4
+29 2018-10-6 2018-10-6 110 0 [[11]] SellMail4
+30 2018-10-7 2018-10-7 110 0 [[14]] SellMail4
+31 2018-10-8 2018-10-8 110 0 [[12]] SellMail4
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 3f6b022..ac7fdfe 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -1,13 +1,13 @@
GiftbagID GiftbagType OriginalRMB BuyCountLimit GiftItemList MainItemID NotifyKey
2 1 88 1 [(196,1,0)] 196 LimitGift3
4 2 130 1 [(913,1,0),(181,80,0)] 913 LimitGift3
-5 3 200 1 [(7002,1,0),(4608,2,0)] 7002 LimitGift3
-7 4 320 1 [(4214,1,0),(4151,200,0)] 4214 LimitGift3
+5 3 260 1 [(7002,1,0),(4608,2,0)] 7002 LimitGift3
+7 4 360 1 [(4214,1,0),(4151,200,0)] 4214 LimitGift3
8 5 600 1 [(4606,2,0),(4607,2,0)] 4606 LimitGift3
-4 6 70 1 [(4215,1,1),(4151,40,1)] 4215 LimitGift3
-5 7 210 1 [(263,1,1),(181,80,1)] 263 LimitGift3
-5 8 140 1 [(4220,1,1),(4151,80,1)] 4220 LimitGift3
-8 9 360 1 [(262,1,1),(181,200,1)] 262 LimitGift3
+4 6 110 1 [(4215,1,1),(4151,80,1)] 4215 LimitGift3
+5 7 190 1 [(263,1,1),(181,100,1)] 263 LimitGift3
+5 8 180 1 [(4220,1,1),(4151,100,1)] 4220 LimitGift3
+8 9 440 1 [(262,1,1),(181,240,1)] 262 LimitGift3
2 10 25 1 [(8353,2,1),(912,1,1),(142,50,1)] 8353 LimitGift3
2 11 40 1 [(8353,2,1),(4010,2,1),(143,30,1)] 8353 LimitGift3
2 12 25 1 [(8353,2,1),(2213,3,1),(143,30,1)] 8353 LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 9cfa377..2385f78 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -289,7 +289,7 @@
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]]}
CeremonyFireParty {"0":801,"1":802,"2":803}
CeremonyRankLimit 3280
-TJDropTaskItem {20007:[120,1104,50,'int(killCnt/25000)+min(max(killCnt-int(killCnt/25000)*25000-random.randint(1,25000),0),1)']}
+TJDropTaskItem {}
SuperGiftTimeList [[651,2],[652,2],[653,2]] []
OSSaleOpenMail [1,2,3,4,5,6,7] []
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]] -60
@@ -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/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index b1fea56..869b60e 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -122,16 +122,16 @@
702 15 0 4185 1 1 [] 4185 0 0 106 1 0 1 288 800 1 OpenTakePreferential2
703 15 0 2343 1 1 [] 0 0 0 106 1 0 1 88 380 2 OpenTakePreferential1
704 15 0 2344 1 1 [] 2344 0 0 106 1 0 1 288 1000 2 OpenTakePreferential2
-705 15 0 800 1 1 [] 800 0 0 106 1 0 1 88 240 3 OpenTakePreferential1
-706 15 0 801 1 1 [[913,1,1]] 801 0 0 106 1 0 1 288 700 3 OpenTakePreferential2
-707 15 0 3514 1 1 [[3504,1,1]] 0 0 0 106 1 0 1 88 360 4 OpenTakePreferential1
-708 15 0 3515 1 1 [[3505,1,1]] 3514 0 0 106 1 0 1 288 1080 4 OpenTakePreferential2
-709 15 0 912 1 1 [[18,1,1]] 912 0 0 106 1 0 1 88 250 5 OpenTakePreferential1
-710 15 0 913 1 1 [[15,1,1]] 913 0 0 106 1 0 1 388 888 5 OpenTakePreferential2
-711 15 0 2213 20 1 [] 0 0 0 106 1 0 1 88 250 6 OpenTakePreferential1
-712 15 0 1128 1 1 [[2213,60,1]] 1128 0 0 106 1 0 1 388 1000 6 OpenTakePreferential2
-713 15 0 852 1 1 [] 0 0 0 106 1 0 1 188 388 7 OpenTakePreferential1
-714 15 0 4606 1 1 [[4608,2,1]] 4606 0 0 106 1 0 1 688 2000 7 OpenTakePreferential2
+705 15 0 9 1 1 [[142,300,1]] 142 0 0 106 1 0 1 188 750 3 OpenTakePreferential1
+706 15 0 6 2 1 [[913,2,1]] 913 0 0 106 1 0 1 488 1800 3 OpenTakePreferential2
+707 15 0 3514 2 1 [[3504,2,1]] 3514 0 0 106 1 0 1 288 1080 4 OpenTakePreferential1
+708 15 0 3515 2 1 [[3505,2,1]] 3515 0 0 106 1 0 1 688 3240 4 OpenTakePreferential2
+709 15 0 912 1 1 [[30,588,1]] 30 0 0 106 1 0 1 188 738 5 OpenTakePreferential1
+710 15 0 913 1 1 [[30,1588,1]] 30 0 0 106 1 0 1 588 2088 5 OpenTakePreferential2
+711 15 0 2213 60 1 [[4610,1,1]] 4610 0 0 106 1 0 1 188 950 6 OpenTakePreferential1
+712 15 0 2213 140 1 [[1128,1,1]] 1128 0 0 106 1 0 1 588 2000 6 OpenTakePreferential2
+713 15 0 30 588 1 [[912,1,1]] 30 0 0 106 1 0 1 188 738 7 OpenTakePreferential1
+714 15 0 4606 2 1 [[4608,2,1]] 4606 0 0 106 1 0 1 688 3000 7 OpenTakePreferential2
751 16 1 15 1 1 [] 15 0 0 0 1 0 1 188 500 0 LimitGift6
752 17 1 4151 60 1 [] 4151 0 0 0 1 0 1 188 600 0 LimitGift6
753 18 1 181 40 1 [] 181 0 0 0 1 0 1 188 600 0 LimitGift6
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 771e1bf..3e260e7 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -237,7 +237,7 @@
1101 1 0 花粉 17 0 0 0 0 999 1 0 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1102 1 0 魂印 17 0 0 0 0 999 1 0 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1103 1 0 令牌 17 0 0 0 0 999 1 0 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-1104 1 0 技能钥匙 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 10 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+1104 1 0 技能钥匙 17 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1105 1 0 钥匙 17 0 0 0 0 999 1 0 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1106 1 0 兵刃 17 0 0 0 0 999 1 0 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1107 1 0 花粉 17 0 0 0 0 999 1 0 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 1 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 a039218..c8e36ae 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -438,9 +438,9 @@
20203007 2 0 荒漠巨兽 405 0 69355 69355 0 22 0 0 10000 72854 0 1 0 0 0 0 0 3 3000 1992925 143 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 98607095 17 10000 0 0 5 0 0 186 1 1
20302001 14 0 小宝箱 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 214 0 1
20302002 14 0 大宝箱 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 214 0 1
-20302003 2 0 秘境守卫 260 0 3677 3677 0 9 0 0 0 844 0 0 0 0 0 0 0 3 3000 896463 56 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 8490386 0 0 0 0 1 435165 22 1 1 1
+20302003 2 0 金甲蛮牛 260 0 3677 3677 0 9 0 0 0 844 0 0 0 0 0 0 0 3 3000 896463 56 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 8490386 0 0 0 0 1 435165 22 1 1 1
20302004 2 0 食灵鱼 275 0 4904 4904 0 11 0 0 0 1009 0 0 0 0 0 0 0 3 3000 973332 62 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 11271884 0 0 0 0 1 528050 25 1 1 1
-20302005 2 0 金甲蛮牛 290 0 5984 5984 0 12 0 0 0 1021 0 0 0 0 0 0 0 3 3000 1067387 69 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 13824218 0 0 0 0 1 539535 29 1 1 1
+20302005 2 0 秘境守卫 290 0 5984 5984 0 12 0 0 0 1021 0 0 0 0 0 0 0 3 3000 1067387 69 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 13824218 0 0 0 0 1 539535 29 1 1 1
20302006 2 0 灵鲛斗士 310 0 11085 11085 0 14 0 0 0 1309 0 0 0 0 0 0 0 3 3000 1347152 92 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 26647019 0 0 0 0 1 546410 33 1 1 1
20302007 2 0 紫炎灵狮 330 0 12801 12801 0 15 0 0 0 1634 0 0 0 0 0 0 0 3 3000 1461649 101 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 38316205 0 0 0 0 1 602510 38 1 1 1
20302008 2 0 金甲剑士 350 0 15108 15108 0 16 0 0 0 2028 0 0 0 0 0 0 0 3 3000 1566210 109 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 53722283 0 0 0 0 1 809985 22 1 1 1
--
Gitblit v1.8.0