diff --git a/extension/weather/extension.js b/extension/weather/extension.js deleted file mode 100644 index 4a45d81b2..000000000 --- a/extension/weather/extension.js +++ /dev/null @@ -1,230 +0,0 @@ -'use strict'; -play.weather={ - arenaReady:function(){ - if(_status.video||_status.connectMode) return; - _status.weatherchance=parseFloat(lib.config.weather_chance_playpackconfig)||0; - - ui.weather=ui.create.system('',null,true); - lib.setPopped(ui.weather,function(){ - var uiintro=ui.create.dialog('hidden'); - var weatherinfo=get.translation('_weather_'+_status.weather+'_info'); - var chancestr=parseInt(_status.weatherchance*100)+'%'; - weatherinfo=weatherinfo.replace(/&weather&/,chancestr); - uiintro.add(get.translation('_weather_'+_status.weather)); - if(weatherinfo.length<=0){ - uiintro.add('
'+weatherinfo+'
'); - } - else{ - uiintro.add('
'+weatherinfo+'
'); - } - uiintro.add(ui.create.div('.placeholder.slim')); - return uiintro; - },220); - - game.changeWeather(); - }, - skill:{ - _weatherchange:{ - trigger:{player:'phaseAfter'}, - filter:function(){ - return ui.weather?true:false; - }, - priority:-1, - forced:true, - content:function(){ - _status.weatherlife--; - if(_status.weatherlife<=0){ - game.changeWeather(); - } - } - }, - _weather_yu:{ - trigger:{player:'phaseAfter'}, - forced:true, - filter:function(event,player){ - if(_status.weather!='yu') return false; - if(Math.random()>_status.weatherchance) return false; - for(var i=0;i_status.weatherchance) return false; - for(var i=0;i_status.weatherchance) return false; - if(event.nature!='fire') return false; - return true; - }, - content:function(){ - trigger.num--; - player.popup('霜'); - game.log('由于温度过低火焰伤害减弱'); - } - }, - _weather_wu:{ - trigger:{target:'useCardToBefore'}, - forced:true, - filter:function(event,player){ - if(_status.weather!='wu') return false; - if(Math.random()>_status.weatherchance) return false; - if(event.card.name!='sha') return false; - return true; - }, - content:function(){ - trigger.untrigger(); - trigger.finish(); - player.popup('雾'); - game.log('大雾使',player,'躲避了杀'); - } - }, - _weather_bao:{ - trigger:{player:'phaseEnd'}, - forced:true, - popup:false, - filter:function(){ - if(_status.weather!='bao') return false; - if(Math.random()>_status.weatherchance) return false; - return true; - }, - content:function(){ - player.damage('nosource'); - player.popup('雹'); - game.log(player,'被冰雹砸中'); - } - }, - _weather_feng:{ - trigger:{player:'damageEnd'}, - forced:true, - filter:function(event,player){ - if(_status.weather!='feng') return false; - if(event.nature!='fire') return false; - if(Math.random()>_status.weatherchance) return false; - return true; - }, - popup:false, - content:function(){ - 'step 0' - var list=[]; - for(var i=0;i_status.weatherchance) return false; - if(lib.config.mode!='chess') return false; - return true; - }, - content:function(){ - var list=[]; - if(player.movable(-1,0)) list.push('moveLeft'); - if(player.movable(1,0)) list.push('moveRight'); - if(player.movable(0,-1)) list.push('moveUp'); - if(player.movable(0,1)) list.push('moveDown'); - if(list.length){ - player.popup('雪'); - game.log('由于地滑,',player,'发生移动'); - player[list.randomGet()](); - } - } - } - }, - game:{ - changeWeather:function(){ - var life; - if(_status.weather=='qing'||Math.random()

  • 没有任何事情发生

  • 在一名角色的回合结束后,若场上没有洪水,有一定机率将一张洪水置于其判定区'+ - '

  • 每当一名角色受到火焰伤害,有一定机率令此伤害-1'+ - '

  • 所有角色使用的杀有一定机率失效'+ - '

  • 每名角色在回合结束后有一定机率受到一点伤害'+ - '

  • (战棋模式)每名角色在回合结束后有一定机率随机移动1格'+ - '

  • 当一名角色受到火焰伤害后,有一定机率令距离其1以内的一名随机角色受到一点火焰伤害'+ - '

  • 在一名角色的回合结束后,若场上没有闪电,有一定机率将一张闪电置于其判定区' - } -}; diff --git a/game/config.js b/game/config.js index e8e247145..0754db23a 100644 --- a/game/config.js +++ b/game/config.js @@ -30,7 +30,7 @@ window.config={ sgscards:['standard','extra','sp','guozhan'], sgsmodes:['identity','guozhan','versus','brawl','connect'], stockmode:['identity','guozhan','versus','boss','chess','stone','connect','brawl','tafang'], - stockextension:['boss','cardpile','character','coin','soldier','weather','wuxing','hs_mod'], + stockextension:['boss','cardpile','character','coin','soldier','wuxing','hs_mod'], layout:['default','newlayout'], theme:['woodden','music','simple'], card_font:['xiaozhuan','huangcao','caoshu','xingshu'], diff --git a/game/game.js b/game/game.js index 40fc22ac5..87bc34cac 100644 --- a/game/game.js +++ b/game/game.js @@ -3330,70 +3330,6 @@ game.saveConfig('hiddenPlayPack',lib.config.hiddenPlayPack); } }, - }, - weather:{ - enable:{ - name:'开启', - init:false, - restart:true, - }, - noqing:{ - name:'异常天气出现概率', - init:'0.5', - item:{ - '0.1':'10%', - '0.3':'30%', - '0.5':'50%', - '0.7':'70%', - '0.9':'90%', - } - }, - chance:{ - name:'天气效果触发概率', - init:'0.5', - item:{ - '0.1':'10%', - '0.2':'20%', - '0.3':'30%', - '0.5':'50%', - '0.8':'80%', - }, - onclick:function(item){ - game.saveConfig('weather_chance_playpackconfig',item); - _status.weatherchance=parseFloat(lib.config.weather_chance_playpackconfig)||0; - } - }, - duration:{ - name:'异常天气持续时间', - init:'[4,4]', - item:{ - '[2,4]':'1~3回合', - '[4,4]':'3~6回合', - '[4,7]':'3~9回合', - '[7,4]':'6~9回合', - '[7,7]':'6~12回合', - } - }, - qingduration:{ - name:'晴朗天气持续时间', - init:'[2,4]', - item:{ - '[2,4]':'1~3回合', - '[4,4]':'3~6回合', - '[4,7]':'3~9回合', - '[7,4]':'6~9回合', - '[7,7]':'6~12回合', - } - }, - hide:{ - name:'隐藏此扩展', - clear:true, - onclick:function(){ - this.innerHTML='此扩展将在重启后隐藏'; - lib.config.hiddenPlayPack.add('weather'); - game.saveConfig('hiddenPlayPack',lib.config.hiddenPlayPack); - } - }, }, coin:{ enable:{ @@ -7341,7 +7277,6 @@ game.saveConfig('characters',lib.config.all.characters); game.saveConfig('cards',lib.config.all.cards); game.saveConfig('plays',['cardpile']); - game.saveConfig('hiddenPlayPack',['character', 'soldier', 'weather']); game.saveConfig('tao_enemy',true); game.saveConfig('layout','long2'); game.saveConfig('background_music','music_off'); diff --git a/game/package.js b/game/package.js index ccded3c28..dcd590709 100644 --- a/game/package.js +++ b/game/package.js @@ -32,7 +32,6 @@ play.pack={ character:'技能卡牌', soldier:'士兵模式', wuxing:'五行生克', - weather:'天气变化', coin:'富甲天下', }; mode.pack={ diff --git a/game/source.js b/game/source.js index efad73bc2..da8438718 100644 --- a/game/source.js +++ b/game/source.js @@ -64,7 +64,6 @@ window.noname_source_list=[ 'extension/character/extension.js', 'extension/coin/extension.js', 'extension/soldier/extension.js', - 'extension/weather/extension.js', 'extension/wuxing/extension.js', 'theme/music/grid.png', 'theme/music/style.css', diff --git a/game/update.js b/game/update.js index bcbcbd541..98edfdead 100644 --- a/game/update.js +++ b/game/update.js @@ -1,11 +1,11 @@ window.noname_update={ version:'1.9.14', - update:'1.9.13.1', + // update:'1.9.13.1', changeLog:[ '游戏内下载扩展', ], files:[ - 'game/game.js', + // 'game/game.js', // 'game/package.js', // 'game/config.js', // 'game/source.js', @@ -13,7 +13,7 @@ window.noname_update={ // 'card/*', // 'card/guozhan.js', // 'character/*', - 'character/refresh.js', + // 'character/refresh.js', // 'mode/boss.js', // 'mode/chess.js', // 'mode/versus.js', @@ -23,8 +23,8 @@ window.noname_update={ // 'theme/woodden/style.css', // 'layout/default/layout.css', // 'layout/default/phone.css', - 'layout/default/menu.css', - 'theme/style/cardback/*', + // 'layout/default/menu.css', + // 'theme/style/cardback/*', // 'layout/long/layout.css', // 'layout/long2/layout.css', // 'layout/mobile/layout.css', diff --git a/layout/default/menu.css b/layout/default/menu.css index e32fa704f..efa118c8e 100644 --- a/layout/default/menu.css +++ b/layout/default/menu.css @@ -1341,6 +1341,7 @@ input.fileinput::-webkit-file-upload-button { left: 0; padding: 7px; font-size: 24px; + cursor: pointer; } .popup-container.editor>div>.editbutton:first-child{ left: auto;