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

This commit is contained in:
wanlop run 2024-05-31 16:15:06 +07:00
commit 5970ded75b
10 changed files with 12265 additions and 335 deletions

View file

@ -1,6 +1,6 @@
normal_eng=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
normal_thai=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
press_eng=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
press_thai=ROOT/taobin_project/inter/mys/image/event/bn_MerdekaPromotionPepsi1.png
disable_eng=ROOT/taobin_project/inter/mys/image/event/bd_MerdekaPromotionPepsi1.png
disable_thai=ROOT/taobin_project/inter/mys/image/event/bd_MerdekaPromotionPepsi1.png
normal_eng=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
normal_thai=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
press_eng=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
press_thai=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
disable_eng=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
disable_thai=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 KiB

View file

@ -1 +1 @@
/event/promotion_pepsi_099.lxml
/event/promotion_winter_warmers.lxml

View file

@ -1,84 +1 @@
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = 99
Var PriceD3 = $12-05-03-0007.Price
Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "12-05-02-0007"
Var PD_CODE3 = "12-05-03-0007"
; begin lang
Var aliasName[0] = "PEPSI"
Var aliasDesc[0] = "Pepsi & Ice"
Var aliasName[1] = "เป๊ปซี่น้ำแข็ง"
Var aliasDesc[1] = "เป๊ปซี่"
Var aliasName[2] = "-"
Var aliasDesc[2] = "-"
Var aliasName[3] = "-"
Var aliasDesc[3] = "-"
Var aliasName[4] = "PEPSI"
Var aliasDesc[4] = "Pepsi, Ais"
Var NameLang[0][0] = ""
Var NameLang[0][1] = ""
Var NameLang[0][2] = ""
Var NameLang[0][3] = ""
Var NameLang[0][4] = ""
Var DescLang[0][0] = ""
Var DescLang[0][1] = ""
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
Var NameLang[1][0] = "PEPSI"
Var NameLang[1][1] = "เป๊ปซี่น้ำแข็ง"
Var NameLang[1][2] = ""
Var NameLang[1][3] = ""
Var NameLang[1][4] = "PEPSI"
Var DescLang[1][0] = "Pepsi, Ice"
Var DescLang[1][1] = "เป๊ปซี่ และน้ำแข็ง"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = "Pepsi, Ais"
Var NameLang[2][0] = "TAO SLUSHIE"
Var NameLang[2][1] = "เต่าสลัชชี่"
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = "TAO SLUSHIE"
Var DescLang[2][0] = "Pepsi, Ice"
Var DescLang[2][1] = "เป๊ปซี่ และน้ำแข็ง"
Var DescLang[2][2] = ""
Var DescLang[2][3] = ""
Var DescLang[2][4] = "Pepsi, Ais"
; end lang
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $12-05-02-0007.Button
Var PD_STAGE_3 = $12-05-03-0007.Button
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
If PD_STAGE_1 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 1
EndIf
If PD_STAGE_2 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 2
EndIf
If PD_STAGE_3 = "Enable" Then
Var SelectCountDrinkType = SelectCountDrinkType + 1
Var DefaultDrinkType = 3
EndIf
If PD_STAGE_2 = "Enable" Then
Topping "Load" "12-05-02-0007"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" "-"
Else
Topping "Load" "12-05-03-0007"
EndIf
EndIf
DEBUGVAR PD_STAGE_1
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
Open "ROOT/taobin_project/inter/aus/xml/page_catalog_group_winter_warmers_ignore.lxml"

File diff suppressed because it is too large Load diff

View file

@ -2,12 +2,18 @@
; zone promote
Var BigButtonEnable = "Enable"
If OpenFromPageBoard = 1 Then
If WinterWarmersCatalogFlag = 1 Then
OpenInst 2 "ROOT/taobin_project/inter/aus/xml/event/promotion_winter_warmers.lxml"
Else
OpenInst 2 "ROOT/taobin_project/inter/aus/xml/page_catalog_group_recommend.lxml"
EndIf
Else
Open "ROOT/taobin_project/inter/aus/xml/page_catalog_group_recommend.lxml"
If WinterWarmersCatalogFlag = 1 Then
Open "ROOT/taobin_project/inter/aus/xml/event/promotion_winter_warmers.lxml"
Else
Open "ROOT/taobin_project/inter/aus/xml/page_catalog_group_recommend.lxml"
EndIf
EndIf
Var OpenFromPageBoard = 0
Var OpenFromPageBoard = 0

View file

@ -189,16 +189,8 @@
SAVELOG "Click rec"
Var NextPage = "-"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_recommend.lxml"
DEBUGVAR CountryRootPath
DEBUGVAR OpenFileXML
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.lxml"
Else
Open OpenFileXML
EndIf
Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
TRY OpenFileXML
</EventClick>
</Button>

View file

@ -2,7 +2,7 @@
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Background> "0x303030" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
@ -81,142 +81,70 @@
SPLIT TaobinExpire "/" 3 TaobinExpireYear
If show_eng = "true" Then
If TaobinExpireMonth = "01" Then
Var TaobinExpireMonth = "Jan"
Var TaobinExpireMonthX = "January"
EndIf
If TaobinExpireMonth = "02" Then
Var TaobinExpireMonth = "Feb"
Var TaobinExpireMonthX = "February"
EndIf
If TaobinExpireMonth = "03" Then
Var TaobinExpireMonth = "Mar"
Var TaobinExpireMonthX = "March"
EndIf
If TaobinExpireMonth = "04" Then
Var TaobinExpireMonth = "Apr"
Var TaobinExpireMonthX = "April"
EndIf
If TaobinExpireMonth = "05" Then
Var TaobinExpireMonth = "May"
Var TaobinExpireMonthX = "May"
EndIf
If TaobinExpireMonth = "06" Then
Var TaobinExpireMonth = "Jun"
Var TaobinExpireMonthX = "June"
EndIf
If TaobinExpireMonth = "07" Then
Var TaobinExpireMonth = "Jul"
Var TaobinExpireMonthX = "July"
EndIf
If TaobinExpireMonth = "08" Then
Var TaobinExpireMonth = "Aug"
Var TaobinExpireMonthX = "August"
EndIf
If TaobinExpireMonth = "09" Then
Var TaobinExpireMonth = "Sep"
Var TaobinExpireMonthX = "September"
EndIf
If TaobinExpireMonth = "10" Then
Var TaobinExpireMonth = "Oct"
Var TaobinExpireMonthX = "October"
EndIf
If TaobinExpireMonth = "11" Then
Var TaobinExpireMonth = "Nov"
Var TaobinExpireMonthX = "November"
EndIf
If TaobinExpireMonth = "12" Then
Var TaobinExpireMonth = "Dec"
Var TaobinExpireMonthX = "December"
EndIf
INT TaobinExpireYear
INT TaobinExpireDay
Var TaobinExpireYear = TaobinExpireYear + 0
Else
If TaobinExpireMonth = "01" Then
Var TaobinExpireMonth = "ม.ค."
Var TaobinExpireMonthX = "มกราคม"
Var TaobinExpireMonth = "Jan"
Var TaobinExpireMonthX = "January"
EndIf
If TaobinExpireMonth = "02" Then
Var TaobinExpireMonth = "ก.พ."
Var TaobinExpireMonthX = "กุมภาพันธ์"
Var TaobinExpireMonth = "Feb"
Var TaobinExpireMonthX = "February"
EndIf
If TaobinExpireMonth = "03" Then
Var TaobinExpireMonth = "มี.ค."
Var TaobinExpireMonthX = "มีนาคม"
Var TaobinExpireMonth = "Mar"
Var TaobinExpireMonthX = "March"
EndIf
If TaobinExpireMonth = "04" Then
Var TaobinExpireMonth = "เม.ย."
Var TaobinExpireMonthX = "เมษายน"
Var TaobinExpireMonth = "Apr"
Var TaobinExpireMonthX = "April"
EndIf
If TaobinExpireMonth = "05" Then
Var TaobinExpireMonth = "พ.ค."
Var TaobinExpireMonthX = "พฤษภาคม"
Var TaobinExpireMonth = "May"
Var TaobinExpireMonthX = "May"
EndIf
If TaobinExpireMonth = "06" Then
Var TaobinExpireMonth = "มิ.ย."
Var TaobinExpireMonthX = "มิถุนายน"
Var TaobinExpireMonth = "Jun"
Var TaobinExpireMonthX = "June"
EndIf
If TaobinExpireMonth = "07" Then
Var TaobinExpireMonth = "ก.ค."
Var TaobinExpireMonthX = "กรกฎาคม"
Var TaobinExpireMonth = "Jul"
Var TaobinExpireMonthX = "July"
EndIf
If TaobinExpireMonth = "08" Then
Var TaobinExpireMonth = "ส.ค."
Var TaobinExpireMonthX = "สิงหาคม"
Var TaobinExpireMonth = "Aug"
Var TaobinExpireMonthX = "August"
EndIf
If TaobinExpireMonth = "09" Then
Var TaobinExpireMonth = "ก.ย."
Var TaobinExpireMonthX = "กันยายน"
Var TaobinExpireMonth = "Sep"
Var TaobinExpireMonthX = "September"
EndIf
If TaobinExpireMonth = "10" Then
Var TaobinExpireMonth = "ต.ค."
Var TaobinExpireMonthX = "ตุลาคม"
Var TaobinExpireMonth = "Oct"
Var TaobinExpireMonthX = "October"
EndIf
If TaobinExpireMonth = "11" Then
Var TaobinExpireMonth = "พ.ย."
Var TaobinExpireMonthX = "พฤศจิกายน"
Var TaobinExpireMonth = "Nov"
Var TaobinExpireMonthX = "November"
EndIf
If TaobinExpireMonth = "12" Then
Var TaobinExpireMonth = "ธ.ค."
Var TaobinExpireMonthX = "ธันวาคม"
Var TaobinExpireMonth = "Dec"
Var TaobinExpireMonthX = "December"
EndIf
INT TaobinExpireYear
INT TaobinExpireDay
Var TaobinExpireYear = TaobinExpireYear + 543
EndIf
Var TaobinExpireYear = TaobinExpireYear + 0
Var ExpireStrTmp = ""
Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay
@ -225,8 +153,6 @@
Var ExpireStrTmp = ExpireStrTmp + " "
Var ExpireStrTmp = ExpireStrTmp + TaobinExpireYear
If TaobinLevel = "1" Then
Var PointMaskState = "Enable"
@ -235,137 +161,65 @@
If show_eng = "true" Then
Var TaobinLevelDesc3 = "You have coupons "
Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons
Var TaobinLevelDesc3 = TaobinLevelDesc3 + " numbers"
Var TaobinLevelDesc3 = "You have coupons "
Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons
Var TaobinLevelDesc3 = TaobinLevelDesc3 + " numbers"
If TaobinLevel = "1" Then
Var TaobinLevelDesc1 = "Shy turtle level"
Var TaobinLevelDesc2 = ""
If TaobinLevel = "1" Then
Var TaobinLevelDesc1 = "Shy turtle level"
Var TaobinLevelDesc2 = ""
Var TaobinLeveImg = "/taoLevel1.png"
EndIf
Var TaobinLeveImg = "/taoLevel1.png"
EndIf
If TaobinLevel = "2" Then
Var TaobinLevelDesc1 = "Walking turtle level"
Var PointDiff = 150 - CoffeePointRank
Var TaobinLevelDesc2 = "Earn " + PointDiff
Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells "
Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Flying turtle level"
If TaobinLevel = "2" Then
Var TaobinLevelDesc1 = "Walking turtle level"
Var PointDiff = 150 - CoffeePointRank
Var TaobinLevelDesc2 = "Earn " + PointDiff
Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells "
Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Flying turtle level"
Var TaobinLeveImg = "/taoLevel2.png"
Var TaobinLeveImg = "/taoLevel2.png"
If CoffeePointRank > 149 Then
;Var TaobinLeveImg = "/taoLevel3.png"
If CoffeePointRank > 149 Then
;Var TaobinLeveImg = "/taoLevel3.png"
;Var TaobinLevelDesc1 = "Flying turtle level "
Var TaobinLevelDesc2 = ""
;Var CoffeePointRank = CoffeePointRank - 150
EndIf
EndIf
If TaobinLevel = "3" Then
Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp
Var PointDiff = 200 - CoffeePointRank
Var TaobinLevelDesc2 = "Earn " + PointDiff
Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells "
Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Master turtle level"
Var TaobinLeveImg = "/taoLevel3.png"
If CoffeePointRank > 199 Then
;Var TaobinLeveImg = "/taoLevel4.png"
;Var TaobinLevelDesc1 = "Master turtle level "
Var TaobinLevelDesc2 = ""
;Var CoffeePointRank = CoffeePointRank - 350
EndIf
EndIf
If TaobinLevel = "4" Then
Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp
Var TaobinLevelDesc2 = ""
Var TaobinLeveImg = "/taoLevel4.png"
EndIf
Else
Var TaobinLevelDesc3 = "ตอนนี้คุณมีคูปองแลกเครื่องดื่มฟรีเหลืออยู่ "
Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons
Var TaobinLevelDesc3 = TaobinLevelDesc3 + " ใบ"
If TaobinLevel = "1" Then
Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าขี้อาย"
Var TaobinLevelDesc2 = ""
Var TaobinLeveImg = "/taoLevel1.png"
EndIf
If TaobinLevel = "2" Then
Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าเตาะแตะ"
Var PointDiff = 150 - CoffeePointRank
Var TaobinLevelDesc2 = "สะสมกระดองอีก " + PointDiff
Var TaobinLevelDesc2 = TaobinLevelDesc2 + " กระดอง "
Var TaobinLevelDesc2 = TaobinLevelDesc2 + "เพื่อเลื่อนขั้นเป็นเต่าติดปีก"
Var TaobinLeveImg = "/taoLevel2.png"
If CoffeePointRank > 149 Then
;Var TaobinLeveImg = "/taoLevel3.png"
;Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก "
Var TaobinLevelDesc2 = ""
;Var CoffeePointRank = CoffeePointRank - 150
EndIf
EndIf
If TaobinLevel = "3" Then
Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก จนถึง " + ExpireStrTmp
Var PointDiff = 200 - CoffeePointRank
Var TaobinLevelDesc2 = "สะสมกระดองอีก " + PointDiff
Var TaobinLevelDesc2 = TaobinLevelDesc2 + " กระดอง "
Var TaobinLevelDesc2 = TaobinLevelDesc2 + "เพื่อเลื่อนขั้นเป็นผู้เฒ่าเต่า"
Var TaobinLeveImg = "/taoLevel3.png"
If CoffeePointRank > 199 Then
;Var TaobinLeveImg = "/taoLevel4.png"
;Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า "
Var TaobinLevelDesc2 = ""
;Var CoffeePointRank = CoffeePointRank - 350
EndIf
EndIf
If TaobinLevel = "4" Then
Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า จนถึง " + ExpireStrTmp
Var TaobinLevelDesc2 = ""
Var TaobinLeveImg = "/taoLevel4.png"
EndIf
;Var TaobinLevelDesc1 = "Flying turtle level "
Var TaobinLevelDesc2 = ""
;Var CoffeePointRank = CoffeePointRank - 150
EndIf
EndIf
If TaobinLevel = "3" Then
Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp
Var PointDiff = 200 - CoffeePointRank
Var TaobinLevelDesc2 = "Earn " + PointDiff
Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells "
Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Master turtle level"
Var TaobinLeveImg = "/taoLevel3.png"
If CoffeePointRank > 199 Then
;Var TaobinLeveImg = "/taoLevel4.png"
;Var TaobinLevelDesc1 = "Master turtle level "
Var TaobinLevelDesc2 = ""
;Var CoffeePointRank = CoffeePointRank - 350
EndIf
EndIf
If TaobinLevel = "4" Then
Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp
Var TaobinLevelDesc2 = ""
Var TaobinLeveImg = "/taoLevel4.png"
EndIf
Var CheckCoupons = 0
Var MakeDrinkState = 0
@ -565,10 +419,6 @@
Open "ROOT/taobin_project/xml/page_display_get_free.xml"
Else
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -734,9 +584,7 @@
EndIf
If PromotionIDCurrentOrder > 1 Then
Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -899,7 +747,6 @@
<Button>
<X> 345 </X>
<Y> 1486 </Y>
<Filename> Var( DirImage + taobinImgP26 )</Filename>
</Button>

View file

@ -7,8 +7,10 @@
<EventOpen>
If CountryName = "Australia" Then
Var catalogFile = CountryRootPath + "/xml/page_catalog.lxml"
Open catalogFile
If WinterWarmersCatalogFlag = 1 Then
Var catalogFile = CountryRootPath + "/xml/page_catalog_winter_warmers.lxml"
Open catalogFile
EndIf
EndIf