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

THAI: Update drink image and re-order menu

Browse source
This commit is contained in:
Kenta420 2025-04-10 15:53:50 +07:00
parent eb094dcbe9
commit 8373d102e3
22 changed files with 9936 additions and 4335 deletions
Download patch file Download diff file Expand all files Collapse all files

6
animation01/play_list.tsv
View file

@ -1357,3 +1357,9 @@ Macallan Lumina Mizuwari 11-99-05-0055 1 27 28 24 100 7:40 32
มัทฉะลาเต้ คูณ 3 ร้อน 12-02-01-0104 1 8 9 70 24 100 7:40 32
มัทฉะลาเต้ คูณ 3 เย็น 12-02-02-0104 1 8 9 70 23 24 100 7:40 32
มัทฉะลาเต้ คูณ 3 ปั่น 12-02-03-0104 1 8 9 70 23 41 24 100 7:40 32
ผลไม้ปั่น 12-01-07-0001 1 41 41 41 41 41 24 100 7:40 32

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

BIN
image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 71 KiB

Before After
Before After

BIN
image/page_drink_disable_n2/bn_Matcha_Latte_X3.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 71 KiB

Before After
Before After

BIN
image/page_drink_disable_n2/bn_Pure_Matcha_X3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 66 KiB

BIN
image/page_drink_n/bn_Matcha_Latte_Premium.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 77 KiB

Before After
Before After

BIN
image/page_drink_n/bn_Matcha_Latte_X3.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 77 KiB

Before After
Before After

BIN
image/page_drink_n/bn_Pure_Matcha_X3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 72 KiB

BIN
image/page_drink_picture2_n/bn_Matcha_Latte_Premium.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before After
Before After

BIN
image/page_drink_picture2_n/bn_Pure_Matcha_X3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
image/page_drink_press_n/bn_Matcha_Latte_Premium.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 77 KiB

Before After
Before After

BIN
image/page_drink_press_n/bn_Matcha_Latte_X3.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 77 KiB

Before After
Before After

BIN
image/page_drink_press_n/bn_Pure_Matcha_X3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 72 KiB

4810
xml/event/double_promotion_kingdom_thai_tea_and_matcha_every_day.xml
View file

File diff suppressed because it is too large Load diff

4809
xml/event/double_promotion_kingdom_thai_tea_and_pepsi_x_taobin.xml
View file

File diff suppressed because it is too large Load diff

1534
xml/event/promotion_kingdom_thai_tea.xml
View file

File diff suppressed because it is too large Load diff

1540
xml/event/promotion_matcha_every_day.xml
View file

File diff suppressed because it is too large Load diff

1492
xml/event/promotion_pepesi_x_taobin.xml
View file

File diff suppressed because it is too large Load diff

20
xml/event/script_common_for_open_promotion_xml.ev
View file

@ -29,7 +29,7 @@ Else
Var CountEnablePromotion = 0
Var FileRecommendToOpen = "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If taobin_nopro = "true" Then
SAVELOG "============================= no promotion ======================="
If CatalogLayoutV3 = 1 Then
@ -42,10 +42,10 @@ Else
DEBUGVAR BigButtonEnable
OpenInst 2 FileRecommendToOpen
TopView "show"
Open "ROOT/taobin_project/xml/page_main_blank.xml"
Else
Open FileRecommendToOpen
@ -54,20 +54,6 @@ Else
EndIf
EndIf
If CoconutMilkPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_coconut_milk.xml"
Var PromotionState2 = "Enable"
If MatchaEveryDayPro = 1 Then
Var PromotionState1 = "Enable"
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_matcha_every_day_and_coconut_milk.xml"
EndIf
Else
If MatchaEveryDayPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_matcha_every_day.xml"
EndIf
EndIf
If KingdomThaiTeaPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_kingdom_thai_tea.xml"
Var PromotionState1 = "Enable"

6
xml/event/tricker.ev
View file

@ -129,12 +129,6 @@ If SystemDateMonthInt = 3 Then
EndIf
If SystemDateMonthInt = 4 Then
Var KingdomThaiTeaPro = 1
Var SongkranSoundCampaign = 1
EndIf
Var JemilaToppingFlag = 1
If SystemDateDayOfWeek = "Wednesday" Then

8
xml/page_catalog_group_pro_matcha_every_day.xml
View file

@ -46,9 +46,9 @@
<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/03/20T00:00:00",$Sum1202020099) </State>
<Button>
<State> $Sum1202020099 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_matcha_tea_pure_x3.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_matcha_tea_pure_x3.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_matcha_tea_pure_x3.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Pure_Matcha_X3.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_Pure_Matcha_X3.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Pure_Matcha_X3.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-02-02-0099, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -57,7 +57,7 @@
Var NameDrinkTH = "เพียวมัทฉะคูณ 3"
Var DrinkDescriptionTH = "มัทฉะ น้ำเย็น"
Var DrinkDescription = "Matcha Cold Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_matcha_tea_pure_x3.png"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Pure_Matcha_X3.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $12-02-02-0099.Price

12
xml/page_catalog_group_recommend.xml
View file

@ -72,9 +72,9 @@
<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1202020099) </State>
<Button>
<State> $Sum1202020099 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_matcha_tea_pure_x3.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_matcha_tea_pure_x3.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_matcha_tea_pure_x3.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Pure_Matcha_X3.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_Pure_Matcha_X3.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Pure_Matcha_X3.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-02-02-0099, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -83,7 +83,7 @@
Var NameDrinkTH = "เพียวมัทฉะคูณ 3"
Var DrinkDescriptionTH = "มัทฉะ น้ำเย็น"
Var DrinkDescription = "Matcha Cold Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_matcha_tea_pure_x3.png"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Pure_Matcha_X3.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $12-02-02-0099.Price
@ -3090,7 +3090,7 @@ Volcano" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-02-01-0103.Button,12-02-02-0103.Button,12-02-03-0103.Button,DateTimeStart="2025/04/20T00:00:00",Var=NewMatchaPremiumX3,Disable=Invisible,$Sum120201010312020201031202030103) </State>
<State> Flag( 12-02-01-0103.Button,12-02-02-0103.Button,12-02-03-0103.Button,Var=NewMatchaPremiumX3,Disable=Invisible,$Sum120201010312020201031202030103) </State>
<Button>
<State> $Sum120201010312020201031202030103 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Matcha_Latte_Premium.png" </Filename>
@ -3345,7 +3345,7 @@ Volcano" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-02-01-0104.Button,12-02-02-0104.Button,12-02-03-0104.Button,DateTimeStart="2025/04/20T00:00:00",Var=NewMatchaPremiumX3,Disable=Invisible,$Sum120201010412020201041202030104) </State>
<State> Flag( 12-02-01-0104.Button,12-02-02-0104.Button,12-02-03-0104.Button,Var=NewMatchaPremiumX3,Disable=Invisible,$Sum120201010412020201041202030104) </State>
<Button>
<State> $Sum120201010412020201041202030104 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Matcha_Latte_X3.png" </Filename>

34
xml/page_catalog_group_tea.xml
View file

@ -1071,7 +1071,7 @@
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-02-01-0103.Button,12-02-02-0103.Button,12-02-03-0103.Button,DateTimeStart="2025/04/20T00:00:00",Var=NewMatchaPremiumX3,$Sum120201010312020201031202030103) </State>
<State> Flag( 12-02-01-0103.Button,12-02-02-0103.Button,12-02-03-0103.Button,Var=NewMatchaPremiumX3,$Sum120201010312020201031202030103) </State>
<Button>
<State> $Sum120201010312020201031202030103 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Matcha_Latte_Premium.png" </Filename>
@ -1326,7 +1326,7 @@
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-02-01-0104.Button,12-02-02-0104.Button,12-02-03-0104.Button,DateTimeStart="2025/04/20T00:00:00",Var=NewMatchaPremiumX3,$Sum120201010412020201041202030104) </State>
<State> Flag( 12-02-01-0104.Button,12-02-02-0104.Button,12-02-03-0104.Button,Var=NewMatchaPremiumX3,$Sum120201010412020201041202030104) </State>
<Button>
<State> $Sum120201010412020201041202030104 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Matcha_Latte_X3.png" </Filename>
@ -1584,9 +1584,9 @@
<State> Flag( 12-02-02-0099.Button,DateTimeStart="2025/03/20T00:00:00",$Sum1202020099) </State>
<Button>
<State> $Sum1202020099 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_matcha_tea_pure_x3.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_matcha_tea_pure_x3.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_matcha_tea_pure_x3.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Pure_Matcha_X3.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_Pure_Matcha_X3.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Pure_Matcha_X3.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-02-02-0099, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -1595,7 +1595,7 @@
Var NameDrinkTH = "เพียวมัทฉะคูณ 3"
Var DrinkDescriptionTH = "มัทฉะ น้ำเย็น"
Var DrinkDescription = "Matcha Cold Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_matcha_tea_pure_x3.png"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Pure_Matcha_X3.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $12-02-02-0099.Price
@ -2953,7 +2953,8 @@ Sugar And Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Western Cocoa Thai Milk Tea" </Value>
<Value> "Western Cocoa
Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>
@ -3208,7 +3209,8 @@ Sugar And Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Northern Strawberry Thai Milk Tea" </Value>
<Value> "Northern Strawberry
Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>
@ -3368,7 +3370,7 @@ Sugar And Ice" </Value>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Southern Coconut Thai Milk Tea"
Var NameDrink = "Southern Coconu Thai Milk Tea"
Var NameDrinkTH = "ชาไทยมะพร้าวศรีวิชัย"
Var DrinkDescriptionTH = "ชาไทย ชาไต้หวัน นม โกโก้ มะพร้าว"
Var DrinkDescription = "Thai Tea Oolong Tea Milk Sugar Cocoa Coconut"
@ -3463,7 +3465,8 @@ Sugar And Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Southern Coconut Thai Milk Tea" </Value>
<Value> "Southern Coconu
Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>
@ -3624,7 +3627,7 @@ Sugar And Ice" </Value>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Northeastern Lychee Thai Milk Tea"
Var NameDrinkTH = "ชาไทยลิ้นจี่ศรีโคตรบูรณ์"
Var NameDrinkTH = "ชาไทยลิ้นจี่ ศรีโคตรบูรณ์"
Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล ลิ้นจี่"
Var DrinkDescription = "Thai Tea Milk Sugar Lychee"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_thai_milk_tea_Lychee.png"
@ -3697,7 +3700,8 @@ Sugar And Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "ชาไทยลิ้นจี่ศรีโคตรบูรณ์" </Value>
<Value> "ชาไทยลิ้นจี่
ศรีโคตรบูรณ์" </Value>
</Text>
<Text>
<X> 16 </X>
@ -3718,7 +3722,8 @@ Sugar And Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Northeastern Lychee Thai Milk Tea" </Value>
<Value> "Northeastern Lychee
Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>
@ -3973,7 +3978,8 @@ Sugar And Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Eastern Ume Thai Milk Tea" </Value>
<Value> "Eastern Ume
Thai Milk Tea" </Value>
</Text>
<Text>
<X> 16 </X>