Merge branch 'libccy:PR-Branch' into PR-Branch

character/jsrg.js

@@ -1833,7 +1833,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					var targets=game.filterPlayer(i=>i!=player);
 					for(var target of targets){
 						var att=get.attitude(target,player);
-						var result=yield target.chooseCard(`负山：是否交给${get.translation(player)}一张牌？`,`若如此做，其此阶段使用【杀】的次数上限+1`).set('att',att).set('ai',card=>{
+						var result=yield target.chooseCard('he',`负山：是否交给${get.translation(player)}一张牌？`,`若如此做，其此阶段使用【杀】的次数上限+1`).set('att',att).set('ai',card=>{
 							if(!get.event('goon')) return -get.value(card);
 							var isSha=get.name(card,get.event('target'))=='sha';
 							if(get.event('att')<0) return (isSha?0:5)-get.value(card);

character/sp.js

@@ -1859,7 +1859,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					event.target=target;
 					var target2=(player.storage.oldongdao?trigger.player:player);
 					event.target2=target2;
-					target2.chooseBool(get.prompt('oldongdao'),'令'+get.translation(target)+'进行一个额外回合');
+					target2.chooseBool(get.prompt('oldongdao'),'令'+get.translation(target)+'进行一个额外回合').set('ai',()=>{
+						var event=_status.event.getParent();
+						return get.attitude(event.target2,event.target)>0;
+					})
 					'step 1'
 					if(result.bool){
 						player.logSkill('oldongdao');

game/asset.js

@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-	'v1.10.3.1',
+	'v1.10.4',
 	/*audio start*/
 	'audio/background/aozhan_chaoming.mp3',
 	'audio/background/aozhan_online.mp3',
@@ -213,6 +213,7 @@ window.noname_asset_list=[
 	'audio/die/caorui.mp3',
 	'audio/die/caoshuang.mp3',
 	'audio/die/caosong.mp3',
+	'audio/die/caoxi.mp3',
 	'audio/die/caoxiancaohua.mp3',
 	'audio/die/caoxing.mp3',
 	'audio/die/caoxiu.mp3',
@@ -240,6 +241,7 @@ window.noname_asset_list=[
 	'audio/die/clan_hanshao.mp3',
 	'audio/die/clan_wanghun.mp3',
 	'audio/die/clan_wangling.mp3',
+	'audio/die/clan_wanglun.mp3',
 	'audio/die/clan_wangyun.mp3',
 	'audio/die/clan_wuban.mp3',
 	'audio/die/clan_wukuang.mp3',
@@ -293,6 +295,7 @@ window.noname_asset_list=[
 	'audio/die/dc_yangbiao.mp3',
 	'audio/die/dc_yanghu.mp3',
 	'audio/die/dc_yuejiu.mp3',
+	'audio/die/dc_zhangmancheng.mp3',
 	'audio/die/dc_zhaotongzhaoguang.mp3',
 	'audio/die/dc_zhaoyǎn.mp3',
 	'audio/die/dc_zhouxuān.mp3',
@@ -401,6 +404,7 @@ window.noname_asset_list=[
 	'audio/die/handang.mp3',
 	'audio/die/hanfu.mp3',
 	'audio/die/hanhaoshihuan.mp3',
+	'audio/die/hanlong.mp3',
 	'audio/die/hanmeng.mp3',
 	'audio/die/hansui.mp3',
 	'audio/die/haomeng.mp3',
@@ -468,6 +472,7 @@ window.noname_asset_list=[
 	'audio/die/key_yuri.mp3',
 	'audio/die/kongrong.mp3',
 	'audio/die/kuailiangkuaiyue.mp3',
+	'audio/die/laimin.mp3',
 	'audio/die/laiyinger.mp3',
 	'audio/die/leibo.mp3',
 	'audio/die/leitong.mp3',
@@ -522,6 +527,7 @@ window.noname_asset_list=[
 	'audio/die/luyi.mp3',
 	'audio/die/luyusheng.mp3',
 	'audio/die/luzhi.mp3',
+	'audio/die/lvboshe.mp3',
 	'audio/die/lvbu.mp3',
 	'audio/die/lvdai.mp3',
 	'audio/die/lvfan.mp3',
@@ -546,6 +552,7 @@ window.noname_asset_list=[
 	'audio/die/mengda.mp3',
 	'audio/die/menghuo.mp3',
 	'audio/die/mengjie.mp3',
+	'audio/die/mengyou.mp3',
 	'audio/die/mifangfushiren.mp3',
 	'audio/die/mifuren.mp3',
 	'audio/die/miheng.mp3',
@@ -570,6 +577,7 @@ window.noname_asset_list=[
 	'audio/die/ol_furong.mp3',
 	'audio/die/ol_huangzhong.mp3',
 	'audio/die/ol_huaxin.mp3',
+	'audio/die/ol_huban.mp3',
 	'audio/die/ol_jiangwei.mp3',
 	'audio/die/ol_lisu.mp3',
 	'audio/die/ol_liuba.mp3',
@@ -594,6 +602,7 @@ window.noname_asset_list=[
 	'audio/die/ol_yuanshao.mp3',
 	'audio/die/ol_yujin.mp3',
 	'audio/die/ol_zhangyì.mp3',
+	'audio/die/ol_zhangzhang.mp3',
 	'audio/die/ol_zhouqun.mp3',
 	'audio/die/ol_zhujun.mp3',
 	'audio/die/ol_zhuling.mp3',
@@ -723,6 +732,7 @@ window.noname_asset_list=[
 	'audio/die/re_sunyi.mp3',
 	'audio/die/re_taishici.mp3',
 	'audio/die/re_taoqian.mp3',
+	'audio/die/re_wangyi.mp3',
 	'audio/die/re_weiyan.mp3',
 	'audio/die/re_wenpin.mp3',
 	'audio/die/re_wuguotai.mp3',
@@ -789,7 +799,9 @@ window.noname_asset_list=[
 	'audio/die/sb_sunquan.mp3',
 	'audio/die/sb_sunshangxiang.mp3',
 	'audio/die/sb_xiahoushi.mp3',
+	'audio/die/sb_xiaoqiao.mp3',
 	'audio/die/sb_xuhuang.mp3',
+	'audio/die/sb_yl_luzhi.mp3',
 	'audio/die/sb_yuanshao.mp3',
 	'audio/die/sb_yujin.mp3',
 	'audio/die/sb_zhangfei.mp3',
@@ -965,9 +977,11 @@ window.noname_asset_list=[
 	'audio/die/tw_yanxiang.mp3',
 	'audio/die/tw_yufuluo.mp3',
 	'audio/die/tw_yujin.mp3',
+	'audio/die/tw_zhanghong.mp3',
 	'audio/die/tw_zhangji.mp3',
 	'audio/die/tw_zhangnan.mp3',
 	'audio/die/tw_zhangning.mp3',
+	'audio/die/tw_zhangzhao.mp3',
 	'audio/die/vtb_xiaojiu.mp3',
 	'audio/die/vtb_xiaole.mp3',
 	'audio/die/vtb_xiaosha.mp3',
@@ -1124,10 +1138,12 @@ window.noname_asset_list=[
 	'audio/die/yj_ganning.mp3',
 	'audio/die/yj_huangzhong.mp3',
 	'audio/die/yj_jushou.mp3',
+	'audio/die/yj_qiaozhou.mp3',
 	'audio/die/yj_weiyan.mp3',
 	'audio/die/yj_xuhuang.mp3',
 	'audio/die/yj_zhanghe.mp3',
 	'audio/die/yj_zhangliao.mp3',
+	'audio/die/yj_zhoubuyi.mp3',
 	'audio/die/yl_luzhi.mp3',
 	'audio/die/yl_yuanshu.mp3',
 	'audio/die/yuanhuan.mp3',
@@ -1181,6 +1197,7 @@ window.noname_asset_list=[
 	'audio/die/zhangxiu.mp3',
 	'audio/die/zhangxuan.mp3',
 	'audio/die/zhangxun.mp3',
+	'audio/die/zhangyan.mp3',
 	'audio/die/zhangyao.mp3',
 	'audio/die/zhangyi.mp3',
 	'audio/die/zhangyì.mp3',
@@ -1233,65 +1250,6 @@ window.noname_asset_list=[
 	'audio/die/zumao.mp3',
 	'audio/die/zuoci.mp3',
 	'audio/die/zuofen.mp3',
-	/*dieaudio end*/
-
-	/*effect audio begin*/
-	'audio/effect/chicken_you_are_so_beautiful.mp3',
-	'audio/effect/chickun.wav',
-	'audio/effect/croatian_rhapsody.mp3',
-	'audio/effect/damage.mp3',
-	'audio/effect/damage_female.mp3',
-	'audio/effect/damage_fire.mp3',
-	'audio/effect/damage_fire2.mp3',
-	'audio/effect/damage_ice.mp3',
-	'audio/effect/damage_ice2.mp3',
-	'audio/effect/damage_male.mp3',
-	'audio/effect/damage_thunder.mp3',
-	'audio/effect/damage_thunder2.mp3',
-	'audio/effect/damage2.mp3',
-	'audio/effect/die_female.mp3',
-	'audio/effect/die_male.mp3',
-	'audio/effect/discard.mp3',
-	'audio/effect/draw.mp3',
-	'audio/effect/drawx.mp3',
-	'audio/effect/equip1.mp3',
-	'audio/effect/equip2.mp3',
-	'audio/effect/equip3.mp3',
-	'audio/effect/equip4.mp3',
-	'audio/effect/equip5.mp3',
-	'audio/effect/flappybird_die.wav',
-	'audio/effect/flappybird_flap.wav',
-	'audio/effect/flappybird_hit.wav',
-	'audio/effect/flappybird_score.wav',
-	'audio/effect/flappybird_start.wav',
-	'audio/effect/hitsound.wav',
-	'audio/effect/hujia_damage.mp3',
-	'audio/effect/hujia_damage_fire.mp3',
-	'audio/effect/hujia_damage_fire2.mp3',
-	'audio/effect/hujia_damage_thunder.mp3',
-	'audio/effect/hujia_damage_thunder2.mp3',
-	'audio/effect/hujia_damage2.mp3',
-	'audio/effect/ignotus.mp3',
-	'audio/effect/judge.mp3',
-	'audio/effect/link.mp3',
-	'audio/effect/lose.mp3',
-	'audio/effect/loseHp.mp3',
-	'audio/effect/pigstep.mp3',
-	'audio/effect/rakshasa_sea_city.mp3',
-	'audio/effect/recover.mp3',
-	'audio/effect/sm3dw_overworld.mp3',
-	'audio/effect/taketori_hishou.mp3',
-	'audio/effect/throw_egg1.mp3',
-	'audio/effect/throw_egg2.mp3',
-	'audio/effect/throw_flower1.mp3',
-	'audio/effect/throw_flower2.mp3',
-	'audio/effect/throw_shoe1.mp3',
-	'audio/effect/throw_shoe2.mp3',
-	'audio/effect/throw_wine1.mp3',
-	'audio/effect/throw_wine2.mp3',
-	'audio/effect/tie.mp3',
-	'audio/effect/tori_no_uta.mp3',
-	'audio/effect/win.mp3',
 	/*effect audio end*/
 	
 	/*skill audio begin*/
@@ -1590,6 +1548,8 @@ window.noname_asset_list=[
 	'audio/skill/chunlao3.mp3',
 	'audio/skill/chuyuan1.mp3',
 	'audio/skill/chuyuan2.mp3',
+	'audio/skill/cibei1.mp3',
+	'audio/skill/cibei2.mp3',
 	'audio/skill/cihuang1.mp3',
 	'audio/skill/cihuang2.mp3',
 	'audio/skill/ciwei1.mp3',
@@ -1633,6 +1593,8 @@ window.noname_asset_list=[
 	'audio/skill/clanhuanjia2.mp3',
 	'audio/skill/clanhuanyin1.mp3',
 	'audio/skill/clanhuanyin2.mp3',
+	'audio/skill/clanjianyuan1.mp3',
+	'audio/skill/clanjianyuan2.mp3',
 	'audio/skill/clanjiexuan1.mp3',
 	'audio/skill/clanjiexuan2.mp3',
 	'audio/skill/clanlianhe1.mp3',
@@ -1651,6 +1613,8 @@ window.noname_asset_list=[
 	'audio/skill/clanmuyin_clan_wukuang2.mp3',
 	'audio/skill/clanmuyin_clan_wuxian1.mp3',
 	'audio/skill/clanmuyin_clan_wuxian2.mp3',
+	'audio/skill/clanqiuxin1.mp3',
+	'audio/skill/clanqiuxin2.mp3',
 	'audio/skill/clansankuang1.mp3',
 	'audio/skill/clansankuang2.mp3',
 	'audio/skill/clanshangshen1.mp3',
@@ -1677,6 +1641,8 @@ window.noname_asset_list=[
 	'audio/skill/clanzhongliu_clan_wanghun2.mp3',
 	'audio/skill/clanzhongliu_clan_wangling1.mp3',
 	'audio/skill/clanzhongliu_clan_wangling2.mp3',
+	'audio/skill/clanzhongliu_clan_wanglun1.mp3',
+	'audio/skill/clanzhongliu_clan_wanglun2.mp3',
 	'audio/skill/clanzhongliu_clan_wangyun1.mp3',
 	'audio/skill/clanzhongliu_clan_wangyun2.mp3',
 	'audio/skill/congjian1.mp3',
@@ -1932,6 +1898,10 @@ window.noname_asset_list=[
 	'audio/skill/dclongsong2.mp3',
 	'audio/skill/dcluochong1.mp3',
 	'audio/skill/dcluochong2.mp3',
+	'audio/skill/dclvecheng1.mp3',
+	'audio/skill/dclvecheng2.mp3',
+	'audio/skill/dcmanzhi1.mp3',
+	'audio/skill/dcmanzhi2.mp3',
 	'audio/skill/dcmengjie1.mp3',
 	'audio/skill/dcmengjie2.mp3',
 	'audio/skill/dcmieji1.mp3',
@@ -2140,6 +2110,8 @@ window.noname_asset_list=[
 	'audio/skill/dczhenze2.mp3',
 	'audio/skill/dczhizhe1.mp3',
 	'audio/skill/dczhizhe2.mp3',
+	'audio/skill/dczhongji1.mp3',
+	'audio/skill/dczhongji2.mp3',
 	'audio/skill/dczhongjie1.mp3',
 	'audio/skill/dczhongjie2.mp3',
 	'audio/skill/dczhubi1.mp3',
@@ -2287,6 +2259,8 @@ window.noname_asset_list=[
 	'audio/skill/duoshi2.mp3',
 	'audio/skill/dushi1.mp3',
 	'audio/skill/dushi2.mp3',
+	'audio/skill/duwang1.mp3',
+	'audio/skill/duwang2.mp3',
 	'audio/skill/duwu1.mp3',
 	'audio/skill/duwu2.mp3',
 	'audio/skill/dzgengzhan1.mp3',
@@ -2723,6 +2697,8 @@ window.noname_asset_list=[
 	'audio/skill/jiangchi2.mp3',
 	'audio/skill/jianglue1.mp3',
 	'audio/skill/jianglue2.mp3',
+	'audio/skill/jiangxi1.mp3',
+	'audio/skill/jiangxi2.mp3',
 	'audio/skill/jianhui1.mp3',
 	'audio/skill/jianhui2.mp3',
 	'audio/skill/jianliang1.mp3',
@@ -2937,7 +2913,6 @@ window.noname_asset_list=[
 	'audio/skill/juxiang1_re_zhurong2.mp3',
 	'audio/skill/juxiang11.mp3',
 	'audio/skill/juxiang12.mp3',
-	'audio/skill/juyi.mp3',
 	'audio/skill/juyi1.mp3',
 	'audio/skill/juyi2.mp3',
 	'audio/skill/jyishi1.mp3',
@@ -3004,6 +2979,9 @@ window.noname_asset_list=[
 	'audio/skill/kurou3.mp3',
 	'audio/skill/kurou4.mp3',
 	'audio/skill/kuwu.mp3',
+	'audio/skill/laishou1.mp3',
+	'audio/skill/laishou2.mp3',
+	'audio/skill/laishou3.mp3',
 	'audio/skill/langmie1.mp3',
 	'audio/skill/langmie2.mp3',
 	'audio/skill/lanjiang1.mp3',
@@ -3137,6 +3115,8 @@ window.noname_asset_list=[
 	'audio/skill/luanfeng2.mp3',
 	'audio/skill/luanji1.mp3',
 	'audio/skill/luanji2.mp3',
+	'audio/skill/luanqun1.mp3',
+	'audio/skill/luanqun2.mp3',
 	'audio/skill/luanwu_re_jiaxu1.mp3',
 	'audio/skill/luanwu_re_jiaxu2.mp3',
 	'audio/skill/luanwu1.mp3',
@@ -3172,6 +3152,8 @@ window.noname_asset_list=[
 	'audio/skill/manjuan.mp3',
 	'audio/skill/mansi1.mp3',
 	'audio/skill/mansi2.mp3',
+	'audio/skill/manyi_mengyou1.mp3',
+	'audio/skill/manyi_mengyou2.mp3',
 	'audio/skill/manyi1.mp3',
 	'audio/skill/manyi2.mp3',
 	'audio/skill/mazui.mp3',
@@ -3179,6 +3161,10 @@ window.noname_asset_list=[
 	'audio/skill/mbaosi2.mp3',
 	'audio/skill/mbguli1.mp3',
 	'audio/skill/mbguli2.mp3',
+	'audio/skill/mbhuiyao1.mp3',
+	'audio/skill/mbhuiyao2.mp3',
+	'audio/skill/mbquesong1.mp3',
+	'audio/skill/mbquesong2.mp3',
 	'audio/skill/mbshihe1.mp3',
 	'audio/skill/mbshihe2.mp3',
 	'audio/skill/mbzhenfu1.mp3',
@@ -3207,6 +3193,8 @@ window.noname_asset_list=[
 	'audio/skill/midu2.mp3',
 	'audio/skill/mieji1.mp3',
 	'audio/skill/mieji2.mp3',
+	'audio/skill/miji_re_wangyi1.mp3',
+	'audio/skill/miji_re_wangyi2.mp3',
 	'audio/skill/miji1.mp3',
 	'audio/skill/miji2.mp3',
 	'audio/skill/mingce1.mp3',
@@ -3331,6 +3319,8 @@ window.noname_asset_list=[
 	'audio/skill/nzry_lijun12.mp3',
 	'audio/skill/nzry_longnu1.mp3',
 	'audio/skill/nzry_longnu2.mp3',
+	'audio/skill/nzry_mingren_1_sb_yl_luzhi1.mp3',
+	'audio/skill/nzry_mingren_1_sb_yl_luzhi2.mp3',
 	'audio/skill/nzry_mingren_11.mp3',
 	'audio/skill/nzry_mingren_12.mp3',
 	'audio/skill/nzry_mingren_21.mp3',
@@ -3390,6 +3380,8 @@ window.noname_asset_list=[
 	'audio/skill/oldingcuo2.mp3',
 	'audio/skill/oldmiji1.mp3',
 	'audio/skill/oldmiji2.mp3',
+	'audio/skill/oldongdao1.mp3',
+	'audio/skill/oldongdao2.mp3',
 	'audio/skill/oldqianxi1.mp3',
 	'audio/skill/oldqianxi2.mp3',
 	'audio/skill/olduanliang1.mp3',
@@ -3406,12 +3398,18 @@ window.noname_asset_list=[
 	'audio/skill/olfengji2.mp3',
 	'audio/skill/olfengzi1.mp3',
 	'audio/skill/olfengzi2.mp3',
+	'audio/skill/olfushi1.mp3',
+	'audio/skill/olfushi2.mp3',
 	'audio/skill/olfusong1.mp3',
 	'audio/skill/olfusong2.mp3',
+	'audio/skill/olgangshu1.mp3',
+	'audio/skill/olgangshu2.mp3',
 	'audio/skill/olgoude1.mp3',
 	'audio/skill/olgoude2.mp3',
 	'audio/skill/olguangao1.mp3',
 	'audio/skill/olguangao2.mp3',
+	'audio/skill/olguzheng1.mp3',
+	'audio/skill/olguzheng2.mp3',
 	'audio/skill/olhaoshi1.mp3',
 	'audio/skill/olhaoshi2.mp3',
 	'audio/skill/olhongji1.mp3',
@@ -3420,6 +3418,8 @@ window.noname_asset_list=[
 	'audio/skill/olhuanfu2.mp3',
 	'audio/skill/olhuiqi1.mp3',
 	'audio/skill/olhuiqi2.mp3',
+	'audio/skill/olhuiyun1.mp3',
+	'audio/skill/olhuiyun2.mp3',
 	'audio/skill/olhunzi_re_sunyi1.mp3',
 	'audio/skill/olhunzi_re_sunyi2.mp3',
 	'audio/skill/olhunzi1.mp3',
@@ -3428,6 +3428,8 @@ window.noname_asset_list=[
 	'audio/skill/oljianhe2.mp3',
 	'audio/skill/oljianman1.mp3',
 	'audio/skill/oljianman2.mp3',
+	'audio/skill/oljianxuan1.mp3',
+	'audio/skill/oljianxuan2.mp3',
 	'audio/skill/oljieming1.mp3',
 	'audio/skill/oljieming2.mp3',
 	'audio/skill/oljiezi1.mp3',
@@ -3442,6 +3444,8 @@ window.noname_asset_list=[
 	'audio/skill/olkangrui2.mp3',
 	'audio/skill/olkenshang1.mp3',
 	'audio/skill/olkenshang2.mp3',
+	'audio/skill/ollangdao1.mp3',
+	'audio/skill/ollangdao2.mp3',
 	'audio/skill/olleijie1.mp3',
 	'audio/skill/olleijie2.mp3',
 	'audio/skill/olluanji_shen_caopi1.mp3',
@@ -3472,6 +3476,8 @@ window.noname_asset_list=[
 	'audio/skill/olshilu2.mp3',
 	'audio/skill/olshuangxiong1.mp3',
 	'audio/skill/olshuangxiong2.mp3',
+	'audio/skill/olsuji1.mp3',
+	'audio/skill/olsuji2.mp3',
 	'audio/skill/olsujian1.mp3',
 	'audio/skill/olsujian2.mp3',
 	'audio/skill/oltianhou_club.mp3',
@@ -3517,6 +3523,8 @@ window.noname_asset_list=[
 	'audio/skill/olzhiba2.mp3',
 	'audio/skill/olzhiji1.mp3',
 	'audio/skill/olzhiji2.mp3',
+	'audio/skill/olzhijian1.mp3',
+	'audio/skill/olzhijian2.mp3',
 	'audio/skill/olzhubi1.mp3',
 	'audio/skill/olzhubi2.mp3',
 	'audio/skill/olzhuyan1.mp3',
@@ -3620,8 +3628,6 @@ window.noname_asset_list=[
 	'audio/skill/qibaodao2.mp3',
 	'audio/skill/qibie1.mp3',
 	'audio/skill/qibie2.mp3',
-	'audio/skill/qice_backup1.mp3',
-	'audio/skill/qice_backup2.mp3',
 	'audio/skill/qice1.mp3',
 	'audio/skill/qice2.mp3',
 	'audio/skill/qieting1.mp3',
@@ -4019,6 +4025,8 @@ window.noname_asset_list=[
 	'audio/skill/rexingsheng2.mp3',
 	'audio/skill/rexingxue1.mp3',
 	'audio/skill/rexingxue2.mp3',
+	'audio/skill/rexinsheng1.mp3',
+	'audio/skill/rexinsheng2.mp3',
 	'audio/skill/rexuanhuo1.mp3',
 	'audio/skill/rexuanhuo2.mp3',
 	'audio/skill/reyajiao1.mp3',
@@ -4216,6 +4224,8 @@ window.noname_asset_list=[
 	'audio/skill/sbrende3.mp3',
 	'audio/skill/sbshipo1.mp3',
 	'audio/skill/sbshipo2.mp3',
+	'audio/skill/sbtianxiang1.mp3',
+	'audio/skill/sbtianxiang2.mp3',
 	'audio/skill/sbtiaoxin1.mp3',
 	'audio/skill/sbtiaoxin2.mp3',
 	'audio/skill/sbtieji_false.mp3',
@@ -4251,6 +4261,8 @@ window.noname_asset_list=[
 	'audio/skill/sbzhangwu2.mp3',
 	'audio/skill/sbzhaxiang1.mp3',
 	'audio/skill/sbzhaxiang2.mp3',
+	'audio/skill/sbzhenliang1.mp3',
+	'audio/skill/sbzhenliang2.mp3',
 	'audio/skill/sbzhiba1.mp3',
 	'audio/skill/sbzhiba2.mp3',
 	'audio/skill/sbzhichi1.mp3',
@@ -4384,6 +4396,8 @@ window.noname_asset_list=[
 	'audio/skill/shiina_retieji1.mp3',
 	'audio/skill/shiki_omusubi1.mp3',
 	'audio/skill/shiki_omusubi2.mp3',
+	'audio/skill/shiming1.mp3',
+	'audio/skill/shiming2.mp3',
 	'audio/skill/shiorimiyuki_banyin1.mp3',
 	'audio/skill/shiorimiyuki_banyin2.mp3',
 	'audio/skill/shiorimiyuki_tingxian1.mp3',
@@ -4720,6 +4734,8 @@ window.noname_asset_list=[
 	'audio/skill/twchongqi2.mp3',
 	'audio/skill/twchuanshu1.mp3',
 	'audio/skill/twchuanshu2.mp3',
+	'audio/skill/twchungang1.mp3',
+	'audio/skill/twchungang2.mp3',
 	'audio/skill/twdanfa1.mp3',
 	'audio/skill/twdanfa2.mp3',
 	'audio/skill/twdianyi1.mp3',
@@ -4788,6 +4804,8 @@ window.noname_asset_list=[
 	'audio/skill/twlanjiang.mp3',
 	'audio/skill/twliexi1.mp3',
 	'audio/skill/twliexi2.mp3',
+	'audio/skill/twlijian1.mp3',
+	'audio/skill/twlijian2.mp3',
 	'audio/skill/twlingbao1.mp3',
 	'audio/skill/twlingbao2.mp3',
 	'audio/skill/twlingfa1.mp3',
@@ -4813,11 +4831,15 @@ window.noname_asset_list=[
 	'audio/skill/twqingtao2.mp3',
 	'audio/skill/twqiongji1.mp3',
 	'audio/skill/twqiongji2.mp3',
+	'audio/skill/twquanqian1.mp3',
+	'audio/skill/twquanqian2.mp3',
 	'audio/skill/twrenchou1.mp3',
 	'audio/skill/twrenchou2.mp3',
 	'audio/skill/twrende1.mp3',
 	'audio/skill/twrende2.mp3',
 	'audio/skill/twrende3.mp3',
+	'audio/skill/twrouke1.mp3',
+	'audio/skill/twrouke2.mp3',
 	'audio/skill/twruilian1.mp3',
 	'audio/skill/twruilian2.mp3',
 	'audio/skill/twshanghe1.mp3',
@@ -4956,7 +4978,6 @@ window.noname_asset_list=[
 	'audio/skill/weishu2.mp3',
 	'audio/skill/weiyi1.mp3',
 	'audio/skill/weiyi2.mp3',
-	'audio/skill/weizhong.mp3',
 	'audio/skill/weizhong1.mp3',
 	'audio/skill/weizhong2.mp3',
 	'audio/skill/wendao1.mp3',
@@ -5286,6 +5307,8 @@ window.noname_asset_list=[
 	'audio/skill/xingzuo2.mp3',
 	'audio/skill/xinhuangtian2_re_zhangjiao1.mp3',
 	'audio/skill/xinhuangtian2_re_zhangjiao2.mp3',
+	'audio/skill/xinjiangchi1.mp3',
+	'audio/skill/xinjiangchi2.mp3',
 	'audio/skill/xinjianying1.mp3',
 	'audio/skill/xinjianying2.mp3',
 	'audio/skill/xinjiaojin1.mp3',
@@ -5732,6 +5755,8 @@ window.noname_asset_list=[
 	'audio/skill/zhengjing2.mp3',
 	'audio/skill/zhengnan1.mp3',
 	'audio/skill/zhengnan2.mp3',
+	'audio/skill/zhenlie_re_wangyi1.mp3',
+	'audio/skill/zhenlie_re_wangyi2.mp3',
 	'audio/skill/zhenlie1.mp3',
 	'audio/skill/zhenlie2.mp3',
 	'audio/skill/zhenshan1.mp3',
@@ -6078,6 +6103,7 @@ window.noname_asset_list=[
 	'image/card/group_wei.png',
 	'image/card/group_western.png',
 	'image/card/group_wu.png',
+	'image/card/group_ye.png',
 	'image/card/guaguliaodu.png',
 	'image/card/guangshatianyi.png',
 	'image/card/guanshi.png',
@@ -6197,6 +6223,12 @@ window.noname_asset_list=[
 	'image/card/huoshan.png',
 	'image/card/huoshaolianying.png',
 	'image/card/huxinjing.png',
+	'image/card/identity_enemy.jpg',
+	'image/card/identity_fan.jpg',
+	'image/card/identity_friend.jpg',
+	'image/card/identity_nei.jpg',
+	'image/card/identity_zhong.jpg',
+	'image/card/identity_zhu.jpg',
 	'image/card/jiedao.png',
 	'image/card/jiejia.png',
 	'image/card/jiguanfeng.png',
@@ -6413,6 +6445,7 @@ window.noname_asset_list=[
 	'image/card/yihuajiemu.png',
 	'image/card/yinfengjia.png',
 	'image/card/yinfengyi.png',
+	'image/card/ying.png',
 	'image/card/yinyueqiang.png',
 	'image/card/yitianjian.png',
 	'image/card/yiyi.png',
@@ -6523,6 +6556,7 @@ window.noname_asset_list=[
 	'image/character/clan_hanshao.jpg',
 	'image/character/clan_wanghun.jpg',
 	'image/character/clan_wangling.jpg',
+	'image/character/clan_wanglun.jpg',
 	'image/character/clan_wangyun.jpg',
 	'image/character/clan_wuban.jpg',
 	'image/character/clan_wukuang.jpg',
@@ -6531,6 +6565,7 @@ window.noname_asset_list=[
 	'image/character/clan_xuncan.jpg',
 	'image/character/clan_xunchen.jpg',
 	'image/character/clan_xunshu.jpg',
+	'image/character/clan_xunyou.jpg',
 	'image/character/clan_zhonghui.jpg',
 	'image/character/clan_zhongyan.jpg',
 	'image/character/clan_zhongyu.jpg',
@@ -6591,6 +6626,7 @@ window.noname_asset_list=[
 	'image/character/dc_yangbiao.jpg',
 	'image/character/dc_yanghu.jpg',
 	'image/character/dc_yuejiu.jpg',
+	'image/character/dc_zhangmancheng.jpg',
 	'image/character/dc_zhaotongzhaoguang.jpg',
 	'image/character/dc_zhaoxiang.jpg',
 	'image/character/dc_zhaoyǎn.jpg',
@@ -7045,25 +7081,38 @@ window.noname_asset_list=[
 	'image/character/jsrg_chendeng.jpg',
 	'image/character/jsrg_chunyuqiong.jpg',
 	'image/character/jsrg_dongbai.jpg',
+	'image/character/jsrg_fanjiangzhangda.jpg',
 	'image/character/jsrg_guanyu.jpg',
+	'image/character/jsrg_guojia.jpg',
+	'image/character/jsrg_hansui.jpg',
 	'image/character/jsrg_hejin.jpg',
 	'image/character/jsrg_huangfusong.jpg',
+	'image/character/jsrg_huangzhong.jpg',
 	'image/character/jsrg_kongrong.jpg',
 	'image/character/jsrg_liubei.jpg',
 	'image/character/jsrg_liuhong.jpg',
 	'image/character/jsrg_liuyan.jpg',
+	'image/character/jsrg_lougui.jpg',
 	'image/character/jsrg_lvbu.jpg',
+	'image/character/jsrg_machao.jpg',
 	'image/character/jsrg_nanhualaoxian.jpg',
+	'image/character/jsrg_pangtong.jpg',
 	'image/character/jsrg_qiaoxuan.jpg',
 	'image/character/jsrg_sunce.jpg',
 	'image/character/jsrg_sunjian.jpg',
+	'image/character/jsrg_sunshangxiang.jpg',
 	'image/character/jsrg_wangyun.jpg',
+	'image/character/jsrg_xiahouen.jpg',
+	'image/character/jsrg_xiahourong.jpg',
 	'image/character/jsrg_xugong.jpg',
 	'image/character/jsrg_xushao.jpg',
 	'image/character/jsrg_xuyou.jpg',
 	'image/character/jsrg_yangbiao.jpg',
+	'image/character/jsrg_zhangchu.jpg',
+	'image/character/jsrg_zhangfei.jpg',
 	'image/character/jsrg_zhanghe.jpg',
 	'image/character/jsrg_zhangliao.jpg',
+	'image/character/jsrg_zhangren.jpg',
 	'image/character/jsrg_zhenji.jpg',
 	'image/character/jsrg_zhujun.jpg',
 	'image/character/jsrg_zoushi.jpg',
@@ -7169,6 +7218,7 @@ window.noname_asset_list=[
 	'image/character/kongrong.jpg',
 	'image/character/kuailiangkuaiyue.jpg',
 	'image/character/laiyinger.jpg',
+	'image/character/le_shen_jiaxu.jpg',
 	'image/character/leibo.jpg',
 	'image/character/leitong.jpg',
 	'image/character/liangxing.jpg',
@@ -7216,11 +7266,11 @@ window.noname_asset_list=[
 	'image/character/luotong.jpg',
 	'image/character/luoxian.jpg',
 	'image/character/lushi.jpg',
-	'image/character/lusu.jpg',
 	'image/character/luxun.jpg',
 	'image/character/luyi.jpg',
 	'image/character/luyusheng.jpg',
 	'image/character/luzhi.jpg',
+	'image/character/lvboshe.jpg',
 	'image/character/lvbu.jpg',
 	'image/character/lvdai.jpg',
 	'image/character/lvfan.jpg',
@@ -7244,6 +7294,7 @@ window.noname_asset_list=[
 	'image/character/mayuanyi.jpg',
 	'image/character/mayunlu.jpg',
 	'image/character/mazhong.jpg',
+	'image/character/mb_sunluyu.jpg',
 	'image/character/mengda.jpg',
 	'image/character/menghuo.jpg',
 	'image/character/mengjie.jpg',
@@ -7295,6 +7346,7 @@ window.noname_asset_list=[
 	'image/character/ns_lvmeng.jpg',
 	'image/character/ns_lvzhi.jpg',
 	'image/character/ns_masu.jpg',
+	'image/character/ns_mengyou.jpg',
 	'image/character/ns_nanhua.jpg',
 	'image/character/ns_nanhua_left.jpg',
 	'image/character/ns_nanhua_right.jpg',
@@ -7331,6 +7383,7 @@ window.noname_asset_list=[
 	'image/character/ol_dengai.jpg',
 	'image/character/ol_dengzhi.jpg',
 	'image/character/ol_dianwei.jpg',
+	'image/character/ol_dingshangwan.jpg',
 	'image/character/ol_dingyuan.jpg',
 	'image/character/ol_dongzhao.jpg',
 	'image/character/ol_dongzhuo.jpg',
@@ -7341,15 +7394,15 @@ window.noname_asset_list=[
 	'image/character/ol_huaxiong.jpg',
 	'image/character/ol_huban.jpg',
 	'image/character/ol_jiangwei.jpg',
-	'image/character/ol_liaohua.jpg',
+	'image/character/ol_lingtong.jpg',
 	'image/character/ol_lisu.jpg',
 	'image/character/ol_liuba.jpg',
 	'image/character/ol_liushan.jpg',
 	'image/character/ol_liuyu.jpg',
+	'image/character/ol_liwan.jpg',
 	'image/character/ol_lusu.jpg',
 	'image/character/ol_luyusheng.jpg',
 	'image/character/ol_maliang.jpg',
-	'image/character/ol_manchong.jpg',
 	'image/character/ol_mengda.jpg',
 	'image/character/ol_pangde.jpg',
 	'image/character/ol_pangtong.jpg',
@@ -7362,7 +7415,6 @@ window.noname_asset_list=[
 	'image/character/ol_wangrong.jpg',
 	'image/character/ol_weiyan.jpg',
 	'image/character/ol_wenqin.jpg',
-	'image/character/ol_wuyi.jpg',
 	'image/character/ol_xiahouyuan.jpg',
 	'image/character/ol_xiaoqiao.jpg',
 	'image/character/ol_xinxianying.jpg',
@@ -7381,7 +7433,6 @@ window.noname_asset_list=[
 	'image/character/ol_zhouqun.jpg',
 	'image/character/ol_zhujun.jpg',
 	'image/character/ol_zhuling.jpg',
-	'image/character/ol_zhuran.jpg',
 	'image/character/ol_zhurong.jpg',
 	'image/character/old_bulianshi.jpg',
 	'image/character/old_caocao.jpg',
@@ -7397,6 +7448,8 @@ window.noname_asset_list=[
 	'image/character/old_fuhuanghou.jpg',
 	'image/character/old_gaoshun.jpg',
 	'image/character/old_guanqiujian.jpg',
+	'image/character/old_guanyinping.jpg',
+	'image/character/old_guanyu.jpg',
 	'image/character/old_guanzhang.jpg',
 	'image/character/old_handang.jpg',
 	'image/character/old_huangfusong.jpg',
@@ -7407,7 +7460,6 @@ window.noname_asset_list=[
 	'image/character/old_lingju.jpg',
 	'image/character/old_lingtong.jpg',
 	'image/character/old_liubiao.jpg',
-	'image/character/old_liushan.jpg',
 	'image/character/old_liuzan.jpg',
 	'image/character/old_liyan.jpg',
 	'image/character/old_machao.jpg',
@@ -7416,6 +7468,8 @@ window.noname_asset_list=[
 	'image/character/old_maliang.jpg',
 	'image/character/old_quancong.jpg',
 	'image/character/old_re_lidian.jpg',
+	'image/character/old_shen_zhaoyun.jpg',
+	'image/character/old_shixie.jpg',
 	'image/character/old_wanglang.jpg',
 	'image/character/old_wangyi.jpg',
 	'image/character/old_wangyun.jpg',
@@ -7423,7 +7477,6 @@ window.noname_asset_list=[
 	'image/character/old_xusheng.jpg',
 	'image/character/old_yangyan.jpg',
 	'image/character/old_yangzhi.jpg',
-	'image/character/old_yuanshao.jpg',
 	'image/character/old_yuanshu.jpg',
 	'image/character/old_zhangfei.jpg',
 	'image/character/old_zhangxingcai.jpg',
@@ -7874,6 +7927,7 @@ window.noname_asset_list=[
 	'image/character/sp_zhugeliang.jpg',
 	'image/character/sp_zhujun.jpg',
 	'image/character/sp_zongyu.jpg',
+	'image/character/star_caoren.jpg',
 	'image/character/std_panfeng.jpg',
 	'image/character/sunce.jpg',
 	'image/character/sunchen.jpg',
@@ -8260,7 +8314,6 @@ window.noname_asset_list=[
 	'image/character/yongjian_ganning.jpg',
 	'image/character/yuanhuan.jpg',
 	'image/character/yuanji.jpg',
-	'image/character/yuanshao.jpg',
 	'image/character/yuanshu.jpg',
 	'image/character/yuantanyuanshang.jpg',
 	'image/character/yuantanyuanxiyuanshang.jpg',
@@ -8351,6 +8404,7 @@ window.noname_asset_list=[
 	'image/character/zhangxiu.jpg',
 	'image/character/zhangxuan.jpg',
 	'image/character/zhangxun.jpg',
+	'image/character/zhangyan.jpg',
 	'image/character/zhangyao.jpg',
 	'image/character/zhangyi.jpg',
 	'image/character/zhangyì.jpg',

game/game.js

@@ -8395,7 +8395,6 @@
 
 					var that=this;
 					this.timeout=setTimeout(function(){
-						console.log(that,that._selfDestroyed)
 						if(!that._selfDestroyed){
 							position.appendChild(that);
 						}
@@ -17486,7 +17485,7 @@
 						event.dialog.addText(event.prompt2);
 					}
 					var expand_length=0;
-					var directh=!lib.config.unauto_choose;
+					var directh=(!lib.config.unauto_choose&&!event.complexSelect);
 					for(var i=0;i<event.position.length;i++){
 						if(event.position[i]=='h'){
 							var hs=target.getCards('h');
@@ -17547,17 +17546,17 @@
 					if(event.dialog.buttons.length==0){
 						event.finish();
 						return;
-					}
+					}var directFilter=(event.forced&&typeof event.filterOk!='function'&&typeof event.selectButton!='function'&&event.filterButton==lib.filter.all);
 					var cs=target.getCards(event.position);
 					var select=get.select(event.selectButton);
-					if(event.forced&&select[0]>=cs.length){
+					if(directFilter&&select[0]>=cs.length){
 						event.result={
 							bool:true,
 							buttons:event.dialog.buttons,
 							links:cs
 						}
 					}
-					else if(event.forced&&directh&&!event.isOnline()&&select[0]==select[1]){
+					else if(directFilter&&directh&&!event.isOnline()&&select[0]==select[1]){
 						event.result={
 							bool:true,
 							buttons:event.dialog.buttons.randomGets(select[0]),
@@ -17703,16 +17702,17 @@
 						event.finish();
 						return;
 					}
+					var directFilter=(event.forced&&typeof event.filterOk!='function'&&typeof event.selectButton!='function'&&event.filterButton==lib.filter.all);
 					var cs=target.getCards(event.position);
 					var select=get.select(event.selectButton);
-					if(event.forced&&select[0]>=cs.length){
+					if(directFilter&&select[0]>=cs.length){
 						event.result={
 							bool:true,
 							buttons:event.dialog.buttons,
 							links:cs
 						}
 					}
-					else if(event.forced&&directh&&!event.isOnline()&&select[0]==select[1]){
+					else if(directFilter&&directh&&!event.isOnline()&&select[0]==select[1]){
 						event.result={
 							bool:true,
 							buttons:event.dialog.buttons.randomGets(select[0]),
@@ -17885,14 +17885,15 @@
 					}
 					var cs=target.getCards(event.position);
 					var select=get.select(event.selectButton);
-					if(event.forced&&select[0]>=cs.length){
+					var directFilter=(event.forced&&typeof event.filterOk!='function'&&typeof event.selectButton!='function'&&event.filterButton==lib.filter.all);
+					if(directFilter&&select[0]>=cs.length){
 						event.result={
 							bool:true,
 							buttons:event.dialog.buttons,
 							links:cs
 						}
 					}
-					else if(event.forced&&directh&&!event.isOnline()&&select[0]==select[1]){
+					else if(directFilter&&directh&&!event.isOnline()&&select[0]==select[1]){
 						event.result={
 							bool:true,
 							buttons:event.dialog.buttons.randomGets(select[0]),
@@ -19677,7 +19678,7 @@
 						if(cards[i].hasOwnProperty('_destroy')){
 							if(cards[i]._destroy){
 								cards[i].delete();
-								cards[i].destroyed=card._destroy;
+								cards[i].destroyed=cards[i]._destroy;
 								continue;
 							}
 						}
@@ -33152,7 +33153,7 @@
 							const num=storage[key];
 							if(typeof num=='number'&&num>0){
 								let trans=get.translation(key);
-								if(combined&&key=='equip3') trans='坐骑栏';
+								if(combined&&key=='equip3') trans='坐骑';
 								str+='<li>'+trans+'栏：'+num+'个<br>'
 							}
 						}
@@ -43638,7 +43639,7 @@
 				setTimeout(()=>{
 					buttons.appendChild(card);
 					dialog.open();
-					ui.create.cardSpinning(card,time);
+					ui.create.cardSpinning(card);
 				},50);
 			},
 			/**
@@ -46270,7 +46271,7 @@
 							var cfgnode=createConfig({
 								name:'开启',
 								_name:mode,
-								init:lib.config.characters.contains(mode),
+								init:connectMenu?(!lib.config.connect_characters.contains(mode)):(lib.config.characters.contains(mode)),
 								onclick:togglePack
 							});
 							var cfgnodeAI=createConfig({
@@ -53357,14 +53358,19 @@
 			},
 			player:(position,noclick)=>new lib.element.Player(position,noclick),
 			connectPlayers:ip=>{
-				ui.updateConnectPlayerPositions();
 				game.connectPlayers=[];
-				const numberOfPlayers=lib.configOL.number;
+				let numberOfPlayers=lib.configOL.number;
+				const gameMode=lib.configOL.mode;
+				if(gameMode=='guozhan'||(gameMode=='identity'&&(lib.configOL.identity_mode!='zhong'&&lib.configOL.identity_mode!='purple'))){
+					numberOfPlayers=10;
+				}
+				ui.updateConnectPlayerPositions(numberOfPlayers);
 				for(let position=0;position<numberOfPlayers;position++){
 					const player=ui.create.player(ui.window);
 					player.dataset.position=position;
 					player.classList.add('connect');
 					game.connectPlayers.push(player);
+					if(position>=lib.configOL.number) player.classList.add('unselectable2');
 				}
 
 				var bar=ui.create.div(ui.window);

game/update.js

@@ -1,16 +1,74 @@
 window.noname_update={
-	version:'1.10.3.1',
+	version:'1.10.4',
-	update:'1.10.3',
+	update:'1.10.3.1',
 	changeLog:[
-		'整合@nonameShijian @PZ157 @MDYY1 @mengxinzxz @lieren2023 @Lucilor @kuangshen04 @BauxiteAI @copcap @Tipx-L @xiaoas @Rintim @universe-st的Pull Request',
+		'整合@copcap @PZ157 @mengxinzxz @lieren2023 @CatIgnore @Tipx-L @kuangshen04 @nonameShijian @universe-st @BauxiteAl @Rintim @S-N-O-R-L-A-X @xiaoas @kola-king @Howard-Zhou-77 的Pull Request',
-		'新机制：武将名称前缀的高亮显示',
+		'《江山如故·转》武将包；神贾诩、族王沦、族荀攸、张曼成、星曹仁、吕伯奢、张燕、OL丁尚浣、OL李婉、数学孟优',
-		'将谋攻篇武将加入同名武将切换',
+		'9人局+10人局、“谋攻篇”游戏模式、“群雄割据”模式常驻',
-		'lib.nature向下兼容和相关函数更改',
+		'游戏内对象class化，事件handler等新机制',
 		'其他AI优化与bug修复',
 	],
 	files:[
+		'card/extra.js',
+		'card/gujian.js',
+		'card/guozhan.js',
+		'card/gwent.js',
+		'card/hearth.js',
+		'card/huanlekapai.js',
+		'card/mtg.js',
+		'card/sp.js',
+		'card/standard.js',
+		'card/swd.js',
+		'card/yongjian.js',
+		'card/yunchou.js',
+		'card/zhenfa.js',
+		'character/clan.js',
+		'character/collab.js',
+		'character/diy.js',
 		'character/extra.js',
+		'character/gujian.js',
+		'character/gwent.js',
+		'character/hearth.js',
+		'character/huicui.js',
+		'character/jiange.js',
+		'character/jsrg.js',
 		'character/mobile.js',
+		'character/mtg.js',
+		'character/offline.js',
+		'character/old.js',
+		'character/ow.js',
+		'character/rank.js',
+		'character/refresh.js',
+		'character/sb.js',
+		'character/shenhua.js',
+		'character/shiji.js',
+		'character/sp.js',
+		'character/sp2.js',
+		'character/standard.js',
+		'character/swd.js',
+		'character/tw.js',
+		'character/xiake.js',
+		'character/xianding.js',
+		'character/xianjian.js',
+		'character/xinghuoliaoyuan.js',
+		'character/yijiang.js',
+		'character/yingbian.js',
+		'character/yxs.js',
+		'character/zhuogui.js',
+		'game/config.js',
 		'game/game.js',
+		'game/pinyinjs.js',
+		'layout/default/layout.css',
+		'layout/newlayout/global.css',
+		'mode/boss.js',
+		'mode/brawl.js',
+		'mode/chess.js',
+		'mode/connect.js',
+		'mode/doudizhu.js',
+		'mode/guozhan.js',
+		'mode/identity.js',
+		'mode/stone.js',
+		'mode/tafang.js',
+		'mode/versus.js',
 	]
 };