From b63c06d982a7e6e25d03a595413e32c88f64c621 Mon Sep 17 00:00:00 2001 From: oc Date: Mon, 3 Jun 2019 12:45:23 +0800 Subject: [PATCH] changeFloor_m selectPoint & ps --- _server/MotaAction.g4 | 4 ++-- _server/editor_blockly.js | 4 ++++ 常用工具/便捷PS工具.exe | Bin 26624 -> 27648 bytes 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4 index ccddca7a..b2640309 100644 --- a/_server/MotaAction.g4 +++ b/_server/MotaAction.g4 @@ -224,7 +224,7 @@ changeFloor_m /* changeFloor_m tooltip : 楼梯, 传送门, 如果目标楼层有多个楼梯, 写upFloor或downFloor可能会导致到达的楼梯不确定, 这时候请使用loc方式来指定具体的点位置 helpUrl : https://h5mota.com/games/template/_docs/#/element?id=%e8%b7%af%e9%9a%9c%ef%bc%8c%e6%a5%bc%e6%a2%af%ef%bc%8c%e4%bc%a0%e9%80%81%e9%97%a8 -default : [null,"MT1",null,0,0,null,500,null] +default : [null,"MTx",null,0,0,null,500,null] var toFloorId = IdString_0; if (Floor_List_0!='floorId') toFloorId = Floor_List_0; var loc = ', "loc": ['+Number_0+', '+Number_1+']'; @@ -1068,7 +1068,7 @@ changeFloor_s /* changeFloor_s tooltip : changeFloor: 楼层切换,动画时间可不填 helpUrl : https://h5mota.com/games/template/_docs/#/event?id=changefloor%EF%BC%9A%E6%A5%BC%E5%B1%82%E5%88%87%E6%8D%A2 -default : ["MT1","0","0",null,500] +default : ["MTx","0","0",null,500] colour : this.dataColor DirectionEx_List_0 = DirectionEx_List_0 && (', "direction": "'+DirectionEx_List_0+'"'); Int_0 = (Int_0!=='') ?(', "time": '+Int_0):''; diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js index d24e57cd..83e56a95 100644 --- a/_server/editor_blockly.js +++ b/_server/editor_blockly.js @@ -775,6 +775,10 @@ function omitedcheckUpdateFunction(event) { } block.setFieldValue(xv+"", arr[0]); block.setFieldValue(yv+"", arr[1]); + if (block.type == 'changeFloor_m') { + block.setFieldValue("floorId", "Floor_List_0"); + block.setFieldValue("loc", "Stair_List_0"); + } }); } diff --git a/常用工具/便捷PS工具.exe b/常用工具/便捷PS工具.exe index 90959cf001b79e78b71dfae4f0346e1e62fa8caf..893fbfc8ba290d06378e031e6d03a6fbd0b4ad59 100644 GIT binary patch delta 4341 zcmai&32+ou8ppr)y65PgnVusTM`R`t!X!XQFa%?Q3IqcLl~c%?B0vNUA_J44#u#R@ z%N5aDvMp%TNFt&Jg<>6GA(j>*C>F}Ph!$ENSb_?!H?GRMxc~QN7+|+{ZEAk~UGMw8 ze(&``qHnV3F}7~aMBnB!)s#4n6K4+QAesk*J#O3<#W{dqCw_EIT;@coP;s0;)A6<= z`No_mQKc|<5_v3bSt-uFL{8|z2vMflHG7Cz#Rlm+=D-xdZ=QKC8=!SUvf_8Mxr_O= zy^v6V7MdTj{yFQS5OIvhkCTN8rV#x!l!!qeh+zjSh!$wboEMwSzhkUlY^>U$utBkp zZAUos$9Cu^8MKF;i(oWuo@ZE2Eav$fHuF(mF8GRXI{bZ8oWc}LU6@6bQlL@|@}q{A z`vbhmg6pg=A<~=CrfOcPU1t$7-R3~&HHJShi#G{-C>0TAqpv>_J?spoC#)&3rq|B| zL$gFcTWY|XQedU^hS`()y{|q5V>7Nu<#91T)}7YH*{x<}uYa&#Vq(FuN^pq1}-iSml_^-p}f%lv%IvWC(6qKGcJ@D`uXxgM)^#$Uv{3U2Qo8+ zA=D^(2;P-!Fw_|98yLq@YLFx-FFGUmkno0YGwZW@sQqBlHo0LOaA@;f-`;h6@ z^zdq2^W)Zxuqn@>ZOJ&l)1P+nx`-N)@J2Du@qHl-{;~eli}!`FonIHxAd-x@IEk=@ zU**XhGUm!l_m;3_B-U2O$3#uJwbGj6&iLLEG8VT#7PrDDluH)2z`Qft&-R!PX8Vl; z$qb0kGWTca_;N7MIl-N{-1Oisus#s`CHo{Zh9ggEa4#%F0^zsKuXFlT3)6Ceygth> z7pHzaD$nAsRwxsD0(Yr5n1_^MizwC1MoE9S;(VB zvH62GY9%KOq5-&>CSz}n_d%Z45UyK%3l^8?Av`>sR@i1tqbCO85eVCWiWw8iao%B$ zD!g1nYQn@*nb}y_94S@;icYsG^`z4>$&HdnB>yQnSQXw{&`KTZeX5lXt9!tmmPgS4 zam!)wN6A#HkS~{j8u*!Cc`i|tJZ zZBN7gIp`y+y@!01B{|rB6mkVX{1Laz1JgJ z`B_r+idKerQ@vIi>kVTGmUs_a3|i$C&25x?-g`gdPkP@rONvI64x<1?nTPVpkJsdI z@p8oeD^6&*g`kzvIO)s9KKIZxXf7(Ee6zdg{>W&h124SA%9CJJ*#h1tWmC#eD%)V$ zCb>)UMafsB_n7h=ydOz^D*2`48A(;$1+Srsm^8^uRbOxyKMrf;g8BAy^q}D>S)G)NaC$!!?jP$u^#gscv zINRtBbsw}@QrkdH>MPJby;k@((C^j5bOm`UgcdJYM!lu>2U)(1vZZF)PpikNjA|3w zIrSv8g$Yf!oQBp=fe$Jo)1GemhDOn&(z(HYg~iTB(H^PAON^pTQfuqA!@CcW;;Uwo zMQ|F(sY=Rtn?jxoDhZ45GP+=AR3=_SR4XHIw@?J3@kAH%4(V=|gU`zz52MH>mP-;P z^PG}~T`y2KU^OD%kjqG&9-ppED`ee?yX!l)sD{+Up9M!xPtR#*59bNdoGgvL}4c37-I2x&h zW;oCmEO$kC7GLX#AYHp-6=czu==VWhD7!A?dmNp-L>8F9K5~fpDArrpXfCFGG#Ar8 zg?@7E;8PIOgFFuBOJJ(=Ae!jo%ww&%m^@a+hdcM7p^;9}));37=B5(fG;tj#_*_}o zD<4O7e3_YBHZ0QVY@`v*HLTamvH!hMeE2#&n2-nhVyCaxm9%-w8X7{2i)+R%s;j+? z;@ZgAmt%%8cfyr4_ASp$DRR%FWz>LwAzF-A8EM<+pPhZ~#)>fFFY=6(p2ud<^%+x{ zIdbM!&+AWZ_~wpHC$3xf$ya|FR^UjBotZh_I`sTs8#vm_M33coi`!w-7A+e8)5G?Hn0LX~tgXQIZ=X>ls{jB1 delta 3828 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