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

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

Browse source
This commit is contained in:
wanlop run 2024-08-28 15:19:09 +07:00
commit d8c905041f
36 changed files with 166 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/event/robinson_beauty/random_10.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 593 KiB

BIN
image/event/robinson_beauty/random_fortune_cookie.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

Before After
Before After

BIN
image/event/robinson_beauty/reward_popmart_labubu_v2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 377 KiB

BIN
image/event/robinson_beauty/reward_popmart_labubu_v2_name.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
image/event/robinson_beauty/robinson_beauty_en.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 244 KiB

After

Width:  |  Height:  |  Size: 244 KiB

Before After
Before After

BIN
image/event/robinson_beauty/robinson_beauty_th.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 249 KiB

After

Width:  |  Height:  |  Size: 248 KiB

Before After
Before After

6
inter/aus/xml/page_catalog_group_milk.lxml
View file

@ -9305,7 +9305,7 @@
Var PD_CODE2 = "##-##-##-####" Var PD_CODE2 = "##-##-##-####"
Var PD_CODE3 = "51-03-03-0047" Var PD_CODE3 = "51-03-03-0047"
; begin lang ; begin lang
Var aliasName[0] = "Mint MILK \nBISCOFF VOLCANO" Var aliasName[0] = "MINT MILK \nBISCOFF VOLCANO"
Var aliasDesc[0] = "Mint Syrup, Milk,\nSugar, Biscof" Var aliasDesc[0] = "Mint Syrup, Milk,\nSugar, Biscof"
Var aliasName[1] = "" Var aliasName[1] = ""
Var aliasDesc[1] = "" Var aliasDesc[1] = ""
@ -9400,9 +9400,9 @@
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color> <Color> 0x322B26 </Color>
<LanguageGroup> <LanguageGroup>
<LanguageSlot1>Mint MILK \nBISCOFF VOLCANO</LanguageSlot1> <LanguageSlot1>MINT MILK \nBISCOFF VOLCANO</LanguageSlot1>
<LanguageSlot2></LanguageSlot2> <LanguageSlot2></LanguageSlot2>
<LanguageSlot3>Mint MILK \nBISCOFF VOLCANO</LanguageSlot3> <LanguageSlot3>MINT MILK \nBISCOFF VOLCANO</LanguageSlot3>
<LanguageSlot4></LanguageSlot4> <LanguageSlot4></LanguageSlot4>
<LanguageSlot5></LanguageSlot5> <LanguageSlot5></LanguageSlot5>
<LanguageSlot6></LanguageSlot6> <LanguageSlot6></LanguageSlot6>

8
inter/aus/xml/page_check_member.lxml
View file

@ -536,12 +536,8 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
Trim Tel2D 1 TRY verifyNumberEV
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf
If Tel2DFlag = 1 Then If Tel2DFlag = 1 Then

8
inter/aus/xml/page_collect_point_1.lxml
View file

@ -553,12 +553,8 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
Trim Tel2D 1 TRY verifyNumberEV
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf
If Tel2DFlag = 1 Then If Tel2DFlag = 1 Then

130
inter/aus/xml/page_show_error.lxml
View file

@ -29,7 +29,68 @@
LED LedDoorLid Off 255 255 255 255 LED LedDoorLid Off 255 255 255 255
EndIf EndIf
Function 2 DEBUGVAR MachineStage
DEBUGVAR stop_now
Var DirImage = "ROOT/taobin_project/inter/aus/image/vending_error_en"
If MachineStage = "mcu-upgrade" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If NeedUpgrade = "true" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
DEBUGVAR MachineStage
If MachineStage = "close-maintenance" Then
DEBUGVAR stop_now
If stop_now = "true" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
Else
Var show_error_normal = "Enable"
Var show_error_sp1 = "Invisible"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
EndIf
If MachineStage = "drink-failed" Then
If stop_now = "true" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
Else
Var show_error_normal = "Enable"
Var show_error_sp1 = "Invisible"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
EndIf
If NETCORE_LOST_CNT > 0 Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If NETCORE_EVENT_CNT_X >= 30 Then
Var NETCORE_EVENT_CNT_X = 0
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
Var MaintenanceCard = 20
Random MaintenanceCard
Var index = 1 + MaintenanceCard
DEBUGVAR DirImage
Var RandomImage = "ROOT/taobin_project/image/close_en/Frame" + index
Var RandomImage = RandomImage + ".png"
DEBUGVAR RandomImage
DEBUGVAR Seeker
DEBUGVAR DoorCupPosition
DEBUGVAR DoorLidPosition
DEBUGVAR EmergencyStop
Var TimeOut = 0 Var TimeOut = 0
Var textStep = 0 Var textStep = 0
@ -188,76 +249,11 @@
Var ButtonLanguageListYPosition = 640 Var ButtonLanguageListYPosition = 640
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Function 2 Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml"
Refresh Refresh
</EventLanguageOnChange> </EventLanguageOnChange>
<Function2>
DEBUGVAR MachineStage
DEBUGVAR stop_now
Var DirImage = "ROOT/taobin_project/inter/aus/image/vending_error_en"
If MachineStage = "mcu-upgrade" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If NeedUpgrade = "true" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
DEBUGVAR MachineStage
If MachineStage = "close-maintenance" Then
DEBUGVAR stop_now
If stop_now = "true" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
Else
Var show_error_normal = "Enable"
Var show_error_sp1 = "Invisible"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
EndIf
If MachineStage = "drink-failed" Then
If stop_now = "true" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
Else
Var show_error_normal = "Enable"
Var show_error_sp1 = "Invisible"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
EndIf
If NETCORE_LOST_CNT > 0 Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If NETCORE_EVENT_CNT_X >= 30 Then
Var NETCORE_EVENT_CNT_X = 0
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
Var MaintenanceCard = 20
Random MaintenanceCard
Var index = 1 + MaintenanceCard
DEBUGVAR DirImage
Var RandomImage = "ROOT/taobin_project/image/close_en/Frame" + index
Var RandomImage = RandomImage + ".png"
DEBUGVAR RandomImage
DEBUGVAR Seeker
DEBUGVAR DoorCupPosition
DEBUGVAR DoorLidPosition
DEBUGVAR EmergencyStop
</Function2>
<Image> <Image>
<State> show_error_normal </State> <State> show_error_normal </State>
<X> 69 </X> <X> 69 </X>

8
inter/aus/xml/verify_number.ev Normal file
View file

@ -0,0 +1,8 @@
Var Tel2D = TelephoneNumber
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf

13
inter/hkg/xml/page_check_member.lxml
View file

@ -536,17 +536,8 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
Trim Tel2D 1 TRY verifyNumberEV
If Tel2D = "0" Then
Var Tel2DFlag = 1
Else
; inter-accept-no-zero
If CountryName = "HongKong" Then
Var Tel2DFlag = 1
EndIf
EndIf
If Tel2DFlag = 1 Then If Tel2DFlag = 1 Then

13
inter/hkg/xml/page_collect_point_1.lxml
View file

@ -852,17 +852,8 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
Trim Tel2D 1 TRY verifyNumberEV
If Tel2D = "0" Then
Var Tel2DFlag = 1
Else
; inter-accept-no-zero
If CountryName = "HongKong" Then
Var Tel2DFlag = 1
EndIf
EndIf
If Tel2DFlag = 1 Then If Tel2DFlag = 1 Then

3
inter/hkg/xml/verify_number.ev Normal file
View file

@ -0,0 +1,3 @@
; inter-accept-no-zero
Var Tel2DFlag = 1

8
inter/mys/xml/page_check_member.lxml
View file

@ -536,12 +536,8 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
Trim Tel2D 1 TRY verifyNumberEV
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf
If Tel2DFlag = 1 Then If Tel2DFlag = 1 Then

7
inter/mys/xml/verify_number.ev Normal file
View file

@ -0,0 +1,7 @@
Var Tel2D = TelephoneNumber
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf

13
inter/sgp/xml/page_check_member.lxml
View file

@ -536,17 +536,8 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
Trim Tel2D 1 TRY verifyNumberEV
If Tel2D = "0" Then
Var Tel2DFlag = 1
Else
; inter-accept-no-zero
If CountryName = "Singapore" Then
Var Tel2DFlag = 1
EndIf
EndIf
If Tel2DFlag = 1 Then If Tel2DFlag = 1 Then

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

@ -911,17 +911,8 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
Trim Tel2D 1 TRY verifyNumberEV
If Tel2D = "0" Then
Var Tel2DFlag = 1
Else
; inter-accept-no-zero
If CountryName = "Singapore" Then
Var Tel2DFlag = 1
EndIf
EndIf
If Tel2DFlag = 1 Then If Tel2DFlag = 1 Then

3
inter/sgp/xml/verify_number.ev Normal file
View file

@ -0,0 +1,3 @@
; inter-accept-no-zero
Var Tel2DFlag = 1

8
inter/uae_dubai/xml/page_check_member.lxml
View file

@ -536,12 +536,8 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
Trim Tel2D 1 TRY verifyNumberEV
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf
If Tel2DFlag = 1 Then If Tel2DFlag = 1 Then

7
inter/uae_dubai/xml/verify_number.ev Normal file
View file

@ -0,0 +1,7 @@
Var Tel2D = TelephoneNumber
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf

7
xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml
View file

@ -452,12 +452,7 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber TRY "ROOT/taobin_project/xml/verify_number.ev"
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf
If Tel2DFlag = 1 Then If Tel2DFlag = 1 Then

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

@ -100,6 +100,7 @@
Var DoubleSerumOutOfStock = Ext1x9 Var DoubleSerumOutOfStock = Ext1x9
Var SetAOutOfStock = Ext1x10 Var SetAOutOfStock = Ext1x10
Var SetAPlusOutOfStock = Ext1x11 Var SetAPlusOutOfStock = Ext1x11
Var PopmartLabubuV2OutOfStock = Ext1x12
DEBUGVAR LustrousOutOfStock DEBUGVAR LustrousOutOfStock
@ -110,6 +111,7 @@
DEBUGVAR DoubleSerumOutOfStock DEBUGVAR DoubleSerumOutOfStock
DEBUGVAR SetAOutOfStock DEBUGVAR SetAOutOfStock
DEBUGVAR SetAPlusOutOfStock DEBUGVAR SetAPlusOutOfStock
DEBUGVAR PopmartLabubuV2OutOfStock
If TaobinName = "" Then If TaobinName = "" Then
Var Seeker.IsLineMember = 0 Var Seeker.IsLineMember = 0

23
xml/event/robinson_beauty/page_robinson_beauty_random.xml
View file

@ -26,10 +26,6 @@
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "set_a_plus" Var rewardList[MaxRandomIndex] = "set_a_plus"
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "set_a_plus"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "set_a_plus"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf EndIf
If SetAOutOfStock = 0 Then If SetAOutOfStock = 0 Then
@ -243,6 +239,13 @@
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
EndIf EndIf
If PopmartLabubuV2OutOfStock = 0 Then
Var rewardList[MaxRandomIndex] = "labubu"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "labubu"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf
</EventOpen> </EventOpen>
@ -287,8 +290,8 @@
; Fotune cookie ; Fotune cookie
<Image> <Image>
<X> 412 </X> <X> 404 </X>
<Y> 798 </Y> <Y> 845 </Y>
<State> SelectingState </State> <State> SelectingState </State>
<Filename> Var( DirImage + "/random_fortune_cookie.png") </Filename> <Filename> Var( DirImage + "/random_fortune_cookie.png") </Filename>
<EventClick> <EventClick>
@ -296,7 +299,7 @@
Var ShakeCount = ShakeCount + 1 Var ShakeCount = ShakeCount + 1
If ShakeCount >= 3 Then If ShakeCount >= 3 Then
Random2 1 9 SelectNumber Random2 1 11 SelectNumber
Function 2 Function 2
EndIf EndIf
</EventClick> </EventClick>
@ -370,9 +373,13 @@
Var CodeType = "145" Var CodeType = "145"
EndIf EndIf
If randResultStr = "labubu" Then
Var CodeType = "146"
EndIf
If SelectNumber = 0 Then If SelectNumber = 0 Then
Random2 1 9 SelectNumber Random2 1 11 SelectNumber
EndIf EndIf
Var SelectedNumberImage = DirImage + "/random_" Var SelectedNumberImage = DirImage + "/random_"

9
xml/event/robinson_beauty/page_robinson_beauty_random_result.xml
View file

@ -94,6 +94,15 @@
Var RewardBg = DirImage + "/reward_bg_no_line.png" Var RewardBg = DirImage + "/reward_bg_no_line.png"
EndIf EndIf
If CodeType = "146" Then
Var RewardText = DirImage + "/reward_popmart_labubu_v2_name.png"
Var RewardImage = DirImage + "/reward_popmart_labubu_v2.png"
Var RewardText_X = 173
Var RewardText_Y = 533
Var RewardImage_X = 277
Var RewardImage_Y = 901
EndIf
Var CodeReward = CodeType Var CodeReward = CodeType
Var var2 = "X" Var var2 = "X"
Var var3 = "X" Var var3 = "X"

7
xml/page_check_member.xml
View file

@ -576,12 +576,7 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber TRY "ROOT/taobin_project/xml/verify_number.ev"
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf
If Tel2DFlag = 1 Then If Tel2DFlag = 1 Then

7
xml/page_collect_point_1-3.xml
View file

@ -555,12 +555,7 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber TRY "ROOT/taobin_project/xml/verify_number.ev"
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf

7
xml/page_collect_point_1.xml
View file

@ -827,12 +827,7 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber TRY "ROOT/taobin_project/xml/verify_number.ev"
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf
If Tel2DFlag = 1 Then If Tel2DFlag = 1 Then

7
xml/page_identityMember_number.xml
View file

@ -495,12 +495,7 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber TRY "ROOT/taobin_project/xml/verify_number.ev"
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf
If Tel2DFlag = 1 Then If Tel2DFlag = 1 Then

10
xml/page_identityMember_otp.xml
View file

@ -411,16 +411,6 @@
If Tel_Confirm_Flag = 1 Then If Tel_Confirm_Flag = 1 Then
Var Tel2DFlag = 0
Var Tel2D = PinNumber
Trim Tel2D 1
Var Tel2DFlag = 1
If PinNumber = OtpCode Then If PinNumber = OtpCode Then
Open "ROOT/taobin_project/xml/page_identityMember_consent.xml" Open "ROOT/taobin_project/xml/page_identityMember_consent.xml"
Else Else

2
xml/page_payment_cash-AUS.xml
View file

@ -365,7 +365,7 @@
Var PayState2 = "Disable" Var PayState2 = "Disable"
Var PayState3 = "Disable" Var PayState3 = "Disable"
Var PayState4 = "Disable" Var PayState4 = "Disable"
Var PayState5 = "Disable" Var PayState5 = "Enable"
Var PayState6 = "Disable" Var PayState6 = "Disable"
Var PayOfflineMode = 1 Var PayOfflineMode = 1

7
xml/page_payment_credit.xml
View file

@ -633,12 +633,7 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber TRY "ROOT/taobin_project/xml/verify_number.ev"
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf
If Tel2DFlag = 1 Then If Tel2DFlag = 1 Then

7
xml/page_payment_storeCredit.xml
View file

@ -511,12 +511,7 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber TRY "ROOT/taobin_project/xml/verify_number.ev"
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf
If Tel2DFlag = 1 Then If Tel2DFlag = 1 Then

7
xml/page_topup_credit-ChooseNumber.xml
View file

@ -226,12 +226,7 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber TRY "ROOT/taobin_project/xml/verify_number.ev"
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf
If Tel2DFlag = 1 Then If Tel2DFlag = 1 Then

7
xml/page_topup_credit.xml
View file

@ -593,12 +593,7 @@
Var Tel2DFlag = 0 Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber TRY "ROOT/taobin_project/xml/verify_number.ev"
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf
If Tel2DFlag = 1 Then If Tel2DFlag = 1 Then

20
xml/verify_number.ev Normal file
View file

@ -0,0 +1,20 @@
Var Tel2D = TelephoneNumber
Trim Tel2D 2
If Tel2D = "06" Then
Var Tel2DFlag = 1
EndIf
If Tel2D = "07" Then
Var Tel2DFlag = 1
EndIf
If Tel2D = "08" Then
Var Tel2DFlag = 1
EndIf
If Tel2D = "09" Then
Var Tel2DFlag = 1
EndIf