From a4d18175cd56ebdd26c46a279a72902835c93316 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期三, 27 五月 2026 15:45:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
index 0bbfb87..5f1511d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
@@ -433,7 +433,7 @@
 SuperHitCfg	max(aSuperHitRate - dSuperHitRateDef, 0)	1.5			
 StunCfg	min(aStunRate - dStunRateDef, 7000)	200			
 SuckHPCfg	long(hurtHP*max(aSuckHPPer -dSuckHPPerDef, 0)*(1+aCurePer-dCureDefPer))				
-HurtFormula	long(max((aAtk*0.05),(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((aAtk*0.05),(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((aAtk*0.05),(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))))		
+HurtFormula	long(max((aAtk*0.05),(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((aAtk*0.05),(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((aAtk*0.05),(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((aAtk*0.05),(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))))				
 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))*(1+max(-0.7,aBatDamPer-dBatDamPerDef))*(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))				

--
Gitblit v1.8.0