Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
wanlop run 2024-06-24 19:11:35 +07:00
commit a96622d3c8
40 changed files with 64170 additions and 1653 deletions

View file

@ -107,6 +107,11 @@
;Var TumbleBottleOutOfStock = 1
;Var ClearGelOutOfStock = 1
Var E_GiftCard100BathOutOfStock = 1
Var TumbleBottleOutOfStock = 1
DEBUGVAR SuperSetOutOfStock
DEBUGVAR BalanceEssenceTonerOutOfStock

View file

@ -45,56 +45,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
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 +58,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 +77,30 @@
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
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,46 @@
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
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 +161,62 @@
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
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
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
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 +230,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
@ -223,16 +253,6 @@
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

View file

@ -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

View file

@ -6,6 +6,14 @@
<Volume> SoundVolume </Volume>
<EventOpen>
If InternationalEnable = 1 Then
Var Brewing3ContiXMLFile = CountryRootPath + "/xml/page_brewing3Conti.xml"
DEBUGVAR Brewing3ContiXMLFile
Open Brewing3ContiXMLFile
EndIf
Var ActionOKCase = 0
Var Seeker = "curr"

View file

@ -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>

View file

@ -697,7 +697,9 @@
EndIf
Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef
CashlessReq SUCCESS
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf