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 2025-07-09 17:49:06 +07:00
commit abd25e0f9a
7 changed files with 57 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

17
inter/mys/xml/e_receipt/page_prompt_e_receipt.lxml
View file

@ -41,6 +41,8 @@ DEBUGVAR bn_no
DEBUGVAR bp_yes
DEBUGVAR bp_no
DEBUGVAR Seeker.TriggerGetFree
</EventOpen>
<Timeout> 1000 </Timeout>
@ -55,7 +57,12 @@ If Timeout > 15 Then
Open "ROOT/taobin_project/xml/page_board.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If Seeker.TriggerGetFree = 1 Then
Var Seeker.TriggerGetFree = 0
Open "ROOT/taobin_project/xml/page_display_get_free.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
EndIf
@ -117,7 +124,13 @@ TimerReset
<EventClick>
Var Seeker.e_receipt = "false"
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If Seeker.TriggerGetFree = 1 Then
Var Seeker.TriggerGetFree = 0
Open "ROOT/taobin_project/xml/page_display_get_free.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
</EventClick>
</Button>

52
inter/mys/xml/page_collect_point_3.lxml
View file

@ -269,7 +269,7 @@
EndIf
If TaobinLevel = "3" Then
Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp
Var TaobinLevelDesc1 = "Flying turtle level"
Var PointDiff = 200 - CoffeePointRank
Var TaobinLevelDesc2 = "Earn " + PointDiff
@ -290,7 +290,7 @@
EndIf
If TaobinLevel = "4" Then
Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp
Var TaobinLevelDesc1 = "Master turtle level"
Var TaobinLevelDesc2 = ""
@ -684,10 +684,30 @@
If Timeout > 5 Then
; goto lid straw
Var Seeker.TriggerGetFree = 0
If CoffeePoint > 29 Then
Var Seeker.TriggerGetFree = 1
If eReceiptFlag = 1 Then
If CountryName = "Malaysia" Then
Var RecieptPromptPage = CountryRootPath + "/xml/e_receipt/page_prompt_e_receipt.lxml"
DEBUGVAR RecieptPromptPage
Open RecieptPromptPage
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_display_get_free.xml"
Else
If Seeker.FromConsent = 1 Then
Var Seeker.TriggerGetFree = 1
If eReceiptFlag = 1 Then
If CountryName = "Malaysia" Then
Var RecieptPromptPage = CountryRootPath + "/xml/e_receipt/page_prompt_e_receipt.lxml"
DEBUGVAR RecieptPromptPage
Open RecieptPromptPage
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_display_get_free.xml"
Else
@ -821,11 +841,11 @@
</Image>
<Image>
<X> 243 </X>
<Y> 860 </Y>
<Filename> Var( DirImage + "/text4.png" )</Filename>
</Image>
;<Image>
;<X> 243 </X>
;<Y> 860 </Y>
;<Filename> Var( DirImage + "/text4.png" )</Filename>
;</Image>
@ -1171,15 +1191,15 @@
<Format> Telnum-mask-1 </Format>
</Text>
<Text>
<X> 250 </X>
<Y> 890 </Y>
<Size> 50 </Size>
<Width> 120 </Width>
<Font> KanitRegularTTF </Font>
<Color> 0xDE794E </Color>
<Value> CoffeePointRank </Value>
</Text>
;<Text>
;<X> 250 </X>
;<Y> 890 </Y>
;<Size> 50 </Size>
;<Width> 120 </Width>
;<Font> KanitRegularTTF </Font>
;<Color> 0xDE794E </Color>
;<Value> CoffeePointRank </Value>
;</Text>
<Button>
<X> 230 </X>

13
xml/process/temp_ledv4_blinkall_horizontal.ev
View file

@ -1,16 +1,7 @@
If FrontDoorVersionInt > 19999 Then
LEDv2 LedV4#103 On 200 20 0 255 10
LEDv2 LedV4#104 On 200 20 0 255 10
LEDv2 LedV4#105 On 200 20 0 255 10
LEDv2 LedV4#106 On 200 20 0 255 10
LEDv2 LedV4#107 On 200 20 0 255 10
LEDv2 LedV4#108 On 200 20 0 255 10
LEDv2 LedV4#109 On 200 20 0 255 10
LEDv2 LedV4#110 On 200 20 0 255 10
LEDv2 LedV4#111 On 200 20 0 255 10
LEDv2 LedV4#112 On 200 20 0 255 10
LEDv2 LedV4#113 On 200 20 0 255 10
LEDv2 LedDoorCupV2 On 200 20 0 255 10
SAVELOG "LEDv4.SlowBrinkHorizontal"
EndIf

12
xml/process/temp_ledv4_offall_horizontal.ev
View file

@ -1,16 +1,6 @@
DEBUGVAR "AllOffv4"
If FrontDoorVersionInt > 19999 Then
LEDv2 LedV4#103 Off 0 0 0 1 0
LEDv2 LedV4#104 Off 0 0 0 1 0
LEDv2 LedV4#105 Off 0 0 0 1 0
LEDv2 LedV4#106 Off 0 0 0 1 0
LEDv2 LedV4#107 Off 0 0 0 1 0
LEDv2 LedV4#108 Off 0 0 0 1 0
LEDv2 LedV4#109 Off 0 0 0 1 0
LEDv2 LedV4#110 Off 0 0 0 1 0
LEDv2 LedV4#111 Off 0 0 0 1 0
LEDv2 LedV4#112 Off 0 0 0 1 0
LEDv2 LedV4#113 Off 0 0 0 1 0
LEDv2 LedDoorCupV2 Off 0 0 0 1 0
SAVELOG "LEDv4.AllOffHorizontal"
EndIf

12
xml/process/temp_ledv4_page_drinkok.ev
View file

@ -3,17 +3,7 @@ If FrontDoorVersionInt > 19999 Then
LEDv2 LedV4All On 100 20 0 255 0
LEDv2 LedV4#103 On 200 20 0 255 10
LEDv2 LedV4#104 On 200 20 0 255 10
LEDv2 LedV4#105 On 200 20 0 255 10
LEDv2 LedV4#106 On 200 20 0 255 10
LEDv2 LedV4#107 On 200 20 0 255 10
LEDv2 LedV4#108 On 200 20 0 255 10
LEDv2 LedV4#109 On 200 20 0 255 10
LEDv2 LedV4#110 On 200 20 0 255 10
LEDv2 LedV4#111 On 200 20 0 255 10
LEDv2 LedV4#112 On 200 20 0 255 10
LEDv2 LedV4#113 On 200 20 0 255 10
LEDv2 LedDoorCupV2 On 200 20 0 255 10
SAVELOG "LEDv4.PageDrinkOk"
EndIf

12
xml/process/temp_ledv4_page_thankyou.ev
View file

@ -5,17 +5,7 @@ If FrontDoorVersionInt > 19999 Then
LEDv2 LedV4Mid Blink 100 20 0 4 10
LEDv2 LedV4Bottom On 100 20 0 255 0
LEDv2 LedV4#103 Blink 200 20 0 4 10
LEDv2 LedV4#104 Blink 200 20 0 4 10
LEDv2 LedV4#105 Blink 200 20 0 4 10
LEDv2 LedV4#106 Blink 200 20 0 4 10
LEDv2 LedV4#107 Blink 200 20 0 4 10
LEDv2 LedV4#108 Blink 200 20 0 4 10
LEDv2 LedV4#109 Blink 200 20 0 4 10
LEDv2 LedV4#110 Blink 200 20 0 4 10
LEDv2 LedV4#111 Blink 200 20 0 4 10
LEDv2 LedV4#112 Blink 200 20 0 4 10
LEDv2 LedV4#113 Blink 200 20 0 4 10
LEDv2 LedDoorCupV2 Blink 200 20 0 4 10
SAVELOG "LEDv4.PageThankYou"

2
xml/vending_tasks_pre_main.xml
View file

@ -130,7 +130,7 @@
<FrameScroll>
<Max> 6 </Max>
<Max> 10 </Max>
<X> 280 </X>
<Y> 200 </Y>
<Width> 600 </Width>