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

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

Browse source
This commit is contained in:
wanlop run 2024-09-02 13:12:29 +07:00
commit 5b69a7522c
60 changed files with 11596 additions and 8620 deletions
Download patch file Download diff file Expand all files Collapse all files

113
xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml
View file

@ -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"
@ -182,6 +182,7 @@
SPLIT Ext1a "/" 7 MenuPoint[6]
SPLIT Ext1a "/" 8 MenuPoint[7]
SPLIT Ext1a "/" 9 MenuPoint[8]
SPLIT Ext1a "/" 10 MenuPoint[9]
INT MenuPoint[0]
@ -193,6 +194,7 @@
INT MenuPoint[6]
INT MenuPoint[7]
INT MenuPoint[8]
INT MenuPoint[9]
DEBUGVAR MenuPoint[0]
DEBUGVAR MenuPoint[1]
@ -203,6 +205,7 @@
DEBUGVAR MenuPoint[6]
DEBUGVAR MenuPoint[7]
DEBUGVAR MenuPoint[8]
DEBUGVAR MenuPoint[9]
; Menu 1
If Seeker.selected_a_drink = "12-05-03-0064" Then
@ -238,6 +241,14 @@
; Menu 4
If Seeker.selected_a_drink = "12-01-02-0073" Then
If MenuPoint[3] = 1 then
Else
Var MenuPoint[3] = 1
Var newPointIndex = 3
EndIf
EndIf
If Seeker.selected_a_drink = "12-21-02-0073" Then
If MenuPoint[3] = 1 then
@ -282,6 +293,14 @@
; Menu 8
If Seeker.selected_a_drink = "12-01-02-0074" Then
If MenuPoint[7] = 1 then
Else
Var MenuPoint[7] = 1
Var newPointIndex = 7
EndIf
EndIf
If Seeker.selected_a_drink = "12-21-02-0074" Then
If MenuPoint[7] = 1 then
@ -302,61 +321,117 @@
EndIf
EndIf
; Menu 10
If Seeker.selected_a_drink = "12-05-03-0115" Then
If MenuPoint[9] = 1 then
Else
Var MenuPoint[9] = 1
Var newPointIndex = 9
EndIf
EndIf
Var CurrentIndexPoint = -1
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
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

79
xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml
View file

@ -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,88 +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 show_eng = "true" Then
Var taobinImgPoint[8] = "/point_9_en.png"
Else
Var taobinImgPoint[8] = "/point_9.png"
EndIf
EndIf
If PointState[9] = 1 Then
Var PointCount = PointCount + 1
EndIf
Var PointDiff = 9 - PointCount
@ -168,7 +117,7 @@
EndIf
If PointCount = 9 Then
If PointCount >= 9 Then
Var CloseBtnImg = PointRootDir + "/bn_random.png"
EndIf

12
xml/event/robinson_beauty/page_collect_point_robinson_beauty_error.xml
View file

@ -55,6 +55,9 @@
; Menu 4
If Seeker.selected_a_drink = "12-01-02-0073" Then
Var newPointIndex = 3
EndIf
If Seeker.selected_a_drink = "12-21-02-0073" Then
Var newPointIndex = 3
EndIf
@ -79,6 +82,9 @@
; Menu 8
If Seeker.selected_a_drink = "12-01-02-0074" Then
Var newPointIndex = 7
EndIf
If Seeker.selected_a_drink = "12-21-02-0074" Then
Var newPointIndex = 7
EndIf
@ -88,7 +94,11 @@
If Seeker.selected_a_drink = "12-02-03-0053" Then
Var newPointIndex = 8
EndIf
; Menu 10
If Seeker.selected_a_drink = "12-05-03-0115" Then
Var newPointIndex = 8
EndIf
Var CurrentPointSlot = newPointIndex + 1
Var CurrentPointCheck = "check"

4
xml/open_page_collect_point.ev
View file

@ -6,6 +6,10 @@ If CountryName = "Australia" Then
Var PageCollectPoint1 = "ROOT/taobin_project/inter/aus/xml/page_collect_point_1.lxml"
EndIf
If CountryName = "Malaysia" Then
Var PageCollectPoint1 = "ROOT/taobin_project/inter/mys/xml/page_collect_point_1.lxml"
EndIf
If CountryName = "Singapore" Then
; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "xml/page_member_prompt.lxml"

47
xml/page_board.xml
View file

@ -844,7 +844,7 @@
Var show_eng = "true"
Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
Var VideoMainPage = "ROOT/taobin_project/inter/sgp/video/video_main.mp4"
Var ShowNetworkProblemText = "Network error. Payment Cash only."
@ -860,8 +860,8 @@
Var PriceUnitText = "Price in SGD"
Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page_en/bn_main_page_member.png"
Var MemberButtonFileName = ""
Var MemberButtonFileNameRest = ""
Var show_eng_button_stage = "Invisible"
Var CountDownShowButton = 35
@ -880,10 +880,7 @@
; Singapore disable point
Var SettingIgnoreCollectPoint = 1
If BoxID = 210604 Then
Var SettingIgnoreCollectPoint = 0
EndIf
READ_FILE "/mnt/sdcard/coffeevending/use_pt_dev" use_pt_dev
STRCONTAIN "1" use_pt_dev enable_pt_mode_by_cfg
@ -1435,24 +1432,26 @@
</EventUnitTest7>
<EventUnitTest8>
Var XMLProfile = "Discount90Per"
CacheVarStr "put" XMLProfile
PRICE "Reset" "-"
PRICE "Load" "-"
PRICE "CheckAndApply" XMLProfile
Var XMLProfile = "Discount50"
DEBUGVAR ProfileIndex[0]
DEBUGVAR ProfileIndex[1]
DEBUGVAR ProfileIndex[2]
DEBUGVAR ProfileIndex[3]
DEBUGVAR ProfileIndex[4]
DEBUGVAR ProfileIndex[5]
DEBUGVAR ProfileIndex[6]
DEBUGVAR ProfileIndex[7]
DEBUGVAR ProfileIndex[8]
DEBUGVAR ProfileIndex[9]
DEBUGVAR ProfileIndex[10]
PRICE "Reload" ""
CacheVarStr "put" XMLProfile
;PRICE "Reset" "-"
;PRICE "Load" "-"
;PRICE "CheckAndApply" XMLProfile
;DEBUGVAR ProfileIndex[0]
;DEBUGVAR ProfileIndex[1]
;DEBUGVAR ProfileIndex[2]
;DEBUGVAR ProfileIndex[3]
;DEBUGVAR ProfileIndex[4]
;DEBUGVAR ProfileIndex[5]
;DEBUGVAR ProfileIndex[6]
;DEBUGVAR ProfileIndex[7]
;DEBUGVAR ProfileIndex[8]
;DEBUGVAR ProfileIndex[9]
;DEBUGVAR ProfileIndex[10]
;PRICE "Reload" ""
</EventUnitTest8>

2
xml/page_payment_cash-MYR.xml
View file

@ -770,6 +770,7 @@
;DEBUGVAR alphaState3
DEBUGVAR CashlessPayFlag
DEBUGVAR ReadyForBrew
If ReadyForBrew = "false" Then
SAVELOG "Back to main1"
@ -1716,6 +1717,7 @@ If alphaState = "Invisible" Then
DEBUGVAR VendingCashless
Var ReqPayInfoFromCashOther = 2
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
EndIf
EndIf

6
xml/verify_number.ev
View file

@ -17,4 +17,10 @@ EndIf
If Tel2D = "09" Then
Var Tel2DFlag = 1
EndIf
If InternationalEnable = 1 Then
Var VerifyFile = CountryRootPath + "/xml/verify_number.ev"
TRY VerifyFile
EndIf