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

Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-12-21 09:53:41 +07:00
commit 7dbdc5caeb
3 changed files with 6 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

20
xml/event/promotion_strawberry_series.xml
View file

@ -1349,7 +1349,7 @@
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-01-01-0004.Button,12-01-02-0002.Button,12-01-03-0002.Button,DateTimeStart="2025/02/02T00:00:00",$Sum120101000412010200021201030002) </State>
<State> Flag( 12-01-01-0004.Button,12-01-02-0002.Button,12-01-03-0002.Button,$Sum120101000412010200021201030002) </State>
<Button>
<State> $Sum120101000412010200021201030002 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_latte.png" </Filename>
@ -1602,7 +1602,7 @@
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-21-01-0004.Button,12-21-02-0002.Button,12-21-03-0002.Button,DateTimeStart="2025/02/02T00:00:00",$Sum122101000412210200021221030002) </State>
<State> Flag( 12-21-01-0004.Button,12-21-02-0002.Button,12-21-03-0002.Button,$Sum122101000412210200021221030002) </State>
<Button>
<State> $Sum122101000412210200021221030002 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_latte.png" </Filename>
@ -1856,7 +1856,7 @@
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-05-02-0008.Button,12-05-03-0008.Button,DateTimeStart="2025/02/02T00:00:00",$Sum12050200081205030008) </State>
<State> Flag( 12-05-02-0008.Button,12-05-03-0008.Button,$Sum12050200081205030008) </State>
<Button>
<State> $Sum12050200081205030008 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_sala_soda.png" </Filename>
@ -2102,20 +2102,6 @@
; - - -
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> "Enable" </State>
</Block>
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> "Enable" </State>
</Block>
; menu_new_li;TAGESP
; ==================> Len = 14
; 12-02-01-0083 12-02-02-0083 12-02-03-0083

20
xml/event/promotion_thick_tea_by_brewer.xml
View file

@ -1349,7 +1349,7 @@
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-01-01-0004.Button,12-01-02-0002.Button,12-01-03-0002.Button,DateTimeStart="2025/02/02T00:00:00",$Sum120101000412010200021201030002) </State>
<State> Flag( 12-01-01-0004.Button,12-01-02-0002.Button,12-01-03-0002.Button,$Sum120101000412010200021201030002) </State>
<Button>
<State> $Sum120101000412010200021201030002 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_latte.png" </Filename>
@ -1602,7 +1602,7 @@
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-21-01-0004.Button,12-21-02-0002.Button,12-21-03-0002.Button,DateTimeStart="2025/02/02T00:00:00",$Sum122101000412210200021221030002) </State>
<State> Flag( 12-21-01-0004.Button,12-21-02-0002.Button,12-21-03-0002.Button,$Sum122101000412210200021221030002) </State>
<Button>
<State> $Sum122101000412210200021221030002 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_latte.png" </Filename>
@ -1856,7 +1856,7 @@
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( 12-05-02-0008.Button,12-05-03-0008.Button,DateTimeStart="2025/02/02T00:00:00",$Sum12050200081205030008) </State>
<State> Flag( 12-05-02-0008.Button,12-05-03-0008.Button,$Sum12050200081205030008) </State>
<Button>
<State> $Sum12050200081205030008 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_sala_soda.png" </Filename>
@ -2102,20 +2102,6 @@
; - - -
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> "Enable" </State>
</Block>
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> "Enable" </State>
</Block>
; menu_new_li;TAGESP
; ==================> Len = 14
; 12-02-01-0083 12-02-02-0083 12-02-03-0083