From 7fb2645ba28a51fc4160b761a1daf4f6941b63d9 Mon Sep 17 00:00:00 2001
From: gwj <123123@qq.com>
Date: 星期五, 10 七月 2026 19:42:33 +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 0eba045..fac22eb 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
@@ -427,7 +427,7 @@
CalcTypeFormula 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))*(1+max(-0.7,aBeastDamPer-dBeastDamPerDef))*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))) long(aAtk*atkSkillPer)
CureFormula long(max((baseValue*skillPer)*(1+max(-0.99,aCurePer-dCureDefPer))*(1+max(-0.7,aBeastDamPer-dBeastDamPerDef))*(1+angerOverflow/100.0), baseValue*0.05))
ShieldFormula long((baseValue*skillPer)*(1+max(-0.7,aBeastDamPer-dBeastDamPerDef))*(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]}
+BuffStateGroup {"1":[1,3,12,15], "2":[9,10,13,16,17,57], "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":[[4,10],[3,100]], "2":[[1,100], [3,100]]}
InvestPower {"1":{"30010":2}} {"2":[30010]} {"1":3, "2":3} {"2":3} {"1":60}
--
Gitblit v1.8.0