diff --git a/image/collectiing/text_show_error.png b/image/collectiing/text_show_error.png new file mode 100644 index 00000000..35b452bf Binary files /dev/null and b/image/collectiing/text_show_error.png differ diff --git a/image/display_point2/ad_main.png b/image/display_point2/ad_main.png new file mode 100644 index 00000000..6dd8b651 Binary files /dev/null and b/image/display_point2/ad_main.png differ diff --git a/image/display_point2/bn_10free1.png b/image/display_point2/bn_10free1.png new file mode 100644 index 00000000..b6ea7cec Binary files /dev/null and b/image/display_point2/bn_10free1.png differ diff --git a/image/display_point2/bn_back.png b/image/display_point2/bn_back.png new file mode 100644 index 00000000..3bdb71a7 Binary files /dev/null and b/image/display_point2/bn_back.png differ diff --git a/image/display_point2/bp_10free1.png b/image/display_point2/bp_10free1.png new file mode 100644 index 00000000..e1c5e5e6 Binary files /dev/null and b/image/display_point2/bp_10free1.png differ diff --git a/image/display_point2/bp_back.png b/image/display_point2/bp_back.png new file mode 100644 index 00000000..3f62a278 Binary files /dev/null and b/image/display_point2/bp_back.png differ diff --git a/image/display_point2/text1.png b/image/display_point2/text1.png new file mode 100644 index 00000000..0f130173 Binary files /dev/null and b/image/display_point2/text1.png differ diff --git a/image/display_point2/text2.png b/image/display_point2/text2.png new file mode 100644 index 00000000..7a2b22cd Binary files /dev/null and b/image/display_point2/text2.png differ diff --git a/image/display_point2/text3.png b/image/display_point2/text3.png new file mode 100644 index 00000000..d70d71c5 Binary files /dev/null and b/image/display_point2/text3.png differ diff --git a/image/display_point2/text_num1.png b/image/display_point2/text_num1.png new file mode 100644 index 00000000..5f2e8cec Binary files /dev/null and b/image/display_point2/text_num1.png differ diff --git a/xml/menu_head.py b/xml/menu_head.py index 7f834ce9..ac73237a 100644 --- a/xml/menu_head.py +++ b/xml/menu_head.py @@ -1,5 +1,5 @@ - RoadShow = True + RoadShow = False default_dir = 'ROOT/taobin_project/image/page_drink/' default_dir2 = 'ROOT/taobin_project/image/page_drink_select/' diff --git a/xml/page_board.xml b/xml/page_board.xml index 2b0ca115..1ef0be17 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -30,7 +30,7 @@ Var countClick = 0 - Var RoadShow = "true" + Var RoadShow = "false" Var IgnorePoint = "true" Var CountDownShowButton = 30 diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml index 910eb5cf..d43a8b75 100644 --- a/xml/page_catalog_choose_drink1.xml +++ b/xml/page_catalog_choose_drink1.xml @@ -388,15 +388,24 @@ - 208 + 226 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0006.Price + 208 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 268 @@ -417,15 +426,24 @@ $11-99-02-0006.description - 465 + 483 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0001.Price + 465 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 268 @@ -446,15 +464,24 @@ $11-99-02-0001.description - 722 + 740 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0003.Price + 722 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 268 @@ -475,15 +502,24 @@ $11-99-02-0003.description - 979 + 997 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0007.Price + 979 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 268 @@ -504,15 +540,24 @@ $11-99-02-0007.description - 208 + 226 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0002.Price + 208 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 596 @@ -533,15 +578,24 @@ $11-99-02-0002.description - 465 + 483 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0004.Price + 465 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 596 @@ -562,15 +616,24 @@ $11-99-01-0004.description - 722 + 740 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0020.Price + 722 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 596 @@ -591,15 +654,24 @@ $11-99-02-0020.description - 979 + 997 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0017.Price + 979 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 596 @@ -620,15 +692,24 @@ $11-99-02-0017.description - 208 + 226 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0017.Price + 208 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 924 @@ -649,15 +730,24 @@ $11-99-01-0017.description - 465 + 483 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0018.Price + 465 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 924 diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml index 99077027..f9ad4a38 100644 --- a/xml/page_catalog_choose_drink2.xml +++ b/xml/page_catalog_choose_drink2.xml @@ -478,15 +478,24 @@ - 208 + 226 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0010.Price + 208 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 268 @@ -507,15 +516,24 @@ $11-99-01-0010.description - 465 + 483 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0001.Price + 465 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 268 @@ -536,15 +554,24 @@ $11-99-01-0001.description - 722 + 740 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0002.Price + 722 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 268 @@ -565,15 +592,24 @@ $11-99-01-0002.description - 979 + 997 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0004.Price + 979 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 268 @@ -594,15 +630,24 @@ $11-99-01-0004.description - 208 + 226 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0007.Price + 208 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 596 @@ -623,15 +668,24 @@ $11-99-01-0007.description - 465 + 483 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0017.Price + 465 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 596 @@ -652,15 +706,24 @@ $11-99-01-0017.description - 722 + 740 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0003.Price + 722 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 596 @@ -681,15 +744,24 @@ $11-99-01-0003.description - 979 + 997 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0006.Price + 979 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 596 @@ -710,15 +782,24 @@ $11-99-02-0006.description - 208 + 226 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0024.Price + 208 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 924 @@ -739,15 +820,24 @@ $11-99-02-0024.description - 465 + 483 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0001.Price + 465 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 924 @@ -768,15 +858,24 @@ $11-99-02-0001.description - 722 + 740 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0003.Price + 722 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 924 @@ -797,15 +896,24 @@ $11-99-02-0003.description - 979 + 997 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0007.Price + 979 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 924 @@ -826,15 +934,24 @@ $11-99-02-0007.description - 208 + 226 1050 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0030.Price + 208 + 1050 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 1252 @@ -855,15 +972,24 @@ $11-99-02-0030.description - 465 + 483 1050 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0002.Price + 465 + 1050 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 1252 diff --git a/xml/page_catalog_choose_drink2_ext.xml b/xml/page_catalog_choose_drink2_ext.xml index 57f604b0..c11b15b8 100644 --- a/xml/page_catalog_choose_drink2_ext.xml +++ b/xml/page_catalog_choose_drink2_ext.xml @@ -571,15 +571,24 @@ - 208 + 226 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0010.Price + 208 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 268 @@ -600,15 +609,24 @@ $11-99-01-0010.description - 465 + 483 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0001.Price + 465 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 268 @@ -629,15 +647,24 @@ $11-99-01-0001.description - 722 + 740 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0002.Price + 722 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 268 @@ -658,15 +685,24 @@ $11-99-01-0002.description - 979 + 997 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0004.Price + 979 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 268 @@ -687,15 +723,24 @@ $11-99-01-0004.description - 208 + 226 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0007.Price + 208 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 596 @@ -716,15 +761,24 @@ $11-99-01-0007.description - 465 + 483 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0017.Price + 465 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 596 @@ -745,15 +799,24 @@ $11-99-01-0017.description - 722 + 740 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0003.Price + 722 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 596 @@ -774,15 +837,24 @@ $11-99-01-0003.description - 979 + 997 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0006.Price + 979 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 596 @@ -803,15 +875,24 @@ $11-99-02-0006.description - 208 + 226 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0024.Price + 208 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 924 @@ -832,15 +913,24 @@ $11-99-02-0024.description - 465 + 483 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0001.Price + 465 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 924 @@ -861,15 +951,24 @@ $11-99-02-0001.description - 722 + 740 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0003.Price + 722 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 924 @@ -890,15 +989,24 @@ $11-99-02-0003.description - 979 + 997 722 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0006.Price + 979 + 722 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 924 @@ -919,15 +1027,24 @@ $11-99-02-0006.description - 208 + 226 1050 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0024.Price + 208 + 1050 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 1252 @@ -948,15 +1065,24 @@ $11-99-02-0024.description - 465 + 483 1050 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0001.Price + 465 + 1050 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 1252 @@ -977,15 +1103,24 @@ $11-99-02-0001.description - 722 + 740 1050 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0003.Price + 722 + 1050 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 1252 @@ -1006,15 +1141,24 @@ $11-99-02-0003.description - 979 + 997 1050 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0007.Price + 979 + 1050 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 1252 @@ -1035,15 +1179,24 @@ $11-99-02-0007.description - 208 + 226 1378 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0030.Price + 208 + 1378 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 1580 @@ -1064,15 +1217,24 @@ $11-99-02-0030.description - 465 + 483 1378 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0002.Price + 465 + 1378 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 1580 diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml index ce7b2160..84f52cb8 100644 --- a/xml/page_catalog_choose_drink3.xml +++ b/xml/page_catalog_choose_drink3.xml @@ -296,15 +296,24 @@ - 208 + 226 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0014.Price + 208 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 268 @@ -325,15 +334,24 @@ $11-99-01-0014.description - 465 + 483 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0012.Price + 465 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 268 @@ -354,15 +372,24 @@ $11-99-01-0012.description - 722 + 740 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0011.Price + 722 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 268 @@ -383,15 +410,24 @@ $11-99-01-0011.description - 979 + 997 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0004.Price + 979 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 268 @@ -412,15 +448,24 @@ $11-99-02-0004.description - 208 + 226 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0014.Price + 208 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 596 @@ -441,15 +486,24 @@ $11-99-02-0014.description - 465 + 483 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0010.Price + 465 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 596 diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml index 7c157195..e1b251e2 100644 --- a/xml/page_catalog_choose_drink4.xml +++ b/xml/page_catalog_choose_drink4.xml @@ -252,15 +252,24 @@ - 208 + 226 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0006.Price + 208 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 268 @@ -281,15 +290,24 @@ $11-99-01-0006.description - 465 + 483 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0017.Price + 465 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 268 @@ -310,15 +328,24 @@ $11-99-01-0017.description - 722 + 740 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0005.Price + 722 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 268 @@ -339,15 +366,24 @@ $11-99-02-0005.description - 979 + 997 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0031.Price + 979 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 268 diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml index 086a1b89..bab48eb0 100644 --- a/xml/page_catalog_choose_drink5.xml +++ b/xml/page_catalog_choose_drink5.xml @@ -344,15 +344,24 @@ - 208 + 226 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-01-0009.Price + 208 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 268 @@ -373,15 +382,24 @@ $11-99-01-0009.description - 465 + 483 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0016.Price + 465 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 268 @@ -402,15 +420,24 @@ $11-99-02-0016.description - 722 + 740 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0017.Price + 722 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 268 @@ -431,15 +458,24 @@ $11-99-02-0017.description - 979 + 997 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0020.Price + 979 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 268 @@ -460,15 +496,24 @@ $11-99-02-0020.description - 208 + 226 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0021.Price + 208 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 596 @@ -489,15 +534,24 @@ $11-99-02-0021.description - 465 + 483 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0023.Price + 465 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 596 @@ -518,15 +572,24 @@ $11-99-02-0023.description - 722 + 740 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0022.Price + 722 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 596 @@ -547,15 +610,24 @@ $11-99-02-0022.description - 979 + 997 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0011.Price + 979 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 596 diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml index 38f62c68..15dabea3 100644 --- a/xml/page_catalog_choose_drink6.xml +++ b/xml/page_catalog_choose_drink6.xml @@ -298,15 +298,24 @@ - 208 + 226 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0018.Price + 208 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 268 @@ -327,16 +336,25 @@ $11-99-02-0018.description + 483 + 66 + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-99-02-0018.Price + + 465 66 - 200 + 20 27 KanitTTF 0xB78F24 - "Free!" + "฿"" - 317 268 26 @@ -356,15 +374,24 @@ $11-99-02-0018.description - 722 + 740 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0025.Price + 722 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 574 268 @@ -385,15 +412,24 @@ $11-99-02-0025.description - 979 + 997 66 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0032.Price + 979 + 66 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 831 268 @@ -414,15 +450,24 @@ $11-99-02-0032.description - 208 + 226 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0026.Price + 208 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 60 596 @@ -443,15 +488,24 @@ $11-99-02-0026.description - 465 + 483 394 - 200 + "Hurr" + 150 27 KanitTTF 0xB78F24 - "Free!" + $11-99-02-0009.Price + 465 + 394 + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + 317 596 diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 24198419..8447a95d 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -38,7 +38,7 @@ Var ShowCountDownBrewing = CountDownBrewing - Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + ;Open "ROOT/taobin_project/xml/page_collect_point_3.xml" Var Timeout = Timeout + 1 If Timeout > 10 Then @@ -102,17 +102,17 @@ - +; diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 61f1c470..178c74cd 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -22,6 +22,7 @@ CoinVending OFF Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" @@ -40,23 +41,47 @@ - If VendingREFID = "" Then - SAVELOG "menu_page4-Code.xml > ActOK_REFID" - Refresh - Else - SAVELOG "menu_page4-Code.xml > ActOK_make" - ;Var VendingQRCode = "ERROR" - ;Coin STANDBY - VendingQR OFF + + + If CodeChannel = 1 Then + + SPLIT ECommerce "/" 5 VendingCode + SPLIT ECommerce "/" 7 VendingCampaignRI3 + SPLIT ECommerce "/" 8 VendingCampaign1 + + Var IntVendingCampaign = VendingCampaignRI3 + INT IntVendingCampaign + + Var VendingREFID = SessionID + + If IntVendingCampaign > 0 Then + ;Var QRChannel = 0 + ;Open "ROOT/xml/menu_Page4-WithCode.xml" + Else + + If VendingCode = "C13" Then + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf + + + Var ShowErrorText = "Enable" + + EndIf - ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" - ;MakeDrinkV1 SelectDrink SelectSugarID - ;Var PayWithQR = 1 - ;Open "/media/bt/xml/page_page4-1.xml" - + EndIf + + + If CodeChannel = 1 Then + Var ShowErrorText = "Enable" + + EndIf + + + + + + + + + 420 + 638 + 56 + KanitBoldTTF + 0x513C2F + TelephoneNumber + Telnum + + + + + 323 + 865 + 434 + Center + 64 + KanitSemiBoldTTF + 0xDE794E + CoffeePoint + + +; + + 751 + 413 + "ROOT/taobin_project/image/page_doing/img2.png" + +; + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + + + + + \ No newline at end of file