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

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

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>

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>