diff --git a/inter/gbr/animation01/play_list.tsv b/inter/gbr/animation01/play_list.tsv index 6eb828ce..da34f7f0 100644 --- a/inter/gbr/animation01/play_list.tsv +++ b/inter/gbr/animation01/play_list.tsv @@ -200,6 +200,7 @@ Hot matcha latte 55-02-01-0004 1 6 7 8 9 24 149 2:29 36 Hot black tea 55-02-01-0005 Hot Kokuto Tea 55-02-01-0006 1 6 7 10 27 24 133 2:13 32 Hot Limeade tea 55-02-01-0007 1 10 12 24 112 1:52 54 +Hot Limeade tea 55-02-01-0040 1 10 12 24 112 1:52 54 Hot Lychee tea 55-02-01-0008 1 10 11 24 112 1:52 54 Hot strawberry tea 55-02-01-0009 1 10 19 24 90 1:30 43 Hot blueberry tea 55-02-01-0010 1 10 20 24 87 1:27 42 @@ -211,7 +212,7 @@ HOT LYCHEE TEA 55-02-01-0019 1 11 16 24 100 19:40 32 HOT GINGER TEA 55-02-01-0020 1 10 24 88 1:28 42 HOT LIME \nGINGER TEA 55-02-01-0021 1 10 12 24 88 1:28 42 Hot strawberry tea 55-02-01-0022 1 10 19 24 90 1:30 43 -Hot thai milk tea 55-02-01-0024 1 6 70 10 24 78 1:18 25 +Hot thai milk tea 55-02-01-0039 1 6 70 10 24 78 1:18 25 Hot Taiwanese Tea 55-02-01-0025 1 6 7 10 24 90 1:30 29 Hot matcha latte 55-02-01-0026 1 6 9 7 8 24 149 2:29 36 HOT MATCHA 55-02-01-0027 1 9 16 8 24 100 14:40 32 @@ -245,6 +246,7 @@ Iced black tea รอเทสชาดำใหม่ 55-02-02-0005 ICED BLACK TEA 55-02-02-0005 1 23 24 100 9:40 32 Iced Kokuto Tea 55-02-02-0006 1 6 7 10 27 23 24 131 2:11 25 Iced Lime tea 55-02-02-0007 1 10 12 23 24 130 2:10 42 +Iced Lime tea 55-02-02-0040 1 10 12 23 24 130 2:10 42 Iced Lychee tea (สูตรแก้วร้อน ลดน้ำจาก 60+50 เป็น 50+40 55-02-02-0008 1 10 11 23 24 129 2:09 42 Iced strawberrry tea 55-02-02-0009 1 10 19 23 24 85 1:25 27 Iced blueberry tea 55-02-02-0010 1 10 20 23 24 85 1:25 27 @@ -259,7 +261,7 @@ ICED GINGER TEA 55-02-02-0020 1 10 23 24 88 2:28 42 Iced strawberrry tea 55-02-02-0022 1 10 19 23 24 85 1:25 27 สตอเบอร์รี่มัชฉะลาเต้เย็ 55-02-02-0023 1 16 8 9 19 23 24 125 3:05 40 Iced Thai milk Tea 55-02-02-0024 1 6 7 10 23 24 165 2:45 40 -Iced Thai milk Tea 55-02-02-0024 1 6 70 10 23 24 165 2:45 40 +Iced Thai milk Tea 55-02-02-0039 1 6 70 10 23 24 165 2:45 40 Iced Taiwanese Tea 55-02-02-0025 1 6 7 10 23 24 104 1:44 25 Iced matcha latte 55-02-02-0026 1 6 7 9 8 23 24 175 2:55 34 ICED MATCHA 55-02-02-0027 1 9 16 8 23 24 100 15:40 32 diff --git a/inter/gbr/xml/page_catalog_group_tea.lxml b/inter/gbr/xml/page_catalog_group_tea.lxml index b7075509..6abc6ec8 100644 --- a/inter/gbr/xml/page_catalog_group_tea.lxml +++ b/inter/gbr/xml/page_catalog_group_tea.lxml @@ -1136,280 +1136,6 @@ center-vertical-horizontal - - ; ==================> Len = 3 - ; 55-02-01-0007 55-02-02-0007 - - - 33 - 22 - 225 - 296 - Flag( 55-02-01-0007.Button,55-02-02-0007.Button,$Sum55020100075502020007) - - - 16 - 164 - 22 - 222 - "multi2" - KanitMediumTTF - 0x322B26 - - THAI LIME TEA - ชามะนาว - THAI LIME TEA - ชามะนาว - - ชามะนาว - - - - 16 - 220 - 14 - 222 - KanitMediumTTF - 0x6F5F51 - - Thai Tea, Limenade, Sugar & Water - ชาไทย มะนาว - Thai Tea, Limenade, Sugar & Water - ชาไทย มะนาว - - ชาไทย มะนาว - - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $55-02-01-0007.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - TextPriceMenuHotX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $55-02-01-0007.Button - StringFmt( $55-02-01-0007.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $55-02-02-0007.Button - - - 113 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $55-02-02-0007.Button - StringFmt( $55-02-02-0007.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 $Sum55020100075502020007 = "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 $Sum55020100075502020007 = "Disable" Then - STRCONTAIN "ERR" $55-02-01-0007.TAG tag1_is_disable - STRCONTAIN "ERR" $55-02-02-0007.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" - $Sum55020100075502020007 - - 000013 - - center-vertical-horizontal - ; ==================> Len = 3 ; 55-02-01-0021 - - @@ -3602,280 +3328,6 @@ center-vertical-horizontal - - ; ==================> Len = 3 - ; 55-02-01-0007 55-02-02-0007 - - - 33 - 22 - 225 - 296 - Flag( 55-02-01-0007.Button,55-02-02-0007.Button,$Sum55020100075502020007) - - - 16 - 164 - 22 - 222 - "multi2" - KanitMediumTTF - 0x322B26 - - THAI LIME TEA - ชามะนาว - THAI LIME TEA - ชามะนาว - - ชามะนาว - - - - 16 - 220 - 14 - 222 - KanitMediumTTF - 0x6F5F51 - - Thai Tea, Limenade, Sugar & Water - ชาไทย มะนาว - Thai Tea, Limenade, Sugar & Water - ชาไทย มะนาว - - ชาไทย มะนาว - - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $55-02-01-0007.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - TextPriceMenuHotX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $55-02-01-0007.Button - StringFmt( $55-02-01-0007.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $55-02-02-0007.Button - - - 113 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $55-02-02-0007.Button - StringFmt( $55-02-02-0007.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 $Sum55020100075502020007 = "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 $Sum55020100075502020007 = "Disable" Then - STRCONTAIN "ERR" $55-02-01-0007.TAG tag1_is_disable - STRCONTAIN "ERR" $55-02-02-0007.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" - $Sum55020100075502020007 - - 000013 - - center-vertical-horizontal - ; ==================> Len = 3 ; 55-02-01-0021 - - @@ -4424,280 +3876,6 @@ center-vertical-horizontal - - ; ==================> Len = 3 - ; 55-02-01-0024 55-02-02-0024 - - - 33 - 22 - 225 - 296 - Flag( 55-02-01-0024.Button,55-02-02-0024.Button,$Sum55020100245502020024) - - - 16 - 164 - 22 - 222 - "multi2" - KanitMediumTTF - 0x322B26 - - THAI MILK TEA - ชานมไทย - THAI MILK TEA - ชานมไทย - - ชานมไทย - - - - 16 - 220 - 14 - 222 - KanitMediumTTF - 0x6F5F51 - - Thai tea, Sugar, Warm milk - ชาไทย และ นมอุ่น - Thai tea, Sugar, Warm milk - ชาไทย และ นมอุ่น - - ชาไทย และ นมอุ่น - - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $55-02-01-0024.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - TextPriceMenuHotX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $55-02-01-0024.Button - StringFmt( $55-02-01-0024.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $55-02-02-0024.Button - - - 113 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $55-02-02-0024.Button - StringFmt( $55-02-02-0024.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 $Sum55020100245502020024 = "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 $Sum55020100245502020024 = "Disable" Then - STRCONTAIN "ERR" $55-02-01-0024.TAG tag1_is_disable - STRCONTAIN "ERR" $55-02-02-0024.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" - $Sum55020100245502020024 - - 000013 - - center-vertical-horizontal - ; ==================> Len = 3 ; 55-02-01-0011 55-02-02-0011 -