This commit is contained in:
miggaze 2020-12-04 13:36:51 +07:00
commit c35ccc6f90
142 changed files with 2306 additions and 567 deletions

View file

@ -7,8 +7,10 @@
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
Var CountDownThankyou = 3
Var CountDownThankyou = 2
Var CountDownBrewing = BrewTime
Var CountUpBrewing = 0
SAVELOG BrewTime
Var ShowCountDownBrewing = CountDownBrewing
Var Timeout = 0
Var ChangeFlag = 0
@ -18,7 +20,7 @@
Var ChangeFlag2 = 0
</EventOpen>
<Timeout> 800 </Timeout>
<Timeout> 600 </Timeout>
<EventTimeout>
Var CountDownBrewing = CountDownBrewing - 1
Var CountDownThankyou = CountDownThankyou - 1
@ -63,9 +65,16 @@
;Open "ROOT/taobin_project/xml/page_lid_straw.xml"
;Open "ROOT/taobin_project/xml/page_brewing.xml"
<<<<<<< HEAD
If TestLoopMakeDrink = 1 Then
Open "ROOT/taobin_project/xml/page_brewing2.xml"
EndIf
=======
Var CountDownBrewing = BrewTime
Var CountUpBrewing = 0
SAVELOG BrewTime
Var ShowCountDownBrewing = CountDownBrewing
>>>>>>> f36bbe70987e89d48bcc2837537db37c4f90c33b
Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
EndIf
@ -75,11 +84,20 @@
TimerReset
</EventTimeout>
<Image>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
</Image>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/video/taobin_adv2.mp4" </Filename>
</Video>
<Image>
<X> 89 </X>
@ -88,22 +106,22 @@
</Image>
<Image>
<X> 751 </X>
<Y> 413 </Y>
<Filename> page_doing_show_time_image </Filename>
</Image>
;
<Text>
<X> XPosiShowCountDownBrew </X>
<Y> 470 </Y>
<Align> End </Align>
<Width> 153 </Width>
<Size> 88 </Size>
<Font> RobotoBold </Font>
<Color> 0x513C2F </Color>
<Value> ShowCountDownBrewing </Value>
</Text>
;<Image>
;<X> 751 </X>
;<Y> 413 </Y>
;<Filename> page_doing_show_time_image </Filename>
;</Image>
;;
;<Text>
;<X> XPosiShowCountDownBrew </X>
;<Y> 470 </Y>
;<Align> End </Align>
;<Width> 153 </Width>
;<Size> 88 </Size>
;<Font> RobotoBold </Font>
;<Color> 0x513C2F </Color>
;<Value> ShowCountDownBrewing </Value>
;</Text>
<EventChangeStatus>
If ChangeStatus = "payout-end" Then