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-06-06 18:54:51 +07:00
commit fa08f087ce
6 changed files with 131 additions and 90506 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inter/aus/xml/event/tricker.ev
View file

@ -6,11 +6,11 @@
; Reset flag away.
Var NewCollectPointFlag = 1
Var NewCollectPointFlag = 0
Var WinterWarmersCatalogFlag = 1
Var XMLLiveInfoEnable = 1
Var XMLLiveInfoEnable = 0
DEBUGVAR Propepsi99Enable

45336
inter/aus/xml/page_catalog_group_winter_warmers.lxml
View file

File diff suppressed because it is too large Load diff

45225
inter/aus/xml/page_catalog_group_winter_warmers_ignore.lxml
View file

File diff suppressed because it is too large Load diff

64
inter/aus/xml/page_catalog_winter_warmers.lxml
View file

@ -335,6 +335,25 @@
<Button>
<X> 220 </X>
<Y> 844 </Y>
<Filename> Var(DirImage + "/bn_winter_warmers.png") </Filename>
<FilenamePress> Var(DirImage + "/bn_winter_warmers.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
;Open "ROOT/taobin_project/xml/page_catalog_group_winter_warmers.lxml"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_winter_warmers_ignore.lxml"
Open OpenFileXML
</EventClick>
</Button>
<Button>
<X> 564 </X>
<Y> 844 </Y>
<Filename> Var(DirImage + "/bn_diy.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_diy.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -359,33 +378,6 @@
</Language>
</Button>
<Button>
<X> 564 </X>
<Y> 844 </Y>
<Filename> Var(DirImage + "/bn_coffee.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_coffee.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_coffee.lxml"
DEBUGVAR CountryRootPath
DEBUGVAR OpenFileXML
Open OpenFileXML
</EventClick>
<Language>
<ID> 000005 </ID>
<X> 28 </X>
<Y> 202 </Y>
<Width> 241 </Width>
<Height> 72 </Height>
</Language>
</Button>
; menu row 2
<Button>
<X> 47 </X>
@ -575,20 +567,28 @@
<X> 736 </X>
<Y> 1532 </Y>
<State> "Enable" </State>
<Filename> Var(DirImage + "/bn_winter_warmers.png") </Filename>
<FilenamePress> Var(DirImage + "/bn_winter_warmers.png") </FilenamePress>
<Filename> Var(DirImage + "/bn_coffee.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_coffee.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
;Open "ROOT/taobin_project/xml/page_catalog_group_winter_warmers.lxml"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_coffee.lxml"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_winter_warmers_ignore.lxml"
DEBUGVAR CountryRootPath
DEBUGVAR OpenFileXML
Open OpenFileXML
</EventClick>
<Language>
<ID> 000005 </ID>
<X> 28 </X>
<Y> 202 </Y>
<Width> 241 </Width>
<Height> 72 </Height>
</Language>
</Button>

4
xml/page_check_member1.xml
View file

@ -91,8 +91,8 @@
If CheckMemberPageCampaign = 1 Then
Var luckeyDrawTicket = Ext1h
INT luckeyDrawTicket
Var luckyDrawTicket = Ext1h
INT luckyDrawTicket
EndIf

4
xml/page_thankyou.xml
View file

@ -270,9 +270,7 @@
If CountDownThankyou = 0 Then
If IgnoreNetCore = "true" Then
;Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Var testPageCollectPointAUS = CountryRootPath + "/xml/page_collect_point_3.lxml"
Open testPageCollectPointAUS
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
If TestLoopMakeDrink = 1 Then