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

Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Pakin 2024-07-26 14:38:33 +07:00
commit abda487328
105 changed files with 14549 additions and 7887 deletions
Download patch file Download diff file Expand all files Collapse all files

27
xml/page_board.xml
View file

@ -1103,19 +1103,6 @@
EndIf
EndIf
If EnergyDrink1BathPro = 1 Then
If CurrentMainVideo = 1 Then
Var VideoMainPage = "ROOT/taobin_project/video/main_page_event_pro2.mp4"
Var CurrentMainVideoTemp = 2
EndIf
EndIf
If CoffeeDrink1BathPro = 1 Then
If CurrentMainVideo = 1 Then
Var VideoMainPage = "ROOT/taobin_project/video/main_page_event_pro3.mp4"
Var CurrentMainVideoTemp = 2
EndIf
EndIf
Var CurrentMainVideo = CurrentMainVideoTemp
@ -1134,6 +1121,9 @@
Var RoadShow = "false"
TRY "ROOT/taobin_project/xml/sometime/RoadShow.ev"
;XMLSaveFileNameForResume 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"
;XMLSaveFileNameForResume 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
</EventOpen>
<EventActionOk>
@ -1251,7 +1241,7 @@
</EventUnitTest3>
<EventUnitTest4>
Var XMLProfile = "$School-$Tier3"
Var XMLProfile = "School-Tier3"
PRICE "Reset" "-"
PRICE "Load" "-"
PRICE "CheckAndApply" XMLProfile
@ -1271,7 +1261,7 @@
</EventUnitTest4>
<EventUnitTest5>
Var XMLProfile = "$School"
Var XMLProfile = "School"
PRICE "Reset" "-"
PRICE "Load" "-"
PRICE "CheckAndApply" XMLProfile
@ -1292,7 +1282,7 @@
<EventUnitTest6>
Var XMLProfile = "$TierSouki"
Var XMLProfile = "TierSouki"
PRICE "Reset" "-"
PRICE "Load" "-"
PRICE "CheckAndApply" XMLProfile
@ -1501,8 +1491,9 @@
;DEBUGVAR MachineStage
;SAVELOG CountDownShowButton
;SAVELOG ShowButtonClickFull
;DEBUGVAR CountDownShowButton
;DEBUGVAR ShowButtonClickFull
;DEBUGVAR CountDownPauseVideo
If TaobinOnlineX = "true" Then