diff --git a/animation01/sync_1.file b/animation01/sync_1.file index 1968e82d..bfb3fdb5 100644 --- a/animation01/sync_1.file +++ b/animation01/sync_1.file @@ -1,4 +1,4 @@ -total 213136 +total 215140 -rw-rw---- 1 root sdcard_rw 948282 2020-11-15 19:54 TaoBin2_draft02_art1.mp4 -rw-rw---- 1 root sdcard_rw 3603060 2020-11-15 20:03 TaoBin2_draft02_art10.mp4 -rw-rw---- 1 root sdcard_rw 3166935 2020-11-15 20:03 TaoBin2_draft02_art11.mp4 @@ -46,11 +46,11 @@ total 213136 -rw-rw---- 1 root sdcard_rw 1647365 2022-06-29 16:47 TaoBin2_draft02_art53.mp4 -rw-rw---- 1 root sdcard_rw 3603060 2020-11-15 20:03 TaoBin2_draft02_art55.mp4 -rw-rw---- 1 root sdcard_rw 1820997 2023-01-20 14:28 TaoBin2_draft02_art56.mp4 --rw-rw---- 1 root sdcard_rw 9643046 2021-09-24 18:44 TaoBin2_draft02_art57.mp4 +-rw-rw---- 1 root sdcard_rw 11695636 2023-01-23 15:58 TaoBin2_draft02_art57.mp4 -rw-rw---- 1 root sdcard_rw 3843048 2020-11-15 20:18 TaoBin2_draft02_art6.mp4 -rw-rw---- 1 root sdcard_rw 3740266 2020-11-15 19:57 TaoBin2_draft02_art7.mp4 -rw-rw---- 1 root sdcard_rw 3998856 2020-11-15 20:01 TaoBin2_draft02_art8.mp4 -rw-rw---- 1 root sdcard_rw 3616423 2020-11-15 20:01 TaoBin2_draft02_art9.mp4 -rw-rw---- 1 root sdcard_rw 34133 2023-01-23 14:18 play_list.tsv -rw-rw---- 1 root sdcard_rw 33618 2023-01-04 13:56 play_list2.tsv --rw-rw---- 1 root sdcard_rw 0 2023-01-23 15:43 sync_1.file +-rw-rw---- 1 root sdcard_rw 0 2023-01-23 16:07 sync_1.file diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index 90bd0bde..219b4c26 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -5587,7 +5587,7 @@ Note: Blue Berry & Floral" ; - - - - ; ==================> Len = 16 + ; ==================> Len = 14 ; 12-01-01-0044 12-01-02-0044 - 33 @@ -17219,7 +17219,7 @@ Sugar, Water" Var NameDrink = "TOKYO BANANA LATTE" Var NameDrinkTH = "ลาเต้โตเกียวบานานา" - Var DrinkDescriptionTH = "" + Var DrinkDescriptionTH = "กาแฟ น้ำ และ กล้วย" Var DrinkDescription = "Espresso, Tokyo Banana Syrup, Sugar, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Banana_cafe_latte" Var OpenFromXML = CurrentXMLFileName2 @@ -17299,7 +17299,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showthaiText - "" + "กาแฟ น้ำ และ กล้วย" 16 @@ -17471,7 +17471,7 @@ Sugar, Water" Var NameDrink = "TOKYO BANANA LATTE" Var NameDrinkTH = "ลาเต้โตเกียวบานานา" - Var DrinkDescriptionTH = "" + Var DrinkDescriptionTH = "กาแฟ น้ำ และ กล้วย" Var DrinkDescription = "Espresso, Tokyo Banana Syrup, Sugar, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Banana_cafe_latte" Var OpenFromXML = CurrentXMLFileName2 @@ -17551,7 +17551,7 @@ Sugar, Water" KanitMediumTTF 0x6F5F51 showthaiText - "" + "กาแฟ น้ำ และ กล้วย" 16 diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index 4766d2dc..04c88e43 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -4394,7 +4394,8 @@ Sugar Oreo" KanitMediumTTF 0x322B26 showengText - "TOKYO BANANA MILK" + "TOKYO +BANANA MILK" 16 @@ -4554,7 +4555,7 @@ Sugar Oreo" SoundVolume Var NameDrink = "CHOCO TOKYO BANANA MILK" - Var NameDrinkTH = "นมช็อกโกโตเกียวบานาน่า" + Var NameDrinkTH = "นมช็อกโกโตเกียว บานาน่า" Var DrinkDescriptionTH = "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล" Var DrinkDescription = "Tokyo Banana Syrup, Milk, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ChocoBanana_milk.png" @@ -4625,7 +4626,8 @@ Sugar Oreo" KanitMediumTTF 0x322B26 showthaiText - "นมช็อกโกโตเกียวบานาน่า" + "นมช็อกโกโตเกียว +บานาน่า" 16 @@ -4646,7 +4648,8 @@ Sugar Oreo" KanitMediumTTF 0x322B26 showengText - "CHOCO TOKYO BANANA MILK" + "CHOCO TOKYO +BANANA MILK" 16 diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index 87127beb..eaa546c2 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -558,7 +558,7 @@ testservice -; menu_new_list 38 +; menu_new_list 40 ; ==================> Len = 16 ; 12-06-01-0001 - - @@ -4615,6 +4615,262 @@ Pink​ Rose & Berry" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0043 - - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0043.Button,Disable=Invisible,$Sum1201010043) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เอสเพรสโซ่ช็อต +CHOPIN" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "Raisin Honey process +หอมสตรอว์เบอร์รี กุหลาบ มะลิ" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "CHOPIN +ESPRESSO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Raisin Honey process +Note: Strawberry & Floral" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0043.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0043.Button + StringFmt( $12-01-01-0043.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum1201010043 = "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 $Sum1201010043 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0043.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1201010043 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 @@ -6916,6 +7172,262 @@ Pink​ Rose & Berry" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 14 + ; 12-01-01-0044 12-01-02-0044 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0044.Button,12-01-02-0044.Button,Disable=Invisible,$Sum12010100441201020044) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโน +CHOPIN" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "Raisin Honey process +หอมสตรอว์เบอร์รี กุหลาบ มะลิ" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "CHOPIN +AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Raisin Honey process +Note: Strawberry & Floral" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0044.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0044.Button + StringFmt( $12-01-01-0044.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-02-0044.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0044.Button + StringFmt( $12-01-02-0044.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12010100441201020044 = "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 $Sum12010100441201020044 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0044.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-02-0044.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12010100441201020044 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16