diff --git a/inter/sgp/animation01/play_list.tsv b/inter/sgp/animation01/play_list.tsv
index 9ddfcf7c..f00b9068 100644
--- a/inter/sgp/animation01/play_list.tsv
+++ b/inter/sgp/animation01/play_list.tsv
@@ -199,9 +199,9 @@ ROSALYN ALMOST DIRTY 52-01-02-0037 1 7 50 2 3 4 5 24 66 6:06 32
-นมยูซุร้อน 52-03-01-0023 1 53 6 16 24 120 3:00 23
-นมยูซุเย็น 52-03-02-0023 1 53 6 23 24 120 4:00 23
-นมยูซุปั่น 52-03-03-0023 1 53 6 23 41 24 120 5:00 23
+นมโตเกียวบานาน่า 52-03-01-0023 1 56 6 16 24 120 3:00 23
+นมโตเกียวบานาน่า 52-03-02-0023 1 56 6 23 24 120 4:00 23
+นมโตเกียวบานาน่า 52-03-03-0023 1 56 6 23 41 24 120 5:00 23
ยูซุโซดา 52-05-02-0045 1 53 23 23 13 24 120 6:00 23
อเมริกาโซดา 52-01-02-0041 1 2 3 4 5 23 16 13 24 120 3:00 23
diff --git a/inter/sgp/xml/page_topping_select6.lxml b/inter/sgp/xml/page_topping_select6.lxml
index bfd1ca1d..5711fee1 100644
--- a/inter/sgp/xml/page_topping_select6.lxml
+++ b/inter/sgp/xml/page_topping_select6.lxml
@@ -808,8 +808,31 @@
Var SugarPressPicLv4 = "ROOT/taobin_project/image/topping2_en/bp_cold_sugar4lv_sg4.png"
+ If toppingID1index1 = toppingID1Default Then
Var SugarState1 = "PressForever"
+ Var sugar_default_flag = 1
+ Var SugarZeroCalOption = "Invisible"
+ EndIf
+ If toppingID1index2 = toppingID1Default Then
+ Var SugarState2 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index3 = toppingID1Default Then
+ Var SugarState3 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index4 = toppingID1Default Then
+ Var SugarState4 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If sugar_default_flag = 0 Then
+ Var SugarState1 = "PressForever"
+ Var SugarZeroCalOption = "Invisible"
+ EndIf
EndIf
; Suger 4 step hot
@@ -835,7 +858,32 @@
Var SugarPressPicLv4 = "ROOT/taobin_project/image/topping2_en/bp_hot_sugar4lv_sg4.png"
+
+ If toppingID1index1 = toppingID1Default Then
Var SugarState1 = "PressForever"
+ Var sugar_default_flag = 1
+ Var SugarZeroCalOption = "Invisible"
+ EndIf
+
+ If toppingID1index2 = toppingID1Default Then
+ Var SugarState2 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index3 = toppingID1Default Then
+ Var SugarState3 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index4 = toppingID1Default Then
+ Var SugarState4 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If sugar_default_flag = 0 Then
+ Var SugarState1 = "PressForever"
+ Var SugarZeroCalOption = "Invisible"
+ EndIf
EndIf
DEBUGVAR RecipeTag2
@@ -857,10 +905,36 @@
Var SugarState5 = "Enable"
- ; Singapore default sugar low level only.
+ If toppingID1index1 = toppingID1Default Then
Var SugarState1 = "PressForever"
+ Var sugar_default_flag = 1
+ Var SugarZeroCalOption = "Invisible"
+ EndIf
+ If toppingID1index2 = toppingID1Default Then
+ Var SugarState2 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index3 = toppingID1Default Then
+ Var SugarState3 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+ If toppingID1index4 = toppingID1Default Then
+ Var SugarState4 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index5 = toppingID1Default Then
+ Var SugarState5 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If sugar_default_flag = 0 Then
+ Var SugarState1 = "PressForever"
+ Var SugarZeroCalOption = "Invisible"
+ EndIf
EndIf
@@ -899,8 +973,39 @@
DEBUGVAR "set default Powder Sugar"
- ; Singapore default sugar low level only.
+ If toppingID1index1 = toppingID1Default Then
Var SugarState1 = "PressForever"
+ Var sugar_default_flag = 1
+ Var SugarZeroCalOption = "Invisible"
+ EndIf
+
+ If toppingID1index2 = toppingID1Default Then
+ Var SugarState2 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index3 = toppingID1Default Then
+ Var SugarState3 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index4 = toppingID1Default Then
+ Var SugarState4 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index5 = toppingID1Default Then
+ Var SugarState5 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If sugar_default_flag = 0 Then
+ Var SugarState1 = "PressForever"
+ Var SugarZeroCalOption = "Invisible"
+ EndIf
+
+ DEBUGVAR toppingID1Default
+ DEBUGVAR SugarState1
DEBUGVAR toppingID1Default
@@ -942,8 +1047,30 @@
Var SugarPressPicLv6 = "ROOT/taobin_project/image/topping2_en/bp_sugar5level_sg6.png"
- ; Singapore default sugar low level only.
- Var SugarState2 = "PressForever"
+ If toppingID1index1 = toppingID1Default Then
+ Var SugarState2 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index2 = toppingID1Default Then
+ Var SugarState3 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index3 = toppingID1Default Then
+ Var SugarState4 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index4 = toppingID1Default Then
+ Var SugarState5 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If sugar_default_flag = 0 Then
+ Var SugarState2 = "PressForever"
+ EndIf
+
EndIf
@@ -996,8 +1123,24 @@
Var SugarState5 = "Enable"
Var SugarState6 = "Enable"
- ; Singapore default sugar low level only.
- Var SugarState4 = "PressForever"
+ If toppingID1index1 = toppingID1Default Then
+ Var SugarState3 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index2 = toppingID1Default Then
+ Var SugarState4 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index3 = toppingID1Default Then
+ Var SugarState5 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If sugar_default_flag = 0 Then
+ Var SugarState3 = "PressForever"
+ EndIf
EndIf
@@ -1018,9 +1161,29 @@
Var SugarState5 = "Enable"
-
- ; Singapore default sugar low level only.
+ If toppingID1index1 = toppingID1Default Then
Var SugarState2 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index2 = toppingID1Default Then
+ Var SugarState3 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index3 = toppingID1Default Then
+ Var SugarState4 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If toppingID1index4 = toppingID1Default Then
+ Var SugarState5 = "PressForever"
+ Var sugar_default_flag = 1
+ EndIf
+
+ If sugar_default_flag = 0 Then
+ Var SugarState2 = "PressForever"
+ EndIf
EndIf
diff --git a/video/script1.ev b/video/script1.ev
index 6605f015..d872e1f8 100644
--- a/video/script1.ev
+++ b/video/script1.ev
@@ -26,3 +26,10 @@ EndIf
DEBUGVAR VideoMainPage
+If taobin_notopup = "true" Then
+ GetFileSizeK "taobin_project/video/_main_page_notopup.mp4" MainfileSize
+ DEBUGVAR MainfileSize
+ If MainfileSize > 0 Then
+ Var VideoMainPage = "ROOT/taobin_project/video/_main_page_notopup.mp4"
+ EndIf
+EndIf
diff --git a/xml/event/promotion_energy_drink_1_bath.xml b/xml/event/promotion_energy_drink_1_bath.xml
index 0e2c75f0..ad9b4b98 100644
--- a/xml/event/promotion_energy_drink_1_bath.xml
+++ b/xml/event/promotion_energy_drink_1_bath.xml
@@ -1833,508 +1833,6 @@ Water"
text_unavailable
center-vertical-horizontal
-
- ; - - -
- ; ==================> Len = 12
- ; - - 12-99-03-0066
-
- 33
- 22
- 225
- 296
- Flag( 12-99-03-0066.Button,Disable=Invisible,$Sum1299030066)
-
-
- 16
- 164
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- "เป๊ปซี่นมโอริโอ้ภูเขาไฟ"
-
-
- 16
- 220
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- "เป๊ปซี่ นม และโอริโอ้"
-
-
- 16
- 164
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- "Pepsi Oreo"
-
-
- 16
- 220
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- "Pepsi, Milk, Oreo and Ice"
-
-
- 16
- 264
- Var( DirImage2 + "option_deactive.png" )
-
-
- 16
- 264
- "Invisible"
- Var( DirImage2 + "hot.png" )
- Var( DirImage2 + "hot_db.png" )
-
-
- 50
- TextPriceMenuY
- TextPriceMenuSize
- 220
- KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
- "Invisible"
- StringFmt( $-.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" )
- $12-99-03-0066.Button
-
-
- 180
- TextPriceMenuY
- TextPriceMenuSize
- 220
- KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
- $12-99-03-0066.Button
- StringFmt( $12-99-03-0066.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 $Sum1299030066 = "Disable" Then
- STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
- STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
- STRCONTAIN "ERR" $12-99-03-0066.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"
- $Sum1299030066
- text_unavailable
- center-vertical-horizontal
-
-
- ; - - -
- ; ==================> Len = 12
- ; - 12-99-02-0003 -
-
- 33
- 22
- 225
- 296
- Flag( 12-99-02-0003.Button,Disable=Invisible,$Sum1299020003)
-
-
- 16
- 164
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- "เป๊ปซี่นม"
-
-
- 16
- 220
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- "เป๊ปซี่ นม"
-
-
- 16
- 164
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- "Pepsi milk"
-
-
- 16
- 220
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- "Pepsi, Milk"
-
-
- 16
- 264
- Var( DirImage2 + "option_deactive.png" )
-
-
- 16
- 264
- "Invisible"
- Var( DirImage2 + "hot.png" )
- Var( DirImage2 + "hot_db.png" )
-
-
- 50
- TextPriceMenuY
- TextPriceMenuSize
- 220
- KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
- "Invisible"
- StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
-
-
- 81
- 264
- Var( DirImage2 + "cold.png" )
- Var( DirImage2 + "cold_db.png" )
- $12-99-02-0003.Button
-
-
- 115
- TextPriceMenuY
- TextPriceMenuSize
- 220
- KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
- $12-99-02-0003.Button
- StringFmt( $12-99-02-0003.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
-
- 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 $Sum1299020003 = "Disable" Then
- STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
- STRCONTAIN "ERR" $12-99-02-0003.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"
- $Sum1299020003
- text_unavailable
- center-vertical-horizontal
-
; - - -
; ==================> Len = 17
diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml
index d383a8f8..6a352161 100644
--- a/xml/page_catalog_group_milk.xml
+++ b/xml/page_catalog_group_milk.xml
@@ -36,7 +36,7 @@
Var block_index_override = 0
Var block_index_move = 0
-; menu_new_list 33
+; menu_new_list 36
; ==================> Len = 17
; 12-03-01-0005 12-03-02-0005 12-03-03-0005
@@ -7663,6 +7663,771 @@ Water"
text_unavailable
center-vertical-horizontal
+
+ ; - - -
+ ; ==================> Len = 12
+ ; - - 12-03-03-0041
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-03-03-0041.Button,$Sum1203030041)
+
+
+ 16
+ 164
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ "นมคาราเมล
+บิสคอฟ"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ "น้ำเชื่อมคาราเมล นม น้ำตาล
+ บิสคอฟ"
+
+
+ 16
+ 164
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ "CARAMEL MILK
+BISCOFF VOLCANO"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ "Caramel Syrup, Milk,
+Sugar, Biscof"
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ "Invisible"
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ 50
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.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" )
+ $12-03-03-0041.Button
+
+
+ 180
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-03-03-0041.Button
+ StringFmt( $12-03-03-0041.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 $Sum1203030041 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-03-03-0041.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"
+ $Sum1203030041
+ text_unavailable
+ center-vertical-horizontal
+
+
+ ; - - -
+ ; ==================> Len = 12
+ ; - - 12-03-03-0042
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-03-03-0042.Button,$Sum1203030042)
+
+
+ 16
+ 164
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ "นมสตรอเบอร์รี่
+บิสคอฟ"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ "น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล
+ บิสคอฟ"
+
+
+ 16
+ 164
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ "STRAWBERRY MILK
+BISCOFF VOLCANO"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ "Strawberry Syrup, Milk,
+Sugar, Biscof"
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ "Invisible"
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ 50
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.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" )
+ $12-03-03-0042.Button
+
+
+ 180
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-03-03-0042.Button
+ StringFmt( $12-03-03-0042.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 $Sum1203030042 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-03-03-0042.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"
+ $Sum1203030042
+ text_unavailable
+ center-vertical-horizontal
+
+
+ ; - - -
+ ; ==================> Len = 12
+ ; - - 12-03-03-0043
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-03-03-0043.Button,$Sum1203030043)
+
+
+ 16
+ 164
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ "นมมินต์
+บิสคอฟ"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ "น้ำเชื่อมมินต์ นม น้ำตาล
+ บิสคอฟ"
+
+
+ 16
+ 164
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ "Mint MILK
+BISCOFF VOLCANO"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ "Mint Syrup, Milk,
+Sugar, Biscof"
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ "Invisible"
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ 50
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.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" )
+ $12-03-03-0043.Button
+
+
+ 180
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitRegularTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-03-03-0043.Button
+ StringFmt( $12-03-03-0043.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 $Sum1203030043 = "Disable" Then
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-03-03-0043.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"
+ $Sum1203030043
+ text_unavailable
+ center-vertical-horizontal
+
; - - -
diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml
index b5bbee0e..8df2cd47 100644
--- a/xml/page_catalog_group_other.xml
+++ b/xml/page_catalog_group_other.xml
@@ -9114,8 +9114,8 @@ LEMON SODA"
Var NameDrink = "PEPSI MINT"
Var NameDrinkTH = "เป๊ปซี่มินต์"
- Var DrinkDescriptionTH = "เป๊ปซี่ น้ำเชื่อมมินต์ และโซดา"
- Var DrinkDescription = "Pepsi, Mint Syrup& Ice"
+ Var DrinkDescriptionTH = "เป๊ปซี่ น้ำเชื่อมมินต์ ผงมะนาว และโซดา"
+ Var DrinkDescription = "Pepsi, Mint Syrup Lime & Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Mint_pepsi.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@@ -9196,7 +9196,7 @@ LEMON SODA"
KanitMediumTTF
0x6F5F51
showthaiText
- "เป๊ปซี่ น้ำเชื่อมมินต์ และโซดา"
+ "เป๊ปซี่ น้ำเชื่อมมินต์ ผงมะนาว และโซดา"
16
@@ -9217,7 +9217,7 @@ LEMON SODA"
KanitMediumTTF
0x6F5F51
showengText
- "Pepsi, Mint Syrup& Ice"
+ "Pepsi, Mint Syrup Lime & Ice"
16
diff --git a/xml/page_catalog_group_pepsi_7up.xml b/xml/page_catalog_group_pepsi_7up.xml
index 371821e6..822066fa 100644
--- a/xml/page_catalog_group_pepsi_7up.xml
+++ b/xml/page_catalog_group_pepsi_7up.xml
@@ -3822,8 +3822,8 @@
Var NameDrink = "PEPSI MINT"
Var NameDrinkTH = "เป๊ปซี่มินต์"
- Var DrinkDescriptionTH = "เป๊ปซี่ น้ำเชื่อมมินต์ และโซดา"
- Var DrinkDescription = "Pepsi, Mint Syrup& Ice"
+ Var DrinkDescriptionTH = "เป๊ปซี่ น้ำเชื่อมมินต์ ผงมะนาว และโซดา"
+ Var DrinkDescription = "Pepsi, Mint Syrup Lime & Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Mint_pepsi.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@@ -3904,7 +3904,7 @@
KanitMediumTTF
0x6F5F51
showthaiText
- "เป๊ปซี่ น้ำเชื่อมมินต์ และโซดา"
+ "เป๊ปซี่ น้ำเชื่อมมินต์ ผงมะนาว และโซดา"
16
@@ -3925,7 +3925,7 @@
KanitMediumTTF
0x6F5F51
showengText
- "Pepsi, Mint Syrup& Ice"
+ "Pepsi, Mint Syrup Lime & Ice"
16
diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml
index 2680cdd3..84dd046a 100644
--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
@@ -854,508 +854,6 @@ Water"
text_unavailable
center-vertical-horizontal
-
- ; - - -
- ; ==================> Len = 12
- ; - - 12-99-03-0066
-
- 33
- 22
- 225
- 296
- Flag( 12-99-03-0066.Button,Disable=Invisible,$Sum1299030066)
-
-
- 16
- 164
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- "เป๊ปซี่นมโอริโอ้ภูเขาไฟ"
-
-
- 16
- 220
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- "เป๊ปซี่ นม และโอริโอ้"
-
-
- 16
- 164
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- "Pepsi Oreo"
-
-
- 16
- 220
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- "Pepsi, Milk, Oreo and Ice"
-
-
- 16
- 264
- Var( DirImage2 + "option_deactive.png" )
-
-
- 16
- 264
- "Invisible"
- Var( DirImage2 + "hot.png" )
- Var( DirImage2 + "hot_db.png" )
-
-
- 50
- TextPriceMenuY
- TextPriceMenuSize
- 220
- KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
- "Invisible"
- StringFmt( $-.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" )
- $12-99-03-0066.Button
-
-
- 180
- TextPriceMenuY
- TextPriceMenuSize
- 220
- KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
- $12-99-03-0066.Button
- StringFmt( $12-99-03-0066.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 $Sum1299030066 = "Disable" Then
- STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
- STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
- STRCONTAIN "ERR" $12-99-03-0066.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"
- $Sum1299030066
- text_unavailable
- center-vertical-horizontal
-
-
- ; - - -
- ; ==================> Len = 12
- ; - 12-99-02-0003 -
-
- 33
- 22
- 225
- 296
- Flag( 12-99-02-0003.Button,Disable=Invisible,$Sum1299020003)
-
-
- 16
- 164
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- "เป๊ปซี่นม"
-
-
- 16
- 220
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- "เป๊ปซี่ นม"
-
-
- 16
- 164
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- "Pepsi milk"
-
-
- 16
- 220
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- "Pepsi, Milk"
-
-
- 16
- 264
- Var( DirImage2 + "option_deactive.png" )
-
-
- 16
- 264
- "Invisible"
- Var( DirImage2 + "hot.png" )
- Var( DirImage2 + "hot_db.png" )
-
-
- 50
- TextPriceMenuY
- TextPriceMenuSize
- 220
- KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
- "Invisible"
- StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
-
-
- 81
- 264
- Var( DirImage2 + "cold.png" )
- Var( DirImage2 + "cold_db.png" )
- $12-99-02-0003.Button
-
-
- 115
- TextPriceMenuY
- TextPriceMenuSize
- 220
- KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
- $12-99-02-0003.Button
- StringFmt( $12-99-02-0003.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
-
- 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 $Sum1299020003 = "Disable" Then
- STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
- STRCONTAIN "ERR" $12-99-02-0003.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"
- $Sum1299020003
- text_unavailable
- center-vertical-horizontal
-
; - - -
; ==================> Len = 17
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 8492ceaa..cffbadf5 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
- Var XMLPageVersion = "8.57"
- Var XMLPageVersionInt = 857
+ Var XMLPageVersion = "8.58"
+ Var XMLPageVersionInt = 858
;Oreo
Var OreoGuarantee = 0