From ebfebf6fa6b95d5e1b4eee6ed97049860b5222ab Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期三, 29 四月 2026 17:41:22 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout

---
 Config/Skill.txt     |   24 +++++++++++++-----------
 Config/SkillSkin.txt |   13 ++++++++-----
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/Config/Skill.txt b/Config/Skill.txt
index bbf4fa9..d2c092b 100644
--- a/Config/Skill.txt
+++ b/Config/Skill.txt
@@ -211,20 +211,22 @@
 1016210	1016210	1	1	澶╁路鏋�	鎬掓皵棰濆闄勫甫<color=#248b12>10%</color>鍐板喕姒傜巼	4												120000				
 1016230	1016230	1	1	澶╁路鐙�	鐩爣韬笂鑻ユ惡甯﹀啺鍐绘垨瀵掓皵鏁堟灉锛屾�掓皵鎶�鑳界郴鏁伴澶栧鍔犳敾鍑诲姏鐨�<color=#248b12>100%</color>	4												360000				
 1016240	1016240	1	1	绁炴牸	鎬掓皵鍩虹浼ゅ绯绘暟鎻愬崌鑷�<color=#248b12>165%</color>	4												480000				
-1017010	1017010	1	1	鍕惧懡	瀵硅閲忔渶浣庣洰鏍囬�犳垚185%娉曟湳浼ゅ锛岃嫢鐩爣韬笂瀛樺湪鏉冭皨锛屽彲寮曠垎鏈�澶�3灞傛潈璋嬶紙娑堣�楀搴旀潈璋嬪眰鏁帮級	1	1	2	1	0	0	0	2	10000	0	3|1	0	6000	guojia1			
-10170101	10170101	1	1	寮曠垎3灞傛潈璋�	寮曠垎3灞傛潈璋�	0																
-1017020	1017020	1	1	鐧介瑁佸績	瀵硅閲忔渶浣庣洰鏍囬�犳垚525%娉曟湳浼ゅ锛岃嫢鐩爣韬笂鎼哄甫瀵掓皵鎴栧啺鍐伙紝鏈浼ゅ棰濆澧炲箙锛堟妧鑳藉浼わ級锛屽瘨姘旀瘡灞傚骞�15%锛屽啺鍐诲骞�30%锛屾涓ょbuff鐨勫骞呭湪璁$畻浼ゅ鏃剁疮鍔狅紙濡傚啺鍐讳笖鎼哄甫2灞傚瘨姘旓紝閭d箞灏辨槸澧炲箙60%锛�	2	1	2	1	0	0	0	6	10000	0	4|1	0	60000	guojia2			
-1017030	1017030	1	1	鏄撶	鏁屾柟姣忚鍐板喕1娆★紝鑾峰緱涓�灞傛槗纰庯紙涓嶅彲椹辨暎锛夛紝姣忓眰鎻愬崌鏆村嚮姒傜巼+5%锛屾毚鍑讳激瀹�+15%锛屾渶澶氬彔鍔�7灞�	3	5	2	1	0	0	5	1	10000		1		360000				
-1017050	1017050	1	1	鍐伴	鍑绘潃鐩爣鏃讹紝棰濆鏂芥斁涓�娆$櫧楠紝瀵规晫鏂瑰墠鎺掔洰鏍囬�犳垚150%浼ゅ锛岀櫧楠ㄤ激瀹抽澶栭澶栧骞咃紝鍦轰笂姣忓瓨鍦ㄤ竴灞傚瘨姘旀垨鍐板喕锛屾妧鑳界郴鏁�+25%锛�50%姒傜巼闄勫甫涓�灞傚瘨姘旓紝姣忓洖鍚堥�犳垚鏀诲嚮鍔�50%娉曟湳浼ゅ锛屾寔缁�4鍥炲悎锛屾瘡鍥炲悎鏈�澶氳Е鍙�2娆�	3	1				0		6	10000				600000		jiutianshui		
-10170501	10170501	1	1	瀵掓皵	鎸佺画3鍥炲悎鐨勫瘨姘旓紝姣忓洖鍚堥�犳垚鏀诲嚮鍔�<color=#248b12>50%</color>娉曟湳浼ゅ	0	4	2	1001	6	0	0	0	5000	0		2	0		hanqi		
-1017070	1017070	1	1	閫嗗垉	鍗曞洖鍚堬紝姣忓彈鍒颁换鎰忕洿鎺ヤ激瀹宠幏寰椾竴灞傞�嗗垉锛�3灞傜珛鍗虫柦鏀句竴娆℃櫘鏀伙紝骞惰幏寰楁湰娆¢�犳垚浼ゅ150%鎵夸激鎶ょ浘锛屾姢鐩惧瓨鍦�2鍥炲悎銆傦紙鍥炲悎缁撴潫涓嬪洖鍚堥噸鏂拌鏁帮級	3	1	2	1	0	0	5	1	10000		1	0	840000				
-10170701	10170701	1	1	閫嗗垉鏀诲嚮		0																
-10170702	10170702	1	1	閫嗗垉鎶ょ浘		0																
+1017010	1017010	1	1	鍕惧懡	瀵硅閲忔渶浣庣洰鏍囬�犳垚185%娉曟湳浼ゅ锛岃嫢鐩爣韬笂瀛樺湪鏉冭皨锛屽彲寮曠垎鏈�澶�3灞傛潈璋嬶紙娑堣�楀搴旀潈璋嬪眰鏁帮級	1	1	2	1	0	0	1	1	10000	0	3|1	0	6000	guojia1			
+1017020	1017020	1	1	鐧介瑁佸績	瀵硅閲忔渶浣庣洰鏍囬�犳垚525%娉曟湳浼ゅ锛岃嫢鐩爣韬笂鎼哄甫瀵掓皵鎴栧啺鍐伙紝鏈浼ゅ棰濆澧炲箙锛堟妧鑳藉浼わ級锛屽瘨姘旀瘡灞傚骞�15%锛屽啺鍐诲骞�30%锛屾涓ょbuff鐨勫骞呭湪璁$畻浼ゅ鏃剁疮鍔狅紙濡傚啺鍐讳笖鎼哄甫2灞傚瘨姘旓紝閭d箞灏辨槸澧炲箙60%锛�	2	1	2	1	0	0	1	1	10000	0	4|1	0	60000	guojia2			
+1017030	1017030	1	1	鏄撶	鏁屾柟琚檮鍔犲瘨姘旀垨鍐板喕鏃讹紙澶氱洰鏍囩畻澶氭锛夛紝寮犳槬鍗庤幏寰�1灞傛槗纰庯紝姣忓眰鎻愬崌2%鏆村嚮5%鏆村嚮浼ゅ锛屾渶澶�20灞傦紝涓嶅彲绉婚櫎鍋峰彇	3	5	2	1	5	0	0	0	10000		1		360000		jiutianshui		
+1017050	1017050	1	1	鍐伴	鎴樻枟寮�濮嬭幏寰�3灞傚啺楠革紝姣忓洖鍚堝紑濮嬶紝娑堣��1灞傚啺楠革紝寮�鍦哄鏁屾柟鍓嶆帓閫犳垚鏀诲嚮鍔�180%娉曟湳浼ゅ锛�50%姒傜巼闄勫甫涓�灞傚瘨姘旓紝姣忓洖鍚堥�犳垚鏀诲嚮鍔�50%娉曟湳浼ゅ锛屾寔缁�3鍥炲悎锛�15%姒傜巼閫犳垚鍐板喕1鍥炲悎锛屽紶鏄ュ崕鍑绘潃鐩爣鎭㈠1灞傚啺楠革紝姝讳骸澶嶆椿淇濈暀灞傛暟锛屼笉鍙Щ闄ゅ伔鍙�	3	5			5	0		0	10000			50	600000		jiutianshui		
+10170501	10170501	1	1	鏀诲嚮		0	1	2	1	2	0		3	10000				0	guojia1			
+10170502	10170502	1	1	瀵掓皵	鎸佺画3鍥炲悎鐨勫瘨姘旓紝姣忓洖鍚堥�犳垚鏀诲嚮鍔�<color=#248b12>50%</color>娉曟湳浼ゅ	0	4	2	1001	6	0	0	0	5000	0		2	0		hanqi		
+1017070	1017070	1	1	閫嗗垉	鍗曞洖鍚堬紝姣忓彈鍒颁换鎰忕洿鎺ヤ激瀹宠幏寰�1灞傞�嗗垉锛�3灞傜珛鍗虫柦鏀句竴娆℃櫘鏀伙紝骞舵仮澶嶆湰娆¢�犳垚浼ゅ100%鐢熷懡鍊硷紝鍗曞洖鍚堝彲澶氭鏂芥斁锛屾瘡澶у洖鍚堟竻绌哄眰鏁伴噸鏂拌鏁�	3	5	0	0	5	0	0	0	10000			51	840000		fangyu2		
+10170701	10170701	1	1	瑙﹀彂鏅敾	瑙﹀彂鏅敾鍙婂洖琛�	0								10000								
+10170702	10170702	1	1	鍥炶	鎭㈠鏈閫犳垚浼ゅ100%鐢熷懡鍊�	0	2		2	5				10000								
 1017080	1017080	1	1	鎬掓皵	鍒濆鑾峰緱<color=#248b12>50</color>鐐规�掓皵	3	0	0	6	5	0	0	0	10000				960000				
-1017090	1017090	1	1	鍗囧彉	鍙搁┈鎳挎浜℃椂锛屽紶鏄ュ崕棰濆瀵瑰嚮鏉�鍙搁┈鎳跨洰鏍囨柦鏀句竴娆℃�掓皵杩藉嚮鎶�鑳斤紝鑻ユ湰娆℃�掓皵鍑绘潃鐩爣锛屽紶鏄ュ崕鑾峰緱澶嶈嫃鏁堟灉锛屾寔缁�5鍥炲悎锛屾晥鏋滃瓨鍦ㄦ湡闂达紝鑻ュ紶鏄ュ崕姝讳骸锛屾秷鑰楀鑻忔晥鏋滐紝浠�100%琛�閲忓鍙�100%鎬掓皵澶嶆椿锛屾瘡鍦烘垬鏂楁渶澶氫竴娆�	3												1080000		fangyu2		
+1017090	1017090	1	1	鍗囧彉	鍙搁┈鎳挎浜℃椂锛屽紶鏄ュ崕瑙i櫎鎺у埗骞堕澶栧鍑绘潃鍙搁┈鎳跨洰鏍囨柦鏀句竴娆℃�掓皵鎶�鑳斤紝鍚屾椂鑾峰緱澶嶈嫃鏁堟灉锛屾晥鏋滃瓨鍦ㄦ湡闂达紝鑻ュ紶鏄ュ崕姝讳骸锛屾秷鑰楀鑻廱uff锛屼互50%琛�閲忓鍙�100%鎬掓皵澶嶆椿锛屾瘡鍦烘垬鏂楁渶澶�2娆�	3												1080000		fangyu2		
+10170901	10170901	1	1	澶嶈嫃	姝讳骸鏃朵互50%琛�閲忓鍙�100%鎬掓皵澶嶆椿	0	5	0	0	5	0	0	0	10000			52	0		fangyu2		
+10170902	10170902	1	1	澶嶆椿	浠�50%琛�閲忓鍙�100%鎬掓皵澶嶆椿	0	8	0	3	5	0	0	0	10000				0				
 1017210	1017210	1	1	鐧介瑁佸績路鏋�	鎬掓皵浼ゅ绯绘暟鎻愬崌40%	4												120000				
 1017230	1017230	1	1	鐧介瑁佸績路鐙�	鎬掓皵浼ゅ绯绘暟鎻愬崌40%	4												360000				
-1017240	1017240	1	1	绁炴牸	鍑绘潃鐩爣鍚庯紝鏀诲嚮鍔涙彁鍗�25%锛屾寔缁�2鍥炲悎銆�	4												480000				
+1017240	1017240	1	1	绁炴牸	鍑绘潃鐩爣鍚庯紝鏀诲嚮鍔涙彁鍗�25%锛屾寔缁�2鍥炲悎銆�	4	5			5				10000				480000		fangyu2		
 1018010	1018010	1	1	鍕惧懡	瀵硅閲忔渶浣庣洰鏍囬�犳垚165%浼ゅ锛屽苟100%闄勫甫涓�灞傚瘨姘旓紝鑻ョ洰鏍囪韩涓婂瓨鍦ㄦ潈璋嬶紝鍙紩鐖�2灞傛潈璋�	1	1	2	1	0	0	0	2	10000	0	3|1	0	6000	guojia1			
 10180101	10180101	1	1	瀵掓皵	瀵掓皵	0	11	2	1	6	0	0	0	10000								
 10180102	10180102			寮曠垎鏉冭皨	寮曠垎2灞傛潈璋�																	
diff --git a/Config/SkillSkin.txt b/Config/SkillSkin.txt
index 410528c..01e17be 100644
--- a/Config/SkillSkin.txt
+++ b/Config/SkillSkin.txt
@@ -292,15 +292,18 @@
 51001611016230			4		9999																			
 51001611016240			4		9999																			
 1017010	attack	2	4		280	14	15	36		[[10000]]														
-10170101		2	4		9999	14	16	36		[[10000]]														
 1017020	angerSkill	2	4		9999	39	40	50		[[10000]]														
 1017030										[[10000]]														
-1017050	angerSkill	2	4		9999	39	40	50		[[10000]]														
-10170501		5	0		9999					[[10000]]				10002		100144							10002	100122
-1017070	attack									[[10000]]														
-10170701		2	4		280	14	15	36		[[10000]]														
+1017050										[[10000]]														
+10170501	angerSkill	2	4		9999	39	40	50		[[10000]]														
+10170502		5	0		9999					[[10000]]				10002		100144							10002	100122
+1017070										[[10000]]														
+10170701										[[10000]]														
+10170702										[[10000]]														
 1017080										[[10000]]														
 1017090										[[10000]]														
+10170901										[[10000]]														
+10170902										[[10000]]														
 1017210										[[10000]]														
 1017230										[[10000]]														
 1017240										[[10000]]														

--
Gitblit v1.8.0