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

merge

Browse source
This commit is contained in:
miggaze 2021-12-17 12:53:05 +07:00
commit cb14903186
15 changed files with 487 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

39
animation01/Menu Description - Sheet1.tsv
View file

@ -140,29 +140,13 @@ Hot strawberry tea 12-02-01-0022 1 10 19 24 90 1:30 43
Iced strawberrry tea 12-02-02-0022 1 10 19 23 24 85 1:25 27
STRAWBERRY SHAKE 12-04-02-0013 1 25 26 19 17 23 24 178 2:58 35
ETHIOPAI BLUE DADDY DIRTY 12-01-02-0020 1 7 42 2 3 4 5 24 100 22:40 32
HOT AMERICANO BLUE DADDY 12-01-01-0019 1 2 42 3 4 5 16 24 88 1:28 32
ICED AMERICANO BLUE DADDY 12-01-02-0019 1 2 42 3 4 5 23 16 24 133 2:13 32
ESPRESSO BLUE DADDY 12-01-01-0020 1 2 42 3 4 5 24 66 1:06 32
MOZART ALMOST DIRTY 12-01-02-0022 1 7 43 2 3 4 5 24 100 22:40 32
อเมริกาโนร้อน 12-01-01-0021 1 2 43 3 4 5 16 24 88 1:28 32
อเมริกาโนเย็น 12-01-02-0021 1 2 43 3 4 5 23 16 24 133 2:13 32
เอสเพรสโซ่ช็อต 12-01-01-0022 1 2 43 3 4 5 24 66 1:06 32
โกโก้สตอเบอร์รี่เย็น 12-03-02-0010 1 15 17 19 23 24 125 2:05 40
โกโก้สตอเบอร์รี่ปั่น 12-03-03-0010 1 15 17 19 23 41 24 125 2:05 40
สตอเบอร์รี่มัชฉะลาเต้เย็ 12-02-02-0023 1 16 8 9 19 23 24 125 3:05 40
สตอเบอร์รี่มัชฉะลาเต้ปั่น 12-02-03-0023 1 16 8 9 19 23 41 24 125 4:05 40
นมสตอเบอร์รี่เย็น 12-03-02-0011 1 17 19 23 24 125 5:05 40
นมสตอเบอร์รี่ปั่น 12-03-03-0011 1 17 19 23 41 24 125 6:05 40
โอรีโอ้โปรตีน 12-04-02-0014 1 17 25 40 26 24 125 7:05 40
เอสเพรสโซ่ช็อต
ETHIOPAI BLUE DADDY DIRTY 12-01-02-0020 1 7 36 2 3 4 5 24 100 22:40 32
HOT AMERICANO BLUE DADDY 12-01-01-0019 1 2 36 3 4 5 16 24 88 1:28 32
ICED AMERICANO BLUE DADDY 12-01-02-0019 1 2 36 3 4 5 23 16 24 133 2:13 32
ESPRESSO BLUE DADDY 12-01-01-0020 1 2 36 3 4 5 24 66 1:06 32
Coke 12-05-02-0019 1 23 37 13 24 49 0:49 23
Coke 12-05-03-0019 1 23 37 13 41 24 49 0:49 23
OREO SMOOTHIE VOLCANO 12-03-03-0009 1 17 23 40 41 24 110 1:50 53
@ -242,9 +226,16 @@ STRAWBERRY SHAKE 12-04-03-0013 1 25 26 19 17 23 41 24 178 2:58 35
ICED AMERICANO BLUE DADDY 12-01-03-0019 1 2 36 3 4 5 23 16 41 24 133 2:13 32
Coke 12-05-03-0019 1 23 37 13 41 24 49 0:49 23
ILYSB 11-99-05-0001 1 23 27 28 24 49 1:01 23
Gale Jail 11-99-05-0002 1 23 27 28 24 49 2:01 23
Third Behind Bars 11-99-05-0003 1 23 27 28 24 49 3:01 23
Love Potion 11-99-05-0005 1 23 27 28 24 49 4:01 23
Pinky Promise 11-99-05-0004 1 23 27 28 24 49 5:01 23
Oriental Kink 11-99-05-0007 1 23 27 28 24 49 6:01 23
Bedroom Story 11-99-05-0006 1 23 27 28 24 49 7:01 23
Good Night Kiss 11-99-05-0009 1 23 27 28 24 49 8:01 23
Forever Love 11-99-05-0010 1 23 27 28 24 49 9:01 23
Long Night 11-99-05-0008 1 23 27 28 24 49 10:01 23

1 name New Code เล่น 4 วินาที ขั้นตอน 1 ขั้นตอน 2 ขั้นตอน 3 ขั้นตอน 4 ขั้นตอน 5 ขั้นตอน 6 ขั้นตอน 7 ขั้นตอน 8 จบ Time (sec) นาทีและวินาที ความยาวการเล่นของแต่ละขั้นตอน
140 Iced strawberrry tea 12-02-02-0022 1 10 19 23 24 85 1:25 27
141 STRAWBERRY SHAKE 12-04-02-0013 1 25 26 19 17 23 24 178 2:58 35
142
143 ETHIOPAI BLUE DADDY DIRTY 12-01-02-0020 1 7 42 36 2 3 4 5 24 100 22:40 32
144 HOT AMERICANO BLUE DADDY 12-01-01-0019 1 2 42 36 3 4 5 16 24 88 1:28 32
145 ICED AMERICANO BLUE DADDY 12-01-02-0019 1 2 42 36 3 4 5 23 16 24 133 2:13 32
146 ESPRESSO BLUE DADDY 12-01-01-0020 1 2 42 36 3 4 5 24 66 1:06 32
MOZART ALMOST DIRTY 12-01-02-0022 1 7 43 2 3 4 5 24 100 22:40 32
อเมริกาโนร้อน 12-01-01-0021 1 2 43 3 4 5 16 24 88 1:28 32
อเมริกาโนเย็น 12-01-02-0021 1 2 43 3 4 5 23 16 24 133 2:13 32
เอสเพรสโซ่ช็อต 12-01-01-0022 1 2 43 3 4 5 24 66 1:06 32
โกโก้สตอเบอร์รี่เย็น 12-03-02-0010 1 15 17 19 23 24 125 2:05 40
โกโก้สตอเบอร์รี่ปั่น 12-03-03-0010 1 15 17 19 23 41 24 125 2:05 40
สตอเบอร์รี่มัชฉะลาเต้เย็ 12-02-02-0023 1 16 8 9 19 23 24 125 3:05 40
สตอเบอร์รี่มัชฉะลาเต้ปั่น 12-02-03-0023 1 16 8 9 19 23 41 24 125 4:05 40
นมสตอเบอร์รี่เย็น 12-03-02-0011 1 17 19 23 24 125 5:05 40
นมสตอเบอร์รี่ปั่น 12-03-03-0011 1 17 19 23 41 24 125 6:05 40
โอรีโอ้โปรตีน 12-04-02-0014 1 17 25 40 26 24 125 7:05 40
เอสเพรสโซ่ช็อต
147
148 Coke 12-05-02-0019 1 23 37 13 24 49 0:49 23
149 Coke 12-05-03-0019 1 23 37 13 41 24 49 0:49 23
150 OREO SMOOTHIE VOLCANO 12-03-03-0009 1 17 23 40 41 24 110 1:50 53
151
152
226 ICED AMERICANO BLUE DADDY 12-01-03-0019 1 2 36 3 4 5 23 16 41 24 133 2:13 32
227 Coke 12-05-03-0019 1 23 37 13 41 24 49 0:49 23
228
229 ILYSB 11-99-05-0001 1 23 27 28 24 49 1:01 23
230 Gale Jail 11-99-05-0002 1 23 27 28 24 49 2:01 23
231 Third Behind Bars 11-99-05-0003 1 23 27 28 24 49 3:01 23
232 Love Potion 11-99-05-0005 1 23 27 28 24 49 4:01 23
233 Pinky Promise 11-99-05-0004 1 23 27 28 24 49 5:01 23
234 Oriental Kink 11-99-05-0007 1 23 27 28 24 49 6:01 23
235 Bedroom Story 11-99-05-0006 1 23 27 28 24 49 7:01 23
236 Good Night Kiss 11-99-05-0009 1 23 27 28 24 49 8:01 23
237 Forever Love 11-99-05-0010 1 23 27 28 24 49 9:01 23
238 Long Night 11-99-05-0008 1 23 27 28 24 49 10:01 23
239
240
241

BIN
animation01/TaoBin2_draft02_art44.mp4 Normal file
View file

Binary file not shown.

BIN
animation01/TaoBin2_draft02_art45.mp4 Normal file
View file

Binary file not shown.

BIN
image/home/bn_qr_1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
image/home/bn_qr_2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
image/home/home/qr_bg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7 KiB

44
xml/page_board.xml
View file

@ -99,11 +99,21 @@
Var TestLoopFailed = 0
;Var IgnoreNetCore = "false"
;SAVELOG SaleProfile
;DEBUGVAR SaleProfile
STRCONTAIN "whey" SaleProfile WheyShow
STRCONTAIN "cocktail" SaleProfile CocktailShow
;STRCONTAIN "roadshow" SaleProfile RoadShow
;STRCONTAIN "roadshow" SaleProfile RoadShow
Var cock_tail_str = ""
READ_FILE "/mnt/sdcard/cock_tail_enable" cock_tail_str
STRCONTAIN "1" cock_tail_str cock_tail_enable
If cock_tail_enable = "true" Then
Var WheyShow = "false"
Var CocktailShow = "true"
Var roadshow = "true"
EndIf
Var TermTemOnline = "false"
Var TaobinOnline = "false"
@ -651,6 +661,25 @@
<Image>
<X> 778 </X>
<Y> 632 </Y>
<Filename> "ROOT/taobin_project/image/home/home/qr_bg.png" </Filename>
</Image>
<QRCode>
<X> 843 </X>
<Y> 98 </Y>
<Width> 150 </Width>
<Color> "0xeae6e1" </Color>
<QRColor> "0x000000" </Color>
<Height> 150 </Height>
<State> WebAppShow </State>
<Service> testservice </Service>
</QRCode>
<Button>
<X> 780 </X>
<Y> 630 </Y>
@ -685,17 +714,6 @@
<Value> ShowNetworkProblemText </Value>
</Text>
<QRCode>
<X> 895 </X>
<Y> 1110 </Y>
<Width> 178 </Width>
<Color> "0xeae6e1" </Color>
<QRColor> "0x000000" </Color>
<Height> 178 </Height>
<State> WebAppShow </State>
<Service> testservice </Service>
</QRCode>
<Button>
<X> 0 </X>

15
xml/page_catalog_choose_drink1.pml
View file

@ -105,6 +105,21 @@
<Button>
<X> 780 </X>
<Y> 500 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
</EventClick>
</Button>
</Popup>

15
xml/page_catalog_choose_drink1.xml
View file

@ -2033,6 +2033,21 @@
<Button>
<X> 780 </X>
<Y> 500 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
</EventClick>
</Button>
</Popup>

252
xml/page_catalog_cocktail.xml
View file

@ -4,11 +4,19 @@
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<Sound> "ROOT/sounds/selectDrink.wav" </Sound>
<EventOpen>
TopView "show"
; On open
WEB "DISABLE"
Var web_readyOK = "false"
Var web_telnumOK = ""
Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/"
;Machine DoorLidClose
Var GetPayInfoFlag = 0
Var countDownRetrun = 30
@ -22,14 +30,93 @@
Var DirImage = "ROOT/taobin_project/image/page2_en/page2"
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
Play PlaySoundLag
Var DirImageCart = "ROOT/taobin_project/image/cart_en"
Else
Var DirImage = "ROOT/taobin_project/image/page2"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
Play PlaySoundLag
Var DirImageCart = "ROOT/taobin_project/image/cart_th"
EndIf
Var StrawAutoRelease1 = "false"
Var StrawAutoRelease2 = "false"
If NetworkStatus = "ACTIVATE" Then
Var ShowButtonClick2 = "Enable"
Else
Var ShowButtonClick2 = "Invisible"
EndIf
If NetworkStatus = "ACTIVATE" Then
Var ShowNetworkProblem = "Invisible"
Var ShowNetworkProblemText = ""
GenHashWithTimeStamp QRCODE99
WEB "ENABLE"
Else
Var ShowNetworkProblem = "Enable"
Var ShowButtonClick2 = "Invisible"
Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
Var QRCODE99 = ""
WEB "DISABLE"
EndIf
; 1035 is Coke.
STRCONTAIN "1035" MaterialAvailable CokeUI
Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
Var countClick = 0
DEBUGVAR CART_COUNT
Var QRCODE99_Y = 1718
Var showCart = "Invisible"
If MultiPayEnable = "true" Then
If CART_COUNT = 1 Then
Var showCart = "Enable"
Var cart_image_bn = DirImageCart + "/bn_cart1.png"
Var cart_image_bp = DirImageCart + "/bp_cart1.png"
Var QRCODE99_Y = 1580
EndIf
If CART_COUNT = 2 Then
Var showCart = "Enable"
Var cart_image_bn = DirImageCart + "/bn_cart2.png"
Var cart_image_bp = DirImageCart + "/bp_cart2.png"
Var QRCODE99_Y = 1580
EndIf
If CART_COUNT = 3 Then
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
EndIf
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -44,6 +131,8 @@
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
Refresh
TimerReset
</EventTimeout>
@ -54,11 +143,25 @@
;EndIf
</EventChangeStatus>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<EventWebApp>
DEBUGVAR web_ready
If web_ready = "true" Then
If web_ref = QRCODE99 Then
Cart "DeleteMenuID" "ALL"
Var web_readyOK = web_ready
Var web_telnumOK = web_telnum
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
EndIf
Else
EndIf
</EventWebApp>
<Video>
<X> 0 </X>
@ -67,8 +170,11 @@
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
; back
<Button>
<X> 19 </X>
@ -165,6 +271,19 @@
</Button>
; menu row 3
;<Button>
;<X> 205 </X>
;<Y> 1533 </Y>
;<Filename> Var(DirImage + "/bn_fruit.png") </Filename>
;<FilenamePress> Var(DirImage + "/bp_fruit.png") </FilenamePress>
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
;<Volume> SoundVolume </Volume>
;<EventClick>
; Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
;</EventClick>
;</Button>
<Button>
<X> 205 </X>
@ -178,12 +297,11 @@
</EventClick>
</Button>
<Button>
<X> 579 </X>
<Y> 1533 </Y>
<Filename> Var(DirImage + "/bn_soda.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_soda.png") </FilenamePress>
<Filename> bnSodaAndOther </Filename>
<FilenamePress> bpSodaAndOther </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -191,28 +309,18 @@
</EventClick>
</Button>
;<Text>
;<X> 0 </X>
;<Y> 1886 </Y>
;<Size> 20 </Size>
;<Width> 1080</Width>
;<Align> Center </Align>
;<Font> RobotoBlack </Font>
;<Color> 0x513C2F </Color>
;<Value> countDownRetrun </Value>
;</Text>
<Button>
<X> 392 </X>
<X> 225 </X>
<Y> 424 </Y>
<State> ShowButtonClick2 </State>
<Filename> Var(DirImage + "/bn_main_page_member.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_main_page_member.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; eng
;Open "ROOT/xml/service_menu.xml"
Open "ROOT/taobin_project/xml/page_check_member.xml"
</EventClick>
</Button>
@ -220,6 +328,7 @@
<Button>
<X> 696 </X>
<Y> 424 </Y>
<State> ShowButtonClick2 </State>
<Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -231,5 +340,104 @@
</EventClick>
</Button>
<Button>
<X> 0 </X>
<Y> 1870 </Y>
<State> ShowNetworkProblem </State>
<Color> "0xFF0000" </Color>
<Width> 1080 </Width>
<Height> 60 </Height>
</Button>
<Text>
<X> 5 </X>
<Y> 1880 </Y>
<Size> 24 </Size>
<Align> Center </Align>
<Width> 1080 </Width>
<Font> RobotoRegular </Font>
<Color> 0xFFFFFF </Color>
<Value> ShowNetworkProblemText </Value>
</Text>
<Button>
<X> 0 </X>
<Y> 1860 </Y>
<Width> 200 </Width>
<Height> 50 </Height>
<Volume> SoundVolume </Volume>
<EventClick>
Var countClick = countClick + 1
If countClick = 3 Then
;Var TestLoopMakeDrink = 1
EndIf
DEBUGVAR countClick
If countClick = 5 Then
If ToppingNewEnable = "false" Then
Var ToppingNewEnable = "true"
Else
Var ToppingNewEnable = "false"
EndIf
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
Refresh
</EventClick>
</Button>
;<QRCode>
;<X> 895 </X>
;<Y> QRCODE99_Y</Y>
;<Width> 178 </Width>
;<Height> 178 </Height>
;<State> "Enable" </State>
;<Service> testservice </Service>
;</QRCode>
; Cart
<Button>
<X> 915 </X>
<Y> 1769 </Y>
<State> showCart </State>
<Filename> cart_image_bn </Filename>
<Filename> cart_image_bp </Filename>
<FilenamePress> cart_image_bp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<Interval> 400</Interval>
<EventClick>
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>
<EventWebApp>
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
</EventWebApp>
</Popup>

6
xml/page_tel_number_mask.xml
View file

@ -225,6 +225,11 @@
<EventClick>
Var seeker = "next"
DEBUGVAR seeker
DEBUGVAR seeker.productCode
DEBUGVAR seeker.productPrice
Var seeker = "prev"
DEBUGVAR seeker
DEBUGVAR seeker.productCode
@ -232,6 +237,7 @@
TransferVar "prev" "next"
Var seeker = "next"
DEBUGVAR seeker
DEBUGVAR seeker.productCode
DEBUGVAR seeker.productPrice

159
xml/page_thankyouConti.xml Normal file
View file

@ -0,0 +1,159 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
Var CountDownThankyou = 3
Var CountDownBrewing = BrewTime
Var CountUpBrewing = 0
SAVELOG BrewTime
Var ShowCountDownBrewing = CountDownBrewing
Var Timeout = 0
Var ChangeFlag = 0
Var ErrTimeout = 0
Var ActionOKCase = 0
Var ChangeTimeout = 0
Var MachineState_Result = 0
Var FailedCount = 0
Var ChangeAmountSum = 0
Var Tel_Confirm_Flag = 0
Var LastMakeDrinkResult = "-"
If show_eng = "true" Then
Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png"
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var BottomText = PicturePath + "text_bottom_eng.png"
Else
Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var BottomText = PicturePath + "text_bottom_thai2.png"
EndIf
DEBUGVAR StarwState
DEBUGVAR LidState
DEBUGVAR BottomText
If StarwState = "Press" Then
Machine StrawWithDelay
LED LedDoorLid Blink 255 255 255 255
EndIf
If LidState = "Press" Then
Machine LidWithDelay
LED LedDoorLid Blink 255 255 255 255
EndIf
DEBUGVAR Seeker.TNumberTaobinCredit
DEBUGVAR TelephoneNumber
DEBUGVAR Seeker.StoreCreditFlag
If Seeker = "curr" Then
Topping "Select" Seeker.selected_a_drink
; Set option toppinng and pack
Topping "Select1-ID" Seeker.topping1
Topping "Select2-ID" Seeker.topping2
Topping "Select3-ID" Seeker.topping3
; Pack
Topping "Pack" ExtendData
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var CountDownBrewing = CountDownBrewing - 1
Var CountDownThankyou = CountDownThankyou - 1
Var Timeout = Timeout + 1
If Timeout = 3 Then
If CART_INDEX = 0 Then
MakeDrinkV1 SelectDrink SelectSugarID
Else
;Cart "MakeID" CART_INDEX
EndIf
EndIf
; run test;
If CountDownThankyou = 0 Then
Var CountDownBrewing = BrewTime
Var CountUpBrewing = 0
SAVELOG BrewTime
Var ShowCountDownBrewing = CountDownBrewing
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
Var ShowCountDownBrewing = CountDownBrewing
Refresh
TimerReset
</EventTimeout>
;<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>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
<Image>
<X> 375 </X>
<Y> 623 </Y>
<Width> 331 </Width>
<Height> 435 </Height>
<Filename> Seeker.PictureDrink </Filename>
</Image>
<Text>
<X> 0 </X>
<Y> 938 </Y>
<Width> 1080</Width>
<Align> Center </Align>
<Size> 72 </Size>
<Font> KanitMediumTTF </Font>
<Color> 0x513C2F </Color>
<Value> Seeker.showname </Value>
</Text>
<EventChangeStatus>
If ChangeStatus = "payout-end" Then
EndIf
</EventChangeStatus>
</Popup>

5
xml/page_topping_select.xml
View file

@ -8,12 +8,15 @@
Var y_topping_bg = 912
WEB "DISABLE"
Open "ROOT/taobin_project/xml/page_topping_select3.xml"
If JXMLVersionInt >= 369 Then
Open "ROOT/taobin_project/xml/page_topping_select4.xml"
EndIf
Open "ROOT/taobin_project/xml/page_topping_select4.xml"
DEBUGVAR BrewVersionInt
If BrewVersionInt >= 419 Then

10
xml/page_topping_select3.xml
View file

@ -11,6 +11,16 @@
DEBUGVAR SelectDrink
DEBUGVAR PictureDrink
StrLen SelectDrink SelectDrinkLen
If SelectDrinkLen = 0 Then
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
If PriceDrink = 0 Then
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
Var SaveProductCodeSelect = SelectDrink
Var UserSelectProductCode = SelectDrink

4
xml_main/startup.xml
View file

@ -95,8 +95,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
Var XMLPageVersion = "5.84"
Var XMLPageVersionInt = 584
Var XMLPageVersion = "5.87"
Var XMLPageVersionInt = 587
</EventOpen>
<Text>