Project_SG_Server.git

parent: 7f712f07 | 补丁 | 提交 | ignore whitespace

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

hwj35

2025-11-19 fe02652c90299d7417a15981213a1079e303d9ea

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

2个文件已修改

	ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -422,11 +422,11 @@
SuperHitCfg    max(aSuperHitRate - dSuperHitRateDef, 0)    1.5            

StunCfg    min(aStunRate - dStunRateDef, 8000)    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))*(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))*(max(1,aSuperDamPer-dSuperDamPerDef))))    long(max(1,(aAtk-dDef)*atkSkillPer*(1+max(-0.7,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))*(1+max(-0.7,aAddSkillPer-dAddSkillPer))*(1+max(-0.7,(aPMDamPer-dPMDamPerDef)+(aComboDamPer-dComboDamPerDef)+(aPursueDamPer-dPursueDamPerDef)))*(1+max(-0.7,aPVPDamPer-dPVPDamPerDef))*(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.99,aDOTPer-aDOTPerDef))))				
CalcTypeFormula    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))*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1)))    long(aAtk*atkSkillPer*(1+aAddSkillPer))			
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))*(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))*(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))*(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.99,aDOTPer-dDOTPerDef))))				
CalcTypeFormula    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))*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1)))    long(aAtk*atkSkillPer)			
CureFormula    long(max((baseValue*skillPer)*(1+max(-0.99,aCurePer-dCureDefPer))*(1+angerOverflow/100.0), baseValue*0.05))                

ShieldFormula    long((baseValue*skillPer)*(1+max(-0.99,aShieldPer-dShieldPerDef)*(1+angerOverflow/100.0))				
ShieldFormula    long((baseValue*skillPer)*(1+max(-0.99,aShieldPer-dShieldPerDef)*(1+angerOverflow/100.0)))				
BuffStateGroup    {"1":[1,3,12,15], "2":[9,10,13,16,17], "3":[1,3,12,15,13], "4":[1,3,12,15,9,10,17], "5":[1,3,12,15,10,17]}                

InvestCost    {"1":[116],"2":[117]}                 

InvestDay    {"1":30}    {"1":180}    {"1":[[1,50], [3,100]], "2":[[1,100], [3,200]]}         


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

@@ -422,11 +422,11 @@
SuperHitCfg    max(aSuperHitRate - dSuperHitRateDef, 0)    1.5            

StunCfg    min(aStunRate - dStunRateDef, 8000)    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))*(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))*(max(1,aSuperDamPer-dSuperDamPerDef))))    long(max(1,(aAtk-dDef)*atkSkillPer*(1+max(-0.7,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))*(1+max(-0.7,aAddSkillPer-dAddSkillPer))*(1+max(-0.7,(aPMDamPer-dPMDamPerDef)+(aComboDamPer-dComboDamPerDef)+(aPursueDamPer-dPursueDamPerDef)))*(1+max(-0.7,aPVPDamPer-dPVPDamPerDef))*(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.99,aDOTPer-aDOTPerDef))))				
CalcTypeFormula    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))*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1)))    long(aAtk*atkSkillPer*(1+aAddSkillPer))			
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))*(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))*(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))*(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.99,aDOTPer-dDOTPerDef))))				
CalcTypeFormula    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))*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1)))    long(aAtk*atkSkillPer)			
CureFormula    long(max((baseValue*skillPer)*(1+max(-0.99,aCurePer-dCureDefPer))*(1+angerOverflow/100.0), baseValue*0.05))                

ShieldFormula    long((baseValue*skillPer)*(1+max(-0.99,aShieldPer-dShieldPerDef)*(1+angerOverflow/100.0))				
ShieldFormula    long((baseValue*skillPer)*(1+max(-0.99,aShieldPer-dShieldPerDef)*(1+angerOverflow/100.0)))				
BuffStateGroup    {"1":[1,3,12,15], "2":[9,10,13,16,17], "3":[1,3,12,15,13], "4":[1,3,12,15,9,10,17], "5":[1,3,12,15,10,17]}                

InvestCost    {"1":[116],"2":[117]}                 

InvestDay    {"1":30}    {"1":180}    {"1":[[1,50], [3,100]], "2":[[1,100], [3,200]]}

			@@ -422,11 +422,11 @@
			SuperHitCfg max(aSuperHitRate - dSuperHitRateDef, 0) 1.5
			StunCfg min(aStunRate - dStunRateDef, 8000) 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))(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))(max(1,aSuperDamPer-dSuperDamPerDef)))) long(max(1,(aAtk-dDef)atkSkillPer(1+max(-0.7,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))(1+max(-0.7,aAddSkillPer-dAddSkillPer))(1+max(-0.7,(aPMDamPer-dPMDamPerDef)+(aComboDamPer-dComboDamPerDef)+(aPursueDamPer-dPursueDamPerDef)))(1+max(-0.7,aPVPDamPer-dPVPDamPerDef))*(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.99,aDOTPer-aDOTPerDef))))
			CalcTypeFormula 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))(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))) long(aAtkatkSkillPer*(1+aAddSkillPer))
			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))(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))(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))(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.99,aDOTPer-dDOTPerDef))))
			CalcTypeFormula 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))(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))) long(aAtkatkSkillPer)
			CureFormula long(max((baseValueskillPer)(1+max(-0.99,aCurePer-dCureDefPer))(1+angerOverflow/100.0), baseValue0.05))
			ShieldFormula long((baseValueskillPer)(1+max(-0.99,aShieldPer-dShieldPerDef)*(1+angerOverflow/100.0))
			ShieldFormula long((baseValueskillPer)(1+max(-0.99,aShieldPer-dShieldPerDef)*(1+angerOverflow/100.0)))
			BuffStateGroup {"1":[1,3,12,15], "2":[9,10,13,16,17], "3":[1,3,12,15,13], "4":[1,3,12,15,9,10,17], "5":[1,3,12,15,10,17]}
			InvestCost {"1":[116],"2":[117]}
			InvestDay {"1":30} {"1":180} {"1":[[1,50], [3,100]], "2":[[1,100], [3,200]]}