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

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

Browse source
This commit is contained in:
wanlop run 2024-07-31 14:38:05 +07:00
commit 1565acb063
84 changed files with 3594 additions and 2069 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/event/lucky_draw_collect_point/base_bg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
image/event/lucky_draw_collect_point/bg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4 KiB

BIN
image/event/lucky_draw_collect_point/goal_BYD.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
image/event/lucky_draw_collect_point/goal_ORA.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
image/event/lucky_draw_collect_point/goal_Tesla.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
image/event/lucky_draw_collect_point/goal_regular.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
image/event/lucky_draw_collect_point/head_slider_level2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
image/event/lucky_draw_collect_point/head_slider_level3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
image/event/lucky_draw_collect_point/head_slider_level4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8 KiB

BIN
image/event/lucky_draw_collect_point/level1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
image/event/lucky_draw_collect_point/level2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
image/event/lucky_draw_collect_point/level3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
image/event/lucky_draw_collect_point/level4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_ads.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 86 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_ads_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 87 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_1-5_level2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_1-5_level3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_1-5_level4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_11-15_level2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_11-15_level3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_11-15_level4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_16-20_level2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_16-20_level3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_16-20_level4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_21-25_level2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_21-25_level3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_21-25_level4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_26-30_level2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_26-30_level3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_26-30_level4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_6-10_level2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_6-10_level3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_6-10_level4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
image/event/lucky_draw_collect_point/slider.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 759 B

4
inter/aus/xml/event/promotion_2.xml
View file

@ -12223,8 +12223,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/aus/xml/event/promotion_3.xml
View file

@ -12223,8 +12223,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/aus/xml/event/promotion_pepsi_099.lxml
View file

@ -12223,8 +12223,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/aus/xml/event/promotion_westfield.lxml
View file

@ -12124,8 +12124,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/aus/xml/event/promotion_winter_warmers.lxml
View file

@ -12124,8 +12124,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/aus/xml/page_catalog_cocktail.lxml
View file

@ -689,8 +689,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/aus/xml/page_catalog_group_recommend.lxml
View file

@ -12092,8 +12092,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/aus/xml/page_catalog_westfield.lxml
View file

@ -700,8 +700,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/aus/xml/page_catalog_winter_warmers.lxml
View file

@ -700,8 +700,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml
View file

@ -12123,8 +12123,8 @@ LIMENADE SODA</LanguageSlot3>
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/mys/xml/event/promotion_2.xml
View file

@ -12362,8 +12362,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/mys/xml/event/promotion_3.xml
View file

@ -12362,8 +12362,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/mys/xml/event/promotion_fruit_raya.lxml
View file

@ -12062,8 +12062,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/mys/xml/event/promotion_pepsi_099.lxml
View file

@ -12362,8 +12362,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/mys/xml/event/promotion_thai_tea.lxml
View file

@ -12376,8 +12376,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/mys/xml/page_catalog_group_recommend.lxml
View file

@ -12144,8 +12144,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/mys/xml/page_catalog_group_recommend_multi_pro.lxml
View file

@ -46172,8 +46172,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

BIN
inter/sgp/image/page_member/bn_no.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before After
Before After

BIN
inter/sgp/image/page_member/bn_yes.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Before After
Before After

BIN
inter/sgp/image/page_member/bp_no.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before After
Before After

BIN
inter/sgp/image/page_member/bp_yes.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Before After
Before After

4
inter/sgp/xml/event/promotion_2.xml
View file

@ -12223,8 +12223,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/sgp/xml/event/promotion_3.xml
View file

@ -12223,8 +12223,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/sgp/xml/event/promotion_pepsi_099.lxml
View file

@ -12223,8 +12223,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/sgp/xml/event/triple_promotion_s1topleft_and_s1topright_and_s1botleft.lxml
View file

@ -2455,8 +2455,8 @@ eval(
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml
View file

@ -2455,8 +2455,8 @@ eval(
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/sgp/xml/event/triple_promotion_s3topleft_and_s3topright_and_s3botleft.lxml
View file

@ -2430,8 +2430,8 @@ eval(
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/sgp/xml/page_catalog_group_recommend.lxml
View file

@ -12605,8 +12605,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/sgp/xml/page_catalog_group_recommend_multi_pro.lxml
View file

@ -5036,8 +5036,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

11
inter/sgp/xml/page_collect_point_2.lxml
View file

@ -174,9 +174,18 @@
DEBUGVAR CatchNotMember DEBUGVAR CatchNotMember
If CatchNotMember = 1 Then If CatchNotMember = 1 Then
Var MemberErrText = Param1 + ", member=false"
DEBUGVAR MemberErrText
Var MemberErrText = ""
DEBUGVAR TaobinName
Var TaobinName = "" Var TaobinName = ""
DEBUGVAR MemberPrompt DEBUGVAR MemberPrompt
Open MemberPrompt Var CatchNotMember = 0
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf EndIf

4
inter/uae_dubai/xml/event/promotion_2.xml
View file

@ -12223,8 +12223,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/uae_dubai/xml/event/promotion_3.xml
View file

@ -12223,8 +12223,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/uae_dubai/xml/event/promotion_pepsi_099.lxml
View file

@ -12223,8 +12223,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename> <Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/uae_dubai/xml/page_catalog_group_recommend.lxml
View file

@ -12166,8 +12166,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

8
xml/event/tricker.ev
View file

@ -127,10 +127,10 @@ Var New_Payment = 0
Var XMLLiveInfoEnable = 0 Var XMLLiveInfoEnable = 0
Var CheckMemberPageCampaign = 0 Var LuckyDrawCampaign = 0
If SystemDateMonthInt = 1 Then If SystemDateMonthInt = 1 Then
Var CheckMemberPageCampaign = 1 Var LuckyDrawCampaign = 1
EndIf EndIf
If SystemDateMonthInt = 5 Then If SystemDateMonthInt = 5 Then
@ -195,7 +195,7 @@ If SystemDateMonthInt = 6 Then
EndIf EndIf
If SystemDateDayInt >= 17 Then If SystemDateDayInt >= 17 Then
Var CheckMemberPageCampaign = 1 Var LuckyDrawCampaign = 1
EndIf EndIf
EndIf EndIf
@ -223,7 +223,7 @@ If SystemDateMonthInt = 7 Then
EndIf EndIf
If SystemDateMonthInt >= 7 Then If SystemDateMonthInt >= 7 Then
Var CheckMemberPageCampaign = 1 Var LuckyDrawCampaign = 1
EndIf EndIf

10
xml/page_check_member.xml
View file

@ -42,7 +42,8 @@
EndIf EndIf
Var luckyDrawTicket = 0
Var luckyDrawAlredyGotReward = 0
Var StepX = 2 Var StepX = 2
@ -130,9 +131,10 @@
INT CoffeePointRank INT CoffeePointRank
Var CoffeePointRankTmp = CoffeePointRank Var CoffeePointRankTmp = CoffeePointRank
If CheckMemberPageCampaign = 1 Then If LuckyDrawCampaign = 1 Then
Var luckeyDrawTicket = Ext1h Var luckyDrawTicket = Ext1h
INT luckeyDrawTicket INT luckyDrawTicket
Var luckyDrawAlredyGotReward = Ext1i
EndIf EndIf

5
xml/page_check_member1.xml
View file

@ -32,6 +32,8 @@
Var Xtext = 246 Var Xtext = 246
Var luckyDrawTicket = 0
Var luckyDrawAlredyGotReward = 0
If show_eng = "true" Then If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/collectiing_en" Var DirImage = "ROOT/taobin_project/image/collectiing_en"
@ -90,9 +92,10 @@
Var CoffeePointRankTmp = CoffeePointRank Var CoffeePointRankTmp = CoffeePointRank
If CheckMemberPageCampaign = 1 Then If LuckyDrawCampaign = 1 Then
Var luckyDrawTicket = Ext1h Var luckyDrawTicket = Ext1h
INT luckyDrawTicket INT luckyDrawTicket
Var luckyDrawAlredyGotReward = Ext1i
EndIf EndIf

2
xml/page_check_member2.xml
View file

@ -8,7 +8,7 @@
<EventOpen> <EventOpen>
; On open ; On open
If CheckMemberPageCampaign = 1 Then If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml" Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml"
EndIf EndIf

35
xml/page_check_member2_campaign.xml
View file

@ -755,6 +755,15 @@
DEBUGVAR SystemDate DEBUGVAR SystemDate
DEBUGVAR targetDate DEBUGVAR targetDate
DEBUGVAR dayDiff DEBUGVAR dayDiff
Var ShowLuckyDrawTicketState = "Enable"
Var ShowLuckyDrawAlreadyGotRewardState = "Invisible"
If luckyDrawAlredyGotReward = 1 Then
Var ShowLuckyDrawTicketState = "Invisible"
Var ShowLuckyDrawAlreadyGotRewardState = "Enable"
EndIf
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
@ -1028,18 +1037,21 @@
<Image> <Image>
<X> 142 </X> <X> 142 </X
<Y> 1036 </Y> <Y> 1036 </Y>
<State> ShowLuckyDrawTicketState </State>
<Filename> Var( DirImageCampaign + "/luckydraw_detail_container.png" ) </Filename> <Filename> Var( DirImageCampaign + "/luckydraw_detail_container.png" ) </Filename>
</Image> </Image>
<Image> <Image>
<X> prize_x </X> <X> prize_x </X>
<Y> 1046 </Y> <Y> 1046 </Y>
<State> ShowLuckyDrawTicketState </State>
<Filename> Var( "ROOT/taobin_project/image/display_point_campaign" + prizeImg ) </Filename> <Filename> Var( "ROOT/taobin_project/image/display_point_campaign" + prizeImg ) </Filename>
</Image> </Image>
<Text> <Text>
<State> ShowLuckyDrawTicketState </State>
<X> dayDiff_X </X> <X> dayDiff_X </X>
<Y> dayDiff_Y </Y> <Y> dayDiff_Y </Y>
<Width> 40 </Width> <Width> 40 </Width>
@ -1051,6 +1063,7 @@
</Text> </Text>
<Text> <Text>
<State> ShowLuckyDrawTicketState </State>
<X> 620 </X> <X> 620 </X>
<Y> 1076 </Y> <Y> 1076 </Y>
<Width> 164 </Width> <Width> 164 </Width>
@ -1062,6 +1075,26 @@
<Value> StringFmt( luckyDrawTicket , LuckyDrawTicketFormat, PreScaleConvertShow) </Value> <Value> StringFmt( luckyDrawTicket , LuckyDrawTicketFormat, PreScaleConvertShow) </Value>
</Text> </Text>
<Text>
<State> ShowLuckyDrawAlreadyGotRewardState </State>
<X> 334 </X>
<Y> 1057 </Y>
<Font> KanitSemiBoldTTF </Font>
<Width> 390 </Width>
<Size> 24 </Size>
<Color> 0x84776F </Color>
<Align> center-vertical-horizontal </Align>
<Value>
eval(
If show_eng = "true" Then
Var return = "You already got Lucky Draw reward."
Else
Var return = "คุณได้รับรางวัล Lucky Draw ไปแล้ว"
EndIf
)
</Value>
</Text>
<Text> <Text>
<X> 142 </X> <X> 142 </X>

2
xml/page_collect_point_1.xml
View file

@ -777,7 +777,7 @@
;Open "ROOT/taobin_project/xml/page_catalog.xml" ;Open "ROOT/taobin_project/xml/page_catalog.xml"
SAVELOG "collect_point1-p589." SAVELOG "collect_point1-p589."
If CheckMemberPageCampaign = 1 Then If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml" Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"

258
xml/page_collect_point_2.xml
View file

@ -44,6 +44,8 @@
EndIf EndIf
Var GetLuckyDraw = 0
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
@ -111,144 +113,172 @@
Else Else
If Ext1a = "ok" Then If GetLuckyDraw = 1 Then
If Ext1a = "ok" Then
Var TaobinName = Ext1d DEBUGVAR Ext1h
Var TaobinCoupons = Ext1g DEBUGVAR Ext1i
Var TaobinExpire = Ext1f Var luckyDrawTicket = Ext1h
Var TaobinLevel = Ext1e INT luckyDrawTicket
Var TaobinPDPA = Ext1h Var luckyDrawAlredyGotReward = Ext1i
If luckyDrawAlredyGotReward = 1 Then
Var TaobinPromoX = Ext1j Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
Else
DEBUGVAR TaobinPDPA Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
Var PointTaobinTmp = Ext1i
DEBUGVAR PointTaobinTmp
INT PointTaobinTmp
INT TaobinPDPA
If TaobinName = "-" Then
Var Seeker.IsLineMember = 0
Else
Var Seeker.IsLineMember = 1
EndIf
Var TelephoneNumber = TelephoneNumberX
Var TNumberTaobinMemberXXX = TelephoneNumber
;Var PointTaobinTmp = 4
Var PointTaobin = PointTaobinTmp
Var pTaobin = PointTaobin
DEBUGVAR TaobinLevel
If TaobinLevel = "1" Then
Var pTaobin = PayAmount / 20
Else
Var pTaobin = PayAmount / 15
EndIf
If pTaobin > 0 Then
Var pTaobinX = PointTaobin / pTaobin
If pTaobinX >= 2 Then
Var Point2X = 1
EndIf EndIf
EndIf
Var Seeker.PointTaobinStr = ParamCP
Var Seeker.TNumberTaobinMember = TelephoneNumberX
Var CoffeePointRank = Ext1b
INT CoffeePointRank
Var CoffeePoint1 = Ext1c
INT CoffeePoint1
Var CoffeePoint = PointTaobin + CoffeePoint1
Var CoffeePointOld = CoffeePoint1
If TaobinLevel = 1 Then
Var CoffeePointRank = CoffeePointRank + 0
Else Else
Var CoffeePointRank = CoffeePointRank + PointTaobin
Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember = TelephoneNumber
Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
EndIf EndIf
EndIf
Var CoffeePointRankTmp = CoffeePointRank
DEBUGVAR Seeker.PointTaobinStr If GetLuckyDraw = 0 Then
DEBUGVAR Seeker.TNumberTaobinMember If Ext1a = "ok" Then
If TaobinPDPA = 0 Then
;inter-xml-open Var TaobinName = Ext1d
If CountryName = "Malaysia" Then Var TaobinCoupons = Ext1g
Open "ROOT/taobin_project/xml/page_collect_point_3.xml" Var TaobinExpire = Ext1f
Var TaobinLevel = Ext1e
Var TaobinPDPA = Ext1h
Var TaobinPromoX = Ext1j
DEBUGVAR TaobinPDPA
Var PointTaobinTmp = Ext1i
DEBUGVAR PointTaobinTmp
INT PointTaobinTmp
INT TaobinPDPA
If TaobinName = "-" Then
Var Seeker.IsLineMember = 0
Else
Var Seeker.IsLineMember = 1
EndIf EndIf
;inter-xml-open
If CountryName = "Indonesia" Then Var TelephoneNumber = TelephoneNumberX
Open "ROOT/taobin_project/xml/page_collect_point_3.xml" Var TNumberTaobinMemberXXX = TelephoneNumber
;Var PointTaobinTmp = 4
Var PointTaobin = PointTaobinTmp
Var pTaobin = PointTaobin
DEBUGVAR TaobinLevel
If TaobinLevel = "1" Then
Var pTaobin = PayAmount / 20
Else
Var pTaobin = PayAmount / 15
EndIf EndIf
;inter-xml-open If pTaobin > 0 Then
If CountryName = "Australia" Then Var pTaobinX = PointTaobin / pTaobin
If pTaobinX >= 2 Then
Var Point2X = 1
EndIf
EndIf
If NewCollectPointFlag = 1 Then
Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml" Var Seeker.PointTaobinStr = ParamCP
Open pageCollectPoint Var Seeker.TNumberTaobinMember = TelephoneNumberX
Else
Var CoffeePointRank = Ext1b
INT CoffeePointRank
Var CoffeePoint1 = Ext1c
INT CoffeePoint1
Var CoffeePoint = PointTaobin + CoffeePoint1
Var CoffeePointOld = CoffeePoint1
If TaobinLevel = 1 Then
Var CoffeePointRank = CoffeePointRank + 0
Else
Var CoffeePointRank = CoffeePointRank + PointTaobin
EndIf
Var CoffeePointRankTmp = CoffeePointRank
DEBUGVAR Seeker.PointTaobinStr
DEBUGVAR Seeker.TNumberTaobinMember
If TaobinPDPA = 0 Then
;inter-xml-open
If CountryName = "Malaysia" Then
Open "ROOT/taobin_project/xml/page_collect_point_3.xml" Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf EndIf
;inter-xml-open
If CountryName = "Indonesia" Then
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf
;inter-xml-open
If CountryName = "Australia" Then
If NewCollectPointFlag = 1 Then
Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml"
Open pageCollectPoint
Else
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf
EndIf
;inter-xml-open
If CountryName = "Singapore" Then
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf
Open "ROOT/taobin_project/xml/page_show_consent.xml"
EndIf
If PayAmount >= 20 Then
If TaobinPromoX = "p2.no_otp" Then
Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml"
EndIf
If TaobinPromoX = "p2.unused" Then
Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml"
EndIf
EndIf EndIf
;inter-xml-open If NewCollectPoint = 1 Then
If CountryName = "Singapore" Then If LuckyDrawCampaign = 1 Then
Var GetLuckyDraw = 1
GETACCEXT TelephoneNumber 14
Else
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_collect_point_3.xml" Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf EndIf
Open "ROOT/taobin_project/xml/page_show_consent.xml"
EndIf
If PayAmount >= 20 Then
If TaobinPromoX = "p2.no_otp" Then
Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml"
EndIf
If TaobinPromoX = "p2.unused" Then
Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml"
EndIf
EndIf
If NewCollectPoint = 1 Then
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
Else Else
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember = TelephoneNumber
Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
EndIf EndIf
Else
Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember = TelephoneNumber
Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
EndIf EndIf
EndIf EndIf
EndIf EndIf

10
xml/page_collect_point_3_28.xml
View file

@ -683,7 +683,7 @@
Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml" Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
Else Else
If Seeker.IsLineMember = 0 Then If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml" Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@ -694,7 +694,7 @@
EndIf EndIf
Else Else
If Seeker.IsLineMember = 0 Then If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml" Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@ -843,7 +843,7 @@
Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml" Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
Else Else
If Seeker.IsLineMember = 0 Then If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml" Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@ -854,7 +854,7 @@
EndIf EndIf
Else Else
If Seeker.IsLineMember = 0 Then If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml" Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@ -1232,7 +1232,7 @@
</EventUnitTest2> </EventUnitTest2>
<EventUnitTest4> <EventUnitTest4>
If CheckMemberPageCampaign = 1 Then If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml" Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"

1395
xml/page_collect_point_3_28_lucky_draw_campaign.xml Normal file
View file

File diff suppressed because it is too large Load diff

22
xml/page_display_get_15_discount.xml
View file

@ -30,19 +30,19 @@
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If FromCheckMemberPoint = 1 Then If Timeout > 10 Then
If Timeout > 10 Then If FromCheckMemberPoint = 1 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml" Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf Else
Else If Seeker.IsLineMember = 0 Then
If Seeker.IsLineMember = 0 Then If LuckyDrawCampaign = 1 Then
If CheckMemberPageCampaign = 1 Then Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml" Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf EndIf
EndIf EndIf
@ -157,7 +157,7 @@
If FromCheckMemberPoint = 1 Then If FromCheckMemberPoint = 1 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml" Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else Else
If CheckMemberPageCampaign = 1 Then If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml" Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@ -181,7 +181,7 @@
Open "ROOT/taobin_project/xml/page_check_member2.xml" Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else Else
If Seeker.IsLineMember = 0 Then If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml" Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"

4
xml/page_display_get_drink_5_baht.xml
View file

@ -53,7 +53,7 @@
Open "ROOT/taobin_project/xml/page_check_member2.xml" Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else Else
If Seeker.IsLineMember = 0 Then If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml" Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@ -157,7 +157,7 @@
Open "ROOT/taobin_project/xml/page_check_member2.xml" Open "ROOT/taobin_project/xml/page_check_member2.xml"
Else Else
If Seeker.IsLineMember = 0 Then If Seeker.IsLineMember = 0 Then
If CheckMemberPageCampaign = 1 Then If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml" Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"

2
xml/page_payment.xml
View file

@ -145,6 +145,8 @@
Var Seeker.CreditCard = 0 Var Seeker.CreditCard = 0
Var Seeker.CreditCardRef = "" Var Seeker.CreditCardRef = ""
Var Seeker.UseCreditPayFullDrinkPrice = 0
Var Seeker.IntVendingCredit = 0 Var Seeker.IntVendingCredit = 0
Var Seeker.StoreCreditFlag = 0 Var Seeker.StoreCreditFlag = 0

3
xml/page_payment_credit3-0.xml
View file

@ -90,6 +90,8 @@
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/" Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/"
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm
Var Seeker.CreditEnoughRefID = PointCrm
CoinVending OFF CoinVending OFF
Var Seeker.TNumberTaobinCredit = TelephoneNumber Var Seeker.TNumberTaobinCredit = TelephoneNumber
@ -98,6 +100,7 @@
Var Seeker.StoreCreditFlag = 1 Var Seeker.StoreCreditFlag = 1
Var SumCreditAmount = SumCreditAmount - PayAmountSubDiscount Var SumCreditAmount = SumCreditAmount - PayAmountSubDiscount
Var VendingCreditRemain = "" + SumCreditAmount Var VendingCreditRemain = "" + SumCreditAmount
Var Seeker.UseCreditPayFullDrinkPrice = 1
If CART_COUNT >= 1 Then If CART_COUNT >= 1 Then

33
xml/page_payment_credit3-TopupCash.xml
View file

@ -78,8 +78,6 @@
Var ChangeTimeout = 0 Var ChangeTimeout = 0
Var CancelCounter = 0 Var CancelCounter = 0
CoinVending XBILL
Var ServiceAmount2 = CreditAmount Var ServiceAmount2 = CreditAmount
Var ServiceCharge = 0 Var ServiceCharge = 0
@ -95,6 +93,24 @@
Var warning_price_state = "Enable" Var warning_price_state = "Enable"
If CoinAmount > 0 Then
Var SumAmount = CreditAmount + CoinAmount
If SumAmount >= PayAmountSubDiscount Then
Var confirmButtonState = "Enable"
Var alphaState2 = "Invisible"
Var warning_price_state = "Invisible"
Else
Var warning_price_state = "Enable"
EndIf
Var RemainAmountStr !assigned StringFmt( SumAmount, DisplayFormat, PreScaleConvertShow )
Var showRemaining = charOfBaht + RemainAmountStr
EndIf
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
@ -112,7 +128,6 @@
AddData 24 TelephoneNumber BmiYear PointCrm GetScore AddData 24 TelephoneNumber BmiYear PointCrm GetScore
EndIf EndIf
CoinVending OFF
Var CancelFlag = 1 Var CancelFlag = 1
Var CancelCounter = 0 Var CancelCounter = 0
If CoinAmount = 0 Then If CoinAmount = 0 Then
@ -154,6 +169,7 @@
Var TelephoneNumber = Seeker.TNumberTaobinCredit Var TelephoneNumber = Seeker.TNumberTaobinCredit
Var PayO2 = Var Seeker.CoffeePinNumber Var PayO2 = Var Seeker.CoffeePinNumber
Var ServiceAmount2 = CoinAmount
Var VendingDiscount = 0 Var VendingDiscount = 0
Var VendingCampaign = 0 Var VendingCampaign = 0
@ -164,6 +180,8 @@
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Var PayCredit = 1 Var PayCredit = 1
CoinVending OFF
If Seeker = "curr" Then If Seeker = "curr" Then
Open "ROOT/taobin_project/xml/page_catalog.xml" Open "ROOT/taobin_project/xml/page_catalog.xml"
Else Else
@ -212,14 +230,6 @@
EndIf EndIf
TimerReset TimerReset
Refresh Refresh
</EventTimeout> </EventTimeout>
@ -381,7 +391,6 @@
AddData 24 TelephoneNumber BmiYear PointCrm GetScore AddData 24 TelephoneNumber BmiYear PointCrm GetScore
EndIf EndIf
CoinVending OFF
Var CancelCounter = 0 Var CancelCounter = 0
Var CancelFlag = 1 Var CancelFlag = 1
If CoinAmount = 0 Then If CoinAmount = 0 Then

20
xml/page_show_consent.xml
View file

@ -30,7 +30,7 @@
EndIf EndIf
Var consentImg = "/img_popup2.png" Var consentImg = "/img_popup2.png"
If CheckMemberPageCampaign = 1 Then If LuckyDrawCampaign = 1 Then
Var consentImg = "/img_popup3.png" Var consentImg = "/img_popup3.png"
EndIf EndIf
@ -59,7 +59,11 @@
;GETACCEXT TelephoneNumber 14 ;GETACCEXT TelephoneNumber 14
; goto lid straw ; goto lid straw
If NewCollectPoint = 1 Then If NewCollectPoint = 1 Then
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml" If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
Else
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
EndIf
Else Else
Open "ROOT/taobin_project/xml/page_collect_point_3.xml" Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf EndIf
@ -130,7 +134,11 @@
If UnitTestType = "1" Then If UnitTestType = "1" Then
Var CoffeePoint = 10 Var CoffeePoint = 10
If NewCollectPoint = 1 Then If NewCollectPoint = 1 Then
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml" If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
Else
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
EndIf
Else Else
Open "ROOT/taobin_project/xml/page_collect_point_3.xml" Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf EndIf
@ -142,7 +150,11 @@
;GETACCEXT TelephoneNumber 14 ;GETACCEXT TelephoneNumber 14
; goto lid straw ; goto lid straw
If NewCollectPoint = 1 Then If NewCollectPoint = 1 Then
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml" If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
Else
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
EndIf
Else Else
Open "ROOT/taobin_project/xml/page_collect_point_3.xml" Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf EndIf

57
xml/page_thankyou.xml
View file

@ -22,6 +22,8 @@
Var GotoStoreCredit0 = 0 Var GotoStoreCredit0 = 0
Var StoreCreditAmount = 0 Var StoreCreditAmount = 0
Var DetectCoinAmount = 0
Var buttonRemoveCup = "Invisible" Var buttonRemoveCup = "Invisible"
Var MachineState_Result = 0 Var MachineState_Result = 0
@ -215,24 +217,33 @@
EndIf EndIf
Else Else
DEBUGVAR Seeker.UseCreditPayFullDrinkPrice
If Seeker.IntVendingCampaign < PayAmount Then If Seeker.UseCreditPayFullDrinkPrice = 1 Then
Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign If CoinAmount > 0 Then
Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit Var StoreCreditAmount = CoinAmount
Var DetectCoinAmount = 1
EndIf
Else
If Seeker.IntVendingCampaign < PayAmount Then
Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign
Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit
If SumCoinAmount >= PayAmount Then If SumCoinAmount >= PayAmount Then
Var Canout = SumCoinAmount - PayAmount Var Canout = SumCoinAmount - PayAmount
If Canout > 0 Then If Canout > 0 Then
;Change Canout ;Change Canout
;Var ChangeFlag2 = 1 ;Var ChangeFlag2 = 1
Var GotoStoreCredit0 = 1 Var GotoStoreCredit0 = 1
Var StoreCreditAmount = Canout Var StoreCreditAmount = Canout
EndIf
EndIf EndIf
EndIf EndIf
EndIf EndIf
EndIf EndIf
@ -409,16 +420,32 @@
DEBUGVAR Seeker.CurrCreditAmount DEBUGVAR Seeker.CurrCreditAmount
DEBUGVAR Seeker.CreditNotEnoughRefID DEBUGVAR Seeker.CreditNotEnoughRefID
DEBUGVAR Seeker.CreditEnoughRefID
If Seeker.CreditNotEnoughRefID = "" Then If Seeker.CreditNotEnoughRefID = "" Then
Var CurrAmount = Seeker.CurrCreditAmount Var CurrAmount = Seeker.CurrCreditAmount
If CoinAmount > 0 Then
Var CurrAmount = CurrAmount + CoinAmount
EndIf
Var CurrTelePhoneNum = Seeker.CurrCreditTelNum Var CurrTelePhoneNum = Seeker.CurrCreditTelNum
Var CurrPinNum = Seeker.CurrCreditPinNum Var CurrPinNum = Seeker.CurrCreditPinNum
Var RefID = ""
AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID If DetectCoinAmount = 1 Then
Var ServiceAmountSupCampain = Seeker.ServiceAmount2 - Seeker.IntVendingCampaign
If CurrAmount >= ServiceAmountSupCampain Then
Var creditToTopup = CurrAmount - ServiceAmountSupCampain
Var RefID = "0/" + Seeker.CreditEnoughRefID
Var Seeker.CreditReferenceTmp = RefID
AddData 41 CurrTelePhoneNum creditToTopup CurrPinNum RefID
Else
Var RefID = ""
AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
EndIf
Else
Var RefID = ""
AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
EndIf
Else Else
Var ServiceAmountSupCampain = Seeker.ServiceAmount2 - Seeker.IntVendingCampaign Var ServiceAmountSupCampain = Seeker.ServiceAmount2 - Seeker.IntVendingCampaign