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

hwj35

2026-06-11 f04d6f2ae347d838133bcd7e0e82ce0b9e02dfd9

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

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DB/StructData/DBFamily.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CreateFamily.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Family.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyAtkDefBat.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossPlayer.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc

Binary files differ

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

@@ -426,7 +426,7 @@
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))))        

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)			
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))*(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)))                

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]}                

@@ -471,7 +471,7 @@
DeleteTestRebate    ryzj    5    20260326    20261226    120

FmAtkDefBatSet    [[1,2,5],[3,6],[4,7]]    5            

FmAtkDefBatPrepare    12    7|50000    4    2    

FmAtkDefBatAward    [[45,200],[2,1000]]    [[45,80],[2,500]]    [[45,3000],[2,30000],[3,100],[1046,20]]    [[45,3000],[2,15000],[3,50],[1046,10]]	
FmAtkDefBatAward    [[45,200],[2,1000]]    [[45,80],[2,500]]    [[45,5000],[2,30000],[3,100],[1046,10]]    [[45,3000],[2,15000],[3,50],[1046,5]]	
FmAtkDefBatTreasure    {"2":9, "3":1}    40    6        

FamilyGCZGroupSet    {"48": {"1": {"1": [4,6,0]}, "2": {"1": [2,6,0], "2": [2,6,0]}, "3": {"1": [1,0,0], "2": [2,0,0], "3": [1,0,0]}}, "72": {"1": {"1": [6,6,0]}, "2": {"1": [3,4,0], "2": [3,4,4]}, "3": {"1": [3,0,0], "2": [2,0,0], "3": [1,0,0]}}}    {"1":{"1":1200, "2":1000, "3":800, "4":600, "6":400, "9":200, "12":150}, "2":{"1":1680, "2":1400, "3":1120, "4":840, "6":560, "9":280, "12":200}, "3":{"1":3550, "2":3230, "3":2940, "4":2670, "6":2430, "9":2210, "12":2000}}            

FamilyGCZXiuluo    10000000000    100    150    [3]    


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

@@ -203,10 +203,10 @@
7025    29    5    1    []    0    19    38    0    100    0    0    0

7026    29    3    10    []    0    50    38    0    40    0    0    0

11000    100    3    25    []    2    1    45    0    0    0    0    0

11001    100    1046    10    []    2    5    45    0    500    0    0    0

11002    100    13    20    []    2    20    45    0    200    0    0    0

11003    100    20    5    []    2    10    45    0    300    0    0    0

11004    100    2    15000    []    2    10    45    0    100    0    0    0

11001    100    1046    5    []    2    3    45    0    800    4000    0    0

11002    100    10000    5    []    2    20    45    0    100    200    1    5

11003    100    20    5    []    2    20    45    0    300    400    1    3

11004    100    2    30000    []    2    10    45    0    100    0    0    0

11005    100    1029    1    []    2    10    45    0    250    0    0    0

11006    100    200    10    []    2    50    45    0    50    0    0    0

11007    100    21    10    []    2    50    45    0    50    0    0    0


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

@@ -426,7 +426,7 @@
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))))        

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)			
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))*(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)))                

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]}                

@@ -471,7 +471,7 @@
DeleteTestRebate    ryzj    5    20260326    20261226    120

FmAtkDefBatSet    [[1,2,5],[3,6],[4,7]]    5            

FmAtkDefBatPrepare    12    7|50000    4    2    

FmAtkDefBatAward    [[45,200],[2,1000]]    [[45,80],[2,500]]    [[45,3000],[2,30000],[3,100],[1046,20]]    [[45,3000],[2,15000],[3,50],[1046,10]]	
FmAtkDefBatAward    [[45,200],[2,1000]]    [[45,80],[2,500]]    [[45,5000],[2,30000],[3,100],[1046,10]]    [[45,3000],[2,15000],[3,50],[1046,5]]	
FmAtkDefBatTreasure    {"2":9, "3":1}    40    6        

FamilyGCZGroupSet    {"48": {"1": {"1": [4,6,0]}, "2": {"1": [2,6,0], "2": [2,6,0]}, "3": {"1": [1,0,0], "2": [2,0,0], "3": [1,0,0]}}, "72": {"1": {"1": [6,6,0]}, "2": {"1": [3,4,0], "2": [3,4,4]}, "3": {"1": [3,0,0], "2": [2,0,0], "3": [1,0,0]}}}    {"1":{"1":1200, "2":1000, "3":800, "4":600, "6":400, "9":200, "12":150}, "2":{"1":1680, "2":1400, "3":1120, "4":840, "6":560, "9":280, "12":200}, "3":{"1":3550, "2":3230, "3":2940, "4":2670, "6":2430, "9":2210, "12":2000}}            

FamilyGCZXiuluo    10000000000    100    150    [3]    


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

@@ -203,10 +203,10 @@
7025    29    5    1    []    0    19    38    0    100    0    0    0

7026    29    3    10    []    0    50    38    0    40    0    0    0

11000    100    3    25    []    2    1    45    0    0    0    0    0

11001    100    1046    10    []    2    5    45    0    500    0    0    0

11002    100    13    20    []    2    20    45    0    200    0    0    0

11003    100    20    5    []    2    10    45    0    300    0    0    0

11004    100    2    15000    []    2    10    45    0    100    0    0    0

11001    100    1046    5    []    2    3    45    0    800    4000    0    0

11002    100    10000    5    []    2    20    45    0    100    200    1    5

11003    100    20    5    []    2    20    45    0    300    400    1    3

11004    100    2    30000    []    2    10    45    0    100    0    0    0

11005    100    1029    1    []    2    10    45    0    250    0    0    0

11006    100    200    10    []    2    50    45    0    50    0    0    0

11007    100    21    10    []    2    50    45    0    50    0    0    0