From 575685aa37fd4f0edaf920deaab25a0efc89f954 Mon Sep 17 00:00:00 2001 From: kong Date: Thu, 15 Oct 2020 14:04:35 +0700 Subject: [PATCH] Do point --- image/collectiing/bd_confirm.png | Bin 0 -> 2773 bytes image/collectiing/text1.png | Bin 3595 -> 4305 bytes image/collectiing/text20.png | Bin 0 -> 12381 bytes image/collectiing/text21.png | Bin 0 -> 4305 bytes xml/page_board.xml | 2 + xml/page_brewing2.xml | 2 +- xml/page_collect_point_1.xml | 67 ++++++++++++++++++++++++------- xml/page_collect_point_2.xml | 27 ++++++++++++- xml/page_lid_straw.xml | 2 +- xml/page_payment_cash.xml | 3 ++ xml/page_show_consent.xml | 45 +++++++++++++++++---- 11 files changed, 121 insertions(+), 27 deletions(-) create mode 100644 image/collectiing/bd_confirm.png create mode 100644 image/collectiing/text20.png create mode 100644 image/collectiing/text21.png diff --git a/image/collectiing/bd_confirm.png b/image/collectiing/bd_confirm.png new file mode 100644 index 0000000000000000000000000000000000000000..cd1cd8e9b53c27e3b1f61335024ac1bfbedfabf5 GIT binary patch literal 2773 zcmV;`3M%!9P)0Hr-A?E+fEIfZ0SQ*bv>4+|(Q3n;UL4zqv)vw#lW0c>D~t{`RuH4O9w z!XJbckoGi$#L~O-u58(oEZg!Ah3Dk^ImbA0gd#$8eeczKPfQ+ox7%rSDQF2vgPDIr z#0_x|{TjR12modybRbLzOtddV2PF0d2|wpB-oJLO`J6s8rq7_$>100Gy6qP-+LvPrJ7JY-_8zPp9nE0#6!j+=qX5j}`%dFWQFr@o5I3+5^wq-A>C= z@D&r^MrH%xJANEX_hH=usJ6hP0Y^BzPsnZnR#3eGXz77x*ENbm4!@ILNd*8at)2k1 z)WGxh&CB~@>1&i!0B4FY)5G6h-+o9-vXsE1Sx&%fKe*$&NdRzGy^AHfwT$e?(1P|} zzx-Q3VFy76;LN)cnDF1PU%&X87PL^t^LFpY@5J)L2LS*pW#Q6muE5hDljBM&T(JT; z$94{nqC3rI^MGbFbKpTg2LOh+Gx) zN5|>7r$+<;Fr8Sk-)wH)m>4rA2A-sutb+qF1p)x7V)_u<=ns>c%@a$lz|-sN;0hK1%tM-Qc3(Ug_tnx;t2bUJd`AEP^O{g{m1aDKf(HZuun1Rj z84gRYa*bp>$aVl=i6j=fwY9a~&b~O3@gUm)fFF*;iW#5Ou1Yh&_3lI6@$K1tlA*kwI%CP^&O)lf{(Kt=7R*qwl+j};enKM_Dmd&-6w z3%CQosbL{$goe!xG?x98T;VZmuH*`arHZ%?h_w_)$GL5d336k1tjm-{^1YHE%r>gU z?c;=|F7p!nI@^PU<8c z{X2TXuU+_A`4}D3FBv7yY|pu4iQPVnfv3v%9XSs7gURkU(kc~!$3xr*^$&gb1Apkd zcDN#!$0r6IfKnQG#BLAZhB=sIA}jhk zP#rQJ59v4_9l4xJMj3Zcdi|7smg7t5(i<&29PF5k~MLZZPvsU!(XnOWa7dMg;+MhEPbiCjQ3;d9Y9!iLh8w; zC!#*edNfn7fF(ic)7brLA0@j_T_|kYVqwGYX-D>{`zzb;;NR(vC7v*_P=i|8euw+a z3{rG~s(W%ounJ^9bpNsM@vh;Y$YnixQtCT=aXHbVq+E%*V@s?o-KYH&yYlT)>AF6H z^>q4c>S(4lO}cc4?oUTs8#C!xd;2dghdOD$`ZLfK3Crj)YB1Gj{2s3cYvsS1$L)yq?X$E2XYcHqkFWb46qDZrpLDtkiVI^6-E8k<%U=|-uUv@MZd<0KNyU-vey2K008RY zE~E34^pip0Ny;se0|Ef3L0V?1LEzDHONfy506-1+aav}n+~gMPzDNK7%O$aNzsAbPfLjnL;j*)CfjRYRedYI@b0RSv)G}}?73z$R_-NO|w z09a6Iwxdb|k47jV{wDzd%t^$4TbAvpiHqy*y?)toPd5nwUhM0H7+dY{r&Ysi~`DZ+>y(k$XbF2LPthzRu?6 z?;cItuJR3(T)$_>J+%k`pxn;2&Fx!NHmrOlnneKqrYc|JU5;7kE=;_QFbkxkZUes^k$}SB)Z32Mv zY{!*XGY1_tQ>j(-X7}X-X1Y%RaIRQOk2b&9zDILf=w{Q`x3(WxYca12;JnbmfyDO~ z2|8+_j3>2Gxr#<7jcbKNOS06!qmt~00vCYzE&;$w za{=OqNTP3+k>wQjTMq;vfR)zP)kyoxAunBRfhUCk1h69XA`zRXvB;CU0#2&-z?0Gd zL=?1wUI1zl0QjQq9#0RCq9@JXU4?6RYJn#!4MHLFZ4qe^^9BLH>2R5it3cY~0?ug$ zo2<_gc#8I3b#96Y8pLwbu({!WARDfW-e9pC2uc96bLY=~@+Xl#@4Gkn_cnPgZZEr0 bJdd9M6LOCp06iy}00000NkvXXu0mjfvq&`? literal 0 HcmV?d00001 diff --git a/image/collectiing/text1.png b/image/collectiing/text1.png index dc60f177f3be61bf972c7358567e332d39bf2a3f..8378e1fe3ce43aa8c775a29320a2d9ea082653b3 100644 GIT binary patch delta 4295 zcmV;&5IFCP9MK^miBL{Q4GJ0x0000DNk~Le0004C0000p2nGNE0I3Ypp^+gpe-LI# zL_t(|0qvb#deb@+#|PR1cPH-(j=KWF3J8~{6i&MW!U`xWpj`nyD`;3jTfXlIE1;|Z zvjV~$-+kxrjPoeU$d(=3i4*;vCr?wyiDX$bmPRw9D->7@PESvxYuB#z{`~n9UA=ns zZye+IpD!;jFMj|2eX+m4A5%?mf7u=W)3FYZxXcj+mIB?Q_DBu-_N4TF%g`0Ek;j34#qPutR2Bp|ySo!wLe<)H`z(Wc& zj-PY})`k9y7cY7gSVulnpmD+ocs&@wPIu+Xm013VIbzRoE{+c=uvT#YfIWW5eWa&+ zjL)1V2L8^F0;LEFc!j~Vl3z#n?%f;OpTR!NW`_@CEspW@HKM>OG2;9DpT~K_-QC>- z%z(HLobdmV@mYtJ>}Y3af9Ej;DkUi36@~@sj_WgCaEo8Qe0k1-^}syN3i~e#tP&%B z03Z6EjE6NZn^=k@BxLSe@c#TQj(M(v-K2l(Q$froLGl1?%ut7ivpDpM!;)^OZhSv zLHPzuxSzzz;fMm25ftzmk)eF!A3uKVQy^flxw#oDhdUIgj7%>G#D{NeZ1nhr#hNa! zn42;EBk>))V4?n~f4Mpp#mHCCWn0!?TwY{+Jo^3n_h&x-3FWb^@}g`mfvj@)n&LWg zBxs8lu50kAAHN+IZF9b!L#s^zl<%D)*C}}eP`8_0mu;!zRNpY~Ro?H}*OC5y-g%C? z&4l7|Jw`ljE^Koya?eb7>W;d1&Ab~~eYpzRkuq-^_ajO_f0I7*wF=qstqYekrKq)Q z6qmP~G}bMV98TH>_Un1_OP~+24DA^*G^4vxIcNPAm+2o>pekTA3|H!jy-36Vt3QHp zS8nvgS(}CVsHoC{tqJZ>X?bb*tX*Du9DliS@x2R-+q^ zc>Ve{7Be2te{+M3k*Ccz$x3rp-Udhgp78a@{C?n*!$ItM5A5UI?uS0@Cj$P6Up+EL z&_4GnhnU9gFhP{N)?T@57F%0ehqh}SmB>5cbI(k;eI9YSd)y9arihQX+ed~R`m_@~bq2or1i#OJ zK9tlYDC;IQOrn7Cv^Q>ML~|la;Uw?8>({SC@z&7~H3)J_-kc5+xPQLO}my(*j19e}&}`@|*Wyf~?E$w~Ec@&!59i0^!YS zn3!Kfu|1|BJn^O@b{zD%(LTC{^cZbtDBoDh`%1xdG#ISj0oRZ{6 zkidhfGH5)ah^XK-RY($-PvbDs&pvfSTf%gt+1fOFDwxCeh_=I&?ZUoCdG$=cpMJ;4 ze^0SW#L_;o(moxr3p?8f3Ww$Lqss;=W(U`(H>Npdrw$ZZPx`p@@1&m6Z}uGDf5HQa zfo8kL05U_?XUdVX{^s9|7S$dpn;8{I9I@e;pJlL56FF-s@X%=dM^#p0^R*8{pdb4v zhIG*Z3oP2_V(TTPPR{%Y*6;WE56li7f9w0sYnlhFICEPc@oSK0mt#eHsI|A)kB8(( zOa;KhivJw2-SFJkZs^D>kifrlYn2kROTLA(A`4vT!G!XD(%mS%9Lj(}eMd_IJ4Ld!!`%=i~c6xxZ@g?Y15}7ivrToayy#=9w-leM}7SJ1Fn0lECxBR zX&w-HL`vt#vm%W);?8|XN%{lt8VJ~cR)jJ>)Y6Bs?lPp=fCp9K zV8A1TrYUNcol5Z0DGuk7o$e+JT3?ma$B0qZ>DF zsI%2NWv2>QW{&ZY^3^L^{}vAu?YBG1u}{Aignwr^T6+^$2%M@yxE1#PtTKMG91$k0B984moKDW9c# z@Y?Y86-x5t$T8f}u2WmcYBGU9DD!`r zF3+?lydvtBohHe!PtPb|E!YRTiw9c|Xvw(>a|4g^_Av#Lg%%b5Ja@#RDJvJ+$dZX< z^nFsnXc(cjaK4A_GIpG^)T4$h!j8hL2g}5aB2gk2>5raZy<4H|f3yl7bPSZkaOoRh z#tTKftTTj75#%#@5ljyJ)Wu?2L^YDJkOcay%=>AC5WF#p+HZ}8h5`N;&w-+W4grfa zJRR8U=K#%mF=)hOgE{OV@GIlZQDzgF+a$j&697U3MMvSNuY6PpMdEOf8V(6Ix32ew7a|8r?IIZ z&N)3I33bLa%h%oo1+R2cxTM|TvRBF%wJzW%i7?qJA_~`>!fofWm1ESmv$KOOr)ra( zwgDx~3V7S$Av6V)G1j+`dSQ{a;;Tl54wTOaMO;V90yi9fZ9^&gG#+{8oDiQ$H37}4 zPs^$zBZXz4e>jytyi(c0Iu2#*Tx?J%UrXD-g9(E=LlMV0Ux`v%@gg2f69vplX~vnk z>0AL&ifQBVzYk?g6(<;xWpyNb1z8vs$*#2SNQh@-ABXvd+y6)waPQ>2aCd2$1Is2e@v%MFV-bCVAmo7+el(s07hiW zAPp1b26~|7oj^xo+s}J#M5}GFUWYAvm2o_nkBaQH%hSAw)(VNP|H^Zvi~0uno^Se|FvF zvPS9mQ6Ac9YisLf$@1`Ee^NkpZp((DJ^P2SsjH)mB;gaH#%!eDJTrddY*D)k12_@D zR~>y74`0ctF+@K~?=j9x9~@|V@u<=k?`IO~%fG;^XOfAkeQNgQh*U;#tfIUpIunF7iU8dJvfQeyA5JQ9f$ zw^rX}3e&|CT@xf4XS|z?09XMH$r|k=v9*$DAJ>gtP!42=-Kh_`J=L9qeSy&M?`n!a zG9QFmeF5yIdAR}b-mW_f2swyLjD912^;y{aT3H_DJtogG@TRQnWckEHe-Vk2kL+^I zw#}2D20;Rz#LbMxu6Js?XMw!M%CSBf${G(;nl%qinHl*Uc%2N=|3&%QrpQ6-Y`_)} zQs+(pu7v7EK}U3WU-&SRD5aPdglk&v0}}0fMkiK=ERLMh9Kcnsq5zO&wY))J*$XMJ zZrf}kJ9#JlS%QsQn*#l%f9W8t)+%5``e0wNyr~Z>9-mnGT%gPmQA5S-&1a}1rYn~V z-u-u;c7WfcBL!k@{QUV7Q}dYSz{m|yW^{&!?vd zhS6=E#26$k!oNK+L5QtqpnP6PX>bRMZJQF`?9bY{uz&E>05=wXe~3NVp)?}5TTHr( zF>JTPg8Myfi;YJ0dGvL5H}*K|$;OB?27IaGIqYKmG&MUe1k~=x^D5?1$*{d9d!F&NA4_QRO^2ISOyg^u`kf;EB1J}k+lX9(y{>3|Q{=jD$s*03?BtEQ zcQWcfbZr`$QAQu{f71;w$*)i2dqaM`hxdkWc~BHw&KZ@E9iL5KO{7k@vhIT|KYYK> z?emHTloZiPXn*dT2s!SdZ_7Q7C}US{xSxqGIm^=}GJBlZa2$iFf%To({9luS$>V8oi=U0c02sO&iZSi{&khtCfR8MrR~?ce?0<$Kp-G21Olz260R^^qYoe+{5X zL_t(|0qvb#THLr2h6@4-cVSjA&I&?SFwJE`k|8SytN`Y0Ak7Mr*}zG&fdfg%&t06e zfPt(4X9d%9M}B+0uPGBDOSaYBrvLOlj~|2Dwq#iQMe~^D-r#*V~C^P>*Iy&0z^?Iuk$il)x_x}C+&qB_5 z_3Bm2_uIE`-!i*wk@2x4k(q@Z@!GX(PtfsOc^ZULVgLH|>kNWwyD33+{rdG&DVA;B z%nyQQ2U{ZHWY~fP6z=)G?>E%fHg+9}OazM(nMojYcGwY3;Z#DxW6Ly)e@J8;L;*FU zKqLA^0-?4gk;nuQhj{ZrhAqwifmXGK;nbRa5VbAZi^gGtLEaxcL%c4w!;SfEeb~8j!WQRIQPueF>%iNsBKXwORr8oZ{NO6AaI^LhNan; zFJIQ15S$#=S~jV!ZdIfke;XUy5^0pELCq-WJb#w`j#<5D5E2umIo!Q_H^Xk-Av_Zp z+7Gb5Bh9m_TPYBti9{MF+MwnX2q$MJ%_Pz|QG=RO zpaJZnliA6gCWcYSE49<0A$2Rx*|+UvFyj9vBZlR0m9Gkv?L;Dte-mv`a|mobPoP1y z?R40AZcU1lBJEKqW5It4W&8zY9K-_WQ&mTfG z9uApsZb1m)KL5mhwj}_gUC;ylSEiY5!+chZl`Ff}RmHxAv@g_CI?7?B*4OWO9HgtR z@Mns;IElm8%M@%-e2^4>-rne~&XaA?kbIfv>JFipHhw zsE%h5R<@g6%6f2=-L zq2=CU-Lg+eAgphkd#vp`wA~Dx?<~?6P_#`9At-F9f6g9Pb!fiXuzN2fZtyu2xM-jU z0RgjRB-oB8HJBFn_q3vHn~rnRNq9>`tNmLVfNh#DOc}C$u}_2u3kpT`OiyG8m@oR! zbD49NP@zvT<}P~!ch#1VkCppyEKhG*S4@|jHwwszgFC)4HLm3oPR{&zEYfc4zEb${ z`W4>3e;Kxv>mtd|(1v~<*jla=aL>=n?rDT%p=HxR-_-S6ZYMIK-B5-rAMIydtBjT9 zG|um%=Z_Shy)B2rS?|AA-BMWK1@NJ2Xvvqd3dP#_>a%HyyDw~^e|BLu`9tQEB^~w@ z(8}DadMGLk7=~aA4H||i_}cb4s$C^^It{k4e;2f?1VC=^6weS3*J+9S4c65>N*xll zfwvuYBkw(p02*fxs|>Wc@D=O+s3o#qU50lWgz>wbmPr7tH|!4U8glg+(f0GiajpGO z!+Z$(?8K38Y5P)p)t0Nwd^urPWv@GMCDv)zcy?RZG2g^Yr$a4-JEUo3rBiYlR~&%KRF zjV{{fQ|sr1!)RZ>Q2(;T@e}(}M=HRJf2D(Kq^_4wnRYzu6#Ss*!XGNF*%(o=1vONc z?^t!D7t(Nkt&TM)xUYlIp&8!9dv==do~{x;9}a`I^>Lka?lLq4dRe{<%GQ_FP?f5TM$ zUFp!Q5bj>f;IbhFFH+Yu`cla3^rjpxJ?mTr zzx?oWD%3ADzr=McT|}g4Qpg4w#`@aa^78Vg%ppEc@>Lx!aM=qAs>+!bUqi%$uGL_e z-xW-)CfK%U$mFag?yGWGMMpY2f6ccNz*XWZ7t(IZl+bHvxf0i+cLT0GP!JNn`t=ys zQyHApk;lYo$5#Ob)FU}xVen8K0!A5Wht#)3W~b}a>S17Ag3;w_kf?@3pOTd2e+mujASwj8 z^=FiB+_-Tt0)MEvClA{YN4SWO-i$Bqrrz~7pCmFg7qfUJ?gG*qV7;6wC>WtF(UX~Z zCaz;tptMY36&gxI`vBf>&mD$&YDTdU)x`A)E8BHpjwuM~VPjJx=UfOV^&PQ=Q={KY z<3ogCT-Ut$R`$M)b72Lcf7WJv9A-TBs;;j>_ql!D5SN3<&m~%>T_91D#>;Lq4}Qbw2h$yLT`si5j`qenFTe@f7hs8uDNQ~EJ~ z8hVns4&eFrTOa?IeoP?pliZ`;^D~XWDVKk#T2e*5uoD>*be-`D_8A?&^KC~re|nv7VWXc^VjW83Hygh*D&J+C9mFSQUQvy(kl`?oV{j9F7SFPMl2R%xCRD^iW_kf8x#-+6!o-4<#DjhbDeB zp#p17sy-ocgY=457mBIFC7dxaF^wS?qcT?%{46lR#5mMW;XpM#NMtC+CZOm*8M-O} z?NB)D=CSj$&2ECa75tA06j4qKSCO?1ZZrUPG|dJ{Chp z3hl0A^#f{AfB$QGspwf}Y(qR~Ay2U-^bqH;O^ugb^D7@Jz*ceG+Vb-9ZQq9+Fzl#p z7eO9R&}eSwni2CXbJC;n9mf}ppz4c7pRE0S5x4y7E!cje&rOp<&k$Ui5W|^J{+oF{ zppH*%FMa%Wi1fmw1kO7~y>X55kEr`h@4f%5c>klCf3RS=Z5tT9*&#sK>GOL^$2~#P zJNISz54OLopSZdNm%r}h?L>YW)Q7Gs!*}okJdZ=u&PFZHT!jJ0XJ($c^Qv`?OUps4 zki8JJ=&#*}4ZxWyGsI! zjS%;hNwE$umbP^~FQ%t50@V0yYaofa0G`%$T6HOD5OhQe0&4MluGKijXeXBn)$1`9 zHI)H@z)RG}>;eeA%)BODbg+AD{GXb?udJ-Be`>VF1rQQkJfM^R&o9%M_r=e?i8ZpI z!XZXGVW7U~;)(i<=nC{-1=kdt8R`Lzxnwm2lVAju{ydV-rxWVMhR6{Tl9i*|afL*-eXEO}ZA z8q*6i2ve_0?cz5l5Nq8<+MjQUHZIIibCSAEcK>B9az zza>S(KLs*Bbeh`dhqMbDK0gefQs(LTI?ai3&3xF1{%&8k&h$-$hjt_qX_l!FQBWHj8;|n8`B^H70xA-j3*u@9kw|1>i2^DTiA*d} zKt&>vi6siCNF*|`Ox=>dV$A4~#l^);B9X{U@-I+bscJlcvyT7(002ovPDHLkV1nH4 B^pgMp diff --git a/image/collectiing/text20.png b/image/collectiing/text20.png new file mode 100644 index 0000000000000000000000000000000000000000..7697cd93243722ad69b2e25facffa1cd933ebbd7 GIT binary patch literal 12381 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 literal 0 HcmV?d00001 diff --git a/image/collectiing/text21.png b/image/collectiing/text21.png new file mode 100644 index 0000000000000000000000000000000000000000..8378e1fe3ce43aa8c775a29320a2d9ea082653b3 GIT binary patch literal 4305 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 800 diff --git a/xml/page_brewing2.xml b/xml/page_brewing2.xml index b5b2cc90..9da9bb9b 100644 --- a/xml/page_brewing2.xml +++ b/xml/page_brewing2.xml @@ -188,7 +188,7 @@ - 808 + XPosiShowCountDownBrew 480 1080 "Hurr" diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 9b3e487d..48e44d91 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -8,19 +8,37 @@ ; On open + Var Tel_Confirm_State = "Disable" + Var ShowTextNumber = "Enable" Var Timeout = 0 Var TelephoneNumber = "" 1000 - + Var CountDownBrewing = CountDownBrewing - 1 + + ; run test; + ;If CountDownBrewing = 40 Then + ; Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;EndIf + If CountDownBrewing = 0 Then + Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + + Var ShowCountDownBrewing = CountDownBrewing + + + StrLen TelephoneNumber TelNumLen + If TelNumLen > 0 Then + Var ShowTextNumber = "Invisible" + EndIf Var Timeout = Timeout + 1 If Timeout > 20 Then - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + ;Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf TimerReset @@ -285,8 +303,8 @@ @@ -328,18 +345,18 @@ - 378 - 874 + 364 + 887 ShowTextNumber - "ROOT/taobin_project/image/enter_point/text3.png" + "ROOT/taobin_project/image/collectiing/text21.png" - 240 - 606 - "ROOT/taobin_project/image/enter_point/text2.png" + 178 + 680 + "ROOT/taobin_project/image/collectiing/text20.png" @@ -348,6 +365,26 @@ 0 "ROOT/taobin_project/image/ad_medium_2.png" + + + + 751 + 413 + "ROOT/taobin_project/image/page_doing/img2.png" + + + + XPosiShowCountDownBrew + 480 + 1080 + "Hurr" + 88 + KanitRegularTTF + 0x513C2F + ShowCountDownBrewing + + + Open "/media/bt/xml/security_alarm.xml" diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml index 61bd171c..ab40229d 100644 --- a/xml/page_collect_point_2.xml +++ b/xml/page_collect_point_2.xml @@ -11,6 +11,8 @@ Var Timeout = 0 Var TelephoneNumber = "" + ;Open "ROOT/taobin_project/xml/page_show_consent.xml" + 1000 @@ -18,7 +20,7 @@ Var Timeout = Timeout + 1 If Timeout > 30 Then ;Var CoffeePoint = 1 - ;Open "/media/bt/xml/page_collect_point_3.xml" + ;Open "ROOT/taobin_project/xml/page_show_consent.xml" If StepGetPoint = 0 Then Open "ROOT/taobin_project/xml/page_show_consent.xml" @@ -110,10 +112,31 @@ EndIf If MachineStage = "drink-failed" Then - Var MachineState_Result = 1 + Var MachineState_Result = 2 EndIf + + + + 751 + 413 + "ROOT/taobin_project/image/page_doing/img2.png" + + + + XPosiShowCountDownBrew + 480 + 1080 + "Hurr" + 88 + KanitRegularTTF + 0x513C2F + ShowCountDownBrewing + + + + \ No newline at end of file diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml index 5969a14e..0e3fe6bb 100644 --- a/xml/page_lid_straw.xml +++ b/xml/page_lid_straw.xml @@ -163,7 +163,7 @@ ; show counter brewing - 808 + XPosiShowCountDownBrew 480 1080 "Hurr" diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index adde0526..211a7a3a 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -323,10 +323,13 @@ "ROOT/taobin_project/image/ad_medium_2.png" Var MachineStage = "make-drink" + Var CountDownBrewing = 120 + ;Var BrewingTextThai = "เตรียมแก้ว" ;MakeDrinkV1 SelectDrink SelectSugarID ;Open "ROOT/taobin_project/xml/page_thankyou.xml" + Open "ROOT/taobin_project/xml/page_collect_point_1.xml" diff --git a/xml/page_show_consent.xml b/xml/page_show_consent.xml index 19c5716b..99bcd83d 100644 --- a/xml/page_show_consent.xml +++ b/xml/page_show_consent.xml @@ -16,12 +16,22 @@ 1000 - ;Open "ROOT/xml/page_board.xml" + Var CountDownBrewing = CountDownBrewing - 1 + + ; run test; + ;If CountDownBrewing = 40 Then + ; Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;EndIf + If CountDownBrewing = 0 Then + Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + + Var ShowCountDownBrewing = CountDownBrewing Var Timeout = Timeout + 1 If Timeout > 20 Then ; goto lid straw - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf TimerReset @@ -44,8 +54,8 @@