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 2024-08-23 13:16:32 +07:00
commit 234823632f
49 changed files with 2870 additions and 2966 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
inter/aus/image/page_drink_disable_n2/bn_protein_Banana.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
inter/aus/image/page_drink_disable_n2/bn_protein_Blueberry.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
inter/aus/image/page_drink_disable_n2/bn_protein_Chocolate.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
inter/aus/image/page_drink_disable_n2/bn_protein_Mango.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
inter/aus/image/page_drink_disable_n2/bn_protein_Matcha.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
inter/aus/image/page_drink_disable_n2/bn_protein_Strawberry.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
inter/aus/image/page_drink_disable_n2/bn_protein_Taiwantea.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
inter/aus/image/page_drink_disable_n2/bn_protein_Thaitea.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
inter/aus/image/page_drink_disable_n2/bn_protein_caramel.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
inter/aus/image/page_drink_disable_n2/bn_protein_espresso.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
inter/aus/image/page_drink_disable_n2/bn_protein_isolated.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

Before After
Before After

BIN
inter/aus/image/page_drink_disable_n2/bn_protein_kokuto.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
inter/aus/image/page_drink_disable_n2/bn_protein_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
inter/aus/image/page_drink_disable_n2/bn_protein_milk.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
inter/aus/image/page_drink_disable_n2/bn_protein_oreo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

BIN
inter/aus/image/page_drink_n/bn_protein_Banana.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
inter/aus/image/page_drink_n/bn_protein_Blueberry.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
inter/aus/image/page_drink_n/bn_protein_Chocolate.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
inter/aus/image/page_drink_n/bn_protein_Mango.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
inter/aus/image/page_drink_n/bn_protein_Matcha.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
inter/aus/image/page_drink_n/bn_protein_Strawberry.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
inter/aus/image/page_drink_n/bn_protein_Taiwantea.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
inter/aus/image/page_drink_n/bn_protein_Thaitea.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
inter/aus/image/page_drink_n/bn_protein_caramel.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

BIN
inter/aus/image/page_drink_n/bn_protein_espresso.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
inter/aus/image/page_drink_n/bn_protein_isolated.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

Before After
Before After

BIN
inter/aus/image/page_drink_n/bn_protein_kokuto.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
inter/aus/image/page_drink_n/bn_protein_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
inter/aus/image/page_drink_n/bn_protein_milk.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
inter/aus/image/page_drink_n/bn_protein_oreo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

BIN
inter/aus/image/page_drink_press_n/bn_protein_Banana.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
inter/aus/image/page_drink_press_n/bn_protein_Blueberry.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
inter/aus/image/page_drink_press_n/bn_protein_Chocolate.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

BIN
inter/aus/image/page_drink_press_n/bn_protein_Mango.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
inter/aus/image/page_drink_press_n/bn_protein_Matcha.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
inter/aus/image/page_drink_press_n/bn_protein_Strawberry.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
inter/aus/image/page_drink_press_n/bn_protein_Taiwantea.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
inter/aus/image/page_drink_press_n/bn_protein_Thaitea.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
inter/aus/image/page_drink_press_n/bn_protein_caramel.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
inter/aus/image/page_drink_press_n/bn_protein_espresso.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
inter/aus/image/page_drink_press_n/bn_protein_isolated.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Before After
Before After

BIN
inter/aus/image/page_drink_press_n/bn_protein_kokuto.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
inter/aus/image/page_drink_press_n/bn_protein_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
inter/aus/image/page_drink_press_n/bn_protein_milk.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
inter/aus/image/page_drink_press_n/bn_protein_oreo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

45
inter/sgp/xml/page_catalog_group_coffee.lxml
View file

@ -14589,21 +14589,14 @@
<Image> <Image>
<X> 16 </X> <X> 16 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 390 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename> <Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" </Filename>
</Image> </Image>
<Image> <Image>
<X> 16 </X> <X> 16 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<State> $52-21-01-0005.Button </State> <State> $52-21-01-0005.Button </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename> <Filename> Var( DirImage2 + "hot.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" </FilenameDisable>
</Image> </Image>
<Text> <Text>
<X> TextPriceMenuHotX </X> <X> TextPriceMenuHotX </X>
@ -14619,12 +14612,8 @@
<Image> <Image>
<X> 81 </X> <X> 81 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "cold.png" ) </Filename> <Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" </FilenameDisable>
<State> $52-31-02-0002.Button </State> <State> $52-31-02-0002.Button </State>
</Image> </Image>
<Text> <Text>
@ -14641,12 +14630,8 @@
<Image> <Image>
<X> 146 </X> <X> 146 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "blend.png" ) </Filename> <Filename> Var( DirImage2 + "blend.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" </FilenameDisable>
<State> $52-31-03-0002.Button </State> <State> $52-31-03-0002.Button </State>
</Image> </Image>
<Text> <Text>
@ -15205,21 +15190,14 @@
<Image> <Image>
<X> 16 </X> <X> 16 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 390 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename> <Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" </Filename>
</Image> </Image>
<Image> <Image>
<X> 16 </X> <X> 16 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<State> $52-21-01-0006.Button </State> <State> $52-21-01-0006.Button </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename> <Filename> Var( DirImage2 + "hot.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" </FilenameDisable>
</Image> </Image>
<Text> <Text>
<X> TextPriceMenuHotX </X> <X> TextPriceMenuHotX </X>
@ -15235,12 +15213,8 @@
<Image> <Image>
<X> 81 </X> <X> 81 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "cold.png" ) </Filename> <Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" </FilenameDisable>
<State> $52-21-02-0003.Button </State> <State> $52-21-02-0003.Button </State>
</Image> </Image>
<Text> <Text>
@ -15257,12 +15231,8 @@
<Image> <Image>
<X> 146 </X> <X> 146 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "blend.png" ) </Filename> <Filename> Var( DirImage2 + "blend.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" </FilenameDisable>
<State> $52-21-03-0003.Button </State> <State> $52-21-03-0003.Button </State>
</Image> </Image>
<Text> <Text>
@ -15821,21 +15791,14 @@
<Image> <Image>
<X> 16 </X> <X> 16 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 390 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename> <Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" </Filename>
</Image> </Image>
<Image> <Image>
<X> 16 </X> <X> 16 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<State> $52-21-01-0007.Button </State> <State> $52-21-01-0007.Button </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename> <Filename> Var( DirImage2 + "hot.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" </FilenameDisable>
</Image> </Image>
<Text> <Text>
<X> TextPriceMenuHotX </X> <X> TextPriceMenuHotX </X>
@ -15851,12 +15814,8 @@
<Image> <Image>
<X> 81 </X> <X> 81 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "cold.png" ) </Filename> <Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" </FilenameDisable>
<State> $52-21-02-0004.Button </State> <State> $52-21-02-0004.Button </State>
</Image> </Image>
<Text> <Text>
@ -15873,12 +15832,8 @@
<Image> <Image>
<X> 146 </X> <X> 146 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "blend.png" ) </Filename> <Filename> Var( DirImage2 + "blend.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" </FilenameDisable>
<State> $52-21-03-0004.Button </State> <State> $52-21-03-0004.Button </State>
</Image> </Image>
<Text> <Text>

30
inter/sgp/xml/page_catalog_group_milk.lxml
View file

@ -3496,21 +3496,14 @@
<Image> <Image>
<X> 16 </X> <X> 16 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 390 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename> <Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" </Filename>
</Image> </Image>
<Image> <Image>
<X> 16 </X> <X> 16 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<State> "Invisible" </State> <State> "Invisible" </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename> <Filename> Var( DirImage2 + "hot.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" </FilenameDisable>
</Image> </Image>
<Text> <Text>
<X> TextPriceMenuHotX </X> <X> TextPriceMenuHotX </X>
@ -3526,12 +3519,8 @@
<Image> <Image>
<X> 81 </X> <X> 81 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "cold.png" ) </Filename> <Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" </FilenameDisable>
<State> "Invisible" </State> <State> "Invisible" </State>
</Image> </Image>
<Text> <Text>
@ -3548,12 +3537,8 @@
<Image> <Image>
<X> 146 </X> <X> 146 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "blend.png" ) </Filename> <Filename> Var( DirImage2 + "blend.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" </FilenameDisable>
<State> $52-03-03-0009.Button </State> <State> $52-03-03-0009.Button </State>
</Image> </Image>
<Text> <Text>
@ -9238,21 +9223,14 @@
<Image> <Image>
<X> 16 </X> <X> 16 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 390 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename> <Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" </Filename>
</Image> </Image>
<Image> <Image>
<X> 16 </X> <X> 16 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<State> "Invisible" </State> <State> "Invisible" </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename> <Filename> Var( DirImage2 + "hot.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" </FilenameDisable>
</Image> </Image>
<Text> <Text>
<X> TextPriceMenuHotX </X> <X> TextPriceMenuHotX </X>
@ -9268,12 +9246,8 @@
<Image> <Image>
<X> 81 </X> <X> 81 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "cold.png" ) </Filename> <Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" </FilenameDisable>
<State> "Invisible" </State> <State> "Invisible" </State>
</Image> </Image>
<Text> <Text>
@ -9290,12 +9264,8 @@
<Image> <Image>
<X> 146 </X> <X> 146 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "blend.png" ) </Filename> <Filename> Var( DirImage2 + "blend.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" </FilenameDisable>
<State> $52-03-03-0027.Button </State> <State> $52-03-03-0027.Button </State>
</Image> </Image>
<Text> <Text>

6
inter/sgp/xml/page_catalog_group_tea.lxml
View file

@ -2890,8 +2890,6 @@
<State> $52-02-01-0039.Button </State> <State> $52-02-01-0039.Button </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename> <Filename> Var( DirImage2 + "hot.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" </FilenameDisable>
</Image> </Image>
<Text> <Text>
<X> TextPriceMenuHotX </X> <X> TextPriceMenuHotX </X>
@ -2909,8 +2907,6 @@
<Y> 264 </Y> <Y> 264 </Y>
<Filename> Var( DirImage2 + "cold.png" ) </Filename> <Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" </FilenameDisable>
<State> $52-02-02-0039.Button </State> <State> $52-02-02-0039.Button </State>
</Image> </Image>
<Text> <Text>
@ -2929,8 +2925,6 @@
<Y> 264 </Y> <Y> 264 </Y>
<Filename> Var( DirImage2 + "blend.png" ) </Filename> <Filename> Var( DirImage2 + "blend.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" </FilenameDisable>
<State> $52-02-03-0039.Button </State> <State> $52-02-03-0039.Button </State>
</Image> </Image>
<Text> <Text>

15
inter/sgp/xml/page_catalog_group_whey.lxml
View file

@ -1418,21 +1418,14 @@
<Image> <Image>
<X> 16 </X> <X> 16 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 390 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename> <Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" </Filename>
</Image> </Image>
<Image> <Image>
<X> 16 </X> <X> 16 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<State> "Invisible" </State> <State> "Invisible" </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename> <Filename> Var( DirImage2 + "hot.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" </FilenameDisable>
</Image> </Image>
<Text> <Text>
<X> TextPriceMenuHotX </X> <X> TextPriceMenuHotX </X>
@ -1448,12 +1441,8 @@
<Image> <Image>
<X> 81 </X> <X> 81 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "cold.png" ) </Filename> <Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" </FilenameDisable>
<State> $52-04-02-0002.Button </State> <State> $52-04-02-0002.Button </State>
</Image> </Image>
<Text> <Text>
@ -1470,12 +1459,8 @@
<Image> <Image>
<X> 146 </X> <X> 146 </X>
<Y> 264 </Y> <Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "blend.png" ) </Filename> <Filename> Var( DirImage2 + "blend.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" </Filename>
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" </FilenameDisable>
<State> "Invisible" </State> <State> "Invisible" </State>
</Image> </Image>
<Text> <Text>