From 37d8902e615e680c430079f80ca2a43f452923ac Mon Sep 17 00:00:00 2001 From: Sukincen <33780347+Sukincen@users.noreply.github.com> Date: Fri, 6 Sep 2019 11:08:34 +0800 Subject: [PATCH] Add files via upload --- game/asset.js | 73 +++++++++++++++++++++++++++++++++++++- game/config.js | 2 +- game/game.js | 93 ++++++++++++++++++++++++++++++++++++++++++++++++- game/package.js | 2 ++ game/source.js | 1 + game/update.js | 20 ++++++++--- 6 files changed, 184 insertions(+), 7 deletions(-) diff --git a/game/asset.js b/game/asset.js index 9b8c11c66..b9f99b7d3 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,5 +1,5 @@ window.noname_asset_list=[ - '1.9.92.2', + '1.9.92.3', 'audio/background/aozhan_chaoming.mp3', 'audio/background/aozhan_online.mp3', 'audio/background/music_danji.mp3', @@ -388,6 +388,10 @@ window.noname_asset_list=[ 'audio/skill/yanjiao2.mp3', 'audio/skill/xingshen1.mp3', 'audio/skill/xingshen2.mp3', + 'audio/skill/weicheng1.mp3', + 'audio/skill/weicheng2.mp3', + 'audio/skill/daoshu1.mp3', + 'audio/skill/daoshu2.mp3', 'audio/skill/anguo1.mp3', 'audio/skill/anguo2.mp3', @@ -1875,6 +1879,7 @@ window.noname_asset_list=[ 'image/background/wangshi_bg.jpg', 'image/background/xiongxin_bg.jpg', 'image/background/zhanyun_bg.jpg', + 'image/background/xinsha_bg.jpg', 'image/card/db_atk1.jpg', 'image/card/db_atk2.jpg', @@ -2546,6 +2551,7 @@ window.noname_asset_list=[ 'image/character/huatuo.jpg', 'image/character/huaxiong.jpg', 'image/character/jiangfei.jpg', + 'image/character/jianggan.jpg', 'image/character/jiangqing.jpg', 'image/character/jiangwei.jpg', 'image/character/jianyong.jpg', @@ -2618,6 +2624,7 @@ window.noname_asset_list=[ 'image/character/mtg_lilianna.jpg', 'image/character/mtg_nisha.jpg', 'image/character/mtg_qianzhuo.jpg', + 'image/character/nashime.jpg', 'image/character/nianshou.jpg', 'image/character/niutou.jpg', 'image/character/ns_caocao.jpg', @@ -2923,6 +2930,13 @@ window.noname_asset_list=[ 'image/character/taishici.jpg', 'image/character/taoqian.jpg', 'image/character/tianfeng.jpg', + 'image/character/tw_beimihu.jpg', + 'image/character/tw_caoang.jpg', + 'image/character/tw_caohong.jpg', + 'image/character/tw_dingfeng.jpg', + 'image/character/tw_maliang.jpg', + 'image/character/tw_xiahouba.jpg', + 'image/character/tw_zumao.jpg', 'image/character/wangcan.jpg', 'image/character/wangji.jpg', 'image/character/wanglang.jpg', @@ -3069,6 +3083,63 @@ window.noname_asset_list=[ 'image/character/zoushi.jpg', 'image/character/zumao.jpg', 'image/character/zuoci.jpg', + + 'image/emotion/shibing_emotion/1.gif', + 'image/emotion/shibing_emotion/2.gif', + 'image/emotion/shibing_emotion/3.gif', + 'image/emotion/shibing_emotion/4.gif', + 'image/emotion/shibing_emotion/5.gif', + 'image/emotion/shibing_emotion/6.gif', + 'image/emotion/shibing_emotion/7.gif', + 'image/emotion/shibing_emotion/8.gif', + 'image/emotion/shibing_emotion/9.gif', + 'image/emotion/shibing_emotion/10.gif', + 'image/emotion/shibing_emotion/11.gif', + 'image/emotion/shibing_emotion/12.gif', + 'image/emotion/shibing_emotion/13.gif', + 'image/emotion/shibing_emotion/14.gif', + 'image/emotion/shibing_emotion/15.gif', + 'image/emotion/guojia_emotion/1.gif', + 'image/emotion/guojia_emotion/2.gif', + 'image/emotion/guojia_emotion/3.gif', + 'image/emotion/guojia_emotion/4.gif', + 'image/emotion/guojia_emotion/5.gif', + 'image/emotion/guojia_emotion/6.gif', + 'image/emotion/guojia_emotion/7.gif', + 'image/emotion/guojia_emotion/8.gif', + 'image/emotion/guojia_emotion/9.gif', + 'image/emotion/guojia_emotion/10.gif', + 'image/emotion/guojia_emotion/11.gif', + 'image/emotion/guojia_emotion/12.gif', + 'image/emotion/guojia_emotion/13.gif', + 'image/emotion/guojia_emotion/14.gif', + 'image/emotion/guojia_emotion/15.gif', + 'image/emotion/guojia_emotion/16.gif', + 'image/emotion/guojia_emotion/17.gif', + 'image/emotion/guojia_emotion/18.gif', + 'image/emotion/guojia_emotion/19.gif', + 'image/emotion/guojia_emotion/20.gif', + 'image/emotion/zhenji_emotion/1.gif', + 'image/emotion/zhenji_emotion/2.gif', + 'image/emotion/zhenji_emotion/3.gif', + 'image/emotion/zhenji_emotion/4.gif', + 'image/emotion/zhenji_emotion/5.gif', + 'image/emotion/zhenji_emotion/6.gif', + 'image/emotion/zhenji_emotion/7.gif', + 'image/emotion/zhenji_emotion/8.gif', + 'image/emotion/zhenji_emotion/9.gif', + 'image/emotion/zhenji_emotion/10.gif', + 'image/emotion/zhenji_emotion/11.gif', + 'image/emotion/zhenji_emotion/12.gif', + 'image/emotion/zhenji_emotion/13.gif', + 'image/emotion/zhenji_emotion/14.gif', + 'image/emotion/zhenji_emotion/15.gif', + 'image/emotion/zhenji_emotion/16.gif', + 'image/emotion/zhenji_emotion/17.gif', + 'image/emotion/zhenji_emotion/18.gif', + 'image/emotion/zhenji_emotion/19.gif', + 'image/emotion/zhenji_emotion/20.gif', + 'image/mode/boss/card/chixueqingfeng.jpg', 'image/mode/boss/card/chiyanzhenhunqin.jpg', 'image/mode/boss/card/guilongzhanyuedao.jpg', diff --git a/game/config.js b/game/config.js index 0ab359dd4..14552f296 100644 --- a/game/config.js +++ b/game/config.js @@ -14,7 +14,7 @@ window.config={ forbiddouble:['zhugedan','swd_kangnalishi','dongzhuo','wutugu','hs_siwangzhiyi','hs_ronghejuren','hs_shanlingjuren'], forbidthreecard:['qiankunbiao','shenhuofeiya','gw_ciguhanshuang','gw_birinongwu','gw_qinpendayu','gw_poxiao'], all:{ - sgscharacters:['standard','shenhua','xinghuoliaoyuan','refresh','yijiang','sp','extra','old','mobile'], + sgscharacters:['standard','shenhua','xinghuoliaoyuan','refresh','yijiang','sp','extra','old','mobile','tw'], sgscards:['standard','extra','sp','guozhan'], sgsmodes:['identity','guozhan','versus','doudizhu','brawl','connect'], stockmode:['identity','guozhan','versus','boss','doudizhu','chess','stone','connect','brawl','tafang'], diff --git a/game/game.js b/game/game.js index 84957e026..03f0d22b0 100644 --- a/game/game.js +++ b/game/game.js @@ -45,6 +45,11 @@ ondb:[], ondb2:[], chatHistory:[], + emotionList:{ + shibing_emotion:15, + guojia_emotion:20, + zhenji_emotion:20, + }, arenaReady:[], onfree:[], inpile:[], @@ -9411,6 +9416,12 @@ qun:'群', shen:'神', western:'西', + wei2:'魏国', + shu2:'蜀国', + wu2:'吴国', + qun2:'群雄', + shen2:'神将', + western2:'西方', male:'男', female:'女', mad:'混乱', @@ -9458,6 +9469,10 @@ fengyin:'封印', baiban:'白板', _disableJudge:"判定区", + + guojia_emotion:'郭嘉表情', + zhenji_emotion:'甄姬表情', + shibing_emotion:'士兵表情', pause:'暂停', config:'选项', @@ -13656,7 +13671,7 @@ lib.skill[event.skill].onrespond(event,player); } } - else if(lib.config.show_card_prompt&&!lib.config.hide_card_prompt_basic){ + else if(!event.nopopup&&lib.config.show_card_prompt&&!lib.config.hide_card_prompt_basic){ player.popup(card.name,'wood'); } if(cardaudio&&event.getParent(3).name=='useCard'){ @@ -15354,6 +15369,7 @@ },this.playerid,str); }, say:function(str){ + str=str.replace(/##assetURL##/g,lib.assetURL); var dialog=ui.create.dialog('hidden'); dialog.classList.add('static'); dialog.add('
'+str+'
'); @@ -42237,6 +42253,72 @@ list.scrollTop=list.scrollHeight; }; uiintro._heightfixed=true; + var emotionTitle=ui.create.div('.text.center','聊天表情'); + emotionTitle.style.width='calc(100%)'; + uiintro.add(emotionTitle); + var list1=ui.create.div(''); + if(get.is.phoneLayout()){ + list1.style.height='100px'; + } + else{ + list1.style.height='150px'; + } + list1.style.overflow='scroll'; + uiintro.add(list1); + uiintro.style.height=uiintro.content.offsetHeight+'px'; + var list2=ui.create.div(''); + if(get.is.phoneLayout()){ + list2.style.height='100px'; + } + else{ + list2.style.height='150px'; + } + list2.style.overflow='scroll'; + uiintro.add(list2); + uiintro.style.height=uiintro.content.offsetHeight+'px'; + for(var i in lib.emotionList){ + var emotionPack=ui.create.div('.card.fullskin','',function(){ + emotionTitle.innerHTML=get.translation(this.pack); + for(var j=1;j<=lib.emotionList[this.pack];j++){ + var emotionButton=ui.create.div('.card.fullskin','',function(){ + var player=game.me; + var str=''; + if(!player){ + if(game.connectPlayers){ + if(game.online){ + for(var i=0;i