Merge pull request #550 from copcap/dev-jsrg-zhuan

江山如故·转

character/huicui.js

@@ -10099,6 +10099,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			qiaorui:['qiaorui','tw_qiaorui'],
 			mamidi:['mamidi','xin_mamidi'],
 			mengyou:['mengyou','ns_mengyou'],
+			zhangchu:['zhangchu','jsrg_zhangchu'],
 		},
 		translate:{
 			re_panfeng:'潘凤',

character/rank.js

@@ -123,6 +123,7 @@ window.noname_character_rank={
 		'key_yuuki',
 		'db_key_liyingxia',
 		'key_kiyu',
+		'jsrg_pangtong',
 	],
 	a:[
 		'diy_zaozhirenjun',
@@ -314,6 +315,12 @@ window.noname_character_rank={
 		'yuechen',
 		'sunli',
 		'dc_zhangmancheng',
+		'jsrg_guojia',
+		'jsrg_lougui',
+		'jsrg_zhangfei',
+		'jsrg_fanjiangzhangda',
+		'jsrg_hansui',
+		'jsrg_zhangren',
 		'key_misuzu',
 		'key_sunohara',
 		'key_umi',
@@ -608,6 +615,9 @@ window.noname_character_rank={
 		'xiahoumao',
 		'dc_xujing',
 		'le_shen_jiaxu',
+		'jsrg_xiahourong',
+		'jsrg_sunshangxiang',
+		'jsrg_machao',
 	],
 	bp:[
 		'chess_diaochan',
@@ -964,6 +974,8 @@ window.noname_character_rank={
 		'yue_zhoufei',
 		'ns_mengyou',
 		'zhangyan',
+		'jsrg_huangzhong',
+		'jsrg_zhangchu',
 	],
 	b:[
 		'diy_feishi',
@@ -1268,6 +1280,7 @@ window.noname_character_rank={
 		'ol_qianzhao',
 		'yj_zhoubuyi',
 		'feiyao',
+		'jsrg_xiahouen',
 	],
 	bm:[
 		'diy_xizhenxihong',

character/shenhua.js

@@ -7755,7 +7755,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			caoren:['caoren','old_caoren','sb_caoren','new_caoren'],
 			sp_caoren:['sp_caoren','jsp_caoren'],
 			xiahouyuan:['re_xiahouyuan','ol_xiahouyuan','xiahouyuan'],
-			huangzhong:['re_huangzhong','ol_huangzhong','sb_huangzhong','huangzhong'],
+			huangzhong:['re_huangzhong','ol_huangzhong','sb_huangzhong','huangzhong','jsrg_huangzhong'],
 			weiyan:['re_weiyan','ol_weiyan','weiyan'],
 			zhoutai:['zhoutai','xin_zhoutai','old_zhoutai'],
 			xiaoqiao:['xiaoqiao','ol_xiaoqiao','re_xiaoqiao','old_xiaoqiao'],
@@ -7765,7 +7765,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			xunyu:['xunyu','ol_xunyu','re_xunyu'],
 			sp_zhugeliang:['sp_zhugeliang','ol_sp_zhugeliang','re_sp_zhugeliang'],
 			pangtong:['pangtong','ol_pangtong','re_pangtong','sb_pangtong'],
-			re_jsp_pangtong:['re_jsp_pangtong','sp_pangtong'],
+			re_jsp_pangtong:['re_jsp_pangtong','jsrg_pangtong','sp_pangtong'],
 			taishici:['taishici','re_taishici'],
 			re_yuanshao:['re_yuanshao','ol_yuanshao','xin_yuanshao','sb_yuanshao'],
 			pangde:['re_pangde','ol_pangde','pangde'],

character/sp.js

@@ -24958,6 +24958,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			qianzhao:['ol_qianzhao','qianzhao'],
 			ol_pengyang:['ol_pengyang','sp_pengyang'],
 			ol_luyusheng:['ol_luyusheng','luyusheng'],
+			fanjiangzhangda:['fanjiangzhangda','jsrg_fanjiangzhangda'],
 		},
 		translate:{
 			"xinfu_lingren":"凌人",

character/sp2.js

@@ -10112,7 +10112,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			huangfusong:['huangfusong','sp_huangfusong','jsrg_huangfusong','old_huangfusong'],
 			dingyuan:['ol_dingyuan','dingyuan'],
 			quyi:['quyi','re_quyi'],
-			hansui:['hansui','re_hansui','xin_hansui'],
+			hansui:['hansui','re_hansui','xin_hansui','jsrg_hansui'],
 			jin_simashi:['jin_simashi','simashi'],
 			jin_yanghuiyu:['jin_yanghuiyu','yanghuiyu'],
 			taoqian:['re_taoqian','taoqian'],

character/standard.js

@@ -2511,11 +2511,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			xiahoudun:['xiahoudun','re_xiahoudun','xin_xiahoudun'],
 			liubei:['liubei','re_liubei','sb_liubei','dc_liubei','junk_liubei'],
 			guanyu:['guanyu','re_guanyu','ps_guanyu'],
-			zhangfei:['zhangfei','re_zhangfei','old_zhangfei','xin_zhangfei','sb_zhangfei','tw_zhangfei','yj_zhangfei'],
+			zhangfei:['zhangfei','re_zhangfei','old_zhangfei','xin_zhangfei','sb_zhangfei','tw_zhangfei','jsrg_zhangfei','yj_zhangfei'],
 			zhaoyun:['zhaoyun','re_zhaoyun','old_zhaoyun','sb_zhaoyun','ps2063_zhaoyun','ps2067_zhaoyun'],
 			sp_zhaoyun:['sp_zhaoyun','jsp_zhaoyun'],
 			machao:['machao','re_machao','sb_machao','ps_machao'],
-			sp_machao:['sp_machao','dc_sp_machao','old_machao'],
+			sp_machao:['sp_machao','dc_sp_machao','jsrg_machao','old_machao'],
 			zhugeliang:['zhugeliang','re_zhugeliang','ps2066_zhugeliang','ps_zhugeliang'],
 			huangyueying:['huangyueying','re_huangyueying','junk_huangyueying'],
 			sunquan:['sunquan','re_sunquan','sb_sunquan','dc_sunquan'],
@@ -2524,7 +2524,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			lvmeng:['lvmeng','re_lvmeng','sb_lvmeng'],
 			huanggai:['huanggai','re_huanggai','sb_huanggai'],
 			daqiao:['daqiao','re_daqiao','sb_daqiao'],
-			sunshangxiang:['sunshangxiang','re_sunshangxiang','sb_sunshangxiang'],
+			sunshangxiang:['sunshangxiang','re_sunshangxiang','sb_sunshangxiang','jsrg_sunshangxiang'],
 			ganning:['ganning','re_ganning','sb_ganning','yongjian_ganning'],
 			yj_ganning:['yj_ganning','sp_ganning'],
 			lvbu:['lvbu','re_lvbu','jsrg_lvbu','ps_lvbu'],

character/tw.js

@@ -14034,6 +14034,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		characterReplace:{
 			tw_caocao:['tw_caocao','jsrg_caocao','yj_caocao'],
 			mateng:['tw_mateng','mateng'],
+			xiahouen:['tw_xiahouen','jsrg_xiahouen'],
 		},
 		dynamicTranslate:{
 			twfeifu:function(player){

game/game.js

@@ -34830,6 +34830,14 @@
 				color:'#c3f9ff',
 				nature:'thundermm',
 			}],
+			['转',{
+				color:'#c3f9ff',
+				nature:'thundermm',
+			}],
+			['梦',{
+				color:'#6affe2',
+				nature:'watermm',
+			}],
 			['用间',{
 				color:'#c3f9ff',
 				nature:'thundermm',