~admin/snxx_server.git

parent: 9d2eabb9 | 补丁 | 提交 | ignore whitespace

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

cehua_ZWJ

2019-01-16 55bbc9a3c2a466cb64a432a85d4614e886eb1617

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

18个文件已修改

	CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/ChNetSendPack.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/ShareDefine.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagChestsAward.txt	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagDienstgrad.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/SysDB/tagChinItem.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/SysDB/tagChinNPC.txt	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt

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

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

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

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


 CoreServerGroup/GameServer/Script/ChNetSendPack.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/ShareDefine.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagChestsAward.txt

@@ -1,17 +1,17 @@
BoxID    BoxLV    SelectList    FixedItem    Probability1    RandCount1    Probability2    RandCount2    ProbabilitySpec     JobItem    MoneyType    MoneyCount    NeedNotifyItemList

2200    0        103_2|102_5|101_10                            0    0	
2201    0        106_1|105_1|104_4                            0    0	
2200    0        103_2|101_10                            0    0	
2201    0        106_1|104_4                            0    0	
2202    0        4305_8                            0    0    

2203    0        5303_100                            0    0    

2204    0    153_15|144_30|143_45|142_60|141_80    147_1                            0    0    

2205    0        5012_20                        [[5012,5022]]    0    0    

2206    0        6_1                            0    0	
2206    0            [[5000,[3502,1]],[10000,[3512,1]]]    1                    0    0	
2301    0        4151_10                            0    0    

2207    0        101_3                            0    0    

2263    0        4611_2|4612_2|4613_2|4614_2|4615_2    [[2941,[983,1]],[4706,[4657,1]],[6471,[4658,1]],[8235,[4670,1]],[10000,[4694,1]]]    [[8300,0],[10000,1]]                    0    0    [983,4657,4658,4670,4694]

2264    0        102_3                            0    0	
2265    0        102_2                            0    0	
2266    0        102_1                            0    0	
2264    0        101_3                            0    0	
2265    0        101_3                            0    0	
2266    0        101_3                            0    0	
2267    0        101_3                            0    0    

2208    0    4314_1|4319_1|4349_1|4354_1                                0    0    

2209    0    4335_1|4370_1|4375_1|4380_1                                0    0    


 db/PyMongoDataServer/PySysDB/tagDienstgrad.txt

@@ -22,3 +22,4 @@
30    1    2592000    6|7    44755|2237    

31    1    2592000    6|7    27972|1398    

32    1    0    6|7    30000|1500    

33    1    0    6|7|8    3000|150|30	

 db/PyMongoDataServer/SysDB/tagChinItem.txt

@@ -54,7 +54,7 @@
54    1    0    万人斩    4    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    1    0    0    204    24    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

55    1    0    修罗战神    4    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    1    0    0    204    25    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

56    1    0    仙魔最强者    4    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    1    0    0    204    26    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

57    1    0    凌波微步    4    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    1    0    0    204    27    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

57    1    0    凌波微步    4    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    1    0    0    204    33    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

58    1    0    烈焰战神    4    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    1    0    0    204    28    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

59    1    0    绝骑武神    4    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    1    0    0    204    29    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    6    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

60    1    0    万服飞将    4    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    1    0    0    204    30    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0


 db/PyMongoDataServer/SysDB/tagChinNPC.txt

@@ -454,8 +454,8 @@
20102005    2    0    精英海斗士    210    0    2508    2508    0    4    0    0    0    818    0    0    0    0    0    0    0    3    3000    951846    28    0    300    2    6    0    0    0    0    0    0    0    0    0    10    2    2358193    0    0    0    0    1    872021    0    1    1    1

20102006    2    0    精英地龙    230    0    2903    2903    0    4    0    0    0    865    0    0    0    0    0    0    0    3    3000    1105585    31    0    300    2    6    0    0    0    0    0    0    0    0    0    10    2    4271978    0    0    0    0    1    1332263    0    1    1    1

20102007    2    0    精英冰骨妖    260    0    3994    3994    0    7    0    0    0    1040    0    0    0    0    0    0    0    3    3000    1353274    34    0    300    2    6    0    0    0    0    0    0    0    0    0    10    2    8807991    0    0    0    0    1    2526516    0    1    1    1

20103001    2    0    蜘蛛女皇    125    0    2185    2185    0    3    0    0    10000    3052    0    1    0    0    0    0    0    3    3000    244842    13    0    300    2    6    23010    23030    0    0    0    0    0    0    0    10    2    2088899    0    10000    0    0    5    0    0    186    1    1

20103002    2    0    嗜海狂鲨    145    0    2646    2646    0    4    0    0    10000    3418    0    1    0    0    0    0    0    3    3000    282802    15    0    300    2    6    23010    23030    0    0    0    0    0    0    0    10    2    4770691    0    10000    0    0    5    0    0    186    1    1

20103001    2    0    蜘蛛女皇    125    0    2185    2185    0    2    0    0    10000    3052    0    1    0    0    0    0    0    3    3000    244842    13    0    300    2    6    23010    23030    0    0    0    0    0    0    0    10    2    2088899    0    10000    0    0    5    0    0    186    1    1

20103002    2    0    嗜海狂鲨    145    0    2646    2646    0    3    0    0    10000    3418    0    1    0    0    0    0    0    3    3000    282802    15    0    300    2    6    23010    23030    0    0    0    0    0    0    0    10    2    4770691    0    10000    0    0    5    0    0    186    1    1

20103003    2    0    古墓石巨人    160    0    3576    3576    0    4    0    0    10000    4807    0    1    0    0    0    0    0    3    3000    311272    17    0    300    2    6    23010    23030    0    0    0    0    0    0    0    10    2    6298117    0    10000    0    0    5    0    0    186    1    1

20103004    2    0    残暴海怪    180    0    4052    4052    0    5    0    0    10000    5146    0    1    0    0    0    0    0    3    3000    349232    19    0    300    2    6    23010    23030    0    0    0    0    0    0    0    10    2    9420689    0    10000    0    0    5    0    0    186    1    1

20103005    2    0    寒冰古妖    215    0    7996    7996    0    6    0    0    10000    9158    0    1    0    0    0    0    0    3    3000    511316    32    0    300    2    6    23010    23030    0    0    0    0    0    0    0    10    2    48246856    0    10000    0    0    5    0    0    186    1    1

			@@ -1,3 +1,4 @@
			CfgID ActMark PlatformList ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd LimitLV
			1 test1 [] [] 2019-1-1 2019-1-1 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
			2 test2 [] [] 7 7 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
			3 20190122 [] [] 2019-1-12 2019-1-12 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110

			@@ -1,17 +1,17 @@
			BoxID BoxLV SelectList FixedItem Probability1 RandCount1 Probability2 RandCount2 ProbabilitySpec JobItem MoneyType MoneyCount NeedNotifyItemList
			2200 0 103_2\|102_5\|101_10 0 0
			2201 0 106_1\|105_1\|104_4 0 0
			2200 0 103_2\|101_10 0 0
			2201 0 106_1\|104_4 0 0
			2202 0 4305_8 0 0
			2203 0 5303_100 0 0
			2204 0 153_15\|144_30\|143_45\|142_60\|141_80 147_1 0 0
			2205 0 5012_20 [[5012,5022]] 0 0
			2206 0 6_1 0 0
			2206 0 [[5000,[3502,1]],[10000,[3512,1]]] 1 0 0
			2301 0 4151_10 0 0
			2207 0 101_3 0 0
			2263 0 4611_2\|4612_2\|4613_2\|4614_2\|4615_2 [[2941,[983,1]],[4706,[4657,1]],[6471,[4658,1]],[8235,[4670,1]],[10000,[4694,1]]] [[8300,0],[10000,1]] 0 0 [983,4657,4658,4670,4694]
			2264 0 102_3 0 0
			2265 0 102_2 0 0
			2266 0 102_1 0 0
			2264 0 101_3 0 0
			2265 0 101_3 0 0
			2266 0 101_3 0 0
			2267 0 101_3 0 0
			2208 0 4314_1\|4319_1\|4349_1\|4354_1 0 0
			2209 0 4335_1\|4370_1\|4375_1\|4380_1 0 0

			@@ -22,3 +22,4 @@
			30 1 2592000 6\|7 44755\|2237
			31 1 2592000 6\|7 27972\|1398
			32 1 0 6\|7 30000\|1500
			33 1 0 6\|7\|8 3000\|150\|30

			@@ -54,7 +54,7 @@
			54 1 0 万人斩 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 24 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			55 1 0 修罗战神 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 25 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			56 1 0 仙魔最强者 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			57 1 0 凌波微步 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 27 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			57 1 0 凌波微步 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 33 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			58 1 0 烈焰战神 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 28 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			59 1 0 绝骑武神 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			60 1 0 万服飞将 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 30 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

			@@ -454,8 +454,8 @@
			20102005 2 0 精英海斗士 210 0 2508 2508 0 4 0 0 0 818 0 0 0 0 0 0 0 3 3000 951846 28 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 2358193 0 0 0 0 1 872021 0 1 1 1
			20102006 2 0 精英地龙 230 0 2903 2903 0 4 0 0 0 865 0 0 0 0 0 0 0 3 3000 1105585 31 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 4271978 0 0 0 0 1 1332263 0 1 1 1
			20102007 2 0 精英冰骨妖 260 0 3994 3994 0 7 0 0 0 1040 0 0 0 0 0 0 0 3 3000 1353274 34 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 8807991 0 0 0 0 1 2526516 0 1 1 1
			20103001 2 0 蜘蛛女皇 125 0 2185 2185 0 3 0 0 10000 3052 0 1 0 0 0 0 0 3 3000 244842 13 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 2088899 0 10000 0 0 5 0 0 186 1 1
			20103002 2 0 嗜海狂鲨 145 0 2646 2646 0 4 0 0 10000 3418 0 1 0 0 0 0 0 3 3000 282802 15 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 4770691 0 10000 0 0 5 0 0 186 1 1
			20103001 2 0 蜘蛛女皇 125 0 2185 2185 0 2 0 0 10000 3052 0 1 0 0 0 0 0 3 3000 244842 13 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 2088899 0 10000 0 0 5 0 0 186 1 1
			20103002 2 0 嗜海狂鲨 145 0 2646 2646 0 3 0 0 10000 3418 0 1 0 0 0 0 0 3 3000 282802 15 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 4770691 0 10000 0 0 5 0 0 186 1 1
			20103003 2 0 古墓石巨人 160 0 3576 3576 0 4 0 0 10000 4807 0 1 0 0 0 0 0 3 3000 311272 17 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 6298117 0 10000 0 0 5 0 0 186 1 1
			20103004 2 0 残暴海怪 180 0 4052 4052 0 5 0 0 10000 5146 0 1 0 0 0 0 0 3 3000 349232 19 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 9420689 0 10000 0 0 5 0 0 186 1 1
			20103005 2 0 寒冰古妖 215 0 7996 7996 0 6 0 0 10000 9158 0 1 0 0 0 0 0 3 3000 511316 32 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 48246856 0 10000 0 0 5 0 0 186 1 1