~admin/snxx_server.git

parent: 55c3e6ef | 补丁 | 提交 | ignore whitespace

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

cehua_wcy

2018-08-27 e7df6bb1e69e172a0b10ac1aae25e32a5b3968ba

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

8个文件已修改

	CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/SysDB/tagChinNPC.txt	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt

@@ -808,12 +808,12 @@
30601014    魂灵    260

30601015    魔剑    265

30603006    玄界冰魔    320

50103001    魔坛巨熊    20

50103002    魔坛巨猿    40

50103003    魔坛牙刃    70

50103004    魔坛左翼    85

50103005    魔坛右翼    85

50103006    魔坛龙王    110

50103001    蜘蛛女皇    125

50103002    嗜海狂鲨    145

50103003    古墓石巨人    160

50103004    残暴海怪    180

50103005    寒冰古妖    215

50103006    翻水妖龙    235

50104001    乾坤熊猫    100

50104002    暗裔暴君    100

50104003    龙血武姬    100


 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt

@@ -2,12 +2,12 @@
#{职业:[等级]}

(

{

    0:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    1:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    2:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    3:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    4:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    5:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    6:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    0:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,185,190,200,210,215,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    1:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,185,190,200,210,215,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    2:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,185,190,200,210,215,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    3:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,185,190,200,210,215,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    4:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,185,190,200,210,215,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    5:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,185,190,200,210,215,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    6:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,185,190,200,210,215,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

}

)


 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip

Binary files differ

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

Binary files differ

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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/SysDB/tagChinNPC.txt

@@ -808,12 +808,12 @@
30601014    2    0    魂灵    260    0    4811    4811    0    9    0    0    0    1400    0    0    0    0    0    0    0    0    2000    370110    34    0    300    2    4    0    0    0    0    0    0    0    0    0    15    2    8032498    0    0    0    0    1    0    0    1    1    1

30601015    2    0    魔剑    265    0    4970    4970    0    9    0    0    0    1400    0    0    0    0    0    0    0    0    2000    376753    35    0    300    2    4    0    0    0    0    0    0    0    0    0    15    2    8607219    0    0    0    0    1    0    0    1    1    1

30603006    2    0    玄界冰魔    320    0    10459    10459    7847    9    0    0    10000    3290    0    0    0    0    0    0    0    0    2000    455520    41    0    300    2    6    0    0    0    0    0    0    0    0    0    15    2    90414255    1    0    0    0    5    0    0    186    1    1

50103001    18    0    魔坛巨熊    20    2    54    54    0    0    0    0    10000    63    0    7    0    0    0    0    0    0    2500    87307    3    0    300    0    6    23010    0    0    0    0    0    0    0    1    10    2    31000000    41    0    0    0    5    0    0    186    1    1

50103002    18    0    魔坛巨猿    40    2    200    200    0    0    0    0    10000    67    0    7    0    0    0    0    0    0    2500    147095    6    0    300    0    6    23010    0    0    0    0    0    0    0    1    10    2    68850000    82    0    0    0    5    0    0    186    1    1

50103003    18    0    魔坛牙刃    70    2    330    330    0    0    0    0    10000    130    0    7    0    0    0    0    0    0    2500    209729    9    0    300    0    6    23010    0    0    0    0    0    0    0    1    10    2    7892980    234    0    0    0    5    0    0    186    1    1

50103004    18    0    魔坛左翼    85    2    489    489    0    1    0    0    10000    143    0    7    0    0    0    0    0    0    2500    279006    12    0    300    0    6    23010    0    0    0    0    0    0    0    1    10    2    47626349    517    0    0    0    5    0    0    186    1    1

50103005    18    0    魔坛右翼    85    2    565    565    0    1    0    0    10000    208    0    7    0    0    0    0    0    0    2500    353028    14    0    300    0    6    23010    0    0    0    0    0    0    0    1    10    2    21584929    672    0    0    0    5    0    0    186    1    1

50103006    18    0    魔坛龙王    110    2    1400    1400    0    2    0    0    10000    242    0    7    0    0    0    0    0    0    2500    453622    18    0    300    0    6    23010    0    0    0    0    0    0    0    1    10    2    63565856    1025    0    0    0    5    0    0    186    1    1

50103001    2    0    蜘蛛女皇    125    0    1184    1184    0    3    0    0    10000    1430    0    7    0    0    0    0    0    3    3000    453622    18    0    300    2    6    23010    23030    0    0    0    0    0    0    0    10    2    1742024    0    10000    0    0    5    0    0    186    1    1

50103002    2    0    嗜海狂鲨    145    0    2863    2863    0    4    0    0    10000    4148    0    7    0    0    0    0    0    3    3000    556113    20    0    300    2    6    23010    23030    0    0    0    0    0    0    0    10    2    5087089    0    10000    0    0    5    0    0    186    1    1

50103003    2    0    古墓石巨人    160    0    3046    3046    0    4    0    0    10000    4235    0    7    0    0    0    0    0    3    3000    634880    22    0    300    2    6    23010    23030    0    0    0    0    0    0    0    10    2    7079698    0    10000    0    0    5    0    0    186    1    1

50103004    2    0    残暴海怪    180    0    3599    3599    0    5    0    0    10000    4474    0    7    0    0    0    0    0    3    3000    738321    25    0    300    2    6    23010    23030    0    0    0    0    0    0    0    10    2    9937882    0    10000    0    0    5    0    0    186    1    1

50103005    2    0    寒冰古妖    215    0    6059    6059    0    7    0    0    10000    7005    0    7    0    0    0    0    0    3    3000    1023022    29    0    300    2    6    23010    23030    0    0    0    0    0    0    0    10    2    45127197    0    10000    0    0    5    0    0    186    1    1

50103006    2    0    翻水妖龙    235    0    7098    7098    0    7    0    0    10000    7780    0    7    0    0    0    0    0    3    3000    1188148    32    0    300    2    6    23010    23030    0    0    0    0    0    0    0    10    2    79667846    0    10000    0    0    5    0    0    186    1    1

50104001    0    1    乾坤熊猫    100    0    272    283    555    0    0    0    0    0    0    0    0    0    0    0    0    0    3000    838    104    10    300    0    6    0    0    0    0    0    0    0    0    0    10    2    1    0    0    0    0    0    0    0    200    1    1

50104002    0    1    暗裔暴君    100    0    272    283    555    0    0    0    0    0    0    0    0    0    0    0    0    0    3000    838    104    10    300    0    6    0    0    0    0    0    0    0    0    0    10    2    1    0    0    0    0    0    0    0    200    1    1

50104003    0    1    龙血武姬    100    0    272    283    555    0    0    0    0    0    0    0    0    0    0    0    0    0    3000    838    104    10    300    0    6    0    0    0    0    0    0    0    0    0    10    2    1    0    0    0    0    0    0    0    200    1    1

			@@ -808,12 +808,12 @@
			30601014 魂灵 260
			30601015 魔剑 265
			30603006 玄界冰魔 320
			50103001 魔坛巨熊 20
			50103002 魔坛巨猿 40
			50103003 魔坛牙刃 70
			50103004 魔坛左翼 85
			50103005 魔坛右翼 85
			50103006 魔坛龙王 110
			50103001 蜘蛛女皇 125
			50103002 嗜海狂鲨 145
			50103003 古墓石巨人 160
			50103004 残暴海怪 180
			50103005 寒冰古妖 215
			50103006 翻水妖龙 235
			50104001 乾坤熊猫 100
			50104002 暗裔暴君 100
			50104003 龙血武姬 100

			@@ -2,12 +2,12 @@
			#{职业:[等级]}
			(
			{
			0:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
			1:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
			2:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
			3:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
			4:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
			5:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
			6:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
			0:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,185,190,200,210,215,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
			1:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,185,190,200,210,215,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
			2:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,185,190,200,210,215,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
			3:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,185,190,200,210,215,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
			4:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,185,190,200,210,215,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
			5:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,185,190,200,210,215,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
			6:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,185,190,200,210,215,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
			}
			)

			@@ -808,12 +808,12 @@
			30601014 2 0 魂灵 260 0 4811 4811 0 9 0 0 0 1400 0 0 0 0 0 0 0 0 2000 370110 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 8032498 0 0 0 0 1 0 0 1 1 1
			30601015 2 0 魔剑 265 0 4970 4970 0 9 0 0 0 1400 0 0 0 0 0 0 0 0 2000 376753 35 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 8607219 0 0 0 0 1 0 0 1 1 1
			30603006 2 0 玄界冰魔 320 0 10459 10459 7847 9 0 0 10000 3290 0 0 0 0 0 0 0 0 2000 455520 41 0 300 2 6 0 0 0 0 0 0 0 0 0 15 2 90414255 1 0 0 0 5 0 0 186 1 1
			50103001 18 0 魔坛巨熊 20 2 54 54 0 0 0 0 10000 63 0 7 0 0 0 0 0 0 2500 87307 3 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 31000000 41 0 0 0 5 0 0 186 1 1
			50103002 18 0 魔坛巨猿 40 2 200 200 0 0 0 0 10000 67 0 7 0 0 0 0 0 0 2500 147095 6 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 68850000 82 0 0 0 5 0 0 186 1 1
			50103003 18 0 魔坛牙刃 70 2 330 330 0 0 0 0 10000 130 0 7 0 0 0 0 0 0 2500 209729 9 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 7892980 234 0 0 0 5 0 0 186 1 1
			50103004 18 0 魔坛左翼 85 2 489 489 0 1 0 0 10000 143 0 7 0 0 0 0 0 0 2500 279006 12 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 47626349 517 0 0 0 5 0 0 186 1 1
			50103005 18 0 魔坛右翼 85 2 565 565 0 1 0 0 10000 208 0 7 0 0 0 0 0 0 2500 353028 14 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 21584929 672 0 0 0 5 0 0 186 1 1
			50103006 18 0 魔坛龙王 110 2 1400 1400 0 2 0 0 10000 242 0 7 0 0 0 0 0 0 2500 453622 18 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 63565856 1025 0 0 0 5 0 0 186 1 1
			50103001 2 0 蜘蛛女皇 125 0 1184 1184 0 3 0 0 10000 1430 0 7 0 0 0 0 0 3 3000 453622 18 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 1742024 0 10000 0 0 5 0 0 186 1 1
			50103002 2 0 嗜海狂鲨 145 0 2863 2863 0 4 0 0 10000 4148 0 7 0 0 0 0 0 3 3000 556113 20 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 5087089 0 10000 0 0 5 0 0 186 1 1
			50103003 2 0 古墓石巨人 160 0 3046 3046 0 4 0 0 10000 4235 0 7 0 0 0 0 0 3 3000 634880 22 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 7079698 0 10000 0 0 5 0 0 186 1 1
			50103004 2 0 残暴海怪 180 0 3599 3599 0 5 0 0 10000 4474 0 7 0 0 0 0 0 3 3000 738321 25 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 9937882 0 10000 0 0 5 0 0 186 1 1
			50103005 2 0 寒冰古妖 215 0 6059 6059 0 7 0 0 10000 7005 0 7 0 0 0 0 0 3 3000 1023022 29 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 45127197 0 10000 0 0 5 0 0 186 1 1
			50103006 2 0 翻水妖龙 235 0 7098 7098 0 7 0 0 10000 7780 0 7 0 0 0 0 0 3 3000 1188148 32 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 79667846 0 10000 0 0 5 0 0 186 1 1
			50104001 0 1 乾坤熊猫 100 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
			50104002 0 1 暗裔暴君 100 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
			50104003 0 1 龙血武姬 100 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1