~admin/snxx_server.git

parent: 56e5520b | 补丁 | 提交 | ignore whitespace

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

cehua_LC

2018-08-24 a99d387dc7d3ba7e6360984e5cdd168f6d9f3fce

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

11个文件已修改

	CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| 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/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagSuccess.txt	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/SysDB/tagChinSkill.txt	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt

@@ -9,7 +9,7 @@
10    70    0    0

12    80    0    0

15    65    0    0

16    135    0    0

16    125    0    0

20    110    0    0

21    115    0    0

22    115    0    0


 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,200,210,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,190,200,210,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,190,200,210,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,190,200,210,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,190,200,210,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,190,200,210,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,190,200,210,220,230,240,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,140,150,160,170,180,190,200,210,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,140,150,160,170,180,190,200,210,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,140,150,160,170,180,190,200,210,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,140,150,160,170,180,190,200,210,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,140,150,160,170,180,190,200,210,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,140,150,160,170,180,190,200,210,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,140,150,160,170,180,190,200,210,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/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt

@@ -9,7 +9,7 @@
10    70    0    0    0

12    80    0    0    0

15    65    0    0    0

16    135    0    0    0

16    125    0    0    0

20    110    0    0    0

21    115    0    0    0

22    115    0    0    0


 db/PyMongoDataServer/PySysDB/tagSuccess.txt

@@ -246,17 +246,17 @@
763    112    1    2124    0    0    0    0        0        

771    36    10    10101001    0    0    0    0        6        

772    5    10    0    0    0    0    0        7        

773    48    8    0    0    0    0    0        8		
773    48    20    0    0    0    0    0        8		
774    81    20    31080    0    0    0    0        9        

775    10    1    100|10    0    0    0    0        10		
776    58    1    50106001|10    0    0    0    0        11		
775    10    1    100|20    0    0    0    0        10		
776    58    1    50106001|20    0    0    0    0        11		
777    19    10    0    0    0    0    0        12        

778    78    3    0    0    0    0    0        13        

779    27    7    15    0    0    0    0        14		
779    27    7    25    0    0    0    0        14		
780    28    3    0    0    0    0    0        15        

781    54    1    4|1|1    0    0    0    0        16        

782    42    1    208    0    0    0    0        17        

783    1    140    0    0    0    0    0        18		
783    1    150    0    0    0    0    0        18		
784    6    1    0    0    0    0    0        19        

785    50    6    0    0    0    0    0        20        

786    12    5    0    0    0    0    0        21        


 db/PyMongoDataServer/SysDB/tagChinSkill.txt

@@ -598,8 +598,8 @@
23023    娲皇八层Boss普通技能    23023    1    1    0    0    0    1    0    0    1    0    41    6    0    1000    0    0    0    0    0    1010    10000    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    10000    0    0    0    0    0    0    0    0    0    0    2    0    0    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

23025    娲皇八层Boss眩晕    23025    1    1    0    0    3100    1    0    0    2    5    41    6    0    36000    0    0    0    0    0    1010    50000    10000    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    10000    0    0    11052    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

23024    第四层加血    23024    1    1    0    0    0    2    0    0    8    5    141    20    0    30000    0    0    0    0    0    1000    1000    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    10000    0    0    0    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

23030    境界压制    23030    1    1    0    11    0    13    0    0    16    0    41    8    0    300000    0    0    0    0    0    1060    50105019    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    10000    10000    0    0    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0

23031    压制法阵    23031    1    1    0    11    0    1    0    0    2    6    40    0    0    1000    0    0    0    0    0    1010    100000    0    0    9999    1000    0    0    1200    10    0    0    0    0    0    0    0    0    0    0    0    0    0    0    10000    1000    0    0    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0

23030    境界压制    23030    1    1    0    11    0    13    0    0    16    0    40    8    0    300000    0    0    0    0    0    1060    50105019    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    10000    10000    0    0    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0

23031    压制法阵    23031    1    1    0    11    0    1    0    0    2    6    40    0    0    1000    0    0    0    0    0    1013    10000    0    0    1010    100000    0    0    9999    1000    0    0    1200    10    0    0    0    0    0    0    0    0    0    0    10000    1000    0    0    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0

47000    斗战之力    47000    1    1    2    9    0    16    0    0    0    0    10    0    0    0    0    0    0    0    0    4004    10000    0    0    4503    1000    0    0    4508    0    0    0    1011    1    1    0    0    0    0    0    0    0    0    0    10000    0    0    0    0    0    0    0    0    0    0    0    0    0    2    1384    0    0    0    0    0    0    0    0    0    50000    0    0    0    0

47010    月耀千里    47010    1    1    2    9    0    7    0    0    0    0    0    0    0    0    0    0    0    0    0    4004    10000    0    0    4045    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    10000    0    0    0    0    0    0    0    0    0    0    0    0    0    2    1778    0    0    0    0    0    0    0    0    0    50100    0    0    0    0

47020    磐龙魔弑    47020    1    1    2    9    0    17    0    0    1    8    41    8    0    0    0    0    0    0    0    4004    5000    0    0    121    5000    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    10000    10000    0    0    0    0    0    0    0    0    0    0    0    0    2    8166    0    0    0    0    0    0    0    4    0    50200    0    0    0    0

			@@ -9,7 +9,7 @@
			10 70 0 0
			12 80 0 0
			15 65 0 0
			16 135 0 0
			16 125 0 0
			20 110 0 0
			21 115 0 0
			22 115 0 0

			@@ -2,12 +2,12 @@
			#{职业:[等级]}
			(
			{
			0:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,200,210,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,190,200,210,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,190,200,210,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,190,200,210,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,190,200,210,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,190,200,210,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,190,200,210,220,230,240,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,140,150,160,170,180,190,200,210,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,140,150,160,170,180,190,200,210,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,140,150,160,170,180,190,200,210,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,140,150,160,170,180,190,200,210,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,140,150,160,170,180,190,200,210,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,140,150,160,170,180,190,200,210,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,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
			}
			)

			@@ -9,7 +9,7 @@
			10 70 0 0 0
			12 80 0 0 0
			15 65 0 0 0
			16 135 0 0 0
			16 125 0 0 0
			20 110 0 0 0
			21 115 0 0 0
			22 115 0 0 0

			@@ -246,17 +246,17 @@
			763 112 1 2124 0 0 0 0 0
			771 36 10 10101001 0 0 0 0 6
			772 5 10 0 0 0 0 0 7
			773 48 8 0 0 0 0 0 8
			773 48 20 0 0 0 0 0 8
			774 81 20 31080 0 0 0 0 9
			775 10 1 100\|10 0 0 0 0 10
			776 58 1 50106001\|10 0 0 0 0 11
			775 10 1 100\|20 0 0 0 0 10
			776 58 1 50106001\|20 0 0 0 0 11
			777 19 10 0 0 0 0 0 12
			778 78 3 0 0 0 0 0 13
			779 27 7 15 0 0 0 0 14
			779 27 7 25 0 0 0 0 14
			780 28 3 0 0 0 0 0 15
			781 54 1 4\|1\|1 0 0 0 0 16
			782 42 1 208 0 0 0 0 17
			783 1 140 0 0 0 0 0 18
			783 1 150 0 0 0 0 0 18
			784 6 1 0 0 0 0 0 19
			785 50 6 0 0 0 0 0 20
			786 12 5 0 0 0 0 0 21

			@@ -598,8 +598,8 @@
			23023 娲皇八层Boss普通技能 23023 1 1 0 0 0 1 0 0 1 0 41 6 0 1000 0 0 0 0 0 1010 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			23025 娲皇八层Boss眩晕 23025 1 1 0 0 3100 1 0 0 2 5 41 6 0 36000 0 0 0 0 0 1010 50000 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 11052 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			23024 第四层加血 23024 1 1 0 0 0 2 0 0 8 5 141 20 0 30000 0 0 0 0 0 1000 1000 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			23030 境界压制 23030 1 1 0 11 0 13 0 0 16 0 41 8 0 300000 0 0 0 0 0 1060 50105019 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
			23031 压制法阵 23031 1 1 0 11 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 100000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
			23030 境界压制 23030 1 1 0 11 0 13 0 0 16 0 40 8 0 300000 0 0 0 0 0 1060 50105019 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
			23031 压制法阵 23031 1 1 0 11 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1013 10000 0 0 1010 100000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
			47000 斗战之力 47000 1 1 2 9 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4004 10000 0 0 4503 1000 0 0 4508 0 0 0 1011 1 1 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 1384 0 0 0 0 0 0 0 0 0 50000 0 0 0 0
			47010 月耀千里 47010 1 1 2 9 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4004 10000 0 0 4045 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 1778 0 0 0 0 0 0 0 0 0 50100 0 0 0 0
			47020 磐龙魔弑 47020 1 1 2 9 0 17 0 0 1 8 41 8 0 0 0 0 0 0 0 4004 5000 0 0 121 5000 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 8166 0 0 0 0 0 0 0 4 0 50200 0 0 0 0