From 32ef84d7a7994efdb5c576c44cea551cfd18bf0f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 14 七月 2026 10:22:58 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(支持死亡召唤其他武将,支持召唤物战斗;增加效果5522;)

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc                      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt          |    2 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                             |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt          |    2 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc                     |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc                    |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5522.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc                      |    0 
 8 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
index d29e31a..1ca841d 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/Attack/TurnAttack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc
index 44d09d7..496e896 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.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 40e3246..532dee2 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 45ba6a8..d3feccc 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/Skill/PassiveTrigger/PassiveEff_5522.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5522.pyc
new file mode 100644
index 0000000..6c6e5bc
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5522.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 7999e9f..c7b3b6e 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 ccc1679..3a14e34 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
@@ -1413,7 +1413,7 @@
 40180701	40180701	1	1		0	1	2	1	0	0	0	1	0	10000	0	0	10000														0								0	0	0
 40180702	40180702	1	1		0	2	0	2	6	0	0	0	0	10000	0	0	10000														0								0	0	0
 4018080	4018080	1	1	怒气	3	0	0	6	5	0	0	0	0	5000	0	0	10000	5011		1	1																				960000
-4018090	4018090	1	1	升变	3	5	0	0	5	0	0	0	0	0	0	0	10000																								1080000
+4018090	4018090	1	1	升变	3	5	0	0	5	0	0	0	0	0	0	0	10000	5522	540015|150|100|2	43	1																				1080000
 4018100	4018100	1	1	普攻·真	3													6006	5000	8	1001010																				
 4018110	4018110	1	1	职业																																					
 4018120	4018120	1	1	怒气·真	3													6006	11200	8	1001020																				
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 ccc1679..3a14e34 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
@@ -1413,7 +1413,7 @@
 40180701	40180701	1	1		0	1	2	1	0	0	0	1	0	10000	0	0	10000														0								0	0	0
 40180702	40180702	1	1		0	2	0	2	6	0	0	0	0	10000	0	0	10000														0								0	0	0
 4018080	4018080	1	1	怒气	3	0	0	6	5	0	0	0	0	5000	0	0	10000	5011		1	1																				960000
-4018090	4018090	1	1	升变	3	5	0	0	5	0	0	0	0	0	0	0	10000																								1080000
+4018090	4018090	1	1	升变	3	5	0	0	5	0	0	0	0	0	0	0	10000	5522	540015|150|100|2	43	1																				1080000
 4018100	4018100	1	1	普攻·真	3													6006	5000	8	1001010																				
 4018110	4018110	1	1	职业																																					
 4018120	4018120	1	1	怒气·真	3													6006	11200	8	1001020																				

--
Gitblit v1.8.0