Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
Pakin 2025-04-30 16:09:32 +07:00
commit eb1dd99d18
12 changed files with 3369 additions and 26 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

View file

@ -17,6 +17,7 @@ TextID Note English Thai
000010 Healthier\nChoice ทางเลือกสุขภาพ\n[\nคุมจำนวน ไขมัน น้ำตาล โซเดียม\nแคลอรี่ต่ำ###Font=KanitRegular,Size=12,Align=Center]
000011 Kid Menu เมนูเด็ก
000012 App Fast แอพ ฟาสท์
000025 Dessert ของหวาน
Menu
Font=Kanit,Type=Regular,Size=16,Color=0x5A5A5A,Align=center-vertical-horizontal Font=Kanit,Type=Regular,Size=32,Color=0x5A5A5A,Align=center-vertical-horizontal
@ -38,6 +39,8 @@ TextID Note English Thai
000024 Cocktail ค็อกเทล
page_toopping_select
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

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

View file

@ -2,6 +2,7 @@ Var MainfileSize = 0
Var EventNewYear = 0
Var EventAO = 0
Var StPatrickEvent = 0
Var HappyEasterEvent = 0

View file

@ -121,7 +121,7 @@
If CountryName = "Australia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
Var DirImageAlterAus = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
@ -266,8 +266,8 @@
<Button>
<Layout> "linear" </Layout>
<State> Menu4Selected </State>
<Filename> Var( DirImageAlterMilk + "/bn_cho_ca2.png") </Filename>
<FilenamePress> Var( DirImageAlterMilk + "/bp_cho_ca2.png") </FilenamePress>
<Filename> Var( DirImageAlterAus + "/bn_cho_ca2.png") </Filename>
<FilenamePress> Var( DirImageAlterAus + "/bp_cho_ca2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -364,28 +364,23 @@
</EventClick>
</Button>
<Button>
<Layout> "linear" </Layout>
<State> Menu22Selected </State>
<Filename> Var( DirImageAlter + "/bn_health.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_health.png") </FilenamePress>
<Filename> Var( DirImageAlterAus + "/bn_dessert.png") </Filename>
<FilenamePress> Var( DirImageAlterAus + "/bp_dessert.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml"
;Open "ROOT/taobin_project/xml/page_catalog_group_dessert.lxml"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_dessert.lxml"
DEBUGVAR CountryRootPath
DEBUGVAR OpenFileXML
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml"
Else
Open OpenFileXML
EndIf
Open OpenFileXML
</EventClick>
</Button>

View file

@ -523,22 +523,22 @@
<X> 564 </X>
<Y> 1532 </Y>
<State> "Enable" </State>
<Filename> Var(DirImage + "/bn_HealthyOption.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_HealthyOption.png") </FilenamePress>
<Filename> Var(DirImageAUS + "/bn_dessert.png") </Filename>
<FilenamePress> Var(DirImageAUS + "/bp_dessert.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml"
;Open "ROOT/taobin_project/xml/page_catalog_group_dessert.lxml"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_dessert.lxml"
Open OpenFileXML
</EventClick>
<Language>
<ID> 000010 </ID>
<ID> 000025 </ID>
<X> 28 </X>
<Y> 202 </Y>
<Width> 241 </Width>

View file

@ -23815,13 +23815,13 @@
<State> Flag( 51-21-01-0081.Button,51-21-02-0081.Button,51-21-03-0081.Button,$Sum512101008151210200815121030081) </State>
<Button>
<State> $Sum512101008151210200815121030081 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_AMERICANO.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_LATTE.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_LATTE.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_LATTE.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_AMERICANO.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_LATTE.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-21-01-0081.Price
Var PriceD2 = $51-21-02-0081.Price

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,42 @@
<?hurr
#include=menu_head.py
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml"
Var Menu22Selected = "PressForever"
SAVELOG PreviseXMLFileName2
Var Timeout = 0
;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml"
</EventOpen>
;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml"
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
</Popup>

View file

@ -5800,13 +5800,13 @@
<State> Flag( 51-02-01-1038.Button,51-02-02-1038.Button,$Sum51020110385102021038) </State>
<Button>
<State> $Sum51020110385102021038 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark_Healthy.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark_Healthy.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark_Healthy.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark_pro_valentine_Healthy.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark_pro_valentine_Healthy.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark_pro_valentine_Healthy.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark_Healthy.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark_pro_valentine_Healthy.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-02-01-1038.Price
Var PriceD2 = $51-02-02-1038.Price