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

Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-10-21 13:05:44 +07:00
commit ba2b12fdd4
19 changed files with 37 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
.inter/whatthecup/sgp/image/user_take_cup_en/bn_door_open.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.3 KiB

BIN
.inter/whatthecup/sgp/image/user_take_cup_en/bp_door_open.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.2 KiB

BIN
image/event/halloween/thank_you.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.8 MiB

BIN
image/event/halloween/thank_you_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 MiB

BIN
image/event/halloween/thank_you_th.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 MiB

4
inter/aus/animation01/play_list.tsv
View file

@ -936,3 +936,7 @@ Combination 51-99-05-0024 1 27 28 24 120 17:00 23
Ume Ume 51-99-05-0025 1 27 28 24 120 17:00 23 Ume Ume 51-99-05-0025 1 27 28 24 120 17:00 23
Like Sex\non The Beach 51-99-05-0026 1 27 28 24 120 17:00 23 Like Sex\non The Beach 51-99-05-0026 1 27 28 24 120 17:00 23
Plum Highball 51-99-05-0027 1 27 28 24 120 17:00 23 Plum Highball 51-99-05-0027 1 27 28 24 120 17:00 23
Hot VANILLA latte 51-21-81-0060 1 2 3 4 5 63 6 70 24 120 17:00 23
Iced VANILLA latte 51-21-82-0060 1 2 3 4 5 63 6 70 23 24 120 17:00 23
VANILLA latte frappe 51-21-83-0060 1 2 3 4 5 63 6 70 41 24 120 17:00 23

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

BIN
inter/aus/image/page_drink_disable_n2/bn_iced_Melon_jasmine_tea.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
inter/aus/image/page_drink_n/bn_iced_melon_jasmine_tea.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
inter/aus/image/page_drink_picture2_n/bn_iced_Melon_jasmine_tea.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
inter/aus/image/page_drink_press_n/bn_iced_Melon_jasmine_tea.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
inter/aus/image/page_drink_press_n/bn_protein_Vanilla.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
inter/aus/image/page_drink_press_n/bn_protein_espresso_caramel.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.9 KiB

8
inter/aus/xml/page_catalog_group_other.lxml
View file

@ -1953,7 +1953,7 @@
Var PD_CODE2 = "51-05-02-0132" Var PD_CODE2 = "51-05-02-0132"
Var PD_CODE3 = "##-##-##-####" Var PD_CODE3 = "##-##-##-####"
; begin lang ; begin lang
Var aliasName[0] = "TURTLE ENERGY\nTOKYO BANANA SODA" Var aliasName[0] = "TURTLE ENERGY\nTOKYO SODA"
Var aliasDesc[0] = "Energy drink, Tokyo Banana Syrup, Soda, Ice" Var aliasDesc[0] = "Energy drink, Tokyo Banana Syrup, Soda, Ice"
Var aliasName[1] = "" Var aliasName[1] = ""
Var aliasDesc[1] = "" Var aliasDesc[1] = ""
@ -1977,7 +1977,7 @@
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
Var DescLang[0][5] = "" Var DescLang[0][5] = ""
Var NameLang[1][0] = "TURTLE ENERGY TOKYO BANANA SODA" Var NameLang[1][0] = "TURTLE ENERGY TOKYO SODA"
Var NameLang[1][1] = "-" Var NameLang[1][1] = "-"
Var NameLang[1][2] = "-" Var NameLang[1][2] = "-"
Var NameLang[1][3] = "-" Var NameLang[1][3] = "-"
@ -2048,9 +2048,9 @@
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color> <Color> 0x322B26 </Color>
<LanguageGroup> <LanguageGroup>
<LanguageSlot1>TURTLE ENERGY\nTOKYO BANANA SODA</LanguageSlot1> <LanguageSlot1>TURTLE ENERGY\nTOKYO SODA</LanguageSlot1>
<LanguageSlot2></LanguageSlot2> <LanguageSlot2></LanguageSlot2>
<LanguageSlot3>TURTLE ENERGY\nTOKYO BANANA SODA</LanguageSlot3> <LanguageSlot3>TURTLE ENERGY\nTOKYO SODA</LanguageSlot3>
<LanguageSlot4></LanguageSlot4> <LanguageSlot4></LanguageSlot4>
<LanguageSlot5></LanguageSlot5> <LanguageSlot5></LanguageSlot5>
<LanguageSlot6></LanguageSlot6> <LanguageSlot6></LanguageSlot6>

8
inter/aus/xml/page_catalog_group_tea.lxml
View file

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

10
inter/aus/xml/page_catalog_group_whey.lxml
View file

@ -4659,7 +4659,7 @@
Var PD_CODE2 = "51-04-02-0060" Var PD_CODE2 = "51-04-02-0060"
Var PD_CODE3 = "##-##-##-####" Var PD_CODE3 = "##-##-##-####"
; begin lang ; begin lang
Var aliasName[0] = "VANILLA PROTEIN SHAKE" Var aliasName[0] = "VANILLA PROTEIN\nSHAKE"
Var aliasDesc[0] = "Whey protein, Milk,\nVanilla Syrup" Var aliasDesc[0] = "Whey protein, Milk,\nVanilla Syrup"
Var aliasName[1] = "" Var aliasName[1] = ""
Var aliasDesc[1] = "" Var aliasDesc[1] = ""
@ -4689,7 +4689,7 @@
Var NameLang[1][3] = "-" Var NameLang[1][3] = "-"
Var NameLang[1][4] = "-" Var NameLang[1][4] = "-"
Var NameLang[1][5] = "" Var NameLang[1][5] = ""
Var DescLang[1][0] = "Whey protein, Espresso\n& Milk, Caramel Syrup " Var DescLang[1][0] = "Whey protein, Milk,\nVanilla Syrup"
Var DescLang[1][1] = "-" Var DescLang[1][1] = "-"
Var DescLang[1][2] = "-" Var DescLang[1][2] = "-"
Var DescLang[1][3] = "-" Var DescLang[1][3] = "-"
@ -4754,9 +4754,9 @@
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color> <Color> 0x322B26 </Color>
<LanguageGroup> <LanguageGroup>
<LanguageSlot1>VANILLA PROTEIN SHAKE</LanguageSlot1> <LanguageSlot1>VANILLA PROTEIN\nSHAKE</LanguageSlot1>
<LanguageSlot2></LanguageSlot2> <LanguageSlot2></LanguageSlot2>
<LanguageSlot3>VANILLA PROTEIN SHAKE</LanguageSlot3> <LanguageSlot3>VANILLA PROTEIN\nSHAKE</LanguageSlot3>
<LanguageSlot4></LanguageSlot4> <LanguageSlot4></LanguageSlot4>
<LanguageSlot5></LanguageSlot5> <LanguageSlot5></LanguageSlot5>
<LanguageSlot6></LanguageSlot6> <LanguageSlot6></LanguageSlot6>
@ -4959,7 +4959,7 @@
Var NameLang[1][3] = "-" Var NameLang[1][3] = "-"
Var NameLang[1][4] = "-" Var NameLang[1][4] = "-"
Var NameLang[1][5] = "" Var NameLang[1][5] = ""
Var DescLang[1][0] = "Whey protein, Milk,\nVanilla Syrup" Var DescLang[1][0] = "Whey protein, Espresso\n& Milk, Caramel Syrup "
Var DescLang[1][1] = "-" Var DescLang[1][1] = "-"
Var DescLang[1][2] = "-" Var DescLang[1][2] = "-"
Var DescLang[1][3] = "-" Var DescLang[1][3] = "-"

8
xml/event/halloween/thank_you.xml
View file

@ -9,6 +9,12 @@
Var Timeout = 0 Var Timeout = 0
Var ThankyouImg = "ROOT/taobin_project/image/event/halloween/thank_you_th.png"
If show_eng = "true" Then
Var ThankyouImg = "ROOT/taobin_project/image/event/halloween/thank_you_en.png"
EndIf
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
@ -35,7 +41,7 @@
<Image> <Image>
<X> 0 </X> <X> 0 </X>
<Y> 380 </Y> <Y> 380 </Y>
<Filename> "ROOT/taobin_project/image/event/halloween/thank_you.png" </Filename> <Filename> ThankyouImg </Filename>
</Image> </Image>
</Popup> </Popup>

4
xml/page_payment.xml
View file

@ -27,6 +27,7 @@
;Var PriceDrink = 2 ;Var PriceDrink = 2
Var DiscountDrink = 0 Var DiscountDrink = 0
Var DiscountCampaignCode = ""
Var SelectSlot = "1" Var SelectSlot = "1"
SAVELOG BoxID SAVELOG BoxID
@ -332,6 +333,7 @@
Var param1 = Seeker.ORDER_ID Var param1 = Seeker.ORDER_ID
Var param2 = Seeker.NameDrinkEN Var param2 = Seeker.NameDrinkEN
Var param3 = DiscountCampaignCode
STRCONTAIN "size" Seeker.NameDrinkEN SizeFromSheet STRCONTAIN "size" Seeker.NameDrinkEN SizeFromSheet
If SizeFromSheet = "true" Then If SizeFromSheet = "true" Then
@ -343,7 +345,7 @@
Var WaitPOSStatus = 1 Var WaitPOSStatus = 1
Var TimeWaitPOSStatus = 0 Var TimeWaitPOSStatus = 0
Var POS_SELL_STATUS = "-" Var POS_SELL_STATUS = "-"
GetPOSStatus param1 param2 GetPOSStatus param1 param2 param3
EndIf EndIf
EndIf EndIf

1
xml/process/discount_from_promotion.ev
View file

@ -24,6 +24,7 @@ If BoxID = 105005 Then
Var PriceDiff = PriceDrink - 25 Var PriceDiff = PriceDrink - 25
Var DiscountDrink = PriceDiff Var DiscountDrink = PriceDiff
Var Seeker.CampaignPPrice = 25 Var Seeker.CampaignPPrice = 25
Var DiscountCampaignCode = "SVB0002"
Var PriceDrink = PriceDrink - PriceDiff Var PriceDrink = PriceDrink - PriceDiff
EndIf EndIf

12
xml/profile/run.ev
View file

@ -35,6 +35,7 @@
STRCONTAIN "AllPriceUp05" XMLProfile AllPriceUp05 STRCONTAIN "AllPriceUp05" XMLProfile AllPriceUp05
STRCONTAIN "AllPriceUp10" XMLProfile AllPriceUp10 STRCONTAIN "AllPriceUp10" XMLProfile AllPriceUp10
Var SpiralPriceOrigin = "true"
STRCONTAIN "SpiralPriceUp15" XMLProfile SpiralPriceUp15 STRCONTAIN "SpiralPriceUp15" XMLProfile SpiralPriceUp15
STRCONTAIN "SpiralPriceUp45" XMLProfile SpiralPriceUp45 STRCONTAIN "SpiralPriceUp45" XMLProfile SpiralPriceUp45
STRCONTAIN "SpiralPriceRetail" XMLProfile SpiralPriceRetail STRCONTAIN "SpiralPriceRetail" XMLProfile SpiralPriceRetail
@ -111,20 +112,25 @@
;spiral price ;spiral price
If SpiralPriceUp15 = "true" Then If SpiralPriceUp15 = "true" Then
Var SpiralPriceOrigin = "false"
__CMD "invoke-all-up-priceSpiral-15" "-" "-" "-" __CMD "invoke-all-up-priceSpiral-15" "-" "-" "-"
EndIf EndIf
If SpiralPriceUp45 = "true" Then If SpiralPriceUp45 = "true" Then
Var SpiralPriceOrigin = "false"
__CMD "invoke-all-up-priceSpiral-45" "-" "-" "-" __CMD "invoke-all-up-priceSpiral-45" "-" "-" "-"
EndIf EndIf
If SpiralPriceRetail = "true" Then If SpiralPriceRetail = "true" Then
Var SpiralPriceOrigin = "false"
__CMD "invoke-all-up-priceSpiral-Retail" "-" "-" "-" __CMD "invoke-all-up-priceSpiral-Retail" "-" "-" "-"
EndIf EndIf
If SpiralPriceOrigin = "true" Then
__CMD "invoke-all-up-priceSpiral-Origin" "-" "-" "-"
EndIf