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

Merge and remvoe move promotion_mystery_cup_35

Browse source
This commit is contained in:
wanlop run 2024-09-23 18:58:13 +07:00
parent 0e00048943
commit 2ce4e71a81
6 changed files with 25 additions and 10716 deletions
Download patch file Download diff file Expand all files Collapse all files

10655
xml/event/promotion_mystery_cup_35.xml
View file

File diff suppressed because it is too large Load diff

24
xml/menutab/page_catalog_group_pro_jemila.xml
View file

@ -700,7 +700,8 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "HONG'S DRAGON MILK" </Value>
<Value> "HONG'S DRAGON
MILK" </Value>
</Text>
<Text>
<X> 16 </X>
@ -953,7 +954,8 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "MUNIN'S FAVORITE DRINK" </Value>
<Value> "MUNIN'S FAVORITE
DRINK" </Value>
</Text>
<Text>
<X> 16 </X>
@ -1459,7 +1461,8 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "JAI RERNG QUITE FIZZY" </Value>
<Value> "JAI RERNG QUITE
FIZZY" </Value>
</Text>
<Text>
<X> 16 </X>
@ -1712,7 +1715,8 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "PRAGLAIDAO WANT IT STRONG" </Value>
<Value> "PRAGLAIDAO WANT
IT STRONG" </Value>
</Text>
<Text>
<X> 16 </X>
@ -1963,7 +1967,8 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "PRAGLAIDAO WANT IT STRONG" </Value>
<Value> "PRAGLAIDAO WANT
IT STRONG" </Value>
</Text>
<Text>
<X> 16 </X>
@ -2215,7 +2220,8 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "GAOMART 'S MIRACLES" </Value>
<Value> "GAOMART 'S
MIRACLES" </Value>
</Text>
<Text>
<X> 16 </X>
@ -2721,7 +2727,8 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "RAVEENA'S 7UP SODA" </Value>
<Value> "RAVEENA'S 7UP
SODA" </Value>
</Text>
<Text>
<X> 16 </X>
@ -3227,7 +3234,8 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "RAVINWORAGARN'S JASMINE" </Value>
<Value> "RAVINWORAGARN'S
JASMINE" </Value>
</Text>
<Text>
<X> 16 </X>

32
xml/page_catalog_group_pro_jemila.xml
View file

@ -147,12 +147,8 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<<<<<<< HEAD
<Value> "HONG'S DRAGON MILK" </Value>
=======
<Value> "HONG'S DRAGON
MILK" </Value>
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
</Text>
<Text>
<X> 16 </X>
@ -404,12 +400,8 @@ MILK" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<<<<<<< HEAD
<Value> "MUNIN'S FAVORITE DRINK" </Value>
=======
<Value> "MUNIN'S FAVORITE
DRINK" </Value>
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
</Text>
<Text>
<X> 16 </X>
@ -913,12 +905,8 @@ DRINK" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<<<<<<< HEAD
<Value> "JAI RERNG QUITE FIZZY" </Value>
=======
<Value> "JAI RERNG QUITE
FIZZY" </Value>
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
</Text>
<Text>
<X> 16 </X>
@ -1170,12 +1158,8 @@ FIZZY" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<<<<<<< HEAD
<Value> "PRAGLAIDAO WANT IT STRONG" </Value>
=======
<Value> "PRAGLAIDAO WANT
IT STRONG" </Value>
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
</Text>
<Text>
<X> 16 </X>
@ -1425,12 +1409,8 @@ IT STRONG" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<<<<<<< HEAD
<Value> "PRAGLAIDAO WANT IT STRONG" </Value>
=======
<Value> "PRAGLAIDAO WANT
IT STRONG" </Value>
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
</Text>
<Text>
<X> 16 </X>
@ -1681,12 +1661,8 @@ IT STRONG" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<<<<<<< HEAD
<Value> "GAOMART 'S MIRACLES" </Value>
=======
<Value> "GAOMART 'S
MIRACLES" </Value>
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
</Text>
<Text>
<X> 16 </X>
@ -2190,12 +2166,8 @@ MIRACLES" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<<<<<<< HEAD
<Value> "RAVEENA'S 7UP SODA" </Value>
=======
<Value> "RAVEENA'S 7UP
SODA" </Value>
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
</Text>
<Text>
<X> 16 </X>
@ -2699,12 +2671,8 @@ SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<<<<<<< HEAD
<Value> "RAVINWORAGARN'S JASMINE" </Value>
=======
<Value> "RAVINWORAGARN'S
JASMINE" </Value>
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
</Text>
<Text>
<X> 16 </X>

10
xml/page_drinkok.xml
View file

@ -61,17 +61,9 @@
Else
Var DirImage = "ROOT/taobin_project/image/complete/"
EndIf
<<<<<<< HEAD
Var text_bottom = DirImage + "text_bottom.png"
=======
If LanguageShow = "UAE_DUBAI" Then
Var text_bottom = CountryRootPath + "/image/complete_en/text_bottom.png"
Else
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
If InternationalEnable = 1 Then
If LanguageShow = "UAE_DUBAI" Then

6
xml/sold_cup_count.xml
View file

@ -42,12 +42,8 @@
Refresh
EndIf
<<<<<<< HEAD
Var Timeout = 0
=======
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
TimerReset
</EventTimeout>