diff --git a/inter/aus/animation01/play_list.tsv b/inter/aus/animation01/play_list.tsv index e5b72e77..b728316c 100644 --- a/inter/aus/animation01/play_list.tsv +++ b/inter/aus/animation01/play_list.tsv @@ -540,9 +540,9 @@ Coke 51-05-03-0019 1 23 37 13 41 24 49 0:49 23 -กาแฟมินต์ลาเต้ปั่น 51-01-03-0057 1 2 3 5 35 7 41 24 120 12:00 23 -กาแฟมินต์ลาเต้เย็น 51-01-02-0057 1 2 3 5 35 7 24 120 13:00 23 -กาแฟมินต์ลาเต้ร้อน 51-01-01-0057 1 2 3 5 35 24 120 14:00 23 +กาแฟมินต์ลาเต้ปั่น 51-21-03-0057 1 2 3 5 35 7 41 24 120 12:00 23 +กาแฟมินต์ลาเต้เย็น 51-21-02-0057 1 2 3 5 35 7 24 120 13:00 23 +กาแฟมินต์ลาเต้ร้อน 51-21-01-0057 1 2 3 5 35 24 120 14:00 23 มินต์มะนาวโซดา 51-05-02-0060 1 12 59 13 23 24 120 19:00 23 สตรอเบอร์รี่มินต์โซดา 51-05-02-0063 1 19 59 13 23 24 120 20:00 23 ยูซุมินต์โซดา 51-05-02-0064 1 53 59 13 23 24 120 22:00 23 @@ -551,8 +551,8 @@ Coke 51-05-03-0019 1 23 37 13 41 24 49 0:49 23 มัทฉะลาเต้มินต์ 51-02-02-0050 1 6 59 8 9 23 24 120 1:00 23 มัทฉะลาเต้มินต์ 51-02-01-0050 1 6 59 8 9 24 120 2:00 23 มัทฉะลาเต้มินต์ 51-02-03-0050 1 6 59 8 9 23 41 24 120 3:00 23 -มินต์กาโน่ร้อน 51-01-01-0058 1 2 3 5 59 16 24 120 4:00 23 -มินต์กาโน่เย็น 51-01-02-0058 1 2 3 5 59 16 23 24 120 5:00 23 +มินต์กาโน่ร้อน 51-21-01-0058 1 2 3 5 59 16 24 120 4:00 23 +มินต์กาโน่เย็น 51-21-02-0058 1 2 3 5 59 16 23 24 120 5:00 23 โกโก้มินต์ร้อน 51-03-01-0035 1 7 15 59 16 24 120 6:00 23 โกโก้มินต์เย็น 51-03-02-0035 1 7 15 59 16 23 24 120 7:00 23 โกโก้มินต์ปั่น 51-03-03-0035 1 7 15 59 16 23 41 24 120 8:00 23 diff --git a/inter/aus/xml/page_catalog_group_other.lxml b/inter/aus/xml/page_catalog_group_other.lxml index 5290fc56..e37a4e3f 100644 --- a/inter/aus/xml/page_catalog_group_other.lxml +++ b/inter/aus/xml/page_catalog_group_other.lxml @@ -12961,534 +12961,6 @@ center-vertical-horizontal - - ; ==================> Len = 3 - ; - 51-05-02-0016 - - - 33 - 22 - 225 - 296 - Flag( 51-05-02-0016.Button,$Sum5105020016) - - - 16 - 164 - 22 - 222 - "multi2" - KanitMediumTTF - 0x322B26 - - DRINKING WATER - น้ำดื่ม - DRINKING WATER - น้ำดื่ม - - น้ำดื่ม - - - - 16 - 220 - 14 - 222 - KanitMediumTTF - 0x6F5F51 - - Water - น้ำ - Water - น้ำ - - น้ำ - - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - TextPriceMenuHotX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "normal.png" ) - Var( DirImage2 + "cold_db.png" ) - $51-05-02-0016.Button - - - 113 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $51-05-02-0016.Button - StringFmt( $51-05-02-0016.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - TextPriceMenuBlendX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum5105020016 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $51-05-02-0016.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - "disable-show" - $Sum5105020016 - - 000013 - - center-vertical-horizontal - - - ; ==================> Len = 3 - ; 51-05-01-0002 51-05-02-0018 - - - 33 - 22 - 225 - 296 - Flag( 51-05-01-0002.Button,51-05-02-0018.Button,$Sum51050100025105020018) - - - 16 - 164 - 22 - 222 - "multi2" - KanitMediumTTF - 0x322B26 - - WATER - น้ำ - WATER - น้ำ - - น้ำ - - - - 16 - 220 - 14 - 222 - KanitMediumTTF - 0x6F5F51 - - Water - น้ำ - Water - น้ำ - - น้ำ - - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $51-05-01-0002.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - TextPriceMenuHotX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $51-05-01-0002.Button - StringFmt( $51-05-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $51-05-02-0018.Button - - - 113 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $51-05-02-0018.Button - StringFmt( $51-05-02-0018.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - TextPriceMenuBlendX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum51050100025105020018 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum51050100025105020018 = "Disable" Then - STRCONTAIN "ERR" $51-05-01-0002.TAG tag1_is_disable - STRCONTAIN "ERR" $51-05-02-0018.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - "disable-show" - $Sum51050100025105020018 - - 000013 - - center-vertical-horizontal - ; Cart diff --git a/xml/menutab/page_catalog_group_coffee.xml b/xml/menutab/page_catalog_group_coffee.xml index 53349bfd..412ab65c 100644 --- a/xml/menutab/page_catalog_group_coffee.xml +++ b/xml/menutab/page_catalog_group_coffee.xml @@ -1,490 +1,490 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - 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/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - InstanceSetString "ShowEng" - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - - InstanceSetString "ShowThai" - EndIf - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; 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 Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - - - - - - - - - - - - - - - - Var Menu2Selected = "PressForever" - - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - - - TimerReset - - - -; 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 - - - - - - InstanceGetString SaveStringInst - DEBUGVAR show_eng - DEBUGVAR SaveStringInst - - If SaveStringInst = "RefreshNow" Then - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - - If show_eng = "true" Then - If SaveStringInst = "ShowThai" Then - - InstanceSetString "ShowEng" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - Else - If SaveStringInst = "ShowEng" Then - - InstanceSetString "ShowThai" - GetXMLFileNameCurrentRunning CurrentOpenFile - Open CurrentOpenFile - EndIf - EndIf - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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" - - ; Handle penetrator - - If Only18 = "true" Then - - Open "ROOT/taobin_project/xml/page_identity18_verification.xml" - Else - - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - EndIf - - ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + 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/page2/bn_thai_lang_press_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" + + Var ice_tab_text = "Ice will be ready at " + Var text_unavailable = "UNAVAILABLE###size=16" + + InstanceSetString "ShowEng" + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" + EndIf + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; 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 Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + + + + + + + + + + + + + + + + Var Menu2Selected = "PressForever" + + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + + + TimerReset + + + +; 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 + + + + + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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" + + ; Handle penetrator + + If Only18 = "true" Then + + Open "ROOT/taobin_project/xml/page_identity18_verification.xml" + Else + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + EndIf + + ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + + + 10 497 @@ -1113,7 +1113,7 @@ KanitMediumTTF 0x322B26 showengText - "DOUBLE + "DOUBLE ESPRESSO" @@ -1366,7 +1366,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showengText - "DOUBLE + "DOUBLE ESPRESSO" @@ -2104,7 +2104,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต Guji Queen Berry" @@ -2115,7 +2115,7 @@ Guji Queen Berry" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -2127,7 +2127,7 @@ Guji Queen Berry" KanitMediumTTF 0x322B26 showengText - "ESPRESSO + "ESPRESSO ETHIOPAI GUJI" @@ -2138,7 +2138,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -2362,7 +2362,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต BLUE DADDY" @@ -2373,7 +2373,7 @@ BLUE DADDY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -2385,7 +2385,7 @@ BLUE DADDY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY ESPRESSO" @@ -2396,7 +2396,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -2620,7 +2620,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต CHOPIN" @@ -2631,7 +2631,7 @@ CHOPIN" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -2643,7 +2643,7 @@ CHOPIN" KanitMediumTTF 0x322B26 showengText - "CHOPIN + "CHOPIN ESPRESSO" @@ -2654,7 +2654,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -2878,7 +2878,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต MANDARINE" @@ -2900,7 +2900,7 @@ MANDARINE" KanitMediumTTF 0x322B26 showengText - "MANDARINE + "MANDARINE ESPRESSO" @@ -3134,7 +3134,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต OPUS ONE" @@ -3156,7 +3156,7 @@ OPUS ONE" KanitMediumTTF 0x322B26 showengText - "OPUS ONE + "OPUS ONE ESPRESSO" @@ -3390,7 +3390,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต MOZART " @@ -3401,7 +3401,7 @@ MOZART " KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -3413,7 +3413,7 @@ MOZART " KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART ESPRESSO" @@ -3424,7 +3424,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -3648,7 +3648,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต SNOWWHITE" @@ -3659,7 +3659,7 @@ SNOWWHITE" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -3671,7 +3671,7 @@ SNOWWHITE" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE ESPRESSO" @@ -3682,7 +3682,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -3906,7 +3906,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต WHISKY DUDE" @@ -3917,7 +3917,7 @@ WHISKY DUDE" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -3929,7 +3929,7 @@ WHISKY DUDE" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE ESPRESSO" @@ -3940,7 +3940,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -4164,7 +4164,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต PEACHER" @@ -4175,7 +4175,7 @@ PEACHER" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -4187,7 +4187,7 @@ PEACHER" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER ESPRESSO" @@ -4198,7 +4198,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -4422,7 +4422,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต PURE BEAUTY" @@ -4433,7 +4433,7 @@ PURE BEAUTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -4445,7 +4445,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY ESPRESSO" @@ -4679,7 +4679,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต GEISHA" @@ -4934,7 +4934,7 @@ GEISHA" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต ROSALYN" @@ -4945,7 +4945,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -4967,7 +4967,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -5688,7 +5688,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน Guji Queen Berry" @@ -5699,7 +5699,7 @@ Guji Queen Berry" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -5711,7 +5711,7 @@ Guji Queen Berry" KanitMediumTTF 0x322B26 showengText - "AMERICANO + "AMERICANO ETHIOPAI GUJI" @@ -5722,7 +5722,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -5946,7 +5946,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน BLUE DADDY" @@ -5957,7 +5957,7 @@ BLUE DADDY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -5969,7 +5969,7 @@ BLUE DADDY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY AMERICANO" @@ -5980,7 +5980,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -6204,7 +6204,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน CHOPIN" @@ -6215,7 +6215,7 @@ CHOPIN" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -6227,7 +6227,7 @@ CHOPIN" KanitMediumTTF 0x322B26 showengText - "CHOPIN + "CHOPIN AMERICANO" @@ -6238,7 +6238,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -6462,7 +6462,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน MANDARINE" @@ -6484,7 +6484,7 @@ MANDARINE" KanitMediumTTF 0x322B26 showengText - "MANDARINE + "MANDARINE AMERICANO" @@ -6718,7 +6718,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน OPUS ONE" @@ -6740,7 +6740,7 @@ OPUS ONE" KanitMediumTTF 0x322B26 showengText - "OPUS ONE + "OPUS ONE AMERICANO" @@ -6974,7 +6974,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน MOZART" @@ -6985,7 +6985,7 @@ MOZART" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -6997,7 +6997,7 @@ MOZART" KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART AMERICANO" @@ -7008,7 +7008,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -7232,7 +7232,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน WHISKY DUDE" @@ -7243,7 +7243,7 @@ WHISKY DUDE" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -7255,7 +7255,7 @@ WHISKY DUDE" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE AMERICANO" @@ -7266,7 +7266,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -7490,7 +7490,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน SNOWWHITE" @@ -7501,7 +7501,7 @@ SNOWWHITE" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -7513,7 +7513,7 @@ SNOWWHITE" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE AMERICANO" @@ -7524,7 +7524,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -7748,7 +7748,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน PEACHER" @@ -7759,7 +7759,7 @@ PEACHER" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -7771,7 +7771,7 @@ PEACHER" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER AMERICANO" @@ -7782,7 +7782,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -8006,7 +8006,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน PURE BEAUTY" @@ -8017,7 +8017,7 @@ PURE BEAUTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -8029,7 +8029,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY AMERICANO" @@ -8263,7 +8263,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน GEISHA" @@ -8285,7 +8285,7 @@ GEISHA" KanitMediumTTF 0x322B26 showengText - "GEISHA + "GEISHA AMERICANO" @@ -8519,7 +8519,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน ROSALYN" @@ -8530,7 +8530,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -8542,7 +8542,7 @@ ROSALYN" KanitMediumTTF 0x322B26 showengText - "ROSALYN + "ROSALYN AMERICANO" @@ -8553,7 +8553,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -8777,7 +8777,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showthaiText - "BLUE DADDY + "BLUE DADDY ALMOST DIRTY" @@ -8788,7 +8788,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -8800,7 +8800,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY ALMOST DIRTY" @@ -8811,7 +8811,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -9031,7 +9031,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "MOZART + "MOZART ALMOST DIRTY" @@ -9042,7 +9042,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -9054,7 +9054,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART ALMOST DIRTY" @@ -9065,7 +9065,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -9285,7 +9285,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "CHOPIN + "CHOPIN ALMOST DIRTY" @@ -9296,7 +9296,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -9308,7 +9308,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "CHOPIN + "CHOPIN ALMOST DIRTY" @@ -9319,7 +9319,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -9539,7 +9539,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "MANDARINE + "MANDARINE ALMOST DIRTY" @@ -9561,7 +9561,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "MANDARINE + "MANDARINE ALMOST DIRTY" @@ -9791,7 +9791,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "OPUS ONE + "OPUS ONE ALMOST DIRTY" @@ -9813,7 +9813,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "OPUS ONE + "OPUS ONE ALMOST DIRTY" @@ -10043,7 +10043,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "WHISKY DUDE + "WHISKY DUDE ALMOST DIRTY" @@ -10054,7 +10054,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -10066,7 +10066,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE ALMOST DIRTY" @@ -10077,7 +10077,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -10297,7 +10297,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "SNOWWHITE + "SNOWWHITE ALMOST DIRTY" @@ -10308,7 +10308,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -10320,7 +10320,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE ALMOST DIRTY" @@ -10331,7 +10331,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -10551,7 +10551,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "QUEEN BERRY + "QUEEN BERRY ALMOST DIRTY" @@ -10562,7 +10562,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -10574,7 +10574,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "QUEEN BERRY + "QUEEN BERRY ALMOST DIRTY" @@ -10585,7 +10585,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -10805,7 +10805,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "PEACHER + "PEACHER ALMOST DIRTY" @@ -10816,7 +10816,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -10828,7 +10828,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER ALMOST DIRTY" @@ -10839,7 +10839,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -11059,7 +11059,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "PURE BEAUTY + "PURE BEAUTY ALMOST DIRTY" @@ -11070,7 +11070,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -11082,7 +11082,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY ALMOST DIRTY" @@ -11312,7 +11312,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "GEISHA + "GEISHA ALMOST DIRTY" @@ -11334,7 +11334,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "GEISHA + "GEISHA ALMOST DIRTY" @@ -11564,7 +11564,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "ROSALYN + "ROSALYN ALMOST DIRTY" @@ -11575,7 +11575,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -11587,7 +11587,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "ROSALYN + "ROSALYN ALMOST DIRTY" @@ -11598,7 +11598,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -11839,7 +11839,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showengText - "THAI + "THAI ICED ESPRESSO" @@ -12088,7 +12088,7 @@ ICED ESPRESSO" KanitMediumTTF 0x322B26 showengText - "THAI + "THAI ICED ESPRESSO" @@ -13842,7 +13842,7 @@ ICED ESPRESSO" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม และ นม + "กาแฟ นม และ นม น้ำเชื่อมคาราเมล" @@ -13864,7 +13864,7 @@ ICED ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Caramel Syrup" @@ -14096,7 +14096,7 @@ Caramel Syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม และ นม + "กาแฟ นม และ นม น้ำเชื่อมคาราเมล" @@ -14118,7 +14118,7 @@ Caramel Syrup" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Caramel Syrup" @@ -14351,7 +14351,7 @@ Caramel Syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -14363,7 +14363,7 @@ Caramel Syrup" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -14605,7 +14605,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -14617,7 +14617,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -14860,7 +14860,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -14872,7 +14872,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -15114,7 +15114,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -15126,7 +15126,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -15369,7 +15369,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ น้ำเชื่อมน้ำตาลแดง + "กาแฟ น้ำเชื่อมน้ำตาลแดง และ นม" @@ -15381,7 +15381,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "BROWN + "BROWN SUGAR LATTE" @@ -15392,7 +15392,7 @@ SUGAR LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Kokuto syrup" @@ -15624,7 +15624,7 @@ Kokuto syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ น้ำเชื่อมน้ำตาลแดง + "กาแฟ น้ำเชื่อมน้ำตาลแดง และ นม" @@ -15636,7 +15636,7 @@ Kokuto syrup" KanitMediumTTF 0x322B26 showengText - "BROWN + "BROWN SUGAR LATTE" @@ -15647,7 +15647,7 @@ SUGAR LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Kokuto syrup" @@ -15880,7 +15880,7 @@ Kokuto syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ เมล่อน น้ำตาล + "กาแฟ เมล่อน น้ำตาล และ นม" @@ -15892,7 +15892,7 @@ Kokuto syrup" KanitMediumTTF 0x322B26 showengText - "MELON + "MELON CAFÉ LATTE" @@ -16134,7 +16134,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ เมล่อน น้ำตาล + "กาแฟ เมล่อน น้ำตาล และ นม" @@ -16146,7 +16146,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MELON + "MELON CAFÉ LATTE" @@ -16389,7 +16389,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -16401,7 +16401,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -16412,7 +16412,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -16644,7 +16644,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -16656,7 +16656,7 @@ Milk, Sugar" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -16667,7 +16667,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -16911,7 +16911,7 @@ Milk, Sugar" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -17164,7 +17164,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -17418,7 +17418,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -17671,7 +17671,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -17914,7 +17914,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -17926,7 +17926,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -17937,7 +17937,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -18169,7 +18169,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -18181,7 +18181,7 @@ Milk, Sugar" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -18192,7 +18192,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -18446,7 +18446,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Lychee, + "Espresso, Lychee, Sugar, Water" @@ -18699,7 +18699,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Lychee, + "Espresso, Lychee, Sugar, Water" @@ -18953,7 +18953,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Yuzu, + "Espresso, Yuzu, Sugar, Water" @@ -19206,7 +19206,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Yuzu, + "Espresso, Yuzu, Sugar, Water" @@ -19450,7 +19450,7 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "TOKYO BANANA + "TOKYO BANANA LATTE" @@ -19461,7 +19461,7 @@ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Tokyo Banana Syrup, + "Espresso, Tokyo Banana Syrup, Sugar, Water" @@ -19704,7 +19704,7 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "TOKYO BANANA + "TOKYO BANANA LATTE" @@ -19715,7 +19715,7 @@ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Tokyo Banana Syrup, + "Espresso, Tokyo Banana Syrup, Sugar, Water" @@ -19969,7 +19969,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Mint Syrup, + "Espresso, Mint Syrup, Sugar, Milk" @@ -20222,7 +20222,7 @@ Sugar, Milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Mint Syrup, + "Espresso, Mint Syrup, Sugar, Milk" @@ -20476,7 +20476,7 @@ Sugar, Milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Mint Syrup, + "Espresso, Mint Syrup, Sugar, Water" @@ -20729,7 +20729,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Mint Syrup, + "Espresso, Mint Syrup, Sugar, Water" @@ -20983,7 +20983,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Peach Syrup , + "Espresso, Peach Syrup , Sugar, Water" @@ -21236,7 +21236,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Peach Syrup , + "Espresso, Peach Syrup , Sugar, Water" @@ -21490,7 +21490,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Peach Syrup, + "Espresso, Peach Syrup, Sugar, Milk" @@ -21743,7 +21743,7 @@ Sugar, Milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Peach Syrup, + "Espresso, Peach Syrup, Sugar, Milk" @@ -21890,9 +21890,9 @@ Sugar, Milk" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - + + + + + + diff --git a/xml/menutab/start_up_inst_11.xml b/xml/menutab/start_up_inst_11.xml new file mode 100644 index 00000000..4248899a --- /dev/null +++ b/xml/menutab/start_up_inst_11.xml @@ -0,0 +1,23 @@ + + 1080 + 1920 + + + + + 10000 + + + If InstanceTabOpenFile11 = "" Then + + Else + Open InstanceTabOpenFile11 + EndIf + + TimerReset + + + + + + diff --git a/xml/menutab/start_up_inst_12.xml b/xml/menutab/start_up_inst_12.xml new file mode 100644 index 00000000..09c8ae34 --- /dev/null +++ b/xml/menutab/start_up_inst_12.xml @@ -0,0 +1,23 @@ + + 1080 + 1920 + + + + + 10000 + + + If InstanceTabOpenFile12 = "" Then + + Else + Open InstanceTabOpenFile12 + EndIf + + TimerReset + + + + + + diff --git a/xml/menutab/start_up_inst_13.xml b/xml/menutab/start_up_inst_13.xml new file mode 100644 index 00000000..6152ae1c --- /dev/null +++ b/xml/menutab/start_up_inst_13.xml @@ -0,0 +1,23 @@ + + 1080 + 1920 + + + + + 10000 + + + If InstanceTabOpenFile13 = "" Then + + Else + Open InstanceTabOpenFile13 + EndIf + + TimerReset + + + + + + diff --git a/xml/page_board.xml b/xml/page_board.xml index 154b3729..6acad989 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -13,7 +13,7 @@ Var img_press_main_page = "ROOT/taobin_project/image/main_page/bp_main_page_start.png" - Var CNTDOWN_PROTECT_SCREEN_BLANK = 400 + Var CNTDOWN_PROTECT_SCREEN_BLANK = 180 DEBUGVAR SoundVolume Var credit_card_enable = "" @@ -1042,6 +1042,8 @@ EndIf If CNTDOWN_PROTECT_SCREEN_BLANK = 0 Then + + SAVELOG "CNTDOWN_PROTECT_SCREEN_BLANK" Open "ROOT/taobib_project/xml/page_board.xml" EndIf diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml index 8b946b3c..bbf6378b 100644 --- a/xml/page_catalog.lxml +++ b/xml/page_catalog.lxml @@ -182,82 +182,10 @@ DEBUGVAR MenuKidButtonState - ; test step 1 - - Var ArrayTestInt[0] = 1 - DEBUGVAR ArrayTestInt[0] - - Var ArrayTestInt[0] = ArrayTestInt[0] + 2 - DEBUGVAR ArrayTestInt[0] - Var EngLangTest[0] = "hurr1" - Var EngLangTest[1] = "hurr2" - DEBUGVAR EngLangTest[0] - DEBUGVAR EngLangTest[1] - Var god_of_hurr = 0 - Var EngLangTest[god_of_hurr] = "test1" - Var god_of_hurr = god_of_hurr + 1 - DEBUGVAR god_of_hurr - Var EngLangTest[god_of_hurr] = "test2" - Var god_of_hurr = god_of_hurr + 1 - DEBUGVAR god_of_hurr - Var EngLangTest[god_of_hurr] = "test3" - - Var EngLangTest[10] = "test-10" - - DEBUGVAR EngLangTest[0] - DEBUGVAR EngLangTest[1] - DEBUGVAR EngLangTest[2] - DEBUGVAR EngLangTest[10] - Var EngLangTest[10] = "test-10-10" - DEBUGVAR EngLangTest[10] - - - ; test step 2 - Var Array2Test2Int[0][0] = "0A" - Var Array2Test2Int[0][1] = "0B" - Var Array2Test2Int[0][2] = "0C" - Var Array2Test2Int[0][3] = "0D" - DEBUGVAR Array2Test2Int[0][0] - DEBUGVAR Array2Test2Int[0][1] - DEBUGVAR Array2Test2Int[0][2] - DEBUGVAR Array2Test2Int[0][3] - Var Array2Test2Int[0][0] = "===> 0A" - Var Array2Test2Int[0][1] = "===> 0B" - Var Array2Test2Int[0][2] = "===> 0C" - Var Array2Test2Int[0][3] = "===> 0D" - - - DEBUGVAR Array2Test2Int[0][0] - DEBUGVAR Array2Test2Int[0][1] - DEBUGVAR Array2Test2Int[0][2] - DEBUGVAR Array2Test2Int[0][3] - - Var Array2Test2Int[1][0] = "1A" - Var Array2Test2Int[1][1] = "1B" - Var Array2Test2Int[1][2] = "1C" - Var Array2Test2Int[1][3] = "1D" - DEBUGVAR Array2Test2Int[1][0] - DEBUGVAR Array2Test2Int[1][1] - DEBUGVAR Array2Test2Int[1][2] - DEBUGVAR Array2Test2Int[1][3] - DEBUGVAR Array2Test2Int[0][0] - DEBUGVAR Array2Test2Int[0][1] - DEBUGVAR Array2Test2Int[0][2] - DEBUGVAR Array2Test2Int[0][3] - - - Var Array2TestInt[0][0] = 1 - Var Array2TestInt[1][0] = 2 - Var Array2TestInt[2][0] = 3 - Var Array2TestInt[3][0] = 4 - DEBUGVAR Array2TestInt[0][0] - DEBUGVAR Array2TestInt[1][0] - DEBUGVAR Array2TestInt[2][0] - DEBUGVAR Array2TestInt[3][0] - + DEBUGVAR $51-03-01-0035.Price Var PromotionIDCurrentOrder = 0 RootLayoutVisible 3 "show" diff --git a/xml/topview2.xml b/xml/topview2.xml index 1131a76f..591e68c1 100644 --- a/xml/topview2.xml +++ b/xml/topview2.xml @@ -30,6 +30,11 @@ Var ButtonLanguageListXPositionIcon = ButtonLanguageListXPosition + 27 Var ButtonLanguageListYPositionIcon = ButtonLanguageListYPosition + 14 + + DEBUGVAR ENABLE_LANGUAGE_COUNT + If ENABLE_LANGUAGE_COUNT = "" Then + LanguageControl "UpdateList" 1 + EndIf If ENABLE_LANGUAGE_COUNT = 1 Then Var LanguageButtonEnable = "Invisible" @@ -59,7 +64,8 @@ If EnableMultiInstance = "true" Then If Not#CountDownForMulti = 99 Then - DEBUGVAR Not#CountDownForMulti + + ;DEBUGVAR Not#CountDownForMulti Else If Not#CountDownForMulti = 1 Then diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 2b22e1b4..d4ac9a8a 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "7.96" - Var XMLPageVersionInt = 796 + Var XMLPageVersion = "7.97" + Var XMLPageVersionInt = 797 ;Oreo Var OreoGuarantee = 0