~admin/snxx_server.git

parent: bd5c7a68 | 补丁 | 提交 | show whitespace

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

CeHua_ZWJ

2018-08-23 8958480d7258a097f5b9d63d21a0e65904bbb951

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

7个文件已修改

	CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagChestsAward.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagRealm.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/SysDB/tagChinNPC.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt

@@ -174,7 +174,7 @@
10504002    先锋官    130

10504003    军中药师    140

10504004    军需    140

10504005    神秘老头    150

10504005    拦路老汉    150

10504006    随行弟子    150

10504007    冰玉    160

10504008    枯藤老人    160


 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt

@@ -118,7 +118,7 @@
    "EVP_1_31190"    :"int(max(min((SuppressValueRealmRate/10000.0-1)*2,0.5)+1,0.5)*max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",



    #火炬特殊伤害

    "EVP_1_31110"    :"max((1250-(dMinAtk+dMaxAtk)/2.0)*20,1)+max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",

    "EVP_1_41110"    :"int(max((1250-(dMinAtk+dMaxAtk)/2.0)*20,1)+max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",



}




 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagChestsAward.txt

@@ -125,5 +125,5 @@
2338    0            [[1428,[10541,1]],[2856,[10542,1]],[4284,[10543,1]],[5712,[10544,1]],[7140,[10545,1]],[8568,[10546,1]],[10000,[10547,1]]]    1            [[10541,20541,30541],[10542,20542,30542],[10543,20543,30543],[10544,20544,30544],[10545,20545,30545],[10546,20546,30546],[10547,20547,30547]]            

2339    0            [[7000,[14,1]],[9000,[18,1]],[10000,[19,1]]]    1                        

2340    0            [[2000,[181,10]],[4000,[181,11]],[6000,[181,12]],[8000,[181,13]],[9000,[181,14]],[10000,[181,15]]]    1                        

2341    0            [[1300,[2107,3]],[1500,[4609,1]],[1600,[4610,1]],[1800,[181,10]],[2000,[4151,10]],[2400,[14,1]],[3000,[151,1]],[5000,[181,1]],[7000,[4151,1]],[10000,[150,1]]]    1						
2341    0            [[1300,[2107,3]],[1500,[4609,1]],[1600,[4610,1]],[1800,[181,10]],[2000,[4151,10]],[2400,[14,1]],[3000,[151,1]],[5000,[181,1]],[7000,[4151,1]],[10000,[150,1]]]    1                        [2107,4609,4610,14]

2342    0            [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]]    1                        


 db/PyMongoDataServer/PySysDB/tagRealm.txt

@@ -1,7 +1,7 @@
Lv    IsBigRealm    NeedPoint    NeedGood    NeedNum    NeedActiveTreasure    AddAttrType    AddAttrNum    BossID    SitTime    TeamAward

0    0    450    0    0    0    6|7    0|0    61103000    {"1":0,"2":0,"3":0,"4":0,"5":0}    0

1    0    650    0    0    0    6|7    4700|230    61103001    {"1":0,"2":0,"3":0,"4":0,"5":0}    0

2    1    1100    0    0    0    6|7    9900|490    61203001    {"1":0,"2":0,"3":0,"4":0,"5":0}    {0:[(105,1,1),(102,3,1)]}

2    1    1000    0    0    0    6|7    9900|490    61203001    {"1":0,"2":0,"3":0,"4":0,"5":0}    {0:[(105,1,1),(102,3,1)]}

3    0    1150    0    0    0    6|7|19    18700|940|1000    61103002    {"1":0,"2":0,"3":0,"4":0,"5":0}    0

4    1    1410    0    0    0    6|7|19    25100|1260|1000    61203002    {"1":0,"2":0,"3":0,"4":0,"5":0}    {0:[(105,3,1),(103,1,1)]}

5    0    1160    0    0    0    6|7|19    35900|1800|3000    61103003    {"1":0,"2":0,"3":0,"4":0,"5":0}    0


 db/PyMongoDataServer/SysDB/tagChinNPC.txt

@@ -174,7 +174,7 @@
10504002    0    1    先锋官    130    0    607    742    1264    0    0    0    0    0    0    0    0    0    0    0    0    0    3000    1390    3772    0    300    0    0    0    0    0    0    0    0    0    0    0    10    2    1    0    0    0    5    0    0    0    200    0    1

10504003    0    1    军中药师    140    0    607    742    1264    0    0    0    0    0    0    0    0    0    0    0    0    0    3000    1390    3772    0    300    0    0    0    0    0    0    0    0    0    0    0    10    2    1    0    0    0    5    0    0    0    200    0    1

10504004    0    1    军需    140    0    607    742    1264    0    0    0    0    0    0    0    0    0    0    0    0    0    3000    1390    3772    0    300    0    0    0    0    0    0    0    0    0    0    0    10    2    1    0    0    0    5    0    0    0    200    0    1

10504005    0    1    神秘老头    150    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

10504005    0    1    拦路老汉    150    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

10504006    0    1    随行弟子    150    0    607    742    1264    0    0    0    0    0    0    0    0    0    0    0    0    0    3000    1390    3772    0    300    0    0    0    0    0    0    0    0    0    0    0    10    2    1    0    0    0    5    0    0    0    200    0    1

10504007    0    1    冰玉    160    0    607    742    1264    0    0    0    0    0    0    0    0    0    0    0    0    0    3000    1390    3772    0    300    0    0    0    0    0    0    0    0    0    0    0    10    2    1    0    0    0    5    0    0    0    200    0    1

10504008    0    1    枯藤老人    160    0    607    742    1264    0    0    0    0    0    0    0    0    0    0    0    0    0    3000    1390    3772    0    300    0    0    0    0    0    0    0    0    0    0    0    10    2    1    0    0    0    5    0    0    0    200    0    1

			@@ -174,7 +174,7 @@
			10504002 先锋官 130
			10504003 军中药师 140
			10504004 军需 140
			10504005 神秘老头 150
			10504005 拦路老汉 150
			10504006 随行弟子 150
			10504007 冰玉 160
			10504008 枯藤老人 160

			@@ -118,7 +118,7 @@
			"EVP_1_31190" :"int(max(min((SuppressValueRealmRate/10000.0-1)2,0.5)+1,0.5)max(((max((aMinAtk+aMaxAtk)/2.0(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))(atkSkillPer+aSkillAtkRate/10000.0)(1-min(dDamReduce,8000)/10000.0)(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)(1+dBeHurtPer/10000.0)(1+suppressValueFP),aMaxAtk0.05+randaMaxAtk*0.05))",

			#火炬特殊伤害
			"EVP_1_31110" :"max((1250-(dMinAtk+dMaxAtk)/2.0)20,1)+max(((max((aMinAtk+aMaxAtk)/2.0(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))(atkSkillPer+aSkillAtkRate/10000.0)(1-min(dDamReduce,8000)/10000.0)(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)(1+dBeHurtPer/10000.0)(1+suppressValueFP),aMaxAtk0.05+randaMaxAtk0.05))",
			"EVP_1_41110" :"int(max((1250-(dMinAtk+dMaxAtk)/2.0)20,1)+max(((max((aMinAtk+aMaxAtk)/2.0(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))(atkSkillPer+aSkillAtkRate/10000.0)(1-min(dDamReduce,8000)/10000.0)(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)(1+dBeHurtPer/10000.0)(1+suppressValueFP),aMaxAtk0.05+randaMaxAtk0.05))",

			}

			@@ -125,5 +125,5 @@
			2338 0 [[1428,[10541,1]],[2856,[10542,1]],[4284,[10543,1]],[5712,[10544,1]],[7140,[10545,1]],[8568,[10546,1]],[10000,[10547,1]]] 1 [[10541,20541,30541],[10542,20542,30542],[10543,20543,30543],[10544,20544,30544],[10545,20545,30545],[10546,20546,30546],[10547,20547,30547]]
			2339 0 [[7000,[14,1]],[9000,[18,1]],[10000,[19,1]]] 1
			2340 0 [[2000,[181,10]],[4000,[181,11]],[6000,[181,12]],[8000,[181,13]],[9000,[181,14]],[10000,[181,15]]] 1
			2341 0 [[1300,[2107,3]],[1500,[4609,1]],[1600,[4610,1]],[1800,[181,10]],[2000,[4151,10]],[2400,[14,1]],[3000,[151,1]],[5000,[181,1]],[7000,[4151,1]],[10000,[150,1]]] 1
			2341 0 [[1300,[2107,3]],[1500,[4609,1]],[1600,[4610,1]],[1800,[181,10]],[2000,[4151,10]],[2400,[14,1]],[3000,[151,1]],[5000,[181,1]],[7000,[4151,1]],[10000,[150,1]]] 1 [2107,4609,4610,14]
			2342 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] 1

			@@ -1,7 +1,7 @@
			Lv IsBigRealm NeedPoint NeedGood NeedNum NeedActiveTreasure AddAttrType AddAttrNum BossID SitTime TeamAward
			0 0 450 0 0 0 6\|7 0\|0 61103000 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
			1 0 650 0 0 0 6\|7 4700\|230 61103001 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
			2 1 1100 0 0 0 6\|7 9900\|490 61203001 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(105,1,1),(102,3,1)]}
			2 1 1000 0 0 0 6\|7 9900\|490 61203001 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(105,1,1),(102,3,1)]}
			3 0 1150 0 0 0 6\|7\|19 18700\|940\|1000 61103002 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
			4 1 1410 0 0 0 6\|7\|19 25100\|1260\|1000 61203002 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(105,3,1),(103,1,1)]}
			5 0 1160 0 0 0 6\|7\|19 35900\|1800\|3000 61103003 {"1":0,"2":0,"3":0,"4":0,"5":0} 0

			@@ -174,7 +174,7 @@
			10504002 0 1 先锋官 130 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
			10504003 0 1 军中药师 140 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
			10504004 0 1 军需 140 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
			10504005 0 1 神秘老头 150 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
			10504005 0 1 拦路老汉 150 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
			10504006 0 1 随行弟子 150 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
			10504007 0 1 冰玉 160 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
			10504008 0 1 枯藤老人 160 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1