diff --git a/image/page_drink_disable_n2/bn_hot_Ginger_tea_jemila_pro.png b/image/page_drink_disable_n2/bn_hot_Ginger_tea_jemila_pro.png
new file mode 100644
index 00000000..351e0106
Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_Ginger_tea_jemila_pro.png differ
diff --git a/image/page_drink_disable_n2/bn_hot_america_no_jemila_pro.png b/image/page_drink_disable_n2/bn_hot_america_no_jemila_pro.png
new file mode 100644
index 00000000..e4caec8c
Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_america_no_jemila_pro.png differ
diff --git a/image/page_drink_disable_n2/bn_hot_thai_tea_jemila_pro.png b/image/page_drink_disable_n2/bn_hot_thai_tea_jemila_pro.png
new file mode 100644
index 00000000..ff0d1e02
Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_thai_tea_jemila_pro.png differ
diff --git a/image/page_drink_disable_n2/bn_iced_7up_jemila_pro.png b/image/page_drink_disable_n2/bn_iced_7up_jemila_pro.png
new file mode 100644
index 00000000..b14bc304
Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_7up_jemila_pro.png differ
diff --git a/image/page_drink_disable_n2/bn_iced_cocoa_jemila_pro.png b/image/page_drink_disable_n2/bn_iced_cocoa_jemila_pro.png
new file mode 100644
index 00000000..20788f06
Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_cocoa_jemila_pro.png differ
diff --git a/image/page_drink_disable_n2/bn_iced_lemonade_jemila_pro.png b/image/page_drink_disable_n2/bn_iced_lemonade_jemila_pro.png
new file mode 100644
index 00000000..5c039657
Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_lemonade_jemila_pro.png differ
diff --git a/image/page_drink_disable_n2/bn_iced_milk_jemila_pro.png b/image/page_drink_disable_n2/bn_iced_milk_jemila_pro.png
new file mode 100644
index 00000000..1b98bde4
Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_milk_jemila_pro.png differ
diff --git a/image/page_drink_disable_n2/bn_jasmine_tea_jemila_pro.png b/image/page_drink_disable_n2/bn_jasmine_tea_jemila_pro.png
new file mode 100644
index 00000000..13ab57b2
Binary files /dev/null and b/image/page_drink_disable_n2/bn_jasmine_tea_jemila_pro.png differ
diff --git a/image/page_drink_disable_n2/bn_soda_jemila_pro.png b/image/page_drink_disable_n2/bn_soda_jemila_pro.png
new file mode 100644
index 00000000..1cbf6000
Binary files /dev/null and b/image/page_drink_disable_n2/bn_soda_jemila_pro.png differ
diff --git a/image/page_drink_disable_n2/bn_water_roomtemp_jemila_pro.png b/image/page_drink_disable_n2/bn_water_roomtemp_jemila_pro.png
new file mode 100644
index 00000000..204b90f1
Binary files /dev/null and b/image/page_drink_disable_n2/bn_water_roomtemp_jemila_pro.png differ
diff --git a/image/page_drink_n/bn_hot_Ginger_tea_jemila_pro.png b/image/page_drink_n/bn_hot_Ginger_tea_jemila_pro.png
new file mode 100644
index 00000000..cd9901df
Binary files /dev/null and b/image/page_drink_n/bn_hot_Ginger_tea_jemila_pro.png differ
diff --git a/image/page_drink_n/bn_hot_america_no_jemila_pro.png b/image/page_drink_n/bn_hot_america_no_jemila_pro.png
new file mode 100644
index 00000000..e20850c5
Binary files /dev/null and b/image/page_drink_n/bn_hot_america_no_jemila_pro.png differ
diff --git a/image/page_drink_n/bn_hot_blackcoffee.png b/image/page_drink_n/bn_hot_blackcoffee.png
index f13a6621..80e0f633 100644
Binary files a/image/page_drink_n/bn_hot_blackcoffee.png and b/image/page_drink_n/bn_hot_blackcoffee.png differ
diff --git a/image/page_drink_n/bn_hot_thai_tea_jemila_pro.png b/image/page_drink_n/bn_hot_thai_tea_jemila_pro.png
new file mode 100644
index 00000000..2a9d8085
Binary files /dev/null and b/image/page_drink_n/bn_hot_thai_tea_jemila_pro.png differ
diff --git a/image/page_drink_n/bn_iced_7up_jemila_pro.png b/image/page_drink_n/bn_iced_7up_jemila_pro.png
new file mode 100644
index 00000000..03013d39
Binary files /dev/null and b/image/page_drink_n/bn_iced_7up_jemila_pro.png differ
diff --git a/image/page_drink_n/bn_iced_cocoa_jemila_pro.png b/image/page_drink_n/bn_iced_cocoa_jemila_pro.png
new file mode 100644
index 00000000..77f1320e
Binary files /dev/null and b/image/page_drink_n/bn_iced_cocoa_jemila_pro.png differ
diff --git a/image/page_drink_n/bn_iced_lemonade_jemila_pro.png b/image/page_drink_n/bn_iced_lemonade_jemila_pro.png
new file mode 100644
index 00000000..b2696c74
Binary files /dev/null and b/image/page_drink_n/bn_iced_lemonade_jemila_pro.png differ
diff --git a/image/page_drink_n/bn_iced_milk_jemila_pro.png b/image/page_drink_n/bn_iced_milk_jemila_pro.png
new file mode 100644
index 00000000..b37142d7
Binary files /dev/null and b/image/page_drink_n/bn_iced_milk_jemila_pro.png differ
diff --git a/image/page_drink_n/bn_jasmine_tea_jemila_pro.png b/image/page_drink_n/bn_jasmine_tea_jemila_pro.png
new file mode 100644
index 00000000..6021a0d1
Binary files /dev/null and b/image/page_drink_n/bn_jasmine_tea_jemila_pro.png differ
diff --git a/image/page_drink_n/bn_soda_jemila_pro.png b/image/page_drink_n/bn_soda_jemila_pro.png
new file mode 100644
index 00000000..9a6d3096
Binary files /dev/null and b/image/page_drink_n/bn_soda_jemila_pro.png differ
diff --git a/image/page_drink_n/bn_water_roomtemp_jemila_pro.png b/image/page_drink_n/bn_water_roomtemp_jemila_pro.png
new file mode 100644
index 00000000..7e3d494c
Binary files /dev/null and b/image/page_drink_n/bn_water_roomtemp_jemila_pro.png differ
diff --git a/image/page_drink_picture2_n/bn_hot_Ginger_tea_jemila_pro.png b/image/page_drink_picture2_n/bn_hot_Ginger_tea_jemila_pro.png
new file mode 100644
index 00000000..3a40b1c0
Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_Ginger_tea_jemila_pro.png differ
diff --git a/image/page_drink_picture2_n/bn_hot_america_no_jemila_pro.png b/image/page_drink_picture2_n/bn_hot_america_no_jemila_pro.png
new file mode 100644
index 00000000..f194f79c
Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_america_no_jemila_pro.png differ
diff --git a/image/page_drink_picture2_n/bn_hot_thai_tea_jemila_pro.png b/image/page_drink_picture2_n/bn_hot_thai_tea_jemila_pro.png
new file mode 100644
index 00000000..5669d460
Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_thai_tea_jemila_pro.png differ
diff --git a/image/page_drink_picture2_n/bn_iced_7up_jemila_pro.png b/image/page_drink_picture2_n/bn_iced_7up_jemila_pro.png
new file mode 100644
index 00000000..a32cb674
Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_7up_jemila_pro.png differ
diff --git a/image/page_drink_picture2_n/bn_iced_cocoa_jemila_pro.png b/image/page_drink_picture2_n/bn_iced_cocoa_jemila_pro.png
new file mode 100644
index 00000000..92558dc6
Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_cocoa_jemila_pro.png differ
diff --git a/image/page_drink_picture2_n/bn_iced_lemonade_jemila_pro.png b/image/page_drink_picture2_n/bn_iced_lemonade_jemila_pro.png
new file mode 100644
index 00000000..7c5606c7
Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_lemonade_jemila_pro.png differ
diff --git a/image/page_drink_picture2_n/bn_iced_milk_jemila_pro.png b/image/page_drink_picture2_n/bn_iced_milk_jemila_pro.png
new file mode 100644
index 00000000..88beab8e
Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_milk_jemila_pro.png differ
diff --git a/image/page_drink_picture2_n/bn_jasmine_tea_jemila_pro.png b/image/page_drink_picture2_n/bn_jasmine_tea_jemila_pro.png
new file mode 100644
index 00000000..7f25e4f0
Binary files /dev/null and b/image/page_drink_picture2_n/bn_jasmine_tea_jemila_pro.png differ
diff --git a/image/page_drink_picture2_n/bn_soda_jemila_pro.png b/image/page_drink_picture2_n/bn_soda_jemila_pro.png
new file mode 100644
index 00000000..ab1c7fd3
Binary files /dev/null and b/image/page_drink_picture2_n/bn_soda_jemila_pro.png differ
diff --git a/image/page_drink_picture2_n/bn_water_roomtemp_jemila_pro.png b/image/page_drink_picture2_n/bn_water_roomtemp_jemila_pro.png
new file mode 100644
index 00000000..af6a5be0
Binary files /dev/null and b/image/page_drink_picture2_n/bn_water_roomtemp_jemila_pro.png differ
diff --git a/image/page_drink_press_n/bn_hot_Ginger_tea_jemila_pro.png b/image/page_drink_press_n/bn_hot_Ginger_tea_jemila_pro.png
new file mode 100644
index 00000000..558218e1
Binary files /dev/null and b/image/page_drink_press_n/bn_hot_Ginger_tea_jemila_pro.png differ
diff --git a/image/page_drink_press_n/bn_hot_america_no_jemila_pro.png b/image/page_drink_press_n/bn_hot_america_no_jemila_pro.png
new file mode 100644
index 00000000..3f0d93a5
Binary files /dev/null and b/image/page_drink_press_n/bn_hot_america_no_jemila_pro.png differ
diff --git a/image/page_drink_press_n/bn_hot_thai_tea_jemila_pro.png b/image/page_drink_press_n/bn_hot_thai_tea_jemila_pro.png
new file mode 100644
index 00000000..e990f73b
Binary files /dev/null and b/image/page_drink_press_n/bn_hot_thai_tea_jemila_pro.png differ
diff --git a/image/page_drink_press_n/bn_iced_7up_jemila_pro.png b/image/page_drink_press_n/bn_iced_7up_jemila_pro.png
new file mode 100644
index 00000000..5e660515
Binary files /dev/null and b/image/page_drink_press_n/bn_iced_7up_jemila_pro.png differ
diff --git a/image/page_drink_press_n/bn_iced_cocoa_jemila_pro.png b/image/page_drink_press_n/bn_iced_cocoa_jemila_pro.png
new file mode 100644
index 00000000..20770a6d
Binary files /dev/null and b/image/page_drink_press_n/bn_iced_cocoa_jemila_pro.png differ
diff --git a/image/page_drink_press_n/bn_iced_lemonade_jemila_pro.png b/image/page_drink_press_n/bn_iced_lemonade_jemila_pro.png
new file mode 100644
index 00000000..d2bf5796
Binary files /dev/null and b/image/page_drink_press_n/bn_iced_lemonade_jemila_pro.png differ
diff --git a/image/page_drink_press_n/bn_iced_milk_jemila_pro.png b/image/page_drink_press_n/bn_iced_milk_jemila_pro.png
new file mode 100644
index 00000000..f6fed9f4
Binary files /dev/null and b/image/page_drink_press_n/bn_iced_milk_jemila_pro.png differ
diff --git a/image/page_drink_press_n/bn_jasmine_tea_jemila_pro.png b/image/page_drink_press_n/bn_jasmine_tea_jemila_pro.png
new file mode 100644
index 00000000..306ff524
Binary files /dev/null and b/image/page_drink_press_n/bn_jasmine_tea_jemila_pro.png differ
diff --git a/image/page_drink_press_n/bn_soda_jemila_pro.png b/image/page_drink_press_n/bn_soda_jemila_pro.png
new file mode 100644
index 00000000..57d198c3
Binary files /dev/null and b/image/page_drink_press_n/bn_soda_jemila_pro.png differ
diff --git a/image/page_drink_press_n/bn_water_roomtemp_jemila_pro.png b/image/page_drink_press_n/bn_water_roomtemp_jemila_pro.png
new file mode 100644
index 00000000..64716c10
Binary files /dev/null and b/image/page_drink_press_n/bn_water_roomtemp_jemila_pro.png differ
diff --git a/inc/video.inc b/inc/video.inc
index b1e5d581..e7b9bf9b 100644
--- a/inc/video.inc
+++ b/inc/video.inc
@@ -6,6 +6,19 @@
"Reload"
+ READ_FILE "/mnt/sdcard/coffeevending/openfile_xml_0" CurrPageInst0
+
+ Var DefaultLargeBanner = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
+ Var DefaultNormBanner = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+
+ If UsePepsiTheme = 1 Then
+ Var PepsiLargeBanner = "/mnt/sdcard/coffeevending/taobin_project/inter/whatthecup/common/adv/wtc_banner"
+ Var PepsiNormBanner = "/mnt/sdcard/coffeevending/taobin_project/inter/whatthecup/common/adv/wtc_banner_menu"
+
+ Var DefaultLargeBanner = PepsiLargeBanner
+ Var DefaultNormBanner = PepsiNormBanner
+ EndIf
+
If showMultiAds = "true" Then
@@ -37,32 +50,36 @@
DEBUGVAR CurrentXMLFileName2
DEBUGVAR PreviousFileName
DEBUGVAR CountDownPauseVideo2
+ DEBUGVAR ads_idx
+ DEBUGVAR CountryName
+
+
If CountryName = "Singapore" Then
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
If CountDownPauseVideo2 < 2 Then
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
Else
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
If CurrentXMLFileName2 = "" Then
If CountDownPauseVideo2 < 2 Then
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
EndIf
Else
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
@@ -71,6 +88,11 @@
DEBUGVAR PromotionOreoToppingFreeEnable
DEBUGVAR ProReducedPriceEnable
DEBUGVAR UseSlideShowVideo
+ DEBUGVAR DisplayAds
+ DEBUGVAR video_menu_0
+
+ Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var DisplayAds = AdvTaobinMenu + ".mp4"
If PromotionOreoToppingFreeEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4"
@@ -78,6 +100,9 @@
If ProReducedPriceEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
EndIf
+ If ProYuzu250Enable = 1 Then
+ Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
+ EndIf
If UseSlideShowVideo = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
EndIf
@@ -93,33 +118,64 @@
DEBUGVAR PreviseXMLFileName2
+ ;auto-open
+ ;/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml
+
+ ;from-test
+ ;/mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml
+
If PreviseXMLFileName2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" Then
DEBUGVAR CurrentXMLFileName2
DEBUGVAR CurrentXMLFileName2
DEBUGVAR PreviseXMLFileName2
+ DEBUGVAR CurrPageInst0
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
+ If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml" Then
+ Var AdvTaobinMenu = DefaultLargeBanner
+ Var DisplayAds = AdvTaobinMenu + ".mp4"
+
+ EndIf
+
+ If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" Then
+ Var AdvTaobinMenu = DefaultLargeBanner
+ Var DisplayAds = AdvTaobinMenu + ".mp4"
+
+ EndIf
+
+ If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/xml/page_show_error.lxml" Then
+ Var AdvTaobinMenu = DefaultLargeBanner
+ Var DisplayAds = AdvTaobinMenu + ".mp4"
+
+ EndIf
+
Else
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
If CurrentXMLFileName2 = "" Then
DEBUGVAR CountDownPauseVideo2
If CountDownPauseVideo2 < 2 Then
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
DEBUGVAR CurrentXMLFileName2
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
+
+ If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/xml/page_show_error.lxml" Then
+ Var AdvTaobinMenu = DefaultLargeBanner
+ Var DisplayAds = AdvTaobinMenu + ".mp4"
+
+ EndIf
EndIf
Else
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
EndIf
@@ -131,19 +187,25 @@
DEBUGVAR ProReducedPriceEnable
DEBUGVAR UseSlideShowVideo
+ Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var DisplayAds = AdvTaobinMenu + ".mp4"
+
If PromotionOreoToppingFreeEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4"
EndIf
If ProReducedPriceEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
EndIf
+ If ProYuzu250Enable = 1 Then
+ Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
+ EndIf
If UseSlideShowVideo = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
EndIf
EndIf
If CountryName = "UnitedArabEmirates Dubai" Then
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_00"
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
@@ -173,30 +235,44 @@
EndIf
If CountryName = "Singapore" Then
+ DEBUGVAR CountryName
+ DEBUGVAR CurrentXMLFileName2
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
If CountDownPauseVideo2 < 2 Then
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
Else
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
If CurrentXMLFileName2 = "" Then
If CountDownPauseVideo2 < 2 Then
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
EndIf
+
+ If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/xml/page_show_error.lxml" Then
+ Var AdvTaobinMenu = DefaultLargeBanner
+ Var DisplayAds = AdvTaobinMenu + ".mp4"
+
+ EndIf
Else
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
+
+ If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/xml/page_show_error.lxml" Then
+ Var AdvTaobinMenu = DefaultLargeBanner
+ Var DisplayAds = AdvTaobinMenu + ".mp4"
+
+ EndIf
EndIf
If CountryName = "Malaysia" Then
@@ -205,12 +281,18 @@
DEBUGVAR ProReducedPriceEnable
DEBUGVAR UseSlideShowVideo
+ Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var DisplayAds = AdvTaobinMenu + ".mp4"
+
If PromotionOreoToppingFreeEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4"
EndIf
If ProReducedPriceEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
EndIf
+ If ProYuzu250Enable = 1 Then
+ Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
+ EndIf
If UseSlideShowVideo = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
EndIf
@@ -222,27 +304,27 @@
If CountryName = "Singapore" Then
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
If CountDownPauseVideo2 < 1 Then
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
Else
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
If CurrentXMLFileName2 = "" Then
If CountDownPauseVideo2 < 2 Then
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
EndIf
Else
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
EndIf
@@ -255,6 +337,9 @@
DEBUGVAR ProReducedPriceEnable
DEBUGVAR UseSlideShowVideo
+ Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
+ Var DisplayAds = AdvTaobinMenu + ".mp4"
+
If PromotionOreoToppingFreeEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4"
EndIf
@@ -263,13 +348,17 @@
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
EndIf
+ If ProYuzu250Enable = 1 Then
+ Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
+ EndIf
+
If UseSlideShowVideo = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
EndIf
EndIf
If CountryName = "UnitedArabEmirates Dubai" Then
- Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_00"
+ Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
diff --git a/inter/aus/image/event/anniversary_new_promo_code_revealed.png b/inter/aus/image/event/anniversary_new_promo_code_revealed.png
new file mode 100644
index 00000000..06cac027
Binary files /dev/null and b/inter/aus/image/event/anniversary_new_promo_code_revealed.png differ
diff --git a/inter/aus/xml/event/tricker.ev b/inter/aus/xml/event/tricker.ev
index 27c86bbe..120a0ca5 100644
--- a/inter/aus/xml/event/tricker.ev
+++ b/inter/aus/xml/event/tricker.ev
@@ -1,4 +1,4 @@
-; australia
+; australia
;DEBUGVAR SystemDateMonthInt
@@ -6,7 +6,7 @@
; Reset flag away.
-; Enable app game
+; Enable app game
Var GameEnableFromTrickerEv = 1
Var NewCollectPointFlag = 1
@@ -33,25 +33,6 @@ If BoxID = 200027 Then
Var AnniverseryPro = 1
EndIf
-If BoxID = 210308 Then
- Var WestfieldCatalogFlag = 1
-EndIf
-
-If BoxID = 210316 Then
- Var WestfieldCatalogFlag = 1
-EndIf
-
-If BoxID = 210322 Then
- Var WestfieldCatalogFlag = 1
-EndIf
-
-If BoxID = 210326 Then
- Var WestfieldCatalogFlag = 1
-EndIf
-
-If BoxID = 210358 Then
- Var WestfieldCatalogFlag = 1
-EndIf
DEBUGVAR Propepsi99Enable
DEBUGVAR DisplayFormatFull
\ No newline at end of file
diff --git a/inter/mys/adv/taobin_adv_menu_24.mp4 b/inter/mys/adv/taobin_adv_menu_24.mp4
new file mode 100644
index 00000000..5047f12f
Binary files /dev/null and b/inter/mys/adv/taobin_adv_menu_24.mp4 differ
diff --git a/inter/mys/xml/event/event_profile.ev b/inter/mys/xml/event/event_profile.ev
index 54b50e9d..12da7f98 100644
--- a/inter/mys/xml/event/event_profile.ev
+++ b/inter/mys/xml/event/event_profile.ev
@@ -12,22 +12,60 @@ DEBUGVAR ProYuzu250Enable
If ProReducedPriceEnable = 1 Then
Else
+ DEBUGVAR "Case pro reduce end"
; case-pro-reduce-end
If ProYuzu250Enable = 1 Then
+ DEBUGVAR "Pro yuzu ongoing"
; concat-profile
If HasProYuzu250Concat = "true" Then
-
+ DEBUGVAR "Pro yuzu concat"
Else
-
+
If IsProfileReduce = "true" Then
-
+ DEBUGVAR "Pro reduce was set but disabled from trick"
+ CacheVarStr "get" XMLProfilePreEvent
+ If XMLProfilePreEvent = "" Then
+ DEBUGVAR "Get PreEvent Empty"
+ Var XMLProfile = "General"
+ Else
+ DEBUGVAR "Restore profile by pre-event, also concat Yuzu"
+ DEBUGVAR XMLProfilePreEvent
+ Var XMLProfile = XMLProfilePreEvent + "-"
+ Var XMLProfile = XMLProfile + "PromoYuzu250"
+ EndIf
+
Else
+ DEBUGVAR "No pro reduce, concat pro yuzu"
CacheVarStr "put" XMLProfilePreEvent
Var XMLProfile = XMLProfile + "-"
Var XMLProfile = XMLProfile + "PromoYuzu250"
EndIf
EndIf
+ Else
+ If IsProfileReduce = "true" Then
+ DEBUGVAR "No yuzu but set pro reduce"
+ CacheVarStr "get" XMLProfilePreEvent
+ If XMLProfilePreEvent = "" Then
+ DEBUGVAR "PreEvent empty, set General"
+ Var XMLProfile = "General"
+ Else
+ DEBUGVAR "Restore profile by pre-event"
+ Var XMLProfile = XMLProfilePreEvent
+ EndIf
+
+ Else
+
+ If HasProYuzu250Concat = "true" Then
+ CacheVarStr "get" XMLProfilePreEvent
+ Var XMLProfile = XMLProfilePreEvent
+ EndIf
+
+ DEBUGVAR "Store profile pre event"
+ DEBUGVAR XMLProfilePreEvent
+ CacheVarStr "put" XMLProfilePreEvent
+ EndIf
+
EndIf
EndIf
diff --git a/inter/mys/xml/event/tricker.ev b/inter/mys/xml/event/tricker.ev
index fb0813bf..63d9cdaa 100644
--- a/inter/mys/xml/event/tricker.ev
+++ b/inter/mys/xml/event/tricker.ev
@@ -44,6 +44,9 @@ Var EnablePayLaterMode = 0
; Slide show Video
Var UseSlideShowVideo = 0
+Var NoTrickPriceProfile = 0
+
+
If SystemDateMonthInt = 9 Then
If SystemDateDayInt < 17 Then
Var PromotionOreoToppingFreeEnable = 1
@@ -59,7 +62,7 @@ If SystemDateMonthInt = 10 Then
If SetProReduceByBO = 1 Then
Var ProReducedPriceEnable = 1
EndIf
-
+
Var ProYuzu250Enable = 1
EndIf
@@ -67,12 +70,17 @@ If SystemDateMonthInt = 11 Then
If SetProReduceByBO = 1 Then
Var ProReducedPriceEnable = 1
EndIf
-
+
Var ProYuzu250Enable = 1
EndIf
If SystemDateMonthInt = 12 Then
Var ProYuzu250Enable = 1
+
+ If SetProReduceByBO = 1 Then
+ Var ProReducedPriceEnable = 0
+ EndIf
+
EndIf
If SystemDateMonthInt = 1 Then
@@ -83,6 +91,17 @@ If SystemDateMonthInt = 1 Then
EndIf
EndIf
+If SystemDateMonthInt < 10 Then
+ Var ProReducedPriceEnable = 0
+EndIf
+
+If ProReducedPriceEnable = 0 Then
+ If XMLProfile = "PromoReduced" Then
+ Var NoTrickPriceProfile = 1
+
+ EndIf
+EndIf
+
If BoxID = 177746 Then
Var ProThaiTeaEnable = 1
Var ProYuzuEnable = 1
@@ -94,8 +113,8 @@ If BoxID = 177746 Then
Var UseSlideShowVideo = 0
- Var ProReducedPriceEnable = 0
- Var ProYuzu250Enable = 1
+ ;Var ProReducedPriceEnable = 0
+ ;Var ProYuzu250Enable = 1
EndIf
If BoxID = 210037 Then
@@ -106,9 +125,9 @@ If BoxID = 210011 Then
Var UseSlideShowVideo = 1
EndIf
-If BoxID = 200002 Then
- Var UseSlideShowVideo = 1
-EndIf
+;If BoxID = 200002 Then
+; Var UseSlideShowVideo = 1
+;EndIf
;If BoxID = Something Then
; Var EnablePayLaterMode = 1
diff --git a/inter/sgp/hardware/exhaust_fan_schedule.ev b/inter/sgp/hardware/exhaust_fan_schedule.ev
index 213d2fd6..7b87b7a5 100644
--- a/inter/sgp/hardware/exhaust_fan_schedule.ev
+++ b/inter/sgp/hardware/exhaust_fan_schedule.ev
@@ -73,7 +73,7 @@ DEBUGVAR LastTimeOfMainGateCloseUnitInMinute
DEBUGVAR MachineUpTimeUnitInMinute
If MachineStage = "close-maintenance" Then
- Var CountDownForSetFanMode = 60
+ Var CountDownForSetFanMode = 3
EndIf
If CountDownForSetFanMode = "" Then
diff --git a/inter/sgp/image/page_drink_disable_n2/bn_iced_Ginger_soda_Doikum.png b/inter/sgp/image/page_drink_disable_n2/bn_iced_Ginger_soda_Doikum.png
index 045a0670..e48045b1 100644
Binary files a/inter/sgp/image/page_drink_disable_n2/bn_iced_Ginger_soda_Doikum.png and b/inter/sgp/image/page_drink_disable_n2/bn_iced_Ginger_soda_Doikum.png differ
diff --git a/inter/sgp/image/page_drink_disable_n2/bn_iced_Gingerlime_soda_Doikum.png b/inter/sgp/image/page_drink_disable_n2/bn_iced_Gingerlime_soda_Doikum.png
index 8ca9a475..8d74ceb3 100644
Binary files a/inter/sgp/image/page_drink_disable_n2/bn_iced_Gingerlime_soda_Doikum.png and b/inter/sgp/image/page_drink_disable_n2/bn_iced_Gingerlime_soda_Doikum.png differ
diff --git a/inter/sgp/image/page_drink_n/bn_iced_Ginger_soda_Doikum.png b/inter/sgp/image/page_drink_n/bn_iced_Ginger_soda_Doikum.png
index 4f7fbf71..bedd81a4 100644
Binary files a/inter/sgp/image/page_drink_n/bn_iced_Ginger_soda_Doikum.png and b/inter/sgp/image/page_drink_n/bn_iced_Ginger_soda_Doikum.png differ
diff --git a/inter/sgp/image/page_drink_n/bn_iced_Gingerlime_soda_Doikum.png b/inter/sgp/image/page_drink_n/bn_iced_Gingerlime_soda_Doikum.png
index d41f4054..1144fd78 100644
Binary files a/inter/sgp/image/page_drink_n/bn_iced_Gingerlime_soda_Doikum.png and b/inter/sgp/image/page_drink_n/bn_iced_Gingerlime_soda_Doikum.png differ
diff --git a/inter/sgp/image/page_drink_picture2_n/bn_iced_Ginger_soda_Doikum.png b/inter/sgp/image/page_drink_picture2_n/bn_iced_Ginger_soda_Doikum.png
index 5e52aa18..4009aa3a 100644
Binary files a/inter/sgp/image/page_drink_picture2_n/bn_iced_Ginger_soda_Doikum.png and b/inter/sgp/image/page_drink_picture2_n/bn_iced_Ginger_soda_Doikum.png differ
diff --git a/inter/sgp/image/page_drink_picture2_n/bn_iced_Gingerlime_soda_Doikum.png b/inter/sgp/image/page_drink_picture2_n/bn_iced_Gingerlime_soda_Doikum.png
index 14944b92..2620b611 100644
Binary files a/inter/sgp/image/page_drink_picture2_n/bn_iced_Gingerlime_soda_Doikum.png and b/inter/sgp/image/page_drink_picture2_n/bn_iced_Gingerlime_soda_Doikum.png differ
diff --git a/inter/sgp/image/page_drink_press_n/bn_iced_Ginger_soda_Doikum.png b/inter/sgp/image/page_drink_press_n/bn_iced_Ginger_soda_Doikum.png
index 839f4d6e..f29660a3 100644
Binary files a/inter/sgp/image/page_drink_press_n/bn_iced_Ginger_soda_Doikum.png and b/inter/sgp/image/page_drink_press_n/bn_iced_Ginger_soda_Doikum.png differ
diff --git a/inter/sgp/image/page_drink_press_n/bn_iced_Gingerlime_soda_Doikum.png b/inter/sgp/image/page_drink_press_n/bn_iced_Gingerlime_soda_Doikum.png
index ebd4b845..a834e59f 100644
Binary files a/inter/sgp/image/page_drink_press_n/bn_iced_Gingerlime_soda_Doikum.png and b/inter/sgp/image/page_drink_press_n/bn_iced_Gingerlime_soda_Doikum.png differ
diff --git a/inter/sgp/menu/lang.tsv b/inter/sgp/menu/lang.tsv
index ae8238a7..b7c05585 100644
--- a/inter/sgp/menu/lang.tsv
+++ b/inter/sgp/menu/lang.tsv
@@ -1,13 +1,14 @@
TextID Note English Thai
- Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center Font=Kanit,Type=Light,Size=48,Color=0xEE8C62,Align=Center
+ Font=Montserrat,Type=Bold,Size=48,Color=0x0025FF,Align=Center Font=Kanit,Type=Light,Size=48,Color=0xEE8C62,Align=Center
000001 Page catalog head Welcome ยินดีต้อนรับ
- Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Kanit,Type=Light,Size=64,Color=0x513C2F,Align=Center
+ Font=Montserrat,Type=Bold,Size=64,Color=0x0025FF,Align=Center Font=Kanit,Type=Light,Size=64,Color=0x513C2F,Align=Center
000002 Please Select Drink Type กรุณาเลือกประเภทเครื่องดื่ม
-
- Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30
-000003 Page catalog body Best Sellers เมนูแนะนำ
+ Page catalog body
+ Font=Kanit,Type=Medium,Size=32,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30
+ Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30
+000003 Best Sellers เมนูแนะนำ
000004 Vending\nMachine ตู้สินค้า
000005 Coffee กาแฟ
000006 Tea ชา
@@ -23,8 +24,8 @@ TextID Note English Thai
000013 UNAVAILABLE หมด
- Font=Montserrat,Type=Regular,Size=20,Color=0x746253,Align=Center-All Font=Montserrat,Type=Regular,Size=24,Color=0x746253,Align=Center-All
- Font=Montserrat,Type=Bold,Size=20,Color=0x746253,Align=Center-All Font=Montserrat,Type=Bold,Size=24,Color=0x746253,Align=Center-All
+ Font=Montserrat,Type=Regular,Size=20,Color=0x0025FF,Align=Center-All Font=Montserrat,Type=Regular,Size=24,Color=0x746253,Align=Center-All
+ Font=Montserrat,Type=Bold,Size=20,Color=0x0025FF,Align=Center-All Font=Montserrat,Type=Bold,Size=24,Color=0x746253,Align=Center-All
000014 our specialty เมนูแนะนำ
000015 Coffee กาแฟ
000016 Tea ชา
@@ -42,7 +43,7 @@ TextID Note English Thai
Font=Kanit,Type=Regular,Size=22,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center
Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=24,Color=0x513C2F,Align=Center
Font=Kanit,Type=Regular,Size=22,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0xCFCFCF,Align=Center
-000040 Not sweet ไม่หวาน
+ Not sweet ไม่หวาน
000041 Little หวานจุบจิบ
000042 Less หวานน้อย
000043 Perfect หวานพอดี
@@ -76,8 +77,8 @@ TextID Note English Thai
000061 =+ SUGAR 2 g (8 cal) =+ น้ำตาล 2 g (8 cal)
000062 =+ SUGAR 5 g (19 cal) =+ น้ำตาล 5 g (19 cal)
000063 =+ SUGAR 7 g (26 cal) =+ น้ำตาล 7 g (26 cal)
-
- Font=Kanit,Type=Medium,Size=36,Color=0xDE794E
+ Text
+ Font=Kanit,Type=Medium,Size=36,Color=0x0025FF
000064 Extra topping เพิ่มส่วนผสมพิเศษ
000065 Sweetness level ระดับความหวาน
000066 Straw and Lid หลอด และ ฝา
@@ -85,31 +86,33 @@ TextID Note English Thai
000103 Vegan substitution นมทางเลือก
Text
- Font=Kanit,Type=Regular,Size=36,Color=0x513C2F
+ Font=Kanit,Type=Regular,Size=36,Color=0x0025FF
000070 I want a straw รับหลอด
000071 I want a lid รับฝา
-
- Font=Opun,Type=Medium,Size=10,Color=0xDE794E
+ Text
+ Font=Opun,Type=Medium,Size=10,Color=0x8092FF
000072 Ice will be ready at น้ำแข็งจะพร้อมเวลา
-
+ Text
Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF
Font=Kanit,Type=Regular,Size=36,Color=0x746253
000073 Pay now ซื้อเลย
- Font=Kanit,Type=Regular,Size=36,Color=0x746253
+ Text
+ Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF
Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF
000074 Cancel ยกเลิก
- Font=Kanit,Type=Light,Size=36,Color=0xFF0000
+ Text
+ Font=Kanit,Type=Light,Size=36,Color=0x0025FF
000075 Please choose drink type โปรดเลือกประเภทเครื่องดื่ม
-
- Font=Kanit,Type=Regular,Size=28,Color=0x513C2F
- Font=Kanit,Type=Medium,Size=28,Color=0x513C2F
- Font=Kanit,Type=Regular,Size=28,Color=0x9D9D9D
- Font=Kanit,Type=Regular,Size=28,Color=0xCFCFCF
+ Text
+ Font=Kanit,Type=Regular,Size=28,Color=0x0025FF,PressColor=0xFFFFFF
+ Font=Kanit,Type=Medium,Size=28,Color=0xFFFFFF
+ Font=Kanit,Type=Regular,Size=28,Color=0xA6B2FF
+ Font=Kanit,Type=Regular,Size=28,Color=0x8092FF
000081 Hot ร้อน
000082 Iced เย็น
000083 Blend ปั่น
- Font=Kanit,Type=Regular,Size=24,Color=0x513C2F
+ Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,PressColor=0xFFFFFF
000084 Normal ปกติ
@@ -117,7 +120,7 @@ TextID Note English Thai
Left of check box
- Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30
+ Font=Kanit,Type=Light,Size=29,Color=0xA6B2FF,Align=end-center-vertical,LineHeight=30
000090 Out of straw หลอดหมด
000091 Out of lid ฝาหมด
000092 Only smoothie\n avalible สำหรับเมนูปั่น
@@ -125,7 +128,7 @@ TextID Note English Thai
Text topping extra
- Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46
+ Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,LineHeight=46
000100 1 Shot of Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15] เอสเพรสโซ่ 1 ช็อต\n[ใช้เวลาชงนานขึ้น 1 นาที###Font=KanitLight,Size=15]
000101 Add extra Oreo crunchy เพิ่มท็อปปิ้งโอริโอภูเขาไฟ
000102 1 Shot of Single Origin Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15] เอสเพรสโซ Single Origin 1 ช็อต\n[ใช้เวลาชงนานขึ้น 1 นาที###Font=KanitLight,Size=15]
@@ -143,8 +146,8 @@ TextID Note English Thai
Page brewing
+ Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=30
Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center,LineHeight=30
- Font=Kanit,Type=Regular,Size=36,Color=0xDE794E,Align=Centerr,LineHeight=30
000400 Notify us about lid problem แจ้งเตือนฝาติด
000401 Notify us about straw problem แจ้งเตือนหลอดติด
@@ -165,11 +168,12 @@ TextID Note English Thai
000407 Order next drink สั่งแก้วถัดไป
Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center
000408 Next customer can order while waiting ลูกค้าท่านถัดไปสั่งเครื่องดื่มรอได้เลย
- Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90 Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90
+ Font=Roboto,Type=Bold,Size=80,Color=0x0025FF,Align=Center,LineHeight=90 Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90
000409 The Previous Drink\nHas Not Been Collected มีเครื่องดื่มค้างอยู่\nในช่องรับเครื่องดื่ม
- Font=Roboto,Type=Regular,Size=36,Color=0x513C2F,Align=Center,LineHeight=50 Font=Roboto,Type=Regular,Size=43,Color=0x513C2F,Align=Center,LineHeight=40
-000410 Please press the button below to open the door.\nTake the drink out.\nAnd start odering your drink. กรุณกดปุ่มเปิดช่องรับเครื่องดื่ม\nนำเครื่องดื่มที่ค้างอยู่ออกจากช่อง\nก่อนเริ่มสั่งเครื่องดื่มของคุณ
- Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50 Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
+ Font=Roboto,Type=Regular,Size=36,Color=0x0025FF,Align=Center,LineHeight=50 Font=Roboto,Type=Regular,Size=43,Color=0x513C2F,Align=Center,LineHeight=40
+000410 Please press the button below to open the door.\nTake the drink out.\nAnd start ordering your drink. กรุณกดปุ่มเปิดช่องรับเครื่องดื่ม\nนำเครื่องดื่มที่ค้างอยู่ออกจากช่อง\nก่อนเริ่มสั่งเครื่องดื่มของคุณ
+ Font=Kanit,Type=Regular,Size=64,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=50 Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
+ Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
000411 Press Here กดที่นี่
@@ -848,9 +852,9 @@ TextID Note English Thai
800771 Type number. ใส่ตัวเลข
800772
800773 Exhaust Fan Test ทดสอบพัดลมดูดอากาศ
-800774
-800775
-800776
+800774 Check Cam powder ตรวจสอบลูกเบี้ยว
+800775 Cam powder test pass ทดสอบผ่าน
+800776 Cam powder test fail ทดสอบไม่ผ่าน
810000
810001 Start เริ่มทำงาน
810002 Stop หยุดทำงาน
@@ -889,7 +893,7 @@ TextID Note English Thai
810034 Hot Water volume ปริมาณน้ำร้อน ml
810035 Preheat when after make espresso ( minute ) pre-heat เมื่อหลังทำกาแฟ( นาที )
810036
-810037
+810037 Time to Test จำนวนครั้ง
810038
810039
810040
@@ -954,8 +958,8 @@ TextID Note English Thai
810150 Volume ปริมาณ
810151 Water Tank ถังน้ำดี
810152 Day วันที่
-810153
-810154
+810153 Weight น้ำหนัก
+810154 calibrate calibrate
810155
810156
810157
@@ -1279,3 +1283,5 @@ TextID Note English Thai
2100054 Sleep mode will be turn on
when machine operating. Sleep mode will be turn on
when machine operating.
2100055 Sleep mode will be turn off
when machine operating. Sleep mode will be turn off
when machine operating.
2100056 Please check before confirming Please check before confirming
+2100057 Fan module Fan module
+2200000 Fan พัดลม
diff --git a/inter/sgp/xml/event/triple_promotion_s1topleft_and_s1topright_and_s1botleft.lxml b/inter/sgp/xml/event/triple_promotion_s1topleft_and_s1topright_and_s1botleft.lxml
index 17bb50f5..5c547a01 100644
--- a/inter/sgp/xml/event/triple_promotion_s1topleft_and_s1topright_and_s1botleft.lxml
+++ b/inter/sgp/xml/event/triple_promotion_s1topleft_and_s1topright_and_s1botleft.lxml
@@ -395,7 +395,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
CARAMEL LATTE
คาราเมลลาเต้
@@ -411,7 +411,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Espresso, Milk,\nCaramel Syrup
กาแฟ นม และ นม\nน้ำเชื่อมคาราเมล
@@ -426,7 +426,7 @@
538
390
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
16
@@ -434,8 +434,8 @@
134
44
$52-21-01-0007.Button
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot_db.png"
86
@@ -443,8 +443,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-01-0007.Button
StringFmt( $52-21-01-0007.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -453,8 +453,8 @@
538
134
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold_db.png"
$52-21-02-0004.Button
@@ -463,8 +463,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-02-0004.Button
StringFmt( $52-21-02-0004.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -473,8 +473,8 @@
538
134
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend_db.png"
$52-21-03-0004.Button
@@ -483,8 +483,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-03-0004.Button
StringFmt( $52-21-03-0004.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -541,7 +541,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -718,7 +718,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
OREO SMOOTHIE
โอริโอ้ปั่นภูเขาไฟ
@@ -735,7 +735,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
VOLCANO
@@ -753,7 +753,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Milk, Sugar, Oreo, Ice
นม น้ำตาล โอริโอ้ \n
@@ -768,7 +768,7 @@
538
390
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
16
@@ -776,8 +776,8 @@
134
44
"Invisible"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot_db.png"
86
@@ -785,8 +785,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -795,8 +795,8 @@
538
134
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold_db.png"
"Invisible"
@@ -805,8 +805,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -815,8 +815,8 @@
538
134
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend_db.png"
$52-03-03-0009.Button
@@ -825,8 +825,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-03-03-0009.Button
StringFmt( $52-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -879,7 +879,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1074,7 +1074,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
MATCHA LATTE
มัทฉะลาเต้
@@ -1090,7 +1090,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Green Tea, Milk, Sugar, Ice
ชาเชียว นม
@@ -1105,14 +1105,14 @@
538
390
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
16
538
$52-02-01-0026.Button
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot_db.png"
86
@@ -1120,16 +1120,16 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-01-0026.Button
StringFmt( $52-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) ; test
146
538
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold_db.png"
$52-02-02-0026.Button
@@ -1138,16 +1138,16 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-02-0026.Button
StringFmt( $52-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) ; test
276
538
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend_db.png"
$52-02-03-0026.Button
@@ -1156,8 +1156,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-03-0026.Button
StringFmt( $52-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1214,7 +1214,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1403,7 +1403,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
PEPSI YUZU
เป๊ปซี่ยูซุ
@@ -1419,7 +1419,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Pepsi, Yuzu Syrup& Ice
เป๊ปซี่ น้ำเชื่อมยูซุ โซดา
@@ -1447,8 +1447,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1465,8 +1465,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-02-0076.Button
StringFmt( $52-05-02-0076.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1483,8 +1483,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1537,7 +1537,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1706,7 +1706,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
LATTE
ลาเต้
@@ -1722,7 +1722,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Espresso, Milk,\n milk
กาแฟ นม และ นม
@@ -1750,8 +1750,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-01-0004.Button
StringFmt( $52-21-01-0004.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1768,8 +1768,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-02-0002.Button
StringFmt( $52-21-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1786,8 +1786,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-03-0002.Button
StringFmt( $52-21-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1844,7 +1844,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -2013,7 +2013,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
THAI MILK TEA
ชานมไทย
@@ -2029,7 +2029,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Thai tea, Sugar, milk
ชาไทย และ นม
@@ -2057,8 +2057,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-01-0039.Button
StringFmt( $52-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2075,8 +2075,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-02-0039.Button
StringFmt( $52-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2093,8 +2093,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-03-0039.Button
StringFmt( $52-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2151,7 +2151,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -2311,7 +2311,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
PLUM \nLIMENADE SODA
บ๊วยมะนาวโซดา
@@ -2327,7 +2327,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Ume Syrup, Limenade, Soda
น้ำเชื่อมบ๊วย มะนาว โซดา \n
@@ -2355,8 +2355,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2373,8 +2373,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-02-0025.Button
StringFmt( $52-05-02-0025.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2391,8 +2391,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-03-0025.Button
StringFmt( $52-05-03-0025.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2445,7 +2445,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
diff --git a/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml b/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml
index f8a524c4..1fe5d166 100644
--- a/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml
+++ b/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml
@@ -395,7 +395,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
MOCHA
มอคค่า
@@ -411,7 +411,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Espresso, Cocoa, Milk, Sugar
กาแฟ นม โกโก้ และ น้ำตาล
@@ -426,7 +426,7 @@
538
390
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
16
@@ -434,8 +434,8 @@
134
44
$52-21-01-0006.Button
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot_db.png"
86
@@ -443,8 +443,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-01-0006.Button
StringFmt( $52-21-01-0006.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -453,8 +453,8 @@
538
134
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold_db.png"
$52-21-02-0003.Button
@@ -463,8 +463,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-02-0003.Button
StringFmt( $52-21-02-0003.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -473,8 +473,8 @@
538
134
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend_db.png"
$52-21-03-0003.Button
@@ -483,8 +483,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-03-0003.Button
StringFmt( $52-21-03-0003.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -541,7 +541,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -718,7 +718,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
MILO SMOOTHIE
โอวัลตินปั่นภูเขาไฟ
@@ -753,7 +753,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Milo, Sugar, milk
โอวัลติน น้ำตาล และ นม
@@ -768,7 +768,7 @@
538
390
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
16
@@ -776,8 +776,8 @@
134
44
"Invisible"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot_db.png"
86
@@ -785,8 +785,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -795,8 +795,8 @@
538
134
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold_db.png"
"Invisible"
@@ -805,8 +805,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -815,8 +815,8 @@
538
134
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend_db.png"
$52-03-03-0049.Button
@@ -825,8 +825,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-03-03-0049.Button
StringFmt( $52-03-03-0049.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -879,7 +879,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1074,7 +1074,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
THAI MILK TEA
ชานมไทย
@@ -1090,7 +1090,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Thai tea, Sugar, milk
ชาไทย และ นม
@@ -1105,14 +1105,14 @@
538
390
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
16
538
$52-02-01-0039.Button
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot_db.png"
86
@@ -1120,16 +1120,16 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-01-0039.Button
StringFmt( $52-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
146
538
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold_db.png"
$52-02-02-0039.Button
@@ -1138,16 +1138,16 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-02-0039.Button
StringFmt( $52-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
276
538
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend_db.png"
$52-02-03-0039.Button
@@ -1156,8 +1156,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-03-0039.Button
StringFmt( $52-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1214,7 +1214,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1403,7 +1403,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
YUZU SODA
ยูซุโซดา
@@ -1419,7 +1419,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Yuzu Syrup, Soda, Ice
น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง
@@ -1447,8 +1447,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1465,8 +1465,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-02-0045.Button
StringFmt( $52-05-02-0045.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1483,8 +1483,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1537,7 +1537,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1706,7 +1706,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
CAPPUCCINO
คาปูชิโน่
@@ -1722,7 +1722,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Espresso, Milk, Foamed milk
กาแฟ นม และ ฟองนม
@@ -1750,8 +1750,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-01-0005.Button
StringFmt( $52-21-01-0005.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1768,8 +1768,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-31-02-0002.Button
StringFmt( $52-31-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1786,8 +1786,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-31-03-0002.Button
StringFmt( $52-31-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1844,7 +1844,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -2013,7 +2013,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
MATCHA LATTE
มัทฉะลาเต้
@@ -2029,7 +2029,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Matcha, Milk
ชาเขียวมัทฉะ และ นมอุ่น
@@ -2057,8 +2057,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-01-0026.Button
StringFmt( $52-02-01-0026.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2075,8 +2075,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-02-0026.Button
StringFmt( $52-02-02-0026.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2093,8 +2093,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-03-0026.Button
StringFmt( $52-02-03-0026.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2151,7 +2151,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -2311,7 +2311,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
PEPSI PLUM
เป๊ปซี่บ๊วย
@@ -2327,7 +2327,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Pepsi, Ume Syrup & Ice
เป๊ปซี่ น้ำเชื่อมบ๊วย โซดา
@@ -2355,8 +2355,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2373,8 +2373,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-02-0074.Button
StringFmt( $52-05-02-0074.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2391,8 +2391,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-03-0074.Button
StringFmt( $52-05-03-0074.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2445,7 +2445,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
diff --git a/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml b/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml
index 80ca600c..ba313d48 100644
--- a/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml
+++ b/inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml
@@ -395,7 +395,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
CAPPUCCINO
คาปูชิโน่
@@ -411,7 +411,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Espresso, Milk, Foamed milk
กาแฟ นม และ ฟองนม
@@ -426,7 +426,7 @@
538
390
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
16
@@ -434,8 +434,8 @@
134
44
$52-21-01-0005.Button
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot_db.png"
86
@@ -443,8 +443,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-01-0005.Button
StringFmt( $52-21-01-0005.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -453,8 +453,8 @@
538
134
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold_db.png"
$52-31-02-0002.Button
@@ -463,8 +463,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-31-02-0002.Button
StringFmt( $52-31-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -473,8 +473,8 @@
538
134
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend_db.png"
$52-31-03-0002.Button
@@ -483,8 +483,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-31-03-0002.Button
StringFmt( $52-31-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -541,7 +541,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -718,7 +718,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
CHOCOLATE SHAKE
โกโก้โปรตีน
@@ -734,7 +734,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Whey protein,\nCocoa, & Milk
เวย์โปรตีน โกโก้ นม
@@ -749,7 +749,7 @@
538
390
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
16
@@ -757,8 +757,8 @@
134
44
"Invisible"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot_db.png"
86
@@ -766,8 +766,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -776,8 +776,8 @@
538
134
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold_db.png"
$52-04-02-0002.Button
@@ -786,8 +786,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-04-02-0002.Button
StringFmt( $52-04-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -796,8 +796,8 @@
538
134
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend_db.png"
"Invisible"
@@ -806,8 +806,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -860,7 +860,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1037,7 +1037,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
STRAWBERRY MILK
สตอเบอร์รี่ปั่น
@@ -1054,7 +1054,7 @@
333
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
OREO VOLCANO
โอริโอ้ภูเขาไฟ
@@ -1072,7 +1072,7 @@
25
333
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Strawberry Syrup, Milk,\nSugar, Oreo
น้ำเชื่อมสตอเบอร์รี่ นม น้ำตาล \n Oreo
@@ -1087,7 +1087,7 @@
538
390
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/option_deactive.png"
16
@@ -1095,8 +1095,8 @@
134
44
"Invisible"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot_db.png"
86
@@ -1104,8 +1104,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1114,8 +1114,8 @@
538
134
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold_db.png"
"Invisible"
@@ -1124,8 +1124,8 @@
23
440
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1134,8 +1134,8 @@
538
134
44
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png"
- "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend_db.png"
$52-03-03-0027.Button
@@ -1144,8 +1144,8 @@
23
440
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-03-03-0027.Button
StringFmt( $52-03-03-0027.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1198,7 +1198,7 @@
542
21
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1387,7 +1387,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
COCONUT PEPSI
@@ -1403,7 +1403,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Coconut Syrup, Pepsi and Soda
@@ -1431,8 +1431,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1449,8 +1449,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-02-0117.Button
StringFmt( $52-05-02-0117.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1467,8 +1467,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1521,7 +1521,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1681,7 +1681,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
AMERICANO
กาแฟดำ(อเมริกาโน)
@@ -1697,7 +1697,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Espresso, Water
กาแฟ และน้ำ
@@ -1725,8 +1725,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-01-0003.Button
StringFmt( $52-21-01-0003.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1743,8 +1743,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-21-02-0001.Button
StringFmt( $52-21-02-0001.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1761,8 +1761,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -1819,7 +1819,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -1988,7 +1988,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
THAI MILK TEA
ชานมไทย
@@ -2004,7 +2004,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Thai tea, Sugar, milk
ชาไทย และ นม
@@ -2032,8 +2032,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-01-0039.Button
StringFmt( $52-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2050,8 +2050,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-02-0039.Button
StringFmt( $52-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2068,8 +2068,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-02-03-0039.Button
StringFmt( $52-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2126,7 +2126,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
@@ -2286,7 +2286,7 @@ eval(
222
"multi2"
KanitMediumTTF
- 0x322B26
+ HeadlineColor
LYCHEE SODA
น้ำลิ้นจี่โซดา
@@ -2302,7 +2302,7 @@ eval(
14
222
KanitMediumTTF
- 0x6F5F51
+ BodyTextColor
Lychee Syrup, Soda & Ice
น้ำเชื่อมลิ้นจี่ โซดา
@@ -2330,8 +2330,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
"Invisible"
StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2348,8 +2348,8 @@ eval(
TextPriceMenuSize
220
KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-02-0033.Button
StringFmt( $52-05-02-0033.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2366,8 +2366,8 @@ eval(
TextPriceMenuSize
220
KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
+ WTCBlueColor
+ WTCWhiteColor
$52-05-03-0033.Button
StringFmt( $52-05-03-0033.Price , DisplayFormat, PreScaleConvertShow) ; test
@@ -2420,7 +2420,7 @@ eval(
266
10
OpunMediumTTF
- 0xDE794E
+ WTCMediumBlueColor
ice_tab_process_show
ice_show_open
diff --git a/inter/sgp/xml/menu_catalog_new.lxml b/inter/sgp/xml/menu_catalog_new.lxml
index 01d8ff98..fbabb4ed 100644
--- a/inter/sgp/xml/menu_catalog_new.lxml
+++ b/inter/sgp/xml/menu_catalog_new.lxml
@@ -139,7 +139,7 @@
0
494
- "ROOT/taobin_project/image/page3/tab_line_bottom.png"
+ "ROOT/taobin_project/inter/whatthecup/sgp/image/page3_2_en/tab_line_bottom.png"
@@ -155,8 +155,8 @@