From ccaac29e87b8ce326933ba45125a442a701f54e0 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期四, 20 九月 2018 21:08:36 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagActCostRebate.txt | 1 +
db/PyMongoDataServer/PySysDB/tagActBossReborn.txt | 3 +--
db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt | 3 +--
CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt | 3 +--
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt | 1 +
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt | 3 +--
7 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index 15e3cb8..933f06c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -1,3 +1,2 @@
CfgID ActMark ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd LimitLV TemplateID
-1 test1 [] 2018-7-16 2018-7-18 1 {0:["BossFHOpen", []]} {} 110 1
-2 test2 [] 2018-9-13 2018-9-15 1 {0:["BossFHOpen", []]} {} 110 2
+1 OpenSever [] 9 10 1 {0:["BossFHOpen", []]} {} 110 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index 4f2b592..88a4368 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -3,3 +3,4 @@
2 test2 [24,30] 2018-7-13 2018-7-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate4"] 1
3 NationalDay [] 2018-9-13 2018-9-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate4"] 1
4 NationalDay1 [24] 2018-9-13 2018-9-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate4"] 1
+5 test3 [] 5 6 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate4"] 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
index f0508ab..2ab47b2 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
@@ -1,3 +1,2 @@
CfgID ActMark ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd Multiple LimitLV
-1 test1 [] 2018-7-31 2018-8-3 1 {} {} 3 110
-2 test2 [] 2018-9-13 2018-9-15 1 {} {} 3 110
+1 opensever [] 7 8 1 {} {} 2 110
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index 739ff39..d0cc53a 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -1,3 +1,2 @@
CfgID StartDate EndDate ResetType LimitLV TemplateID
-1 2018-7-16 2018-7-18 1 110 1
-2 2018-9-13 2018-9-15 1 110 2
+1 9 10 1 110 1
diff --git a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
index 5c0e8f0..ea60537 100644
--- a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
@@ -3,3 +3,4 @@
2 2018-7-13 2018-7-15 50 1 3
3 2018-9-13 2018-9-15 50 1 1|2|3
4 2018-9-13 2018-9-15 50 1 1
+5 5 6 50 1 1
diff --git a/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt b/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
index 43370bb..e571355 100644
--- a/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
@@ -1,3 +1,2 @@
CfgID Multiple LimitLV
-1 3 110
-2 3 110
+1 2 110
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index b80a351..e40c0b3 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -126,7 +126,7 @@
FamilyRedPacketGoldLimit 1000 0 0 0 0
FamilyBossWeekNum 5 0 0 0 0
FamilyBossNeedFood 6000 0 0 0 0
-SWRHFamilyLV 2
+SWRHFamilyLV 3
TechFamilyLV 3
FamilyStoreItemRule1 1|2|3|4|5|6|7 0|1|0 0 0 0
FamilyStoreItemRule2 8|9|10 4|0|3 0 0 0
--
Gitblit v1.8.0