From b36fd4b1b38a4414e694044978665b9e0e35482f Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期二, 15 一月 2019 21:32:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt | 1 +
db/PyMongoDataServer/PySysDB/tagActBossReborn.txt | 1 +
db/PyMongoDataServer/PySysDB/tagActSpringSale.txt | 3 +++
db/PyMongoDataServer/PySysDB/tagStore.txt | 3 +++
CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 1 +
db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 1 +
CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt | 1 +
db/PyMongoDataServer/PySysDB/tagActExpRate.txt | 1 +
CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt | 1 +
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 9 ++++-----
db/PyMongoDataServer/PySysDB/tagActWishingWell.txt | 1 +
db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt | 1 +
CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt | 3 +++
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 2 ++
CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt | 10 +++++-----
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 3 +++
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 2 ++
18 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index 26d2183..d7e339d 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -12,3 +12,4 @@
12 sdq1228 [] [] 2018-12-28 2018-12-30 1 {0:["BossFHOpen", []]} {} 110 1
13 sdq0102 [] [] 2019-1-2 2019-1-4 1 {0:["BossFHOpen", []]} {} 110 1
14 20190111 [] [] 2019-1-11 2019-1-13 1 {0:["BossFHOpen", []]} {} 110 1
+15 20190121 [] [] 2019-1-21 2019-1-23 1 {0:["BossFHOpen", []]} {} 110 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index 705754b..86b3f6e 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -12,3 +12,4 @@
11 JanuaryExp1 [] [] 2019-1-2 2019-1-2 18:00 20:00 { 0:["ExpActivity_Start", [3]]} {-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]} [30, "ExpActivity_Goahead", [3]] 110 20000
12 JanuaryExp2 [] [] 2019-1-6 2019-1-6 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
13 20190113 [] [] 2019-1-13 2019-1-13 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
+14 20190119 [] [] 2019-1-19 2019-1-19 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 0a89f25..582eb81 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -71,3 +71,5 @@
70 Jan4 [] [] 2019-1-9 2019-1-9 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
71 20190111 [] [] 2019-1-11 2019-1-11 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
72 20190113 [] [] 2019-1-13 2019-1-13 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+73 20190117 [] [] 2019-1-17 2019-1-17 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+74 20190120 [] [] 2019-1-20 2019-1-20 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
index 3fd730e..d1dc0ee 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
@@ -1,3 +1,4 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd Multiple LimitLV LimitPoint
1 opensever [] [] 6 7 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
2 Jan01 [] [] 2019-1-3 2019-1-4 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
+3 20190120 [] [] 2019-1-20 2019-1-20 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index fc24763..f6ae72b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -45,3 +45,6 @@
44 Jan4 [] [] 2019-1-6 2019-1-6 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
45 20190112 [] [] 2019-1-12 2019-1-12 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
46 20190115 [] [] 2019-1-15 2019-1-15 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+47 20190119 [] [] 2019-1-19 2019-1-19 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+48 20190121 [] [] 2019-1-21 2019-1-21 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+49 20190123 [] [] 2019-1-23 2019-1-23 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index 9ec299f..e8e65b0 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -18,3 +18,4 @@
17 sdq0108 [] [] 2019-1-8 2019-1-8 1 0 {0:["XYCOpen", []]} {} [] 110
18 20190110 [] [] 2019-1-10 2019-1-10 1 0 {0:["XYCOpen", []]} {} [] 110
19 20190114 [] [] 2019-1-14 2019-1-14 1 0 {0:["XYCOpen", []]} {} [] 110
+20 20190117 [] [] 2019-1-17 2019-1-19 1 0 {0:["XYCOpen", []]} {} [] 110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
index 7f011c5..34b4c19 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
@@ -80,8 +80,8 @@
40103001 32020 1920 [] 0 0 2078 100 跨服Boss
40103002 32020 2880 [] 0 0 2079 100 跨服Boss
40103003 32020 3600 [] 0 0 2080 100 跨服Boss
-40103004 32020 4800 [] 0 0 2081 100 跨服Boss
-40103005 32020 5760 [] 0 0 2082 100 跨服Boss
-40103006 32020 5760 [] 0 0 2083 100 跨服Boss
-40103007 32020 7200 [] 0 0 2084 100 跨服Boss
-40103008 32020 9600 [] 0 0 2085 100 跨服Boss
+40103004 32020 4110 [] 0 0 2081 100 跨服Boss
+40103005 32020 4800 [] 0 0 2082 100 跨服Boss
+40103006 32020 5240 [] 0 0 2083 100 跨服Boss
+40103007 32020 5760 [] 0 0 2084 100 跨服Boss
+40103008 32020 6400 [] 0 0 2085 100 跨服Boss
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 692b15c..6db674d 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -216,6 +216,9 @@
791 125 0 0
792 126 0 0
793 127 0 0
+794 128 0 0
+795 129 0 0
+796 130 0 0
801 19 0 0
802 19 0 0
803 19 0 0
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
index 350226e..92b7aef 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index c80b0ef..667f856 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -12,3 +12,4 @@
12 2018-12-28 2018-12-30 1 110 1
13 2019-1-2 2019-1-4 1 110 1
14 2019-1-11 2019-1-13 1 110 1
+15 2019-1-21 2019-1-23 1 110 1
diff --git a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
index 6e55650..fb867aa 100644
--- a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
@@ -12,3 +12,4 @@
11 110 20000
12 110 10000
13 110 10000
+14 110 10000
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 3dcddd8..32ae2a1 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -71,3 +71,5 @@
70 2019-1-9 2019-1-9 110 0 [[59]] SellMail4
71 2019-1-11 2019-1-11 110 0 [[60]] SellMail4
72 2019-1-13 2019-1-13 110 0 [[61]] SellMail4
+73 2019-1-17 2019-1-17 110 0 [[61]] SellMail4
+74 2019-1-20 2019-1-20 110 0 [[63]] SellMail4
diff --git a/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt b/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
index ae53aea..cff6044 100644
--- a/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
@@ -1,3 +1,4 @@
CfgID Multiple LimitLV LimitPoint
1 2 110 3000
2 2 110 3000
+3 2 110 3000
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index f031d7b..8818e63 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -45,3 +45,6 @@
44 2019-1-6 2019-1-6 110 0 [[125]] SellMail3
45 2019-1-12 2019-1-12 110 0 [[127]] SellMail3
46 2019-1-15 2019-1-15 110 0 [[126]] SellMail3
+47 2019-1-19 2019-1-19 110 0 [[128]] SellMail3
+48 2019-1-21 2019-1-21 110 0 [[129]] SellMail3
+49 2019-1-23 2019-1-23 110 0 [[130]] SellMail3
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index 082bff8..cd7340c 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -18,3 +18,4 @@
17 2019-1-8 2019-1-8 1 0 110 1
18 2019-1-10 2019-1-10 1 0 110 1
19 2019-1-14 2019-1-14 1 0 110 1
+20 2019-1-17 2019-1-19 1 0 110 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index cef7d95..1c508c2 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -61,3 +61,4 @@
4 60 125 1 [(4680,1,1),(4681,2,1)] 4680 LimitGift3
4 61 130 1 [(913,1,1),(4694,8,1)] 913 LimitGift3
8 62 440 1 [(4223,1,1),(4151,25,1)] 262 LimitGift3
+4 63 108 1 [(110,60,1),(112,12,1)] 913 LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index ce5043f..0da1334 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -179,11 +179,10 @@
60203022 0 655 0 0 [(500000,0),(1000000,(11,2,107))] 5 {(11,3,107):2600000} 1 {} {3:[(10000,0)]} [] [] {987:1000000,4609:15000,3801:4000,4610:15000,4609:4000,4606:1000,2324:1000000} {2321:2} {} {2:21800000} {2:1} 0 0 0 0 [] []
60203023 0 680 0 0 [(500000,0),(1000000,(11,2,107))] 5 {(11,3,107):2600000} 1 {} {3:[(10000,0)]} [] [] {987:1000000,4609:15000,3801:4000,4610:15000,4609:4000,4606:1000,2324:1000000} {2321:2} {} {2:21800000} {2:1} 0 0 0 0 [] []
60203024 0 705 0 0 [(500000,0),(1000000,(12,2,107))] 5 {(12,3,107):2600000} 1 {} {3:[(10000,0)]} [] [] {987:1000000,4609:15000,3801:4000,4610:15000,4609:4000,4606:1000,2324:1000000} {2321:2} {} {2:21800000} {2:1} 0 0 0 0 [] []
-30903001 150 0 0 0 [(250000,0),(375000,(3,2,107)),(918750,(3,3,107)),(1000000,(3,4,107)),(1000000,(3,5,107))] 80 {(3,4,107):2000000} 1 {4:8,5:0} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
-30903001 200 0 0 0 [(250000,0),(375000,(4,2,107)),(918750,(4,3,107)),(987500,(4,4,107)),(1000000,(4,5,107))] 80 {(4,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
-30903001 250 0 0 0 [(250000,0),(375000,(5,2,107)),(918750,(5,3,107)),(987500,(5,4,107)),(1000000,(5,5,107))] 80 {(5,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
-30903001 300 0 0 0 [(250000,0),(375000,(6,2,107)),(918750,(6,3,107)),(987500,(6,4,107)),(1000000,(6,5,107))] 80 {(6,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
-30903001 350 0 0 0 [(250000,0),(375000,(7,2,107)),(918750,(7,3,107)),(987500,(7,4,107)),(1000000,(7,5,107))] 80 {(7,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
+30903001 185 0 0 0 [(250000,0),(375000,(4,2,107)),(918750,(4,3,107)),(987500,(4,4,107)),(1000000,(4,5,107))] 80 {(4,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
+30903001 235 0 0 0 [(250000,0),(375000,(5,2,107)),(918750,(5,3,107)),(987500,(5,4,107)),(1000000,(5,5,107))] 80 {(5,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
+30903001 275 0 0 0 [(250000,0),(375000,(6,2,107)),(918750,(6,3,107)),(987500,(6,4,107)),(1000000,(6,5,107))] 80 {(6,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
+30903001 320 0 0 0 [(250000,0),(375000,(7,2,107)),(918750,(7,3,107)),(987500,(7,4,107)),(1000000,(7,5,107))] 80 {(7,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
30903001 400 0 0 0 [(250000,0),(375000,(8,2,107)),(918750,(8,3,107)),(987500,(8,4,107)),(1000000,(8,5,107))] 80 {(8,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
30903001 450 0 0 0 [(250000,0),(375000,(9,2,107)),(918750,(9,3,107)),(987500,(9,4,107)),(1000000,(9,5,107))] 80 {(9,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
30903001 500 0 0 0 [(250000,0),(375000,(10,2,107)),(918750,(10,3,107)),(987500,(10,4,107)),(1000000,(10,5,107))] 80 {(10,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 2a93d75..3bc5c44 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -216,6 +216,9 @@
791 125 1 913 1 1 [[4694,10,1]] 913 0 0 0 1 0 1 388 1500 0 LimitGift6
792 126 1 912 1 1 [[2213,20,1]] 912 0 0 0 1 0 1 88 400 0 LimitGift6
793 127 1 112 20 1 [[110,60,1]] 112 0 0 0 1 0 1 388 1320 0 LimitGift6
+794 128 1 4606 1 1 [[2213,50,1]] 4606 0 0 0 1 0 1 388 1625 0 LimitGift6
+795 129 1 912 1 1 [[2213,15,1]] 912 0 0 0 1 0 1 88 338 0 LimitGift6
+796 130 1 106 3 1 [[104,60,1]] 106 0 0 0 1 0 1 88 300 0 LimitGift6
801 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
--
Gitblit v1.8.0