From d821585ba893504de0da01b6f68a0206303aead3 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 28 九月 2018 19:18:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagActSpringSale.txt | 20 +++++-----
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt | 20 +++++-----
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 34 ++++++++--------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 1
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 34 ++++++++--------
6 files changed, 55 insertions(+), 54 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 27343c9..1fe5ba3 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -4,20 +4,20 @@
3 OpenServer03 [] 6 6 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
4 OpenServer04 [] 7 7 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 180 0
5 OpenServer05 [] 10 10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 280 0
-6 NationalDay [] 2018-9-1 2018-9-3 1440 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
-7 NationalDay [(1,10), (100, 110), 120] 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 1440 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
-8 1OpenServer01 [7001] 2018-9-7 2018-9-7 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-9 1OpenServer02 [7001] 2018-9-9 2018-9-9 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-10 1OpenServer03 [7001] 2018-9-11 2018-9-11 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-11 1OpenServer04 [7001] 2018-9-12 2018-9-12 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
-12 1OpenServer05 [7001] 2018-9-15 2018-9-15 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
-13 2OpenServer01 [7002] 2018-9-8 2018-9-8 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-14 2OpenServer02 [7002] 2018-9-10 2018-9-10 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-15 2OpenServer03 [7002] 2018-9-12 2018-9-12 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-16 2OpenServer04 [7002] 2018-9-13 2018-9-13 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
-17 2OpenServer05 [7002] 2018-9-16 2018-9-16 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
-18 3OpenServer01 [7003] 2018-9-12 2018-9-12 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-19 3OpenServer02 [7003] 2018-9-14 2018-9-14 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-20 3OpenServer03 [7003] 2018-9-16 2018-9-16 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-21 3OpenServer04 [7003] 2018-9-17 2018-9-17 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
-22 3OpenServer05 [7003] 2018-9-20 2018-9-20 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
+6 NationalDay [] 2018-9-1 2018-9-3 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
+7 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
+8 1OpenServer01 [7001] 2018-9-7 2018-9-7 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+9 1OpenServer02 [7001] 2018-9-9 2018-9-9 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+10 1OpenServer03 [7001] 2018-9-11 2018-9-11 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+11 1OpenServer04 [7001] 2018-9-12 2018-9-12 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
+12 1OpenServer05 [7001] 2018-9-15 2018-9-15 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
+13 2OpenServer01 [7002] 2018-9-8 2018-9-8 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+14 2OpenServer02 [7002] 2018-9-10 2018-9-10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+15 2OpenServer03 [7002] 2018-9-12 2018-9-12 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+16 2OpenServer04 [7002] 2018-9-13 2018-9-13 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
+17 2OpenServer05 [7002] 2018-9-16 2018-9-16 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
+18 3OpenServer01 [7003] 2018-9-12 2018-9-12 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+19 3OpenServer02 [7003] 2018-9-14 2018-9-14 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+20 3OpenServer03 [7003] 2018-9-16 2018-9-16 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+21 3OpenServer04 [7003] 2018-9-17 2018-9-17 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
+22 3OpenServer05 [7003] 2018-9-20 2018-9-20 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index b4a5893..c947958 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -1,11 +1,11 @@
CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime AdvanceMinutes NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV IsDayReset
-1 test1 [] 2018-7-24 2018-7-31 0 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 50 1
-2 test2 [] 2018-5-1 2018-5-3 12:00|18:00 13:00|19:00 0 {} {} [120, "LimitGift1"] 50 1
-3 NationalDay [] 2018-9-1 2018-9-3 0 {} {} [120, "LimitGift1"] 50 1
-4 NationalDay [(1,10), (100, 110), 120] 2018-9-1 2018-9-3 0 {} {} [120, "LimitGift1"] 50 1
-5 NationalDay [(200, 210)] 2018-9-1 2018-9-3 0 {} {} [120, "LimitGift1"] 50 1
-6 New1 [] 2018-8-5 2018-8-5 0 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
-7 New2 [] 2018-8-7 2018-8-7 0 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
-8 New3 [] 2018-8-9 2018-8-9 0 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
-9 New4 [] 2018-8-11 2018-8-11 0 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
-10 New5 [] 2018-8-13 2018-8-13 0 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
+1 test1 [] 2018-7-24 2018-7-31 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 50 1
+2 test2 [] 2018-5-1 2018-5-3 12:00|18:00 13:00|19:00 120 {} {} [120, "LimitGift1"] 50 1
+3 NationalDay [] 2018-9-1 2018-9-3 120 {} {} [120, "LimitGift1"] 50 1
+4 NationalDay [(1,10), (100, 110), 120] 2018-9-1 2018-9-3 120 {} {} [120, "LimitGift1"] 50 1
+5 NationalDay [(200, 210)] 2018-9-1 2018-9-3 120 {} {} [120, "LimitGift1"] 50 1
+6 New1 [] 2018-8-5 2018-8-5 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
+7 New2 [] 2018-8-7 2018-8-7 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
+8 New3 [] 2018-8-9 2018-8-9 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
+9 New4 [] 2018-8-11 2018-8-11 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
+10 New5 [] 2018-8-13 2018-8-13 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
index ec79bf5..ede57ea 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index ff71ec4..2d9cae7 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -4,20 +4,20 @@
3 6 6 120 50 0 [[1]] SellMail4 [[181,2,1],[4151,2,1]]
4 7 7 0 180 0 [[3]] SellMail4 [[181,2,1],[4151,2,1]]
5 10 10 120 280 0 [[5]] SellMail4 [[181,2,1],[4151,2,1]]
-6 2018-9-1 2018-9-3 1440 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
-7 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 1440 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
-8 2018-9-7 2018-9-7 0 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
-9 2018-9-9 2018-9-9 0 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
-10 2018-9-11 2018-9-11 0 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
-11 2018-9-12 2018-9-12 0 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
-12 2018-9-15 2018-9-15 0 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
-13 2018-9-8 2018-9-8 0 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
-14 2018-9-10 2018-9-10 0 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
-15 2018-9-12 2018-9-12 0 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
-16 2018-9-13 2018-9-13 0 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
-17 2018-9-16 2018-9-16 0 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
-18 2018-9-12 2018-9-12 0 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
-19 2018-9-14 2018-9-14 0 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
-20 2018-9-16 2018-9-16 0 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
-21 2018-9-17 2018-9-17 0 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
-22 2018-9-20 2018-9-20 0 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
+6 2018-9-1 2018-9-3 120 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
+7 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]]
+8 2018-9-7 2018-9-7 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
+9 2018-9-9 2018-9-9 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
+10 2018-9-11 2018-9-11 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
+11 2018-9-12 2018-9-12 120 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+12 2018-9-15 2018-9-15 120 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
+13 2018-9-8 2018-9-8 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
+14 2018-9-10 2018-9-10 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
+15 2018-9-12 2018-9-12 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
+16 2018-9-13 2018-9-13 120 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+17 2018-9-16 2018-9-16 120 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
+18 2018-9-12 2018-9-12 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
+19 2018-9-14 2018-9-14 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
+20 2018-9-16 2018-9-16 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
+21 2018-9-17 2018-9-17 120 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+22 2018-9-20 2018-9-20 120 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index 8004c3b..42fe534 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -1,11 +1,11 @@
CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset ShopTypeList MailKey MailItemPrize
-1 2018-7-24 2018-7-31 0 50 1 [[16],[17],[18],[20],[21],[22],[23],[24]] SellMail3 [[13,2,1],[2,2,1]]
-2 2018-5-1 2018-5-3 12:00|18:00 13:00|19:00 0 50 1 [[16,17],[16,17],[16,17]] SellMail3 [[13,2,1],[2,2,1]]
-3 2018-9-1 2018-9-3 0 50 1 [[16],[17],[18]] SellMail3 [[13,2,1],[2,2,1]]
-4 2018-9-1 2018-9-3 0 50 1 [[16],[17],[18]] SellMail3 [[13,2,1],[2,2,1]]
-5 2018-9-1 2018-9-3 0 50 1 [[16],[17],[18]] SellMail3 [[13,2,1],[2,2,1]]
-6 2018-8-5 2018-8-5 0 100 1 [[25]] SellMail3 [[13,2,1],[2,2,1]]
-7 2018-8-7 2018-8-7 0 100 1 [[26]] SellMail3 [[13,2,1],[2,2,1]]
-8 2018-8-9 2018-8-9 0 100 1 [[27]] SellMail3 [[13,2,1],[2,2,1]]
-9 2018-8-11 2018-8-11 0 100 1 [[28]] SellMail3 [[13,2,1],[2,2,1]]
-10 2018-8-13 2018-8-13 0 100 1 [[29]] SellMail3 [[13,2,1],[2,2,1]]
+1 2018-7-24 2018-7-31 120 50 1 [[16],[17],[18],[20],[21],[22],[23],[24]] SellMail3 [[13,2,1],[2,2,1]]
+2 2018-5-1 2018-5-3 12:00|18:00 13:00|19:00 120 50 1 [[16,17],[16,17],[16,17]] SellMail3 [[13,2,1],[2,2,1]]
+3 2018-9-1 2018-9-3 120 50 1 [[16],[17],[18]] SellMail3 [[13,2,1],[2,2,1]]
+4 2018-9-1 2018-9-3 120 50 1 [[16],[17],[18]] SellMail3 [[13,2,1],[2,2,1]]
+5 2018-9-1 2018-9-3 120 50 1 [[16],[17],[18]] SellMail3 [[13,2,1],[2,2,1]]
+6 2018-8-5 2018-8-5 120 100 1 [[25]] SellMail3 [[13,2,1],[2,2,1]]
+7 2018-8-7 2018-8-7 120 100 1 [[26]] SellMail3 [[13,2,1],[2,2,1]]
+8 2018-8-9 2018-8-9 120 100 1 [[27]] SellMail3 [[13,2,1],[2,2,1]]
+9 2018-8-11 2018-8-11 120 100 1 [[28]] SellMail3 [[13,2,1],[2,2,1]]
+10 2018-8-13 2018-8-13 120 100 1 [[29]] SellMail3 [[13,2,1],[2,2,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 4286bc6..92849b8 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -295,3 +295,4 @@
FairyGrabBoss {50103001:{1:[[2352,1,1]],2:[[2353,1,1]],3:[[2354,1,1]]},50103002:{1:[[2356,1,1]],2:[[2357,1,1]],3:[[2358,1,1]]},50103003:{1:[[2360,1,1]],2:[[2361,1,1]],3:[[2362,1,1]]},50103004:{1:[[2364,1,1]],2:[[2365,1,1]],3:[[2366,1,1]]},50103005:{1:[[2368,1,1]],2:[[2369,1,1]],3:[[2370,1,1]]},50103006:{1:[[2372,1,1]],2:[[2373,1,1]],3:[[2374,1,1]]},50103007:{1:[[2376,1,1]],2:[[2377,1,1]],3:[[2378,1,1]]}} 2 {50103001:[[2351,1,1]],50103002:[[2355,1,1]],50103003:[[2359,1,1]],50103004:[[2363,1,1]],50103005:[[2367,1,1]],50103006:[[2371,1,1]],50103007:[[2375,1,1]]} [[10, "FairyGrabBossWillKill"]]
SamboSpecialUnlock 9001|9002|9003|9004|9005|9006|9007|9008|9009|9010|9011|9012|9013|9014|9015|9016|9017|9018
BindJadeWheelCfg 88 {"1":110,"2":130,"3":150,"4":150,"5":200,"6":200,"7":300,"8":300,"9":588} [(3879,1),(7379,2),(8379,3),(9379,4),(9679,5),(9979,6),(9989,7),(9999,8),(10000)] {1:[(6000,3),(10000,5)]} [[0,20],[20,40],[40,60],[60,80],[80,100],[100,120],[120,140],[140,200],[200,360]]
+BindJadeWheelNotice 150
--
Gitblit v1.8.0