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

Merge

Browse source
This commit is contained in:
wanlop run 2024-09-23 18:56:10 +07:00
commit 0e00048943
161 changed files with 6489 additions and 3222 deletions
Download patch file Download diff file Expand all files Collapse all files

51
xml/page_catalog_group_pro_jemila.xml
View file

@ -110,6 +110,7 @@
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var FromJemilaPro = 1
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@ -146,7 +147,12 @@
<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>
@ -361,6 +367,7 @@
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var FromJemilaPro = 1
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@ -397,7 +404,12 @@
<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>
@ -612,6 +624,7 @@
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var FromJemilaPro = 1
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@ -863,6 +876,7 @@
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var FromJemilaPro = 1
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@ -899,7 +913,12 @@
<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>
@ -1114,6 +1133,7 @@
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var FromJemilaPro = 1
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@ -1150,7 +1170,12 @@
<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>
@ -1363,6 +1388,7 @@
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var FromJemilaPro = 1
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@ -1399,7 +1425,12 @@
<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>
@ -1613,6 +1644,7 @@
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var FromJemilaPro = 1
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@ -1649,7 +1681,12 @@
<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>
@ -1864,6 +1901,7 @@
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var FromJemilaPro = 1
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@ -2115,6 +2153,7 @@
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var FromJemilaPro = 1
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@ -2151,7 +2190,12 @@
<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>
@ -2366,6 +2410,7 @@
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var FromJemilaPro = 1
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@ -2617,6 +2662,7 @@
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var FromJemilaPro = 1
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
@ -2653,7 +2699,12 @@
<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>