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

SGP: extend timer collect pt3 & adjust cup pos

Browse source
This commit is contained in:
Pakin 2024-10-16 13:17:23 +07:00
parent d6bbb5b47c
commit 3afcd85b20
5 changed files with 52 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inter/sgp/xml/page_collect_point_1.lxml
View file

@ -1188,7 +1188,7 @@
Var TaobinLevel = "2" Var TaobinLevel = "2"
Var CoffeePoint = 55 Var CoffeePoint = 54
</EventUnitTest1> </EventUnitTest1>

5
inter/sgp/xml/page_collect_point_2.lxml
View file

@ -43,11 +43,12 @@
Var Seeker.TNumberTaobinMember= TelephoneNumber Var Seeker.TNumberTaobinMember= TelephoneNumber
Var TaobinLevel = 2 Var TaobinLevel = 2
Var CoffeePointRank = 55 Var CoffeePointRank = 54
DEBUGVAR TaobinLevel DEBUGVAR TaobinLevel
; reset ; reset
Var DebugBypassCollectPt2 = 0 Var DebugBypassCollectPt2 = 0
Var DebugCupSGP = 1
Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.lxml" Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.lxml"
EndIf EndIf
@ -143,6 +144,8 @@
Var TelephoneNumber = TelephoneNumberX Var TelephoneNumber = TelephoneNumberX
If UseSGPCollectFlag = 1 Then If UseSGPCollectFlag = 1 Then
DEBUGVAR Param1
DEBUGVAR "ActionOk GETACCEXT 35"
GETACCEXT Param1 35 GETACCEXT Param1 35
Else Else
GETACCEXT TelephoneNumber 14 GETACCEXT TelephoneNumber 14

57
inter/sgp/xml/page_collect_point_3.lxml
View file

@ -52,6 +52,10 @@
Var pImage = pImage / 55 Var pImage = pImage / 55
Var pImageStr = "/taobinPoint55.png" Var pImageStr = "/taobinPoint55.png"
If DebugCupSGP = 1 Then
Var pImageStr = "/taobinPoint55_debug.png"
EndIf
If UsePepsiTheme = 1 Then If UsePepsiTheme = 1 Then
Var pImageStr = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_member" + pImageStr Var pImageStr = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_member" + pImageStr
Else Else
@ -276,7 +280,10 @@
Var TaobinLevelDesc1More = "SILVER LEVEL" Var TaobinLevelDesc1More = "SILVER LEVEL"
Var TaobinLevelDesc2 = "" Var TaobinLevelDesc2 = ""
Var CoffeePointRank = CoffeePointRank - 150 ; reset-rank
DEBUGVAR CoffeePointRank
Var CoffeePointRank = 0
DEBUGVAR CoffeePointRank
EndIf EndIf
@ -285,14 +292,19 @@
If TaobinLevel = "3" Then If TaobinLevel = "3" Then
;Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp ;Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp
Var PointDiff = 350 - CoffeePointRank ;Var PointDiff = 350 - CoffeePointRank
Var TaobinLevelDesc2 = "Earn " + PointDiff ;Var TaobinLevelDesc2 = "Earn " + PointDiff
Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells " ;Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells "
Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Master turtle level" ;Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Master turtle level"
Var TaobinLeveImg = "/WTCLevel2.png" Var TaobinLeveImg = "/WTCLevel2.png"
Var TaobinLevelDesc1 = "CUPPING"
Var TaobinLevelDesc1Cont = "BETTER!"
If CoffeePointRank > 349 Then
Var TaobinLevelDesc1More = "SILVER LEVEL"
If CoffeePointRank > 199 Then
Var TaobinLeveImg = "/WTCLevel3.png" Var TaobinLeveImg = "/WTCLevel3.png"
Var TaobinLevelDesc1 = "CUPPING" Var TaobinLevelDesc1 = "CUPPING"
@ -300,7 +312,10 @@
Var TaobinLevelDesc1More = "GOLD LEVEL" Var TaobinLevelDesc1More = "GOLD LEVEL"
Var TaobinLevelDesc2 = "" Var TaobinLevelDesc2 = ""
Var CoffeePointRank = CoffeePointRank - 350 ;Var CoffeePointRank = CoffeePointRank - 199
DEBUGVAR CoffeePointRank
Var CoffeePointRank = 0
DEBUGVAR CoffeePointRank
EndIf EndIf
@ -312,18 +327,28 @@
Var TaobinLevelDesc2 = "" Var TaobinLevelDesc2 = ""
Var TaobinLeveImg = "/WTCLevel3.png" Var TaobinLeveImg = "/WTCLevel3.png"
Var TaobinLevelDesc1 = "CUPPING"
Var TaobinLevelDesc1Cont = "BEST!"
Var TaobinLevelDesc1More = "GOLD LEVEL"
Var TaobinLevelDesc2 = ""
EndIf EndIf
EndIf EndIf
DEBUGVAR TaobinLevel
DEBUGVAR TaobinLevelDesc1
DEBUGVAR TaobinLevelDesc1Cont
DEBUGVAR TaobinLevelDesc1More
DEBUGVAR CoffeePointRank
Var CheckCoupons = 0 Var CheckCoupons = 0
Var MakeDrinkState = 0 Var MakeDrinkState = 0
; X Y taobin ; X Y taobin
Var ShellXCol1 = 170 Var ShellXCol1 = 168
Var ShellXCol2 = 268 Var ShellXCol2 = 268
Var ShellXCol3 = 367 Var ShellXCol3 = 367
Var ShellXCol4 = 467 Var ShellXCol4 = 467
@ -333,19 +358,19 @@
Var ShellXCol8 = 860 Var ShellXCol8 = 860
; 1-8 ; 1-8
Var ShellYRow1 = 1042 Var ShellYRow1 = 1045
; 9-16 ; 9-16
Var ShellYRow2 = 1125 Var ShellYRow2 = 1125
; 17-24 ; 17-24
Var ShellYRow3 = 1213 Var ShellYRow3 = 1208
; 25-32 ; 25-32
Var ShellYRow4 = 1292 Var ShellYRow4 = 1292
; 33-40 ; 33-40
Var ShellYRow5 = 1375 Var ShellYRow5 = 1375
; 41-48 ; 41-48
Var ShellYRow6 = 1458 Var ShellYRow6 = 1453
; 49-55 ; 49-55
Var ShellYRow7 = 1541 Var ShellYRow7 = 1536
Var taobinP1 = "Invisible" Var taobinP1 = "Invisible"
@ -939,7 +964,7 @@
Var Timeout = 0 Var Timeout = 0
EndIf EndIf
If Timeout > 5 Then If Timeout > 25 Then
; goto lid straw ; goto lid straw
If CoffeePoint > 54 Then If CoffeePoint > 54 Then
@ -1528,8 +1553,8 @@
; free ; free
<Button> <Button>
<X> 740 </X> <X> 745 </X>
<Y> 1535 </Y> <Y> 1525 </Y>
<Filename> Free1 </Filename> <Filename> Free1 </Filename>
</Button> </Button>

BIN
inter/whatthecup/sgp/image/page_member/points_alert.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before After
Before After

7
xml/page_board.xml
View file

@ -1325,7 +1325,12 @@
; lang-lock-until-done ; lang-lock-until-done
If LangProcess = "Done" Then If LangProcess = "Done" Then
Var ShowButtonClick = "Enable" Var ShowButtonClick = "Enable"
;Var ShowButtonClickFull = "Enable"
If UsePepsiTheme = 1 Then
Var ShowButtonClickFull = "Enable"
EndIf
Else Else
Var ShowButtonClick = "Invisible" Var ShowButtonClick = "Invisible"
Var ShowButtonClickFull = "Invisible" Var ShowButtonClickFull = "Invisible"