pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

MYS: fix coconut text & add promotion free topping oreo

Browse source
This commit is contained in:
Pakin 2024-08-02 13:40:58 +07:00
parent 87de5ee4ec
commit 4a989506e0
14 changed files with 96 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
adv/banner_free_oreo_ontop.mp4 Normal file
View file

Binary file not shown.

3
inter/mys/animation01/play_list.tsv
View file

@ -570,8 +570,7 @@ Coconut Jasmine tea 12-02-02-0065 1 10 62 23 24 120 7:00 23
Coconut Jasmine tea 12-02-03-0065 1 10 62 23 41 24 120 8:00 23
PEPSI COCONUT SMOOTHIE 12-05-03-0091 1 23 62 14 41
ESPRESSO SHAKE 12-24-02-0004 1 25 26 2 3 4 5 17 23 24 230 3:50 28

Can't render this file because it has a wrong number of fields in line 40.

BIN
inter/mys/image/page_doing/txt_2_en.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Before After
Before After

BIN
inter/mys/image/page_doing/txt_61_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
inter/mys/image/page_doing/txt_62_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 28 KiB

10
inter/mys/xml/event/tricker.ev
View file

@ -20,6 +20,10 @@ Var FromProThaiTea = 0
Var ProYuzuEnable = 0
Var FromProYuzu = 0
; Pro free oreo topping
Var PromotionOreoToppingFreeEnable = 0
If SystemDateMonthInt = 6 Then
If SystemDateDayInt >= 15 Then
Var ProThaiTeaEnable = 1
@ -46,9 +50,15 @@ If SystemDateMonthInt = 8 Then
Else
Var ProThaiTeaEnable = 0
Var ProYuzuEnable = 0
Var PromotionOreoToppingFreeEnable = 1
EndIf
EndIf
If SystemDateMonthInt = 9 Then
Var PromotionOreoToppingFreeEnable = 1
EndIf
If BoxID = 177746 Then
Var ProThaiTeaEnable = 1
Var ProYuzuEnable = 1

8
inter/mys/xml/page_catalog_group_coffee.lxml
View file

@ -20897,17 +20897,17 @@
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
Var DescLang[0][5] = ""
Var NameLang[1][0] = ""
Var NameLang[1][0] = "Iced Coconut Americano"
Var NameLang[1][1] = ""
Var NameLang[1][2] = ""
Var NameLang[1][3] = ""
Var NameLang[1][4] = ""
Var NameLang[1][4] = "AMERICANO KELAPA"
Var NameLang[1][5] = ""
Var DescLang[1][0] = ""
Var DescLang[1][0] = "Espresso, Coconut Syrup,\nSugar, Water"
Var DescLang[1][1] = ""
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
Var DescLang[1][4] = "Espresso, Sirap Kelapa, Gula & Air"
Var DescLang[1][5] = ""
Var NameLang[2][0] = ""
Var NameLang[2][1] = ""

10
inter/mys/xml/page_catalog_group_health.lxml
View file

@ -6960,7 +6960,7 @@
Var PD_CODE2 = "12-02-02-1040"
Var PD_CODE3 = "##-##-##-####"
; begin lang
Var aliasName[0] = "BLACK TEA LIMENADE"
Var aliasName[0] = "BLACK TEA \nLIMENADE"
Var aliasDesc[0] = "Thai tea, Limenade and Water"
Var aliasName[1] = "ชาดำมะนาว"
Var aliasDesc[1] = "ชาไทย ผงมะนาว และน้ำ"
@ -6972,7 +6972,7 @@
Var aliasDesc[4] = "Teh Thai, Limau, Air"
Var aliasName[5] = "-"
Var aliasDesc[5] = "-"
Var NameLang[0][0] = "Hot BLACK TEA LIMENADE"
Var NameLang[0][0] = "Hot BLACK TEA LIMENADE"
Var NameLang[0][1] = "ชาดำมะนาวร้อน"
Var NameLang[0][2] = "-"
Var NameLang[0][3] = "-"
@ -6984,7 +6984,7 @@
Var DescLang[0][3] = "-"
Var DescLang[0][4] = "Teh Thai, Limau, Air"
Var DescLang[0][5] = ""
Var NameLang[1][0] = "Iced BLACK TEA LIMENADE"
Var NameLang[1][0] = "Iced BLACK TEA LIMENADE"
Var NameLang[1][1] = "ชาดำมะนาวเย็น"
Var NameLang[1][2] = "-"
Var NameLang[1][3] = "-"
@ -7055,9 +7055,9 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<LanguageGroup>
<LanguageSlot1>BLACK TEA LIMENADE</LanguageSlot1>
<LanguageSlot1>BLACK TEA \nLIMENADE</LanguageSlot1>
<LanguageSlot2>ชาดำมะนาว</LanguageSlot2>
<LanguageSlot3>BLACK TEA LIMENADE</LanguageSlot3>
<LanguageSlot3>BLACK TEA \nLIMENADE</LanguageSlot3>
<LanguageSlot4>ชาดำมะนาว</LanguageSlot4>
<LanguageSlot5>TEH O LIMAU</LanguageSlot5>
<LanguageSlot6>ชาดำมะนาว</LanguageSlot6>

4
inter/mys/xml/page_catalog_group_milk.lxml
View file

@ -2334,11 +2334,11 @@
Var DescLang[1][3] = ""
Var DescLang[1][4] = "Sirap Kelapa, Koko, Susu & Air"
Var DescLang[1][5] = ""
Var NameLang[2][0] = "Coconut\nChocolate milk SMOOTHIE"
Var NameLang[2][0] = "Coconut Chocolate \nmilk SMOOTHIE###size=58"
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = "SMOOTHIE SUSU KOKO KELAPA"
Var NameLang[2][4] = "SMOOTHIE SUSU \nKOKO KELAPA###size=58"
Var NameLang[2][5] = ""
Var DescLang[2][0] = "Coconut syrup, Cocoa, Milk,\nWater"
Var DescLang[2][1] = ""

2
inter/mys/xml/page_catalog_group_other.lxml
View file

@ -15014,7 +15014,7 @@
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
Var DescLang[1][5] = ""
Var NameLang[2][0] = "Coconut Smoothie SMOOTHIE"
Var NameLang[2][0] = "Coconut Smoothie"
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""

22
inter/mys/xml/page_catalog_group_tea.lxml
View file

@ -5357,11 +5357,11 @@
Var DescLang[1][3] = ""
Var DescLang[1][4] = "Sirap Kelapa, Teh Thai, Susu & Air"
Var DescLang[1][5] = ""
Var NameLang[2][0] = "Coconut\nThai Milk Tea SMOOTHIE"
Var NameLang[2][0] = "Coconut Thai Milk \nTea SMOOTHIE###size=58"
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = "SMOOTHIE TEH SUSU THAI KELAPA"
Var NameLang[2][4] = "SMOOTHIE TEH SUSU THAI KELAPA###size=58"
Var NameLang[2][5] = ""
Var DescLang[2][0] = "Coconut Syrup, Thai Tea, Milk \nWater"
Var DescLang[2][1] = ""
@ -6449,11 +6449,11 @@
Var DescLang[1][3] = ""
Var DescLang[1][4] = "Sirap Kelapa, Teh Jasmine & Air"
Var DescLang[1][5] = ""
Var NameLang[2][0] = "Coconut\nJasmine tea SMOOTHIE"
Var NameLang[2][0] = "Coconut Jasmine \ntea SMOOTHIE###size=58"
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = "SMOOTHIE TEH JASMINE KELAPA"
Var NameLang[2][4] = "SMOOTHIE TEH \nJASMINE KELAPA###size=58"
Var NameLang[2][5] = ""
Var DescLang[2][0] = "Coconut Syrup, Jasmine Tea and Water"
Var DescLang[2][1] = ""
@ -6993,11 +6993,11 @@
Var DescLang[1][3] = ""
Var DescLang[1][4] = "Sirap Kelapa, Teh Jasmine & Susu"
Var DescLang[1][5] = ""
Var NameLang[2][0] = "Coconut\nJasmine milk tea SMOOTHIE"
Var NameLang[2][0] = "Coconut Jasmine milk \ntea SMOOTHIE###size=58"
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = "SMOOTHIE TEH SUSU JASMINE KELAPA"
Var NameLang[2][4] = "SMOOTHIE TEH SUSU \nJASMINE KELAPA###size=58"
Var NameLang[2][5] = ""
Var DescLang[2][0] = "Coconut Syrup, Jasmine Tea, Milk"
Var DescLang[2][1] = ""
@ -8359,11 +8359,11 @@
Var DescLang[1][3] = ""
Var DescLang[1][4] = "Sirap Kelapa, Matcha, Susu & Air"
Var DescLang[1][5] = ""
Var NameLang[2][0] = "Coconut\nMatcha latte SMOOTHIE"
Var NameLang[2][0] = "Coconut Matcha \nlatte SMOOTHIE###size=58"
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = "SMOOTHIE MACTHA LATTE KELAPA"
Var NameLang[2][4] = "SMOOTHIE MACTHA \nLATTE KELAPA###size=58"
Var NameLang[2][5] = ""
Var DescLang[2][0] = "Coconut Syrup, Matcha Milk \nWater"
Var DescLang[2][1] = ""
@ -9729,7 +9729,7 @@
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = "SMOOTHIE MATCHA KELAPA"
Var NameLang[2][4] = "SMOOTHIE MATCHA KELAPA###size=58"
Var NameLang[2][5] = ""
Var DescLang[2][0] = "Coconut Syrup, Matcha and Water"
Var DescLang[2][1] = ""
@ -11913,11 +11913,11 @@
Var DescLang[1][3] = ""
Var DescLang[1][4] = "Sirap Kelapa, Teh Thai & Air"
Var DescLang[1][5] = ""
Var NameLang[2][0] = "Coconut\nThai Black Tea SMOOTHIE"
Var NameLang[2][0] = "Coconut Thai Black \nTea SMOOTHIE###size=58"
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = "SMOOTHIE TEH THAI KELAPA"
Var NameLang[2][4] = "SMOOTHIE TEH THAI KELAPA###size=58"
Var NameLang[2][5] = ""
Var DescLang[2][0] = "Coconut Syrup, Thai Tea and Water"
Var DescLang[2][1] = ""

53
inter/mys/xml/page_topping_select6.lxml
View file

@ -106,6 +106,10 @@
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 510
Var text_show_normal_x = 408
Var text_x_free_adjust = 100
If PromotionOreoToppingFreeEnable = 1 Then
Var text_x_free_adjust = text_x_free_adjust + 5
EndIf
Else
Var DirImage = "ROOT/taobin_project/image/topping2"
@ -120,9 +124,15 @@
Var topping_shot_price_x = 600
Var text_x_add_oreo_price = 490
Var text_show_normal_x = 386
Var text_x_free_adjust = 70
If PromotionOreoToppingFreeEnable = 1 Then
Var text_x_free_adjust = text_x_free_adjust + 30
EndIf
EndIf
Var text_x_free_topping = text_x_add_oreo_price + text_x_free_adjust
Var bg_strawlid = DirImage + "/bg_strawlid.png"
Var bg_straw_only = DirImage + "/bg_straw_only.png"
Var bg_lid_only = DirImage + "/bg_lid_only.png"
@ -311,6 +321,22 @@
Var text_milk_choice_price_x = 265
DEBUGVAR PromotionOreoToppingFreeEnable
If PromotionOreoToppingFreeEnable = 1 Then
Var toppingID6price2 = 0
Var text_price_6 = "(Free)"
EndIf
DEBUGVAR toppingID6price2
DEBUGVAR text_price_6
If show_eng = "true" Then
Var CerealMilkX = 400
Else
Var CerealMilkX = 270
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -397,6 +423,10 @@
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 510
Var text_show_normal_x = 408
Var text_x_free_adjust = 100
If PromotionOreoToppingFreeEnable = 0 Then
Var text_x_free_adjust = text_x_free_adjust + 5
EndIf
Else
Var DirImage = "ROOT/taobin_project/image/topping2"
@ -411,9 +441,16 @@
Var topping_shot_price_x = 600
Var text_x_add_oreo_price = 490
Var text_show_normal_x = 386
Var text_x_free_adjust = 70
If PromotionOreoToppingFreeEnable = 0 Then
Var text_x_free_adjust = text_x_free_adjust + 30
EndIf
EndIf
Var text_x_free_topping = text_x_add_oreo_price + text_x_free_adjust
Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png"
Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png"
@ -600,6 +637,11 @@
If TOPPING6 = "Topping-Volcano" Then
If PromotionOreoToppingFreeEnable = 1 Then
Var toppingID6price2 = 0
Var text_price_6 = "(Free)"
EndIf
If toppingID6price2 > 0 Then
DEBUGVAR toppingID6price2
@ -620,6 +662,10 @@
Else
Var text_price_6 = ""
If PromotionOreoToppingFreeEnable = 1 Then
Var text_price_6 = "(Free)"
EndIf
EndIf
If blend_button_state = "PressForever" Then
@ -691,11 +737,18 @@
STRCONTAIN "12-04" UserSelectProductCode IsWheyMenu
STRCONTAIN "12-24" UserSelectProductCode IsWheyV2Menu
If IsWheyMenu = "true" Then
Var showOreoAddEnable = "Enable"
Var showText8 = "Invisible"
EndIf
If IsWheyV2Menu = "true" Then
Var showOreoAddEnable = "Enable"
Var showText8 = "Invisible"
EndIf
STRCONTAIN "9701" BrewParam IgnoreLidStraw
DEBUGVAR BrewParam

5
xml/multi_ads/ads_path.ev
View file

@ -45,6 +45,11 @@ DEBUGVAR CurrentTotalCupInt
Var XMLLiveInfoEnable = 1
; xml verson 8.72
If CountryName = "Singapore" Then
Var XMLLiveInfoEnable = 0
EndIf
If XMLLiveInfoEnable = 0 Then
Var showMultiAds = "false"

4
xml/page_drinkok.xml
View file

@ -464,6 +464,10 @@
If show_eng = "true" Then
Var PlaySoundStraw = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw.mp3"
If CountryName = "Malaysia" Then
Var PlaySoundStraw = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw_without_change.m4a"
EndIf
If CountryName = "Australia" Then
Var PlaySoundStraw = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw_without_change.m4a"
EndIf