Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

xml/event/pepween/page_collect_point_pro_pepween_2.xml

@@ -159,55 +159,116 @@
 				Var PopweenPointNewIndex = 0
 
 				If Seeker.selected_a_drink = "12-99-05-0053" Then
-					Var PopweenPointNewIndex = 0
+					If PopweenPointState[0]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 0
+					EndIf
+
 					Var PopweenPointState[0] = 1
 				EndIf
-				If Seeker.selected_a_drink = "12-99-05-0054" Then
+				If Seeker.selected_a_drink = "12-99-05-0054" Then	
-					Var PopweenPointNewIndex = 1
+					If PopweenPointState[1]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 1
+					EndIf
+				
 					Var PopweenPointState[1] = 1
 				EndIf
 				If Seeker.selected_a_drink = "12-99-05-0055" Then
-					Var PopweenPointNewIndex = 2
+					If PopweenPointState[2]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 2
+					EndIf
+
 					Var PopweenPointState[2] = 1
 				EndIf
 				If Seeker.selected_a_drink = "12-99-05-0057" Then
-					Var PopweenPointNewIndex = 3
+					If PopweenPointState[3]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 3
+					EndIf
+
 					Var PopweenPointState[3] = 1
 				EndIf
 				If Seeker.selected_a_drink = "12-99-05-0058" Then
-					Var PopweenPointNewIndex = 4
+					If PopweenPointState[4]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 4
+					EndIf
 					Var PopweenPointState[4] = 1
 				EndIf
 				If Seeker.selected_a_drink = "12-99-05-0059" Then
-					Var PopweenPointNewIndex = 5
+					If PopweenPointState[5]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 5
+					EndIf
+
 					Var PopweenPointState[5] = 1
 				EndIf
 				If Seeker.selected_a_drink = "12-99-05-0060" Then
-					Var PopweenPointNewIndex = 6
+					If PopweenPointState[6]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 6
+					EndIf
+
 					Var PopweenPointState[6] = 1
 				EndIf
 				If Seeker.selected_a_drink = "12-99-05-0061" Then
-					Var PopweenPointNewIndex = 7
+					If PopweenPointState[7]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 7
+					EndIf
 					Var PopweenPointState[7] = 1
 				EndIf
 				If Seeker.selected_a_drink = "12-99-05-0062" Then
 					Var PopweenPointNewIndex = 8
 					Var PopweenPointState[8] = 1
+
+					If PopweenPointState[8]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					EndIf
 				EndIf
 				If Seeker.selected_a_drink = "12-99-05-0064" Then
-					Var PopweenPointNewIndex = 9
+					If PopweenPointState[9]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 9
+					EndIf
+
 					Var PopweenPointState[9] = 1
 				EndIf
 				If Seeker.selected_a_drink = "12-99-05-0065" Then
-					Var PopweenPointNewIndex = 10
+					If PopweenPointState[10] = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 10
+					EndIf
+
 					Var PopweenPointState[10] = 1
 				EndIf
 				If Seeker.selected_a_drink = "12-99-05-0056" Then
 					Var PopweenPointNewIndex = 11
 					Var PopweenPointState[11] = 1
+
+					If PopweenPointState[11] = 1 Then
+						Var PopweenPointNewIndex = ""
+					EndIf
 				EndIf
 				If Seeker.selected_a_drink = "12-99-05-0066" Then
-					Var PopweenPointNewIndex = 12
+					If PopweenPointState[12] = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 12
+					EndIf
+
 					Var PopweenPointState[12] = 1
 				EndIf
 

xml/event/pepween/page_collect_point_pro_pepween_3.xml

@@ -174,12 +174,15 @@
 		Var PepweenPoint = PepweenPoint + 1
 	EndIf
 
-	If PopweenPointNewIndex >= 0 Then
+	If PopweenPointNewIndex = "" Then
-		Var taobinImgPoint[PopweenPointNewIndex] = "/skull_active_new.png"
+		; Nothing
-		Var taobinTextColorPoint[PopweenPointNewIndex] = "0xE97A13"
+	Else
+		If PopweenPointNewIndex >= 0 Then
+			Var taobinImgPoint[PopweenPointNewIndex] = "/skull_active_new.png"
+			Var taobinTextColorPoint[PopweenPointNewIndex] = "0xE97A13"
+		EndIf
 	EndIf
 
-
 	Var PointDiff = 13 - PepweenPoint
 
 	If show_eng = "true" Then

xml/page_catalog_group_pro_pepween.skt

@@ -14,7 +14,17 @@
         #include=menu_catalog_default_init.py
     ?>
     
-
+    DEBUGVAR SystemTimeHourInt
+    If SystemTimeHourInt >= 19 Then
+        Var Haunted7price = 30
+    Else
+        If SystemTimeHourInt < 5 Then
+            Var Haunted7price = 30
+        Else
+            Var Haunted7price = $12-99-03-0066.Price
+        EndIf
+    EndIf
+    
 
     Var Timeout = 0