Project_SG_Server.git

parent: 5e124362 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

gwj

7 天以前 8337ecdee0dbfdac437f6053f94eae696130473d

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

6个文件已修改

	.gitignore	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	EventServerPY/server.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/SysDB/tagChinItem.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/SysDB/tagChinItem.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .gitignore

@@ -11,3 +11,5 @@
/*.userprefs
/*.pidb
/*.booproj
/EventServerPY/EventData/
/EventServer/EventData/

 EventServerPY/server.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt

@@ -429,7 +429,7 @@
ZhaojiaCfg    100|1    1|50    3000        

ComboCfg    0 if comboNum>4 else int(min((aComboRate-dComboRateDef),10000)*pow(0.5,comboNum))                

SuperHitCfg    max(aSuperHitRate - dSuperHitRateDef, 0)    1.5            

StunCfg    min(aStunRate - dStunRateDef, 8000)    200			
StunCfg    min(aStunRate - dStunRateDef, 7000)    200			
SuckHPCfg    long(hurtHP*max(aSuckHPPer -dSuckHPPerDef, 0)*(1+aCurePer-dCureDefPer))                

HurtFormula    long(max(1,(aAtk-dDef)*atkSkillPer*(1+max(-0.7,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))*(1+max(-0.7,(aNormalSkillPer-dNormalSkillPerDef)+(aPMDamPer-dPMDamPerDef)+(aComboDamPer-dComboDamPerDef)+(aPursueDamPer-dPursueDamPerDef)))*(1+max(-0.7,aPVPDamPer-dPVPDamPerDef))*(1+max(-0.7,aBatDamPer-dBatDamPerDef))*(max(1,aSuperDamPer-dSuperDamPerDef))))    long(max(1,(aAtk-dDef)*atkSkillPer*(1+angerOverflow/100)*(1+max(-0.7,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))*(1+max(-0.7,(aAngerSkillPer-dAngerSkillPerDef)+(aPMDamPer-dPMDamPerDef)+(aPursueDamPer-dPursueDamPerDef)))*(1+max(-0.7,aPVPDamPer-dPVPDamPerDef))*(1+max(-0.7,aBatDamPer-dBatDamPerDef))*(max(1,aSuperDamPer-dSuperDamPerDef))))    long(max(1,(aAtk-dDef)*atkSkillPer*(1+max(-0.7,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))*(1+max(-0.7,(aPMDamPer-dPMDamPerDef)+(aComboDamPer-dComboDamPerDef)+(aPursueDamPer-dPursueDamPerDef)))*(1+max(-0.7,aPVPDamPer-dPVPDamPerDef))*(1+max(-0.7,aBatDamPer-dBatDamPerDef))*(max(1,aSuperDamPer-dSuperDamPerDef))))        

DOTFormula    long(max(1,(aAtk-dDef)*atkSkillPer*(1+max(-0.99,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))*(1+max(-0.99,aPVPDamPer-dPVPDamPerDef))*(1+max(-0.7,aBatDamPer-dBatDamPerDef))*(1+max(-0.99,aDOTPer-dDOTPerDef))))                


 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/SysDB/tagChinItem.txt

@@ -29,6 +29,7 @@
29    1    0    日曜粉尘    15    0    0    0    0    2000000000    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    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    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

30    1    0    通明签    15    0    0    0    0    2000000000    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    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    0    0    0    0    4    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

31    1    0    祈灵香    15    0    0    0    0    2000000000    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    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    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

32    1    0    益气丹    15    0    0    0    0    2000000000    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    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    0    0    0    0    4    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

100    1    0    战锤    15    0    0    0    0    2000000000    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    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    0    0    0    0    4    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

101    1    0    将星玉髓    15    0    0    0    0    2000000000    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    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    0    0    0    0    4    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

102    1    0    元宝    15    0    0    0    0    2000000000    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    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    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0


 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt

@@ -429,7 +429,7 @@
ZhaojiaCfg    100|1    1|50    3000        

ComboCfg    0 if comboNum>4 else int(min((aComboRate-dComboRateDef),10000)*pow(0.5,comboNum))                

SuperHitCfg    max(aSuperHitRate - dSuperHitRateDef, 0)    1.5            

StunCfg    min(aStunRate - dStunRateDef, 8000)    200			
StunCfg    min(aStunRate - dStunRateDef, 7000)    200			
SuckHPCfg    long(hurtHP*max(aSuckHPPer -dSuckHPPerDef, 0)*(1+aCurePer-dCureDefPer))                

HurtFormula    long(max(1,(aAtk-dDef)*atkSkillPer*(1+max(-0.7,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))*(1+max(-0.7,(aNormalSkillPer-dNormalSkillPerDef)+(aPMDamPer-dPMDamPerDef)+(aComboDamPer-dComboDamPerDef)+(aPursueDamPer-dPursueDamPerDef)))*(1+max(-0.7,aPVPDamPer-dPVPDamPerDef))*(1+max(-0.7,aBatDamPer-dBatDamPerDef))*(max(1,aSuperDamPer-dSuperDamPerDef))))    long(max(1,(aAtk-dDef)*atkSkillPer*(1+angerOverflow/100)*(1+max(-0.7,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))*(1+max(-0.7,(aAngerSkillPer-dAngerSkillPerDef)+(aPMDamPer-dPMDamPerDef)+(aPursueDamPer-dPursueDamPerDef)))*(1+max(-0.7,aPVPDamPer-dPVPDamPerDef))*(1+max(-0.7,aBatDamPer-dBatDamPerDef))*(max(1,aSuperDamPer-dSuperDamPerDef))))    long(max(1,(aAtk-dDef)*atkSkillPer*(1+max(-0.7,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))*(1+max(-0.7,(aPMDamPer-dPMDamPerDef)+(aComboDamPer-dComboDamPerDef)+(aPursueDamPer-dPursueDamPerDef)))*(1+max(-0.7,aPVPDamPer-dPVPDamPerDef))*(1+max(-0.7,aBatDamPer-dBatDamPerDef))*(max(1,aSuperDamPer-dSuperDamPerDef))))        

DOTFormula    long(max(1,(aAtk-dDef)*atkSkillPer*(1+max(-0.99,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))*(1+max(-0.99,aPVPDamPer-dPVPDamPerDef))*(1+max(-0.7,aBatDamPer-dBatDamPerDef))*(1+max(-0.99,aDOTPer-dDOTPerDef))))                


 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/SysDB/tagChinItem.txt

@@ -29,6 +29,7 @@
29    1    0    日曜粉尘    15    0    0    0    0    2000000000    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    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    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

30    1    0    通明签    15    0    0    0    0    2000000000    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    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    0    0    0    0    4    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

31    1    0    祈灵香    15    0    0    0    0    2000000000    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    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    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

32    1    0    益气丹    15    0    0    0    0    2000000000    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    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    0    0    0    0    4    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

100    1    0    战锤    15    0    0    0    0    2000000000    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    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    0    0    0    0    4    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

101    1    0    将星玉髓    15    0    0    0    0    2000000000    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    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    0    0    0    0    4    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

102    1    0    元宝    15    0    0    0    0    2000000000    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    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    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

			@@ -11,3 +11,5 @@
			/*.userprefs
			/*.pidb
			/*.booproj
			/EventServerPY/EventData/
			/EventServer/EventData/

			@@ -429,7 +429,7 @@
			ZhaojiaCfg 100\|1 1\|50 3000
			ComboCfg 0 if comboNum>4 else int(min((aComboRate-dComboRateDef),10000)*pow(0.5,comboNum))
			SuperHitCfg max(aSuperHitRate - dSuperHitRateDef, 0) 1.5
			StunCfg min(aStunRate - dStunRateDef, 8000) 200
			StunCfg min(aStunRate - dStunRateDef, 7000) 200
			SuckHPCfg long(hurtHPmax(aSuckHPPer -dSuckHPPerDef, 0)(1+aCurePer-dCureDefPer))
			HurtFormula long(max(1,(aAtk-dDef)atkSkillPer(1+max(-0.7,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))(1+max(-0.7,(aNormalSkillPer-dNormalSkillPerDef)+(aPMDamPer-dPMDamPerDef)+(aComboDamPer-dComboDamPerDef)+(aPursueDamPer-dPursueDamPerDef)))(1+max(-0.7,aPVPDamPer-dPVPDamPerDef))(1+max(-0.7,aBatDamPer-dBatDamPerDef))(max(1,aSuperDamPer-dSuperDamPerDef)))) long(max(1,(aAtk-dDef)atkSkillPer(1+angerOverflow/100)(1+max(-0.7,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))(1+max(-0.7,(aAngerSkillPer-dAngerSkillPerDef)+(aPMDamPer-dPMDamPerDef)+(aPursueDamPer-dPursueDamPerDef)))(1+max(-0.7,aPVPDamPer-dPVPDamPerDef))(1+max(-0.7,aBatDamPer-dBatDamPerDef))(max(1,aSuperDamPer-dSuperDamPerDef)))) long(max(1,(aAtk-dDef)atkSkillPer(1+max(-0.7,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))(1+max(-0.7,(aPMDamPer-dPMDamPerDef)+(aComboDamPer-dComboDamPerDef)+(aPursueDamPer-dPursueDamPerDef)))(1+max(-0.7,aPVPDamPer-dPVPDamPerDef))(1+max(-0.7,aBatDamPer-dBatDamPerDef))*(max(1,aSuperDamPer-dSuperDamPerDef))))
			DOTFormula long(max(1,(aAtk-dDef)atkSkillPer(1+max(-0.99,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))(1+max(-0.99,aPVPDamPer-dPVPDamPerDef))(1+max(-0.7,aBatDamPer-dBatDamPerDef))*(1+max(-0.99,aDOTPer-dDOTPerDef))))

			@@ -29,6 +29,7 @@
			29 1 0 日曜粉尘 15 0 0 0 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 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 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			30 1 0 通明签 15 0 0 0 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 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 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			31 1 0 祈灵香 15 0 0 0 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 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 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			32 1 0 益气丹 15 0 0 0 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 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 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			100 1 0 战锤 15 0 0 0 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 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 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			101 1 0 将星玉髓 15 0 0 0 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 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 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			102 1 0 元宝 15 0 0 0 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 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 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0