Before pull

This commit is contained in:
wanlop run 2024-08-13 14:19:07 +07:00
parent 737ff9cf8f
commit adcfb7273b
21 changed files with 68313 additions and 18324 deletions

View file

@ -14213,14 +14213,21 @@
<Image>
<X> 16 </X>
<Y> 264 </Y>
<Width> 390 </Width>
<Height> 44 </Height>
<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>
<X> 16 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<State> $52-01-01-0005.Button </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
<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>
<Text>
<X> TextPriceMenuHotX </X>
@ -14236,8 +14243,12 @@
<Image>
<X> 81 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
<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-11-02-0002.Button </State>
</Image>
<Text>
@ -14254,8 +14265,12 @@
<Image>
<X> 146 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<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-11-03-0002.Button </State>
</Image>
<Text>
@ -14520,14 +14535,21 @@
<Image>
<X> 16 </X>
<Y> 264 </Y>
<Width> 390 </Width>
<Height> 44 </Height>
<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>
<X> 16 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<State> $52-21-01-0005.Button </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
<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>
<Text>
<X> TextPriceMenuHotX </X>
@ -14543,8 +14565,12 @@
<Image>
<X> 81 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
<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>
</Image>
<Text>
@ -14561,8 +14587,12 @@
<Image>
<X> 146 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<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>
</Image>
<Text>
@ -14799,14 +14829,21 @@
<Image>
<X> 16 </X>
<Y> 264 </Y>
<Width> 390 </Width>
<Height> 44 </Height>
<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>
<X> 16 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<State> $52-01-01-0006.Button </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
<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>
<Text>
<X> TextPriceMenuHotX </X>
@ -14822,8 +14859,12 @@
<Image>
<X> 81 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
<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-01-02-0003.Button </State>
</Image>
<Text>
@ -14840,8 +14881,12 @@
<Image>
<X> 146 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<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-01-03-0003.Button </State>
</Image>
<Text>
@ -15106,14 +15151,21 @@
<Image>
<X> 16 </X>
<Y> 264 </Y>
<Width> 390 </Width>
<Height> 44 </Height>
<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>
<X> 16 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<State> $52-21-01-0006.Button </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
<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>
<Text>
<X> TextPriceMenuHotX </X>
@ -15129,8 +15181,12 @@
<Image>
<X> 81 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
<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>
</Image>
<Text>
@ -15147,8 +15203,12 @@
<Image>
<X> 146 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<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>
</Image>
<Text>
@ -15385,14 +15445,21 @@
<Image>
<X> 16 </X>
<Y> 264 </Y>
<Width> 390 </Width>
<Height> 44 </Height>
<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>
<X> 16 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<State> $52-01-01-0007.Button </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
<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>
<Text>
<X> TextPriceMenuHotX </X>
@ -15408,8 +15475,12 @@
<Image>
<X> 81 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
<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-01-02-0004.Button </State>
</Image>
<Text>
@ -15426,8 +15497,12 @@
<Image>
<X> 146 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<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-01-03-0004.Button </State>
</Image>
<Text>
@ -15692,14 +15767,21 @@
<Image>
<X> 16 </X>
<Y> 264 </Y>
<Width> 390 </Width>
<Height> 44 </Height>
<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>
<X> 16 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<State> $52-21-01-0007.Button </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
<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>
<Text>
<X> TextPriceMenuHotX </X>
@ -15715,8 +15797,12 @@
<Image>
<X> 81 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
<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>
</Image>
<Text>
@ -15733,8 +15819,12 @@
<Image>
<X> 146 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<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>
</Image>
<Text>

View file

@ -3442,14 +3442,21 @@
<Image>
<X> 16 </X>
<Y> 264 </Y>
<Width> 390 </Width>
<Height> 44 </Height>
<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>
<X> 16 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<State> "Invisible" </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
<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>
<Text>
<X> TextPriceMenuHotX </X>
@ -3465,8 +3472,12 @@
<Image>
<X> 81 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
<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>
</Image>
<Text>
@ -3483,8 +3494,12 @@
<Image>
<X> 146 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<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>
</Image>
<Text>
@ -9169,14 +9184,21 @@
<Image>
<X> 16 </X>
<Y> 264 </Y>
<Width> 390 </Width>
<Height> 44 </Height>
<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>
<X> 16 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<State> "Invisible" </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
<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>
<Text>
<X> TextPriceMenuHotX </X>
@ -9192,8 +9214,12 @@
<Image>
<X> 81 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
<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>
</Image>
<Text>
@ -9210,8 +9236,12 @@
<Image>
<X> 146 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<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>
</Image>
<Text>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -2836,6 +2836,8 @@
<State> $52-02-01-0039.Button </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
<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>
<Text>
<X> TextPriceMenuHotX </X>
@ -2853,6 +2855,8 @@
<Y> 264 </Y>
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
<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>
</Image>
<Text>
@ -2871,6 +2875,8 @@
<Y> 264 </Y>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<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>
</Image>
<Text>

View file

@ -1364,14 +1364,21 @@
<Image>
<X> 16 </X>
<Y> 264 </Y>
<Width> 390 </Width>
<Height> 44 </Height>
<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>
<X> 16 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<State> "Invisible" </State>
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
<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>
<Text>
<X> TextPriceMenuHotX </X>
@ -1387,8 +1394,12 @@
<Image>
<X> 81 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
<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>
</Image>
<Text>
@ -1405,8 +1416,12 @@
<Image>
<X> 146 </X>
<Y> 264 </Y>
<Width> 134 </Width>
<Height> 44 </Height>
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
<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>
</Image>
<Text>