Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
1aef016ab7
6 changed files with 1385 additions and 89 deletions
|
|
@ -581,9 +581,6 @@
|
|||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
CashlessReq SUCCESS
|
||||
|
||||
</EventOpen>
|
||||
<EventLanguageOnChange>
|
||||
Var XPosiShowCountDownBrew = 768
|
||||
|
|
|
|||
1293
inter/aus/xml/page_brewing3Conti.xml
Normal file
1293
inter/aus/xml/page_brewing3Conti.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -55,46 +55,6 @@
|
|||
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
|
||||
|
||||
If TumbleBottleOutOfStock = 0 Then
|
||||
|
|
@ -108,26 +68,6 @@
|
|||
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
|
||||
Var rewardList[MaxRandomIndex] = "tumble_bottle"
|
||||
Var MaxRandomIndex = MaxRandomIndex + 1
|
||||
EndIf
|
||||
|
||||
If CleansingGelOutOfStock = 0 Then
|
||||
|
|
@ -147,6 +87,20 @@
|
|||
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
|
||||
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
|
||||
|
||||
If BalanceEssenceTonerOutOfStock = 0 Then
|
||||
|
|
@ -160,6 +114,26 @@
|
|||
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
|
||||
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
|
||||
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
|
||||
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
|
||||
Var MaxRandomIndex = MaxRandomIndex + 1
|
||||
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
|
||||
Var MaxRandomIndex = MaxRandomIndex + 1
|
||||
EndIf
|
||||
|
||||
If SuperSetOutOfStock = 0 Then
|
||||
|
|
@ -167,6 +141,22 @@
|
|||
Var MaxRandomIndex = MaxRandomIndex + 1
|
||||
Var rewardList[MaxRandomIndex] = "super_set"
|
||||
Var MaxRandomIndex = MaxRandomIndex + 1
|
||||
Var rewardList[MaxRandomIndex] = "super_set"
|
||||
Var MaxRandomIndex = MaxRandomIndex + 1
|
||||
Var rewardList[MaxRandomIndex] = "super_set"
|
||||
Var MaxRandomIndex = MaxRandomIndex + 1
|
||||
Var rewardList[MaxRandomIndex] = "super_set"
|
||||
Var MaxRandomIndex = MaxRandomIndex + 1
|
||||
Var rewardList[MaxRandomIndex] = "super_set"
|
||||
Var MaxRandomIndex = MaxRandomIndex + 1
|
||||
Var rewardList[MaxRandomIndex] = "super_set"
|
||||
Var MaxRandomIndex = MaxRandomIndex + 1
|
||||
Var rewardList[MaxRandomIndex] = "super_set"
|
||||
Var MaxRandomIndex = MaxRandomIndex + 1
|
||||
Var rewardList[MaxRandomIndex] = "super_set"
|
||||
Var MaxRandomIndex = MaxRandomIndex + 1
|
||||
Var rewardList[MaxRandomIndex] = "super_set"
|
||||
Var MaxRandomIndex = MaxRandomIndex + 1
|
||||
EndIf
|
||||
|
||||
If E_GiftCard100BathOutOfStock = 0 Then
|
||||
|
|
@ -180,26 +170,6 @@
|
|||
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
|
||||
|
|
@ -233,6 +203,36 @@
|
|||
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
|
||||
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
|
||||
Var MaxRandomIndex = MaxRandomIndex + 1
|
||||
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
|
||||
Var MaxRandomIndex = MaxRandomIndex + 1
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -164,9 +164,7 @@ EndIf
|
|||
If SystemDateMonthInt = 6 Then
|
||||
|
||||
If SystemDateDayInt >= 3 Then
|
||||
If SystemDateDayInt <= 30 Then
|
||||
Var NamHomCoconutPro = 1
|
||||
EndIf
|
||||
Var NamHomCoconutPro = 1
|
||||
EndIf
|
||||
|
||||
If SystemDateDayInt <= 15 Then
|
||||
|
|
@ -189,6 +187,12 @@ If SystemDateMonthInt = 6 Then
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
If SystemDateMonthInt = 7 Then
|
||||
If SystemDateDayInt <= 7 Then
|
||||
Var NamHomCoconutPro = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SystemDateMonthInt >= 7 Then
|
||||
Var CheckMemberPageCampaign = 1
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -1051,9 +1051,9 @@
|
|||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> 654 </X>
|
||||
<X> 620 </X>
|
||||
<Y> 1076 </Y>
|
||||
<Width> 120 </Width>
|
||||
<Width> 164 </Width>
|
||||
<Height> 80 </Height>
|
||||
<Font> RobotoBold </Font>
|
||||
<Size> 64 </Size>
|
||||
|
|
|
|||
|
|
@ -697,7 +697,9 @@
|
|||
EndIf
|
||||
Var Seeker.CreditCard = 1
|
||||
Var Seeker.CreditCardRef = CreditCardRef
|
||||
|
||||
|
||||
CashlessReq SUCCESS
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue