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

Regan

Browse source
This commit is contained in:
wanlop run 2024-12-09 16:32:34 +07:00
parent 86a20990bb
commit 1e1894b1a9
6 changed files with 809 additions and 941 deletions
Download patch file Download diff file Expand all files Collapse all files

47
xml/page_catalog_group_milk.xml
View file

@ -37,10 +37,7 @@
Var block_index_override = 0
Var block_index_move = 0
</Script>
<<<<<<< HEAD
=======
;dummy_layout.inc
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
; menu_new_list 53
; ==================> Len = 19
; 12-03-01-0005 12-03-02-0005 12-03-03-0005
@ -5369,11 +5366,7 @@ VOLCANO" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<<<<<<< HEAD
<State> Flag( 12-03-03-0094.Button,$Sum1203030094) </State>
=======
<State> Flag( 12-03-03-0094.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030094) </State>
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
<Button>
<State> $Sum1203030094 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Ovaltine_cocoa_smoothie.png" </Filename>
@ -5626,11 +5619,7 @@ VOLCANO" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<<<<<<< HEAD
<State> Flag( 12-03-03-0095.Button,$Sum1203030095) </State>
=======
<State> Flag( 12-03-03-0095.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030095) </State>
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
<Button>
<State> $Sum1203030095 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png" </Filename>
@ -10461,11 +10450,7 @@ Sugar, Biscof" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<<<<<<< HEAD
<State> Flag( 12-01-03-0085.Button,$Sum1201030085) </State>
=======
<State> Flag( 12-01-03-0085.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1201030085) </State>
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
<Button>
<State> $Sum1201030085 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coffee_Milk_Sugar_BISCOFF.png" </Filename>
@ -10714,11 +10699,7 @@ Sugar, Biscof" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<<<<<<< HEAD
<State> Flag( 12-21-03-0085.Button,$Sum1221030085) </State>
=======
<State> Flag( 12-21-03-0085.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1221030085) </State>
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
<Button>
<State> $Sum1221030085 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Coffee_Milk_Sugar_BISCOFF.png" </Filename>
@ -10968,11 +10949,7 @@ Sugar, Biscof" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<<<<<<< HEAD
<State> Flag( 12-02-03-0086.Button,$Sum1202030086) </State>
=======
<State> Flag( 12-02-03-0086.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1202030086) </State>
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
<Button>
<State> $Sum1202030086 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Thai_Tea_Milk_Sugar_BISCOFF.png" </Filename>
@ -11223,11 +11200,7 @@ Sugar, Biscof" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<<<<<<< HEAD
<State> Flag( 12-02-03-0087.Button,$Sum1202030087) </State>
=======
<State> Flag( 12-02-03-0087.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1202030087) </State>
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
<Button>
<State> $Sum1202030087 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Matcha_Milk_Sugar_BISCOFF.png" </Filename>
@ -11478,11 +11451,7 @@ Sugar, Biscof" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<<<<<<< HEAD
<State> Flag( 12-03-03-0090.Button,$Sum1203030090) </State>
=======
<State> Flag( 12-03-03-0090.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030090) </State>
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
<Button>
<State> $Sum1203030090 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Milk_Sugar_BISCOFF.png" </Filename>
@ -11733,11 +11702,7 @@ Sugar, Biscof" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<<<<<<< HEAD
<State> Flag( 12-03-03-0091.Button,$Sum1203030091) </State>
=======
<State> Flag( 12-03-03-0091.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030091) </State>
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
<Button>
<State> $Sum1203030091 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Sala_Milk_Sugar_BISCOFF.png" </Filename>
@ -11988,11 +11953,7 @@ Sugar, Biscof" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<<<<<<< HEAD
<State> Flag( 12-03-03-0061.Button,$Sum1203030061) </State>
=======
<State> Flag( 12-03-03-0061.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030061) </State>
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
<Button>
<State> $Sum1203030061 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Cocoa_Milk_Sugar_BISCOFF.png" </Filename>
@ -12243,11 +12204,7 @@ Sugar, Biscof" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<<<<<<< HEAD
<State> Flag( 12-03-03-0093.Button,$Sum1203030093) </State>
=======
<State> Flag( 12-03-03-0093.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030093) </State>
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
<Button>
<State> $Sum1203030093 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Lychee_Milk_Sugar_BISCOFF.png" </Filename>
@ -12498,11 +12455,7 @@ Sugar, Biscof" </Value>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<<<<<<< HEAD
<State> Flag( 12-03-03-0092.Button,$Sum1203030092) </State>
=======
<State> Flag( 12-03-03-0092.Button,DateTimeStart="2024/12/16T00:00:00",$Sum1203030092) </State>
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
<Button>
<State> $Sum1203030092 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_7UP_Milk_Sugar_BISCOFF.png" </Filename>

3
xml/page_catalog_group_pro_12_day_12_menu.xml
View file

@ -33,10 +33,7 @@
Var block_index_override = 0
Var block_index_move = 0
</Script>
<<<<<<< HEAD
=======
;dummy_layout.inc
>>>>>>> 56907ba9cc04a4338ee26de332fa2045051b44ea
; menu_new_list 12
; ==================> Len = 14
; - - 12-03-03-0067

1584
xml/page_catalog_group_pro_thick_tea_by_brewer.xml
View file

File diff suppressed because it is too large Load diff