SGP: extend timer collect pt3 & adjust cup pos

inter/sgp/xml/page_collect_point_1.lxml

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

inter/sgp/xml/page_collect_point_2.lxml

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

inter/sgp/xml/page_collect_point_3.lxml

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

xml/page_board.xml

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