From e94463d1b128f53f94892ec8e171238997110ecf Mon Sep 17 00:00:00 2001 From: libccy Date: Sat, 21 Nov 2015 21:23:23 +0800 Subject: [PATCH] 1.5.7 --- CHANGELOG.MD | 7 +----- audio/card/female/tao.mp3 | Bin 8834 -> 0 bytes audio/card/male/tao.mp3 | Bin 8834 -> 0 bytes card/extra.js | 17 +++++++++++--- card/standard.js | 6 +++++ character/rank.js | 20 +++++++++++++++++ character/yijiang.js | 19 +++++++++++----- game/game.js | 46 ++++++++++++++++++++++++++++++++++---- index.html | 1 + layout/default/layout.css | 12 ++++++++++ layout/mobile/layout.css | 5 ++++- manifest.json | 2 +- package.json | 2 +- play/weather.js | 9 ++++++++ 14 files changed, 125 insertions(+), 21 deletions(-) delete mode 100644 audio/card/female/tao.mp3 delete mode 100644 audio/card/male/tao.mp3 diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 17e760257..1cc9c180e 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -1,6 +1 @@ -1.5.7 -屏蔽强将选项 -卡牌、卡背、体力条样式 -徐盛、步练师修改 -新武将（5个SP武将、补全一将成名） -安卓精简版（去掉配音、DIY武将及卡牌） +1.5.8 diff --git a/audio/card/female/tao.mp3 b/audio/card/female/tao.mp3 deleted file mode 100644 index 1472462d35dc98d4206e5fb33e13970283e2a92d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8834 zcmciIXHXMS+c4lwXrXsOdR0KWAiab1-bE>b(wl;!D2Yf1r3fk@O*%*y0Z~E(L;qzt0xJtvNHDc zj8-{*ez+fhPQkz;_1wm3<2fA$DWA5p@v!Qxtv%FPXXZ~Q6?A!vmKy*FV!W6P<(dhp zqq5j!JO-kpPJaNAp#h8of@n`0z~nm1bI_0xJ!zc|kcS}0D`GDPabhdBxHAtcCGqYp ziLdV=O8U4abR-@8M=K3m*F!BVB__#H@Lbo%`1S?Ej8{`mCq>R4j~cuCFC?&0cYRyU z5htH+WfK~>jQxZDh?L`FeG7ng0Axbj3PBVk@F(i0A_y9r0$}eJEkSgq69OFw05)>K z4y$Wao7&z!06Sigz8j<`)6{$rM* zamj-$67hPh^G#dz`e_uz&WHp647PuCpKi9x~Ib=MNTMW4{$CNc-h&#TJ&D!=Xa z=LKV<0ptJ({TcvFn*3QvtupRCW>QP4YDP1d?kOz(`SKT!dCDOWpfT~YgINY5Ie|7$ zHD@h@kkMyDNDK8=kl?vc->GYD<|itCod~_Z+S3=-8o;f#*6%IwC zGFmRk6F*M~oss~Z`dL1@85Q-`l&WEu4yMfUHK~PF0fBNcGXrSQ-UR@*+=*~^wdUF6 zXZws8Jg%JCzAhPI-oZy~*69+(Qy0}p3~>-a{^-T#ko$<%IVS*`0b!>6&#%)S_)*qz z^995X(5e~%%X`RQ{WOfG9g3D;&phWSZ$!E|@M;Z3f2-`hAW!pElJt=~Qt{Cy=aemz z!P2Ko*jctLS56-;xC6jjks2?8!z#+TTK}ks>RvDRSD^38-}<;Oq&}kb3VpJ71ZhHg z{D~-piRhf29bssD{H2v}AZH2J()0&-VsXX;g zK*yExxc}Hm6PT_{b);+f>wK+CK^Y#~6w(ft##)}Nn14*{4G;PCFFxe0eYYJnC<+m| zmDR2EMn<9EM#1&XFZiniSLh-fbOZf;e0oLGUeh&zwGg^=Y0vP?NRkMY^D2i6ySqkV zO^05-)$F@V75Z=Z2|*EtcNk}r_|*P(yfAG)N1HXDpBt!p^yuc=_ut{432DK%>WN-K zO1*;R+Slr8$kiixcAGA;>hJ2Z{$%aw8U2~6co@2;y zeQdpx|KW7&>FR>}I{`yN1^9KN_K)%AzEeYDs3nA=L%{%PC)52mZ6Sl9stsns@t;_8 z*!y1|k6IDg@*nx{86d%t;K%)Y21O^Z?8Iy2WFn1b?s=@1dvKx)d3G`l{+h<$tnshO zpVvxotdn`DESa5o#1QogL4BMQ81fp@4oCX-X=+#$0BitEC?14W0Z;2%)vLGK4e)3i zxE1_8q_(nE8E^fVi+dx)m#cgGh$xO<+3R9i0`n{wAmr==JjHwfe5#i#@xuL^7vBhC zrQ&GETRF6em##{;fkjB7NsdgfY#W3DS?_tjE=nZEwdSu0Y8D`kKx-#?h zy|sN3-v#1oSdPyUcK(f7LrPqC7`&sHU7jb*)Dm%{ZIEKL#1Ji^omyC}eHH(bM-KGR zbFt&fmE!lwf=^y8hgS1ZJ%^NV=P$YrGyY7`IAJ~Wm?IEqpFWP_R}|(p1Fy~cD0ISw zB2U0PBSoI-Rapaso~mz2`b!1BOFEjYWG8SnOWWrQH#}c@DLU7X$nBp;StLrEpj^gj zvEg%RZ|-bv9d3?oxC(v=FDK--_7SLaEZ3#(RRLUyRoZ=d1CN+$a&@9TW8Uac;-`w_ zPY}2`R`ZBz^H&-Nyx|hy%ySbVfOdA0sfZ!(&ls_x*JhXi08Pm1a!ehD8X)eC6;t4}#4fxkqQ*!Zme_-7FR=@6%Ufj$n~wQq zZj~C9Nyb#@4_*krCH?+vCRfL3X4sJZ9a}HC%;9q%TfPD0q12FT{ji^XC)5lHuei;h zd4doqj0c+YVjj7Ec$1kK2}*#TXf=ZiEu<119R_QUZ@kXplQYa39ca{f^Dxz@;o*U; z@(w>X#+rnha8(EiI06}#Y7`1Z*Zqb*T09k%2(khg-xEZ#F^={ zc$x|>B@(jb6OH_%hSLkV^hi(7-tS{xI+n~>S@wSP{MtOI&jH#m2ivIV91^053w7Ck9D? zM_hH*8`rCccS;qtq*>yyK@=7=XPy)a1$U1=A@~fr=e5s{W+dtlyqs6xuH_Tfj@gBM z54RV|Kw9uil8BTYN9<9o?;*ilhUVDhpUcr8>?+;;ib;-M6Gv6# zLhSb7CbBH@+BfRfYY_F)BOKkUXJQXh?Y8}Mxp#BS`NW?LlwI;RLgVmfo@lB_cMETo z{EoP#O3X{)=LSxMArplg_10x(vLruY{C|oW)LVu-=ltF#H0t8Q8+Xf+^b_wGtfk!k zTT@lgn;!@lWM8SuTcQf!)JHE9p)BwK{I*gc`@nHWQLJw_HiJ&uBtkH0RD}KVBa6!$ zB)k$ocX=FT1L)O>6hE3JaB{2^392T!8)T5|dgo zS*Loul{?Mn5TI8H;AKht!`C3W$#~^mkH}Y9j7SPuFNRl}C%!Suw^VdsBpa%r)`5rW z{M3m?3^yKT6|WF$$ew3FSG>$HA5ioG^T+ZrVYvFtCM3o@Hs5WP(4=axp=_k2OBsqoR9w?;x zA>wZ1T-|o^=<6r-EY3ecccOzuD z;9rT=;V1+s*~^g*iiwQxCGR3Ke`Osh`R&p2AHf@<RKo<=&Z$biiV^{pal~5Z!@Ojw#1Oxks5r zA3m(@Q^LXFbqBEIkB^m?Q^5I;g{CW$sJEUb@qO>-jL1lOtOTe8!%S@&_1_12Y;6+cClhU`*$nBY!Yu+ zw{i`6yxxeIYd7{b`%q?5Vjtr)vBo_vZdzuC@bVdsx?h9$ZPh=zHh}%er)sW{sDGT1@9XJMdd?L5 z9k>Ablp>30=#8iF5{*hut8EY+#JRHDEh)WG?Uq);AD_xC2<%2Up8D9$ElkCSrcpDf zDu&XV-|tidC!EEHuMYq?c?*YNC>n^uDbj$%TO#HD8=;crhJrKC6Vg_U38l=Bi`1TB zuRqw(%sQXjp-6LXP7PT*txndfuw{B>@pI!a#ME&j#le`{&t>bF3J}tHAANzp~ z3t4-dSA-lyV!K<;w^0{_Xy-Qa6$r#Lg|`taywKMem%dsnT@-X)ADiQklNHT?{}@}9 zLCsdJcH=^s>Ma!eGJn*>{)!O$e1vCl-l&w zR0=k4>^u|IQ&RlXVYz-f9+}K}qa*ENFMb!4HRp~VuYa;`@uMeUUxiAB*oeZQ`+GrT zMSZScs!Bbbrcb0#bi!2D0tK3XNZIB-w+CPW4z{-wL5i#uG6KGSC;hMKrCWdN$DG~B z-@zIowc~b+r8N=1ic2_RBW(BgWeT^e>fL9aR?@Y$tBpF07br_@au1b^c0NpxMC-E0kv=L+IX#YK#=A^{M>4$Bx`;6I!IFomK_7j&(uR3d*uV!(oEu426M zs4bWS&-0#gEuOsFOD&|>&g%7?c@`0C z7!z+{d7Ch|P;M$$uQ6qmq1@xoK4_|HhbX^9f=-0H4) zY~1hB=Ke6hPzT@Ibn8{Fw)-a^br1H!-WkYw|9oe!#S|2vv+nxyLF~|dYkB&oXlt>+ z!;Q?+or93qS6Yb?YV!ThOqZ6U{|d3mXQU@{p7epufAeRR+!KU&o z21J~Gbw%wm!+aW`F%%o9QI~ML?EFK1D#DevgSPWAXS4ls-j|fy4r{~dmL@RX#KT;7 zP~k=<#vQzdvl9L-x{VRcu`tOYwo>HfcH+L!O8Z0o(1mx@NaX^|gzv^$CY-~f-cG0T zOV*w;b~B7w(M0qB5Kso+m(Jp|f>;-`=#zoZP{FceSS@??UNY^AP~=jKke&o6l;D=gG|5a_}}b3TzXBBi-BHM?+fi9XG9h=nJmL zpXY+P2yjI7!#(xY;o$Rt-FaajFWo;DMwbkHS2&3I8B7z;cRjCC4U zj*9u~WerDe&wAbZaBC~(| zN49sLdg{c0EqL`Sik72rBivhAU2jj+IHl)6Ldc1k#R6+iX)9zC-@n|o! z^MW3VVuITH1w>`hb8^N8Y_(ye5S?d=wwyY9So%Q7T#`x3e0YR$XL-;? zvnCk!d|3_s*=#QDU;VX=2*8;5%XH?^nRCC$h#DkDT@b`=8dQxn}n0SV*<_ zZbp3Rc_E74NMq6@MSQ4O5mqMBH`kY0CnE4thb%p`T~#yxn%jHJjqbKJRM}Tr%%1sg zy^~=vid5#*F*K!7L3YV$kkwQgvRA>LT8nu*iK!RQ#Lc!-7K@@a*(jbvIxqN*LSs}LGxq@%}-5t#BICxk~gh9&OCok>p?w#y-q=zUr_<9 z-dHQMt5S=kBge}fGnRNQhKHnE044WV-gxYH9N*lt@nMjn)HzUDb&vA(*2fW*Pvy&( zOtFC_LZ#P0UfqhK0{cl4Gr)~C8EkI*#SNKZtw$zegszmR$2ZHwCAZ2lCQG^8bp8G| z0uJ3nKYYqlvnZv}xM0M7rMI_K@L&EjOJ>(5Pi6j$iKZqz$j*zIs*fnWXdl;fzP&?T zmmo{JQ%`e*ydHf5nXYY$bbE$1HUZX_&V)zNd75k!T>Mg@l#Elwz4v8P(p=2JHVjFq zm&IU*6*PLH2P2#UIi5s&n4nmkc8g+S&(mi#X-68=w$4b>lPH#yEb$gtHzj4i_3eFK`bZxLjlQ+i4yL2t8LF7hdo!y-0R3dyq?TeZE?5ju=L>V^3 zpWM4=A#%m1$K)mNk9*%+nZoggiJeVqSoxz5-v8z^A{S%Or{0lA_dP7+if1BxHFyYO zK+3t^3{0kw_`peooXvZlvp-Dw`!q;J-oKl5^*_uHDD<+wGb;jiMQ=~i_GEj>u8g(y zc~1$IN^FK&xCR@OPHiR71044N0b6{ya{Sp@`w=hd^fLHkkf)`Se&N=)j8wckltxQk zQQcz0yYk~66Cr_K;@|c3CmB_n48n7Tnx-ZyK-G&@FEUlWC+4a;6FFd{+BmJU4PKMu z|Gc!r_Y}&eY3^z97@D&Nx4veqN(-+QuxBw_yW&$^9AuMY;fXzoNn0;>Us)93-hbj2 zvIzYc`97%MwkWP-oLE~D8yCqVH}IFrk2CwGCd(leVLrCcS8!v0Z*%0`?mMq+ZA#?7 z`(smN?=Xr^W}R=T2f~9Ky$qp8-c*kxs-c^*o29~6`s|H{D&}^a%!O=ahxj_1EJreE z>e;O_QuYRi*Vh2@h|M4G)Ns69KVhQN%#;yL{#<`3J5`LgjfaUy*X#p|oKRen(i8pq z%94-Rp1DB-oj?6Y8tSj@wHtk5EzLc$Y4qeO@LAmxsncBlJ;%TKLpqOPm_EHn!>k48-_IgKHhXc^Xws>si}IK!Dr}V!y>cIu`M?4A5NM(mZbD<&_L%sh*HWu8#KrjmsECT|Ks-`N?SZ@-t4+aQgvpSk0tA;G5b%e{g- zHK3_#GOe5c^_gc0A%oEjHCmvhF^_U$^w2GIY+$tcSQX`xqfF_Io0Lj; ze3IELlFWqeilMacX9{a^xkFXCH~JdXbYZn7ekJnIAZOhN8r9^v?!X#2p8v-agt3^C zS)ir~4ENv)k5l%)4N#X(Cg9N)LM)*r>fHMr7v~-_=25xZ{n3q}ws^B>c^-|YN6zs6 zE=IF{eXpHg+n08?nPRiv*V1uXcz*Y#Xq21r_XcDbg#0D-!KYlcf|2DYkKMxKrNh$> zWghcaZY+y2v7esbV-uhTtSf2PxrAL+aNusZkLZ8qj~QB;!c629)%P%;pWZZja2+Ah z*yT%;X+JxpsWcoshyrR_%8egIM&El9b@YvvUaj42his1ExoTrM5wzx#g$7wb-uzp| zjFW+|W#v2TzqMtSPD_JvGEuz3)^Lb!YJxt#GHCR-n&9EO+O$NcFEjd&r6^SRw_M}{ zOIrM`mwX9o;6N-^a~gBz!66zkmJ%`xwDcNb*^cstB7<~q<4%|P{`!dB1i6l+?e7!X z73S`{F|;p3ltMgNVvagyv60Np6Z=Ioe9FFt9a>qwsdo8#-WA6ODw(FWAaEUTjr!?5 zIi6#HJ1uATk3;oPk|a*ZEr|K^(grJMNXln6?J0RG7GGkrJ8CwD&A$j{>kUSGvRVJ` z*R7BhU?jOcDG;=$=VyY)D;g%^O~OU7R5;lip}n;&b5FhM&x;%+{O80BQpHKW2_(Uk zEymf_c5g>sywu_H>VP77&+MF*M1!@%7t004UDmz#EOvCvIH5bad(H!QnvPL6l@+ zXf|W|Z8851=JWF-QhpVpq8*vnnAggxw5*PIa|#82*R>Ye1bn>Y&{$|ZCMmYh{N_;x zE{>N}=|&lY={))v`Py4`3NP}+niKGHo_T(g1))WpJl%<@&BKhC(oN|Ie_`(cSVcG8 zAk>q|5rsSW<`Px4v`OYLWD{0q86NCp^`}@UXCXnx{iZZ6Ht$u9P|Iub{p=;!L61Tz z->;=Ne~wc>9DAE;r!)EUGbOR%>1`VbQS=w9l=CL+QwQJ@tgwi3_0MUc|Z0zCwKv_99&gU#}H}83FB@Q(f#*)X9eMm zQJzxo)S*p|vLblUY6F3TLX+c-QB5KEx-%s8GwWiqC&37pQ@SiS9+VFZH^68wqiloN z`FyDOY2KE7M5+)uJsTy;gt#J(+JHvlx(k<>`(wXql&}~IJ}9=T(?g3>@s$TIzSu7Q7-3d==gGC} z55yVRwU!uF9d!CuVNH9@QS^sQ&f3ubz30FG>?}T~?_0nM&fc(qAR@i9&;RcIzwi7H D1Fg!V diff --git a/audio/card/male/tao.mp3 b/audio/card/male/tao.mp3 deleted file mode 100644 index 1472462d35dc98d4206e5fb33e13970283e2a92d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8834 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 D1Fg!V diff --git a/card/extra.js b/card/extra.js index e7d8ed596..560f2c918 100755 --- a/card/extra.js +++ b/card/extra.js @@ -16,7 +16,11 @@ card.extra={ content:function(){ if(target==_status.dying) target.recover(); else{ - target.addTempSkill('jiu','phaseAfter'); + target.addSkill('jiu'); + if(!player.node.jiu&&lib.config.jiu_effect){ + player.node.jiu=ui.create.div('.playerjiu',player.node.avatar); + player.node.jiu2=ui.create.div('.playerjiu',player.node.avatar2); + } if(card.clone&&card.clone.parentNode==ui.arena){ card.clone.moveTo(target).delete(); game.addVideo('gain2',target,get.cardsInfo([card])); @@ -343,15 +347,22 @@ card.extra={ group:'jiu2' }, jiu2:{ - trigger:{player:['useCardAfter','phaseAfter']}, + trigger:{player:'useCardAfter',global:'phaseAfter'}, priority:2, filter:function(event){ - return (event.card&&(event.card.name=='sha')); + if(event.name=='useCard') return (event.card&&(event.card.name=='sha')); + return true; }, forced:true, popup:false, content:function(){ player.removeSkill('jiu'); + if(player.node.jiu){ + player.node.jiu.delete(); + player.node.jiu2.delete(); + delete player.node.jiu; + delete player.node.jiu2; + } }, }, guding_skill:{ diff --git a/card/standard.js b/card/standard.js index 4587324de..df6131161 100755 --- a/card/standard.js +++ b/card/standard.js @@ -1121,6 +1121,12 @@ card.standard={ "step 0" if(player.skills.contains('jiu')){ player.removeSkill('jiu'); + if(player.node.jiu){ + player.node.jiu.delete(); + player.node.jiu2.delete(); + delete player.node.jiu; + delete player.node.jiu2; + } event.jiu=true; } player.chooseToUse('是否发动青龙偃月刀？',{name:'sha'},trigger.target,-1).logSkill='qinglong'; diff --git a/character/rank.js b/character/rank.js index 7272b0a61..32a5585cc 100644 --- a/character/rank.js +++ b/character/rank.js @@ -86,9 +86,12 @@ window.characterRank={ 'liubiao', 'jianyong', 'zhoutai', + 'zhongyao', + 'liuchen', ], am:[ 'sp_caiwenji', + 'caorui', 'manchong', 'swd_linyue', 'swd_fuyan', @@ -145,6 +148,8 @@ window.characterRank={ 'zhanglu', ], bp:[ + 'gongsunyuan', + 'guotufengji', 'shixie', 'yxs_mozi', 'hs_xuefashi', @@ -212,9 +217,14 @@ window.characterRank={ 'diy_xuhuang', 'sunquan', 'hs_jgarrosh', + 'guanping', + 'panzhangmazhong', + 'sunxiu', + 'quancong', ], b:[ 'pal_linyueru', + 'zhuran', 'fuhuanghou', 'xin_masu', 'masu', @@ -264,6 +274,14 @@ window.characterRank={ 'guanzhang', 'diy_yuji', 'yuejin', + 'gaoshun', + 'chengpu', + 'caozhen', + 'wuyi', + 'hanhaoshihuan', + 'caoxiu', + 'zhuzhi', + 'zhangyi', ], bm:[ 'guohuai', @@ -308,6 +326,7 @@ window.characterRank={ c:[ 'huaxiong', 'xiahouyuan', + 'liaohua', 'caoren', 'huangzhong', 'zhaoyun', @@ -325,6 +344,7 @@ window.characterRank={ ], d:[ 'menghuo', + 'zhoucang', 'weiyan', 'guanyu', 'xuzhu', diff --git a/character/yijiang.js b/character/yijiang.js index 2baf0dd96..62abbd4cf 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -581,6 +581,12 @@ character.yijiang={ "step 2" if(player.skills.contains('jiu')){ player.removeSkill('jiu'); + if(player.node.jiu){ + player.node.jiu.delete(); + player.node.jiu2.delete(); + delete player.node.jiu; + delete player.node.jiu2; + } event.jiu=true; } player.chooseToUse('是否对'+get.translation(trigger.target)+'再使用一张杀？', @@ -769,8 +775,11 @@ character.yijiang={ return '黑色'; } 'step 1' + event.control=result.control; + player.showHandcards(); + 'step 2' var cards; - if(result.control=='red'){ + if(event.control=='红色'){ cards=player.get('h',{color:'red'}); } else{ @@ -778,13 +787,13 @@ character.yijiang={ } player.discard(cards); event.num=cards.length; - 'step 2' + 'step 3' player.chooseTarget([1,event.num],function(card,player,target){ return target!=player&&target.num('he')>0; }).ai=function(target){ return -ai.get.attitude(player,target)+0.5; } - 'step 3' + 'step 4' if(result.targets){ event.targets=result.targets; event.gained=event.targets.length; @@ -792,12 +801,12 @@ character.yijiang={ else{ event.finish(); } - 'step 4' + 'step 5' if(event.targets.length){ player.gainPlayerCard(event.targets.shift(),'he',true); event.redo(); } - 'step 5' + 'step 6' if(event.gained>=2){ player.loseHp(); } diff --git a/game/game.js b/game/game.js index 046ac3677..9baa86c0f 100755 --- a/game/game.js +++ b/game/game.js @@ -56,6 +56,11 @@ }, unfrequent:true, }, + confirm_exit:{ + name:'确认退出', + init:false, + unfrequent:true + }, auto_confirm:{ name:'自动确认', init:true, @@ -92,6 +97,7 @@ mid:'中', fast:'较快', vfast:'快', + vvfast:'很快', }, }, right_click:{ @@ -662,6 +668,11 @@ init:true, unfrequent:true, }, + jiu_effect:{ + name:'喝酒效果', + init:true, + unfrequent:true, + }, animation:{ name:'游戏特效', init:true, @@ -1978,7 +1989,10 @@ lib.config.all.characters=[]; lib.config.all.cards=[]; lib.config.all.plays=[]; + + var charlist=['standard','wind','fire','woods','mountain','guozhan','sp','yijiang','extra','refresh']; for(i in character.pack){ + if(window.minnoname&&charlist.indexOf(i)==-1) continue; lib.config.all.characters.push(i); lib.translate[i+'_character_config']=character.pack[i]; } @@ -4261,6 +4275,12 @@ if(!_status.video){ game.addVideo('update',this,[this.num('h'),this.hp,this.maxHp,this.hujia]); } + if(this.node.jiu&&!this.skills.contains('jiu')){ + this.node.jiu.delete(); + this.node.jiu2.delete(); + delete this.node.jiu; + delete this.node.jiu2; + } return this; }, num:function(arg1,arg2,arg3){ @@ -4325,6 +4345,7 @@ if(arg2) skills=skills.concat(this.hiddenSkills); if(arg3!==false){ for(i=0;i
'+ + lib.translate[(js[i].viewAs||js[i].name)+'_info']+'
'; + uiintro.add(translation); + } if(false){ uiintro.add(ui.create.div('.placeholder')); var table,tr,td; @@ -17821,11 +17851,11 @@ game.start(); game.loop(); }; - document.onmousewheel=ui.click.windowmousewheel; - document.onmousemove=ui.click.windowmousemove; - document.onmousedown=ui.click.windowmousedown; - document.onmouseup=ui.click.windowmouseup; if(!lib.config.touchscreen){ + document.onmousewheel=ui.click.windowmousewheel; + document.onmousemove=ui.click.windowmousemove; + document.onmousedown=ui.click.windowmousedown; + document.onmouseup=ui.click.windowmouseup; document.oncontextmenu=ui.click.right; } document.ontouchend=function(e){ @@ -17836,4 +17866,12 @@ document.ontouchmove = function(e) { e.preventDefault(); }; + window.onbeforeunload=function(){ + if(lib.config.confirm_exit&&!_status.reloading){ + return '是否离开游戏？' + } + else{ + return null; + } + } }()); diff --git a/index.html b/index.html index a324168af..5f4cd6c0e 100755 --- a/index.html +++ b/index.html @@ -6,6 +6,7 @@ 无名杀 + diff --git a/layout/default/layout.css b/layout/default/layout.css index 09b8547c0..611e7b618 100755 --- a/layout/default/layout.css +++ b/layout/default/layout.css @@ -132,6 +132,18 @@ body>.background{z-index:-2} animation:cardflip 0.3s ease-out; -webkit-animation:cardflip 0.3s ease-out; } +.player .playerjiu{ + animation:game_start 0.5s; + -webkit-animation:game_start 0.5s; + position: absolute; + width: 100%; + height: 100%; + left:0; + top:0; + z-index: 4; + pointer-events: none; + background: rgba(255, 0, 0, 0.3); +} .player.playerbright{ filter:brightness(1.2); -webkit-filter:brightness(1.2); diff --git a/layout/mobile/layout.css b/layout/mobile/layout.css index 55af88694..1900e8e47 100644 --- a/layout/mobile/layout.css +++ b/layout/mobile/layout.css @@ -40,7 +40,10 @@ #handcards2{ display:none; } - +/*#arena:not(.chess) .player[data-position='0']>.playerjiu{ + width: 120px; + border-radius: 0px; +}*/ #arena:not(.chess) .player[data-position='0']>.equips>div{ width: 45px; height: 45px; diff --git a/manifest.json b/manifest.json index cb468b72c..149f2fd56 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name": "noname", - "xwalk_version": "1.5.6", + "xwalk_version": "1.5.7", "start_url": "index.html", "icons": [ { diff --git a/package.json b/package.json index cdb3c5a7b..07769f381 100755 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { "name" : "无名杀", - "version" : "1.5.6", + "version" : "1.5.7", "main" : "main.js" } diff --git a/play/weather.js b/play/weather.js index b7472a2c1..7c003feb4 100644 --- a/play/weather.js +++ b/play/weather.js @@ -218,4 +218,13 @@ play.weather={ _weather_lei:'雷', _weather_lei_info:'在一名角色的回合结束后，若场上没有闪电，有&weather&的机率将一张闪电置于其判定区', }, + help:{ + '天气变化':'
  • 晴
    没有任何事情发生
  • 雨
    在一名角色的回合结束后，若场上没有洪水，有一定机率将一张洪水置于其判定区'+ + '
  • 霜
    每当一名角色受到火焰伤害，有一定机率令此伤害-1'+ + '
  • 雾
    所有角色使用的杀有一定机率失效'+ + '
  • 雹
    每名角色在回合结束后有一定机率受到一点伤害'+ + '
  • 雪
    （战棋模式）每名角色在回合结束后有一定机率随机移动1格'+ + '
  • 风
    当一名角色受到火焰伤害后，有一定机率令距离其1以内的一名随机角色受到一点火焰伤害'+ + '
  • 雷
    在一名角色的回合结束后，若场上没有闪电，有一定机率将一张闪电置于其判定区' + } };