diff --git a/audio/skill/xinfencheng1.mp3 b/audio/skill/xinfencheng1.mp3 new file mode 100644 index 000000000..361a73c5e Binary files /dev/null and b/audio/skill/xinfencheng1.mp3 differ diff --git a/audio/skill/xinfencheng2.mp3 b/audio/skill/xinfencheng2.mp3 new file mode 100644 index 000000000..6f5600439 Binary files /dev/null and b/audio/skill/xinfencheng2.mp3 differ diff --git a/audio/skill/xinjuece1.mp3 b/audio/skill/xinjuece1.mp3 new file mode 100644 index 000000000..7f4d7a307 Binary files /dev/null and b/audio/skill/xinjuece1.mp3 differ diff --git a/audio/skill/xinjuece2.mp3 b/audio/skill/xinjuece2.mp3 new file mode 100644 index 000000000..d3a1e370b Binary files /dev/null and b/audio/skill/xinjuece2.mp3 differ diff --git a/audio/skill/xinmieji1.mp3 b/audio/skill/xinmieji1.mp3 new file mode 100644 index 000000000..97bf574a9 Binary files /dev/null and b/audio/skill/xinmieji1.mp3 differ diff --git a/audio/skill/xinmieji2.mp3 b/audio/skill/xinmieji2.mp3 new file mode 100644 index 000000000..b057d017b Binary files /dev/null and b/audio/skill/xinmieji2.mp3 differ diff --git a/audio/skill/xinrende1.mp3 b/audio/skill/xinrende1.mp3 new file mode 100755 index 000000000..83f5e8fff Binary files /dev/null and b/audio/skill/xinrende1.mp3 differ diff --git a/audio/skill/xinrende2.mp3 b/audio/skill/xinrende2.mp3 new file mode 100755 index 000000000..a53e95542 Binary files /dev/null and b/audio/skill/xinrende2.mp3 differ diff --git a/character/yijiang.js b/character/yijiang.js index bc11c5096..0c6292f02 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -64,6 +64,7 @@ character.yijiang={ guotufengji:['male','qun',3,['jigong','shifei']], xin_yujin:['male','wei',4,['jieyue']], + xin_liru:['male','qun',3,['xinjuece','xinmieji','xinfencheng']], }, perfectPair:{ wuguotai:['sunjian','sunshangxiang'], @@ -4198,7 +4199,7 @@ character.yijiang={ return att; }, position:'he', - prompt:'是否发动【举荐】?' + prompt:'是否发动【'+get.skillTranslation('xinjujian',player)+'】?' }); "step 1" if(result.bool){ diff --git a/game/asset.js b/game/asset.js index 17e606b8e..e9c933454 100644 --- a/game/asset.js +++ b/game/asset.js @@ -2020,10 +2020,18 @@ window.noname_asset_list=[ 'audio/skill/xingwu2.mp3', 'audio/skill/xingxue1.mp3', 'audio/skill/xingxue2.mp3', + 'audio/skill/xinfencheng1.mp3', + 'audio/skill/xinfencheng2.mp3', + 'audio/skill/xinjuece1.mp3', + 'audio/skill/xinjuece2.mp3', 'audio/skill/xinjujian1.mp3', 'audio/skill/xinjujian2.mp3', + 'audio/skill/xinmieji1.mp3', + 'audio/skill/xinmieji2.mp3', 'audio/skill/xinpojun1.mp3', 'audio/skill/xinpojun2.mp3', + 'audio/skill/xinrende1.mp3', + 'audio/skill/xinrende2.mp3', 'audio/skill/xinsheng1.mp3', 'audio/skill/xinsheng2.mp3', 'audio/skill/xintan1.mp3', diff --git a/game/game.js b/game/game.js index a4009156e..ac51cdee7 100755 --- a/game/game.js +++ b/game/game.js @@ -53,9 +53,9 @@ var lib={ configprefix:'noname_0.9_', versionOL:8, - updateURL:localStorage.getItem('noname_update_url')||'http://123.206.55.178/', + updateURL:localStorage.getItem('noname_update_url')||'http://websha.cn/', assetURL:'', - hallURL:'123.206.55.178', + hallURL:'websha.cn', changeLog:[], updates:[], canvasUpdates:[], @@ -15428,7 +15428,7 @@ var str; var check=get.info(event.skill).check; if(get.info(event.skill).prompt) str=get.info(event.skill).prompt; - else str='是否发动【'+get.translation(event.skill)+'】?'; + else str='是否发动【'+get.skillTranslation(event.skill,player)+'】?'; if(typeof str=='function'){str=str(trigger,player)} player.chooseBool(str).ai=function(){ return !check||check(trigger,player); @@ -25949,9 +25949,15 @@ if(card.parentNode.id=='discardPile') return 'd'; if(card.parentNode.id=='special') return 's'; }, - skillTranslation(str,player){ - if(str.indexOf('re')==0&&player){ - var str2=str.slice(2); + skillTranslation:function(str,player){ + var str2; + if(str.indexOf('re')==0){ + str2=str.slice(2); + } + else if(str.indexOf('xin')==0){ + str2=str.slice(3); + } + if(str2){ if(lib.translate[str]==lib.translate[str2]){ if(player.hasSkill(str2)){ return '新'+lib.translate[str]; diff --git a/game/update.js b/game/update.js index 0ddbc1aad..9473d9e4f 100644 --- a/game/update.js +++ b/game/update.js @@ -1,6 +1,7 @@ window.noname_update={ - version:'1.8.8.4', + version:'1.8.9', changeLog:[ - '修bug', + '新武将', + 'sp、一将联机' ] } diff --git a/mode/connect.js b/mode/connect.js index dab17a4f8..3f0d1bc99 100644 --- a/mode/connect.js +++ b/mode/connect.js @@ -1,10 +1,12 @@ 'use strict'; mode.connect={ start:function(){ - if(!lib.config.hall_ip_188){ + if(!lib.config.hall_ip_189){ game.saveConfig('hall_ip',null,true); game.saveConfig('hall_ip_186'); - game.saveConfig('hall_ip_188',true); + game.saveConfig('hall_ip_188'); + game.saveConfig('hall_ip_189',true); + localStorage.setItem('noname_update_url',lib.hallURL); } var directstartmode=lib.config.directstartmode; ui.create.menu(true);