~admin/snxx_server.git

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

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

cehua_wcy

2019-01-31 fcdcc6d976fd50681622d03e577f2aa8cdb18291

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

8个文件已修改

	CoreServerGroup/GameServer/PySysDB/tagActNewFairyCeremony.txt	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/PySysDB/tagActNewFairyCeremony.txt

@@ -1,3 +1,3 @@
CfgID    ActMark    PlatformList    ServerIDList    StartDate    EndDate    ResetType    NotifyInfoStart    NotifyInfoEnd    LimitLV

1    test1    []    []    2019-2-8    2019-2-8    2    {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}    {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}    110

2    test2    []    []    2019-2-19    2019-2-19    2    {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}    {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}    110

1    test1    []    []    2019-2-8    2019-2-8    2    {0:["NewCeremonyStart", []],30:["NewCeremonyStart", []],60:["NewCeremonyStart", []],180:["NewCeremonyStart", []],360:["NewCeremonyStart", []]}    {-60:["NewCeremonyEnd", []],-30:["NewCeremonyEnd", []],0:["NewCeremonyOver", []]}    110

2    test2    []    []    2019-2-19    2019-2-19    2    {0:["NewCeremonyStart", []],30:["NewCeremonyStart", []],60:["NewCeremonyStart", []],180:["NewCeremonyStart", []],360:["NewCeremonyStart", []]}    {-60:["NewCeremonyEnd", []],-30:["NewCeremonyEnd", []],0:["NewCeremonyOver", []]}    110


 CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt

@@ -51,10 +51,10 @@
30303014    31031    5800    [1,500]    40    5    2051    100    BOSS之家三层

30303015    31031    6700    [1,500]    40    5    2052    100    BOSS之家三层

30303016    31031    7000    [1,500]    40    5    2053    100    BOSS之家三层

30303017    31360    6000    [1,500]    40    5    2050    100    BOSS之家四层

30303018    31360    6500    [1,500]    40    5    2051    100    BOSS之家四层

30303019    31360    6700    [1,500]    40    5    2052    100    BOSS之家四层

30303020    31360    7200    [1,500]    40    5    2053    100    BOSS之家四层

30303017    31360    6000    [1,500]    40    5    2061    100    BOSS之家四层

30303018    31360    6500    [1,500]    40    5    2062    100    BOSS之家四层

30303019    31360    6700    [1,500]    40    5    2063    100    BOSS之家四层

30303020    31360    7200    [1,500]    40    5    2064    100    BOSS之家四层

31503001    31150    1350    [1,500]    40    5    2031    100    古神禁地

31503002    31150    1700    [1,500]    40    5    2032    100    古神禁地

31503003    31150    2150    [1,500]    40    5    2033    100    古神禁地


 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt

@@ -51,10 +51,10 @@
30303014    31031    91    0    0    0    2051

30303015    31031    92    0    0    0    2052

30303016    31031    93    0    0    0    2053

30303017    31360    90    0    0    0    2050

30303018    31360    91    0    0    0    2051

30303019    31360    92    0    0    0    2052

30303020    31360    93    0    0    0    2053

30303017    31360    90    0    0    0    2061

30303018    31360    91    0    0    0    2062

30303019    31360    92    0    0    0    2063

30303020    31360    93    0    0    0    2064

31503001    31150    90    0    0    0    2031

31503002    31150    91    0    0    0    2032

31503003    31150    92    0    0    0    2033


 db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt

@@ -22,6 +22,6 @@
6    300    1    [(4610,1,1),(2213,20,1)]    ConsumptionRebate2

7    100    0    [(108,5,1),(197,2,1)]    ConsumptionRebate3

7    300    1    [(109,2,1),(197,3,1)]    ConsumptionRebate2

8    60    1    [(107,10,1),(4609,1,1)]    ConsumptionRebate3

8    300    2    [(109,2,1),(197,3,1)]    ConsumptionRebate3

8    1500    3    [(109,5,1),(4184,1,1)]    ConsumptionRebate2

8    60    0    [(107,10,1),(4609,1,1)]    ConsumptionRebate3

8    300    1    [(109,2,1),(197,3,1)]    ConsumptionRebate3

8    1500    2    [(109,5,1),(4184,1,1)]    ConsumptionRebate2


 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt

@@ -67,6 +67,6 @@
5    66    200    1    [(2445,1,1)]    2445    LimitGift3

4    67    150    1    [(913,1,1),(4694,10,1)]    913    LimitGift3

2    68    35    1    [(912,1,1),(4694,4,1)]    912    LimitGift3

8    69    400    1    [(226,1,1),(181,25,1)]    226    LimitGift3

8    69    400    1    [(266,1,1),(181,25,1)]    266    LimitGift3

5    70    180    1    [(4228,1,1),(4151,25,1)]    4228    LimitGift3

5    71    150    1    [(5809,1,1),(5810,1,1),(5811,1,1)]    5809    LimitGift3

			@@ -1,3 +1,3 @@
			CfgID ActMark PlatformList ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd LimitLV
			1 test1 [] [] 2019-2-8 2019-2-8 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
			2 test2 [] [] 2019-2-19 2019-2-19 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
			1 test1 [] [] 2019-2-8 2019-2-8 2 {0:["NewCeremonyStart", []],30:["NewCeremonyStart", []],60:["NewCeremonyStart", []],180:["NewCeremonyStart", []],360:["NewCeremonyStart", []]} {-60:["NewCeremonyEnd", []],-30:["NewCeremonyEnd", []],0:["NewCeremonyOver", []]} 110
			2 test2 [] [] 2019-2-19 2019-2-19 2 {0:["NewCeremonyStart", []],30:["NewCeremonyStart", []],60:["NewCeremonyStart", []],180:["NewCeremonyStart", []],360:["NewCeremonyStart", []]} {-60:["NewCeremonyEnd", []],-30:["NewCeremonyEnd", []],0:["NewCeremonyOver", []]} 110

			@@ -51,10 +51,10 @@
			30303014 31031 5800 [1,500] 40 5 2051 100 BOSS之家三层
			30303015 31031 6700 [1,500] 40 5 2052 100 BOSS之家三层
			30303016 31031 7000 [1,500] 40 5 2053 100 BOSS之家三层
			30303017 31360 6000 [1,500] 40 5 2050 100 BOSS之家四层
			30303018 31360 6500 [1,500] 40 5 2051 100 BOSS之家四层
			30303019 31360 6700 [1,500] 40 5 2052 100 BOSS之家四层
			30303020 31360 7200 [1,500] 40 5 2053 100 BOSS之家四层
			30303017 31360 6000 [1,500] 40 5 2061 100 BOSS之家四层
			30303018 31360 6500 [1,500] 40 5 2062 100 BOSS之家四层
			30303019 31360 6700 [1,500] 40 5 2063 100 BOSS之家四层
			30303020 31360 7200 [1,500] 40 5 2064 100 BOSS之家四层
			31503001 31150 1350 [1,500] 40 5 2031 100 古神禁地
			31503002 31150 1700 [1,500] 40 5 2032 100 古神禁地
			31503003 31150 2150 [1,500] 40 5 2033 100 古神禁地

			@@ -51,10 +51,10 @@
			30303014 31031 91 0 0 0 2051
			30303015 31031 92 0 0 0 2052
			30303016 31031 93 0 0 0 2053
			30303017 31360 90 0 0 0 2050
			30303018 31360 91 0 0 0 2051
			30303019 31360 92 0 0 0 2052
			30303020 31360 93 0 0 0 2053
			30303017 31360 90 0 0 0 2061
			30303018 31360 91 0 0 0 2062
			30303019 31360 92 0 0 0 2063
			30303020 31360 93 0 0 0 2064
			31503001 31150 90 0 0 0 2031
			31503002 31150 91 0 0 0 2032
			31503003 31150 92 0 0 0 2033

			@@ -22,6 +22,6 @@
			6 300 1 [(4610,1,1),(2213,20,1)] ConsumptionRebate2
			7 100 0 [(108,5,1),(197,2,1)] ConsumptionRebate3
			7 300 1 [(109,2,1),(197,3,1)] ConsumptionRebate2
			8 60 1 [(107,10,1),(4609,1,1)] ConsumptionRebate3
			8 300 2 [(109,2,1),(197,3,1)] ConsumptionRebate3
			8 1500 3 [(109,5,1),(4184,1,1)] ConsumptionRebate2
			8 60 0 [(107,10,1),(4609,1,1)] ConsumptionRebate3
			8 300 1 [(109,2,1),(197,3,1)] ConsumptionRebate3
			8 1500 2 [(109,5,1),(4184,1,1)] ConsumptionRebate2

			@@ -67,6 +67,6 @@
			5 66 200 1 [(2445,1,1)] 2445 LimitGift3
			4 67 150 1 [(913,1,1),(4694,10,1)] 913 LimitGift3
			2 68 35 1 [(912,1,1),(4694,4,1)] 912 LimitGift3
			8 69 400 1 [(226,1,1),(181,25,1)] 226 LimitGift3
			8 69 400 1 [(266,1,1),(181,25,1)] 266 LimitGift3
			5 70 180 1 [(4228,1,1),(4151,25,1)] 4228 LimitGift3
			5 71 150 1 [(5809,1,1),(5810,1,1),(5811,1,1)] 5809 LimitGift3