Merge pull request #602 from mengxinzxz/PR-Branch

分包调整＋small bugfix

character/old.js

@@ -14,19 +14,21 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				old_yijiang4:["old_caozhen","old_chenqun","old_zhuhuan",'old_caorui'],
 				old_yijiang5:["old_caoxiu","old_zhuzhi"],
 				old_yijiang67:["ol_zhangrang",'old_huanghao','old_liyan'],
-				old_sp:["old_wanglang","old_maliang","old_zhangxingcai","old_wangyun",'old_dingfeng','old_guanyinping'],
+				old_sp:['old_shixie',"panfeng","old_wanglang","old_maliang","old_zhangxingcai","old_wangyun",'old_dingfeng','old_guanyinping'],
 				old_yingbian:['junk_simayi','old_yangyan','old_yangzhi'],
 				old_mobile:["old_caochun"],
 			},
 		},
 		character:{
+			old_shixie:['male','qun',3,['biluan','lixia']],
+			panfeng:['male','qun',4,['kuangfu']],
 			old_shen_zhaoyun:['male','shen',2,['oldjuejing','oldlonghun'],['shu']],
 			old_guanyinping:['female','shu',3,['xueji_old','oldhuxiao','oldwuji']],
 			old_caocao:['male','shen',3,['junkguixin','feiying'],['die_audio']],
 			old_chendao:['male','shu',4,['drlt_wanglie']],
 			old_liyan:['male','shu',3,['duliang','fulin']],
 			old_guanzhang:['male','shu',4,['old_fuhun']],
-			new_caoren:['male','wei',4,['jushou']],
+			new_caoren:['male','wei',4,['moon_jushou','jiewei']],
 			huangzhong:['male','shu',4,['liegong']],
 			junk_sunquan:['male','shen',4,['dili','yuheng'],['wei']],
 			old_dingfeng:['male','wu',4,['fenxun','duanbing']],
@@ -1209,6 +1211,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			oldjuejing_info:'锁定技。①摸牌阶段，你令额定摸牌数+X（X为你已损失的体力值）。②你的手牌上限+2。',
 			oldlonghun:'龙魂',
 			oldlonghun_info:'你可以将花色相同的Y张牌按下列规则使用或打出：♥当【桃】，♦当火【杀】，♣当【闪】，♠当普【无懈可击】（Y为你的体力值且至少为1）。',
+			panfeng:'旧潘凤',
+			panfeng_prefix:'旧',
+			old_shixie:'旧士燮',
+			old_shixie_prefix:'旧',
 			
 			old_standard:'标准包',
 			old_shenhua:'神话再临',

character/shenhua.js

@@ -16,7 +16,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		character:{
 			re_huangzhong:['male','shu',4,['xinliegong']],
 			old_zhoutai:['male','wu',4,['gzbuqu']],
-			old_caoren:['male','wei',4,['moon_jushou','jiewei']],
+			old_caoren:['male','wei',4,['jushou']],
 			re_xuhuang:['male','wei',4,['duanliang','jiezi']],
 			re_pangde:['male','qun',4,['mashu','jianchu']],
 			re_xiahouyuan:['male','wei',4,['xinshensu']],

character/sp.js

@@ -7,7 +7,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			sp:{
 				sp_tianji:["sunhao","liuxie","caoang","hetaihou","sunluyu",'ol_wangrong',"zuofen","ol_bianfuren","qinghegongzhu","tengfanglan","ruiji",'caoxiancaohua'],
 				sp_sibi:["yangxiu","chenlin","chengyu","shixie","fuwan","wangyun","zhugejin","simalang","maliang","buzhi","dongyun","kanze","sunqian","xizhicai","sunshao",'duxi',"jianggan",'ol_dengzhi','ol_yangyi','ol_dongzhao','ol_chendeng','jin_yanghu','wangyan','xiahouxuan','quhuang','zhanghua','wangguan','sunhong','caoxi'],
-				sp_tianzhu:['zhangyan','niujin','hejin','hansui',"wutugu","yanbaihu","shamoke","panfeng","zhugedan",'huangzu','gaogan',"tadun","fanjiangzhangda","ahuinan","dongtuna",'ol_wenqin'],
+				sp_tianzhu:['zhangyan','niujin','hejin','hansui',"wutugu","yanbaihu","shamoke","zhugedan",'huangzu','gaogan',"tadun","fanjiangzhangda","ahuinan","dongtuna",'ol_wenqin'],
 				sp_nvshi:["lingju","guanyinping","zhangxingcai","mayunlu","dongbai","zhaoxiang",'ol_zhangchangpu',"daxiaoqiao","jin_guohuai"],
 				sp_shaowei:["simahui","zhangbao","zhanglu","zhugeguo","xujing","zhangling",'huangchengyan','zhangzhi','lushi'],
 				sp_huben:['duanjiong','ol_mengda',"caohong","xiahouba","zhugeke","zumao","wenpin","litong","mazhong","heqi","quyi","luzhi","zangba","yuejin","dingfeng","wuyan","ol_zhuling","tianyu","huojun",'zhaoyǎn','dengzhong','ol_furong','macheng','ol_zhangyì','ol_zhujun','maxiumatie','luoxian','ol_huban','haopu','ol_qianzhao'],
@@ -106,7 +106,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			ol_zhangchangpu:['female','wei',3,['yanjiao','olxingshen']],
 			zhangling:['male','qun',3,['zlhuji','zlshoufu']],
 			caiyang:['male','qun',1,['yinka','zhuixi'],['forbidai','unseen']],
-			panfeng:['male','qun',4,['kuangfu']],
 			sunshao:['male','wu',3,['bizheng','yidian']],
 			
 			huangfusong:['male','qun',4,['fenyue']],
@@ -25210,7 +25209,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		},
 		characterReplace:{
 			guanyinping:['guanyinping','old_guanyinping'],
-			shixie:['shixie','dc_shixie'],
+			shixie:['shixie','dc_shixie','old_shixie'],
 			caoshuang:['caoshuang','ns_caoshuang'],
 			caoang:['caoang','yj_caoang','tw_caoang'],
 			caohong:['caohong','tw_re_caohong','tw_caohong','yj_caohong'],
@@ -25397,8 +25396,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			sunluyu:'OL孙鲁育',
 			sunluyu_prefix:'OL',
 			hanba:'旱魃',
-			panfeng:'OL潘凤',
-			panfeng_prefix:'OL',
 			gz_panfeng:'潘凤',
 			zumao:'祖茂',
 			daxiaoqiao:'大乔小乔',
@@ -25713,7 +25710,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			juedi:'绝地',
 			juedi_info:'锁定技，准备阶段，若你的武将牌上有「引兵」牌，你选择一项：1.移去「引兵」牌，将手牌补至体力上限数；2.将「引兵」牌交给一名体力值不大于你的其他角色，其回复1点体力并摸等量的牌。',
 			kuangfu:'狂斧',
-			kuangfu_info:'当你使用【杀】造成伤害时，你可以选择一项：弃置其装备区内的一张牌，或将其装备区内的一张牌移动到你的装备区内。',
+			kuangfu_info:'当你使用【杀】造成伤害后，你可以选择一项：弃置其装备区内的一张牌，或将其装备区内的一张牌移动到你的装备区内。',
 			xintan:'心惔',
 			xintan_info:'出牌阶段限一次，你可以移去两张「焚」并选择一名角色，该角色失去1点体力。',
 			fentian:'焚天',

character/sp2.js

@@ -204,7 +204,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				subSkill:{
 					mark:{
 						charlotte:true,
-						trigger:{player:'useCard1'},
+						trigger:{global:'useCard1'},
 						filter:function(event,player){
 							return !player.getStorage('starlifeng_count').contains(get.color(event.card));
 						},
@@ -10605,7 +10605,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			starsujun:'肃军',
 			starsujun_info:'当你使用一张牌时，若你手牌中的基本牌和非基本牌的牌数相等，你可以摸两张牌。',
 			starlifeng:'砺锋',
-			starlifeng_info:'你可以将一张本回合未使用过的颜色的手牌当做不计入次数的【杀】或【无懈可击】使用。',
+			starlifeng_info:'你可以将一张本回合未有角色使用过的颜色的手牌当做不计入次数的【杀】或【无懈可击】使用。',
 			
 			sp_whlw:"文和乱武",
 			sp_zlzy:"逐鹿中原",