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

This commit is contained in:
Pakin 2024-06-21 15:46:16 +07:00
commit 1aef016ab7
6 changed files with 1385 additions and 89 deletions

View file

@ -581,9 +581,6 @@
EndIf EndIf
EndIf EndIf
CashlessReq SUCCESS
</EventOpen> </EventOpen>
<EventLanguageOnChange> <EventLanguageOnChange>
Var XPosiShowCountDownBrew = 768 Var XPosiShowCountDownBrew = 768

File diff suppressed because it is too large Load diff

View file

@ -55,46 +55,6 @@
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
EndIf EndIf
If TumbleBottleOutOfStock = 0 Then If TumbleBottleOutOfStock = 0 Then
@ -108,26 +68,6 @@
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
@ -147,6 +87,20 @@
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
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
@ -160,6 +114,26 @@
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
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 EndIf
If SuperSetOutOfStock = 0 Then If SuperSetOutOfStock = 0 Then
@ -167,6 +141,22 @@
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
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
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 EndIf
If E_GiftCard100BathOutOfStock = 0 Then If E_GiftCard100BathOutOfStock = 0 Then
@ -180,26 +170,6 @@
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath" Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1 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 EndIf
If ClearGel4mlOutOfStock = 0 Then If ClearGel4mlOutOfStock = 0 Then
@ -233,6 +203,36 @@
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml" Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1 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 EndIf

View file

@ -164,10 +164,8 @@ EndIf
If SystemDateMonthInt = 6 Then If SystemDateMonthInt = 6 Then
If SystemDateDayInt >= 3 Then If SystemDateDayInt >= 3 Then
If SystemDateDayInt <= 30 Then
Var NamHomCoconutPro = 1 Var NamHomCoconutPro = 1
EndIf EndIf
EndIf
If SystemDateDayInt <= 15 Then If SystemDateDayInt <= 15 Then
STRCONTAIN "TaoBin_1_Baht_Energy" XMLProfile TaoBin_1_Baht_Energy STRCONTAIN "TaoBin_1_Baht_Energy" XMLProfile TaoBin_1_Baht_Energy
@ -189,6 +187,12 @@ If SystemDateMonthInt = 6 Then
EndIf EndIf
EndIf EndIf
If SystemDateMonthInt = 7 Then
If SystemDateDayInt <= 7 Then
Var NamHomCoconutPro = 1
EndIf
EndIf
If SystemDateMonthInt >= 7 Then If SystemDateMonthInt >= 7 Then
Var CheckMemberPageCampaign = 1 Var CheckMemberPageCampaign = 1
EndIf EndIf

View file

@ -1051,9 +1051,9 @@
</Text> </Text>
<Text> <Text>
<X> 654 </X> <X> 620 </X>
<Y> 1076 </Y> <Y> 1076 </Y>
<Width> 120 </Width> <Width> 164 </Width>
<Height> 80 </Height> <Height> 80 </Height>
<Font> RobotoBold </Font> <Font> RobotoBold </Font>
<Size> 64 </Size> <Size> 64 </Size>

View file

@ -698,6 +698,8 @@
Var Seeker.CreditCard = 1 Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef Var Seeker.CreditCardRef = CreditCardRef
CashlessReq SUCCESS
Open "ROOT/taobin_project/xml/page_thankyou.xml" Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf EndIf