This commit is contained in:
kong 2023-06-29 14:36:56 +07:00
parent c32782eb35
commit 5fda196adc
27 changed files with 9303 additions and 36 deletions

View file

@ -1,6 +1,6 @@
normal_eng=ROOT/taobin_project/image/event/bn_pepsi_buy2_save_move_en.png
normal_thai=ROOT/taobin_project/image/event/bn_pepsi_buy2_save_move_th.png
press_eng=ROOT/taobin_project/image/event/bn_pepsi_buy2_save_move_en.png
press_thai=ROOT/taobin_project/image/event/bn_pepsi_buy2_save_move_th.png
disable_eng=ROOT/taobin_project/image/event/bn_pepsi_buy2_save_move_en.png
disable_thai=ROOT/taobin_project/image/event/bn_pepsi_buy2_save_move_th.png
normal_eng=ROOT/taobin_project/image/event/welcomedrink.png
normal_thai=ROOT/taobin_project/image/event/welcomedrink.png
press_eng=ROOT/taobin_project/image/event/welcomedrink.png
press_thai=ROOT/taobin_project/image/event/welcomedrink.png
disable_eng=ROOT/taobin_project/image/event/welcomedrink.png
disable_thai=ROOT/taobin_project/image/event/welcomedrink.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 128 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Before After
Before After

Binary file not shown.

Binary file not shown.

View file

@ -1 +1 @@
/event/promotion_pepsi.xml
/event/promotion_oreo_welcome_drink.xml

View file

@ -8979,6 +8979,19 @@ LIMENADE SODA" </Value>
Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
</EventClick>
</Button>
<Text>
<X> 91</X>
<Y> 635 </Y>
<Size> 32 </Size>
<Width>128</Width>
<Height>64</Height>
<Font> MITRegularTTF </Font>
<Color> 0x5A5A5A </Color>
<Mode> "disable-show" </Mode>
<State> SubRandMilkButtonEnable </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
<Button>
<X> 301 </X>
@ -9019,6 +9032,20 @@ Var OreoGuarantee = OreoGuarantee + 1
Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
</EventClick>
</Button>
<Text>
<X> 349 </X>
<Y> 635 </Y>
<Size> 32 </Size>
<Width>128</Width>
<Height>64</Height>
<Font> MITRegularTTF </Font>
<Color> 0x5A5A5A </Color>
<Mode> "disable-show" </Mode>
<State> SubRandTeaButtonEnable </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
<Button>
<X> 43 </X>
@ -9062,6 +9089,19 @@ EndIf
Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
</EventClick>
</Button>
<Text>
<X> 91</X>
<Y> 953 </Y>
<Size> 32 </Size>
<Width>128</Width>
<Height>64</Height>
<Font> MITRegularTTF </Font>
<Color> 0x5A5A5A </Color>
<Mode> "disable-show" </Mode>
<State> SubRandCoffButtonEnable </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
<Button>
<X> 301 </X>
@ -9102,6 +9142,19 @@ EndIf
Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
</EventClick>
</Button>
<Text>
<X> 349</X>
<Y> 953 </Y>
<Size> 32 </Size>
<Width>128</Width>
<Height>64</Height>
<Font> MITRegularTTF </Font>
<Color> 0x5A5A5A </Color>
<Mode> "disable-show" </Mode>
<State> SubRandAllButtonEnable </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
;
;
@ -9114,7 +9167,7 @@ EndIf
<Button>
<X> 42 </X>
<Y> 520 </Y>
<Y> 518 </Y>
<State> BigButtonEnable </State>
<Filename>
eval(

View file

@ -1 +1,62 @@
Open "ROOT/taobin_project/xml/page_catalog_group_pepsi_pro.xml"
Var NameDrink = "OREO SMOOTHIE VOLCANO"
Var NameDrinkTH = "โอริโอ้ปั่นภูเขาไฟ"
Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้ "
Var DrinkDescription = "Milk, Sugar, Oreo, Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_oreo.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $-.Price
Var PriceD3 = $12-03-03-0009.Price
Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "##-##-##-####"
Var PD_CODE3 = "12-03-03-0009"
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = "Disable2"
Var PD_STAGE_3 = $12-03-03-0009.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" "-"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" "-"
Else
Topping "Load" "12-03-03-0009"
EndIf
EndIf
Var menu_name_eng_hot = $##-##-##-####.NameE
Var menu_desc_eng_hot = $##-##-##-####.descriptionE
Var menu_name_thai_hot = $##-##-##-####.Name
Var menu_desc_thai_hot = $##-##-##-####.description
Var menu_name_eng_cold = $##-##-##-####.NameE
Var menu_desc_eng_cold = $##-##-##-####.descriptionE
Var menu_name_thai_cold = $##-##-##-####.Name
Var menu_desc_thai_cold = $##-##-##-####.description
Var menu_name_eng_blender = $12-03-03-0009.NameE
Var menu_desc_eng_blender = $12-03-03-0009.descriptionE
Var menu_name_thai_blender = $12-03-03-0009.Name
Var menu_desc_thai_blender = $12-03-03-0009.description
DEBUGVAR PD_STAGE_1
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
Var SelectDrinkType = 0
Var OreoWelcomeDrinkFromClick = 1
Open "ROOT/taobin_project/xml/page_topping_select5.xml"

File diff suppressed because it is too large Load diff

View file

@ -46,6 +46,19 @@
Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
</EventClick>
</Button>
<Text>
<X> 91</X>
<Y> 635 </Y>
<Size> 32 </Size>
<Width>128</Width>
<Height>64</Height>
<Font> MITRegularTTF </Font>
<Color> 0x5A5A5A </Color>
<Mode> "disable-show" </Mode>
<State> SubRandMilkButtonEnable </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
<Button>
<X> 301 </X>
@ -86,6 +99,20 @@ Var OreoGuarantee = OreoGuarantee + 1
Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
</EventClick>
</Button>
<Text>
<X> 349 </X>
<Y> 635 </Y>
<Size> 32 </Size>
<Width>128</Width>
<Height>64</Height>
<Font> MITRegularTTF </Font>
<Color> 0x5A5A5A </Color>
<Mode> "disable-show" </Mode>
<State> SubRandTeaButtonEnable </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
<Button>
<X> 43 </X>
@ -129,6 +156,19 @@ EndIf
Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
</EventClick>
</Button>
<Text>
<X> 91</X>
<Y> 953 </Y>
<Size> 32 </Size>
<Width>128</Width>
<Height>64</Height>
<Font> MITRegularTTF </Font>
<Color> 0x5A5A5A </Color>
<Mode> "disable-show" </Mode>
<State> SubRandCoffButtonEnable </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
<Button>
<X> 301 </X>
@ -169,6 +209,19 @@ EndIf
Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
</EventClick>
</Button>
<Text>
<X> 349</X>
<Y> 953 </Y>
<Size> 32 </Size>
<Width>128</Width>
<Height>64</Height>
<Font> MITRegularTTF </Font>
<Color> 0x5A5A5A </Color>
<Mode> "disable-show" </Mode>
<State> SubRandAllButtonEnable </State>
<Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align>
</Text>
;
;
@ -181,7 +234,7 @@ EndIf
<Button>
<X> 42 </X>
<Y> 520 </Y>
<Y> 518 </Y>
<State> BigButtonEnable </State>
<Filename>
eval(

View file

@ -9,8 +9,11 @@ If OpenFromPageBoard = 1 Then
Var OpenFromPageBoard = 0
Else
OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If OreoWelcomeDrinkEnable = 1 Then
OpenInst 2 "ROOT/taobin_project/xml/event/promotion_oreo_welcome_drink.xml"
Else
OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
EndIf
Else
@ -19,8 +22,11 @@ Else
Var BigButtonEnable = "Enable"
Open "ROOT/taobin_project/xml/event/promotion_mystery_cup_35.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If OreoWelcomeDrinkEnable = 1 Then
Open "ROOT/taobin_project/xml/event/promotion_oreo_welcome_drink.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
EndIf
EndIf
Var OpenFromPageBoard = 0

View file

@ -19,6 +19,7 @@ Var SoundBackToSchoolType = 0
; End
Var MysteryProEnable = 0
Var OreoWelcomeDrinkEnable = 0
If SystemDateMonthInt = 7 Then
If SystemDateDayInt = 3 Then
@ -75,26 +76,70 @@ If BoxID = 200000 Then
Var MysteryProEnable = 0
EndIf
If BoxID = 173149 Then
Var OreoDueEnable = 0
Var OreoForFreeEnable = 0
Var PepsiProEnable = 0
Var PepsiProCodeEnable = 0
Var MysteryProEnable = 0
EndIf
If SystemDateMonthInt = 7 Then
If SystemDateDayInt = 24 Then
Var OreoWelcomeDrinkEnable = 1
EndIf
If SystemDateDayInt = 25 Then
Var OreoWelcomeDrinkEnable = 1
EndIf
If SystemDateDayInt = 26 Then
Var OreoWelcomeDrinkEnable = 1
EndIf
If SystemDateDayInt = 27 Then
Var OreoWelcomeDrinkEnable = 1
EndIf
If SystemDateDayInt = 28 Then
Var OreoWelcomeDrinkEnable = 1
EndIf
If SystemDateDayInt = 29 Then
Var OreoWelcomeDrinkEnable = 1
EndIf
If SystemDateDayInt = 30 Then
Var OreoWelcomeDrinkEnable = 1
EndIf
If SystemDateDayInt = 31 Then
Var OreoWelcomeDrinkEnable = 1
EndIf
EndIf
If BoxID = 173149 Then
Var MysteryProEnable = 1
EndIf
If BoxID = 172053 Then
;Var MysteryProEnable = 1
Var OreoWelcomeDrinkEnable = 1
EndIf
If BoxID = 201092 Then
Var MysteryProEnable = 1
EndIf
If BoxID = 172527 Then
Var MysteryProEnable = 1
EndIf
If BoxID = 105005 Then
Var OreoWelcomeDrinkEnable = 1
EndIf
If SystemDateMonthInt = 7 Then
If SystemDateDayInt > 14 Then
Var MysteryProEnable = 0
Var OreoWelcomeDrinkEnable = 0
EndIf
EndIf
If SystemDateMonthInt > 7 Then
Var MysteryProEnable = 0
Var OreoWelcomeDrinkEnable = 0
EndIf
DEBUGVAR MysteryProEnable
If InternationalEnable = 1 Then
Var PepsiProEnable = 0

View file

@ -319,20 +319,20 @@
Var DiscountWithIdentifyState = "Invisible"
Var BackToSchoolForFreeButtonState = "Invisible"
Var WelcomeDrinkButtonState = "Invisible"
DEBUGVAR Price5Active
DEBUGVAR EnableLiveness
DEBUGVAR DiscountWithIdentifyState
DEBUGVAR BackToSchoolForFreeEnable
DEBUGVAR WelcomeDrinkEnable
If BackToSchoolForFreeEnable = 1 Then
Var BackToSchoolForFreeEnable = 0
Var BackToSchoolForFreeButtonState = "Enable"
If OreoWelcomeDrinkFromClick = 1 Then
Var OreoWelcomeDrinkFromClick = 0
Var WelcomeDrinkButtonState = "Enable"
EndIf
DEBUGVAR BackToSchoolForFreeButtonState
DEBUGVAR WelcomeDrinkButtonState
If EnableLiveness = "true" Then
If CameraCount = 1 Then
@ -767,6 +767,8 @@
EndIf
EndIf
DEBUGVAR Service_LidStraw
; Override all
If Service_LidStraw = "Disable" Then
@ -4250,7 +4252,7 @@
; free oreo
<Button>
<State> BackToSchoolForFreeButtonState </State>
<State> WelcomeDrinkButtonState </State>
<X> 673 </X>
<Y> 1785 </Y>
<Filename> Var( DirImage + "/bn_childrenFree.png" ) </Filename>

View file

@ -319,20 +319,20 @@
Var DiscountWithIdentifyState = "Invisible"
Var BackToSchoolForFreeButtonState = "Invisible"
Var WelcomeDrinkButtonState = "Invisible"
DEBUGVAR Price5Active
DEBUGVAR EnableLiveness
DEBUGVAR DiscountWithIdentifyState
DEBUGVAR BackToSchoolForFreeEnable
DEBUGVAR WelcomeDrinkEnable
If BackToSchoolForFreeEnable = 1 Then
Var BackToSchoolForFreeEnable = 0
Var BackToSchoolForFreeButtonState = "Enable"
If OreoWelcomeDrinkFromClick = 1 Then
Var OreoWelcomeDrinkFromClick = 0
Var WelcomeDrinkButtonState = "Enable"
EndIf
DEBUGVAR BackToSchoolForFreeButtonState
DEBUGVAR WelcomeDrinkButtonState
If EnableLiveness = "true" Then
If CameraCount = 1 Then
@ -4251,7 +4251,7 @@
; free oreo
<Button>
<State> BackToSchoolForFreeButtonState </State>
<State> WelcomeDrinkButtonState </State>
<X> 673 </X>
<Y> 1785 </Y>
<Filename> Var( DirImage + "/bn_childrenFree.png" ) </Filename>