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

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

Browse source
This commit is contained in:
wanlop run 2025-05-08 19:21:12 +07:00
commit ce80902ee8
10 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.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
inter/aus/image/page_drink_n/bn_COCONUT_LATTE.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

BIN
inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

BIN
inter/aus/image/page_drink_n/bn_hot_america_no.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

BIN
inter/aus/image/page_drink_n/bn_hot_cappuccino.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

BIN
inter/aus/image/page_drink_n/bn_hot_latte.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

BIN
inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

BIN
inter/aus/image/page_drink_n/bn_protein_Mocha.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

6
inter/aus/xml/page_catalog_group_dessert.lxml
View file

@ -604,7 +604,7 @@
Var PD_CODE2 = "##-##-##-####"
Var PD_CODE3 = "51-03-03-0027"
; begin lang
Var aliasName[0] = "Strawberry Milk\nOreo Valcano"
Var aliasName[0] = "Strawberry\nOreo Valcano"
Var aliasDesc[0] = "Milk,Sugar,\nStrawberry Syrup, Oreo"
Var aliasName[1] = ""
Var aliasDesc[1] = ""
@ -699,9 +699,9 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<LanguageGroup>
<LanguageSlot1>Strawberry Milk\nOreo Valcano</LanguageSlot1>
<LanguageSlot1>Strawberry\nOreo Valcano</LanguageSlot1>
<LanguageSlot2></LanguageSlot2>
<LanguageSlot3>Strawberry Milk\nOreo Valcano</LanguageSlot3>
<LanguageSlot3>Strawberry\nOreo Valcano</LanguageSlot3>
<LanguageSlot4></LanguageSlot4>
<LanguageSlot5></LanguageSlot5>
<LanguageSlot6></LanguageSlot6>

13
inter/tha/configure.ev
View file

@ -8,18 +8,18 @@
If BoxID = 105005 Then
Var EnableMultiInstanceFromBoxID = 1
EndIf
If BoxID = 176277 Then
Var EnableMultiInstanceFromBoxID = 1
EndIf
If BoxID = 200435 Then
Var EnableMultiInstanceFromBoxID = 1
EndIf
If BoxID = 201316 Then
Var EnableMultiInstanceFromBoxID = 1
EndIf
If BoxID = 123456 Then
Var EnableMultiInstanceFromBoxID = 1
EndIf
@ -30,19 +30,14 @@
Var EnableMultiInstanceFromBoxID = 1
EndIf
<<<<<<< HEAD
If BoxID = 210699 Then
Var EnableMultiInstanceFromBoxID = 1
EndIf
=======
If BoxID = 174565 Then
Var EnableMultiInstanceFromBoxID = 1
EndIf
If BoxID = 173319 Then
Var EnableMultiInstanceFromBoxID = 0
EndIf
>>>>>>> 6467e5f893ec61fc1c783c5b4e790ea2d74d664c