pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

7.02

Browse source
This commit is contained in:
kong 2023-03-08 16:20:02 +07:00
parent ee565931d4
commit 51875b0b0d
8 changed files with 83 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page3/img_oreo_wed_free.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
image/page3/img_oreo_wed_topping.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
image/topping2/bg_top_oreo2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Before After
Before After

BIN
image/topping2_en/bg_top_oreo2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Before After
Before After

BIN
video/main_page_en.mp4 Normal file
View file

Binary file not shown.

9
xml/page_payment.xml
View file

@ -133,6 +133,15 @@
Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a"
EndIf
Var PromotionIDCurrentOrder = 0
If PromotionOreoVolcanoEnable = 1 Then
If PD_CODE3 = "12-03-03-0009" Then
Var PromotionIDCurrentOrder = 2
EndIf
EndIf
DEBUGVAR PromotionIDCurrentOrder
SAVELOG MachineStage

78
xml/page_topping_select6.xml
View file

@ -104,8 +104,12 @@
Var text_show_eng = "Enable"
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 510
Var text_x_add_oreo_price = 430
Var text_show_normal_x = 408
Var text_x_free_adjust = 100
If PromotionOreoToppingFreeEnable = 0 Then
Var text_x_free_adjust = text_x_free_adjust + 5
EndIf
Else
Var DirImage = "ROOT/taobin_project/image/topping2"
@ -118,11 +122,17 @@
Var text_show_eng = "Invisible"
Var topping_shot_price_x = 600
Var text_x_add_oreo_price = 490
Var text_x_add_oreo_price = 420
Var text_show_normal_x = 386
Var text_x_free_adjust = 70
If PromotionOreoToppingFreeEnable = 0 Then
Var text_x_free_adjust = text_x_free_adjust + 30
EndIf
EndIf
Var text_x_free_topping = text_x_add_oreo_price + text_x_free_adjust
Var bg_strawlid = DirImage + "/bg_strawlid.png"
Var bg_straw_only = DirImage + "/bg_straw_only.png"
Var bg_lid_only = DirImage + "/bg_lid_only.png"
@ -298,6 +308,19 @@
Var PromotionIDCurrentOrder = 2
EndIf
EndIf
If PromotionOreoToppingFreeEnable = 1 Then
Var oreo_topping_wed_free = "Enable"
Var oreo_topping_wed_topping = "Invisible"
Else
Var oreo_topping_wed_free = "Invisible"
Var oreo_topping_wed_topping = "Enable"
EndIf
DEBUGVAR PromotionIDCurrentOrder
</EventOpen>
@ -353,8 +376,6 @@
<Button>
<X> 990 </X>
<Y> 438 </Y>
@ -383,8 +404,12 @@
Var text_show_eng = "Enable"
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 510
Var text_x_add_oreo_price = 430
Var text_show_normal_x = 408
Var text_x_free_adjust = 100
If PromotionOreoToppingFreeEnable = 0 Then
Var text_x_free_adjust = text_x_free_adjust + 5
EndIf
Else
Var DirImage = "ROOT/taobin_project/image/topping2"
@ -397,11 +422,18 @@
Var text_show_eng = "Invisible"
Var topping_shot_price_x = 600
Var text_x_add_oreo_price = 490
Var text_x_add_oreo_price = 420
Var text_show_normal_x = 386
Var text_x_free_adjust = 70
If PromotionOreoToppingFreeEnable = 0 Then
Var text_x_free_adjust = text_x_free_adjust + 30
EndIf
EndIf
Var text_x_free_topping = text_x_add_oreo_price + text_x_free_adjust
Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png"
Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png"
@ -2865,6 +2897,29 @@
</Text>
<Image>
<State> showText8 </State>
<X> 600 </X>
<Y> 6 </Y>
<Filename> Var( DirImage + "/text8.png" ) </Filename>
</Image>
<Image>
<State> oreo_topping_wed_free </State>
<X> text_x_free_topping </X>
<Y> 6 </Y>
<Filename> "ROOT/taobin_project/image/page3/img_oreo_wed_free.png" </Filename>
</Image>
<Image>
<State> oreo_topping_wed_topping</State>
<X> text_x_free_topping </X>
<Y> 6 </Y>
<Filename> "ROOT/taobin_project/image/page3/img_oreo_wed_topping.png" </Filename>
</Image>
</Row1>
@ -3850,4 +3905,15 @@
;
<EventUnitTest1>
Var PromotionOreoToppingFreeEnable = 1
DEBUGVAR PromotionOreoToppingFreeEnable
</EventUnitTest1>
<EventUnitTest2>
Var PromotionOreoToppingFreeEnable = 0
DEBUGVAR PromotionOreoToppingFreeEnable
</EventUnitTest2>
</Page>

4
xml_main/startup.xml
View file

@ -106,8 +106,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
Var XMLPageVersion = "7.01"
Var XMLPageVersionInt = 701
Var XMLPageVersion = "7.02"
Var XMLPageVersionInt = 702
</EventOpen>
<Text>