Pro nam hom change

This commit is contained in:
wanlop run 2024-06-05 18:10:18 +07:00
commit fa17e87175
56 changed files with 1304 additions and 701 deletions

View file

@ -1,5 +1,5 @@
total 341344 total 335232
-rw-rw---- 1 root sdcard_rw 0 2024-05-23 23:25 sync_1.file -rw-rw---- 1 root sdcard_rw 0 2021-03-18 16:28 sync_1.file
-rw-rw---- 1 root sdcard_rw 3772465 2023-09-18 18:44 taobin_adv_00.mp4 -rw-rw---- 1 root sdcard_rw 3772465 2023-09-18 18:44 taobin_adv_00.mp4
-rw-rw---- 1 root sdcard_rw 3647528 2023-09-18 18:44 taobin_adv_01.mp4 -rw-rw---- 1 root sdcard_rw 3647528 2023-09-18 18:44 taobin_adv_01.mp4
-rw-rw---- 1 root sdcard_rw 8456105 2024-03-18 16:14 taobin_adv_02.mp4 -rw-rw---- 1 root sdcard_rw 8456105 2024-03-18 16:14 taobin_adv_02.mp4
@ -47,11 +47,11 @@ total 341344
-rw-rw---- 1 root sdcard_rw 12272227 2024-05-21 14:49 taobin_adv_menu_02.mp4 -rw-rw---- 1 root sdcard_rw 12272227 2024-05-21 14:49 taobin_adv_menu_02.mp4
-rw-rw---- 1 root sdcard_rw 7482104 2024-04-11 15:57 taobin_adv_menu_03.mp4 -rw-rw---- 1 root sdcard_rw 7482104 2024-04-11 15:57 taobin_adv_menu_03.mp4
-rw-rw---- 1 root sdcard_rw 7200596 2024-02-21 14:56 taobin_adv_menu_04.mp4 -rw-rw---- 1 root sdcard_rw 7200596 2024-02-21 14:56 taobin_adv_menu_04.mp4
-rw-rw---- 1 root sdcard_rw 10162524 2024-05-23 16:54 taobin_adv_menu_05.mp4 -rw-rw---- 1 root sdcard_rw 7377834 2024-06-05 13:27 taobin_adv_menu_05.mp4
-rw-rw---- 1 root sdcard_rw 2625751 2023-09-18 18:44 taobin_adv_menu_06.mp4 -rw-rw---- 1 root sdcard_rw 2625751 2023-09-18 18:44 taobin_adv_menu_06.mp4
-rw-rw---- 1 root sdcard_rw 13259746 2023-11-06 22:07 taobin_adv_menu_07.mp4 -rw-rw---- 1 root sdcard_rw 13259746 2023-11-06 22:07 taobin_adv_menu_07.mp4
-rw-rw---- 1 root sdcard_rw 798616 2024-04-22 15:38 taobin_adv_menu_08.mp4 -rw-rw---- 1 root sdcard_rw 798616 2024-04-22 15:38 taobin_adv_menu_08.mp4
-rw-rw---- 1 root sdcard_rw 7351406 2024-02-21 13:02 taobin_adv_menu_09.mp4 -rw-rw---- 1 root sdcard_rw 3876868 2024-05-29 09:16 taobin_adv_menu_09.mp4
-rw-rw---- 1 root sdcard_rw 2457487 2023-09-18 18:44 taobin_adv_menu_10.mp4 -rw-rw---- 1 root sdcard_rw 2457487 2023-09-18 18:44 taobin_adv_menu_10.mp4
-rw-rw---- 1 root sdcard_rw 1421871 2024-02-22 08:57 taobin_adv_menu_11.mp4 -rw-rw---- 1 root sdcard_rw 1421871 2024-02-22 08:57 taobin_adv_menu_11.mp4
-rw-rw---- 1 root sdcard_rw 190457 2023-09-18 18:44 taobin_adv_menu_12.mp4 -rw-rw---- 1 root sdcard_rw 190457 2023-09-18 18:44 taobin_adv_menu_12.mp4

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 312 KiB

After

Width:  |  Height:  |  Size: 312 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 341 KiB

After

Width:  |  Height:  |  Size: 341 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 63 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

View file

@ -6,8 +6,12 @@
; Reset flag away. ; Reset flag away.
Var NewCollectPointFlag = 1
Var WinterWarmersCatalogFlag = 1 Var WinterWarmersCatalogFlag = 1
Var XMLLiveInfoEnable = 1
DEBUGVAR Propepsi99Enable DEBUGVAR Propepsi99Enable
DEBUGVAR DisplayFormatFull DEBUGVAR DisplayFormatFull

View file

@ -1110,7 +1110,25 @@
If AddData = 1 Then If AddData = 1 Then
Var Cid = 26 Var Cid = 26
If NewCollectPointFlag = 1 Then
Var redeemSeeker = "curr-redeem"
If redeemSeeker.redeem2Dollar = 1 Then
; TODO: Var Cid =
EndIf
If redeemSeeker.redeem1Dollar = 1 Then
; TODO: Var Cid =
EndIf
; reset
Var redeemSeeker.phoneNumber = ""
Var redeemSeeker.redeem2Dollar = 0
Var redeemSeeker.redeem1Dollar = 0
EndIf
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf EndIf
@ -1215,6 +1233,22 @@
If AddData = 1 Then If AddData = 1 Then
Var Cid = 26 Var Cid = 26
If NewCollectPointFlag = 1 Then
Var redeemSeeker = "curr-redeem"
If redeemSeeker.redeem2Dollar = 1 Then
; TODO: Var Cid =
EndIf
If redeemSeeker.redeem1Dollar = 1 Then
; TODO: Var Cid =
EndIf
; reset
Var redeemSeeker.phoneNumber = ""
Var redeemSeeker.redeem2Dollar = 0
Var redeemSeeker.redeem1Dollar = 0
EndIf
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf EndIf
@ -1695,14 +1729,7 @@
<Filename> VideoPlayFile </Filename> <Filename> VideoPlayFile </Filename>
</Video> </Video>
<Video> ;include="ROOT/taobin_project/inc/video.inc"
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>

View file

@ -621,14 +621,7 @@
<Video> ;include="ROOT/taobin_project/inc/video.inc"
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
<EventSecurity> <EventSecurity>

View file

@ -810,14 +810,7 @@
</EventClick> </EventClick>
</Button> </Button>
<Video> ;include="ROOT/taobin_project/inc/video.inc"
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>

View file

@ -570,14 +570,7 @@
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename> ;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image> ;</Image>
<Video> ;include="ROOT/taobin_project/inc/video.inc"
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>

View file

@ -66,14 +66,7 @@
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename> ;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image> ;</Image>
<Video> ;include="ROOT/taobin_project/inc/video.inc"
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>

View file

@ -688,14 +688,7 @@
</EventClick> </EventClick>
</Button> </Button>
<Video> ;include="ROOT/taobin_project/inc/video.inc"
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>

View file

@ -843,14 +843,7 @@
</EventClick> </EventClick>
</Button> </Button>
<Video> ;include="ROOT/taobin_project/inc/video.inc"
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,290 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0x303030" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
Var Timeout = 0
Var TargetTimeout = 10
If show_eng = "true" Then
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
Else
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
EndIf
Var DirImage = "ROOT/taobin_project/inter/aus/image/collect_point/redeem"
Var congratsState = "Enable"
Var sendCodeState = "Invisible"
Var footerButtonSectionState = "Enable"
Var headerBackground = "/header_bg.png"
Var content_X = 178
Var content_Y = 899
If RedeemType = "1_dollar" Then
Var headerImage = DirImage + "/redeem_1dollar_header.png"
Var contentImage = DirImage + "/redeem_1dollar_content.png"
EndIf
If RedeemType = "2_dollar" Then
Var headerImage = DirImage + "/redeem_2dollar_header.png"
Var contentImage = DirImage + "/redeem_2dollar_content.png"
EndIf
If RedeemType = "get_free" Then
Var headerImage = DirImage + "/redeem_get_free_header.png"
Var contentImage = DirImage + "/redeem_get_free_content.png"
Var footerButtonSectionState = "Invisible"
Var content_Y = 984
Var TargetTimeout = 5
EndIf
Var SELLONLINE = 0
If SELLSTATUS = "SELLONLINE" Then
Var SELLONLINE = 1
EndIf
If SELLSTATUS = "SELLNOCASH" Then
Var SELLONLINE = 1
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing
;Var Timeout = Timeout + 1
If Timeout > TargetTimeout Then
If sendCodeState = "Enable" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
If RedeemType = "get_free" Then
Var congratsState = "Invisible"
Var sendCodeState = "Enable"
Var Timeout = 0
Var TargetTimeout = 5
If SELLONLINE = 1 Then
Var headerBackground = "/success_header_bg.png"
Var headerImage = "/redeem_success_header.png"
Var contentImage = "/redeem_success_content.png"
Var content_X = 308
Var content_Y = 1065
Else
Var headerBackground = "/fail_header_bg.png"
Var headerImage = "/redeem_fail_header.png"
Var contentImage = "/redeem_fail_content.png"
Var content_X = 243
Var content_Y = 1118
EndIf
Refresh
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
EndIf
TimerReset
Refresh
</EventTimeout>
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
<EventMachine>
If MachineStage = "drink-success" Then
Var MachineState_Result = 1
EndIf
If MachineStage = "drink-failed" Then
Var MachineState_Result = 2
EndIf
</EventMachine>
;include="ROOT/taobin_project/inc/video.inc"
<Image>
<X> 118 </X>
<Y> 642 </Y>
<Filename> Var( DirImage + headerBackground) </Filename>
</Image>
<Image>
<X> 118 </X>
<Y> 859 </Y>
<Filename> Var( DirImage + "/redemption_bg.png") </Filename>
</Image>
<Image>
<X> 158 </X>
<Y> 682 </Y>
<Filename> Var( DirImage + headerImage ) </Filename>
</Image>
<Image>
<X> content_X </X>
<Y> content_Y </Y>
<Filename> Var( DirImage + contentImage ) </Filename>
</Image>
<Button>
<X> 212 </X>
<Y> 1752 </Y>
<State>
eval(
If congratsState = "Enable" Then
If footerButtonSectionState = "Enable" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
Else
Var return = "Invisible"
EndIf
)
</State>
<Filename> Var( DirImage + "/keep_collecting_btn.png" )</Filename>
<FilenamePress> Var( DirImage + "/keep_collecting_btn_pressed.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; Go to lid straw
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>
</Button>
<Button>
<X> 548 </X>
<Y> 1752 </Y>
<State>
eval(
If congratsState = "Enable" Then
If footerButtonSectionState = "Enable" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
Else
Var return = "Invisible"
EndIf
)
</State>
<Filename> Var( DirImage + "/redeem_now_btn.png" )</Filename>
<FilenamePress> Var( DirImage + "/redeem_now_btn_pressed.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var redeemSeeker = "curr-redeem"
Var redeemSeeker.phoneNumber = Seeker.TNumberTaobinMember
If RedeemType = "1_dollar" Then
Var redeemSeeker.redeem1Dollar = 1
EndIf
If RedeemType = "2_dollar" Then
Var redeemSeeker.redeem2Dollar = 1
EndIf
Var congratsState = "Invisible"
Var sendCodeState = "Enable"
Var Timeout = 0
Var TargetTimeout = 5
If SELLONLINE = 1 Then
Var headerBackground = "/success_header_bg.png"
Var headerImage = "/redeem_success_header.png"
Var contentImage = "/redeem_success_content.png"
Var content_X = 308
Var content_Y = 1065
Else
Var headerBackground = "/fail_header_bg.png"
Var headerImage = "/redeem_fail_header.png"
Var contentImage = "/redeem_fail_content.png"
Var content_X = 243
Var content_Y = 1118
EndIf
Refresh
</EventClick>
</Button>
<Button>
<X> 379 </X>
<Y> 1752 </Y>
<State> sendCodeState </State>
<Filename> Var( DirImage + "/close_btn.png" )</Filename>
<FilenamePress> Var( DirImage + "/close_btn_pressed.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; goto lid straw
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>
</Button>
;
<Image>
<X> 751 </X>
<Y> 413 </Y>
<Filename> IMG_CNT </Filename>
</Image>
;
<Text>
<X> XPosiShowCountDownBrew </X>
<Y> 470 </Y>
<Align> End </Align>
<Width> 153 </Width>
<Size> 88 </Size>
<Font> RobotoBold </Font>
<Color> 0x513C2F </Color>
<Value> ShowCountDownBrewing </Value>
</Text>
<EventUnitTest1>
Var RedeemType = "1_dollar"
Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
</EventUnitTest1>
<EventUnitTest2>
Var RedeemType = "2_dollar"
Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
</EventUnitTest2>
<EventUnitTest3>
Var RedeemType = "get_free"
Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
</EventUnitTest3>
</Popup>

View file

@ -143,14 +143,7 @@
<Video> ;include="ROOT/taobin_project/inc/video.inc"
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>

View file

@ -95,14 +95,7 @@
<Video> ;include="ROOT/taobin_project/inc/video.inc"
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
<Image> <Image>
<X> 70 </X> <X> 70 </X>

View file

@ -739,14 +739,7 @@
</EventClick> </EventClick>
</Button> </Button>
<Video> ;include="ROOT/taobin_project/inc/video.inc"
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>

View file

@ -761,14 +761,7 @@
</EventClick> </EventClick>
</Button> </Button>
<Video> ;include="ROOT/taobin_project/inc/video.inc"
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>

View file

@ -110,14 +110,7 @@
</EventClick> </EventClick>
</Button> </Button>
<Video> ;include="ROOT/taobin_project/inc/video.inc"
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>

View file

@ -116,14 +116,7 @@
</EventClick> </EventClick>
</Button> </Button>
<Video> ;include="ROOT/taobin_project/inc/video.inc"
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>

View file

@ -107,14 +107,7 @@
</EventClick> </EventClick>
</Button> </Button>
<Video> ;include="ROOT/taobin_project/inc/video.inc"
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>

View file

@ -97,6 +97,8 @@
Var CleansingGelOutOfStock = Ext1f Var CleansingGelOutOfStock = Ext1f
Var TumbleBottleOutOfStock = Ext1g Var TumbleBottleOutOfStock = Ext1g
Var ClearGelOutOfStock = Ext1h Var ClearGelOutOfStock = Ext1h
Var E_GiftCard100BathOutOfStock = Ext1i
Var ClearGel4mlOutOfStock = Ext1j
;DEBUG ;DEBUG
;Var SuperSetOutOfStock = 1 ;Var SuperSetOutOfStock = 1
@ -148,20 +150,24 @@
If CleansingGalOutOfStock = 1 Then If CleansingGalOutOfStock = 1 Then
If TumbleBottleOutOfStock = 1 Then If TumbleBottleOutOfStock = 1 Then
If ClearGalOutOfStock = 1 Then If ClearGalOutOfStock = 1 Then
SAVELOG "All reward out of stock skip to normal collect point." If E_GiftCard100BathOutOfStock = 1 Then
If ClearGel4mlOutOfStock = 1 Then
SAVELOG "All reward out of stock skip to normal collect point."
WRITE_FILE "/mnt/sdcard/nam_hom_coconut_reward_out_of_stock" "1" WRITE_FILE "/mnt/sdcard/nam_hom_coconut_reward_out_of_stock" "1"
If Seeker.CodeChannel = 1 Then If Seeker.CodeChannel = 1 Then
If Seeker.CollectPointMain = 1 Then If Seeker.CollectPointMain = 1 Then
GETACCEXT Param1 23 GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml" Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
Else Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
EndIf
EndIf EndIf
Else
GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
EndIf EndIf
EndIf EndIf
EndIf EndIf

View file

@ -10,53 +10,7 @@
Var DirImage = "ROOT/taobin_project/image/event/nam_hom_coconut/random" Var DirImage = "ROOT/taobin_project/image/event/nam_hom_coconut/random"
Var RandomStyle = 0 Var BagImg = DirImage + "/cura-md-bag.png"
Random2 0 2 RandomStyle
If RandomStyle = 0 Then
Var Text_X = 241
Var Text_Y = 1113
Var BagImg = DirImage + "/cura-md-bag_md.png"
Var Bag1_X = 75
Var Bag1_Y = 715
Var Bag2_X = 424
Var Bag2_Y = 715
Var Bag3_X = 774
Var Bag3_Y = 715
Var Bag4_X = 249
Var Bag4_Y = 1338
Var Bag5_X = 599
Var Bag5_Y = 1338
Else
Var Text_X = 256
Var Text_Y = 628
Var BagImg = DirImage + "/cura-md-bag_lg.png"
Var Bag1_X = 75
Var Bag1_Y = 806
Var Bag2_X = 713
Var Bag2_Y = 806
Var Bag3_X = 394
Var Bag3_Y = 1129
Var Bag4_X = 75
Var Bag4_Y = 1471
Var Bag5_X = 713
Var Bag5_Y = 1471
EndIf
Var MaxRandomIndex = 0 Var MaxRandomIndex = 0
@ -79,6 +33,68 @@
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel" Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf EndIf
If TumbleBottleOutOfStock = 0 Then If TumbleBottleOutOfStock = 0 Then
@ -92,6 +108,26 @@
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle" Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf EndIf
If CleansingGelOutOfStock = 0 Then If CleansingGelOutOfStock = 0 Then
@ -101,6 +137,16 @@
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel" Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf EndIf
If BalanceEssenceTonerOutOfStock = 0 Then If BalanceEssenceTonerOutOfStock = 0 Then
@ -108,11 +154,85 @@
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner" Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf EndIf
If SuperSetOutOfStock = 0 Then If SuperSetOutOfStock = 0 Then
Var rewardList[MaxRandomIndex] = "super_set" Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf
If E_GiftCard100BathOutOfStock = 0 Then
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf
If ClearGel4mlOutOfStock = 0 Then
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf EndIf
@ -151,14 +271,14 @@
</Image> </Image>
<Image> <Image>
<X> Text_X </X> <X> 220 </X>
<Y> Text_Y </Y> <Y> 627 </Y>
<Filename> Var( DirImage + "/random_text.png") </Filename> <Filename> Var( DirImage + "/random_text.png") </Filename>
</Image> </Image>
<Button> <Button>
<X> Bag1_X </X> <X> 410 </X>
<Y> Bag1_Y </Y> <Y> 800 </Y>
<Filename> BagImg </Filename> <Filename> BagImg </Filename>
<FilenamePress> BagImg </FilenamePress> <FilenamePress> BagImg </FilenamePress>
<EventClick> <EventClick>
@ -167,8 +287,8 @@
</Button> </Button>
<Button> <Button>
<X> Bag2_X </X> <X> 739 </X>
<Y> Bag2_Y </Y> <Y> 933 </Y>
<Filename> BagImg </Filename> <Filename> BagImg </Filename>
<FilenamePress> BagImg </FilenamePress> <FilenamePress> BagImg </FilenamePress>
<EventClick> <EventClick>
@ -177,8 +297,8 @@
</Button> </Button>
<Button> <Button>
<X> Bag3_X </X> <X> 739 </X>
<Y> Bag3_Y </Y> <Y> 1364 </Y>
<Filename> BagImg </Filename> <Filename> BagImg </Filename>
<FilenamePress> BagImg </FilenamePress> <FilenamePress> BagImg </FilenamePress>
<EventClick> <EventClick>
@ -187,8 +307,8 @@
</Button> </Button>
<Button> <Button>
<X> Bag4_X </X> <X> 410 </X>
<Y> Bag4_Y </Y> <Y> 1532 </Y>
<Filename> BagImg </Filename> <Filename> BagImg </Filename>
<FilenamePress> BagImg </FilenamePress> <FilenamePress> BagImg </FilenamePress>
<EventClick> <EventClick>
@ -197,8 +317,28 @@
</Button> </Button>
<Button> <Button>
<X> Bag5_X </X> <X> 68 </X>
<Y> Bag5_Y </Y> <Y> 1364 </Y>
<Filename> BagImg </Filename>
<FilenamePress> BagImg </FilenamePress>
<EventClick>
Function 2
</EventClick>
</Button>
<Button>
<X> 68 </X>
<Y> 933 </Y>
<Filename> BagImg </Filename>
<FilenamePress> BagImg </FilenamePress>
<EventClick>
Function 2
</EventClick>
</Button>
<Button>
<X> 410 </X>
<Y> 1167 </Y>
<Filename> BagImg </Filename> <Filename> BagImg </Filename>
<FilenamePress> BagImg </FilenamePress> <FilenamePress> BagImg </FilenamePress>
<EventClick> <EventClick>
@ -236,6 +376,14 @@
Var CodeType = "134" Var CodeType = "134"
EndIf EndIf
If randResultStr = "e_gift_card_100bath" Then
Var CodeType = "135"
EndIf
If randResultStr = "clear_gel_4ml" Then
Var CodeType = "136"
EndIf
DEBUGVAR randResultInt DEBUGVAR randResultInt
DEBUGVAR randResultStr DEBUGVAR randResultStr

View file

@ -45,6 +45,20 @@
Var RewardImage_Y = 864 Var RewardImage_Y = 864
EndIf EndIf
If CodeType = "135" Then
Var RewardText = DirImage + "/e_gift_card_100_bath_reward_text.png"
Var RewardImage = DirImage + "/e_gift_card_100_bath_reward.png"
Var RewardImage_X = 254
Var RewardImage_Y = 805
EndIf
If CodeType = "136" Then
Var RewardText = DirImage + "/clear_gel_4_ml_reward_text.png"
Var RewardImage = DirImage + "/clear_gel_4_ml_reward.png"
Var RewardImage_X = 267
Var RewardImage_Y = 808
EndIf
Var AddData = 0 Var AddData = 0
Var CodeReward = CodeType Var CodeReward = CodeType
@ -71,19 +85,25 @@
Var BalanceEssenceTonerRemain = RemainRewardSpl[1] Var BalanceEssenceTonerRemain = RemainRewardSpl[1]
Var CleansingGalRemain = RemainRewardSpl[2] Var CleansingGalRemain = RemainRewardSpl[2]
Var TumbleBottleRemain = RemainRewardSpl[3] Var TumbleBottleRemain = RemainRewardSpl[3]
Var ClearGalRemain = RemainRewardSpl[4] Var ClearGelRemain = RemainRewardSpl[4]
Var E_GiftCard100BathRemain = RemainRewardSpl[5]
Var ClearGel4mlRemain = RemainRewardSpl[6]
INT SuperSetRemain INT SuperSetRemain
INT BalanceEssenceTonerRemain INT BalanceEssenceTonerRemain
INT CleansingGalRemain INT CleansingGalRemain
INT TumbleBottleRemain INT TumbleBottleRemain
INT ClearGalRemain INT ClearGelRemain
INT E_GiftCard100BathRemain
INT ClearGel4mlRemain
Var SumNamHomCoconutRemainReward = SuperSetRemain Var SumNamHomCoconutRemainReward = SuperSetRemain
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + BalanceEssenceTonerRemain Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + BalanceEssenceTonerRemain
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + CleansingGalRemain Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + CleansingGalRemain
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + TumbleBottleRemain Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + TumbleBottleRemain
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + ClearGalRemain Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + ClearGelRemain
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + E_GiftCard100BathRemain
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + ClearGel4mlRemain
If SumNamHomCoconutRemainReward = 0 Then If SumNamHomCoconutRemainReward = 0 Then
SAVELOG "NamHomCoconutPro: All reward out of stock" SAVELOG "NamHomCoconutPro: All reward out of stock"

View file

@ -109,6 +109,7 @@ Var FromNamHomCoconutPro = 0
Var NamHomCoconutRewardOutOfStock = 0 Var NamHomCoconutRewardOutOfStock = 0
Var NewCollectPoint = 1 Var NewCollectPoint = 1
Var ShouldCollectPromotionPoint = 0
Var NewFlowPaymentCode = 0 Var NewFlowPaymentCode = 0
@ -439,3 +440,10 @@ EndIf
DEBUGVAR FreePowerup DEBUGVAR FreePowerup
; Control collect promotion point behavior
If NamHomCoconutPro = 1 Then
Var ShouldCollectPromotionPoint = 1
EndIf

View file

@ -1099,19 +1099,25 @@
Var BalanceEssenceTonerRemain = RemainRewardSpl[1] Var BalanceEssenceTonerRemain = RemainRewardSpl[1]
Var CleansingGalRemain = RemainRewardSpl[2] Var CleansingGalRemain = RemainRewardSpl[2]
Var TumbleBottleRemain = RemainRewardSpl[3] Var TumbleBottleRemain = RemainRewardSpl[3]
Var ClearGalRemain = RemainRewardSpl[4] Var ClearGelRemain = RemainRewardSpl[4]
Var E_GiftCard100BathRemain = RemainRewardSpl[5]
Var ClearGel4mlRemain = RemainRewardSpl[6]
INT SuperSetRemain INT SuperSetRemain
INT BalanceEssenceTonerRemain INT BalanceEssenceTonerRemain
INT CleansingGalRemain INT CleansingGalRemain
INT TumbleBottleRemain INT TumbleBottleRemain
INT ClearGalRemain INT ClearGelRemain
INT E_GiftCard100BathRemain
INT ClearGel4mlRemain
Var SumNamHomCoconutRemainReward = SuperSetRemain Var SumNamHomCoconutRemainReward = SuperSetRemain
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + BalanceEssenceTonerRemain Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + BalanceEssenceTonerRemain
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + CleansingGalRemain Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + CleansingGalRemain
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + TumbleBottleRemain Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + TumbleBottleRemain
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + ClearGalRemain Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + ClearGelRemain
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + E_GiftCard100BathRemain
Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + ClearGel4mlRemain
If ShouldShowNamHomCoconutRemainReward = 1 Then If ShouldShowNamHomCoconutRemainReward = 1 Then
Var ShowNamHomCoconutRemainReward = "Enable" Var ShowNamHomCoconutRemainReward = "Enable"

View file

@ -130,6 +130,11 @@
INT CoffeePointRank INT CoffeePointRank
Var CoffeePointRankTmp = CoffeePointRank Var CoffeePointRankTmp = CoffeePointRank
If CheckMemberPageCampaign = 1 Then
Var luckeyDrawTicket = Ext1h
INT luckeyDrawTicket
EndIf
GETACCEXT TelephoneNumber 15 GETACCEXT TelephoneNumber 15

View file

@ -84,13 +84,18 @@
Var TNumberTaobinMemberXXX = TelephoneNumber Var TNumberTaobinMemberXXX = TelephoneNumber
Var CoffeePointRank = Ext1b Var CoffeePointRank = Ext1b
INT CoffeePointRank INT CoffeePointRank
Var CoffeePointRankTmp = CoffeePointRank Var CoffeePointRankTmp = CoffeePointRank
If CheckMemberPageCampaign = 1 Then
Var luckeyDrawTicket = Ext1h
INT luckeyDrawTicket
EndIf
Var Ext1a = "" Var Ext1a = ""
Var Ext1b = "" Var Ext1b = ""
Var Ext1c = "" Var Ext1c = ""

View file

@ -498,6 +498,10 @@
Var CouponNameA = "/imgCoupon121.png" Var CouponNameA = "/imgCoupon121.png"
EndIf EndIf
If CouponTypeA = "135" Then
Var CouponNameA = "/imgCouponMKP1.png"
EndIf
INT CouponExireA_D INT CouponExireA_D
INT CouponExireA_Y INT CouponExireA_Y
Var CouponExireA_Y = CouponExireA_Y + 0 Var CouponExireA_Y = CouponExireA_Y + 0
@ -616,6 +620,10 @@
Var CouponNameB = "/imgCoupon121.png" Var CouponNameB = "/imgCoupon121.png"
EndIf EndIf
If CouponTypeB = "135" Then
Var CouponNameB = "/imgCouponMKP1.png"
EndIf
INT CouponExireB_D INT CouponExireB_D
INT CouponExireB_Y INT CouponExireB_Y
Var CouponExireB_Y = CouponExireB_Y + 0 Var CouponExireB_Y = CouponExireB_Y + 0
@ -740,6 +748,10 @@
Var CouponNameA = "/imgCoupon121.png" Var CouponNameA = "/imgCoupon121.png"
EndIf EndIf
If CouponTypeA = "135" Then
Var CouponNameA = "/imgCouponMKP1.png"
EndIf
INT CouponExireA_D INT CouponExireA_D
INT CouponExireA_Y INT CouponExireA_Y
Var CouponExireA_Y = CouponExireA_Y + 543 Var CouponExireA_Y = CouponExireA_Y + 543
@ -857,6 +869,10 @@
Var CouponNameB = "/imgCoupon121.png" Var CouponNameB = "/imgCoupon121.png"
EndIf EndIf
If CouponTypeB = "135" Then
Var CouponNameB = "/imgCouponMKP1.png"
EndIf
INT CouponExireB_D INT CouponExireB_D
INT CouponExireB_Y INT CouponExireB_Y
Var CouponExireB_Y = CouponExireB_Y + 543 Var CouponExireB_Y = CouponExireB_Y + 543

View file

@ -2,7 +2,7 @@
<Cache> "Enable" </Cache> <Cache> "Enable" </Cache>
<Width> 1080 </Width> <Width> 1080 </Width>
<Height> 1920 </Height> <Height> 1920 </Height>
<Background> "0xeae6e1" </Background> <Background> "0xDFD9D6" </Background>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOpen> <EventOpen>
@ -485,6 +485,10 @@
Var CouponNameA = "/imgCoupon121.png" Var CouponNameA = "/imgCoupon121.png"
EndIf EndIf
If CouponTypeA = "135" Then
Var CouponNameA = "/imgCouponMKP1.png"
EndIf
INT CouponExireA_D INT CouponExireA_D
INT CouponExireA_Y INT CouponExireA_Y
Var CouponExireA_Y = CouponExireA_Y + 0 Var CouponExireA_Y = CouponExireA_Y + 0
@ -552,6 +556,10 @@
Var CouponNameB = "/imgCoupon121.png" Var CouponNameB = "/imgCoupon121.png"
EndIf EndIf
If CouponTypeB = "135" Then
Var CouponNameB = "/imgCouponMKP1.png"
EndIf
INT CouponExireB_D INT CouponExireB_D
INT CouponExireB_Y INT CouponExireB_Y
Var CouponExireB_Y = CouponExireB_Y + 0 Var CouponExireB_Y = CouponExireB_Y + 0
@ -689,8 +697,7 @@
INT TaobinCredit INT TaobinCredit
Var TaobinCreditStr !assigned StringFmt( TaobinCredit, DisplayFormat, PreScaleConvertShow ) Var TaobinCreditStr !assigned StringFmt( TaobinCredit, DisplayFormat, PreScaleConvertShow )
Var LuckeyDrawTicketFormat = "%03.0f" Var LuckyDrawTicketFormat = "%03.0f"
Var luckyDrawTicket = 16
If SystemDateMonthInt = 6 Then If SystemDateMonthInt = 6 Then
If SystemDateDayInt >= 17 Then If SystemDateDayInt >= 17 Then
@ -1052,7 +1059,7 @@
<Size> 64 </Size> <Size> 64 </Size>
<Color> 0x3F2C20 </Color> <Color> 0x3F2C20 </Color>
<Align> center-vertical-horizontal </Align> <Align> center-vertical-horizontal </Align>
<Value> StringFmt( luckyDrawTicket , LuckeyDrawTicketFormat, PreScaleConvertShow) </Value> <Value> StringFmt( luckyDrawTicket , LuckyDrawTicketFormat, PreScaleConvertShow) </Value>
</Text> </Text>

View file

@ -192,10 +192,14 @@
;inter-xml-open ;inter-xml-open
If CountryName = "Australia" Then If CountryName = "Australia" Then
;Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml"
;Open pageCollectPoint If NewCollectPointFlag = 1 Then
Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml"
Open pageCollectPoint
Else
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf EndIf
;inter-xml-open ;inter-xml-open

View file

@ -88,7 +88,7 @@
EndIf EndIf
If FromWednesdayMelonPro = 1 Then If FromWednesdayMelonPro = 1 Then
Var PriceDrink = OriginalPrice Var PriceDrink = OriginalPrice + TOPPING_PRICE
EndIf EndIf
If FromPowerUpPro = 1 Then If FromPowerUpPro = 1 Then

View file

@ -231,8 +231,13 @@
If ShouldCollectPoint = 1 Then If ShouldCollectPoint = 1 Then
Var Seeker.CollectPointMain = 1 Var Seeker.CollectPointMain = 1
If ShouldCollectPromotionPoint = 1 Then
Var Seeker.CollectPointPromotion = 1
EndIf
EndIf EndIf
;Open "ROOT/taobin_project/xml/page_payment_cash.xml" ;Open "ROOT/taobin_project/xml/page_payment_cash.xml"
Var Seeker.VendingCampaign = PayAmount Var Seeker.VendingCampaign = PayAmount
Var Seeker.FreeVendingCampaign = 1 Var Seeker.FreeVendingCampaign = 1
@ -267,6 +272,10 @@
If ShouldCollectPoint = 1 Then If ShouldCollectPoint = 1 Then
Var Seeker.CollectPointMain = 1 Var Seeker.CollectPointMain = 1
EndIf EndIf
If ShouldCollectPromotionPoint = 1 Then
Var Seeker.CollectPointPromotion = 1
EndIf
EndIf EndIf

View file

@ -270,7 +270,9 @@
If CountDownThankyou = 0 Then If CountDownThankyou = 0 Then
If IgnoreNetCore = "true" Then If IgnoreNetCore = "true" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml" ;Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Var testPageCollectPointAUS = CountryRootPath + "/xml/page_collect_point_3.lxml"
Open testPageCollectPointAUS
EndIf EndIf
If TestLoopMakeDrink = 1 Then If TestLoopMakeDrink = 1 Then