diff --git a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml index e0ee8250..9035b44c 100644 --- a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml +++ b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml @@ -158,16 +158,16 @@ Var PointState[8] = 0 Var PointState[9] = 0 - Var PointNameIndex[0] = -1 - Var PointNameIndex[1] = -1 - Var PointNameIndex[2] = -1 - Var PointNameIndex[3] = -1 - Var PointNameIndex[4] = -1 - Var PointNameIndex[5] = -1 - Var PointNameIndex[6] = -1 - Var PointNameIndex[7] = -1 - Var PointNameIndex[8] = -1 - Var PointNameIndex[9] = -1 + Var PointImage[0] = "/no_point.png" + Var PointImage[1] = "/no_point.png" + Var PointImage[2] = "/no_point.png" + Var PointImage[3] = "/no_point.png" + Var PointImage[4] = "/no_point.png" + Var PointImage[5] = "/no_point.png" + Var PointImage[6] = "/no_point.png" + Var PointImage[7] = "/no_point.png" + Var PointImage[8] = "/no_point.png" + Var PointImage[9] = "/no_point.png" @@ -337,61 +337,101 @@ If MenuPoint[0] = 1 Then Var CurrentIndexPoint = CurrentIndexPoint + 1 Var PointState[CurrentIndexPoint] = 1 - Var PointNameIndex[CurrentIndexPoint] = 0 + If show_eng = "true" Then + Var PointImage[CurrentIndexPoint] = "/point_1_en.png" + Else + Var PointImage[CurrentIndexPoint] = "/point_1.png" + EndIf EndIf If MenuPoint[1] = 1 Then Var CurrentIndexPoint = CurrentIndexPoint + 1 Var PointState[CurrentIndexPoint] = 1 - Var PointNameIndex[CurrentIndexPoint] = 1 + If show_eng = "true" Then + Var PointImage[CurrentIndexPoint] = "/point_2_en.png" + Else + Var PointImage[CurrentIndexPoint] = "/point_2.png" + EndIf EndIf If MenuPoint[2] = 1 Then Var CurrentIndexPoint = CurrentIndexPoint + 1 Var PointState[CurrentIndexPoint] = 1 - Var PointNameIndex[CurrentIndexPoint] = 2 + If show_eng = "true" Then + Var PointImage[CurrentIndexPoint] = "/point_3_en.png" + Else + Var PointImage[CurrentIndexPoint] = "/point_3.png" + EndIf EndIf If MenuPoint[3] = 1 Then Var CurrentIndexPoint = CurrentIndexPoint + 1 Var PointState[CurrentIndexPoint] = 1 - Var PointNameIndex[CurrentIndexPoint] = 3 + If show_eng = "true" Then + Var PointImage[CurrentIndexPoint] = "/point_4_en.png" + Else + Var PointImage[CurrentIndexPoint] = "/point_4.png" + EndIf EndIf If MenuPoint[4] = 1 Then Var CurrentIndexPoint = CurrentIndexPoint + 1 Var PointState[CurrentIndexPoint] = 1 - Var PointNameIndex[CurrentIndexPoint] = 4 + If show_eng = "true" Then + Var PointImage[CurrentIndexPoint] = "/point_5_en.png" + Else + Var PointImage[CurrentIndexPoint] = "/point_5.png" + EndIf EndIf If MenuPoint[5] = 1 Then Var CurrentIndexPoint = CurrentIndexPoint + 1 Var PointState[CurrentIndexPoint] = 1 - Var PointNameIndex[CurrentIndexPoint] = 5 + If show_eng = "true" Then + Var PointImage[CurrentIndexPoint] = "/point_6_en.png" + Else + Var PointImage[CurrentIndexPoint] = "/point_6.png" + EndIf EndIf If MenuPoint[6] = 1 Then Var CurrentIndexPoint = CurrentIndexPoint + 1 Var PointState[CurrentIndexPoint] = 1 - Var PointNameIndex[CurrentIndexPoint] = 6 + If show_eng = "true" Then + Var PointImage[CurrentIndexPoint] = "/point_7_en.png" + Else + Var PointImage[CurrentIndexPoint] = "/point_7.png" + EndIf EndIf If MenuPoint[7] = 1 Then Var CurrentIndexPoint = CurrentIndexPoint + 1 Var PointState[CurrentIndexPoint] = 1 - Var PointNameIndex[CurrentIndexPoint] = 7 + If show_eng = "true" Then + Var PointImage[CurrentIndexPoint] = "/point_8_en.png" + Else + Var PointImage[CurrentIndexPoint] = "/point_8.png" + EndIf EndIf If MenuPoint[8] = 1 Then Var CurrentIndexPoint = CurrentIndexPoint + 1 Var PointState[CurrentIndexPoint] = 1 - Var PointNameIndex[CurrentIndexPoint] = 8 + If show_eng = "true" Then + Var PointImage[CurrentIndexPoint] = "/point_9_en.png" + Else + Var PointImage[CurrentIndexPoint] = "/point_9.png" + EndIf EndIf If MenuPoint[9] = 1 Then Var CurrentIndexPoint = CurrentIndexPoint + 1 Var PointState[CurrentIndexPoint] = 1 - Var PointNameIndex[CurrentIndexPoint] = 9 + If show_eng = "true" Then + Var PointImage[CurrentIndexPoint] = "/point_10_en.png" + Else + Var PointImage[CurrentIndexPoint] = "/point_10.png" + EndIf EndIf DEBUGVAR Seeker.selected_a_drink diff --git a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml index a55849f3..07473853 100644 --- a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml +++ b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml @@ -35,16 +35,6 @@ Var CheckCoupons = 0 Var MakeDrinkState = 0 - Var taobinImgPoint[0] = "/no_point.png" - Var taobinImgPoint[1]= "/no_point.png" - Var taobinImgPoint[2]= "/no_point.png" - Var taobinImgPoint[3]= "/no_point.png" - Var taobinImgPoint[4]= "/no_point.png" - Var taobinImgPoint[5]= "/no_point.png" - Var taobinImgPoint[6]= "/no_point.png" - Var taobinImgPoint[7]= "/no_point.png" - Var taobinImgPoint[8]= "/no_point.png" - Var PointCount = 0 DEBUGVAR PointState[0] @@ -56,96 +46,47 @@ DEBUGVAR PointState[6] DEBUGVAR PointState[7] DEBUGVAR PointState[8] + DEBUGVAR PointState[9] - Var PointNameIndex0 = PointNameIndex[0] - Var PointNameIndex1 = PointNameIndex[1] - Var PointNameIndex2 = PointNameIndex[2] - Var PointNameIndex3 = PointNameIndex[3] - Var PointNameIndex4 = PointNameIndex[4] - Var PointNameIndex5 = PointNameIndex[5] - Var PointNameIndex6 = PointNameIndex[6] - Var PointNameIndex7 = PointNameIndex[7] - Var PointNameIndex8 = PointNameIndex[8] + Var taobinImgPoint[0] = PointImage[0] + Var taobinImgPoint[1] = PointImage[1] + Var taobinImgPoint[2] = PointImage[2] + Var taobinImgPoint[3] = PointImage[3] + Var taobinImgPoint[4] = PointImage[4] + Var taobinImgPoint[5] = PointImage[5] + Var taobinImgPoint[6] = PointImage[6] + Var taobinImgPoint[7] = PointImage[7] + Var taobinImgPoint[8] = PointImage[8] If PointState[0] = 1 Then Var PointCount = PointCount + 1 - If show_eng = "true" Then - Var taobinImgPoint[0] = "/point_1_en.png" - Else - Var taobinImgPoint[0] = "/point_1.png" - EndIf EndIf If PointState[1] = 1 Then Var PointCount = PointCount + 1 - If show_eng = "true" Then - Var taobinImgPoint[1] = "/point_2_en.png" - Else - Var taobinImgPoint[1] = "/point_2.png" - EndIf EndIf If PointState[2] = 1 Then Var PointCount = PointCount + 1 - If show_eng = "true" Then - Var taobinImgPoint[2] = "/point_3_en.png" - Else - Var taobinImgPoint[2] = "/point_3.png" - EndIf EndIf If PointState[3] = 1 Then Var PointCount = PointCount + 1 - If show_eng = "true" Then - Var taobinImgPoint[3] = "/point_4_en.png" - Else - Var taobinImgPoint[3] = "/point_4.png" - EndIf EndIf If PointState[4] = 1 Then Var PointCount = PointCount + 1 - If show_eng = "true" Then - Var taobinImgPoint[4] = "/point_5_en.png" - Else - Var taobinImgPoint[4] = "/point_5.png" - EndIf EndIf If PointState[5] = 1 Then Var PointCount = PointCount + 1 - If show_eng = "true" Then - Var taobinImgPoint[5] = "/point_6_en.png" - Else - Var taobinImgPoint[5] = "/point_6.png" - EndIf EndIf If PointState[6] = 1 Then Var PointCount = PointCount + 1 - If show_eng = "true" Then - Var taobinImgPoint[6] = "/point_7_en.png" - Else - Var taobinImgPoint[6] = "/point_7.png" - EndIf EndIf If PointState[7] = 1 Then Var PointCount = PointCount + 1 - If show_eng = "true" Then - Var taobinImgPoint[7] = "/point_8_en.png" - Else - Var taobinImgPoint[7] = "/point_8.png" - EndIf EndIf If PointState[8] = 1 Then Var PointCount = PointCount + 1 - If MenuPoint[9] = 1 Then - If show_eng = "true" Then - Var taobinImgPoint[8] = "/point_10_en.png" - Else - Var taobinImgPoint[8] = "/point_10.png" - EndIf - Else - If show_eng = "true" Then - Var taobinImgPoint[8] = "/point_9_en.png" - Else - Var taobinImgPoint[8] = "/point_9.png" - EndIf - EndIf + EndIf + If PointState[9] = 1 Then + Var PointCount = PointCount + 1 EndIf Var PointDiff = 9 - PointCount @@ -176,7 +117,7 @@ EndIf - If PointCount = 9 Then + If PointCount >= 9 Then Var CloseBtnImg = PointRootDir + "/bn_random.png" EndIf