From 112f0131749f6707b0d5f4ece7d2c4be56e73c69 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 19 十二月 2025 17:26:53 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(貂蝉、吕布部分潜能;)

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc                      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt          |   14 +++++++-------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                             |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt          |   14 +++++++-------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6029.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5507.pyc |    0 
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index fabb05c..ba17caf 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/Skill/PassiveTrigger/PassiveEff_5507.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5507.pyc
new file mode 100644
index 0000000..a7837a2
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5507.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6029.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6029.pyc
new file mode 100644
index 0000000..391a798
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6029.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 14c6074..37ead99 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 3f336bd..54602bf 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
@@ -682,10 +682,10 @@
 40120101	40120101	1	1	生命恢复	0	2	1	2	5	0	0	0	2	2000	0	0	10000	0				0				0					0		0	0		0	0	0	0	0	0
 4012020	4012020	1	1	红颜枯骨	2	1	2	1	0	0	0	3	0	13500	0	0	10000	5010	40120201|[]|0|1	13		0				0					0	4|1	0	0		0	0	0	0	0	60000
 40120201	40120201	1	1	魅惑	0	14	0	0	6	0	0	0	0	0	0	0	2500	0				0				0					0		16	1		0	0	0	0	0	0
-4012030	4012030	1	1	倾城	3											0																									240000
-4012050	4012050	1	1	同生共死	3											0																									480000
-4012070	4012070	1	1	乱世	3											0																									720000
-4012080	4012080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000																								840000
+4012030	4012030	1	1	倾城	3	5			5							0	10000	5011		1	1	5504		27	1	6029	37|[4000,8000,16000,32000,64000]|1	8	4012010|1				37			1	5	3	1		240000
+4012050	4012050	1	1	同生共死	3	8		3	6			1		1500		0	10000	5507	0|540014|10	27	1																				480000
+4012070	4012070	1	1	乱世	3	10				1		6				0	10000	31	1000|1			5011		40	1																720000
+4012080	4012080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000	5011		1	1																				840000
 4012090	4012090	1	1	升变	3											0																									960000
 4012210	4012210	1	1	红颜枯骨·极																																					120000
 4012230	4012230	1	1	红颜枯骨·狂																																					360000
@@ -706,10 +706,10 @@
 40140101	40140101	1	1	普攻减伤	0	5	0	0	5	0	0	0	0	0	0	0	10000	42	2000|1			0				0					0		0	1		0	0	0	0	0	42
 4014020	4014020	1	1	魔神再临	2	1	1	1	0	0	0	6	0	13500	0	0	10000	5010	40140201	13		0				0					0	4|1	0	0		0	0	0	0	0	60000
 40140201	40140201	1	1	生命恢复	0	2	1	2	5	0	0	0	2	3000	0	0	10000	0				0				0					0		0	0		0	0	0	0	0	0
-4014030	4014030	1	1	饕餮	3											0																									240000
-4014050	4014050	1	1	同生共死	3											0																									480000
+4014030	4014030	1	1	饕餮	3	2		2	5					16000		0	10000	5010		32	1																				240000
+4014050	4014050	1	1	同生共死	3	8		3	6			1		1500		0	10000	5507	0|540012|10	27	1																				480000
 4014070	4014070	1	1	修罗	3											0																									720000
-4014080	4014080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000																								840000
+4014080	4014080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000	5011		1	1																				840000
 4014090	4014090	1	1	升变	3											0																									960000
 4014210	4014210	1	1	魔神再临·极																																					120000
 4014230	4014230	1	1	魔神再临·狂																																					360000
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 3f336bd..54602bf 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
@@ -682,10 +682,10 @@
 40120101	40120101	1	1	生命恢复	0	2	1	2	5	0	0	0	2	2000	0	0	10000	0				0				0					0		0	0		0	0	0	0	0	0
 4012020	4012020	1	1	红颜枯骨	2	1	2	1	0	0	0	3	0	13500	0	0	10000	5010	40120201|[]|0|1	13		0				0					0	4|1	0	0		0	0	0	0	0	60000
 40120201	40120201	1	1	魅惑	0	14	0	0	6	0	0	0	0	0	0	0	2500	0				0				0					0		16	1		0	0	0	0	0	0
-4012030	4012030	1	1	倾城	3											0																									240000
-4012050	4012050	1	1	同生共死	3											0																									480000
-4012070	4012070	1	1	乱世	3											0																									720000
-4012080	4012080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000																								840000
+4012030	4012030	1	1	倾城	3	5			5							0	10000	5011		1	1	5504		27	1	6029	37|[4000,8000,16000,32000,64000]|1	8	4012010|1				37			1	5	3	1		240000
+4012050	4012050	1	1	同生共死	3	8		3	6			1		1500		0	10000	5507	0|540014|10	27	1																				480000
+4012070	4012070	1	1	乱世	3	10				1		6				0	10000	31	1000|1			5011		40	1																720000
+4012080	4012080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000	5011		1	1																				840000
 4012090	4012090	1	1	升变	3											0																									960000
 4012210	4012210	1	1	红颜枯骨·极																																					120000
 4012230	4012230	1	1	红颜枯骨·狂																																					360000
@@ -706,10 +706,10 @@
 40140101	40140101	1	1	普攻减伤	0	5	0	0	5	0	0	0	0	0	0	0	10000	42	2000|1			0				0					0		0	1		0	0	0	0	0	42
 4014020	4014020	1	1	魔神再临	2	1	1	1	0	0	0	6	0	13500	0	0	10000	5010	40140201	13		0				0					0	4|1	0	0		0	0	0	0	0	60000
 40140201	40140201	1	1	生命恢复	0	2	1	2	5	0	0	0	2	3000	0	0	10000	0				0				0					0		0	0		0	0	0	0	0	0
-4014030	4014030	1	1	饕餮	3											0																									240000
-4014050	4014050	1	1	同生共死	3											0																									480000
+4014030	4014030	1	1	饕餮	3	2		2	5					16000		0	10000	5010		32	1																				240000
+4014050	4014050	1	1	同生共死	3	8		3	6			1		1500		0	10000	5507	0|540012|10	27	1																				480000
 4014070	4014070	1	1	修罗	3											0																									720000
-4014080	4014080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000																								840000
+4014080	4014080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000	5011		1	1																				840000
 4014090	4014090	1	1	升变	3											0																									960000
 4014210	4014210	1	1	魔神再临·极																																					120000
 4014230	4014230	1	1	魔神再临·狂																																					360000

--
Gitblit v1.8.0