From 3a4252db315a39270cbaa652f6e43dcdbec68fad Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期四, 20 九月 2018 21:16:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagActBossReborn.txt | 3 +--
db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt | 3 +--
CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt | 3 +--
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4 ++--
CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt | 3 +--
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
6 files changed, 6 insertions(+), 10 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/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/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 2601969..851f514 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
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/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..3f8fb23 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
@@ -160,7 +160,7 @@
StrengthenLevelBroadCast 20|35|50|70|90|110|130|150|170|190
LegendAttrCount {(3,0):[1,0,0],(3,1):[0,1,0],(4,0):[2,0,0],(4,1):[1,1,0],(4,2):[0,2,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,1]} {(1,0):[3,0,0],(2,0):[3,0,0],(2,1):[2,1,0],(2,2):[1,2,0],(3,0):[3,0,0],(3,1):[2,1,0],(3,2):[1,2,0],(3,3):[0,3,0],(4,0):[3,0,0],(4,1):[2,1,0],(4,2):[1,2,0],(4,3):[0,3,0],(5,0):[3,0,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,1]} 0 0 0
LegendAttrRule {1:[[15,25,44,52,54,55],[11,51,19],0],2:[[15,25,44,52,54,55],[11,51,19],0],3:[[22,45,44,53,54,55],[20,50,49],18],4:[[22,45,44,53,54,55],[20,50,49],30],5:[[22,45,44,53,54,55],[20,50,49],29],6:[[22,45,44,53,54,55],[20,50,49],14],7:[[22,45,44,53,54,55],[20,50,49],71],8:[[15,25,44,52,54,55],[11,12,70],0],9:[[15,25,44,52,54,55],[20,12,70],0],10:[[15,25,44,52,54,55],[20,12,70],0],101:[[15,25,44,52,54,55],[11,51,19],0],102:[[15,25,44,52,54,55],[11,51,19],0],103:[[22,45,44,53,54,55],[20,50,69],18],104:[[22,45,44,53,54,55],[20,50,69],30],105:[[22,45,44,53,54,55],[20,50,11],29]} 0 0 0 0
-LegendAttrValueByColor {51:{3:320,4:400,5:500,6:500},19:{3:300,4:480,5:600,6:600},11:{3:500,4:800,5:1000,6:1000},12:{3:250,4:400,5:500,6:500},70:{3:1000,4:1600,5:2000,6:2000},20:{3:200,4:320,5:400,6:400},50:{3:200,4:320,5:400,6:400},49:{3:250,4:400,5:500,6:500},15:{3:500,4:800,5:1000,6:1000},25:{3:500,4:800,5:1000,6:1000},52:{3:20,4:25,5:33,6:33},45:{3:500,4:800,5:1000,6:1000},44:{3:500,4:800,5:1000,6:1000},22:{3:200,4:320,5:400,6:400},53:{3:3,4:4,5:5,6:5},54:{3:250,4:400,5:500,6:500},55:{3:250,4:400,5:500,6:500}} 0 0 0 0
+LegendAttrValueByColor {51:{3:300,4:525,5:750,6:750},19:{3:360,4:630,5:900,6:900},11:{3:600,4:1050,5:1500,6:1500},12:{3:200,4:350,5:500,6:500},70:{3:800,4:1400,5:2000,6:2000},20:{3:240,4:420,5:600,6:600},50:{3:240,4:420,5:600,6:600},49:{3:300,4:525,5:750,6:750},15:{3:500,4:800,5:1000,6:1000},25:{3:500,4:800,5:1000,6:1000},52:{3:20,4:25,5:33,6:33},45:{3:500,4:800,5:1000,6:1000},44:{3:500,4:800,5:1000,6:1000},22:{3:200,4:320,5:400,6:400},53:{3:3,4:4,5:5,6:5},54:{3:250,4:400,5:500,6:500},55:{3:250,4:400,5:500,6:500}} 0 0 0 0
LegendAttrValueByColor2 {51:{3:200,4:320,5:400,6:400},19:{3:200,4:320,5:400,6:400},11:{3:625,4:1000,5:1250,6:1250},12:{3:250,4:400,5:500,6:500},70:{3:1000,4:1600,5:2000,6:2000},20:{3:200,4:320,5:400,6:400},50:{3:200,4:320,5:400,6:400},69:{3:250,4:400,5:500,6:500},15:{3:500,4:800,5:1000,6:1000},25:{3:500,4:800,5:1000,6:1000},52:{3:20,4:25,5:33,6:33},45:{3:500,4:800,5:1000,6:1000},44:{3:500,4:800,5:1000,6:1000},22:{3:250,4:400,5:500,6:500},53:{3:3,4:4,5:5,6:5},54:{3:250,4:400,5:500,6:500},55:{3:250,4:400,5:500,6:500}}
LegendAttrValueByClassLV {29:{9:600,10:900,11:1200,12:1320,13:1425,14:1500,15:1575},30:{9:2000,10:3000,11:4000,12:4400,13:4750,14:5000,15:5250},14:{9:1600,10:2400,11:3200,12:3520,13:3800,14:4000,15:4200},18:{9:2000,10:3000,11:4000,12:4400,13:4750,14:5000,15:5250},71:{9:800,10:1200,11:1600,12:1760,13:1900,14:2000,15:2100}} 0 0 0 0
EquipGSTypeForSort 101|102|103|104|105|106|107|108|109|110|111|112|119|120|121|122|123 0 0 0 0
--
Gitblit v1.8.0