From 7d7897bb7e5f2435dd25192e9971d8ce6c2bc5ac Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期二, 27 十一月 2018 17:05:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagActSpringSale.txt | 17 ++++++++
db/PyMongoDataServer/PySysDB/tagStore.txt | 16 ++++----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_20.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 20 ++++++++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt | 17 ++++++++
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 6 +++
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 12 +++---
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 6 +++
10 files changed, 80 insertions(+), 14 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 3ba78ec..df18b04 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -45,3 +45,9 @@
44 WooliesSection8 [] [] 2018-11-23 2018-11-23 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
45 WooliesSection9 [] [] 2018-11-25 2018-11-25 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
46 WooliesSection10 [] [] 2018-11-26 2018-11-26 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+47 December1 [] [] 2018-11-29 2018-11-29 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+48 December2 [] [] 2018-11-30 2018-11-30 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+49 December3 [] [] 2018-12-1 2018-12-1 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+50 December4 [] [] 2018-12-2 2018-12-2 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+51 December5 [] [] 2018-12-3 2018-12-3 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+52 December6 [] [] 2018-12-4 2018-12-4 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index 8eb8bc1..4859958 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -17,3 +17,20 @@
16 NationalDay06 [] [(7001,7003), (8002, 8004)] 2018-10-6 2018-10-6 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
17 NationalDay07 [] [(7001,7003), (8002, 8004)] 2018-10-7 2018-10-7 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
18 NationalDay08 [] [(7001,7003), (8002, 8004)] 2018-10-8 2018-10-8 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+19 New4 [] [] 2018-10-11 2018-10-11 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 100 1
+20 New5 [] [] 2018-10-12 2018-10-12 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 100 1
+21 WooliesSection1 [] [] 2018-11-14 2018-11-14 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+22 WooliesSection2 [] [] 2018-11-15 2018-11-15 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+23 WooliesSection3 [] [] 2018-11-16 2018-11-16 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+24 WooliesSection4 [] [] 2018-11-17 2018-11-17 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+25 WooliesSection5 [] [] 2018-11-18 2018-11-18 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+26 WooliesSection6 [] [] 2018-11-19 2018-11-19 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+27 New1 [] [] 2018-11-21 2018-11-21 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+28 New2 [] [] 2018-11-24 2018-11-24 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+29 New3 [] [] 2018-11-25 2018-11-25 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+30 New4 [] [] 2018-11-26 2018-11-26 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+31 New5 [] [] 2018-11-27 2018-11-27 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+32 December1 [] [] 2018-11-29 2018-11-29 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+33 December2 [] [] 2018-11-30 2018-11-30 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+34 December3 [] [] 2018-12-3 2018-12-3 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+35 December4 [] [] 2018-12-4 2018-12-4 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 10463b5..889a3c1 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -183,12 +183,12 @@
774 108 0 0
775 109 0 0
776 110 0 0
-777 110 0 0
-778 111 0 0
-779 112 0 0
-780 113 0 0
-781 113 0 0
-782 114 0 0
+777 111 0 0
+778 112 0 0
+779 113 0 0
+780 114 0 0
+781 115 0 0
+782 116 0 0
801 19 0 0
802 19 0 0
803 19 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc
index 91ce63e..f93491a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_20.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_20.pyc
index 669c0cc..376e62b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_20.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_20.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 eaa7330..e676ed3 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/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index b7b82b8..455857e 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -45,3 +45,9 @@
44 2018-11-23 2018-11-23 50 0 [[34]] SellMail4
45 2018-11-25 2018-11-25 120 50 0 [[35]] SellMail4
46 2018-11-26 2018-11-26 50 0 [[36]] SellMail4
+47 2018-11-29 2018-11-29 120 50 0 [[37]] SellMail4
+48 2018-11-30 2018-11-30 50 0 [[38]] SellMail4
+49 2018-12-1 2018-12-1 120 50 0 [[39]] SellMail4
+50 2018-12-2 2018-12-2 50 0 [[40]] SellMail4
+51 2018-12-3 2018-12-3 50 0 [[41]] SellMail4
+52 2018-12-4 2018-12-4 50 0 [[42]] SellMail4
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index 8fbb837..10d5791 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -17,3 +17,20 @@
16 2018-10-6 2018-10-6 110 0 [[36]] SellMail3
17 2018-10-7 2018-10-7 110 0 [[31]] SellMail3
18 2018-10-8 2018-10-8 110 0 [[37]] SellMail3
+19 2018-10-11 2018-10-11 120 100 1 [[28]] SellMail3
+20 2018-10-12 2018-10-12 120 100 1 [[29]] SellMail3
+21 2018-11-14 2018-11-14 120 110 0 [[109]] SellMail3
+22 2018-11-15 2018-11-15 110 0 [[110]] SellMail3
+23 2018-11-16 2018-11-16 110 0 [[111]] SellMail3
+24 2018-11-17 2018-11-17 110 0 [[112]] SellMail3
+25 2018-11-18 2018-11-18 110 0 [[113]] SellMail3
+26 2018-11-19 2018-11-19 110 0 [[114]] SellMail3
+27 2018-11-21 2018-11-21 120 110 0 [[109]] SellMail3
+28 2018-11-24 2018-11-24 120 110 0 [[110]] SellMail3
+29 2018-11-25 2018-11-25 110 0 [[111]] SellMail3
+30 2018-11-26 2018-11-26 110 0 [[112]] SellMail3
+31 2018-11-27 2018-11-27 110 0 [[113]] SellMail3
+32 2018-11-29 2018-11-29 120 110 0 [[109]] SellMail3
+33 2018-11-30 2018-11-30 110 0 [[110]] SellMail3
+34 2018-12-3 2018-12-3 110 0 [[111]] SellMail3
+35 2018-12-4 2018-12-4 110 0 [[112]] SellMail3
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index b5d9f58..a431223 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -21,3 +21,23 @@
4 20 80 1 [(913,1,1),(181,30,1)] 913 LimitGift3
7 21 260 1 [(4214,1,1),(4151,100,1)] 4214 LimitGift3
4 22 60 1 [(265,1,1),(181,30,1)] 265 LimitGift3
+2 23 25 1 [(2213,20,1)] 2213 LimitGift3
+2 24 27 1 [(3514,1,1)] 3514 LimitGift3
+2 25 27 1 [(4694,9,1)] 4694 LimitGift3
+2 26 25 1 [(4151,25,1)] 4151 LimitGift3
+2 27 35 1 [(1128,1,1),(4657,1,1)] 1128 LimitGift3
+4 28 100 1 [(4680,1,1),(4681,1,1)] 4680 LimitGift3
+4 29 110 1 [(4694,6,1),(913,1,1)] 913 LimitGift3
+4 30 100 1 [(2213,40,1),(4608,1,1)] 4608 LimitGift3
+2 31 33 1 [(4184,1,1),(5303,100,1)] 4184 LimitGift3
+4 32 100 1 [(4680,1,1),(4681,1,1)] 4681 LimitGift3
+2 33 33 1 [(2213,10,1),(4610,1,1)] 4610 LimitGift3
+4 34 130 1 [(4606,1,1),(2213,20,1)] 4606 LimitGift3
+4 35 110 1 [(4694,6,1),(913,1,1)] 913 LimitGift3
+2 36 30 1 [(108,5,1),(109,1,1)] 109 LimitGift3
+2 37 34 1 [(4007,3,1),(30,100,1)] 4007 LimitGift3
+4 38 1000 1 [(4680,1,1),(4681,1,1)] 4680 LimitGift3
+2 39 30 1 [(191,2,1),(30,100,1)] 191 LimitGift3
+4 40 1100 1 [(4694,6,1),(913,1,1)] 4694 LimitGift3
+2 41 33 1 [(2213,10,1),(4610,1,1)] 2213 LimitGift3
+4 42 1100 1 [(4151,100,1),(1500,4,1)] 4151 LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index bedf793..0d9a25d 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -181,14 +181,14 @@
772 108 1 153 80 1 [[147,6,1]] 153 0 0 0 1 0 1 88 630 0 LimitGift6
773 108 1 4606 1 1 [[2213,70,1]] 4606 0 0 0 1 0 1 288 8750 0 LimitGift7
774 108 1 982 10 1 [] 982 0 0 0 1 0 1 888 2500 0 LimitGift8
-775 109 1 4007 2 1 [[30,100,1]] 4007 0 0 0 1 0 1 88 260 0 LimitGift6
-776 110 1 1503 2 1 [[966,2,1]] 1503 0 0 0 1 0 1 88 300 0 LimitGift6
-777 110 1 153 200 1 [[5303,500,1]] 153 0 0 0 1 0 1 588 1700 0 LimitGift7
-778 111 1 912 2 1 [] 912 0 0 0 1 0 1 88 300 0 LimitGift6
-779 112 1 983 30 1 [] 983 0 0 0 1 0 1 188 900 0 LimitGift6
-780 113 1 4181 5 1 [[4182,1,1]] 4182 0 0 0 1 0 1 88 550 0 LimitGift6
-781 113 1 2346 6 1 [] 2346 0 0 0 1 0 1 588 1620 0 LimitGift7
-782 114 1 4007 6 1 [[144,100,1]] 4007 0 0 0 1 0 1 188 780 0 LimitGift6
+775 109 1 913 1 1 [[109,6,1]] 913 0 0 0 1 0 1 388 1400 0 LimitGift6
+776 110 1 4664 2 1 [[4673,2,1]] 4664 0 0 0 1 0 1 88 320 0 LimitGift6
+777 111 1 4606 1 1 [[2213,25,1]] 4606 0 0 0 1 0 1 388 1375 0 LimitGift7
+778 112 1 181 10 1 [[4151,20,1]] 181 0 0 0 1 0 1 88 300 0 LimitGift6
+779 113 1 983 30 1 [] 983 0 0 0 1 0 1 188 900 0 LimitGift6
+780 114 1 4181 5 1 [[4182,1,1]] 4182 0 0 0 1 0 1 88 550 0 LimitGift6
+781 115 1 2346 6 1 [] 2346 0 0 0 1 0 1 588 1620 0 LimitGift7
+782 116 1 4007 6 1 [[144,100,1]] 4007 0 0 0 1 0 1 188 780 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