Merge remote-tracking branch 'origin/masterpiece' into th_mmr
This commit is contained in:
commit
020098b2af
457 changed files with 95264 additions and 50614 deletions
|
|
@ -69,7 +69,7 @@
|
|||
Var DirImage = "ROOT/taobin_project/image/page_thankyou"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
|
||||
Var BottomText = PicturePath + "text_bottom_eng.png"
|
||||
|
||||
|
|
@ -154,7 +154,7 @@
|
|||
|
||||
Var show_video = 1
|
||||
Var SaveTheWorldST = "Invisible"
|
||||
|
||||
|
||||
If CountryName = "Thailand" Then
|
||||
Var video_file_name = "ROOT/taobin_project/video/" + video_name_to_play
|
||||
Else
|
||||
|
|
@ -324,15 +324,7 @@
|
|||
If CountDownThankyou = 0 Then
|
||||
|
||||
If IgnoreNetCore = "true" Then
|
||||
If Seeker.IsLineMember = 0 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
|
||||
If TestLoopMakeDrink = 1 Then
|
||||
|
|
@ -346,19 +338,31 @@
|
|||
|
||||
|
||||
If RoadShow = "true" Then
|
||||
If Seeker.IsLineMember = 0 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
|
||||
If CleanFeedbackFlag = 1 Then
|
||||
Var CleanFeedBackToCollectPoint = 0
|
||||
Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
|
||||
Else
|
||||
If Seeker.IsLineMember = 0 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Else
|
||||
|
||||
If EnablePayLaterMode = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
If CleanFeedbackFlag = 1 Then
|
||||
Var CleanFeedBackToCollectPoint = 0
|
||||
Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -434,15 +438,7 @@
|
|||
EndIf
|
||||
|
||||
If CART_INDEX >= 2 Then
|
||||
If Seeker.IsLineMember = 0 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR ChangeFlag2
|
||||
|
|
@ -529,15 +525,7 @@
|
|||
EndIf
|
||||
Else
|
||||
If CART_INDEX >= 2 Then
|
||||
If Seeker.IsLineMember = 0 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
|
||||
TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
|
||||
|
|
@ -589,15 +577,7 @@
|
|||
EndIf
|
||||
Else
|
||||
If CART_INDEX >= 2 Then
|
||||
If Seeker.IsLineMember = 0 Then
|
||||
If LuckyDrawCampaign = 1 Then
|
||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue