From 9ae718dbdb36c96a8de13c576943620c13bc803f Mon Sep 17 00:00:00 2001
From: gwj <379014410@qq.com>
Date: 星期三, 17 九月 2025 16:43:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

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

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
index 18c2e82..52a9cc6 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
@@ -431,7 +431,8 @@
 StunCfg	min(aStunRate - dStunRateDef, 8000)	200			
 SuckHPCfg	int(max(aSuckHPPer -dSuckHPPerDef, 0)/10000.0*hurtHP)				
 HurtFormula	int((aAtk-dDef)*atkSkillPer*(1+aNormalSkillPer-dNormalSkillPerDef)*(1+aAddSkillPer)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	int((aAtk-dDef)*atkSkillPer*(1+aAngerSkillPer-dAngerSkillPerDef)*(1+aAddSkillPer)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef+angerOverflow/100.0)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	0	int((aAtk-dDef)*atkSkillPer*(1+aAddSkillPer)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	
-DOTFormula	int(aAtk*atkSkillPer*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef))				
+DOTFormula	int((aAtk-dDef)*atkSkillPer*(1+aAddSkillPer)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef))				
+CalcTypeFormula	int((aAtk-dDef)*atkSkillPer*(1+aAddSkillPer)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))				
 CureFormula	int(max((baseValue*skillPer)*(1+curePer-cureDefPer)*(1+angerOverflow/100.0), baseValue*0.05))				
 InvestCost	{}	{}	{"7":[101],"12":[102]} 	{}	{}
 InvestMaxDay	{"7":28,"12":0}	[7,8]			

--
Gitblit v1.8.0