129 【战斗】战斗系统-服务端(张星彩怒技,觉醒技能;增加buff消失后触发时机;增加效果6007 6008 7001 7002;技能友好目标增加类型2:一定包含自己的友方单位)
18个文件已修改
2个文件已添加
50 ■■■■ 已修改文件
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5001.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5002.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5003.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5012.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6007.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6008.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/BuffAtkType_1003.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroAwake.txt 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroAwake.txt 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5001.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5002.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5003.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5012.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6007.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6008.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/BuffAtkType_1003.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
@@ -432,7 +432,7 @@
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+aComboDamPer+aPursueDamPer)*(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+aPursueDamPer)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))    0    int((aAtk-dDef)*atkSkillPer*(1+aAddSkillPer)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef+aPursueDamPer)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))    
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))
CalcTypeFormula    int((aAtk-dDef)*atkSkillPer*(1+aAddSkillPer)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))    int(aAtk*atkSkillPer*(1+aAddSkillPer))
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]            
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroAwake.txt
@@ -383,10 +383,10 @@
520006    22    35    200    0    0    0
520006    23    35    200    0    0    0
520006    24    35    200    0    8    10
520007    1    35    200    0    0    0
520007    2    35    200    0    0    0
520007    3    35    200    0    0    0
520007    4    35    200    0    0    0
520007    1    35    200    2007210    0    0
520007    2    35    200    2007220    0    0
520007    3    35    200    2007230    0    0
520007    4    35    200    2007240    0    0
520007    5    35    200    0    0    0
520007    6    35    200    0    5    10
520007    7    35    200    0    0    0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
@@ -35,9 +35,9 @@
1001070    1001070    1    1    鹰视    3    1    1    0    1    0    0    1    0    10000    0    0    10000    0        13        0                0                0                0    0    0    0    0    
1001080    1001080    1    1    怒气    3    5    0    6    5    1    0    0    0    7000    0    0    10000    0                0                0                0                0    0    0    0    0    
1001090    1001090    1    1    升变    3    2    0    2    5    1    0    1    0    7500    0    0        5001    1    4    2    0                0                0            4    2    2    0    0    0    
1001210    1001210    1    1    秘药·极
1001210    1001210    1    1    噬魄·极
1001220    1001220    1    1    破境                                                                                                                                            
1001230    1001230    1    1    秘药·狂
1001230    1001230    1    1    噬魄·狂
1001240    1001240    1    1    神格                                                                                                                                            
1002010    1002010    1    1    登先    1    1    2    1    1    0    0    1    0    9000    0    0    10000    5010    10020101    13        0                0                0        0    0    0    0    0    0    0    attack
10020101    10020101    1    1    登先    0    4    2    1001    6    0    0    0    0    2000    0    0    5000    5001        4    2    5002    2|3|0|300    13        0                0        2    4    1    0    4    0    0    
@@ -294,16 +294,17 @@
2006240    2006240    1    1    神格                                                                                                                                            
2007010    2007010    1    1    炫彩    1    1    1    1    1    0    0    1    0    8500    0    0    10000    5010    20070101    13        0                0                0        0    0    0    0    0    0    0    attack
20070101    20070101    1    1    炫彩    0    1    1    1    6    0    0    0    0    8000    0    0    3000                                    0                0        0    0    0    0    0    0        attack
2007020    2007020    1    3    明镜止水    2    5    1    0    5    0    0    0    0        0    0    10000                    0                0                0        8    1                    0    angerskill
2007020    2007020    1    1    明镜止水    2    5    1    0    5    0    0    0    0        0    0    10000    5011    20070201    17    4    0                0                0        8    1                    0    angerskill
20070201    20070201    1    1    治疗    0    2    1    2    0    2    1    2    4    2500    0    0    10000    7001    0|500                            0                0        0    0    0    0    0    0        attack
2007030    2007030    1    1    霓裳    3                                            0                                                                                        0    
2007050    2007050    1    1    虹鳞    3                                            0                                                                                        0    
2007070    2007070    1    1    浣纱    3                                            0                                                                                        0    
2007080    2007080    1    1    怒气    3    1    0    6    5    1    0    0                0    10000                                                                                    0    
2007090    2007090    1    1    升变    3                                            0                                                                                        0    
2007210    2007210    1    1    明镜止水·极
2007220    2007220    1    1    破境
2007230    2007230    1    1    明镜止水·狂
2007240    2007240    1    1    神格
2007210    2007210    1    1    明镜止水·极    4    1    1    1    0    0    0    6    4    5000    0    0    10000    5011    0    17    2007020    7002
2007220    2007220    1    1    破境    4    7    0    0    0    0    0    0    0    0    0    0    10000    35    1000|1            36    500|1
2007230    2007230    1    1    明镜止水·狂    4    7    0    0    0    0    0    0    0    0    0    0    10000    6007    1    8    20070201
2007240    2007240    1    1    神格    4    7    0    0    0    0    0    0    0    0    0    0    10000    6008    30    8    2
2008010    2008010    1    1    啸林    1    1    2    1    2    0    0    3    0    5000    0    0    10000    0                0                0                0        0    0    0    0    0    0    0    attack
2008020    2008020    1    1    春秋刀域    2    1    2    1    2    0    0    3    0    21000    0    0    10000    0                0                0                0        0    0    0    0    0    0    0    angerskill
2008030    2008030    1    1    刀意盈袖    3                                            0                                                                                        0    
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
@@ -432,7 +432,7 @@
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+aComboDamPer+aPursueDamPer)*(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+aPursueDamPer)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))    0    int((aAtk-dDef)*atkSkillPer*(1+aAddSkillPer)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef+aPursueDamPer)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))    
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))
CalcTypeFormula    int((aAtk-dDef)*atkSkillPer*(1+aAddSkillPer)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))    int(aAtk*atkSkillPer*(1+aAddSkillPer))
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]            
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroAwake.txt
@@ -383,10 +383,10 @@
520006    22    35    200    0    0    0
520006    23    35    200    0    0    0
520006    24    35    200    0    8    10
520007    1    35    200    0    0    0
520007    2    35    200    0    0    0
520007    3    35    200    0    0    0
520007    4    35    200    0    0    0
520007    1    35    200    2007210    0    0
520007    2    35    200    2007220    0    0
520007    3    35    200    2007230    0    0
520007    4    35    200    2007240    0    0
520007    5    35    200    0    0    0
520007    6    35    200    0    5    10
520007    7    35    200    0    0    0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
@@ -35,9 +35,9 @@
1001070    1001070    1    1    鹰视    3    1    1    0    1    0    0    1    0    10000    0    0    10000    0        13        0                0                0                0    0    0    0    0    
1001080    1001080    1    1    怒气    3    5    0    6    5    1    0    0    0    7000    0    0    10000    0                0                0                0                0    0    0    0    0    
1001090    1001090    1    1    升变    3    2    0    2    5    1    0    1    0    7500    0    0        5001    1    4    2    0                0                0            4    2    2    0    0    0    
1001210    1001210    1    1    秘药·极
1001210    1001210    1    1    噬魄·极
1001220    1001220    1    1    破境                                                                                                                                            
1001230    1001230    1    1    秘药·狂
1001230    1001230    1    1    噬魄·狂
1001240    1001240    1    1    神格                                                                                                                                            
1002010    1002010    1    1    登先    1    1    2    1    1    0    0    1    0    9000    0    0    10000    5010    10020101    13        0                0                0        0    0    0    0    0    0    0    attack
10020101    10020101    1    1    登先    0    4    2    1001    6    0    0    0    0    2000    0    0    5000    5001        4    2    5002    2|3|0|300    13        0                0        2    4    1    0    4    0    0    
@@ -294,16 +294,17 @@
2006240    2006240    1    1    神格                                                                                                                                            
2007010    2007010    1    1    炫彩    1    1    1    1    1    0    0    1    0    8500    0    0    10000    5010    20070101    13        0                0                0        0    0    0    0    0    0    0    attack
20070101    20070101    1    1    炫彩    0    1    1    1    6    0    0    0    0    8000    0    0    3000                                    0                0        0    0    0    0    0    0        attack
2007020    2007020    1    3    明镜止水    2    5    1    0    5    0    0    0    0        0    0    10000                    0                0                0        8    1                    0    angerskill
2007020    2007020    1    1    明镜止水    2    5    1    0    5    0    0    0    0        0    0    10000    5011    20070201    17    4    0                0                0        8    1                    0    angerskill
20070201    20070201    1    1    治疗    0    2    1    2    0    2    1    2    4    2500    0    0    10000    7001    0|500                            0                0        0    0    0    0    0    0        attack
2007030    2007030    1    1    霓裳    3                                            0                                                                                        0    
2007050    2007050    1    1    虹鳞    3                                            0                                                                                        0    
2007070    2007070    1    1    浣纱    3                                            0                                                                                        0    
2007080    2007080    1    1    怒气    3    1    0    6    5    1    0    0                0    10000                                                                                    0    
2007090    2007090    1    1    升变    3                                            0                                                                                        0    
2007210    2007210    1    1    明镜止水·极
2007220    2007220    1    1    破境
2007230    2007230    1    1    明镜止水·狂
2007240    2007240    1    1    神格
2007210    2007210    1    1    明镜止水·极    4    1    1    1    0    0    0    6    4    5000    0    0    10000    5011    0    17    2007020    7002
2007220    2007220    1    1    破境    4    7    0    0    0    0    0    0    0    0    0    0    10000    35    1000|1            36    500|1
2007230    2007230    1    1    明镜止水·狂    4    7    0    0    0    0    0    0    0    0    0    0    10000    6007    1    8    20070201
2007240    2007240    1    1    神格    4    7    0    0    0    0    0    0    0    0    0    0    10000    6008    30    8    2
2008010    2008010    1    1    啸林    1    1    2    1    2    0    0    3    0    5000    0    0    10000    0                0                0                0        0    0    0    0    0    0    0    attack
2008020    2008020    1    1    春秋刀域    2    1    2    1    2    0    0    3    0    21000    0    0    10000    0                0                0                0        0    0    0    0    0    0    0    angerskill
2008030    2008030    1    1    刀意盈袖    3                                            0                                                                                        0