From 950b6d9d9af76353f532c33a6c9f8ff041adfd74 Mon Sep 17 00:00:00 2001 From: hwj35 <691170510@qq.com> Date: 星期四, 28 八月 2025 11:41:49 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt | 17 +++++++++++------ ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5001.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt | 17 +++++++++++------ ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/OpenFunc.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5002.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPrestigeSys.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/RealmLVUP.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.pyc | 0 15 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc index 1f32786..7f335d8 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index b7d2e39..5f5e9a5 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc index 9f54917..4459368 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/OpenFunc.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/OpenFunc.pyc index 2db8198..de4446c 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/OpenFunc.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/OpenFunc.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/RealmLVUP.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/RealmLVUP.pyc index d94c2ef..4c88099 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/RealmLVUP.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/RealmLVUP.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.pyc index 751bec0..615c942 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPrestigeSys.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPrestigeSys.pyc index c638e0d..0560986 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPrestigeSys.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPrestigeSys.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5001.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5001.pyc index e315310..0e11536 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5001.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5001.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5002.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5002.pyc new file mode 100644 index 0000000..eff9363 --- /dev/null +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5002.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.pyc index c90fe8d..c81ed73 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc index d18941e..27b8869 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc index ee63ba3..0faa4c6 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc index 52e91a9..0ebf6ee 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt index c1c5e03..5e2a39e 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt @@ -1,17 +1,22 @@ SkillID SkillTypeID SkillLV SkillMaxLV SkillName FuncType SkillType HurtType AtkType TagAim TagFriendly TagAffect TagCount CalcType SkillPer SkillValue HappenRate EffectID1 EffectValues1 TriggerWay1 TriggerSrc1 EffectID2 EffectValues2 TriggerWay2 TriggerSrc2 EffectID3 EffectValues3 TriggerWay3 TriggerSrc3 CoolDownTime IgnoreStates BuffState LastTime LayerCnt LayerMax BuffRepeat DieContinue FightPower SkillMotionName 100 100 1 1 通用反击 4 1 1 1 0 0 0 1 0 10000 0 10000 0 0 0 0 0 0 0 0 0 0 -200 200 1 1 击晕 0 14 0 0 6 0 0 0 0 0 0 10000 0 0 0 0 3 1 0 0 6 0 0 -201 201 1 1 击晕 0 14 0 0 6 0 0 0 0 0 0 2000 0 0 0 0 3 1 0 0 6 0 0 -300 300 1 1 冰冻 0 14 1 0 6 0 0 0 0 0 0 10000 0 0 0 0 1 1 0 0 6 0 0 -301 301 1 1 冰冻 0 14 1 0 6 0 0 0 0 0 0 10000 0 0 0 0 1 2 0 0 6 0 0 -302 302 1 1 冰冻 0 14 1 0 6 0 0 0 0 0 0 5000 0 0 0 0 1 2 0 0 6 0 0 +200 200 1 1 击晕 0 14 0 0 6 0 0 0 0 0 0 10000 0 0 0 0 3 1 0 0 0 0 0 +201 201 1 1 击晕 0 14 0 0 6 0 0 0 0 0 0 2000 0 0 0 0 3 1 0 0 0 0 0 +300 300 1 1 冰冻 0 14 1 0 6 0 0 0 0 0 0 10000 0 0 0 0 1 1 0 0 0 0 0 +301 301 1 1 冰冻 0 14 1 0 6 0 0 0 0 0 0 10000 0 0 0 0 1 2 0 0 0 0 0 +302 302 1 1 冰冻 0 14 1 0 6 0 0 0 0 0 0 5000 0 0 0 0 1 2 0 0 0 0 0 100101 100101 1 1 曹婴普技 1 1 1 1 0 0 1 1 0 10000 0 10000 0 0 0 0 0 0 0 0 0 0 0 100102 100102 1 1 曹婴怒技 2 1 1 1 4 0 0 2 0 21000 0 10000 0 0 0 0 0 0 0 0 0 0 0 100201 100201 1 1 乐进普技 1 1 2 1 1 0 0 1 0 9000 0 10000 5010 1002011 13 0 0 0 0 0 0 0 0 0 0 -1002011 1002011 1 1 寒气 1 4 2 1001 6 0 0 0 0 2000 0 4000 5001 4 2 5002 2|3|0|300 13 0 0 2 4 1 0 4 0 0 +1002011 1002011 1 1 寒气 0 4 2 1001 6 0 0 0 0 2000 0 4000 5001 4 2 5002 2|3|0|300 13 0 0 2 4 1 0 4 0 0 +100202 100202 1 1 乐进怒技 2 1 2 1 1 0 0 1 0 35600 0 10000 5010 1002021 13 0 0 0 0 0 0 0 0 0 0 +1002021 1002021 1 1 破甲 0 6 0 0 6 0 0 0 0 0 0 5000 17 5000|2 0 0 0 0 1 0 0 0 0 0 100301 100301 1 1 庞德普技 1 1 1 1 1 0 0 1 0 10500 0 10000 0 0 0 0 0 0 0 0 0 0 0 100302 100302 1 1 庞德怒技 2 1 1 1 2 0 0 3 0 15000 0 10000 5010 1003021 13 0 0 0 0 0 0 0 0 0 0 1003021 1003021 1 1 卸甲 0 6 0 0 6 0 0 0 0 0 0 5000 17 5000|2 0 0 0 0 2 0 0 0 0 0 +100401 100401 1 1 卞夫人普技 1 1 2 1 3 0 0 1 0 6500 0 10000 5010 300 13 0 0 0 0 0 0 0 0 0 0 +100402 100402 1 1 卞夫人怒技 2 1 2 1 0 0 0 0 0 8000 0 10000 5010 1004021 13 0 0 0 0 0 0 0 0 0 0 +1004021 1004021 1 1 寒气 0 4 2 1001 6 0 0 0 0 2000 0 5000 5001 4 2 5002 2|3|0|301 13 0 0 2 4 1 0 4 0 0 101501 101501 1 1 曹仁普技 1 1 1 1 1 0 0 1 0 8000 0 10000 5010 [1015011,[1,3,12]] 13 0 0 0 0 0 0 0 0 0 0 1015011 1015011 1 1 护盾 0 5 0 1003 5 0 0 0 1 1000 0 10000 0 0 0 0 0 0 0 0 0 0 0 101502 101502 1 1 曹仁怒技 2 5 1 1003 5 0 0 0 1 2000 0 10000 5010 1015021 13 2 5011 302 11 2 5011 301 12 101502 0 0 2 0 0 0 0 0 attack diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt index c1c5e03..5e2a39e 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt @@ -1,17 +1,22 @@ SkillID SkillTypeID SkillLV SkillMaxLV SkillName FuncType SkillType HurtType AtkType TagAim TagFriendly TagAffect TagCount CalcType SkillPer SkillValue HappenRate EffectID1 EffectValues1 TriggerWay1 TriggerSrc1 EffectID2 EffectValues2 TriggerWay2 TriggerSrc2 EffectID3 EffectValues3 TriggerWay3 TriggerSrc3 CoolDownTime IgnoreStates BuffState LastTime LayerCnt LayerMax BuffRepeat DieContinue FightPower SkillMotionName 100 100 1 1 通用反击 4 1 1 1 0 0 0 1 0 10000 0 10000 0 0 0 0 0 0 0 0 0 0 -200 200 1 1 击晕 0 14 0 0 6 0 0 0 0 0 0 10000 0 0 0 0 3 1 0 0 6 0 0 -201 201 1 1 击晕 0 14 0 0 6 0 0 0 0 0 0 2000 0 0 0 0 3 1 0 0 6 0 0 -300 300 1 1 冰冻 0 14 1 0 6 0 0 0 0 0 0 10000 0 0 0 0 1 1 0 0 6 0 0 -301 301 1 1 冰冻 0 14 1 0 6 0 0 0 0 0 0 10000 0 0 0 0 1 2 0 0 6 0 0 -302 302 1 1 冰冻 0 14 1 0 6 0 0 0 0 0 0 5000 0 0 0 0 1 2 0 0 6 0 0 +200 200 1 1 击晕 0 14 0 0 6 0 0 0 0 0 0 10000 0 0 0 0 3 1 0 0 0 0 0 +201 201 1 1 击晕 0 14 0 0 6 0 0 0 0 0 0 2000 0 0 0 0 3 1 0 0 0 0 0 +300 300 1 1 冰冻 0 14 1 0 6 0 0 0 0 0 0 10000 0 0 0 0 1 1 0 0 0 0 0 +301 301 1 1 冰冻 0 14 1 0 6 0 0 0 0 0 0 10000 0 0 0 0 1 2 0 0 0 0 0 +302 302 1 1 冰冻 0 14 1 0 6 0 0 0 0 0 0 5000 0 0 0 0 1 2 0 0 0 0 0 100101 100101 1 1 曹婴普技 1 1 1 1 0 0 1 1 0 10000 0 10000 0 0 0 0 0 0 0 0 0 0 0 100102 100102 1 1 曹婴怒技 2 1 1 1 4 0 0 2 0 21000 0 10000 0 0 0 0 0 0 0 0 0 0 0 100201 100201 1 1 乐进普技 1 1 2 1 1 0 0 1 0 9000 0 10000 5010 1002011 13 0 0 0 0 0 0 0 0 0 0 -1002011 1002011 1 1 寒气 1 4 2 1001 6 0 0 0 0 2000 0 4000 5001 4 2 5002 2|3|0|300 13 0 0 2 4 1 0 4 0 0 +1002011 1002011 1 1 寒气 0 4 2 1001 6 0 0 0 0 2000 0 4000 5001 4 2 5002 2|3|0|300 13 0 0 2 4 1 0 4 0 0 +100202 100202 1 1 乐进怒技 2 1 2 1 1 0 0 1 0 35600 0 10000 5010 1002021 13 0 0 0 0 0 0 0 0 0 0 +1002021 1002021 1 1 破甲 0 6 0 0 6 0 0 0 0 0 0 5000 17 5000|2 0 0 0 0 1 0 0 0 0 0 100301 100301 1 1 庞德普技 1 1 1 1 1 0 0 1 0 10500 0 10000 0 0 0 0 0 0 0 0 0 0 0 100302 100302 1 1 庞德怒技 2 1 1 1 2 0 0 3 0 15000 0 10000 5010 1003021 13 0 0 0 0 0 0 0 0 0 0 1003021 1003021 1 1 卸甲 0 6 0 0 6 0 0 0 0 0 0 5000 17 5000|2 0 0 0 0 2 0 0 0 0 0 +100401 100401 1 1 卞夫人普技 1 1 2 1 3 0 0 1 0 6500 0 10000 5010 300 13 0 0 0 0 0 0 0 0 0 0 +100402 100402 1 1 卞夫人怒技 2 1 2 1 0 0 0 0 0 8000 0 10000 5010 1004021 13 0 0 0 0 0 0 0 0 0 0 +1004021 1004021 1 1 寒气 0 4 2 1001 6 0 0 0 0 2000 0 5000 5001 4 2 5002 2|3|0|301 13 0 0 2 4 1 0 4 0 0 101501 101501 1 1 曹仁普技 1 1 1 1 1 0 0 1 0 8000 0 10000 5010 [1015011,[1,3,12]] 13 0 0 0 0 0 0 0 0 0 0 1015011 1015011 1 1 护盾 0 5 0 1003 5 0 0 0 1 1000 0 10000 0 0 0 0 0 0 0 0 0 0 0 101502 101502 1 1 曹仁怒技 2 5 1 1003 5 0 0 0 1 2000 0 10000 5010 1015021 13 2 5011 302 11 2 5011 301 12 101502 0 0 2 0 0 0 0 0 attack -- Gitblit v1.8.0