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

hwj35

2025-11-19 9b11f88d1545eeece9d667fc9a2a72d05f0d5714

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

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

@@ -1,5 +1,6 @@
ADID    ADCntMax    ADAwardItemList    ADAwardType    ADAwardValue

1    2    []    2    30010

2    2    []    2    30020

3    3    []    3    12

3    2    []    3    12

4    12    []    1    0

5    2    []    3    5


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

@@ -411,7 +411,7 @@
MainEquipDrop    1    42|30    [-3, 2]    long(round(itemLV*attrStep*attrProportion*randfloat(0.9,1.1)))    

MainBootyDrop    {7:1,8:15,6:50,5:50,1:20}    {7:[4,10],8:[0,2],6:[0,1],5:[0,2],1:[2,6]}            

MainDropAppoint    {1:[100101,0,101],2:[100203,0,102],3:[100104,0,103],4:[100107,0,104],5:[100106,0,105],6:[100305,0,106],7:[100102,0,107],8:[100209,0,108],9:[100111,0,109],10:[100407,0,110],11:[100110,0,111],12:[100105,1,0],13:[100212,0,112],14:[100107,3,0],15:[100301,0,113],16:[100206,1,0],17:[100105,0,114],18:[100201,2,0],19:[100103,1,115],20:[100110,1,0],21:[100112,2,0],22:[100209,0,116],23:[100107,2,0],24:[100109,1,0],25:[100308,0,117]}                

TreeLVUP    42    4|300    5    120    30

TreeLVUP    42    4|300			
TreeEnergy    3    3    120    30    1|50

TurnFightCD    0    800            

TurnMax    15    20    {}        

@@ -422,14 +422,14 @@
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((aAtk-dDef)*atkSkillPer*max(1, 1+aNormalSkillPer-dNormalSkillPerDef)*(1+aAddSkillPer)*max(1,1+aPMDamPer-dPMDamPerDef)*max(1,1+aFinalDamPer-dFinalDamPerDef)*max(1,1+aComboDamPer-dComboDamPerDef)*max(1,1+aPursueDamPer-dPursueDamPerDef)*max(1,1+aCountryDamPer-dCountryDamPerDef)*max(1,1+aPVPDamPer-dPVPDamPerDef)*max(1, aSuperDamPer-dSuperDamPerDef))    long((aAtk-dDef)*atkSkillPer*max(1, 1+aAngerSkillPer-dAngerSkillPerDef)*(1+angerOverflow/100.0)*(1+aAddSkillPer)*max(1,1+aPMDamPer-dPMDamPerDef)*max(1,1+aFinalDamPer-dFinalDamPerDef)*max(1,1+aPursueDamPer-dPursueDamPerDef)*max(1,1+aCountryDamPer-dCountryDamPerDef)*max(1,1+aPVPDamPer-dPVPDamPerDef)*max(1, aSuperDamPer-dSuperDamPerDef))    long((aAtk-dDef)*atkSkillPer*(1+aAddSkillPer)*max(1,1+aPMDamPer-dPMDamPerDef)*max(1,1+aFinalDamPer-dFinalDamPerDef)*max(1,1+aPursueDamPer-dPursueDamPerDef)*max(1,1+aCountryDamPer-dCountryDamPerDef)*max(1,1+aPVPDamPer-dPVPDamPerDef)*max(1, aSuperDamPer-dSuperDamPerDef))		
DOTFormula    long((aAtk-dDef)*atkSkillPer*max(1, 1+aDOTPer-dDOTPerDef)*(1+aAddSkillPer)*max(1,1+aPMDamPer-dPMDamPerDef)*max(1,1+aFinalDamPer-dFinalDamPerDef)*max(1,1+aCountryDamPer-dCountryDamPerDef)*max(1,1+aPVPDamPer-dPVPDamPerDef))				
CalcTypeFormula    long((aAtk-dDef)*atkSkillPer*(1+aAddSkillPer)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef+angerOverflow/100.0+aPVPDamPer-dPVPDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))    long(aAtk*atkSkillPer*(1+aAddSkillPer))			
CureFormula    long(max((baseValue*skillPer)*(1+aCurePer-dCureDefPer)*(1+angerOverflow/100.0), baseValue*0.05))				
ShieldFormula    long((baseValue*skillPer)*(1+aShieldPer-dShieldPerDef)*(1+angerOverflow/100.0))				
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))			
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]}                

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

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

GoldRush    12|12    60|60    10        

GoldRushAuto    [3,  30]    [[1]]    [1,2,3,4]        


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

@@ -18,7 +18,7 @@
1010    1010    1    1    ǿ׳    0    0    0    0    5    0    0    0    0    10000    0    0    10000    18    3000|1        1    0                0                    0            0        0    0    0    0    0

1011    1011    1    1    狂怒    0    0    0    0    5    0    0    0    0    10000    0    0    10000    19    5000|1        1    0                0                    0            0        0    0    0    0    0

1012    1012    1    1    荆棘    0    1    0    1    6    0    0    0    7    2500    0    0    10000    5011        11    1    0                0                    0            0        0    0    0    0    0

1013    1013    1    1    瘟疫    0    4    0    1001    0    0    0    0    0    5000    0    0    10000    5011        1    1    5001        4    2    0                    0            0        0    0    0    1    0

1013    1013    1    1    瘟疫    0    4    0    1001    0    0    0    6    0    5000    0    0    10000    5011        1    1    5001        4    2    0                    0            0        0    0    0    1    0

1014    1014    1    1    ͳ˧    0    5    0    0    0    1    0    0    0    10000    0    0    10000    35    1500|1            5011        1    1    0                    0            0        0    0    0    1    0

1015    1015    1    1    统御    0    5    0    0    0    1    0    0    0    10000    0    0    10000    36    1500|1            5011        1    1    0                    0            0        0    0    0    1    0

1016    1016    1    1    枯竭    0    6    0    0    0    0    0    0    0    10000    0    0    10000    19    3000|2            5011        1    1    0                    0            0        0    0    0    1    0


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

@@ -1,5 +1,6 @@
ADID    ADCntMax    ADAwardItemList    ADAwardType    ADAwardValue

1    2    []    2    30010

2    2    []    2    30020

3    3    []    3    12

3    2    []    3    12

4    12    []    1    0

5    2    []    3    5


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

@@ -411,7 +411,7 @@
MainEquipDrop    1    42|30    [-3, 2]    long(round(itemLV*attrStep*attrProportion*randfloat(0.9,1.1)))    

MainBootyDrop    {7:1,8:15,6:50,5:50,1:20}    {7:[4,10],8:[0,2],6:[0,1],5:[0,2],1:[2,6]}            

MainDropAppoint    {1:[100101,0,101],2:[100203,0,102],3:[100104,0,103],4:[100107,0,104],5:[100106,0,105],6:[100305,0,106],7:[100102,0,107],8:[100209,0,108],9:[100111,0,109],10:[100407,0,110],11:[100110,0,111],12:[100105,1,0],13:[100212,0,112],14:[100107,3,0],15:[100301,0,113],16:[100206,1,0],17:[100105,0,114],18:[100201,2,0],19:[100103,1,115],20:[100110,1,0],21:[100112,2,0],22:[100209,0,116],23:[100107,2,0],24:[100109,1,0],25:[100308,0,117]}                

TreeLVUP    42    4|300    5    120    30

TreeLVUP    42    4|300			
TreeEnergy    3    3    120    30    1|50

TurnFightCD    0    800            

TurnMax    15    20    {}        

@@ -422,14 +422,14 @@
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((aAtk-dDef)*atkSkillPer*max(1, 1+aNormalSkillPer-dNormalSkillPerDef)*(1+aAddSkillPer)*max(1,1+aPMDamPer-dPMDamPerDef)*max(1,1+aFinalDamPer-dFinalDamPerDef)*max(1,1+aComboDamPer-dComboDamPerDef)*max(1,1+aPursueDamPer-dPursueDamPerDef)*max(1,1+aCountryDamPer-dCountryDamPerDef)*max(1,1+aPVPDamPer-dPVPDamPerDef)*max(1, aSuperDamPer-dSuperDamPerDef))    long((aAtk-dDef)*atkSkillPer*max(1, 1+aAngerSkillPer-dAngerSkillPerDef)*(1+angerOverflow/100.0)*(1+aAddSkillPer)*max(1,1+aPMDamPer-dPMDamPerDef)*max(1,1+aFinalDamPer-dFinalDamPerDef)*max(1,1+aPursueDamPer-dPursueDamPerDef)*max(1,1+aCountryDamPer-dCountryDamPerDef)*max(1,1+aPVPDamPer-dPVPDamPerDef)*max(1, aSuperDamPer-dSuperDamPerDef))    long((aAtk-dDef)*atkSkillPer*(1+aAddSkillPer)*max(1,1+aPMDamPer-dPMDamPerDef)*max(1,1+aFinalDamPer-dFinalDamPerDef)*max(1,1+aPursueDamPer-dPursueDamPerDef)*max(1,1+aCountryDamPer-dCountryDamPerDef)*max(1,1+aPVPDamPer-dPVPDamPerDef)*max(1, aSuperDamPer-dSuperDamPerDef))		
DOTFormula    long((aAtk-dDef)*atkSkillPer*max(1, 1+aDOTPer-dDOTPerDef)*(1+aAddSkillPer)*max(1,1+aPMDamPer-dPMDamPerDef)*max(1,1+aFinalDamPer-dFinalDamPerDef)*max(1,1+aCountryDamPer-dCountryDamPerDef)*max(1,1+aPVPDamPer-dPVPDamPerDef))				
CalcTypeFormula    long((aAtk-dDef)*atkSkillPer*(1+aAddSkillPer)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef+angerOverflow/100.0+aPVPDamPer-dPVPDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))    long(aAtk*atkSkillPer*(1+aAddSkillPer))			
CureFormula    long(max((baseValue*skillPer)*(1+aCurePer-dCureDefPer)*(1+angerOverflow/100.0), baseValue*0.05))				
ShieldFormula    long((baseValue*skillPer)*(1+aShieldPer-dShieldPerDef)*(1+angerOverflow/100.0))				
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))			
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]}                

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

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

GoldRush    12|12    60|60    10        

GoldRushAuto    [3,  30]    [[1]]    [1,2,3,4]        


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

@@ -18,7 +18,7 @@
1010    1010    1    1    ǿ׳    0    0    0    0    5    0    0    0    0    10000    0    0    10000    18    3000|1        1    0                0                    0            0        0    0    0    0    0

1011    1011    1    1    狂怒    0    0    0    0    5    0    0    0    0    10000    0    0    10000    19    5000|1        1    0                0                    0            0        0    0    0    0    0

1012    1012    1    1    荆棘    0    1    0    1    6    0    0    0    7    2500    0    0    10000    5011        11    1    0                0                    0            0        0    0    0    0    0

1013    1013    1    1    瘟疫    0    4    0    1001    0    0    0    0    0    5000    0    0    10000    5011        1    1    5001        4    2    0                    0            0        0    0    0    1    0

1013    1013    1    1    瘟疫    0    4    0    1001    0    0    0    6    0    5000    0    0    10000    5011        1    1    5001        4    2    0                    0            0        0    0    0    1    0

1014    1014    1    1    ͳ˧    0    5    0    0    0    1    0    0    0    10000    0    0    10000    35    1500|1            5011        1    1    0                    0            0        0    0    0    1    0

1015    1015    1    1    统御    0    5    0    0    0    1    0    0    0    10000    0    0    10000    36    1500|1            5011        1    1    0                    0            0        0    0    0    1    0

1016    1016    1    1    枯竭    0    6    0    0    0    0    0    0    0    10000    0    0    10000    19    3000|2            5011        1    1    0                    0            0        0    0    0    1    0