From 6bc284d2aaa16a1f4c98fe340903df504afee400 Mon Sep 17 00:00:00 2001 From: kong Date: Mon, 21 Feb 2022 22:05:07 +0700 Subject: [PATCH] add ./taobin_project/spiral --- image/page3_en/bn_vending2.png | Bin 3035 -> 3119 bytes image/page3_en/bp_vending2.png | Bin 2788 -> 2875 bytes .../bn_hot_espresso_light_pure_beauty.png | Bin 11482 -> 11476 bytes spiral/xml/page_catalog_vending_machine.xml | 483 ++++++++++++++++++ spiral/xml/z_android.pml | 1 + xml/menu_catalog.xml | 2 +- xml/menu_catalog_default_init.xml | 8 + xml/page_catalog_choose_drink.xml | 2 +- xml/page_catalog_choose_drink1.xml | 10 +- xml/page_catalog_choose_drink11.xml | 10 +- xml/page_catalog_choose_drink2.xml | 10 +- xml/page_catalog_choose_drink3.xml | 10 +- xml/page_catalog_choose_drink4.xml | 10 +- xml/page_catalog_choose_drink5.xml | 10 +- xml/page_catalog_choose_drink6.xml | 10 +- xml/page_catalog_choose_drink7.xml | 16 +- xml/page_catalog_choose_drink8.xml | 10 +- xml/page_catalog_with_vending.xml | 4 +- 18 files changed, 580 insertions(+), 16 deletions(-) create mode 100644 spiral/xml/page_catalog_vending_machine.xml create mode 100644 spiral/xml/z_android.pml diff --git a/image/page3_en/bn_vending2.png b/image/page3_en/bn_vending2.png index 37ae8d0b94f199ea880fbee160aa117d83b83040..486d1f45f7aa0916778e845fd3c9fde30e0f371d 100644 GIT binary patch literal 3119 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 F{{!+6vjG4A diff --git a/image/page3_en/bp_vending2.png b/image/page3_en/bp_vending2.png index 9b1dd550203d3d3f4a9ee138094e094122ec14f8..221a74c343fb63abba1186cb0c5af9905de1f3dc 100644 GIT binary patch literal 2875 zcmb7GXE+;<`b`imT9VqM_NJ(&bPz;T>{X*0qheKQ)uyqx)@Wmu)+j~L5I?y! zXx$A0((DX8?^^P}0yTM2ng*h~mJA>V88i8u1bu>dnY&Y=LYYDtZK$axiJ#rbPYkk1 zm%x(8Laz{XC8in>!+^|=02;HP1!?~~F%*3&G*XKqy3 zkoxS+)5SNNQ(Jch-MuPvOVz4|EbNW?w@X6wGi0V*hhKP1LYpzP%;bqZCh@%rauY6)J<;oMJ?mE(N*U)m zj5EvlnrFp6Ac;#{!loAlt*ozG+Kr!@Ef4vX`Ib(O((-btzF;-t>CgKbp5MdzU{pb; z`?>2`Yhqz>jc-lu@mvazO)W}{tfTe|PP!oe-ouYY8>Bv0!S0bB3+6RW z9{j|L~ ziCM{Qs>9S~%I@sM$PL-l+R8a+YE zHJ@Dwr;BF$cHfP3Tz)BCGOe+|B5Gia%(g6{^e#rxRZYW!NuPg|o@6D_((KPqxF!U9;vC%b|Pt>r(9%!6$(Y2-SKcjM-~s5_(rk{a627wAp@86=fq=dbVa&u zF^i0uohPKg6Z|>gl|^8u%dy~f>HlDL+eq{#q2pQ0{&AxuH#z_Pc*{~B>~uZsVC!~x zb75n*G^85fF+3Exq-09b4tT}on#BNzG}FfYOXvW#Yvjza%A=XJRV#jLypmi`gv6(O zvMYi6gZ*MVb0=zZF~t-{%&Bvf-){CHTw5o(?;~;iUw7$_yzHAP8nE6coyDrq zx(j(Go4Vr*3iC-b)Z&lDzsa3qNAL(AC=oON#}F!O>oODE)Hxh(rXo6|@Qh=r8lsol ztxQ@~ynsKs8R*&`UI5opjvSQjUCvN9KH}ZK7c%{Ynkbv3`&B?`wZ&;e02{JkIks5( z=uw9r$U~b|t)S4`_xYXGtjKAx`U?RQMbh!fy^PY{+6d9!2&Sb2kwKy9!HYDD8;}&Xe+%~Ug%-FR-I!EtC|ydMeO!jv`T8fUV>%-~Ic51>?7Rdm99tW2 z-h!bs={%1Ir+SEAA+iP?eJrzSDVErm3Zpu(B+n295^laj6l*65Ct$?bvNt%+ePI6( zpp?cV&v%??oDn2}p?o z0V0#6^HGZ_0@mDVArw)1Lj}wPs|+>i*&@DJ;Vgrq>x2+B!u-oNhxaNdjV``q|1^Uk zhX!eMmz($lLArNE?lvOqs5Ksj$IOizwA|^JO`y%^C5Id;nW3jxKBH`b234A`fBQ9a z7Q%sl(upDRnvL%~#&L71(I0Cf&*vX4s4mAa(DrxgIQ0`oK0%&be&}Q;b-wz7@a7z8 zy4+{&Ygi|IbE(6X11qll*6WdUWGb%o@|H4%tD^Ol**ARfs_@#><_YL=0jiY4hA$XHSZb>X76#RFQd*R zk+VR`#VT_xX{Y!v128Z(B4DD&Le+bTjms!*Z{hblzEOjt{sYF-$~0+Z_}4$253Ld&Ic*^TgGNq zIH0On>OfL6V^WKh8zrxj8{b*K@=-1t>>QC?jz;mJp+2m}vOA{5T!o7x!r%_>q+X2t z`1rf_+_B1jQ<>j+aT!2_w5xgpE7L7h(GBMh{G6>}OR0Ykl>G)UMrkSzN>~O|DeV_f z>=V=BC;If@EnOoRj;Ipc&?I+Xaqv3X&hYib199Rs@9v%U(2nlcd3jdPxRkGg@1=r7 zoK;4)gMK8~_kNOM>}X7!r}pjy(Q+Rb8;San-FCxs-P^gMCn>V1a~YXel0XwJr4)?= z6_h0iKRj^ngfjI)85=wIR5Nz317+d$Gegg|SswS8lz{KCJ+uvr?)#zrXG23lbBD3r z!Dkdh>fMuj-H73ky*}%+WEuBc@8&G~{=p|jL+XhAv`n@9O9+2AnEy`}*?KMS&T^e4 zBmKC*&XO7a8SleiO&`}{k_4I*4qZ~_MXiE2GFYPF|BOGH?NgeqCkD)F%a2PHxpd~c z2oxE~V7!Tb=vu(GN$U<#K`d-332W3;spOJE1L$yL-+s(`RT)F?%HDVdq=w3WaoP(p z(+jY@PMOm;-XBS>uv&Q&jt?>I;X2)8g_;&81SCNPx{_=Vb+z9jf1}_k7O6A6+~E^F zK%~^djynSs358bXtQefL)C#^4g;Qnb80_(Yab>ivESf0$Xaa6N#OpE&cX!y}-->mb zMDI(8SjVR_An9Yto+h%wV4X%53C@IM{CCEK*Yh4PbS+c`7}J?!NALC+TYDCno@~0W z#dQj=-I4yn^S`!(|56Yiv5(n3V}_iwsm(r>$(6v L9b*I@?ilqiw_0MW literal 2788 zcmai$c{~#iAIG=0<_dF_HAjSo9JwlI)?76=p%4iRl{4g?Ba<}NO^i`i#~yGj4|d4$ z{b^rEIW`VoV~69COW@xE0`dxkk4s>Hl@St9M-f>&4q#7xQ+)t{n8tPBdJ+KO3^hUN z+k^n=PB(pQY=w1$Q7}hi>aEK@w71WH0A?gqMY@`!;sY(Tw7t%yzti+{$jjwZS?U6iQw7zeBU#C~`!!7Jf z!M@icdZip*qzt_M(QW3AxtLBZ)vQpNW-UAZQ{)hXuF1JlK52^ml-G5)%CfA;4jXb} z8jb%!n%r#jGwrGLiZNgAQKh{l;KE@#{3y;okZ;UtMR40AX@RdXRYH97;Zjd42=4%t z?$mmV1a!H$#|m;geJODyuTgrJTP_9&T+bTyj4TH)apX>c4WBUFsam61gm>u-n{N?5 z=&;J$9DQ(HX5|24=#!nZHI`|Jg$znFWTT`qJ7Da19({5kJM!gqsER1|#TqmY{p{R* zO|ZnM#DAIMEN{FJS}`lMuv2V?3w4)D2gz+hRn#MAe#ZVYGdz9ow4rM{B|Y|)hq&N^ zy|Q{3C0xiePBP$VOKadd2-BXT;N2+po1vdZeG~eZ!w9$*<1CPW(xmC{B#=DKKO*fs za(}>~w&GszBpqJpkY=zUBUz({^SkSi!0c=)t+hzbiG6v+X6O^hZBQohM1$M|s{mya zd#qtq(WN_CpkaH@uIVQKxF7g&RXtX3`K+h>p-Ymh2k_3-G_je;`C11Qr&Ld}rNG_D zK^7#;QYl^;GZg z1IIww^CxwbG(qD6;lU;Brpqjtc(q%U2*VU1Hc&?(S@#^$CyU2^PF=~yo;q=0w>P7e zfN*?vmkVX}ak9~^MxslXmz(WROU7EXrG6Oc;jVm=I4x)=uMg5@S9h2QdhHaPl`0YP z(QuN7K0}|#ia1!9olT~38c2o8TsFW2y}K4-@rO}fz~)duUWbXF{Wd(xfvKK6Q0BvR zJm+d5zN1%-U-OZiXCsP$j+ zR8p>S;lM#Jd4(7Jfz0w1zg+|37W=W#qBGU}YlUs!HFqQ7Wp?Mr+QO>y^fc|uRDp5s z%~_Wal=CTz)b8w{NM6+S((!@99L<9RLHF~ozrQxJOs=(+@Z!pA}kV%4^G$hP~=i7wZ1?>bcz(#V?JOUNs#!u-A1S2*Jhoan^I33%$g+S0; zmOZSYNalOKwXgYG5&e+Bs0KxBHWsxF$svshcDS4Ib&8y@z+lAolfUji4kN5X|EDT`I?YTluj2HGy$Jn`i412E;s%X)Cw0i z>)=i|2m2vD+K3(y#5CXB`9?G#CT5~pW@h}r{*8wN)lRjs@gR@i7|p2Kr*7wlJ2fh< zxYCHxtFRGCv@Tl7>TF9Ku}wuQsP2r$D*24@{IGA!QWExBD!H-)Yly}sY%;o)X5k~Z z=e4%4=A=Tl8}>fOg1b(%N4A=M?=`pVi~gONWPGB}HQx?NI*dQZbPynHw>4cogv&DJ_wD&4PQ=$s(1Y{0MiEB?(TU}>uC z9QK8`ZW~R2x)`>Rw{HE_{%B#yOUl)MY_^GaT)*E};m^{Z?5-AI5YV^l9n;R3dq1O# z$B?<73f5SB^3WAn%(}Pxq~k7&0~y7VWh;}dHCV)p=e&0V?$sO3Pe>}f zdbJ3`vYG>(J#R;gs`aJ-x5D2vJ7xDNVWJed=}9luVR4WLp=%~{Fm}Og02qZ z&sK^e(Ub?HkkD^kikU_>Iv21V5 zTf8LkBiSTOWj!T&1^Zh?NAs2cKrln+brAt9t@PwaJ@nqKpezJNdu{j^BXB(>0GpO`Lp$Q6mhL#<%~E0RMvy{{PhZQEw*rQN>sz d$g_Ai>b_faV^^fl^J6Flm>8I$>X0tje*ylRIsX6v diff --git a/image/page_drink_disable/bn_hot_espresso_light_pure_beauty.png b/image/page_drink_disable/bn_hot_espresso_light_pure_beauty.png index b3e27af89f7365dc282443f7a4c22b72d31c0b4e..ade11e19920ade5ce7d4756eb2f808b9c19644f0 100644 GIT binary patch delta 1382 zcmcZ=c_nf}7-Qzf@MDU8mj%7ne}Bmt9dn_nbMn#bfEHzrBkc+t#}Wh<-(@-&>f@ep zGUoO{1F7Sc%m-)5e|aP&F7lA0(L>qm0M7obE2VBm)}?#*#>Q{1RH7u zJ~&;z#$eg0YY*o2Eb0DqPX6D1lRNuV56+3He3Sj(l`Hr4le?>SY02;TH>qOg?)SIf z?BIG=KYRbr`oG?x^*?9-zxz3xWfy0#h;zc*XSu%&@7z>mxBpRm=lA8bvs2HniPMi; zTJg%now2SaBY!`GVh~qBMnH@60WG75y|1U+civ9FyDT?oNnYCe#?lAo_Ww%myk2{@ zx9HV}d;e

10E ze!WXx7icWYP`vK$mko7& z9~JZBY;H9Q6dsv$iQ`#sN?rw& z{Au}e#M$5W@va+e%uI%9G8`N2{)pVYkl656w~aZ%YDYPPsOj-55*O>UBUn2&z6)!g zqj-`h=byFDfxX--4HcP8rk}6ViJd#QsJ|$b+ty%S6L;0S6q7^Tj7e)|zjgF}C;Fm~ zPq`}Q$1m?&QcX;y&dQ;N^(VD7wPu=S#e~GDAFJKIN^9$nGZGg#CN$1SRCN;MGv0CV zVc#LCD$Xmti*kCIWXd!SO?>pJ{^sN&PtJ|U6zeT!IVfbFeD(Eja+J{d|r9z}2zic0fzZ4jvGXTt+>G`YF|3Pnq*6 zwSGrEMWKh^dY1^z7J=;+58uCiTkFlCm{)jceMK;k76`oU|0ny}nwx9aJj^}cDqu9p zq2Yh{%k@F*X;V!9gntdtYnd>SfvM%*g54PaEkFyk8QkuM29H(CYDc06-&HNwpTiZwPyB^mrW&i?DS3j3^ HP6Y!QG^nKlfmHiK0RTJ3tBL7vUm-Oa0G$)5Cp*(3}Uof zAh?R@qyUn+wu50bj`IeBH9zRZH7+Q^5dx7$lzkQ~noeFCN6u^2~ zlWQV60hW`dB0K`!UbEyPiva}nL||OAbR>KOe@SOiR4+gg63;SLs&+gtLi|UB!(k!g z3;dtg*VoHf!1E&P>FJS+7cWwX;|Tm;cWFU5K5RmnUTGfuRRB zct7~^9V?8fvNgCTBk7{N^N0U04YzMeFeg_Y``UkzLfbldx2mqn2d}>*UgqxmHao6@ zfBWWd{$Kx6)nESRfA{0!dms^;bh@Hc;k+H?e(?dM++3;5W#qG z!$V)v&l9<&xS7p9UH~rU?D?OGd!26R@IVn}0J~fI$%(^``)qvZ?_{)-C=he&`c=B2 z!vsZ`A*^oc(S19#812kox=L2wH+pYgeSHq%f{T6N!|nPxEI-}Q%t8@n2y=7de-Z3` z`&GyBA;dZwg$MyAveXy{8aH$$-O!9f5oQqFoNG5dte<0ih?^IWb|6ID@TJN{HKKJ3 zTmw=qi3E6T?~a&p;F49|O}UI#Jm218H1e?;JDoZd9X}yG@z7JxxGuKAfIy5H2STh5 zKSeim7+`yg;Q*En?j1ly%`r7bfAktw0b;DX)gfm{G6S3c4ij+iLTXHi0L|sIA4^wf zr`)4l)j|)9r{IE~I~k4eLVy_SW_!?*dj-0q!-yUizW$Q7hM+**&`4FxU$RPyN~Vn( z7Zuluao??~N-aJ!1~dX>AZA#JP=vz_Zg9Axu!dd&b)zU-qX35;ig2X3KYaG2Tv9@; zamXKzCJ;zkvU+|0n3fDX6yZpNabjyrlQh)cR93Q6Mgzf|9JS>sS9uOC-^fD|65=vU zQ4r!blh7Vflh7Vflh7Vflh7Vflh7Vflh7Une*+O#3L(TTPWXF!d*2d5h+CZSE8Y}B zh#N%I_7ne_HEVV&Yxr{^gp4E*;Qv+ntJHxRWexvTJ(LR}WF&w9p*QF*8XZ+?Y*Y`Q z@3V*zA%qMU+5)QW!9LxI&%Q@_d3jkR68UGJ&$mkbxLODynV=FuP~~;Lg(0BzjsF1h X6IJE!Pt#^G00000NkvXXu0mjfh2qx# diff --git a/spiral/xml/page_catalog_vending_machine.xml b/spiral/xml/page_catalog_vending_machine.xml new file mode 100644 index 00000000..7a351c00 --- /dev/null +++ b/spiral/xml/page_catalog_vending_machine.xml @@ -0,0 +1,483 @@ + + + + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + EndIf + + ; SpiralOnline + If SpiralOnline = "true" Then + Var Menu1Selected2 = "Enable" + Var Menu2Selected2 = "Enable" + Var Menu3Selected2 = "Enable" + Var Menu4Selected2 = "Enable" + + Var Menu6Selected2 = "Enable" + Var Menu7Selected2 = "Enable" + Var MenuVSelected2 = "Enable" + + If AppFastEnable = "true" Then + Var Menu11Selected2 = "Enable" + Var Menu7Selected2 = "Invisible" + Else + Var Menu11Selected2 = "Invisible" + Var Menu7Selected2 = "Enable" + EndIf + + ; init default + Var Menu1Selected = "Invisible" + Var Menu2Selected = "Invisible" + Var Menu3Selected = "Invisible" + Var Menu4Selected = "Invisible" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Invisible" + Var Menu7Selected = "Invisible" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + + Var Menu11Selected = "Invisible" + Var Menu7Selected = "Invisible" + ; fuck + Else + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + + ; spiral + Var MenuVSelected2 = "PressForever" + + + Var Timeout = 0 + + + + + + 1000 + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + +; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + + + diff --git a/spiral/xml/z_android.pml b/spiral/xml/z_android.pml new file mode 100644 index 00000000..cd5155c6 --- /dev/null +++ b/spiral/xml/z_android.pml @@ -0,0 +1 @@ + diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml index a8537a1d..e5ea13bc 100644 --- a/xml/menu_catalog.xml +++ b/xml/menu_catalog.xml @@ -344,7 +344,7 @@ SoundVolume Var NextPage = "-" - Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" diff --git a/xml/menu_catalog_default_init.xml b/xml/menu_catalog_default_init.xml index b0035dfd..e30edf84 100644 --- a/xml/menu_catalog_default_init.xml +++ b/xml/menu_catalog_default_init.xml @@ -25,6 +25,14 @@ Var Menu7Selected2 = "Enable" Var MenuVSelected2 = "Enable" + If AppFastEnable = "true" Then + Var Menu11Selected2 = "Enable" + Var Menu7Selected2 = "Invisible" + Else + Var Menu11Selected2 = "Invisible" + Var Menu7Selected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Invisible" Var Menu2Selected = "Invisible" diff --git a/xml/page_catalog_choose_drink.xml b/xml/page_catalog_choose_drink.xml index 78c7a9e5..224662bc 100644 --- a/xml/page_catalog_choose_drink.xml +++ b/xml/page_catalog_choose_drink.xml @@ -416,7 +416,7 @@ SoundVolume Var NextPage = "-" - Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml index 71aab5c1..bf994b28 100644 --- a/xml/page_catalog_choose_drink1.xml +++ b/xml/page_catalog_choose_drink1.xml @@ -37,6 +37,14 @@ Var Menu7Selected2 = "Enable" Var MenuVSelected2 = "Enable" + If AppFastEnable = "true" Then + Var Menu11Selected2 = "Enable" + Var Menu7Selected2 = "Invisible" + Else + Var Menu11Selected2 = "Invisible" + Var Menu7Selected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Invisible" Var Menu2Selected = "Invisible" @@ -475,7 +483,7 @@ SoundVolume Var NextPage = "-" - Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" diff --git a/xml/page_catalog_choose_drink11.xml b/xml/page_catalog_choose_drink11.xml index 77c68496..d1429e12 100644 --- a/xml/page_catalog_choose_drink11.xml +++ b/xml/page_catalog_choose_drink11.xml @@ -39,6 +39,14 @@ Var Menu7Selected2 = "Enable" Var MenuVSelected2 = "Enable" + If AppFastEnable = "true" Then + Var Menu11Selected2 = "Enable" + Var Menu7Selected2 = "Invisible" + Else + Var Menu11Selected2 = "Invisible" + Var Menu7Selected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Invisible" Var Menu2Selected = "Invisible" @@ -463,7 +471,7 @@ SoundVolume Var NextPage = "-" - Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml index 8094ca48..ae9f7c55 100644 --- a/xml/page_catalog_choose_drink2.xml +++ b/xml/page_catalog_choose_drink2.xml @@ -38,6 +38,14 @@ Var Menu7Selected2 = "Enable" Var MenuVSelected2 = "Enable" + If AppFastEnable = "true" Then + Var Menu11Selected2 = "Enable" + Var Menu7Selected2 = "Invisible" + Else + Var Menu11Selected2 = "Invisible" + Var Menu7Selected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Invisible" Var Menu2Selected = "Invisible" @@ -451,7 +459,7 @@ SoundVolume Var NextPage = "-" - Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml index 7d1c01de..89c6469d 100644 --- a/xml/page_catalog_choose_drink3.xml +++ b/xml/page_catalog_choose_drink3.xml @@ -38,6 +38,14 @@ Var Menu7Selected2 = "Enable" Var MenuVSelected2 = "Enable" + If AppFastEnable = "true" Then + Var Menu11Selected2 = "Enable" + Var Menu7Selected2 = "Invisible" + Else + Var Menu11Selected2 = "Invisible" + Var Menu7Selected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Invisible" Var Menu2Selected = "Invisible" @@ -450,7 +458,7 @@ SoundVolume Var NextPage = "-" - Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml index b06d3e20..eb915768 100644 --- a/xml/page_catalog_choose_drink4.xml +++ b/xml/page_catalog_choose_drink4.xml @@ -36,6 +36,14 @@ Var Menu7Selected2 = "Enable" Var MenuVSelected2 = "Enable" + If AppFastEnable = "true" Then + Var Menu11Selected2 = "Enable" + Var Menu7Selected2 = "Invisible" + Else + Var Menu11Selected2 = "Invisible" + Var Menu7Selected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Invisible" Var Menu2Selected = "Invisible" @@ -448,7 +456,7 @@ SoundVolume Var NextPage = "-" - Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml index 574a6f3b..44e0d060 100644 --- a/xml/page_catalog_choose_drink5.xml +++ b/xml/page_catalog_choose_drink5.xml @@ -37,6 +37,14 @@ Var Menu7Selected2 = "Enable" Var MenuVSelected2 = "Enable" + If AppFastEnable = "true" Then + Var Menu11Selected2 = "Enable" + Var Menu7Selected2 = "Invisible" + Else + Var Menu11Selected2 = "Invisible" + Var Menu7Selected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Invisible" Var Menu2Selected = "Invisible" @@ -441,7 +449,7 @@ SoundVolume Var NextPage = "-" - Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml index 3a8e8b5e..2bbf6f14 100644 --- a/xml/page_catalog_choose_drink6.xml +++ b/xml/page_catalog_choose_drink6.xml @@ -37,6 +37,14 @@ Var Menu7Selected2 = "Enable" Var MenuVSelected2 = "Enable" + If AppFastEnable = "true" Then + Var Menu11Selected2 = "Enable" + Var Menu7Selected2 = "Invisible" + Else + Var Menu11Selected2 = "Invisible" + Var Menu7Selected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Invisible" Var Menu2Selected = "Invisible" @@ -447,7 +455,7 @@ SoundVolume Var NextPage = "-" - Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml index a04fb5b6..42e61904 100644 --- a/xml/page_catalog_choose_drink7.xml +++ b/xml/page_catalog_choose_drink7.xml @@ -37,6 +37,14 @@ Var Menu7Selected2 = "Enable" Var MenuVSelected2 = "Enable" + If AppFastEnable = "true" Then + Var Menu11Selected2 = "Enable" + Var Menu7Selected2 = "Invisible" + Else + Var Menu11Selected2 = "Invisible" + Var Menu7Selected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Invisible" Var Menu2Selected = "Invisible" @@ -95,11 +103,11 @@ If SpiralOnline = "true" Then If AppFastEnable = "true" Then - Var Menu11Selected2 = "Invisible" - Var Menu7Selected2 = "PressForever" - Else Var Menu11Selected2 = "PressForever" Var Menu7Selected2 = "Invisible" + Else + Var Menu11Selected2 = "Invisible" + Var Menu7Selected2 = "PressForever" EndIf Else @@ -463,7 +471,7 @@ SoundVolume Var NextPage = "-" - Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" diff --git a/xml/page_catalog_choose_drink8.xml b/xml/page_catalog_choose_drink8.xml index f11bba4f..17f6105c 100644 --- a/xml/page_catalog_choose_drink8.xml +++ b/xml/page_catalog_choose_drink8.xml @@ -37,6 +37,14 @@ Var Menu7Selected2 = "Enable" Var MenuVSelected2 = "Enable" + If AppFastEnable = "true" Then + Var Menu11Selected2 = "Enable" + Var Menu7Selected2 = "Invisible" + Else + Var Menu11Selected2 = "Invisible" + Var Menu7Selected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Invisible" Var Menu2Selected = "Invisible" @@ -443,7 +451,7 @@ SoundVolume Var NextPage = "-" - Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" diff --git a/xml/page_catalog_with_vending.xml b/xml/page_catalog_with_vending.xml index 6b49801b..5c082afe 100644 --- a/xml/page_catalog_with_vending.xml +++ b/xml/page_catalog_with_vending.xml @@ -271,8 +271,8 @@ SoundVolume ; eng - Open "ROOT/taobin_spiral/xml/page_catalog_vending_machine.xml" - + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" +