~admin/snxx_server.git

parent: b1e5cb9a | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua-TT

2018-09-20 ccaac29e87b8ce326933ba45125a442a701f54e0

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

7个文件已修改

	CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagActBossReborn.txt	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagActCostRebate.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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


 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


 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


 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


 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


 db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt

@@ -1,3 +1,2 @@
CfgID    Multiple    LimitLV

1    3    110

2    3    110

1    2    110


 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

			@@ -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

			@@ -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

			@@ -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

			@@ -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

			@@ -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

			@@ -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