pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

do cocktail

Browse source
This commit is contained in:
kong 2020-12-16 09:50:26 +07:00
parent 8bf88cad9b
commit 7a57379f94
84 changed files with 1977 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

5
xml/page_thankyou.xml
View file

@ -78,16 +78,15 @@
;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