Merge remote-tracking branch 'origin/freeEnergyDrink' into masterpiece

This commit is contained in:
Kenta420 2024-03-08 10:09:38 +07:00
commit 45264a090c
31 changed files with 12872 additions and 589 deletions

View file

@ -38,8 +38,6 @@
If Seeker = "curr" Then
Var LastMakeDrinkResult = "-"
EndIf
If show_eng = "true" Then
Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png"
@ -280,7 +278,16 @@
Var ShowCountDownBrewing = CountDownBrewing
If RoadShow = "true" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If FreeEnergyDrink = 1 Then
; reset
Var RoadShow = ""
; AddData
; +1 in quota in this id card
AddData <ID> <user-id> <menu?>
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Var Seeker.OrderChanel = Seeker.OrderChanel + ":"