From e57536a647d49a581ec2de82c69e6f90c230c8ac Mon Sep 17 00:00:00 2001 From: kong Date: Wed, 18 Jan 2023 23:33:53 +0700 Subject: [PATCH 1/3] do inter .lxml --- animation01/play_list.tsv | 2 +- image/sync_1.file | 404 ++- image/topping_inter/bd_sugar_6lvl.png | Bin 0 -> 1393 bytes image/topping_inter/bn_sugar_4step.png | Bin 0 -> 1776 bytes image/topping_inter/bn_sugar_6lvl.png | Bin 0 -> 1691 bytes image/topping_inter/bp_sugar_4step.png | Bin 0 -> 1128 bytes image/topping_inter/bp_sugar_6lvl.png | Bin 0 -> 1082 bytes xml/menu_new_layout_gen_v2.py | 8 +- xml/page_catalog.lxml | 23 +- xml/page_catalog_group_appfast.lxml | 40 +- xml/page_catalog_group_appfast.xml | 3 + xml/page_catalog_group_cocktail.lxml | 112 +- xml/page_catalog_group_cocktail.xml | 3 + xml/page_catalog_group_coffee.lxml | 360 +-- xml/page_catalog_group_coffee.xml | 3 + xml/page_catalog_group_forkid.lxml | 112 +- xml/page_catalog_group_forkid.xml | 3 + xml/page_catalog_group_health.lxml | 136 +- xml/page_catalog_group_milk.lxml | 120 +- xml/page_catalog_group_milk.xml | 3 + xml/page_catalog_group_other.lxml | 280 +- xml/page_catalog_group_other.xml | 2 + xml/page_catalog_group_recommend.lxml | 304 +- xml/page_catalog_group_tea.lxml | 216 +- xml/page_catalog_group_tea.xml | 5 + xml/page_catalog_group_whey.lxml | 120 +- xml/page_catalog_group_whey.xml | 3 + xml/page_topping_select6.lxml | 3504 ++++++++++++++++++++++++ 28 files changed, 4848 insertions(+), 918 deletions(-) create mode 100644 image/topping_inter/bd_sugar_6lvl.png create mode 100644 image/topping_inter/bn_sugar_4step.png create mode 100644 image/topping_inter/bn_sugar_6lvl.png create mode 100644 image/topping_inter/bp_sugar_4step.png create mode 100644 image/topping_inter/bp_sugar_6lvl.png create mode 100644 xml/page_topping_select6.lxml diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index 7b036b52..b194f11f 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -327,7 +327,7 @@ nUll 12-02-03-0037 24 1 1 32 โฮจิฉะลาเต้เย็น 12-02-02-1037 1 6 55 16 23 24 1 1 32 คาปูชิโน่เย็น 12-01-02-1099 1 2 3 4 5 6 7 23 24 1 1 32 คาปูชิโน่ร้อน 12-01-01-1099 1 2 3 4 5 6 7 24 1 1 32 - +ICED LIMENADE 12-05-02-1001 1 16 12 23 24 100 1:40 32 diff --git a/image/sync_1.file b/image/sync_1.file index c62d6e4c..1be31760 100644 --- a/image/sync_1.file +++ b/image/sync_1.file @@ -1,3 +1,402 @@ +./collectiing/: +total 4712 +-rw-rw---- 1 root sdcard_rw 30424 2022-06-13 18:43 Businessman_sorry.png +-rw-rw---- 1 root sdcard_rw 20712 2022-06-13 18:43 Businessman_sorry2.png +-rw-rw---- 1 root sdcard_rw 943 2022-06-13 18:43 Exit.png +-rw-rw---- 1 root sdcard_rw 2241 2022-06-13 18:43 Group.png +-rw-rw---- 1 root sdcard_rw 9686 2022-06-13 18:43 PinFailed.png +-rw-rw---- 1 root sdcard_rw 12786 2022-06-13 18:43 PinSuccess.png +-rw-rw---- 1 root sdcard_rw 5230 2022-06-13 18:43 ad_main.png +-rw-rw---- 1 root sdcard_rw 9970 2022-06-13 18:43 alpha.png +-rw-rw---- 1 root sdcard_rw 2773 2022-06-13 18:43 bd_confirm.png +-rw-rw---- 1 root sdcard_rw 5109 2022-10-10 14:46 bd_pay_with_ccard1.png +-rw-rw---- 1 root sdcard_rw 4160 2022-06-13 18:43 bd_pay_with_codeAIS.png +-rw-rw---- 1 root sdcard_rw 4623 2022-06-13 18:43 bd_pay_with_codeDtac.png +-rw-rw---- 1 root sdcard_rw 3795 2022-09-28 14:21 bd_pay_with_codeKBANK.png +-rw-rw---- 1 root sdcard_rw 2835 2022-08-25 13:33 bd_pay_with_codeLH.png +-rw-rw---- 1 root sdcard_rw 3357 2022-06-13 18:43 bd_pay_with_codeLotus.png +-rw-rw---- 1 root sdcard_rw 3608 2022-10-10 14:46 bd_pay_with_codeMCard.png +-rw-rw---- 1 root sdcard_rw 4352 2022-11-10 15:49 bd_pay_with_codeRabbit.png +-rw-rw---- 1 root sdcard_rw 3205 2022-07-13 09:44 bd_pay_with_codeSCG.png +-rw-rw---- 1 root sdcard_rw 2938 2022-06-13 18:43 bd_pay_with_codeThe1.png +-rw-rw---- 1 root sdcard_rw 4617 2023-01-10 09:22 bd_pay_with_codeTrue.png +-rw-rw---- 1 root sdcard_rw 6351 2022-08-25 13:33 bd_pay_with_dolfin.png +-rw-rw---- 1 root sdcard_rw 3517 2022-11-01 17:33 bd_pay_with_linepay.png +-rw-rw---- 1 root sdcard_rw 3869 2022-10-27 14:14 bd_pay_with_shoppy.png +-rw-rw---- 1 root sdcard_rw 5129 2022-10-27 14:14 bd_pay_with_true.png +-rw-rw---- 1 root sdcard_rw 3502 2022-06-13 18:43 bn_0.png +-rw-rw---- 1 root sdcard_rw 2435 2022-06-13 18:43 bn_1.png +-rw-rw---- 1 root sdcard_rw 3072 2022-06-13 18:43 bn_2.png +-rw-rw---- 1 root sdcard_rw 3223 2022-06-13 18:43 bn_3.png +-rw-rw---- 1 root sdcard_rw 2793 2022-06-13 18:43 bn_4.png +-rw-rw---- 1 root sdcard_rw 3028 2022-06-13 18:43 bn_5.png +-rw-rw---- 1 root sdcard_rw 3312 2022-06-13 18:43 bn_6.png +-rw-rw---- 1 root sdcard_rw 2763 2022-06-13 18:43 bn_7.png +-rw-rw---- 1 root sdcard_rw 3630 2022-06-13 18:43 bn_8.png +-rw-rw---- 1 root sdcard_rw 3426 2022-06-13 18:43 bn_9.png +-rw-rw---- 1 root sdcard_rw 3001 2022-06-13 18:43 bn_back-1.png +-rw-rw---- 1 root sdcard_rw 3486 2022-06-13 18:43 bn_back.png +-rw-rw---- 1 root sdcard_rw 3791 2022-06-13 18:43 bn_back2.png +-rw-rw---- 1 root sdcard_rw 3121 2022-06-13 18:43 bn_back3.png +-rw-rw---- 1 root sdcard_rw 3589 2022-06-13 18:43 bn_cancel.png +-rw-rw---- 1 root sdcard_rw 2983 2022-06-13 18:43 bn_cancel2.png +-rw-rw---- 1 root sdcard_rw 2878 2022-06-13 18:43 bn_cancel3.png +-rw-rw---- 1 root sdcard_rw 4540 2022-06-13 18:43 bn_catalog.png +-rw-rw---- 1 root sdcard_rw 2497 2022-06-13 18:43 bn_close.png +-rw-rw---- 1 root sdcard_rw 3126 2022-06-13 18:43 bn_confirm.png +-rw-rw---- 1 root sdcard_rw 3759 2022-06-13 18:43 bn_confirm2.png +-rw-rw---- 1 root sdcard_rw 3019 2022-06-13 18:43 bn_continue.png +-rw-rw---- 1 root sdcard_rw 10422 2022-06-13 18:43 bn_door_open.png +-rw-rw---- 1 root sdcard_rw 6733 2022-06-13 18:43 bn_door_open2.png +-rw-rw---- 1 root sdcard_rw 4512 2022-06-13 18:43 bn_getPin.png +-rw-rw---- 1 root sdcard_rw 4046 2022-06-13 18:43 bn_getSMSPage.png +-rw-rw---- 1 root sdcard_rw 3131 2022-06-13 18:43 bn_ignore.png +-rw-rw---- 1 root sdcard_rw 7485 2022-10-10 14:46 bn_pay_with_ccard1.png +-rw-rw---- 1 root sdcard_rw 6518 2022-06-13 18:43 bn_pay_with_codeAIS.png +-rw-rw---- 1 root sdcard_rw 7318 2022-06-13 18:43 bn_pay_with_codeDtac.png +-rw-rw---- 1 root sdcard_rw 6480 2022-08-02 21:24 bn_pay_with_codeGLX.png +-rw-rw---- 1 root sdcard_rw 7583 2022-09-28 14:21 bn_pay_with_codeKBANK.png +-rw-rw---- 1 root sdcard_rw 3790 2022-08-25 13:33 bn_pay_with_codeLH.png +-rw-rw---- 1 root sdcard_rw 7124 2022-06-13 18:43 bn_pay_with_codeLotus.png +-rw-rw---- 1 root sdcard_rw 48016 2022-10-10 14:46 bn_pay_with_codeMCard.png +-rw-rw---- 1 root sdcard_rw 5856 2022-11-10 15:49 bn_pay_with_codeRabbit.png +-rw-rw---- 1 root sdcard_rw 4636 2022-07-13 09:44 bn_pay_with_codeSCG.png +-rw-rw---- 1 root sdcard_rw 5332 2022-06-13 18:43 bn_pay_with_codeThe1.png +-rw-rw---- 1 root sdcard_rw 6423 2023-01-10 09:22 bn_pay_with_codeTrue.png +-rw-rw---- 1 root sdcard_rw 5277 2022-06-13 18:43 bn_pay_with_codeXXX.png +-rw-rw---- 1 root sdcard_rw 15094 2022-08-25 13:33 bn_pay_with_dolfin.png +-rw-rw---- 1 root sdcard_rw 4868 2022-11-01 17:33 bn_pay_with_linepay.png +-rw-rw---- 1 root sdcard_rw 11637 2022-08-25 13:33 bn_pay_with_shoppy.png +-rw-rw---- 1 root sdcard_rw 18342 2022-08-25 13:33 bn_pay_with_true.png +-rw-rw---- 1 root sdcard_rw 6901 2022-06-13 18:43 bn_recieve_coupon.png +-rw-rw---- 1 root sdcard_rw 3072 2022-06-13 18:43 bn_sh.png +-rw-rw---- 1 root sdcard_rw 4522 2022-06-13 18:43 bn_tryAgainPin.png +-rw-rw---- 1 root sdcard_rw 3574 2022-06-13 18:43 bn_useCredit.png +-rw-rw---- 1 root sdcard_rw 2805 2022-06-13 18:43 bns_0.png +-rw-rw---- 1 root sdcard_rw 1955 2022-06-13 18:43 bns_1.png +-rw-rw---- 1 root sdcard_rw 2486 2022-06-13 18:43 bns_2.png +-rw-rw---- 1 root sdcard_rw 2650 2022-06-13 18:43 bns_3.png +-rw-rw---- 1 root sdcard_rw 2336 2022-06-13 18:43 bns_4.png +-rw-rw---- 1 root sdcard_rw 2487 2022-06-13 18:43 bns_5.png +-rw-rw---- 1 root sdcard_rw 2779 2022-06-13 18:43 bns_6.png +-rw-rw---- 1 root sdcard_rw 2244 2022-06-13 18:43 bns_7.png +-rw-rw---- 1 root sdcard_rw 2964 2022-06-13 18:43 bns_8.png +-rw-rw---- 1 root sdcard_rw 2742 2022-06-13 18:43 bns_9.png +-rw-rw---- 1 root sdcard_rw 2437 2022-06-13 18:43 bns_back-1.png +-rw-rw---- 1 root sdcard_rw 3198 2022-06-13 18:43 bp_0.png +-rw-rw---- 1 root sdcard_rw 2316 2022-06-13 18:43 bp_1.png +-rw-rw---- 1 root sdcard_rw 2907 2022-06-13 18:43 bp_2.png +-rw-rw---- 1 root sdcard_rw 3064 2022-06-13 18:43 bp_3.png +-rw-rw---- 1 root sdcard_rw 2604 2022-06-13 18:43 bp_4.png +-rw-rw---- 1 root sdcard_rw 2884 2022-06-13 18:43 bp_5.png +-rw-rw---- 1 root sdcard_rw 3187 2022-06-13 18:43 bp_6.png +-rw-rw---- 1 root sdcard_rw 2573 2022-06-13 18:43 bp_7.png +-rw-rw---- 1 root sdcard_rw 3390 2022-06-13 18:43 bp_8.png +-rw-rw---- 1 root sdcard_rw 3227 2022-06-13 18:43 bp_9.png +-rw-rw---- 1 root sdcard_rw 2835 2022-06-13 18:43 bp_back-1.png +-rw-rw---- 1 root sdcard_rw 3427 2022-06-13 18:43 bp_back.png +-rw-rw---- 1 root sdcard_rw 3813 2022-06-13 18:43 bp_back2.png +-rw-rw---- 1 root sdcard_rw 3239 2022-06-13 18:43 bp_back3.png +-rw-rw---- 1 root sdcard_rw 3433 2022-06-13 18:43 bp_cancel.png +-rw-rw---- 1 root sdcard_rw 2939 2022-06-13 18:43 bp_cancel2.png +-rw-rw---- 1 root sdcard_rw 2807 2022-06-13 18:43 bp_cancel3.png +-rw-rw---- 1 root sdcard_rw 4293 2022-06-13 18:43 bp_catalog.png +-rw-rw---- 1 root sdcard_rw 2377 2022-06-13 18:43 bp_close.png +-rw-rw---- 1 root sdcard_rw 2994 2022-06-13 18:43 bp_confirm.png +-rw-rw---- 1 root sdcard_rw 3694 2022-06-13 18:43 bp_confirm2.png +-rw-rw---- 1 root sdcard_rw 2923 2022-06-13 18:43 bp_continue.png +-rw-rw---- 1 root sdcard_rw 9983 2022-06-13 18:43 bp_door_open.png +-rw-rw---- 1 root sdcard_rw 6807 2022-06-13 18:43 bp_door_open2.png +-rw-rw---- 1 root sdcard_rw 4493 2022-06-13 18:43 bp_getPin.png +-rw-rw---- 1 root sdcard_rw 4201 2022-06-13 18:43 bp_getSMSPage.png +-rw-rw---- 1 root sdcard_rw 2495 2022-06-13 18:43 bp_ignore.png +-rw-rw---- 1 root sdcard_rw 7925 2022-10-10 14:46 bp_pay_with_ccard1.png +-rw-rw---- 1 root sdcard_rw 5265 2022-06-13 18:43 bp_pay_with_codeAIS.png +-rw-rw---- 1 root sdcard_rw 6220 2022-06-13 18:43 bp_pay_with_codeDtac.png +-rw-rw---- 1 root sdcard_rw 5026 2022-09-28 14:21 bp_pay_with_codeKBANK.png +-rw-rw---- 1 root sdcard_rw 3519 2022-08-25 13:33 bp_pay_with_codeLH.png +-rw-rw---- 1 root sdcard_rw 3940 2022-06-13 18:43 bp_pay_with_codeLotus.png +-rw-rw---- 1 root sdcard_rw 4362 2022-10-10 14:46 bp_pay_with_codeMCard.png +-rw-rw---- 1 root sdcard_rw 5784 2022-11-10 15:49 bp_pay_with_codeRabbit.png +-rw-rw---- 1 root sdcard_rw 4044 2022-07-13 09:44 bp_pay_with_codeSCG.png +-rw-rw---- 1 root sdcard_rw 2966 2022-06-13 18:43 bp_pay_with_codeThe1.png +-rw-rw---- 1 root sdcard_rw 5619 2023-01-10 09:22 bp_pay_with_codeTrue.png +-rw-rw---- 1 root sdcard_rw 9369 2022-08-25 13:33 bp_pay_with_dolfin.png +-rw-rw---- 1 root sdcard_rw 4747 2022-11-01 17:33 bp_pay_with_linepay.png +-rw-rw---- 1 root sdcard_rw 5003 2022-08-25 13:33 bp_pay_with_shoppy.png +-rw-rw---- 1 root sdcard_rw 6702 2022-08-25 13:33 bp_pay_with_true.png +-rw-rw---- 1 root sdcard_rw 6923 2022-06-13 18:43 bp_recieve_coupon.png +-rw-rw---- 1 root sdcard_rw 2989 2022-06-13 18:43 bp_sh.png +-rw-rw---- 1 root sdcard_rw 4346 2022-06-13 18:43 bp_tryAgainPin.png +-rw-rw---- 1 root sdcard_rw 2911 2022-06-13 18:43 bp_useCredit.png +-rw-rw---- 1 root sdcard_rw 2650 2022-06-13 18:43 bps_0.png +-rw-rw---- 1 root sdcard_rw 1914 2022-06-13 18:43 bps_1.png +-rw-rw---- 1 root sdcard_rw 2399 2022-06-13 18:43 bps_2.png +-rw-rw---- 1 root sdcard_rw 2503 2022-06-13 18:43 bps_3.png +-rw-rw---- 1 root sdcard_rw 2245 2022-06-13 18:43 bps_4.png +-rw-rw---- 1 root sdcard_rw 2413 2022-06-13 18:43 bps_5.png +-rw-rw---- 1 root sdcard_rw 2708 2022-06-13 18:43 bps_6.png +-rw-rw---- 1 root sdcard_rw 2186 2022-06-13 18:43 bps_7.png +-rw-rw---- 1 root sdcard_rw 2727 2022-06-13 18:43 bps_8.png +-rw-rw---- 1 root sdcard_rw 2629 2022-06-13 18:43 bps_9.png +-rw-rw---- 1 root sdcard_rw 2317 2022-06-13 18:43 bps_back-1.png +drwxrwx--x 2 root sdcard_rw 4096 2021-03-18 15:09 collectiing +-rw-rw---- 1 root sdcard_rw 5688 2022-06-13 18:43 img2.png +-rw-rw---- 1 root sdcard_rw 2895 2022-06-13 18:43 img3.png +-rw-rw---- 1 root sdcard_rw 6879 2022-06-13 18:43 img4.png +-rw-rw---- 1 root sdcard_rw 2784 2022-06-13 18:43 img5.png +-rw-rw---- 1 root sdcard_rw 35564 2022-06-13 18:43 imgDrinkFailed.png +-rw-rw---- 1 root sdcard_rw 6844 2022-06-13 18:43 img_popup1.png +-rw-rw---- 1 root sdcard_rw 14264 2022-06-13 18:43 img_popup11.png +-rw-rw---- 1 root sdcard_rw 91096 2022-06-13 18:43 img_popup12.png +-rw-rw---- 1 root sdcard_rw 64563 2022-06-13 18:43 img_popup13.png +-rw-rw---- 1 root sdcard_rw 15358 2022-06-13 18:43 img_popup15.png +-rw-rw---- 1 root sdcard_rw 11381 2022-11-10 14:01 img_popup16.png +-rw-rw---- 1 root sdcard_rw 9702 2022-08-25 13:33 img_popup17.png +-rw-rw---- 1 root sdcard_rw 127678 2023-01-16 14:55 img_popupAIS.png +-rw-rw---- 1 root sdcard_rw 116294 2022-12-19 15:37 img_popupDtac.png +-rw-rw---- 1 root sdcard_rw 175490 2022-10-10 14:46 img_popupGLX.png +-rw-rw---- 1 root sdcard_rw 247417 2022-09-28 14:21 img_popupKBANK.png +-rw-rw---- 1 root sdcard_rw 176033 2022-08-25 13:33 img_popupLH.png +-rw-rw---- 1 root sdcard_rw 216317 2022-06-13 18:43 img_popupLotus.png +-rw-rw---- 1 root sdcard_rw 189366 2022-10-10 14:46 img_popupMCard.png +-rw-rw---- 1 root sdcard_rw 141879 2022-11-10 15:49 img_popupRabbit.png +-rw-rw---- 1 root sdcard_rw 151699 2022-07-13 09:44 img_popupSCG.png +-rw-rw---- 1 root sdcard_rw 139581 2022-07-13 09:44 img_popupThe1.png +-rw-rw---- 1 root sdcard_rw 180354 2023-01-11 16:03 img_popupTrue.png +-rw-rw---- 1 root sdcard_rw 5151 2022-06-13 18:43 loadingText.png +-rw-rw---- 1 root sdcard_rw 6832 2022-06-13 18:43 loadingTextError.png +-rw-rw---- 1 root sdcard_rw 13638 2022-06-13 18:43 smartphone.png +-rw-rw---- 1 root sdcard_rw 4305 2022-06-13 18:43 text1.png +-rw-rw---- 1 root sdcard_rw 4152 2022-06-13 18:43 text14.png +-rw-rw---- 1 root sdcard_rw 4340 2022-06-13 18:43 text15.png +-rw-rw---- 1 root sdcard_rw 12390 2022-06-13 18:43 text2.png +-rw-rw---- 1 root sdcard_rw 12381 2022-06-13 18:43 text20.png +-rw-rw---- 1 root sdcard_rw 4305 2022-06-13 18:43 text21.png +-rw-rw---- 1 root sdcard_rw 71208 2022-12-13 17:25 text22-2.png +-rw-rw---- 1 root sdcard_rw 65471 2022-12-13 17:25 text22.png +-rw-rw---- 1 root sdcard_rw 115151 2022-12-13 19:57 text23.png +-rw-rw---- 1 root sdcard_rw 9843 2022-06-13 18:43 textRefundChannel1.png +-rw-rw---- 1 root sdcard_rw 9383 2022-06-13 18:43 textRefundChannel2.png +-rw-rw---- 1 root sdcard_rw 9624 2022-06-13 18:43 textRefundChannel3.png +-rw-rw---- 1 root sdcard_rw 7444 2022-06-13 18:43 text_11.png +-rw-rw---- 1 root sdcard_rw 4663 2022-06-13 18:43 text_12.png +-rw-rw---- 1 root sdcard_rw 7757 2022-06-13 18:43 text_13.png +-rw-rw---- 1 root sdcard_rw 5156 2022-06-13 18:43 text_15.png +-rw-rw---- 1 root sdcard_rw 9401 2022-06-13 18:43 text_16.png +-rw-rw---- 1 root sdcard_rw 7847 2022-06-13 18:43 text_17.png +-rw-rw---- 1 root sdcard_rw 9752 2022-06-13 18:43 text_18.png +-rw-rw---- 1 root sdcard_rw 14485 2022-06-13 18:43 text_19.png +-rw-rw---- 1 root sdcard_rw 2352 2022-06-13 18:43 text_20.png +-rw-rw---- 1 root sdcard_rw 5094 2022-06-13 18:43 text_21.png +-rw-rw---- 1 root sdcard_rw 2724 2022-06-13 18:43 text_22.png +-rw-rw---- 1 root sdcard_rw 11587 2022-06-13 18:43 text_23.png +-rw-rw---- 1 root sdcard_rw 7301 2022-06-13 18:43 text_24.png +-rw-rw---- 1 root sdcard_rw 10702 2022-06-13 18:43 text_25.png +-rw-rw---- 1 root sdcard_rw 8870 2022-06-13 18:43 text_26.png +-rw-rw---- 1 root sdcard_rw 11542 2022-06-13 18:43 text_27.png +-rw-rw---- 1 root sdcard_rw 10674 2022-06-13 18:43 text_28.png +-rw-rw---- 1 root sdcard_rw 10814 2022-06-13 18:43 text_29.png +-rw-rw---- 1 root sdcard_rw 6929 2022-06-13 18:43 text_30.png +-rw-rw---- 1 root sdcard_rw 5978 2022-06-13 18:43 text_31.png +-rw-rw---- 1 root sdcard_rw 6965 2022-06-13 18:43 text_32.png +-rw-rw---- 1 root sdcard_rw 5831 2022-06-13 18:43 text_33.png +-rw-rw---- 1 root sdcard_rw 7973 2022-06-13 18:43 text_34.png +-rw-rw---- 1 root sdcard_rw 6597 2022-07-13 09:44 text_35.png +-rw-rw---- 1 root sdcard_rw 6526 2022-07-13 09:44 text_36.png +-rw-rw---- 1 root sdcard_rw 7874 2022-08-02 21:24 text_37.png +-rw-rw---- 1 root sdcard_rw 6419 2022-08-25 13:33 text_38.png +-rw-rw---- 1 root sdcard_rw 6431 2022-10-10 14:46 text_39.png +-rw-rw---- 1 root sdcard_rw 6488 2022-10-10 14:46 text_40.png +-rw-rw---- 1 root sdcard_rw 8204 2022-11-10 15:49 text_41.png +-rw-rw---- 1 root sdcard_rw 940 2022-06-13 18:43 text_X.png +-rw-rw---- 1 root sdcard_rw 5823 2022-06-13 18:43 text_show_amountInvalid.png +-rw-rw---- 1 root sdcard_rw 6305 2022-06-13 18:43 text_show_amountInvalid2.png +-rw-rw---- 1 root sdcard_rw 4831 2022-06-13 18:43 text_show_error.png +-rw-rw---- 1 root sdcard_rw 9299 2022-06-13 18:43 text_show_error2.png +-rw-rw---- 1 root sdcard_rw 9031 2022-06-13 18:43 text_show_error3.png +-rw-rw---- 1 root sdcard_rw 5171 2022-07-13 09:44 text_show_error4.png +-rw-rw---- 1 root sdcard_rw 10418 2022-09-20 16:41 text_show_error5.png +-rw-rw---- 1 root sdcard_rw 6223 2022-06-13 18:43 text_show_notEnough.png +-rw-rw---- 1 root sdcard_rw 2144 2022-06-13 18:43 text_show_notfound.png +-rw-rw---- 1 root sdcard_rw 8376 2022-06-13 18:43 text_show_sentSMS.png +-rw-rw---- 1 root sdcard_rw 39234 2022-06-13 18:43 txtDrinkFailed.png + +./collectiing_en: +total 4376 +-rw-rw---- 1 root sdcard_rw 30424 2022-06-13 18:43 Businessman_sorry.png +-rw-rw---- 1 root sdcard_rw 20712 2022-06-13 18:43 Businessman_sorry2.png +-rw-rw---- 1 root sdcard_rw 943 2022-06-13 18:43 Exit.png +-rw-rw---- 1 root sdcard_rw 2241 2022-06-13 18:43 Group.png +-rw-rw---- 1 root sdcard_rw 8118 2022-06-13 18:43 PinFailed.png +-rw-rw---- 1 root sdcard_rw 15570 2022-06-13 18:43 PinSuccess.png +-rw-rw---- 1 root sdcard_rw 9970 2022-06-13 18:43 alpha.png +-rw-rw---- 1 root sdcard_rw 5109 2022-10-10 14:46 bd_pay_with_ccard1.png +-rw-rw---- 1 root sdcard_rw 4160 2022-06-13 18:43 bd_pay_with_codeAIS.png +-rw-rw---- 1 root sdcard_rw 4623 2022-06-13 18:43 bd_pay_with_codeDtac.png +-rw-rw---- 1 root sdcard_rw 3795 2022-09-28 14:21 bd_pay_with_codeKBANK.png +-rw-rw---- 1 root sdcard_rw 2835 2022-08-25 13:33 bd_pay_with_codeLH.png +-rw-rw---- 1 root sdcard_rw 3357 2022-06-13 18:43 bd_pay_with_codeLotus.png +-rw-rw---- 1 root sdcard_rw 3608 2022-10-10 14:46 bd_pay_with_codeMCard.png +-rw-rw---- 1 root sdcard_rw 4352 2022-11-10 15:49 bd_pay_with_codeRabbit.png +-rw-rw---- 1 root sdcard_rw 2938 2022-06-13 18:43 bd_pay_with_codeThe1.png +-rw-rw---- 1 root sdcard_rw 4617 2023-01-10 09:22 bd_pay_with_codeTrue.png +-rw-rw---- 1 root sdcard_rw 6351 2022-08-25 13:33 bd_pay_with_dolfin.png +-rw-rw---- 1 root sdcard_rw 3517 2022-11-01 17:33 bd_pay_with_linepay.png +-rw-rw---- 1 root sdcard_rw 3869 2022-10-27 14:14 bd_pay_with_shoppy.png +-rw-rw---- 1 root sdcard_rw 5129 2022-10-27 14:14 bd_pay_with_true.png +-rw-rw---- 1 root sdcard_rw 3499 2022-06-13 18:43 bn_0.png +-rw-rw---- 1 root sdcard_rw 2435 2022-06-13 18:43 bn_1.png +-rw-rw---- 1 root sdcard_rw 3066 2022-06-13 18:43 bn_2.png +-rw-rw---- 1 root sdcard_rw 3214 2022-06-13 18:43 bn_3.png +-rw-rw---- 1 root sdcard_rw 2766 2022-06-13 18:43 bn_4.png +-rw-rw---- 1 root sdcard_rw 3031 2022-06-13 18:43 bn_5.png +-rw-rw---- 1 root sdcard_rw 3319 2022-06-13 18:43 bn_6.png +-rw-rw---- 1 root sdcard_rw 2733 2022-06-13 18:43 bn_7.png +-rw-rw---- 1 root sdcard_rw 3641 2022-06-13 18:43 bn_8.png +-rw-rw---- 1 root sdcard_rw 3434 2022-06-13 18:43 bn_9.png +-rw-rw---- 1 root sdcard_rw 3000 2022-06-13 18:43 bn_back-1.png +-rw-rw---- 1 root sdcard_rw 2918 2022-06-13 18:43 bn_back.png +-rw-rw---- 1 root sdcard_rw 3794 2022-06-13 18:43 bn_back2.png +-rw-rw---- 1 root sdcard_rw 3968 2022-06-13 18:43 bn_back3.png +-rw-rw---- 1 root sdcard_rw 2976 2022-06-13 18:43 bn_cancel2.png +-rw-rw---- 1 root sdcard_rw 3095 2022-06-13 18:43 bn_cancel3.png +-rw-rw---- 1 root sdcard_rw 4351 2022-06-13 18:43 bn_catalog.png +-rw-rw---- 1 root sdcard_rw 3420 2022-06-13 18:43 bn_close.png +-rw-rw---- 1 root sdcard_rw 3151 2022-06-13 18:43 bn_confirm.png +-rw-rw---- 1 root sdcard_rw 4265 2022-06-13 18:43 bn_confirm2.png +-rw-rw---- 1 root sdcard_rw 3003 2022-06-13 18:43 bn_continue.png +-rw-rw---- 1 root sdcard_rw 8685 2022-06-13 18:43 bn_door_open.png +-rw-rw---- 1 root sdcard_rw 6268 2022-06-13 18:43 bn_door_open2.png +-rw-rw---- 1 root sdcard_rw 5066 2022-06-13 18:43 bn_getPin.png +-rw-rw---- 1 root sdcard_rw 5135 2022-06-13 18:43 bn_getSMSPage.png +-rw-rw---- 1 root sdcard_rw 2938 2022-06-13 18:43 bn_ignore.png +-rw-rw---- 1 root sdcard_rw 7485 2022-10-10 14:46 bn_pay_with_ccard1.png +-rw-rw---- 1 root sdcard_rw 6518 2022-06-13 18:43 bn_pay_with_codeAIS.png +-rw-rw---- 1 root sdcard_rw 7318 2022-06-13 18:43 bn_pay_with_codeDtac.png +-rw-rw---- 1 root sdcard_rw 7583 2022-09-28 14:21 bn_pay_with_codeKBANK.png +-rw-rw---- 1 root sdcard_rw 3790 2022-08-25 13:33 bn_pay_with_codeLH.png +-rw-rw---- 1 root sdcard_rw 7124 2022-06-13 18:43 bn_pay_with_codeLotus.png +-rw-rw---- 1 root sdcard_rw 48016 2022-10-10 14:46 bn_pay_with_codeMCard.png +-rw-rw---- 1 root sdcard_rw 5856 2022-11-10 15:49 bn_pay_with_codeRabbit.png +-rw-rw---- 1 root sdcard_rw 5332 2022-06-13 18:43 bn_pay_with_codeThe1.png +-rw-rw---- 1 root sdcard_rw 6423 2023-01-10 09:22 bn_pay_with_codeTrue.png +-rw-rw---- 1 root sdcard_rw 5277 2022-06-13 18:43 bn_pay_with_codeXXX.png +-rw-rw---- 1 root sdcard_rw 15094 2022-08-25 13:33 bn_pay_with_dolfin.png +-rw-rw---- 1 root sdcard_rw 4868 2022-11-01 17:33 bn_pay_with_linepay.png +-rw-rw---- 1 root sdcard_rw 11637 2022-08-25 13:33 bn_pay_with_shoppy.png +-rw-rw---- 1 root sdcard_rw 18342 2022-08-25 13:33 bn_pay_with_true.png +-rw-rw---- 1 root sdcard_rw 6271 2022-06-13 18:43 bn_recieve_coupon.png +-rw-rw---- 1 root sdcard_rw 4462 2022-06-13 18:43 bn_tryAgainPin.png +-rw-rw---- 1 root sdcard_rw 2946 2022-06-13 18:43 bn_useCredit.png +-rw-rw---- 1 root sdcard_rw 2915 2022-06-13 18:43 bp_back.png +-rw-rw---- 1 root sdcard_rw 3747 2022-06-13 18:43 bp_back2.png +-rw-rw---- 1 root sdcard_rw 4162 2022-06-13 18:43 bp_back3.png +-rw-rw---- 1 root sdcard_rw 2915 2022-06-13 18:43 bp_cancel2.png +-rw-rw---- 1 root sdcard_rw 3013 2022-06-13 18:43 bp_cancel3.png +-rw-rw---- 1 root sdcard_rw 4200 2022-06-13 18:43 bp_catalog.png +-rw-rw---- 1 root sdcard_rw 3183 2022-06-13 18:43 bp_close.png +-rw-rw---- 1 root sdcard_rw 3094 2022-06-13 18:43 bp_confirm.png +-rw-rw---- 1 root sdcard_rw 4228 2022-06-13 18:43 bp_confirm2.png +-rw-rw---- 1 root sdcard_rw 2929 2022-06-13 18:43 bp_continue.png +-rw-rw---- 1 root sdcard_rw 8258 2022-06-13 18:43 bp_door_open.png +-rw-rw---- 1 root sdcard_rw 6232 2022-06-13 18:43 bp_door_open2.png +-rw-rw---- 1 root sdcard_rw 4750 2022-06-13 18:43 bp_getPin.png +-rw-rw---- 1 root sdcard_rw 5148 2022-06-13 18:43 bp_getSMSPage.png +-rw-rw---- 1 root sdcard_rw 7925 2022-10-10 14:46 bp_pay_with_ccard1.png +-rw-rw---- 1 root sdcard_rw 5265 2022-06-13 18:43 bp_pay_with_codeAIS.png +-rw-rw---- 1 root sdcard_rw 6220 2022-06-13 18:43 bp_pay_with_codeDtac.png +-rw-rw---- 1 root sdcard_rw 5026 2022-09-28 14:21 bp_pay_with_codeKBANK.png +-rw-rw---- 1 root sdcard_rw 3519 2022-08-25 13:33 bp_pay_with_codeLH.png +-rw-rw---- 1 root sdcard_rw 3940 2022-06-13 18:43 bp_pay_with_codeLotus.png +-rw-rw---- 1 root sdcard_rw 4362 2022-10-10 14:46 bp_pay_with_codeMCard.png +-rw-rw---- 1 root sdcard_rw 5784 2022-11-10 15:49 bp_pay_with_codeRabbit.png +-rw-rw---- 1 root sdcard_rw 2966 2022-06-13 18:43 bp_pay_with_codeThe1.png +-rw-rw---- 1 root sdcard_rw 5619 2023-01-10 09:22 bp_pay_with_codeTrue.png +-rw-rw---- 1 root sdcard_rw 9369 2022-08-25 13:33 bp_pay_with_dolfin.png +-rw-rw---- 1 root sdcard_rw 4747 2022-11-01 17:33 bp_pay_with_linepay.png +-rw-rw---- 1 root sdcard_rw 5003 2022-08-25 13:33 bp_pay_with_shoppy.png +-rw-rw---- 1 root sdcard_rw 6702 2022-08-25 13:33 bp_pay_with_true.png +-rw-rw---- 1 root sdcard_rw 6328 2022-06-13 18:43 bp_recieve_coupon.png +-rw-rw---- 1 root sdcard_rw 4224 2022-06-13 18:43 bp_tryAgainPin.png +-rw-rw---- 1 root sdcard_rw 2910 2022-06-13 18:43 bp_useCredit.png +-rw-rw---- 1 root sdcard_rw 2895 2022-06-13 18:43 img3.png +-rw-rw---- 1 root sdcard_rw 6879 2022-06-13 18:43 img4.png +-rw-rw---- 1 root sdcard_rw 2784 2022-06-13 18:43 img5.png +-rw-rw---- 1 root sdcard_rw 35564 2022-06-13 18:43 imgDrinkFailed.png +-rw-rw---- 1 root sdcard_rw 6844 2022-06-13 18:43 img_popup1.png +-rw-rw---- 1 root sdcard_rw 13536 2022-06-13 18:43 img_popup11.png +-rw-rw---- 1 root sdcard_rw 91096 2022-06-13 18:43 img_popup12.png +-rw-rw---- 1 root sdcard_rw 71577 2022-06-13 18:43 img_popup13.png +-rw-rw---- 1 root sdcard_rw 14676 2022-06-13 18:43 img_popup15.png +-rw-rw---- 1 root sdcard_rw 13015 2022-11-10 14:01 img_popup16.png +-rw-rw---- 1 root sdcard_rw 10082 2022-08-25 13:33 img_popup17.png +-rw-rw---- 1 root sdcard_rw 127678 2023-01-16 14:55 img_popupAIS.png +-rw-rw---- 1 root sdcard_rw 116294 2022-12-19 15:37 img_popupDtac.png +-rw-rw---- 1 root sdcard_rw 175490 2022-10-10 14:46 img_popupGLX.png +-rw-rw---- 1 root sdcard_rw 247417 2022-09-28 14:21 img_popupKBANK.png +-rw-rw---- 1 root sdcard_rw 176033 2022-08-25 13:33 img_popupLH.png +-rw-rw---- 1 root sdcard_rw 216317 2022-06-13 18:43 img_popupLotus.png +-rw-rw---- 1 root sdcard_rw 189366 2022-10-10 14:46 img_popupMCard.png +-rw-rw---- 1 root sdcard_rw 141879 2022-11-10 15:49 img_popupRabbit.png +-rw-rw---- 1 root sdcard_rw 151699 2022-07-13 09:44 img_popupSCG.png +-rw-rw---- 1 root sdcard_rw 139581 2022-07-13 09:44 img_popupThe1.png +-rw-rw---- 1 root sdcard_rw 180354 2023-01-11 16:03 img_popupTrue.png +-rw-rw---- 1 root sdcard_rw 5680 2022-06-13 18:43 loadingText.png +-rw-rw---- 1 root sdcard_rw 10065 2022-06-13 18:43 loadingTextError.png +-rw-rw---- 1 root sdcard_rw 23369 2022-06-13 18:43 smartphone.png +-rw-rw---- 1 root sdcard_rw 4152 2022-06-13 18:43 text14.png +-rw-rw---- 1 root sdcard_rw 4340 2022-06-13 18:43 text15.png +-rw-rw---- 1 root sdcard_rw 81607 2022-12-13 17:25 text22-2.png +-rw-rw---- 1 root sdcard_rw 66429 2022-12-13 17:25 text22.png +-rw-rw---- 1 root sdcard_rw 125191 2022-12-13 19:57 text23.png +-rw-rw---- 1 root sdcard_rw 4269 2022-06-13 18:43 text3.png +-rw-rw---- 1 root sdcard_rw 9108 2022-06-13 18:43 textRefundChannel1.png +-rw-rw---- 1 root sdcard_rw 9313 2022-06-13 18:43 textRefundChannel2.png +-rw-rw---- 1 root sdcard_rw 12866 2022-06-13 18:43 textRefundChannel3.png +-rw-rw---- 1 root sdcard_rw 12964 2022-06-13 18:43 text_1.png +-rw-rw---- 1 root sdcard_rw 9038 2022-06-13 18:43 text_11.png +-rw-rw---- 1 root sdcard_rw 4663 2022-06-13 18:43 text_12.png +-rw-rw---- 1 root sdcard_rw 7209 2022-06-13 18:43 text_13.png +-rw-rw---- 1 root sdcard_rw 11618 2022-06-13 18:43 text_16.png +-rw-rw---- 1 root sdcard_rw 7560 2022-06-13 18:43 text_17.png +-rw-rw---- 1 root sdcard_rw 19330 2022-06-13 18:43 text_19.png +-rw-rw---- 1 root sdcard_rw 3087 2022-06-13 18:43 text_20.png +-rw-rw---- 1 root sdcard_rw 8531 2022-06-13 18:43 text_21.png +-rw-rw---- 1 root sdcard_rw 8531 2021-03-18 15:00 text_21png.png +-rw-rw---- 1 root sdcard_rw 10732 2022-06-13 18:43 text_23.png +-rw-rw---- 1 root sdcard_rw 8115 2022-06-13 18:43 text_24.png +-rw-rw---- 1 root sdcard_rw 9044 2022-06-13 18:43 text_25.png +-rw-rw---- 1 root sdcard_rw 10303 2022-06-13 18:43 text_26.png +-rw-rw---- 1 root sdcard_rw 9880 2022-06-13 18:43 text_27.png +-rw-rw---- 1 root sdcard_rw 9393 2022-06-13 18:43 text_28.png +-rw-rw---- 1 root sdcard_rw 9645 2022-06-13 18:43 text_29.png +-rw-rw---- 1 root sdcard_rw 9654 2022-06-13 18:43 text_30.png +-rw-rw---- 1 root sdcard_rw 7417 2022-06-13 18:43 text_31.png +-rw-rw---- 1 root sdcard_rw 8715 2022-06-13 18:43 text_32.png +-rw-rw---- 1 root sdcard_rw 7122 2022-06-13 18:43 text_33.png +-rw-rw---- 1 root sdcard_rw 8628 2022-06-13 18:43 text_34.png +-rw-rw---- 1 root sdcard_rw 7255 2022-07-13 09:44 text_35.png +-rw-rw---- 1 root sdcard_rw 7323 2022-07-13 09:44 text_36.png +-rw-rw---- 1 root sdcard_rw 8358 2022-08-02 21:24 text_37.png +-rw-rw---- 1 root sdcard_rw 7132 2022-08-25 13:33 text_38.png +-rw-rw---- 1 root sdcard_rw 7126 2022-10-10 14:46 text_39.png +-rw-rw---- 1 root sdcard_rw 7109 2022-10-10 14:46 text_40.png +-rw-rw---- 1 root sdcard_rw 8779 2022-11-10 15:49 text_41.png +-rw-rw---- 1 root sdcard_rw 940 2022-06-13 18:43 text_X.png +-rw-rw---- 1 root sdcard_rw 6696 2022-06-13 18:43 text_show_amountInvalid.png +-rw-rw---- 1 root sdcard_rw 8176 2022-06-13 18:43 text_show_amountInvalid2.png +-rw-rw---- 1 root sdcard_rw 3928 2022-06-13 18:43 text_show_error.png +-rw-rw---- 1 root sdcard_rw 10373 2022-06-13 18:43 text_show_error2.png +-rw-rw---- 1 root sdcard_rw 11226 2022-06-13 18:43 text_show_error3.png +-rw-rw---- 1 root sdcard_rw 5825 2022-07-13 09:44 text_show_error4.png +-rw-rw---- 1 root sdcard_rw 8170 2022-09-20 16:41 text_show_error5.png +-rw-rw---- 1 root sdcard_rw 8237 2022-06-13 18:43 text_show_notEnough.png +-rw-rw---- 1 root sdcard_rw 2483 2022-06-13 18:43 text_show_notfound.png +-rw-rw---- 1 root sdcard_rw 8536 2022-06-13 18:43 text_show_sentSMS.png +drwxrwx--x 2 root sdcard_rw 4096 2021-03-18 15:09 topping2 +-rw-rw---- 1 root sdcard_rw 46355 2022-06-13 18:43 txtDrinkFailed.png + ./page_doing: total 3704 -rw-rw---- 1 root sdcard_rw 21318 2022-06-13 18:43 6.png @@ -378,7 +777,7 @@ total 3504 -rw-rw---- 1 root sdcard_rw 8457 2022-07-04 10:45 bn_Congee.png -rw-rw---- 1 root sdcard_rw 13836 2022-07-04 10:45 bn_Lychee_lime_soda.png -rw-rw---- 1 root sdcard_rw 11295 2022-12-26 22:24 bn_Melon_smoothie.png --rw-rw---- 1 root sdcard_rw 16112 2023-01-04 11:01 bn_PinkOreo_smoothie.png +-rw-rw---- 1 root sdcard_rw 16112 2023-01-11 09:45 bn_PinkOreo_smoothie.png -rw-rw---- 1 root sdcard_rw 11165 2022-12-22 19:03 bn_Pinky Promise.png -rw-rw---- 1 root sdcard_rw 8027 2022-12-26 13:53 bn_Yuzu_americano.png -rw-rw---- 1 root sdcard_rw 10519 2022-12-26 22:24 bn_Yuzu_smoothie.png @@ -779,7 +1178,7 @@ total 5572 -rw-rw---- 1 root sdcard_rw 5359 2022-07-03 22:20 green-tea 4.png ./page_drink_press_n: -total 3168 +total 3176 -rw-rw---- 1 root sdcard_rw 9060 2022-07-04 10:47 CHOCO & CARAMEL.png -rw-rw---- 1 root sdcard_rw 2746 2022-07-04 10:47 COFFEE.png -rw-rw---- 1 root sdcard_rw 1219 2022-12-26 22:24 Component 3.png @@ -987,3 +1386,4 @@ total 3168 -rw-rw---- 1 root sdcard_rw 5250 2022-07-04 10:47 bn_soda.png -rw-rw---- 1 root sdcard_rw 15584 2022-07-04 10:47 bn_strawberry_lime_soda.png -rw-rw---- 1 root sdcard_rw 2643 2022-07-04 10:47 bn_water_roomtemp.png +drwxrwx--x 2 root sdcard_rw 4096 2021-03-19 17:41 page_drink_press_n diff --git a/image/topping_inter/bd_sugar_6lvl.png b/image/topping_inter/bd_sugar_6lvl.png new file mode 100644 index 0000000000000000000000000000000000000000..f4ae837d6dee3425e6a4c3df1f22e545911b9e5d GIT binary patch literal 1393 zcmV-%1&;cOP)IsY|sGdMPLG1}@Ptf!PNfAUua79H?qkW%o z-es~T8g*Mu=J~;}v)P)8`{SLjop%c+XR6g|EQf_Ciarzyh2q`a-JG1qu8{mlq}1eZ zoXFp}a(jFGQ_d@;QmJNgq+oIYQuOxrF3T@Ek7CGMQjxMP!tCTB%c}$tG3I-Ede(d? zByyPk{(dt!IB4XWtpgFrko*t<%+1Y>E!WrA=JN8=9`U&%(PgJzuWyPdyXJ+wNDvWY zPHz5J6$4U0h~eR3D+JET+W=9{&(Cd9M3h|-W$7gm2 z4vb2+q>9d{nVg(V`xc}#fGCHDhZ;>1kpxZ7&Qm}4q#%2Hd&}}=8>o+rjF>o%88tc- zbYM?TPSR*1=c^*g#$!M8s35)^;z@!&$;W0L*QT8bH(H4?N}(Lx3+^rEu7nu(+%1zd@IVmhcdW^wh|vlJ zA>GZy#Dvar7cs|`z24BoxTd9w`tgviI930rXYicTbts#PlL73~Xk%MxC z1Lm|a8xF99;$KSz!NMEXRv-rEJ4jfdKZ5x!H~<&)^HdO7&{@V2ofbxq@X&QN;P*wW zAn1FDAPcCwUM&d_U37I(#Exh*f~0aVdW4HUw&A#6v3D01ab(|vXbU3E%qJWRI<$p7 zGcz-Wgbfz-_V@SgQOX1&2p%ft@;$L2Q1tcn>FELlnMZA4V89RphK7c;Iu}V>^8q!_ z8WK3(K&2STkS5N2NCHQL1@<H35KojNE0ezMjny(rmfEETsmkj*pKG>2A=SaEo&_k)xcw{y-3nXpkmR zstGzR?2mLWUP3#)=MQN5z!1U=(j@AaP?GK=lcTI<7Uq^ulp(1ZGT>#ujC4LtvK+R| zm-=L$)M~Z55=D_sDuUhLnn!|k9_WxJNs=z9ygE;+lFhU{H8sU;5*-GnEif|8J=3z1 z&DE|+{3*)&CYxQ^{EJ-eJ|aq4M6nrYAP3R~Ft5n_L)X>(r4u*DRmMoQ-S2tn`(luh zXiLhxeg;X9Uxb^$-wu7I2Yn2GWggS#Qda%!h3)d{H%=k9nWnD-`o<}Uf+Hde-aN&Q zZNBJ}=MVyQ2$6j%(224B-`_Zu#r01X_CRGn^E70BqwqO-U literal 0 HcmV?d00001 diff --git a/image/topping_inter/bn_sugar_4step.png b/image/topping_inter/bn_sugar_4step.png new file mode 100644 index 0000000000000000000000000000000000000000..2016ac9d4408a3faef1124f27e562541dd1ae6d4 GIT binary patch literal 1776 zcmV4K1{BkcNnL1kfrJoU5jrG-B-k*fA;D_mU|5+D zK~{zZB`zdtV2YHK5>1h4gcwsaK+B>ID_Yx`>;3M$H=R!ZP1{M+&ij7J@czsjR`=^U z=id9yr=-NhW3fnOWxCO5y%Q0SoKiD7Ygi7a2aN}haroh+@Y zl4UDax%-iatAvo*GB|KwQvLmsO7%tHP9n@`^boxm1XGfDVLuMq5 zLwjR2Mw`#Y69mMt_L+53{cNoh1+EF1OKw_${Q7g3`{a=vR%*vgBFMCaft0CYu|b50 z;Ti&{eR-3-U_TTCnGf9iw_mP$0>L>@#>5Y_e(~{i{-2_S5#JwMQ)$e3lP##7AU3|* zKtYgs2}E)EV!K@FXm{6kp!WPL^1F=|J1Yocwc--V`n;LwM=o2-0}+tV;=h_~L|DN9*MlLbO}$r7o4u2zPJ zhUNA@H^WNF+gs{u@15)D>YVI%lL`Z(FrpGT-(b_G*Is`^Dk>_4kc9-s?Bi>na_5-E z5~UiZ632wXK>FlG3MUHG6ND^eRzLQHJNn|-Twizfd`IUW<2^gBFi>cR#C&H@!xRN6 zC-TK%)2fDz8|uDEUhGU2KBvd~F=n6aA>z+G5mHWIOru`5L@?H|3{m*Z7-1aRxBDQb zWKm#K6r^0)YU^c;ag23uZEh5!QYoZRRw-^O>%FGE^1y=+2_fYO3UZ`Xzg)hA%NJjH zsqW0VOP#&`_oE_4g>h>YZt;#&vZUO>THN#Xo7}m##VJQl7}yYK4^arB)_a(ca%bb# z-0qEN%l=r@zn>F^4uzU0ABBT-L>$BB5A%UTGWD{)E zpP_QXsK}(9C>SkB5D9y)O@Pp%jN3WxrBZr3{;g)TAOXc6`${R7S81eCqNE0@@mB>2 z2^z~rUa)iNln!NvYy2+=2`XXlm299Z(~Vk`j^g4`Mhg;f(5C<>t!lIqwH_DCS1@9b zV1woz0BxVNm~6kNNEK(JNU-sP1A>K3rLymEbDEZrENBpj=~@>t*wlaooxI=>(Lx9r z1BF4zI6xTgwZ4?soQja3GBDESGi9f1B_)KAT<1bd4Z-ysRmuGh%KQ z+$1EB^m)O-h`FkDM!Se{kJZ5;IH8Y24`F5)-jARu2*`2=>{QzAvg9-<^&E-80r7CYutR}w`)wNNZ`OU ztuG9C_~DpshLD#|!EA$&ATg3DnKQnzOm0hvQOa2{U9rMo)F45@wNp%Op{DP@JuQTkBPbUz#xd4y z3KcK>evB|MLj~JcdzwPE{?m`FH%NJbG3}*L{#YNwxK?AZUfNt=cO4FwSP_KhF`KcG zasZ;Z;Qg^TM!j?Jlf<|Nl@pp%!nAKoece5)iUx{+)r7>AhpwK>h`c!TP3ZnR^HIbO?H%f{C*2YRXx1|U=DQtUx7u)TS z1p#)ApE`NWU#m#j^l68U6m3)et|(yuG=GM}CCvPA4c8@Fl9Bn!ptn%%M+wY6q0laz zmYs;Ah2hh(KNk0$XCMj~&Cpka%oiXCtY%-%+uCGA9Z3&L+}jga6w?+4K=km8ETjIt zYEK|6(8*jg=)FsX<%R2`cZeskn*$5iGEHVA3?G>JX=9pvn=-K2Yp0Ix={O>iMC^y1 z4oNBSdlTHfb4ybF{qB|Q-m!0=Cb62GzxQdn%t{zOE`m6_GQAxpG(yPS12MFx2P83_ zlxZSLB8+?>l2FEqLuI1QVgTLLvyG!8Ldfh%dA-oO(cwlb-90oQZKV)HKK}zFFPA>p S3}SBp00006fuYjg6WDiHaf?hH4EP6I^I?QJbdGRa2&ktt6E&hLBV=aWGw( zG`4nSSd_+vjT$=C(g2NSu+iAY7|;}<3mjH}FzcO>;^z#bDyrMgnGAQ3$s8=xE_C@xR54;B%VJ0>T_DLFby$>b=F4BeqW|M;DT^%3`7bmMk7sZ?9zCuiccN>(M1mJ^XO zCDo^7g#l6Qd1^0}JY8Sza3%lGvIP=th!htpbw#BMPa}+~mup!V>l}!q z_gWX-=I8bje`N8f-9y3Q*BsG;4{a3nsew**vc?E)kG(hSbeHvtOGFq7Y?q=U5U0v zo7*w2Sg_0p75KO%3Lm0v+w+}P^q3S?pR6N|=5DB~YGXjx;Ks}Bq zS~z<6kD#4b1A5LTQ;QgZp!U#3N*&Hi(^W0wL&|3+UBhmV#t5XqNf~i)^zb)9yKDml zHaTX--liCN2>+IF^zc2d280kM-$L6|gHY!0w(Me0F#)13(waqopm;|2=^ z51nGtYfQO&%VdKMZ|LTl2*Qhx85d8m2uWg?MPPw2ivod|WoAjcxrSjTX0~r8bvKui z#4sMlW`e~4B1i&fcZco}!vIe=Zx53p-A;h=|~enZvT3d7zUXAGC(d+5D%WAILwpbXMQorjc2;H_L@8yw0kTX-7$1_+ zfO5{`U<8u-SDFplw|}|GX~xH(d+Q1W9%neF7cG0z49rFte=?In)FszoCNtEogfP}b zH?%-Fiue!LvI;1X&L|)wkjB%oIN2z2^}EZ&_=`Rr80-jY+-kuvYqCx_;<$OZyNgEt z<{ph-fH3;3hZ)=uz2D6e$f=KG2|aq&hV%9>&vL5q0cc}*mjRR++2(e0ru$QqG72X= zsOsCVFA|gApqxNkqs?_{iDrL4MGNVQx@RkY2vnp6Rhb93QmCVvGG|RZhzX-#yCP zBsLhBt#7|@cEwK1tM_WJtY)jK4Zx%w`0V>Xz1qDrH$#I4yg^Kp!lV<41P$i2OB zsv#1VO4YmeRlt4Y6x;%EL}bC+rg-OGZgJNT-_=thc=HsNj1JFT6&T0psCRB^)k04?VhFt lb|y$66H^n^kqc3H`434wmp+3H5z_zw002ovPDHLkV1fs@2vPt5 literal 0 HcmV?d00001 diff --git a/image/topping_inter/bp_sugar_4step.png b/image/topping_inter/bp_sugar_4step.png new file mode 100644 index 0000000000000000000000000000000000000000..4104609b630b8b702e8c3cbfa129986d7a734e0d GIT binary patch literal 1128 zcmV-u1eg1XP)u8RFxdp&apTB=p$n1}5- zOpO2_!6a2+&Bpg!+Or`F%nAj%( zP(h{PHKXSkc1(3Z0H9~uKGACw3{x~XxEa7Q@^fkt1p~t=0MhQ_nGU1$WwIrtEuD!< zF#%*vhr(p!)OSSZ(Z-$EICKs2NDEn3wqIP2@B23qGOrOp9*MKkd)pU`%0n*@p*;e~ z5!>ds;<-g^Xxq76p{miaVsxy9UAK^Raa$iU@{3B^t%MY= z5I}}$8y_4(#m0VvPmA_xWlI9cAZ^>@3R9|6%NZ-JiEJPK?GQjloK?zLof!<(Ep4pT zmT;m7%(IpbpHAy3VyS|mj@Fl5;ZUo&x&$zPnmW-QH>VhsIvBB!>$mI7v`GMSLL}TX z$Ax-j*Gs+9I&mWXLqmOoGu%L(<`PRqJkOiGl8E>MmhL u3uZ$by?%cv2t_{WVII!0UYlg+SX$nLwIn7J}nUpv&L^ZdX%&`F-bo3eeUU`4aY7a9HT)0 z(RZ~?lYIExfb73{K5fXnCoEG(Nm1K$Z|>Q-Q-w2!7!8LAtrCnZyCj~uv$Pr8#<2m> zE~wLUz=-q7e|dLl%Z++3G9aA^sm?httYkyePFyFVCa#flkj`oa;mD4nwz+O&^uKW` zAa>p{Pgt#FQK?|}xcXo08Dcs^%RWJ7wOXx-`)@yb;dxIFlIQE|1erFLb5^>~PXeMB z-t3a6N|0%KeND3vo}UE7Fi#VJrB~>~=fNBVa}VhEZ?v2%w8$d8kLm@B(pkm@#9Vs}Mj0z4_esB&JFL5tyW6?DBS;03tA%lChg( zxF`qFn8tM#QzC$9MGXjg5QtMubkj0q7Xkuj(ttDxAX*avfwMGpnd=ci1T8ILNceyN zBKRVo(StxN@u_Z{yyFr;1jpn&Q?9v9Cax1eFR#4pHiCT+JJ#$FKo>1zrNTJyjP@qPvW{)}VIg&9XGS+dX+SCb;*>LO zgMtc0SCZ7*A`Ach7pMAZkK%KCvQw!D^+qn0)J1s59GcZZhLSj`1f-jWrOmC1)*aE( z5}oP+CBh0QZQA&HACKpY9O%vG&Y|O`5sGeq01Bj33cRj9=l}o!07*qoM6N<$g7IGO A-v9sr literal 0 HcmV?d00001 diff --git a/xml/menu_new_layout_gen_v2.py b/xml/menu_new_layout_gen_v2.py index 50d128e3..e991a8cf 100644 --- a/xml/menu_new_layout_gen_v2.py +++ b/xml/menu_new_layout_gen_v2.py @@ -255,7 +255,7 @@ out_xml( '\t\t\r\n') out_xml( '\t\t\r\n') - out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select5.xml"\r\n') + out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select6.lxml"\r\n') out_xml( '\t\t\r\n') @@ -508,11 +508,11 @@ out_xml( '\t 32 \r\n') out_xml( '\t128\r\n') out_xml( '\t64\r\n') - out_xml( '\t MITRegularTTF \r\n') - out_xml( '\t 0x5A5A5A \r\n') out_xml( '\t "disable-show" \r\n') out_xml( '\t $Sum' + str_con_var +' \r\n') - out_xml( '\t text_unavailable \r\n') + out_xml( '\t\r\n') + out_xml( '\t\t 000013 \r\n') + out_xml( '\t\r\n') out_xml( '\t center-vertical-horizontal \r\n') out_xml( '\t\r\n') diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml index 8eee49e5..a426554f 100644 --- a/xml/page_catalog.lxml +++ b/xml/page_catalog.lxml @@ -282,24 +282,25 @@ - + + 70 + 591 + 940 + 85 000001 - 70 - 591 - 940 - 85 + - + + 70 + 679 + 940 + 85 000002 - 70 - 679 - 940 - 85 - + ; menu row 1 @@ -734,11 +734,11 @@ essential nutrients 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204021018 - text_unavailable + + 000013 + center-vertical-horizontal @@ -813,7 +813,7 @@ essential nutrients Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -975,11 +975,11 @@ essential nutrients 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204021019 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1054,7 +1054,7 @@ essential nutrients Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1219,11 +1219,11 @@ essential nutrients 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204021020 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1298,7 +1298,7 @@ essential nutrients Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1463,11 +1463,11 @@ essential nutrients 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204021021 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1542,7 +1542,7 @@ essential nutrients Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1707,11 +1707,11 @@ essential nutrients 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204021022 - text_unavailable + + 000013 + center-vertical-horizontal diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml index 745050aa..06a0e649 100644 --- a/xml/page_catalog_group_appfast.xml +++ b/xml/page_catalog_group_appfast.xml @@ -515,6 +515,8 @@ + + 10 497 @@ -1798,4 +1800,5 @@ essential nutrients" + diff --git a/xml/page_catalog_group_cocktail.lxml b/xml/page_catalog_group_cocktail.lxml index 6939692e..2c72bb81 100644 --- a/xml/page_catalog_group_cocktail.lxml +++ b/xml/page_catalog_group_cocktail.lxml @@ -560,7 +560,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -722,11 +722,11 @@ Soda, Ice, Malibu 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1199050001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -801,7 +801,7 @@ Soda, Ice, Malibu Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -957,11 +957,11 @@ Soda, Ice, Malibu 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1199050002 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1036,7 +1036,7 @@ Soda, Ice, Malibu Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1198,11 +1198,11 @@ Soda, Malibu 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1199050003 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1277,7 +1277,7 @@ Soda, Malibu Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1436,11 +1436,11 @@ Mount Gay Rum 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1199050004 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1515,7 +1515,7 @@ Mount Gay Rum Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1677,11 +1677,11 @@ Soda, Ice, Mount Gay Rum 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1199050005 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1756,7 +1756,7 @@ Soda, Ice, Mount Gay Rum Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1912,11 +1912,11 @@ Soda, Ice, Mount Gay Rum 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1199050006 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1991,7 +1991,7 @@ Soda, Ice, Mount Gay Rum Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2147,11 +2147,11 @@ Soda, Ice, Mount Gay Rum 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1199050007 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2226,7 +2226,7 @@ Soda, Ice, Mount Gay Rum Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2388,11 +2388,11 @@ juice Ice, Malibu 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1199050008 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2467,7 +2467,7 @@ juice Ice, Malibu Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2629,11 +2629,11 @@ Mount Gay Rum 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1199050009 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2708,7 +2708,7 @@ Mount Gay Rum Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2870,11 +2870,11 @@ Ice, Mount Gay Rum 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1199050010 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2949,7 +2949,7 @@ Ice, Mount Gay Rum Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3105,11 +3105,11 @@ Ice, Mount Gay Rum 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1199050012 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3184,7 +3184,7 @@ Ice, Mount Gay Rum Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3340,11 +3340,11 @@ Ice, Mount Gay Rum 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1199050013 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3419,7 +3419,7 @@ Ice, Mount Gay Rum Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3575,11 +3575,11 @@ Ice, Mount Gay Rum 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1199050015 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3654,7 +3654,7 @@ Ice, Mount Gay Rum Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3810,11 +3810,11 @@ Ice, Mount Gay Rum 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1199050014 - text_unavailable + + 000013 + center-vertical-horizontal diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml index 149955a5..b7927e79 100644 --- a/xml/page_catalog_group_cocktail.xml +++ b/xml/page_catalog_group_cocktail.xml @@ -506,6 +506,8 @@ + + 10 497 @@ -4020,4 +4022,5 @@ Ice, Mount Gay Rum" + diff --git a/xml/page_catalog_group_coffee.lxml b/xml/page_catalog_group_coffee.lxml index 9a302b50..754ee22a 100644 --- a/xml/page_catalog_group_coffee.lxml +++ b/xml/page_catalog_group_coffee.lxml @@ -560,7 +560,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -720,11 +720,11 @@ 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -799,7 +799,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -962,11 +962,11 @@ ESPRESSO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1211010001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1041,7 +1041,7 @@ ESPRESSO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1201,11 +1201,11 @@ ESPRESSO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100031201020001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1280,7 +1280,7 @@ ESPRESSO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1452,11 +1452,11 @@ Strawberry, Orange, Floral 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010013 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1531,7 +1531,7 @@ Strawberry, Orange, Floral Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1703,11 +1703,11 @@ Note: Blue Berry & Floral 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010020 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1782,7 +1782,7 @@ Note: Blue Berry & Floral Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1954,11 +1954,11 @@ Note: Strawberry & Floral 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010022 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2033,7 +2033,7 @@ Note: Strawberry & Floral Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2205,11 +2205,11 @@ Note: Jasmine & Honey 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010024 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2284,7 +2284,7 @@ Note: Jasmine & Honey Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2456,11 +2456,11 @@ Note: Whisky & Vanilla 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010026 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2535,7 +2535,7 @@ Note: Whisky & Vanilla Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2707,11 +2707,11 @@ Note: Peach, tea, chocolate 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010028 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2786,7 +2786,7 @@ Note: Peach, tea, chocolate Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2955,11 +2955,11 @@ PURE BEAUTY 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010033 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3034,7 +3034,7 @@ PURE BEAUTY Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3197,11 +3197,11 @@ GEISHA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010036 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3276,7 +3276,7 @@ GEISHA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3445,11 +3445,11 @@ Pink​ Rose & Berry 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010037 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3524,7 +3524,7 @@ Pink​ Rose & Berry Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3683,11 +3683,11 @@ Pink​ Rose & Berry 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201020041 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3762,7 +3762,7 @@ Pink​ Rose & Berry Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3934,11 +3934,11 @@ Strawberry, Orange, Floral 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100141201020011 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4013,7 +4013,7 @@ Strawberry, Orange, Floral Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4185,11 +4185,11 @@ Note: Blue Berry & Floral 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100191201020019 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4264,7 +4264,7 @@ Note: Blue Berry & Floral Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4436,11 +4436,11 @@ Note: Strawberry & Floral 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100211201020021 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4515,7 +4515,7 @@ Note: Strawberry & Floral Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4687,11 +4687,11 @@ Note: Whisky & Vanilla 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100251201020025 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4766,7 +4766,7 @@ Note: Whisky & Vanilla Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4938,11 +4938,11 @@ Note: Jasmine & Honey 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100231201020023 - text_unavailable + + 000013 + center-vertical-horizontal @@ -5017,7 +5017,7 @@ Note: Jasmine & Honey Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5189,11 +5189,11 @@ Note: Peach, tea, chocolate 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100271201020027 - text_unavailable + + 000013 + center-vertical-horizontal @@ -5268,7 +5268,7 @@ Note: Peach, tea, chocolate Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5437,11 +5437,11 @@ PURE BEAUTY 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100321201020032 - text_unavailable + + 000013 + center-vertical-horizontal @@ -5516,7 +5516,7 @@ PURE BEAUTY Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5682,11 +5682,11 @@ GEISHA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100351201020035 - text_unavailable + + 000013 + center-vertical-horizontal @@ -5761,7 +5761,7 @@ GEISHA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5933,11 +5933,11 @@ Pink​ Rose & Berry 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100381201020038 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6012,7 +6012,7 @@ Pink​ Rose & Berry Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6180,11 +6180,11 @@ Note: Blue Berry & Floral 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201020020 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6259,7 +6259,7 @@ Note: Blue Berry & Floral Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6427,11 +6427,11 @@ Note: Strawberry & Floral 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201020022 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6506,7 +6506,7 @@ Note: Strawberry & Floral Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6674,11 +6674,11 @@ Note: Whisky & Vanilla 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201020026 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6753,7 +6753,7 @@ Note: Whisky & Vanilla Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6921,11 +6921,11 @@ Note: Jasmine & Honey 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201020024 - text_unavailable + + 000013 + center-vertical-horizontal @@ -7000,7 +7000,7 @@ Note: Jasmine & Honey Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7168,11 +7168,11 @@ Strawberry, Orange, Floral 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201020018 - text_unavailable + + 000013 + center-vertical-horizontal @@ -7247,7 +7247,7 @@ Strawberry, Orange, Floral Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7415,11 +7415,11 @@ Note: Peach, tea, chocolate 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201020028 - text_unavailable + + 000013 + center-vertical-horizontal @@ -7494,7 +7494,7 @@ Note: Peach, tea, chocolate Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7659,11 +7659,11 @@ ALMOST DIRTY 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201020033 - text_unavailable + + 000013 + center-vertical-horizontal @@ -7738,7 +7738,7 @@ ALMOST DIRTY Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7900,11 +7900,11 @@ ALMOST DIRTY 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201020036 - text_unavailable + + 000013 + center-vertical-horizontal @@ -7979,7 +7979,7 @@ ALMOST DIRTY Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8147,11 +8147,11 @@ Pink​ Rose & Berry 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201020037 - text_unavailable + + 000013 + center-vertical-horizontal @@ -8226,7 +8226,7 @@ Pink​ Rose & Berry Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8385,11 +8385,11 @@ ICED ESPRESSO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12110200011211030001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -8464,7 +8464,7 @@ ICED ESPRESSO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8624,11 +8624,11 @@ ICED ESPRESSO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120101000412010200021201030002 - text_unavailable + + 000013 + center-vertical-horizontal @@ -8703,7 +8703,7 @@ ICED ESPRESSO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8863,11 +8863,11 @@ ICED ESPRESSO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120101000512110200021211030002 - text_unavailable + + 000013 + center-vertical-horizontal @@ -8942,7 +8942,7 @@ ICED ESPRESSO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9102,11 +9102,11 @@ ICED ESPRESSO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120101000612010200031201030003 - text_unavailable + + 000013 + center-vertical-horizontal @@ -9181,7 +9181,7 @@ ICED ESPRESSO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9347,11 +9347,11 @@ Caramel Syrup 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120101000712010200041201030004 - text_unavailable + + 000013 + center-vertical-horizontal @@ -9426,7 +9426,7 @@ Caramel Syrup Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9592,11 +9592,11 @@ CAFÉ LATTE 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120101003112010200311201030031 - text_unavailable + + 000013 + center-vertical-horizontal @@ -9671,7 +9671,7 @@ CAFÉ LATTE Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9837,11 +9837,11 @@ CAFÉ LATTE 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120101000812010200051201030005 - text_unavailable + + 000013 + center-vertical-horizontal @@ -9916,7 +9916,7 @@ CAFÉ LATTE Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10085,11 +10085,11 @@ Kokuto syrup 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120101001112010200081201030008 - text_unavailable + + 000013 + center-vertical-horizontal @@ -10164,7 +10164,7 @@ Kokuto syrup Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10330,11 +10330,11 @@ CAFÉ LATTE 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100391201020039 - text_unavailable + + 000013 + center-vertical-horizontal @@ -10409,7 +10409,7 @@ CAFÉ LATTE Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10578,11 +10578,11 @@ Milk, Sugar 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120101000912010200061201030006 - text_unavailable + + 000013 + center-vertical-horizontal @@ -10657,7 +10657,7 @@ Milk, Sugar Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10820,11 +10820,11 @@ CAFÉ LATTE 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120101002912010200291201030029 - text_unavailable + + 000013 + center-vertical-horizontal @@ -10899,7 +10899,7 @@ CAFÉ LATTE Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11068,11 +11068,11 @@ Milk, Sugar 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120101003012010200301201030030 - text_unavailable + + 000013 + center-vertical-horizontal @@ -11147,7 +11147,7 @@ Milk, Sugar Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11313,11 +11313,11 @@ Sugar, Water 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100171201020017 - text_unavailable + + 000013 + center-vertical-horizontal @@ -11392,7 +11392,7 @@ Sugar, Water Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11558,11 +11558,11 @@ Sugar, Water 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100401201020040 - text_unavailable + + 000013 + center-vertical-horizontal diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index f9cb9572..01252f29 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -506,6 +506,8 @@ + + 10 497 @@ -16453,4 +16455,5 @@ Sugar, Water" + diff --git a/xml/page_catalog_group_forkid.lxml b/xml/page_catalog_group_forkid.lxml index 8af2efee..f6dcc7ae 100644 --- a/xml/page_catalog_group_forkid.lxml +++ b/xml/page_catalog_group_forkid.lxml @@ -570,7 +570,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -730,11 +730,11 @@ 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120301000512030200051203030005 - text_unavailable + + 000013 + center-vertical-horizontal @@ -809,7 +809,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -969,11 +969,11 @@ 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120301000112030200011203030001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1048,7 +1048,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1211,11 +1211,11 @@ MILK 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120301000312030200031203030003 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1290,7 +1290,7 @@ MILK Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1449,11 +1449,11 @@ MILK 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12030200061203030006 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1528,7 +1528,7 @@ MILK Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1688,11 +1688,11 @@ MILK 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120301000212030200021203030002 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1767,7 +1767,7 @@ MILK Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1927,11 +1927,11 @@ MILK 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120301002212030200221203030022 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2006,7 +2006,7 @@ MILK Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2168,11 +2168,11 @@ SMOOTHIE 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1203030010 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2247,7 +2247,7 @@ SMOOTHIE Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2406,11 +2406,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1203030020 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2485,7 +2485,7 @@ VOLCANO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2644,11 +2644,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1203030021 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2723,7 +2723,7 @@ VOLCANO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2879,11 +2879,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200411205030041 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2958,7 +2958,7 @@ VOLCANO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3114,11 +3114,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200081205030008 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3193,7 +3193,7 @@ VOLCANO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3352,11 +3352,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1205020044 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3431,7 +3431,7 @@ VOLCANO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3590,11 +3590,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1205020045 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3669,7 +3669,7 @@ VOLCANO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3831,11 +3831,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1203030009 - text_unavailable + + 000013 + center-vertical-horizontal diff --git a/xml/page_catalog_group_forkid.xml b/xml/page_catalog_group_forkid.xml index 031acd2e..2c8323ae 100644 --- a/xml/page_catalog_group_forkid.xml +++ b/xml/page_catalog_group_forkid.xml @@ -515,6 +515,9 @@ + + + 10 497 diff --git a/xml/page_catalog_group_health.lxml b/xml/page_catalog_group_health.lxml index 550d6891..07dba1da 100644 --- a/xml/page_catalog_group_health.lxml +++ b/xml/page_catalog_group_health.lxml @@ -557,7 +557,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -723,11 +723,11 @@ 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010110031201021001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -802,7 +802,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -965,11 +965,11 @@ Foamed milk 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010110041201021002 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1044,7 +1044,7 @@ Foamed milk Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1210,11 +1210,11 @@ Milk, Sugar 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010110061201021003 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1289,7 +1289,7 @@ Milk, Sugar Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1452,11 +1452,11 @@ Foamed milk 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010110991201021099 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1531,7 +1531,7 @@ Foamed milk Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1691,11 +1691,11 @@ Foamed milk 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12020110241202021024 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1770,7 +1770,7 @@ Foamed milk Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1936,11 +1936,11 @@ and Milk 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12020110251202021025 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2015,7 +2015,7 @@ and Milk Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2175,11 +2175,11 @@ and Milk 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12020110261202021026 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2254,7 +2254,7 @@ and Milk Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2414,11 +2414,11 @@ and Milk 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12020110271202021027 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2493,7 +2493,7 @@ and Milk Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2653,11 +2653,11 @@ and Milk 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12020110291202021029 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2732,7 +2732,7 @@ and Milk Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2895,11 +2895,11 @@ LIMENADE 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12020110301202021030 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2974,7 +2974,7 @@ LIMENADE Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3134,11 +3134,11 @@ LIMENADE 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12020110311202021031 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3213,7 +3213,7 @@ LIMENADE Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3382,11 +3382,11 @@ Water, and Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12020110321202021032 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3461,7 +3461,7 @@ Water, and Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3621,11 +3621,11 @@ Water, and Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12020110371202021037 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3700,7 +3700,7 @@ Water, and Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3860,11 +3860,11 @@ Water, and Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12030110021203021002 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3939,7 +3939,7 @@ Water, and Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4099,11 +4099,11 @@ Water, and Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12030110051203021005 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4178,7 +4178,7 @@ Water, and Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4338,11 +4338,11 @@ Water, and Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050110011205021001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4417,7 +4417,7 @@ Water, and Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4576,11 +4576,11 @@ SODA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1205021010 - text_unavailable + + 000013 + center-vertical-horizontal diff --git a/xml/page_catalog_group_milk.lxml b/xml/page_catalog_group_milk.lxml index 046c1c33..ce59a0b0 100644 --- a/xml/page_catalog_group_milk.lxml +++ b/xml/page_catalog_group_milk.lxml @@ -557,7 +557,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -717,11 +717,11 @@ 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120301000512030200051203030005 - text_unavailable + + 000013 + center-vertical-horizontal @@ -796,7 +796,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -956,11 +956,11 @@ 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120301000112030200011203030001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1035,7 +1035,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1201,11 +1201,11 @@ Caramel Syrup 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120301000412030200041203030004 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1280,7 +1280,7 @@ Caramel Syrup Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1443,11 +1443,11 @@ MILK 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120301000312030200031203030003 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1522,7 +1522,7 @@ MILK Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1681,11 +1681,11 @@ MILK 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12030200061203030006 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1760,7 +1760,7 @@ MILK Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1920,11 +1920,11 @@ MILK 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120301000212030200021203030002 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1999,7 +1999,7 @@ MILK Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2161,11 +2161,11 @@ SMOOTHIE 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1203030010 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2240,7 +2240,7 @@ SMOOTHIE Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2402,11 +2402,11 @@ SMOOTHIE 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1203030011 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2481,7 +2481,7 @@ SMOOTHIE Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2643,11 +2643,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1203030009 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2722,7 +2722,7 @@ VOLCANO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2882,11 +2882,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120301001912030200191203030019 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2961,7 +2961,7 @@ VOLCANO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3120,11 +3120,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1203030020 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3199,7 +3199,7 @@ VOLCANO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3358,11 +3358,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1203030021 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3437,7 +3437,7 @@ VOLCANO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3597,11 +3597,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120301002212030200221203030022 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3676,7 +3676,7 @@ VOLCANO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3836,11 +3836,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120301002512030200251203030025 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3915,7 +3915,7 @@ VOLCANO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4083,11 +4083,11 @@ Sugar Oreo 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1203030026 - text_unavailable + + 000013 + center-vertical-horizontal diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index 0b36c25d..a8999bd1 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -503,6 +503,8 @@ + + 10 497 @@ -4300,4 +4302,5 @@ Sugar Oreo" + diff --git a/xml/page_catalog_group_other.lxml b/xml/page_catalog_group_other.lxml index 5bfbf5d5..6d20917b 100644 --- a/xml/page_catalog_group_other.lxml +++ b/xml/page_catalog_group_other.lxml @@ -559,7 +559,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -715,11 +715,11 @@ 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200071205030007 - text_unavailable + + 000013 + center-vertical-horizontal @@ -794,7 +794,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -956,11 +956,11 @@ DRINK SODA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200351205030035 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1035,7 +1035,7 @@ DRINK SODA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1194,11 +1194,11 @@ DRINK SODA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1205020044 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1273,7 +1273,7 @@ DRINK SODA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1432,11 +1432,11 @@ DRINK SODA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1205020045 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1511,7 +1511,7 @@ DRINK SODA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1670,11 +1670,11 @@ SODA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200101205030010 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1749,7 +1749,7 @@ SODA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1905,11 +1905,11 @@ SODA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200331205030033 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1984,7 +1984,7 @@ SODA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2149,11 +2149,11 @@ Limenade, Soda & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200221205030022 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2228,7 +2228,7 @@ Limenade, Soda & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2387,11 +2387,11 @@ Limenade, Soda & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200281205030028 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2466,7 +2466,7 @@ Limenade, Soda & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2631,11 +2631,11 @@ Soda & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200291205030029 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2710,7 +2710,7 @@ Soda & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2866,11 +2866,11 @@ Soda & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1205020012 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2945,7 +2945,7 @@ Soda & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3101,11 +3101,11 @@ Soda & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200411205030041 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3180,7 +3180,7 @@ Soda & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3336,11 +3336,11 @@ Soda & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200081205030008 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3415,7 +3415,7 @@ Soda & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3577,11 +3577,11 @@ Soda & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200091205030009 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3656,7 +3656,7 @@ Soda & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3812,11 +3812,11 @@ Soda & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200241205030024 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3891,7 +3891,7 @@ Soda & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4056,11 +4056,11 @@ Soda & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200251205030025 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4135,7 +4135,7 @@ Soda & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4291,11 +4291,11 @@ Soda & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200461205030046 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4370,7 +4370,7 @@ Soda & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4526,11 +4526,11 @@ Soda & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200471205030047 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4605,7 +4605,7 @@ Soda & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4761,11 +4761,11 @@ Soda & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200381205030038 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4840,7 +4840,7 @@ Soda & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4999,11 +4999,11 @@ SODA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200391205030039 - text_unavailable + + 000013 + center-vertical-horizontal @@ -5078,7 +5078,7 @@ SODA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5234,11 +5234,11 @@ SODA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1205020014 - text_unavailable + + 000013 + center-vertical-horizontal @@ -5313,7 +5313,7 @@ SODA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5469,11 +5469,11 @@ SODA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1205020015 - text_unavailable + + 000013 + center-vertical-horizontal @@ -5548,7 +5548,7 @@ SODA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5707,11 +5707,11 @@ SODA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200341205030034 - text_unavailable + + 000013 + center-vertical-horizontal @@ -5786,7 +5786,7 @@ SODA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5948,11 +5948,11 @@ Water & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200031205030003 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6027,7 +6027,7 @@ Water & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6186,11 +6186,11 @@ Water & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200041205030004 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6265,7 +6265,7 @@ Water & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6424,11 +6424,11 @@ Water & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200021205030002 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6503,7 +6503,7 @@ Water & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6665,11 +6665,11 @@ Water & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1205020005 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6744,7 +6744,7 @@ Water & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6904,11 +6904,11 @@ Water & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120501000112050200011205030001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6983,7 +6983,7 @@ Water & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7139,11 +7139,11 @@ Water & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200261205030026 - text_unavailable + + 000013 + center-vertical-horizontal @@ -7218,7 +7218,7 @@ Water & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7377,11 +7377,11 @@ Water & Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200321205030032 - text_unavailable + + 000013 + center-vertical-horizontal @@ -7456,7 +7456,7 @@ Water & Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7615,11 +7615,11 @@ Water, Ice 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1205030040 - text_unavailable + + 000013 + center-vertical-horizontal @@ -7694,7 +7694,7 @@ Water, Ice Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7857,11 +7857,11 @@ PLANT PROTEIN 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1206010001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -7936,7 +7936,7 @@ PLANT PROTEIN Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8096,11 +8096,11 @@ PLANT PROTEIN 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1206010002 - text_unavailable + + 000013 + center-vertical-horizontal @@ -8175,7 +8175,7 @@ PLANT PROTEIN Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8331,11 +8331,11 @@ PLANT PROTEIN 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1205020017 - text_unavailable + + 000013 + center-vertical-horizontal @@ -8410,7 +8410,7 @@ PLANT PROTEIN Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8566,11 +8566,11 @@ PLANT PROTEIN 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1205020016 - text_unavailable + + 000013 + center-vertical-horizontal @@ -8645,7 +8645,7 @@ PLANT PROTEIN Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8805,11 +8805,11 @@ PLANT PROTEIN 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050100021205020018 - text_unavailable + + 000013 + center-vertical-horizontal diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index b5821efb..9d3e0d4f 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -505,6 +505,8 @@ + + 10 497 diff --git a/xml/page_catalog_group_recommend.lxml b/xml/page_catalog_group_recommend.lxml index 504388e4..8488a717 100644 --- a/xml/page_catalog_group_recommend.lxml +++ b/xml/page_catalog_group_recommend.lxml @@ -599,7 +599,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -762,11 +762,11 @@ PLANT PROTEIN 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1206010001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -841,7 +841,7 @@ PLANT PROTEIN Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1001,11 +1001,11 @@ PLANT PROTEIN 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1206010002 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1080,7 +1080,7 @@ PLANT PROTEIN Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1248,11 +1248,11 @@ Sugar Oreo 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1203030026 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1327,7 +1327,7 @@ Sugar Oreo Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1487,11 +1487,11 @@ Sugar Oreo 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1566,7 +1566,7 @@ Sugar Oreo Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1726,11 +1726,11 @@ Sugar Oreo 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100031201020001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1805,7 +1805,7 @@ Sugar Oreo Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1977,11 +1977,11 @@ Strawberry, Orange, Floral 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010013 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2056,7 +2056,7 @@ Strawberry, Orange, Floral Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2228,11 +2228,11 @@ Note: Blue Berry & Floral 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010020 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2307,7 +2307,7 @@ Note: Blue Berry & Floral Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2479,11 +2479,11 @@ Note: Strawberry & Floral 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010022 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2558,7 +2558,7 @@ Note: Strawberry & Floral Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2730,11 +2730,11 @@ Note: Jasmine & Honey 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010024 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2809,7 +2809,7 @@ Note: Jasmine & Honey Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2981,11 +2981,11 @@ Note: Whisky & Vanilla 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010026 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3060,7 +3060,7 @@ Note: Whisky & Vanilla Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3232,11 +3232,11 @@ Note: Peach, tea, chocolate 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010028 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3311,7 +3311,7 @@ Note: Peach, tea, chocolate Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3480,11 +3480,11 @@ PURE BEAUTY 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010033 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3559,7 +3559,7 @@ PURE BEAUTY Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3722,11 +3722,11 @@ GEISHA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010036 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3801,7 +3801,7 @@ GEISHA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3970,11 +3970,11 @@ Pink​ Rose & Berry 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1201010037 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4049,7 +4049,7 @@ Pink​ Rose & Berry Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4221,11 +4221,11 @@ Guji Queen Berry 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100141201020011 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4300,7 +4300,7 @@ Guji Queen Berry Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4472,11 +4472,11 @@ Note: Blue Berry & Floral 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100191201020019 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4551,7 +4551,7 @@ Note: Blue Berry & Floral Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4723,11 +4723,11 @@ Note: Strawberry & Floral 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100211201020021 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4802,7 +4802,7 @@ Note: Strawberry & Floral Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4974,11 +4974,11 @@ Note: Whisky & Vanilla 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100251201020025 - text_unavailable + + 000013 + center-vertical-horizontal @@ -5053,7 +5053,7 @@ Note: Whisky & Vanilla Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5225,11 +5225,11 @@ Note: Jasmine & Honey 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100231201020023 - text_unavailable + + 000013 + center-vertical-horizontal @@ -5304,7 +5304,7 @@ Note: Jasmine & Honey Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5476,11 +5476,11 @@ Note: Peach, tea, chocolate 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100271201020027 - text_unavailable + + 000013 + center-vertical-horizontal @@ -5555,7 +5555,7 @@ Note: Peach, tea, chocolate Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5724,11 +5724,11 @@ PURE BEAUTY 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100321201020032 - text_unavailable + + 000013 + center-vertical-horizontal @@ -5803,7 +5803,7 @@ PURE BEAUTY Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5969,11 +5969,11 @@ GEISHA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100351201020035 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6048,7 +6048,7 @@ GEISHA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6220,11 +6220,11 @@ Pink​ Rose & Berry 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12010100381201020038 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6299,7 +6299,7 @@ Pink​ Rose & Berry Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6462,11 +6462,11 @@ Pink​ Rose & Berry 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120101000412010200021201030002 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6541,7 +6541,7 @@ Pink​ Rose & Berry Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6701,11 +6701,11 @@ Pink​ Rose & Berry 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201003712020200371202030037 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6780,7 +6780,7 @@ Pink​ Rose & Berry Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6940,11 +6940,11 @@ Pink​ Rose & Berry 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201002612020200261202030026 - text_unavailable + + 000013 + center-vertical-horizontal @@ -7019,7 +7019,7 @@ Pink​ Rose & Berry Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7179,11 +7179,11 @@ Pink​ Rose & Berry 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201002412020200241202030024 - text_unavailable + + 000013 + center-vertical-horizontal @@ -7258,7 +7258,7 @@ Pink​ Rose & Berry Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7418,11 +7418,11 @@ Pink​ Rose & Berry 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120301000212030200021203030002 - text_unavailable + + 000013 + center-vertical-horizontal @@ -7497,7 +7497,7 @@ Pink​ Rose & Berry Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7657,11 +7657,11 @@ Pink​ Rose & Berry 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120301000112030200011203030001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -7736,7 +7736,7 @@ Pink​ Rose & Berry Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7898,11 +7898,11 @@ Sugar 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12030200061203030006 - text_unavailable + + 000013 + center-vertical-horizontal @@ -7977,7 +7977,7 @@ Sugar Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8139,11 +8139,11 @@ SMOOTHIE 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1203030011 - text_unavailable + + 000013 + center-vertical-horizontal @@ -8218,7 +8218,7 @@ SMOOTHIE Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8378,11 +8378,11 @@ SMOOTHIE 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120301002212030200221203030022 - text_unavailable + + 000013 + center-vertical-horizontal @@ -8457,7 +8457,7 @@ SMOOTHIE Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8619,11 +8619,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1203030009 - text_unavailable + + 000013 + center-vertical-horizontal @@ -8698,7 +8698,7 @@ VOLCANO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8857,11 +8857,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1203030020 - text_unavailable + + 000013 + center-vertical-horizontal @@ -8936,7 +8936,7 @@ VOLCANO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9092,11 +9092,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200071205030007 - text_unavailable + + 000013 + center-vertical-horizontal @@ -9171,7 +9171,7 @@ VOLCANO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9327,11 +9327,11 @@ VOLCANO 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200461205030046 - text_unavailable + + 000013 + center-vertical-horizontal @@ -9406,7 +9406,7 @@ VOLCANO Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9565,11 +9565,11 @@ DRINK SODA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200351205030035 - text_unavailable + + 000013 + center-vertical-horizontal @@ -9644,7 +9644,7 @@ DRINK SODA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -9806,11 +9806,11 @@ LIMENADE SODA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12050200251205030025 - text_unavailable + + 000013 + center-vertical-horizontal diff --git a/xml/page_catalog_group_tea.lxml b/xml/page_catalog_group_tea.lxml index 74274126..2c4d846e 100644 --- a/xml/page_catalog_group_tea.lxml +++ b/xml/page_catalog_group_tea.lxml @@ -562,7 +562,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -722,11 +722,11 @@ 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201000112020200011202030001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -801,7 +801,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -961,11 +961,11 @@ 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201002012020200201202030020 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1040,7 +1040,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1200,11 +1200,11 @@ 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201001712050200271205030027 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1279,7 +1279,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1439,11 +1439,11 @@ 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201000712020200071202030007 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1518,7 +1518,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1681,11 +1681,11 @@ GINGER TEA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1202010021 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1760,7 +1760,7 @@ GINGER TEA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1920,11 +1920,11 @@ GINGER TEA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201003912020200391202030039 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1999,7 +1999,7 @@ GINGER TEA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2159,11 +2159,11 @@ GINGER TEA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201002412020200241202030024 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2238,7 +2238,7 @@ GINGER TEA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2398,11 +2398,11 @@ GINGER TEA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201002512020200251202030025 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2477,7 +2477,7 @@ GINGER TEA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2637,11 +2637,11 @@ GINGER TEA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201000312020200031202030003 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2716,7 +2716,7 @@ GINGER TEA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2876,11 +2876,11 @@ GINGER TEA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201000412020200041202030004 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2955,7 +2955,7 @@ GINGER TEA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3115,11 +3115,11 @@ GINGER TEA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201002612020200261202030026 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3194,7 +3194,7 @@ GINGER TEA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3354,11 +3354,11 @@ GINGER TEA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201003712020200371202030037 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3433,7 +3433,7 @@ GINGER TEA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3593,11 +3593,11 @@ GINGER TEA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201002712020200271202030027 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3672,7 +3672,7 @@ GINGER TEA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3838,11 +3838,11 @@ LIMENADE 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201002812020200281202030028 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3917,7 +3917,7 @@ LIMENADE Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4077,11 +4077,11 @@ LIMENADE 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201001112020200111202030011 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4156,7 +4156,7 @@ LIMENADE Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4322,11 +4322,11 @@ LIMENADE 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201001212020200121202030012 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4401,7 +4401,7 @@ LIMENADE Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4567,11 +4567,11 @@ TEA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201000612020200061202030006 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4646,7 +4646,7 @@ TEA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4806,11 +4806,11 @@ TEA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201000812020200081202030008 - text_unavailable + + 000013 + center-vertical-horizontal @@ -4885,7 +4885,7 @@ TEA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5045,11 +5045,11 @@ TEA 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201001912020200191202030019 - text_unavailable + + 000013 + center-vertical-horizontal @@ -5124,7 +5124,7 @@ TEA Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5290,11 +5290,11 @@ Water 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12020200091202010009 - text_unavailable + + 000013 + center-vertical-horizontal @@ -5369,7 +5369,7 @@ Water Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5535,11 +5535,11 @@ Water 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201002212020200221202030022 - text_unavailable + + 000013 + center-vertical-horizontal @@ -5614,7 +5614,7 @@ Water Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5774,11 +5774,11 @@ Water 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum120201001612020200171202030017 - text_unavailable + + 000013 + center-vertical-horizontal @@ -5853,7 +5853,7 @@ Water Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6013,11 +6013,11 @@ Water 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12020100291202020029 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6092,7 +6092,7 @@ Water Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6255,11 +6255,11 @@ LIMENADE 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12020100301202020030 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6334,7 +6334,7 @@ LIMENADE Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6497,11 +6497,11 @@ LIMENADE 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12020100311202020031 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6576,7 +6576,7 @@ LIMENADE Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6742,11 +6742,11 @@ Water 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12020100321202020032 - text_unavailable + + 000013 + center-vertical-horizontal @@ -6821,7 +6821,7 @@ Water Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6981,11 +6981,11 @@ Water 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum12020100381202020038 - text_unavailable + + 000013 + center-vertical-horizontal diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index a435cbed..4839f2d0 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -505,6 +505,11 @@ + + + + + 10 497 diff --git a/xml/page_catalog_group_whey.lxml b/xml/page_catalog_group_whey.lxml index 75a919e0..7f5d2e92 100644 --- a/xml/page_catalog_group_whey.lxml +++ b/xml/page_catalog_group_whey.lxml @@ -565,7 +565,7 @@ Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -724,11 +724,11 @@ Matcha, & Milk 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204020001 - text_unavailable + + 000013 + center-vertical-horizontal @@ -803,7 +803,7 @@ Matcha, & Milk Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -962,11 +962,11 @@ Matcha, & Milk 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204020016 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1041,7 +1041,7 @@ Matcha, & Milk Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1200,11 +1200,11 @@ Cocoa, & Milk 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204020002 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1279,7 +1279,7 @@ Cocoa, & Milk Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1444,11 +1444,11 @@ Strawberry Syrup 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204020003 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1523,7 +1523,7 @@ Strawberry Syrup Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1688,11 +1688,11 @@ Strawberry Syrup 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204020013 - text_unavailable + + 000013 + center-vertical-horizontal @@ -1767,7 +1767,7 @@ Strawberry Syrup Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1929,11 +1929,11 @@ Melon Syrup 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204020018 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2008,7 +2008,7 @@ Melon Syrup Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2167,11 +2167,11 @@ Melon Syrup 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204020004 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2246,7 +2246,7 @@ Melon Syrup Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2405,11 +2405,11 @@ Thai Tea, & Milk 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204020005 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2484,7 +2484,7 @@ Thai Tea, & Milk Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2643,11 +2643,11 @@ Thai Tea, & Milk 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204020015 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2722,7 +2722,7 @@ Thai Tea, & Milk Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2887,11 +2887,11 @@ Kokuto syrup 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204020006 - text_unavailable + + 000013 + center-vertical-horizontal @@ -2966,7 +2966,7 @@ Kokuto syrup Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3131,11 +3131,11 @@ Taiwanese Tea, Sugar 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204020008 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3210,7 +3210,7 @@ Taiwanese Tea, Sugar Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3375,11 +3375,11 @@ Taiwanese Tea, Sugar 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204020017 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3454,7 +3454,7 @@ Taiwanese Tea, Sugar Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3616,11 +3616,11 @@ Caramel Syrup 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204020009 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3695,7 +3695,7 @@ Caramel Syrup Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3851,11 +3851,11 @@ Caramel Syrup 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204020010 - text_unavailable + + 000013 + center-vertical-horizontal @@ -3930,7 +3930,7 @@ Caramel Syrup Var SelectDrinkType = 0 - Open "ROOT/taobin_project/xml/page_topping_select5.xml" + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4086,11 +4086,11 @@ Caramel Syrup 32 128 64 - MITRegularTTF - 0x5A5A5A "disable-show" $Sum1204020011 - text_unavailable + + 000013 + center-vertical-horizontal diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml index 0657ce46..d02c3e23 100644 --- a/xml/page_catalog_group_whey.xml +++ b/xml/page_catalog_group_whey.xml @@ -510,6 +510,9 @@ + + + 10 497 diff --git a/xml/page_topping_select6.lxml b/xml/page_topping_select6.lxml new file mode 100644 index 00000000..d8279ebe --- /dev/null +++ b/xml/page_topping_select6.lxml @@ -0,0 +1,3504 @@ + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + + Var UserSeletedSugar = 0 + + SAVELOG "Event Open Select 6" + + Var y_topping_bg = 912 + + Var CHECK_EventOpen_Double = CHECK_EventOpen_Double + 1 + If CHECK_EventOpen_Double > 1 Then + WRITE_FILE "/mnt/sdcard/xml_alert_bug" "double called" + EndIf + + WEB "DISABLE" + DEBUGVAR Seeker + + Var BGSugarNew = "Invisible" + + DEBUGVAR video_menu_0 + + DEBUGVAR SelectDrink + DEBUGVAR PictureDrink + + + Var SaveProductCodeSelect = "-" + Var UserSelectProductCode = "-" + + Var showText4 = "Invisible" + Var showText7 = "Invisible" + + DEBUGVAR UserSelectProductCode + + Var blendedState = "Enable" + Var DisableUsingCode = "false" + Var ShowLidStraw = "Invisible" + Var ShowLidOnly = "Invisible" + Var ShowCollagenOnly = "Invisible" + + Var blendedStateShow = "Invisible" + Var ShotCoffeeBG = "Invisible" + Var showShotEnable = "Invisible" + Var ShowLidStraw = "Invisible" + Var ShowStrawOnly = "Invisible" + Var ShowLidOnly = "Invisible" + + ; On open + Var lidAndStrawOldPageIgnore = "true" + Var SugarState1 = "Invisible" + Var SugarState2 = "Invisible" + Var SugarState3 = "Invisible" + Var SugarState4 = "Invisible" + Var SugarState5 = "Invisible" + Var SugarState6 = "Invisible" + + Var AddShotEnable = "Invisible" + + Var BGSugar = "Invisible" + Var ShotCoffeeBG = "Invisible" + + Var showShotEnable = "Invisible" + Var ShotCoffeePremium = "Invisible" + Var showOreoAddEnable = "Invisible" + + Var BGSugarHotHealthy = "Invisible" + Var BGSugarColdHealthy = "Invisible" + + Var showText8 = "Invisible" + + ;Var showShotEnable = "Enable" + ;Var ShotCoffeePremium = "Enable" + ;Var showOreoAddEnable = "Enable" + + Var ExtraTopping = "Invisible" + + ; On open + Var LidState = Lid1Status + + ;SAVELOG PreviseXMLFileName2 + + + Var topping1 = "1" + Var topping2 = "31" + Var topping3 = "31" + + + Var BugFlag = 0 + + If show_eng = "true" Then + + Var DirImage = "ROOT/taobin_project/image/topping2_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + Var showname = NameDrink + Var showdesc = DrinkDescription + + Var text_show_thai = "Invisible" + Var text_show_eng = "Enable" + + Var topping_shot_price_x = 630 + Var text_x_add_oreo_price = 510 + Var text_show_normal_x = 408 + Else + + Var DirImage = "ROOT/taobin_project/image/topping2" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + Var showname = NameDrinkTH + Var showdesc = DrinkDescriptionTH + + Var text_show_thai = "Enable" + Var text_show_eng = "Invisible" + + Var topping_shot_price_x = 600 + Var text_x_add_oreo_price = 490 + Var text_show_normal_x = 386 + + EndIf + + 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" + + + + Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png" + Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png" + + Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png" + Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png" + + + + ;Var blendedState = "Enable" + ;Var ShotCoffeeBG = "Enable" + ;Var showShotEnable = "Enable" + ;Var ShowLidStraw = "Enable" + ;Var ShowStrawOnly = "Enable" + ;Var ShowLidOnly = "Enable" + + Var ShiftSugarStep = 1 + + + CRLFToSpace showname + CRLFToSpace showdesc + + ;- Begin + Var PriceDrinkNoTop = PriceDrink + Var PriceDrinkTmp = PriceDrink + Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp + Var Timeout = 0 + + ;SAVELOG PriceDrinkTmp + ;- End + + If RoadShow = "true" Then + Var PriceDrinkTmp = "Free" + Var SaveSelectDrinkRoadShow = SelectDrink + EndIf + + DEBUGVAR SaveSelectDrinkRoadShow + + If ShowPrice = "Invisible" Then + Var PriceDrinkTmpShow = "Free" + EndIf + + Var StateImgKeto = "Invisible" + + + Var ToppingGotoPayment = "true" + + DEBUGVAR backGroundAddExtra + DEBUGVAR backGroundAddShotPremium + + DEBUGVAR MultiPayEnable + DEBUGVAR CART_COUNT + Var btnAddCart = "Invisible" + If MultiPayEnable = "true" Then + Var btnAddCart = "Enable" + If CART_COUNT = 3 Then + Var btnAddCart = "Invisible" + EndIf + EndIf + + Var LidDeactiveButton = "Invisible" + Var StrawDeactiveButton = "Invisible" + + Machine DoorClose + Machine DoorLidClose + + Var ButtonNext = "false" + + Var NEW_MULTI = "Invisible" + + Var high_light_drink_type = "Invisible" + + Var text_hot_color = "0x84776F" + Var text_cold_color = "0x84776F" + Var text_blender_color = "0x84776F" + + If new_layout = "true" Then + Var PriceDrinkTmpShow = "---" + + Var show_select_type = "Enable" + + Var hot_button_state = PD_STAGE_1 + Var cold_button_state = PD_STAGE_2 + Var blend_button_state = PD_STAGE_3 + + ; Protect have product-code but menu disable or invalid. + If hot_button_state = "Invisible" Then + + Var hot_button_state = "Disable2" + EndIf + If cold_button_state = "Invisible" Then + + Var cold_button_state = "Disable2" + EndIf + If blend_button_state = "Invisible" Then + + Var blend_button_state = "Disable2" + EndIf + + + Function 2 + + Else + Var show_select_type = "Invisible" + + ; assume auto select + Var SelectDrinkType = 1 + EndIf + + DEBUGVAR show_select_type + DEBUGVAR PriceD1 + DEBUGVAR PriceD2 + DEBUGVAR PriceD3 + + If hot_button_state = "Disable2" Then + Var text_price_d1 = "" + Else + Var text_price_d1 !assigned StringFmt( PriceD1 , DisplayFormat, PreScaleConvertShow) + EndIf + + If cold_button_state = "Disable2" Then + Var text_price_d2 = "" + Else + Var text_price_d2 !assigned StringFmt( PriceD2 , DisplayFormat, PreScaleConvertShow) + EndIf + + If blend_button_state = "Disable2" Then + Var text_price_d3 = "" + Else + Var text_price_d3 !assigned StringFmt( PriceD3 , DisplayFormat, PreScaleConvertShow) + EndIf + + DEBUGVAR PD_CODE1 + DEBUGVAR PD_CODE2 + DEBUGVAR PD_CODE3 + DEBUGVAR PD_STAGE_1 + DEBUGVAR PD_STAGE_2 + DEBUGVAR PD_STAGE_3 + + Var img_cold = "/bt_cold_no.png" + Var img_cold_sel = "/bt_cold_selected_no.png" + Var img_cold_dis = "/bt_cold_disable_no.png" + Var img_cold_dis2 = "/bt_cold_disable2_no.png" + + + Var img_smth = "/bt_smoothie_no.png" + Var img_smth_sel = "/bt_smoothie_selected_no.png" + Var img_smth_dis = "/bt_smoothie_disable_no.png" + Var img_smth_dis2 = "/bt_smoothie_disable2_no.png" + + + Var topping_price_refresh = 1 + + Var StrawState = "Enable" + Var LidState = "Enable" + Var MAT_ID_9701 = StrawState + + Var SubMenuGroupIDSlot6_1 = 0 + + + Var bg_lidProblem_ST = "Invisible" + Var GetLidButtonState = "Invisible" + + + + 1000 + + DEBUGVAR Timeout + + + Var Timeout = Timeout + 1 + + If Timeout > 40 Then + Var Timeout = 0 + If Seeker = "next" Then + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + + EndIf + + If MultiPayEnable = "true" Then + If NEW_MULTI = "Invisible" Then + Var NEW_MULTI = "Enable" + Else + Var NEW_MULTI = "Invisible" + EndIf + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + + EndIf + EndIf + + Refresh + TimerReset + + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + + + + + +; + + +; back + + + + DEBUGVAR MAT_ID_9701 + DEBUGVAR MAT_ID_9601 + + + DEBUGVAR SubMenuProductCode1 + DEBUGVAR SubMenuName11 + DEBUGVAR SubMenuPrice1 + + DEBUGVAR SubMenuProductCode2 + DEBUGVAR SubMenuName12 + + DEBUGVAR TOPPING1 + DEBUGVAR TOPPING1_EXT_2 + DEBUGVAR TOPPING2 + DEBUGVAR TOPPING3 + DEBUGVAR TOPPING4 + DEBUGVAR TOPPING5 + DEBUGVAR TOPPING6 + DEBUGVAR toppingID1index1 + DEBUGVAR toppingID1index2 + DEBUGVAR toppingID1index3 + DEBUGVAR toppingID1index4 + DEBUGVAR toppingID1index5 + DEBUGVAR toppingID1index6 + DEBUGVAR toppingID1index7 + DEBUGVAR toppingID1index8 + DEBUGVAR toppingID1index9 + + DEBUGVAR toppingID2index1 + DEBUGVAR toppingID2index2 + DEBUGVAR toppingID2index3 + DEBUGVAR toppingID2index4 + DEBUGVAR toppingID2index5 + + If toppingID1index5 > 0 Then + SAVELOG "toppingID1index5 not set" + EndIf + + + + + DEBUGVAR MenuCodeName + DEBUGVAR toppingID1Default + DEBUGVAR toppingID2Default + DEBUGVAR toppingID3Default + + + DEBUGVAR toppingID2price2 + DEBUGVAR toppingID3price2 + DEBUGVAR toppingID6price2 + + DEBUGVAR BrewParam + DEBUGVAR UserSeletedSugar + + If BugFlag = 1 Then + + Else + + + If TOPPING6 = "Topping-Volcano" Then + + If toppingID6price2 > 0 Then + DEBUGVAR toppingID6price2 + DEBUGVAR DisplayFormat + + Var toppingID6price2Conv !assigned StringFmt( toppingID6price2 , DisplayFormat, PreScaleConvertShow) + + DEBUGVAR toppingID6price2Conv + + Var text_price_6 = "" + + Var text_price_6 = toppingID6price2Conv + ")" + Var text_price_6 = "(+" + text_price_6 + + + + DEBUGVAR text_price_6 + Else + + Var text_price_6 = "" + EndIf + + If blend_button_state = "PressForever" Then + + Var showOreoAddEnable = "Enable" + Var showText8 = "Invisible" + Else + Var showOreoAddEnable = "Disable" + Var showText8 = "Enable" + + EndIf + + Var ExtraTopping = "Enable" + + + If blend_button_state = "Disable2" Then + If hot_button_state = "Disable2" Then + If cold_button_state = "PressForever" Then + Var showOreoAddEnable = "Enable" + Var showText8 = "Invisible" + EndIf + EndIf + EndIf + EndIf + + DEBUGVAR SubMenuGroupIDSlot6_1 + + + ; i f Hot menu disable away + If hot_button_state = "PressForever" Then + If showOreoAddEnable = "Enable" Then + Var showOreoAddEnable = "Disable" + EndIf + If showOreoAddEnable = "Press" Then + Var showOreoAddEnable = "Disable" + EndIf + EndIf + + ; first time. + If blend_button_state = "PressForever" Then + + Else + If SubMenuGroupIDSlot6_1 = 300 Then + Var showOreoAddEnable = "Disable" + Var showText8 = "Enable" + Var ExtraTopping = "Enable" + EndIf + EndIf + + STRCONTAIN "9701" BrewParam IgnoreLidStraw + + DEBUGVAR BrewParam + DEBUGVAR IgnoreLidStraw + + Var h_block_of_sugar = 210 + + + + If IgnoreLidStraw = "true" Then + Var IgnoreLidStraw = "false" + Var ShowLidStraw = "Invisible" + Var ShowLidOnly = "Invisible" + Var ShowStrawOnly = "Invisible" + + + Else + Var ShowLidStraw = "Enable" + If StrawState = "Enable" Then + If MAT_ID_9701 = "Enable" Then + Var StrawState = MAT_ID_9701 + Else + Var StrawState = MAT_ID_9701 + EndIf + EndIf + DEBUGVAR MAT_ID_9701 + DEBUGVAR StrawState + + If StrawState = "Press" Then + Var Seeker.thankStrawFlag = 1 + Else + Var Seeker.thankStrawFlag = 0 + EndIf + + + If LidState = "Enable" Then + If MAT_ID_9601 = "Enable" Then + Var LidState = MAT_ID_9601 + Else + Var LidState = MAT_ID_9601 + EndIf + EndIf + + EndIf + + ; Override all + If Service_LidStraw = "Disable" Then + Var ShowLidStraw = "Enable" + ;Var ShowLidOnly = "Invisible" + ;Var ShowStawOnly = "Invisible" + + + Var StrawState = "Disable" + Var LidState = "Disable" + + EndIf + + If StrawState = "Enable" Then + Var StrawDeactiveButton = "Invisible" + Else + If StrawState = "Press" Then + Var StrawDeactiveButton = "Invisible" + Else + Var StrawDeactiveButton = "Enable" + EndIf + EndIf + + + If LidState = "Enable" Then + Var LidDeactiveButton = "Invisible" + Else + If LidState = "Press" Then + Var LidDeactiveButton = "Invisible" + Else + Var LidDeactiveButton = "Enable" + EndIf + EndIf + + + If UserSeletedSugar = 0 Then + If SugarModeUpdateWhenChangeDrinkType = 1 Then + Var SugarModeUpdateWhenChangeDrinkType = 0 + RefreshAll + Else + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + Var SugarState6 = "Enable" + EndIf + + Var sugar_default_flag = 0 + + ; Suger 4 step cold + If TOPPING1 = "Suger 4 step cold" Then + + + Var BGSugar = "Invisible" + + Var ShiftSugarStep = 1 + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + + If toppingID1index1 = toppingID1Default Then + Var SugarState1 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState2 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState3 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index4 = toppingID1Default Then + Var SugarState4 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If sugar_default_flag = 0 Then + Var SugarState1 = "PressForever" + EndIf + EndIf + + ; Suger 4 step hot + If TOPPING1 = "Suger 4 step hot" Then + + + Var BGSugar = "Invisible" + + Var ShiftSugarStep = 1 + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + + If toppingID1index1 = toppingID1Default Then + Var SugarState1 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState2 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState3 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index4 = toppingID1Default Then + Var SugarState4 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If sugar_default_flag = 0 Then + Var SugarState1 = "PressForever" + EndIf + EndIf + + DEBUGVAR RecipeTag2 + ; + If TOPPING1 = "Sugar" Then + + If RecipeTag2 = "Topping6Step" Then + Var BGSugar = "Invisible" + Var BGSugarNew = "Enable" + Else + Var BGSugar = "Enable" + EndIf + + Var ShiftSugarStep = 1 + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + If toppingID1index1 = toppingID1Default Then + Var SugarState1 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState2 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState3 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index4 = toppingID1Default Then + Var SugarState4 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index5 = toppingID1Default Then + Var SugarState5 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If sugar_default_flag = 0 Then + Var SugarState1 = "PressForever" + EndIf + + + EndIf + + If TOPPING1 = "Powder Sugar" Then + + If RecipeTag2 = "Topping6Step" Then + Var BGSugar = "Invisible" + Var BGSugarNew = "Enable" + Else + Var BGSugar = "Enable" + EndIf + + Var ShiftSugarStep = 1 + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + Var SugarState6 = "Enable" + + DEBUGVAR "set default Powder Sugar" + + If toppingID1index1 = toppingID1Default Then + Var SugarState1 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState2 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState3 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index4 = toppingID1Default Then + Var SugarState4 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index5 = toppingID1Default Then + Var SugarState5 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If sugar_default_flag = 0 Then + Var SugarState1 = "PressForever" + EndIf + + DEBUGVAR toppingID1Default + DEBUGVAR SugarState1 + EndIf + + + If TOPPING1 = "Sugar Premix 25" Then + + If RecipeTag2 = "Topping6Step" Then + Var BGSugar = "Invisible" + Var BGSugarNew = "Enable" + Else + Var BGSugar = "Enable" + EndIf + + Var ShiftSugarStep = 2 + Var SugarState1 = "Disable" + Var SugarState2 = "Enable" + + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + Var SugarState6 = "Enable" + + If toppingID1index1 = toppingID1Default Then + Var SugarState2 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState3 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState4 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index4 = toppingID1Default Then + Var SugarState5 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If sugar_default_flag = 0 Then + Var SugarState2 = "PressForever" + EndIf + + EndIf + + If TOPPING1 = "Powder Sugar Premix 50" Then + + If RecipeTag2 = "Topping6Step" Then + Var BGSugar = "Invisible" + Var BGSugarNew = "Enable" + Else + Var BGSugar = "Enable" + EndIf + Var ShiftSugarStep = 3 + Var SugarState1 = "Disable" + Var SugarState2 = "Disable" + If RecipeTag2 = "Topping6Step" Then + Var SugarState3 = "Disable" + Else + Var SugarState3 = "Enable" + EndIf + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + Var SugarState6 = "Enable" + + If toppingID1index1 = toppingID1Default Then + Var SugarState3 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState4 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState5 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If sugar_default_flag = 0 Then + Var SugarState3 = "PressForever" + EndIf + + EndIf + + If TOPPING1 = "Powder Sugar Premix 25" Then + If RecipeTag2 = "Topping6Step" Then + Var BGSugar = "Invisible" + Var BGSugarNew = "Enable" + Else + Var BGSugar = "Enable" + EndIf + + Var ShiftSugarStep = 2 + + Var SugarState2 = "Enable" + + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + If toppingID1index1 = toppingID1Default Then + Var SugarState2 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState3 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState4 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index4 = toppingID1Default Then + Var SugarState5 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If sugar_default_flag = 0 Then + Var SugarState2 = "PressForever" + EndIf + EndIf + + Var SugarModeUpdateWhenChangeDrinkType = 0 + + If TOPPING1 = "Suger 4 step cold" Then + Var BGSugarColdHealthy = "Enable" + Var BGSugarHotHealthy = "Invisible" + + Var ShiftSugarStep = 1 + Var SugarModeUpdateWhenChangeDrinkType = 1 + EndIf + + If TOPPING1 = "Suger 4 step hot" Then + Var BGSugarHotHealthy = "Enable" + Var BGSugarColdHealthy = "Invisible" + + Var ShiftSugarStep = 1 + Var SugarModeUpdateWhenChangeDrinkType = 1 + EndIf + + + Var ShowCollagenOnly = "Enable" + + Var BugFlag = 1 + + Var topping1 = toppingID1Default + + + Var ToppingGotoPayment = "false" + + If BGSugar = "Enable" Then + If SelectDrinkType = 1 Then + If show_eng = "true" Then + Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" + Else + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" + EndIf + EndIf + EndIf + + DEBUGVAR SelectDrinkType + + If SelectDrinkType = 0 Then + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + EndIf + + Else + + EndIf + ; End of UserSeletedSugar = 0 + + Refresh + + Var collagenShow = "true" +;-BEGIN shot layout + + If topping_price_refresh = 1 Then + Var topping_price_refresh = 0 + + Var topping3 = toppingID3Default + Var shot_h_layout = 218 + + If TOPPING2 = "shot coffee" Then + + Var ShotCoffeeBG = "Enable" + Var showShotEnable = "Enable" + Var ExtraTopping = "Enable" + + Var toppingID2price2Conv !assigned StringFmt( toppingID2price2 , DisplayFormat, PreScaleConvertShow) + + DEBUGVAR toppingID2price2Conv + Var text_shot_normal_add = toppingID2price2Conv + ")" + Var text_shot_normal_add = "(+" + text_shot_normal_add + + Refresh + EndIf + + + If TOPPING2 = "shot coffee termtem" Then + + Var ShotCoffeeBG = "Enable" + Var showShotEnable = "Enable" + + Var ExtraTopping = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + + If TOPPING2 = "shot coffee 1003" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Invisible" + Var ExtraTopping = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + If TOPPING2 = "shot coffee 1007" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Invisible" + Var ExtraTopping = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + If TOPPING2 = "shot coffee 1008" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Invisible" + Var ExtraTopping = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + + If TOPPING2 = "add-show-1009" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Invisible" + Var ExtraTopping = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + If TOPPING2 = "add-show-1101" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Invisible" + Var ExtraTopping = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + + If TOPPING2 = "add-show-1102" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Invisible" + Var ExtraTopping = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + + If TOPPING2 = "add-show-1103" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Invisible" + Var ExtraTopping = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + If TOPPING2 = "add-show-1104" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Invisible" + Var ExtraTopping = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + + If TOPPING2 = "add-show-1105" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Invisible" + Var ExtraTopping = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + + If ShotCoffeePremium = "Enable" Then + Var toppingID2price2Conv !assigned StringFmt( toppingID2price2 , DisplayFormat, PreScaleConvertShow) + + DEBUGVAR toppingID2price2Conv + Var text_price_topping = toppingID2price2Conv + ")" + Var text_price_topping = "(+" + text_price_topping + + EndIf + + ;-END + If TOPPING3 = "Collagen" Then + Var CollagenState = "Enable" + Else + Var CollagenState = "Invisible" + Var ShowCollagenOnly = "Invisible" + EndIf + + EndIf + ;topping_price_refresh = 0 + + + SAVELOG ToppingGotoPayment + If ToppingGotoPayment = "true" Then + Topping "Select" SelectDrink + ; Pack + + Topping "Pack" ExtendDataCurr + Var Seeker.ExtendDataCurr = ExtendDataCurr + + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" + Open "ROOT/taobin_project/xml/page_payment.xml" + EndIf + + + If RoadShow = "true" Then + Var PriceShowValue = "Free" + EndIf + + DEBUGVAR showShotEnable + DEBUGVAR showOreoAddEnable + DEBUGVAR ShotCoffeePremium + DEBUGVAR toppingID2price1 + DEBUGVAR toppingID2price2 + DEBUGVAR toppingID2price3 + Function 2 + EndIf + + + + + + ;Var BugFlag = 1 + If CartUpdate = "true" Then + Var CartUpdate = "-" + + + If CART_COUNT = 3 Then + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" + Open "ROOT/taobin_project/xml/page_payment_multi.xml" + Else + If ButtonNext = "true" Then + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" + Open "ROOT/taobin_project/xml/page_payment_multi.xml" + Else + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + EndIf + EndIf + + + +; same + + 374 + 382 + 331 + 436 + PictureDrink + + + + + 374 + 399 + eval( + If IsSmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + + "ROOT/taobin_project/image/topping2/blender_icon.png" + + +; same + + + 0 + 752 + 1080 + Center + 72 + KanitMediumTTF + 0x513C2F + showname + +; same + + 0 + 836 + 1080 + Center + 24 + KanitLightTTF + 0x6F5F51 + showdesc + + + + + + + +; +; +; +; +; +; +; +; +; +; +; +; +;- FRAME SCORELLL + + 52 + 881 + 1080 + "auto-all" + "Vertical" + 1 + + + +; show_select_type + 988 + 162 + 20 + show_select_type + + + Var( DirImage + "/drink_select_type.png" ) + + + + + + + + + + + + + + + + + 552 + 85 + KanitRegularTTF + 23 + text_hot_color + text_price_d1 + + + 710 + 85 + KanitRegularTTF + 23 + text_cold_color + text_price_d2 + + + 852 + 85 + KanitRegularTTF + 23 + text_show_thai + text_blender_color + text_price_d3 + + + 872 + 85 + KanitRegularTTF + text_show_eng + 23 + text_blender_color + text_price_d3 + + + + + +; +; +; +; +; +; +; +; +; +; +;- Begin topping new + + + 988 + 156 + 20 + BGSugarNew +; sugar layout + + "Enable" + Var( DirImage + "/bg_sugar_bank_button.png" ) + + + +; + +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +; sugar5 + + +; sugar6 + +;- END topping1 + + + +; +; +; +; +; +; +; +; +; +; +; +; +; +; +;- Begin topping2 + + + 988 + 156 + 20 + BGSugarHotHealthy +; sugar layout + + BGSugarHotHealthy + Var( DirImage + "/bg_sugar_bank_button.png" ) + + + +; + +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +;- END topping2 + + +; +; +; +; +; +; +; +; +; +; +; +; +; +; +;- Begin topping3 + + + 988 + 156 + 20 + BGSugarColdHealthy +; sugar layout + + BGSugarColdHealthy + Var( DirImage + "/bg_sugar_bank_button.png" ) + + + +; + +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +;- END topping2 + + +; +; +; +; +; +; +; +; +; + +;-END +; +; +; Extra topping. +; +; +; +; +; +; +;-BEGIN shot layout + + ExtraTopping + 1080 + "auto" + 20 + + + 986 + "auto" + "vertical" + ExtraTopping +; + + 986 + 64 + ExtraTopping + + Var( DirImage + "/bg_top.png" ) + + +; +; +; + + 986 + "auto" + ShotCoffeePremium +; + + 0 + 0 + Var( DirImage + "/bg_top_b3shot.png") + + + + +; + + + + topping_shot_price_x + 2 + KanitRegularTTF + "ShotCoffeePremium" + 36 + 0x84776F + text_price_topping + + + + +; +; +; +;-BEGIN shot layout "showShotEnable" + + 986 + "auto" + showShotEnable +; + + 0 + 0 + Var( DirImage + "/bg_top_shot2.png") + +; + + +; + + + + showText4 + 602 + 4 + Var( DirImage + "/text4.png" ) + + + + text_show_normal_x + 4 + KanitRegularTTF + "Enable" + 36 + 0x84776F + text_shot_normal_add + + + + + +; +; +; +; +; + + 986 + "auto" + showOreoAddEnable +; + + 0 + 0 + Var( DirImage + "/bg_top_oreo2.png") + +; + + +; + + + + showText8 + 600 + 6 + Var( DirImage + "/text8.png" ) + + + + + text_x_add_oreo_price + 12 + KanitRegularTTF + "Enable" + 36 + 0x84776F + text_price_6 + + + + + + +; +; +; +; +; +; + + + "Enable" + 986 + 27 + -5 + + ExtraTopping + "ROOT/taobin_project/image/topping2/bg_bottom.png" + + + + + + + + +;-END +; +; +; +; +; +; +; +; +; +; +;-BEGIN Collagen +; +;-BEGIN Lid straw + + 986 + 240 + 20 + ShowLidStraw + + bg_strawlid + + +; straw left + + + + + + +; LID left + + + + + + StrawDeactiveButton + 602 + 64 + Var( DirImage + "/text20.png" ) + + + + + LidDeactiveButton + 602 + 150 + Var( DirImage + "/text21.png" ) + + + + + +; +; +; +; +; +; +; +; +; + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + +; back + + + + + + +; add cart + + + + +; next + + + + + + + + Var img_cold_no_flag = 0 + Var img_smth_no_flag = 0 + + If hot_button_state = "Disable2" Then + If blend_button_state = "Disable2" Then + Var img_cold_no_flag = 1 + Else + Var img_cold_no_flag = 1 + Var img_smth_no_flag = 2 + EndIf + EndIf + + If PriceD1 = PriceD2 Then + Var img_cold_no_flag = 1 + EndIf + + If hot_button_state = "Disable2" Then + If cold_button_state = "Disable2" Then + Var img_smth_no_flag = 1 + EndIf + EndIf + + + If img_cold_no_flag = 1 Then + SAVELOG "Cold Image change." + Var img_cold = "/bt_cold_no.png" + Var img_cold_sel = "/bt_cold_selected_no.png" + Var img_cold_dis = "/bt_cold_disable_no.png" + Var img_cold_dis2 = "/bt_cold_disable2_no.png" + Else + Var img_cold = "/bt_cold.png" + Var img_cold_sel = "/bt_cold_selected.png" + Var img_cold_dis = "/bt_cold_disable.png" + Var img_cold_dis2 = "/bt_cold_disable2.png" + EndIf + + If img_smth_no_flag = 1 Then + SAVELOG "Smoothies change img. 1" + Var img_smth = "/bt_smoothie_no.png" + Var img_smth_sel = "/bt_smoothie_selected_no.png" + Var img_smth_dis = "/bt_smoothie_disable_no.png" + Var img_smth_dis2 = "/bt_smoothie_disable2_no.png" + Else + If img_smth_no_flag = 2 Then + SAVELOG "Smoothies change img. 2" + Var img_smth = "/bt_smoothie_sub2.png" + Var img_smth_sel = "/bt_smoothie_selected_sub2.png" + Var img_smth_dis = "/bt_smoothie_disable_sub2.png" + Var img_smth_dis2 = "/bt_smoothie_disable2_sub2.png" + Else + + Var img_smth = "/bt_smoothie.png" + Var img_smth_sel = "/bt_smoothie_selected.png" + Var img_smth_dis = "/bt_smoothie_disable.png" + Var img_smth_dis2 = "/bt_smoothie_disable2.png" + EndIf + EndIf + + Var img_cold = "/bt_cold_no.png" + Var img_cold_sel = "/bt_cold_selected_no.png" + Var img_cold_dis = "/bt_cold_disable_no.png" + Var img_cold_dis2 = "/bt_cold_disable2_no.png" + + Var img_smth = "/bt_smoothie_no.png" + Var img_smth_sel = "/bt_smoothie_selected_no.png" + Var img_smth_dis = "/bt_smoothie_disable_no.png" + Var img_smth_dis2 = "/bt_smoothie_disable2_no.png" + + DEBUGVAR menu_name_thai_cold + SAVELOG "FUNCTION2" + + + Var TOPPING_PRICE = 0 + + Var SelectDrinkType = 0 + + ; Set default + If SelectCountDrinkType = 1 Then + If DefaultDrinkType = 1 Then + Var hot_button_state = "PressForever" + EndIf + If DefaultDrinkType = 2 Then + Var cold_button_state = "PressForever" + EndIf + If DefaultDrinkType = 3 Then + Var blend_button_state = "PressForever" + EndIf + + EndIf + + If hot_button_state = "PressForever" Then + Var PriceDrinkNoTop = PriceD1 + Var UserSelectProductCode = PD_CODE1 + + If showShotEnable = "Disable" Then + Var showShotEnable = "Enable" + EndIf + + Var showText4 = "Invisible" + + If show_eng = "true" Then + Var showname = menu_name_eng_hot + Var showdesc = menu_desc_eng_hot + Else + Var showname = menu_name_thai_hot + Var showdesc = menu_desc_thai_hot + EndIf + Var text_hot_color = "0xFFFFFF" + Var text_cold_color = "0x84776F" + Var text_blender_color = "0x84776F" + + Var SelectDrinkType = 1 + + Machine PreparCup + EndIf + + If cold_button_state = "PressForever" Then + Var PriceDrinkNoTop = PriceD2 + Var UserSelectProductCode = PD_CODE2 + + If showShotEnable = "Disable" Then + Var showShotEnable = "Enable" + EndIf + Var showText4 = "Invisible" + + If show_eng = "true" Then + Var showname = menu_name_eng_cold + Var showdesc = menu_desc_eng_cold + Else + Var showname = menu_name_thai_cold + Var showdesc = menu_desc_thai_cold + EndIf + + Var text_hot_color = "0x84776F" + Var text_cold_color = "0xFFFFFF" + Var text_blender_color = "0x84776F" + + Var SelectDrinkType = 1 + + Machine PreparCup + EndIf + + If blend_button_state = "PressForever" Then + Var PriceDrinkNoTop = PriceD3 + Var UserSelectProductCode = PD_CODE3 + + If showShotEnable = "Invisible" Then + + Else + Var showShotEnable = "Disable" + EndIf + Var showText4 = "Enable" + + If show_eng = "true" Then + Var showname = menu_name_eng_blender + Var showdesc = menu_desc_eng_blender + Else + Var showname = menu_name_thai_blender + Var showdesc = menu_desc_thai_blender + EndIf + + Var text_hot_color = "0x84776F" + Var text_cold_color = "0x84776F" + Var text_blender_color = "0xFFFFFF" + + Var SelectDrinkType = 1 + + Machine PreparCup + EndIf + + + DEBUGVAR PriceDrinkNoTop + DEBUGVAR PriceDiff + DEBUGVAR showShotEnable + Var TOPPING_PRICE = 0 + + If ShotCoffeePremium = "Press" Then + If blendedState = "Press" Then + Var PriceDrinkTmp = PriceDrinkNoTop + EndIf + + Var blendedState = "Disable" + Var TOPPING_PRICE = 0 + + Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 + + Var topping2 = toppingID2index2 + + Var DisableUsingCode = "true" + + Var showText7 = "Enable" + + SAVELOG "Select premi normal shot" + + Else + + If showShotEnable = "Press" Then + If blendedState = "Press" Then + Var PriceDrinkTmp = PriceDrinkNoTop + EndIf + + Var blendedState = "Disable" + + Var TOPPING_PRICE = 0 + + ;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 + Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 + + Var topping2 = toppingID2index2 + + Var DisableUsingCode = "true" + + Var showText7 = "Enable" + + SAVELOG "Select add normal shot" + Else + If blendedState = "Disable" Then + Var blendedState = "Enable" + EndIf + + + Var PriceDrinkTmp = PriceDrinkNoTop + Var topping2 = toppingID2index1 + Var DisableUsingCode = "false" + SAVELOG "Deselect add normal shot" + + Var showText7 = "Invisible" + + EndIf + + EndIf + + + DEBUGVAR showOreoAddEnable + DEBUGVAR TOPPING_PRICE + + If showOreoAddEnable = "Press" Then + Var TOPPING_PRICE = TOPPING_PRICE + toppingID6price2 + Var topping6 = toppingID6index2 + Var DisableUsingCode = "true" + Else + + ;Var PriceDrinkTmp = PriceDrinkNoTop + + Var topping6 = toppingID6index1 + + Var DisableUsingCode = "false" + + EndIf + + + DEBUGVAR SelectDrinkType + + DEBUGVAR showShotEnable + DEBUGVAR PriceDrinkTmpShow + + Var PriceDrinkTmp = PriceDrinkNoTop + TOPPING_PRICE + Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp + + If SelectDrinkType = 0 Then + Var PriceDrinkTmpShow = "---" + Else + Var PriceDrinkTmpShow !assigned StringFmt( PriceDrinkTmp , DisplayFormat, PreScaleConvertShow) + EndIf + SAVELOG PriceDrinkTmp + + If RoadShow = "true" Then + Var PriceDrinkTmp = 0 + Var PriceDrinkTmpShow = "Free" + + DEBUGVAR SelectDrink2 + DEBUGVAR PriceDrinkTmpShow + EndIf + + CRLFToSpace showname + CRLFToSpace showdesc + DEBUGVAR showname + DEBUGVAR showdesc + + + Var Timeout = 0 + + RefreshAll + + + + + + + 924 + 1804 + KanitTTF + 36 + 1080 + 0xFFFFFF + + + "OnValueChange" + + PriceDrinkTmpShow + + + + 0 + 380 + 1080 + 1540 + high_light_drink_type + "ROOT/taobin_project/image/topping2_en/topping_en/high_light_drink_type.png" + + + + + + + 543 + 920 + high_light_drink_type + KanitTTF + 36 + 1080 + 0xFF0000 + eval( + If show_eng = "true" Then + Var return = "Please choose drink type" + Else + Var return ="โปรดเลือกประเภทเครื่องดื่ม" + EndIf + ) + + + + 1 + 1 + KanitTTF + 22 + 1080 + end + 0xFF0000 + "#5" + + + +; + + From def0afc30c969f2f5f30c38e5f5347a72aa7c4e7 Mon Sep 17 00:00:00 2001 From: kong Date: Thu, 19 Jan 2023 16:10:46 +0700 Subject: [PATCH 2/3] DO lang --- image/page3_inter/bn_tabmenu.png | Bin 0 -> 823 bytes image/page3_inter/bp_tabmenu.png | Bin 0 -> 830 bytes xml/menu_catalog_new.lxml | 4 ++-- xml/page_catalog_group_appfast.lxml | 4 ++-- xml/page_catalog_group_cocktail.lxml | 4 ++-- xml/page_catalog_group_coffee.lxml | 4 ++-- xml/page_catalog_group_forkid.lxml | 4 ++-- xml/page_catalog_group_health.lxml | 4 ++-- xml/page_catalog_group_milk.lxml | 4 ++-- xml/page_catalog_group_other.lxml | 4 ++-- xml/page_catalog_group_recommend.lxml | 4 ++-- xml/page_catalog_group_tea.lxml | 4 ++-- xml/page_catalog_group_whey.lxml | 4 ++-- 13 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 image/page3_inter/bn_tabmenu.png create mode 100644 image/page3_inter/bp_tabmenu.png diff --git a/image/page3_inter/bn_tabmenu.png b/image/page3_inter/bn_tabmenu.png new file mode 100644 index 0000000000000000000000000000000000000000..8bad56aaf6ccf4f5faa924f43a88e90663eecd34 GIT binary patch literal 823 zcmeAS@N?(olHy`uVBq!ia0vp^c|e@P!3HGL53tS!Qk(@Ik;M!Q+`=Ht$S`Y;1W=H% zILO_JVcj{Imp~3nx}&cn1H;CC?mvmF3=B+XJY5_^Dj471@bwlAlsW$KzvW}zt!KY# zW(eLXSU6#U>yDEz*j_GLpeMPDbJxvnu2X)$V3pX{v}tLhrW4Dy6|RmRE!{1*S_IZ| z6u$bu+Z(2-da`ELEr&b#d3W>G+s{XqpBK!2|7O#+KIXRn&!2zK|Mv3nthM_h zw{6!x{q5`N=Wi-_eqvxnE%sfPrHuo$B+C}PrPAMlz8S`U);83m+TJT(`fy_Z~OZUv#oY};!U5gvAS{J z_;=RRyHz&tx9flT7kOjKV;^ZgW8R|z@2i{_dIsq2OtG_{*V?`M_>Q8U^IHTLiTdRT z-ClBzEopUy4!8L9KhfenpMA6!OuL|>C$#uT%(YYg*RrqHY?HMQG!+Ssxp}-{Wn}86 zx|OejpJ#n^xqo26!W(VpQqJ$%5O8xv<@4J5J1?!>b}V}R?rzn5zrFTPKd)D2=a)4T ziLQ3PeobL(7yo+Brxtmcxuzn~(a*mvKeox-Luro2q0Zq#WSwHyGZ4A=!H^?snrgH{QS3j3^P6@g8ZL1jF)+@ZdaqwDng(pW(N5_H%3zU=%UM-rd zl{EL+OqmTmyN+1d|ENnS|7ZRCP3rzL=gwID?mjKNwd&lPtdw<08ItMS?reE+>+9_D zwEr9PR-dfeI_dmVslb%K4@(yYY-n64`1;MejY&K2b}ilX@c++mU%PAnY)D!kXS4bG z$H$*vWo@!|`Lpky%x**L{ePC9&+ROK`e^2=?i@8a@1sRGk7Yk!ySjS*!qR#6l_}oc z+?hwVX57{DIe+f#|9$VKS4cmUN|ckZ$~&y?ceC%1pY!Y1#f2~LHQCk`*jLK_=eo8$ z{aIda++^?e55Y5w|K-_;^&P$F<~MKKwrzV7t6Sdh+x^|aXn+0hV{E2c;v(y zqfmQmsc%0|?97s=;*&E=xqaY#aeU3kOFpwIpV!7qRCP|ToGbnP_QdbXiLWo$2bR5m zX^;~Aqg-1sQZ=WhW_lbKv$)pHaGkBolP{f-P7(B%_}DW1h@Bt4WIl~enXqwna{i^a Z?3PKT%M&D?%mF5M22WQ%mvv4FO#q8zevkkF literal 0 HcmV?d00001 diff --git a/xml/menu_catalog_new.lxml b/xml/menu_catalog_new.lxml index 618bb14c..300635af 100644 --- a/xml/menu_catalog_new.lxml +++ b/xml/menu_catalog_new.lxml @@ -117,10 +117,10 @@ If Seeker = "curr" Then Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf diff --git a/xml/page_catalog_group_appfast.lxml b/xml/page_catalog_group_appfast.lxml index 4d007b79..0ce37810 100644 --- a/xml/page_catalog_group_appfast.lxml +++ b/xml/page_catalog_group_appfast.lxml @@ -264,10 +264,10 @@ If Seeker = "curr" Then Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf diff --git a/xml/page_catalog_group_cocktail.lxml b/xml/page_catalog_group_cocktail.lxml index 2c72bb81..965a7b30 100644 --- a/xml/page_catalog_group_cocktail.lxml +++ b/xml/page_catalog_group_cocktail.lxml @@ -256,10 +256,10 @@ If Seeker = "curr" Then Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf diff --git a/xml/page_catalog_group_coffee.lxml b/xml/page_catalog_group_coffee.lxml index 754ee22a..90c72dc4 100644 --- a/xml/page_catalog_group_coffee.lxml +++ b/xml/page_catalog_group_coffee.lxml @@ -256,10 +256,10 @@ If Seeker = "curr" Then Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf diff --git a/xml/page_catalog_group_forkid.lxml b/xml/page_catalog_group_forkid.lxml index f6dcc7ae..212dc9c6 100644 --- a/xml/page_catalog_group_forkid.lxml +++ b/xml/page_catalog_group_forkid.lxml @@ -265,10 +265,10 @@ If Seeker = "curr" Then Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf diff --git a/xml/page_catalog_group_health.lxml b/xml/page_catalog_group_health.lxml index 07dba1da..1771034a 100644 --- a/xml/page_catalog_group_health.lxml +++ b/xml/page_catalog_group_health.lxml @@ -256,10 +256,10 @@ If Seeker = "curr" Then Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf diff --git a/xml/page_catalog_group_milk.lxml b/xml/page_catalog_group_milk.lxml index ce59a0b0..140351a5 100644 --- a/xml/page_catalog_group_milk.lxml +++ b/xml/page_catalog_group_milk.lxml @@ -254,10 +254,10 @@ If Seeker = "curr" Then Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf diff --git a/xml/page_catalog_group_other.lxml b/xml/page_catalog_group_other.lxml index 6d20917b..a6b83010 100644 --- a/xml/page_catalog_group_other.lxml +++ b/xml/page_catalog_group_other.lxml @@ -255,10 +255,10 @@ If Seeker = "curr" Then Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf diff --git a/xml/page_catalog_group_recommend.lxml b/xml/page_catalog_group_recommend.lxml index 8488a717..9de9ca93 100644 --- a/xml/page_catalog_group_recommend.lxml +++ b/xml/page_catalog_group_recommend.lxml @@ -262,10 +262,10 @@ If Seeker = "curr" Then Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf diff --git a/xml/page_catalog_group_tea.lxml b/xml/page_catalog_group_tea.lxml index 2c4d846e..de5723a8 100644 --- a/xml/page_catalog_group_tea.lxml +++ b/xml/page_catalog_group_tea.lxml @@ -256,10 +256,10 @@ If Seeker = "curr" Then Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf diff --git a/xml/page_catalog_group_whey.lxml b/xml/page_catalog_group_whey.lxml index 7f5d2e92..0cb8a61e 100644 --- a/xml/page_catalog_group_whey.lxml +++ b/xml/page_catalog_group_whey.lxml @@ -261,10 +261,10 @@ If Seeker = "curr" Then Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf From e333a114df97599d3cfe4c78e207f30161c05229 Mon Sep 17 00:00:00 2001 From: kong Date: Thu, 19 Jan 2023 16:13:29 +0700 Subject: [PATCH 3/3] Release 6.93 --- xml_main/startup.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 5f588ca0..16e10939 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -106,8 +106,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "6.92" - Var XMLPageVersionInt = 692 + Var XMLPageVersion = "6.93" + Var XMLPageVersionInt = 693