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

fix pepsi and coffee

Browse source
This commit is contained in:
kong 2023-06-07 17:05:43 +07:00
parent 0529613887
commit 326a9f4f71
43 changed files with 398 additions and 1464 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page_doing/brewing_txt_adv3.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 37 KiB

Before After
Before After

BIN
image/page_doing/brewing_txt_adv3_en.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 35 KiB

Before After
Before After

BIN
image/page_drink_disable_n2/bn_PEPSI_BANANA.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
image/page_drink_disable_n2/bn_PEPSI_COFFEE.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

BIN
image/page_drink_disable_n2/bn_PEPSI_LYCHEE.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

BIN
image/page_drink_disable_n2/bn_PEPSI_MELON.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

BIN
image/page_drink_disable_n2/bn_PEPSI_MILK.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

BIN
image/page_drink_disable_n2/bn_PEPSI_PLUM.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

BIN
image/page_drink_disable_n2/bn_PEPSI_SALA.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

BIN
image/page_drink_disable_n2/bn_PEPSI_TEA.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

BIN
image/page_drink_disable_n2/bn_PEPSI_YUZU.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
image/page_drink_picture2_n/bn_PEPSI_BANANA.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Before After
Before After

BIN
image/page_drink_picture2_n/bn_PEPSI_COFFEE.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Before After
Before After

BIN
image/page_drink_picture2_n/bn_PEPSI_LYCHEE.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

Before After
Before After

BIN
image/page_drink_picture2_n/bn_PEPSI_MELON.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Before After
Before After

BIN
image/page_drink_picture2_n/bn_PEPSI_MILK.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_PEPSI_PLUM.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Before After
Before After

BIN
image/page_drink_picture2_n/bn_PEPSI_SALA.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Before After
Before After

BIN
image/page_drink_picture2_n/bn_PEPSI_TEA.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Before After
Before After

BIN
image/page_drink_picture2_n/bn_PEPSI_YUZU-1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Before After
Before After

BIN
image/page_drink_picture2_n/bn_PEPSI_YUZU.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Before After
Before After

BIN
image/page_drink_picture2_n/bn_iced_pepsi_Melon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before After
Before After

BIN
image/page_drink_press_n/bn_PEPSI_BANANA.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
image/page_drink_press_n/bn_PEPSI_COFFEE.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

BIN
image/page_drink_press_n/bn_PEPSI_LYCHEE.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

BIN
image/page_drink_press_n/bn_PEPSI_MELON.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

BIN
image/page_drink_press_n/bn_PEPSI_MILK.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
image/page_drink_press_n/bn_PEPSI_PLUM.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

BIN
image/page_drink_press_n/bn_PEPSI_SALA.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

BIN
image/page_drink_press_n/bn_PEPSI_TEA.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
image/page_drink_press_n/bn_PEPSI_YUZU.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

BIN
video/brewing_adv3.mp4
View file

Binary file not shown.

10
xml/event/tricker.ev
View file

@ -17,6 +17,7 @@ Var SoundBackToSchoolType = 0
Var PepsiProEnable = 0
Var PepsiPromoteVideo = 0
If SystemDateMonthInt = 6 Then
If SystemDateDayInt = 12 Then
@ -51,6 +52,12 @@ If SystemDateMonthInt = 6 Then
Var PepsiProEnable = 1
EndIf
If SystemDateDayInt > 23 Then
Var PepsiPromoteVideo = 0
Else
Var PepsiPromoteVideo = 1
EndIf
EndIf
If BoxID = 200001 Then
@ -78,8 +85,7 @@ EndIf
DEBUGVAR PepsiProEnable
DEBUGVAR OreoDueEnable
DEBUGVAR OreoForFreeEnable
DEBUGVAR PepsiPromoteVideo

11
xml/page_brewing3.xml
View file

@ -341,7 +341,8 @@
var EnableGetMoreStrawFileName = "Invisible"
var EnableGetMoreStrawFileName2 = "Enable"
Var bg_strawProblem_ST2 = "Invisible"
Var bg_strawProblem_ST2 = "Invisible"~/tb_send_file.sh 173149 ~cofffeemachineConfig/profile/run_6_profile_1.json profile/profile_new_1.json dc
If bg_lidProblem_ST2 = "Invisible" Then
Var GetLidButtonState2 = "Enable"
Else
@ -1152,7 +1153,8 @@
GetFileSizeK "taobin_project/video/brewing_adv3.mp4" brewing_adv_size
DEBUGVAR brewing_adv_size
If brewing_adv_size = 8321419 Then
If brewing_adv_size = 7057670 Then
Var adver_brewing_play_index = 1
Var adver_brewing_count_down = 20
Else
@ -1160,7 +1162,8 @@
Var adver_brewing_count_down = 0
EndIf
If ShowPromoitonOreo = 1 Then
If PepsiPromoteVideo = 1 Then
Else
Var adver_brewing_play_index = 1
@ -1190,7 +1193,7 @@
Else
DEBUGVAR VideoPlayFile
Var CountUpBrewing = CountUpBrewing + 1
;CampaignEnable

1604
xml/page_catalog_group_coffee.lxml
View file

File diff suppressed because it is too large Load diff

12
xml/page_catalog_group_forkid.lxml
View file

@ -1344,7 +1344,7 @@
Var aliasDesc[2] = "-"
Var aliasName[3] = "-"
Var aliasDesc[3] = "-"
Var aliasName[4] = "SUSU PINK OREO VOLCANO"
Var aliasName[4] = "SUSU PINK\nOREO VOLCANO"
Var aliasDesc[4] = "Sirap Salak, Susu, Gula"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
@ -1427,7 +1427,7 @@
<LanguageSlot2>นมชมพู</LanguageSlot2>
<LanguageSlot3>PINK MILK</LanguageSlot3>
<LanguageSlot4>นมชมพู</LanguageSlot4>
<LanguageSlot5>SUSU PINK OREO VOLCANO</LanguageSlot5>
<LanguageSlot5>SUSU PINK\nOREO VOLCANO</LanguageSlot5>
<LanguageSlot6>นมชมพู</LanguageSlot6>
</LanguageGroup>
</Text>
@ -2662,7 +2662,7 @@
Var aliasDesc[2] = "-"
Var aliasName[3] = "-"
Var aliasDesc[3] = "-"
Var aliasName[4] = "KOKO OVALTINE VOLCANO"
Var aliasName[4] = "KOKO OVALTINE\nVOLCANO"
Var aliasDesc[4] = "Ovaltine, Koko, Gula, Susu"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
@ -2745,7 +2745,7 @@
<LanguageSlot2>โกโก้โอดิบภูเขาไฟ</LanguageSlot2>
<LanguageSlot3>COCOA OVALTINE \nVOLCANO</LanguageSlot3>
<LanguageSlot4>โกโก้โอดิบภูเขาไฟ</LanguageSlot4>
<LanguageSlot5>KOKO OVALTINE VOLCANO</LanguageSlot5>
<LanguageSlot5>KOKO OVALTINE\nVOLCANO</LanguageSlot5>
<LanguageSlot6>โกโก้โอดิบภูเขาไฟ</LanguageSlot6>
</LanguageGroup>
</Text>
@ -3972,7 +3972,7 @@
Var aliasDesc[2] = "-"
Var aliasName[3] = "-"
Var aliasDesc[3] = "-"
Var aliasName[4] = "SMOOTHIE OREO VOLCANO"
Var aliasName[4] = "SMOOTHIE\nOREO VOLCANO"
Var aliasDesc[4] = "Susu, Gula, Oreo, Ais"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
@ -4055,7 +4055,7 @@
<LanguageSlot2>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot2>
<LanguageSlot3>OREO SMOOTHIE \nVOLCANO</LanguageSlot3>
<LanguageSlot4>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot4>
<LanguageSlot5>SMOOTHIE OREO VOLCANO</LanguageSlot5>
<LanguageSlot5>SMOOTHIE\nOREO VOLCANO</LanguageSlot5>
<LanguageSlot6>โอริโอ้ปั่นภูเขาไฟ</LanguageSlot6>
</LanguageGroup>
</Text>

96
xml/page_catalog_group_health.lxml
View file

@ -801,26 +801,26 @@
Var aliasDesc[3] = "-"
Var aliasName[4] = "AMERICANO"
Var aliasDesc[4] = "Espresso, Air"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
Var NameLang[0][0] = "Hot AMERICANO"
Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)"
Var NameLang[0][2] = ""
Var NameLang[0][3] = ""
Var NameLang[0][4] = ""
Var DescLang[0][0] = ""
Var DescLang[0][1] = ""
Var NameLang[0][4] = "AMERICANO PANAS"
Var DescLang[0][0] = "Espresso, Water"
Var DescLang[0][1] = "กาแฟ และน้ำร้อน(อเมริกาโน)"
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
Var NameLang[1][0] = ""
Var NameLang[1][1] = ""
Var DescLang[0][4] = "Espresso, Air"
Var NameLang[1][0] = "Iced AMERICANO"
Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)"
Var NameLang[1][2] = ""
Var NameLang[1][3] = ""
Var NameLang[1][4] = ""
Var DescLang[1][0] = ""
Var DescLang[1][1] = ""
Var NameLang[1][4] = "AMERICANO AIS"
Var DescLang[1][0] = "Espresso, Water, Ice"
Var DescLang[1][1] = "กาแฟ น้ำ และ น้ำแข็ง(อเมริกาโน)"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
Var DescLang[1][4] = "Espresso, Air, Ais"
Var NameLang[2][0] = ""
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
@ -1333,26 +1333,26 @@
Var aliasDesc[3] = "-"
Var aliasName[4] = "KAFÉ LATTE"
Var aliasDesc[4] = "Espresso, Susu, Susu Buih"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
Var NameLang[0][0] = "Hot CAFE' LATTE"
Var NameLang[0][1] = "ลาเต้ร้อน"
Var NameLang[0][2] = ""
Var NameLang[0][3] = ""
Var NameLang[0][4] = ""
Var DescLang[0][0] = ""
Var DescLang[0][1] = ""
Var NameLang[0][4] = "KAFÉ LATTE PANAS"
Var DescLang[0][0] = "Espresso, Milk,Foamed milk"
Var DescLang[0][1] = "กาแฟ นม และ นม"
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
Var NameLang[1][0] = ""
Var NameLang[1][1] = ""
Var DescLang[0][4] = "Espresso, Susu, Susu Buih"
Var NameLang[1][0] = "Iced CAFE LATTE"
Var NameLang[1][1] = "ลาเต้เย็น"
Var NameLang[1][2] = ""
Var NameLang[1][3] = ""
Var NameLang[1][4] = ""
Var DescLang[1][0] = ""
Var DescLang[1][1] = ""
Var NameLang[1][4] = "KAFÉ LATTE AIS"
Var DescLang[1][0] = "Espresso,Milk, Sugar, Ice"
Var DescLang[1][1] = "กาแฟ นม นม น้ำตาลและ น้ำแข็ง"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
Var DescLang[1][4] = "Espresso, Susu, Gula, Ais"
Var NameLang[2][0] = ""
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
@ -1865,26 +1865,26 @@
Var aliasDesc[3] = "-"
Var aliasName[4] = "MOCHA"
Var aliasDesc[4] = "Espresso , Koko, Susu, Gula"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
Var NameLang[0][0] = "Hot MOCHA"
Var NameLang[0][1] = "มอคค่าร้อน"
Var NameLang[0][2] = ""
Var NameLang[0][3] = ""
Var NameLang[0][4] = ""
Var DescLang[0][0] = ""
Var DescLang[0][1] = ""
Var NameLang[0][4] = "MOCHA PANAS"
Var DescLang[0][0] = "Espresso, Cocoa,Milk, Sugar"
Var DescLang[0][1] = "กาแฟ นม ผสมช็อกโกแลตน้ำตาล"
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
Var NameLang[1][0] = ""
Var NameLang[1][1] = ""
Var DescLang[0][4] = "Espresso, Koko, Susu, Gula"
Var NameLang[1][0] = "Iced MOCHA"
Var NameLang[1][1] = "มอคค่าเย็น"
Var NameLang[1][2] = ""
Var NameLang[1][3] = ""
Var NameLang[1][4] = ""
Var DescLang[1][0] = ""
Var DescLang[1][1] = ""
Var NameLang[1][4] = "MOCHA AIS"
Var DescLang[1][0] = "Espresso, Cocoa,Milk, Ice"
Var DescLang[1][1] = "กาแฟ นม ผสมช็อกโกแลต นม และ น้ำแข็ง"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
Var DescLang[1][4] = "Espresso, Koko, Susu, Gula"
Var NameLang[2][0] = ""
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
@ -2397,26 +2397,26 @@
Var aliasDesc[3] = "-"
Var aliasName[4] = "KAPUCINO"
Var aliasDesc[4] = "Espresso, Susu, Susu Buih"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
Var NameLang[0][0] = "Hot CAPPUCINO"
Var NameLang[0][1] = "คาปูชิโน่ร้อน"
Var NameLang[0][2] = ""
Var NameLang[0][3] = ""
Var NameLang[0][4] = ""
Var DescLang[0][0] = ""
Var DescLang[0][1] = ""
Var NameLang[0][4] = "KAPUCINO PANAS"
Var DescLang[0][0] = "Espresso, Milk,Foamed milk"
Var DescLang[0][1] = "กาแฟ นม และ นม"
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
Var NameLang[1][0] = ""
Var NameLang[1][1] = ""
Var DescLang[0][4] = "Espresso, Susu, Susu Buih"
Var NameLang[1][0] = "Iced CAPPUCCINO"
Var NameLang[1][1] = "คาปูชิโน่เย็น"
Var NameLang[1][2] = ""
Var NameLang[1][3] = ""
Var NameLang[1][4] = ""
Var DescLang[1][0] = ""
Var DescLang[1][1] = ""
Var NameLang[1][4] = "KAPUCINO AIS"
Var DescLang[1][0] = "Espresso,Milk, Foamed milk, Ice"
Var DescLang[1][1] = "กาแฟ นม และ น้ำแข็ง"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
Var DescLang[1][4] = "Espresso, Susu, Susu Buih,Ais"
Var NameLang[2][0] = ""
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""

4
xml/page_catalog_group_other.lxml
View file

@ -7085,7 +7085,7 @@
Var aliasDesc[2] = "-"
Var aliasName[3] = "-"
Var aliasDesc[3] = "-"
Var aliasName[4] = "TAO POWER"
Var aliasName[4] = "POWER"
Var aliasDesc[4] = "Minuman Bervitamin, Ais"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
@ -7168,7 +7168,7 @@
<LanguageSlot2>เต่าทรงพลัง</LanguageSlot2>
<LanguageSlot3>TAO POWER DRINK</LanguageSlot3>
<LanguageSlot4>เต่าทรงพลัง</LanguageSlot4>
<LanguageSlot5>TAO POWER</LanguageSlot5>
<LanguageSlot5>POWER</LanguageSlot5>
<LanguageSlot6>เต่าทรงพลัง</LanguageSlot6>
</LanguageGroup>
</Text>

36
xml/page_catalog_group_recommend.lxml
View file

@ -1079,16 +1079,16 @@
Var aliasDesc[3] = "-"
Var aliasName[4] = "ESPRESSO"
Var aliasDesc[4] = "Espresso (30 ml)"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
Var NameLang[0][0] = "ESPRESSO"
Var NameLang[0][1] = "เอสเพรสโซ่"
Var NameLang[0][2] = ""
Var NameLang[0][3] = ""
Var NameLang[0][4] = ""
Var DescLang[0][0] = ""
Var DescLang[0][1] = ""
Var NameLang[0][4] = "ESPRESSO"
Var DescLang[0][0] = "Espresso (30 ml)"
Var DescLang[0][1] = "กาแฟ (30 ml)"
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
Var DescLang[0][4] = "Espresso (30 ml)"
Var NameLang[1][0] = ""
Var NameLang[1][1] = ""
Var NameLang[1][2] = ""
@ -1611,26 +1611,26 @@
Var aliasDesc[3] = "-"
Var aliasName[4] = "AMERICANO"
Var aliasDesc[4] = "Espresso, Air"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
Var NameLang[0][0] = "Hot AMERICANO"
Var NameLang[0][1] = "กาแฟดำร้อน(อเมริกาโน)"
Var NameLang[0][2] = ""
Var NameLang[0][3] = ""
Var NameLang[0][4] = ""
Var DescLang[0][0] = ""
Var DescLang[0][1] = ""
Var NameLang[0][4] = "AMERICANO PANAS"
Var DescLang[0][0] = "Espresso, Water"
Var DescLang[0][1] = "กาแฟ และน้ำร้อน(อเมริกาโน)"
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
Var NameLang[1][0] = ""
Var NameLang[1][1] = ""
Var DescLang[0][4] = "Espresso, Air"
Var NameLang[1][0] = "Iced AMERICANO"
Var NameLang[1][1] = "กาแฟดำเย็น(อเมริกาโน)"
Var NameLang[1][2] = ""
Var NameLang[1][3] = ""
Var NameLang[1][4] = ""
Var DescLang[1][0] = ""
Var DescLang[1][1] = ""
Var NameLang[1][4] = "AMERICANO AIS"
Var DescLang[1][0] = "Espresso, Water, Ice"
Var DescLang[1][1] = "กาแฟ น้ำ และ น้ำแข็ง(อเมริกาโน)"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
Var DescLang[1][4] = "Espresso, Air, Ais"
Var NameLang[2][0] = ""
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""

60
xml/page_catalog_group_tea.lxml
View file

@ -1072,36 +1072,36 @@
Var aliasDesc[3] = "-"
Var aliasName[4] = "TEH HALIA"
Var aliasDesc[4] = "Halia, Air"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
Var NameLang[0][0] = "Hot GINGER TEA"
Var NameLang[0][1] = "ชาขิงร้อน"
Var NameLang[0][2] = ""
Var NameLang[0][3] = ""
Var NameLang[0][4] = ""
Var DescLang[0][0] = ""
Var DescLang[0][1] = ""
Var NameLang[0][4] = "TEH HALIA PANAS"
Var DescLang[0][0] = "Ginger and Hot water"
Var DescLang[0][1] = "ขิง และน้ำร้อน"
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
Var NameLang[1][0] = ""
Var NameLang[1][1] = ""
Var DescLang[0][4] = "Halia, Air"
Var NameLang[1][0] = "Iced GINGER TEA"
Var NameLang[1][1] = "ชาขิงเย็น"
Var NameLang[1][2] = ""
Var NameLang[1][3] = ""
Var NameLang[1][4] = ""
Var DescLang[1][0] = ""
Var DescLang[1][1] = ""
Var NameLang[1][4] = "TEH HALIA AIS"
Var DescLang[1][0] = "Ginger, Water and Ice"
Var DescLang[1][1] = "ขิง น้ำ และน้ำแข็ง"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
Var NameLang[2][0] = ""
Var NameLang[2][1] = ""
Var DescLang[1][4] = "Halia, Air, Ais"
Var NameLang[2][0] = "GINGER SMOOTHIE"
Var NameLang[2][1] = "ชาขิงปั่น"
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = ""
Var DescLang[2][0] = ""
Var DescLang[2][1] = ""
Var NameLang[2][4] = "SMOOTHIE HALIA"
Var DescLang[2][0] = "Ginger, Water and Ice"
Var DescLang[2][1] = "ขิง น้ำ และน้ำแข็ง"
Var DescLang[2][2] = ""
Var DescLang[2][3] = ""
Var DescLang[2][4] = ""
Var DescLang[2][4] = "Halia, Air, Ais"
; end lang
Var PD_STAGE_1 = $12-02-01-0041.Button
Var PD_STAGE_2 = $12-02-02-0041.Button
@ -2136,26 +2136,26 @@
Var aliasDesc[3] = "-"
Var aliasName[4] = "TEH HALIA LIMAU"
Var aliasDesc[4] = "Halia, Limau, Air"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
Var NameLang[0][0] = "Hot LIME GINGER TEA"
Var NameLang[0][1] = "ชาขิงมะนาวร้อน"
Var NameLang[0][2] = ""
Var NameLang[0][3] = ""
Var NameLang[0][4] = ""
Var DescLang[0][0] = ""
Var DescLang[0][1] = ""
Var NameLang[0][4] = "TEH LIMAU HALIA PANAS"
Var DescLang[0][0] = "Ginger, Lime and Hot water"
Var DescLang[0][1] = "ขิง มะนาว และน้ำร้อน"
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
Var NameLang[1][0] = ""
Var NameLang[1][1] = ""
Var DescLang[0][4] = "Halia, Limau, Air"
Var NameLang[1][0] = "GINGER LIME SODA"
Var NameLang[1][1] = "ขิงมะนาวโซดา"
Var NameLang[1][2] = ""
Var NameLang[1][3] = ""
Var NameLang[1][4] = ""
Var DescLang[1][0] = ""
Var DescLang[1][1] = ""
Var NameLang[1][4] = "SODA HALIA LIMAU"
Var DescLang[1][0] = "Ginger, Lime, Soda and Ice"
Var DescLang[1][1] = "ขิง มะนาว โซดา และน้ำแข็ง"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
Var DescLang[1][4] = "Halia, Limau, Soda, Ais"
Var NameLang[2][0] = ""
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""

12
xml/page_payment_cash-MYR.xml
View file

@ -1332,12 +1332,12 @@
<Image>
<X> 91 </X>
<Y> 1180 </Y>
<State> MenuCautionImageStage0 </State>
<Filename> "ROOT/taobin_project/image/warning/image_warning_energy_drink.png" </Filename>
</Image>
;<Image>
;<X> 91 </X>
;<Y> 1180 </Y>
;<State> MenuCautionImageStage0 </State>
;<Filename> "ROOT/taobin_project/image/warning/image_warning_energy_drink.png" </Filename>
;</Image>
<Video>
<X> 0 </X>

11
xml/page_topping_select6.xml
View file

@ -622,17 +622,6 @@
Var text_price_6 = ""
EndIf
If PromotionOreoToppingFreeEnable = 1 Then
Var toppingID6price2 = 0
If show_eng = "true" Then
Var text_price_6 = "(Free)"
Else
Var text_price_6 = "(ฟรี)"
EndIf
EndIf
If blend_button_state = "PressForever" Then
Var showOreoAddEnable = "Enable"

4
xml_main/startup.xml
View file

@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
Var XMLPageVersion = "7.27"
Var XMLPageVersionInt = 727
Var XMLPageVersion = "7.28"
Var XMLPageVersionInt = 728
</EventOpen>
<Text>