diff --git a/adv/taobin_adv_menu_01.mp4 b/adv/taobin_adv_menu_01.mp4 index 7574ed50..ecad6e02 100755 Binary files a/adv/taobin_adv_menu_01.mp4 and b/adv/taobin_adv_menu_01.mp4 differ diff --git a/image/page_drink_disable_n2/bn_dirty_light__peacher.png b/image/page_drink_disable_n2/bn_dirty_light__peacher.png index a70fb775..0ebf7e9e 100644 Binary files a/image/page_drink_disable_n2/bn_dirty_light__peacher.png and b/image/page_drink_disable_n2/bn_dirty_light__peacher.png differ diff --git a/image/page_drink_disable_n2/bn_dirty_light__snowwhite.png b/image/page_drink_disable_n2/bn_dirty_light__snowwhite.png index fa0be693..861a2932 100644 Binary files a/image/page_drink_disable_n2/bn_dirty_light__snowwhite.png and b/image/page_drink_disable_n2/bn_dirty_light__snowwhite.png differ diff --git a/image/page_drink_disable_n2/bn_dirty_light_geisha.png b/image/page_drink_disable_n2/bn_dirty_light_geisha.png index 9a88370b..b513aa5e 100644 Binary files a/image/page_drink_disable_n2/bn_dirty_light_geisha.png and b/image/page_drink_disable_n2/bn_dirty_light_geisha.png differ diff --git a/image/page_drink_disable_n2/bn_dirty_light_pure_beauty.png b/image/page_drink_disable_n2/bn_dirty_light_pure_beauty.png index 8a4ce040..0748a625 100644 Binary files a/image/page_drink_disable_n2/bn_dirty_light_pure_beauty.png and b/image/page_drink_disable_n2/bn_dirty_light_pure_beauty.png differ diff --git a/image/page_drink_disable_n2/bn_dirty_light_rosalyn.png b/image/page_drink_disable_n2/bn_dirty_light_rosalyn.png index 6ad0f427..41084b85 100644 Binary files a/image/page_drink_disable_n2/bn_dirty_light_rosalyn.png and b/image/page_drink_disable_n2/bn_dirty_light_rosalyn.png differ diff --git a/image/page_drink_disable_n2/bn_dirty_light_whiskydude.png b/image/page_drink_disable_n2/bn_dirty_light_whiskydude.png index dc0a16b5..b07bd38f 100644 Binary files a/image/page_drink_disable_n2/bn_dirty_light_whiskydude.png and b/image/page_drink_disable_n2/bn_dirty_light_whiskydude.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png b/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png index b869e0f5..af8dea20 100644 Binary files a/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png and b/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_light_peacher.png b/image/page_drink_disable_n2/bn_hot_americano_light_peacher.png index 1663317f..7247cb7b 100644 Binary files a/image/page_drink_disable_n2/bn_hot_americano_light_peacher.png and b/image/page_drink_disable_n2/bn_hot_americano_light_peacher.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_light_pure_beauty.png b/image/page_drink_disable_n2/bn_hot_americano_light_pure_beauty.png index f5a444b9..17ddfab9 100644 Binary files a/image/page_drink_disable_n2/bn_hot_americano_light_pure_beauty.png and b/image/page_drink_disable_n2/bn_hot_americano_light_pure_beauty.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_light_rosalyn.png b/image/page_drink_disable_n2/bn_hot_americano_light_rosalyn.png index ecf57b93..e97f92a2 100644 Binary files a/image/page_drink_disable_n2/bn_hot_americano_light_rosalyn.png and b/image/page_drink_disable_n2/bn_hot_americano_light_rosalyn.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_light_snowwhite.png b/image/page_drink_disable_n2/bn_hot_americano_light_snowwhite.png index 038db4bf..b5c0a2f1 100644 Binary files a/image/page_drink_disable_n2/bn_hot_americano_light_snowwhite.png and b/image/page_drink_disable_n2/bn_hot_americano_light_snowwhite.png differ diff --git a/image/page_drink_disable_n2/bn_hot_americano_light_whiskydude.png b/image/page_drink_disable_n2/bn_hot_americano_light_whiskydude.png index 9d1310c6..6edff362 100644 Binary files a/image/page_drink_disable_n2/bn_hot_americano_light_whiskydude.png and b/image/page_drink_disable_n2/bn_hot_americano_light_whiskydude.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png b/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png index fb276f8a..8a959fb8 100644 Binary files a/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png and b/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light_peacher.png b/image/page_drink_disable_n2/bn_hot_espresso_light_peacher.png index c7798f48..5fcd208a 100644 Binary files a/image/page_drink_disable_n2/bn_hot_espresso_light_peacher.png and b/image/page_drink_disable_n2/bn_hot_espresso_light_peacher.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light_pure_beauty.png b/image/page_drink_disable_n2/bn_hot_espresso_light_pure_beauty.png index ded3297b..63e0ff7a 100644 Binary files a/image/page_drink_disable_n2/bn_hot_espresso_light_pure_beauty.png and b/image/page_drink_disable_n2/bn_hot_espresso_light_pure_beauty.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light_rosalyn.png b/image/page_drink_disable_n2/bn_hot_espresso_light_rosalyn.png index 56e51c3c..e941bbd9 100644 Binary files a/image/page_drink_disable_n2/bn_hot_espresso_light_rosalyn.png and b/image/page_drink_disable_n2/bn_hot_espresso_light_rosalyn.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light_snowwhite.png b/image/page_drink_disable_n2/bn_hot_espresso_light_snowwhite.png index 517fe302..ad9d8739 100644 Binary files a/image/page_drink_disable_n2/bn_hot_espresso_light_snowwhite.png and b/image/page_drink_disable_n2/bn_hot_espresso_light_snowwhite.png differ diff --git a/image/page_drink_disable_n2/bn_hot_espresso_light_whiskydude.png b/image/page_drink_disable_n2/bn_hot_espresso_light_whiskydude.png index 99db29a2..7f539318 100644 Binary files a/image/page_drink_disable_n2/bn_hot_espresso_light_whiskydude.png and b/image/page_drink_disable_n2/bn_hot_espresso_light_whiskydude.png differ diff --git a/image/page_drink_n/bn_dirty_light__peacher.png b/image/page_drink_n/bn_dirty_light__peacher.png index 94c71ca0..d4db5d80 100644 Binary files a/image/page_drink_n/bn_dirty_light__peacher.png and b/image/page_drink_n/bn_dirty_light__peacher.png differ diff --git a/image/page_drink_n/bn_dirty_light__snowwhite.png b/image/page_drink_n/bn_dirty_light__snowwhite.png index 6e201e9b..e478a42f 100644 Binary files a/image/page_drink_n/bn_dirty_light__snowwhite.png and b/image/page_drink_n/bn_dirty_light__snowwhite.png differ diff --git a/image/page_drink_n/bn_dirty_light_geisha.png b/image/page_drink_n/bn_dirty_light_geisha.png index 80483d70..b449ac0f 100644 Binary files a/image/page_drink_n/bn_dirty_light_geisha.png and b/image/page_drink_n/bn_dirty_light_geisha.png differ diff --git a/image/page_drink_n/bn_dirty_light_pure_beauty.png b/image/page_drink_n/bn_dirty_light_pure_beauty.png index f96f5d5a..c0cf7701 100644 Binary files a/image/page_drink_n/bn_dirty_light_pure_beauty.png and b/image/page_drink_n/bn_dirty_light_pure_beauty.png differ diff --git a/image/page_drink_n/bn_dirty_light_rosalyn.png b/image/page_drink_n/bn_dirty_light_rosalyn.png index 203bc037..3d81659a 100644 Binary files a/image/page_drink_n/bn_dirty_light_rosalyn.png and b/image/page_drink_n/bn_dirty_light_rosalyn.png differ diff --git a/image/page_drink_n/bn_dirty_light_whiskydude.png b/image/page_drink_n/bn_dirty_light_whiskydude.png index c0da6b30..aff83e7c 100644 Binary files a/image/page_drink_n/bn_dirty_light_whiskydude.png and b/image/page_drink_n/bn_dirty_light_whiskydude.png differ diff --git a/image/page_drink_n/bn_hot_americano_light_geisha.png b/image/page_drink_n/bn_hot_americano_light_geisha.png index 995be4be..16e5c768 100644 Binary files a/image/page_drink_n/bn_hot_americano_light_geisha.png and b/image/page_drink_n/bn_hot_americano_light_geisha.png differ diff --git a/image/page_drink_n/bn_hot_americano_light_peacher.png b/image/page_drink_n/bn_hot_americano_light_peacher.png index 6bf88335..5dae1814 100644 Binary files a/image/page_drink_n/bn_hot_americano_light_peacher.png and b/image/page_drink_n/bn_hot_americano_light_peacher.png differ diff --git a/image/page_drink_n/bn_hot_americano_light_pure_beauty.png b/image/page_drink_n/bn_hot_americano_light_pure_beauty.png index 7b1199eb..065554f4 100644 Binary files a/image/page_drink_n/bn_hot_americano_light_pure_beauty.png and b/image/page_drink_n/bn_hot_americano_light_pure_beauty.png differ diff --git a/image/page_drink_n/bn_hot_americano_light_rosalyn.png b/image/page_drink_n/bn_hot_americano_light_rosalyn.png index 573b8168..39a4818f 100644 Binary files a/image/page_drink_n/bn_hot_americano_light_rosalyn.png and b/image/page_drink_n/bn_hot_americano_light_rosalyn.png differ diff --git a/image/page_drink_n/bn_hot_americano_light_snowwhite.png b/image/page_drink_n/bn_hot_americano_light_snowwhite.png index b452260b..7b074dea 100644 Binary files a/image/page_drink_n/bn_hot_americano_light_snowwhite.png and b/image/page_drink_n/bn_hot_americano_light_snowwhite.png differ diff --git a/image/page_drink_n/bn_hot_americano_light_whiskydude.png b/image/page_drink_n/bn_hot_americano_light_whiskydude.png index e49661e9..641c28c8 100644 Binary files a/image/page_drink_n/bn_hot_americano_light_whiskydude.png and b/image/page_drink_n/bn_hot_americano_light_whiskydude.png differ diff --git a/image/page_drink_n/bn_hot_espresso_light_geisha.png b/image/page_drink_n/bn_hot_espresso_light_geisha.png index db73c168..a40a0b1f 100644 Binary files a/image/page_drink_n/bn_hot_espresso_light_geisha.png and b/image/page_drink_n/bn_hot_espresso_light_geisha.png differ diff --git a/image/page_drink_n/bn_hot_espresso_light_peacher.png b/image/page_drink_n/bn_hot_espresso_light_peacher.png index 7a67aef1..c319a18b 100644 Binary files a/image/page_drink_n/bn_hot_espresso_light_peacher.png and b/image/page_drink_n/bn_hot_espresso_light_peacher.png differ diff --git a/image/page_drink_n/bn_hot_espresso_light_pure_beauty.png b/image/page_drink_n/bn_hot_espresso_light_pure_beauty.png index 349c09ac..ace7853f 100644 Binary files a/image/page_drink_n/bn_hot_espresso_light_pure_beauty.png and b/image/page_drink_n/bn_hot_espresso_light_pure_beauty.png differ diff --git a/image/page_drink_n/bn_hot_espresso_light_rosalyn.png b/image/page_drink_n/bn_hot_espresso_light_rosalyn.png index 5b5d0413..447227ac 100644 Binary files a/image/page_drink_n/bn_hot_espresso_light_rosalyn.png and b/image/page_drink_n/bn_hot_espresso_light_rosalyn.png differ diff --git a/image/page_drink_n/bn_hot_espresso_light_snowwhite.png b/image/page_drink_n/bn_hot_espresso_light_snowwhite.png index 02c51a74..4bcc304a 100644 Binary files a/image/page_drink_n/bn_hot_espresso_light_snowwhite.png and b/image/page_drink_n/bn_hot_espresso_light_snowwhite.png differ diff --git a/image/page_drink_n/bn_hot_espresso_light_whiskydude.png b/image/page_drink_n/bn_hot_espresso_light_whiskydude.png index 10332d04..4f98901b 100644 Binary files a/image/page_drink_n/bn_hot_espresso_light_whiskydude.png and b/image/page_drink_n/bn_hot_espresso_light_whiskydude.png differ diff --git a/image/page_drink_picture2_n/bn_dirty_light__peacher.png b/image/page_drink_picture2_n/bn_dirty_light__peacher.png index c8486837..a7639df9 100644 Binary files a/image/page_drink_picture2_n/bn_dirty_light__peacher.png and b/image/page_drink_picture2_n/bn_dirty_light__peacher.png differ diff --git a/image/page_drink_picture2_n/bn_dirty_light__snowwhite.png b/image/page_drink_picture2_n/bn_dirty_light__snowwhite.png index 4cdefede..0daf1be4 100644 Binary files a/image/page_drink_picture2_n/bn_dirty_light__snowwhite.png and b/image/page_drink_picture2_n/bn_dirty_light__snowwhite.png differ diff --git a/image/page_drink_picture2_n/bn_dirty_light_geisha.png b/image/page_drink_picture2_n/bn_dirty_light_geisha.png index ea1831e9..25a72152 100644 Binary files a/image/page_drink_picture2_n/bn_dirty_light_geisha.png and b/image/page_drink_picture2_n/bn_dirty_light_geisha.png differ diff --git a/image/page_drink_picture2_n/bn_dirty_light_pure_beauty.png b/image/page_drink_picture2_n/bn_dirty_light_pure_beauty.png index 46bac4fe..5a129de1 100644 Binary files a/image/page_drink_picture2_n/bn_dirty_light_pure_beauty.png and b/image/page_drink_picture2_n/bn_dirty_light_pure_beauty.png differ diff --git a/image/page_drink_picture2_n/bn_dirty_light_rosalyn.png b/image/page_drink_picture2_n/bn_dirty_light_rosalyn.png index 0ca0237a..303fc102 100644 Binary files a/image/page_drink_picture2_n/bn_dirty_light_rosalyn.png and b/image/page_drink_picture2_n/bn_dirty_light_rosalyn.png differ diff --git a/image/page_drink_picture2_n/bn_dirty_light_whiskydude.png b/image/page_drink_picture2_n/bn_dirty_light_whiskydude.png index fb06bca4..eb4f2de3 100644 Binary files a/image/page_drink_picture2_n/bn_dirty_light_whiskydude.png and b/image/page_drink_picture2_n/bn_dirty_light_whiskydude.png differ diff --git a/image/page_drink_picture2_n/bn_hot_americano_light_geisha.png b/image/page_drink_picture2_n/bn_hot_americano_light_geisha.png index c62306a5..63cd56dd 100644 Binary files a/image/page_drink_picture2_n/bn_hot_americano_light_geisha.png and b/image/page_drink_picture2_n/bn_hot_americano_light_geisha.png differ diff --git a/image/page_drink_picture2_n/bn_hot_americano_light_peacher.png b/image/page_drink_picture2_n/bn_hot_americano_light_peacher.png index e4c2da97..d11f3521 100644 Binary files a/image/page_drink_picture2_n/bn_hot_americano_light_peacher.png and b/image/page_drink_picture2_n/bn_hot_americano_light_peacher.png differ diff --git a/image/page_drink_picture2_n/bn_hot_americano_light_pure_beauty.png b/image/page_drink_picture2_n/bn_hot_americano_light_pure_beauty.png index 1339b0e8..f7338c47 100644 Binary files a/image/page_drink_picture2_n/bn_hot_americano_light_pure_beauty.png and b/image/page_drink_picture2_n/bn_hot_americano_light_pure_beauty.png differ diff --git a/image/page_drink_picture2_n/bn_hot_americano_light_rosalyn.png b/image/page_drink_picture2_n/bn_hot_americano_light_rosalyn.png index f801786d..f1310686 100644 Binary files a/image/page_drink_picture2_n/bn_hot_americano_light_rosalyn.png and b/image/page_drink_picture2_n/bn_hot_americano_light_rosalyn.png differ diff --git a/image/page_drink_picture2_n/bn_hot_americano_light_snowwhite.png b/image/page_drink_picture2_n/bn_hot_americano_light_snowwhite.png index c243803b..0114d395 100644 Binary files a/image/page_drink_picture2_n/bn_hot_americano_light_snowwhite.png and b/image/page_drink_picture2_n/bn_hot_americano_light_snowwhite.png differ diff --git a/image/page_drink_picture2_n/bn_hot_americano_light_whiskydude.png b/image/page_drink_picture2_n/bn_hot_americano_light_whiskydude.png index 92bf908f..32e1dcc9 100644 Binary files a/image/page_drink_picture2_n/bn_hot_americano_light_whiskydude.png and b/image/page_drink_picture2_n/bn_hot_americano_light_whiskydude.png differ diff --git a/image/page_drink_picture2_n/bn_hot_espresso_light_geisha.png b/image/page_drink_picture2_n/bn_hot_espresso_light_geisha.png index 12266b64..4a01d8d7 100644 Binary files a/image/page_drink_picture2_n/bn_hot_espresso_light_geisha.png and b/image/page_drink_picture2_n/bn_hot_espresso_light_geisha.png differ diff --git a/image/page_drink_picture2_n/bn_hot_espresso_light_peacher.png b/image/page_drink_picture2_n/bn_hot_espresso_light_peacher.png index 7007a03a..229a667c 100644 Binary files a/image/page_drink_picture2_n/bn_hot_espresso_light_peacher.png and b/image/page_drink_picture2_n/bn_hot_espresso_light_peacher.png differ diff --git a/image/page_drink_picture2_n/bn_hot_espresso_light_pure_beauty.png b/image/page_drink_picture2_n/bn_hot_espresso_light_pure_beauty.png index aa499a93..6d486e9a 100644 Binary files a/image/page_drink_picture2_n/bn_hot_espresso_light_pure_beauty.png and b/image/page_drink_picture2_n/bn_hot_espresso_light_pure_beauty.png differ diff --git a/image/page_drink_picture2_n/bn_hot_espresso_light_rosalyn.png b/image/page_drink_picture2_n/bn_hot_espresso_light_rosalyn.png index f401a89f..030e0f3d 100644 Binary files a/image/page_drink_picture2_n/bn_hot_espresso_light_rosalyn.png and b/image/page_drink_picture2_n/bn_hot_espresso_light_rosalyn.png differ diff --git a/image/page_drink_picture2_n/bn_hot_espresso_light_snowwhite.png b/image/page_drink_picture2_n/bn_hot_espresso_light_snowwhite.png index de1c3080..a4a94409 100644 Binary files a/image/page_drink_picture2_n/bn_hot_espresso_light_snowwhite.png and b/image/page_drink_picture2_n/bn_hot_espresso_light_snowwhite.png differ diff --git a/image/page_drink_picture2_n/bn_hot_espresso_light_whiskydude.png b/image/page_drink_picture2_n/bn_hot_espresso_light_whiskydude.png index 73d35f81..dcef2c25 100644 Binary files a/image/page_drink_picture2_n/bn_hot_espresso_light_whiskydude.png and b/image/page_drink_picture2_n/bn_hot_espresso_light_whiskydude.png differ diff --git a/image/page_drink_press_n/bn_dirty_light__peacher.png b/image/page_drink_press_n/bn_dirty_light__peacher.png index 63b38f3e..8fca2be3 100644 Binary files a/image/page_drink_press_n/bn_dirty_light__peacher.png and b/image/page_drink_press_n/bn_dirty_light__peacher.png differ diff --git a/image/page_drink_press_n/bn_dirty_light__snowwhite.png b/image/page_drink_press_n/bn_dirty_light__snowwhite.png index 1f21d659..891d03c6 100644 Binary files a/image/page_drink_press_n/bn_dirty_light__snowwhite.png and b/image/page_drink_press_n/bn_dirty_light__snowwhite.png differ diff --git a/image/page_drink_press_n/bn_dirty_light_geisha.png b/image/page_drink_press_n/bn_dirty_light_geisha.png index 26a28ee3..705e709d 100644 Binary files a/image/page_drink_press_n/bn_dirty_light_geisha.png and b/image/page_drink_press_n/bn_dirty_light_geisha.png differ diff --git a/image/page_drink_press_n/bn_dirty_light_pure_beauty.png b/image/page_drink_press_n/bn_dirty_light_pure_beauty.png index ea7585f7..dc58deef 100644 Binary files a/image/page_drink_press_n/bn_dirty_light_pure_beauty.png and b/image/page_drink_press_n/bn_dirty_light_pure_beauty.png differ diff --git a/image/page_drink_press_n/bn_dirty_light_rosalyn.png b/image/page_drink_press_n/bn_dirty_light_rosalyn.png index 2db4b658..0b4537e2 100644 Binary files a/image/page_drink_press_n/bn_dirty_light_rosalyn.png and b/image/page_drink_press_n/bn_dirty_light_rosalyn.png differ diff --git a/image/page_drink_press_n/bn_dirty_light_whiskydude.png b/image/page_drink_press_n/bn_dirty_light_whiskydude.png index 37cd29e9..4e236097 100644 Binary files a/image/page_drink_press_n/bn_dirty_light_whiskydude.png and b/image/page_drink_press_n/bn_dirty_light_whiskydude.png differ diff --git a/image/page_drink_press_n/bn_hot_americano_light_geisha.png b/image/page_drink_press_n/bn_hot_americano_light_geisha.png index 249d8b58..079e9a1a 100644 Binary files a/image/page_drink_press_n/bn_hot_americano_light_geisha.png and b/image/page_drink_press_n/bn_hot_americano_light_geisha.png differ diff --git a/image/page_drink_press_n/bn_hot_americano_light_peacher.png b/image/page_drink_press_n/bn_hot_americano_light_peacher.png index fc2e0e90..5359f7ae 100644 Binary files a/image/page_drink_press_n/bn_hot_americano_light_peacher.png and b/image/page_drink_press_n/bn_hot_americano_light_peacher.png differ diff --git a/image/page_drink_press_n/bn_hot_americano_light_pure_beauty.png b/image/page_drink_press_n/bn_hot_americano_light_pure_beauty.png index 2bbb971f..77dc984b 100644 Binary files a/image/page_drink_press_n/bn_hot_americano_light_pure_beauty.png and b/image/page_drink_press_n/bn_hot_americano_light_pure_beauty.png differ diff --git a/image/page_drink_press_n/bn_hot_americano_light_rosalyn.png b/image/page_drink_press_n/bn_hot_americano_light_rosalyn.png index 57288b12..5db80e14 100644 Binary files a/image/page_drink_press_n/bn_hot_americano_light_rosalyn.png and b/image/page_drink_press_n/bn_hot_americano_light_rosalyn.png differ diff --git a/image/page_drink_press_n/bn_hot_americano_light_snowwhite.png b/image/page_drink_press_n/bn_hot_americano_light_snowwhite.png index 5448dc1a..d52bb405 100644 Binary files a/image/page_drink_press_n/bn_hot_americano_light_snowwhite.png and b/image/page_drink_press_n/bn_hot_americano_light_snowwhite.png differ diff --git a/image/page_drink_press_n/bn_hot_americano_light_whiskydude.png b/image/page_drink_press_n/bn_hot_americano_light_whiskydude.png index e866a030..797e2461 100644 Binary files a/image/page_drink_press_n/bn_hot_americano_light_whiskydude.png and b/image/page_drink_press_n/bn_hot_americano_light_whiskydude.png differ diff --git a/image/page_drink_press_n/bn_hot_espresso_light_geisha.png b/image/page_drink_press_n/bn_hot_espresso_light_geisha.png index 29fea365..d6621729 100644 Binary files a/image/page_drink_press_n/bn_hot_espresso_light_geisha.png and b/image/page_drink_press_n/bn_hot_espresso_light_geisha.png differ diff --git a/image/page_drink_press_n/bn_hot_espresso_light_peacher.png b/image/page_drink_press_n/bn_hot_espresso_light_peacher.png index 65ed6152..4ba7ba71 100644 Binary files a/image/page_drink_press_n/bn_hot_espresso_light_peacher.png and b/image/page_drink_press_n/bn_hot_espresso_light_peacher.png differ diff --git a/image/page_drink_press_n/bn_hot_espresso_light_pure_beauty.png b/image/page_drink_press_n/bn_hot_espresso_light_pure_beauty.png index 25980327..d7787439 100644 Binary files a/image/page_drink_press_n/bn_hot_espresso_light_pure_beauty.png and b/image/page_drink_press_n/bn_hot_espresso_light_pure_beauty.png differ diff --git a/image/page_drink_press_n/bn_hot_espresso_light_rosalyn.png b/image/page_drink_press_n/bn_hot_espresso_light_rosalyn.png index cb558e67..10408cf1 100644 Binary files a/image/page_drink_press_n/bn_hot_espresso_light_rosalyn.png and b/image/page_drink_press_n/bn_hot_espresso_light_rosalyn.png differ diff --git a/image/page_drink_press_n/bn_hot_espresso_light_snowwhite.png b/image/page_drink_press_n/bn_hot_espresso_light_snowwhite.png index 5008f292..65c5385b 100644 Binary files a/image/page_drink_press_n/bn_hot_espresso_light_snowwhite.png and b/image/page_drink_press_n/bn_hot_espresso_light_snowwhite.png differ diff --git a/image/page_drink_press_n/bn_hot_espresso_light_whiskydude.png b/image/page_drink_press_n/bn_hot_espresso_light_whiskydude.png index 71a89941..da36ae17 100644 Binary files a/image/page_drink_press_n/bn_hot_espresso_light_whiskydude.png and b/image/page_drink_press_n/bn_hot_espresso_light_whiskydude.png differ diff --git a/inter/aus/animation01/play_list.tsv b/inter/aus/animation01/play_list.tsv index 43ac71b5..616737e1 100644 --- a/inter/aus/animation01/play_list.tsv +++ b/inter/aus/animation01/play_list.tsv @@ -199,9 +199,9 @@ ROSALYN ALMOST DIRTY 51-01-02-0037 1 7 50 2 3 4 5 24 66 6:06 32 -นมยูซุร้อน 51-03-01-0023 1 53 6 16 24 120 3:00 23 -นมยูซุเย็น 51-03-02-0023 1 53 6 23 24 120 4:00 23 -นมยูซุปั่น 51-03-03-0023 1 53 6 23 41 24 120 5:00 23 +นมโตเกียวบานาน่า 51-03-01-0023 1 56 6 16 24 120 3:00 23 +นมโตเกียวบานาน่า 51-03-02-0023 1 56 6 23 24 120 4:00 23 +นมโตเกียวบานาน่า 51-03-03-0023 1 56 6 23 41 24 120 5:00 23 ยูซุโซดา 51-05-02-0045 1 53 23 23 13 24 120 6:00 23 อเมริกาโซดา 51-01-02-0041 1 2 3 4 5 23 16 13 24 120 3:00 23 @@ -895,3 +895,29 @@ Banana Cheesecake Royale 51-03-03-0057 1 63 53 56 17 23 41 24 120 17:00 23 CARAMEL MILK \nBISCOFF VOLCANO 51-03-03-0045 1 22 17 23 40 41 24 120 17:00 23 STRAWBERRY MILK \nBISCOFF VOLCANO 51-03-03-0046 1 19 17 23 40 41 24 120 17:00 23 Mint MILK \nBISCOFF VOLCANO 51-03-03-0047 1 59 17 23 40 41 24 120 17:00 23 + +STX On The Beach 51-99-05-0001 1 27 28 24 120 17:00 23 +Noxious Nitrous 51-99-05-0002 1 27 28 24 120 17:00 23 +Sea Level RISE 51-99-05-0003 1 27 28 24 120 17:00 23 +Methane Bubbles 51-99-05-0004 1 27 28 24 120 17:00 23 +My Carbon\nFootprint 51-99-05-0005 1 27 28 24 120 17:00 23 +Fossil Fuel 51-99-05-0006 1 27 28 24 120 17:00 23 +Stinky Sulphur 51-99-05-0007 1 27 28 24 120 17:00 23 +Biofuel 51-99-05-0008 1 27 28 24 120 17:00 23 +Coal Story Bro 51-99-05-0009 1 27 28 24 120 17:00 23 +Bangkok\nUnderwater 51-99-05-0010 1 27 28 24 120 17:00 23 +Druzhba Pipe 51-99-05-0012 1 27 28 24 120 17:00 23 +2050 51-99-05-0013 1 27 28 24 120 17:00 23 +Greenwash 51-99-05-0014 1 27 28 24 120 17:00 23 +Tailpipe Emissions 51-99-05-0015 1 27 28 24 120 17:00 23 +Petrol Fumes 51-99-05-0017 1 27 28 24 120 17:00 23 +Big Kid 51-99-05-0018 1 27 28 24 120 17:00 23 +Peach Smash 51-99-05-0019 1 27 28 24 120 17:00 23 +Melon Fizz 51-99-05-0020 1 27 28 24 120 17:00 23 +Yuzu Collins 51-99-05-0021 1 27 28 24 120 17:00 23 +Gin Collins 51-99-05-0022 1 27 28 24 120 17:00 23 +The Floral 51-99-05-0023 1 27 28 24 120 17:00 23 +Combination 51-99-05-0024 1 27 28 24 120 17:00 23 +Ume Ume 51-99-05-0025 1 27 28 24 120 17:00 23 +Like Sex\non The Beach 51-99-05-0026 1 27 28 24 120 17:00 23 +Plum Highball 51-99-05-0027 1 27 28 24 120 17:00 23 diff --git a/inter/aus/xml/page_catalog_group_cocktail.lxml b/inter/aus/xml/page_catalog_group_cocktail.lxml index 35762d96..3c8171c2 100644 --- a/inter/aus/xml/page_catalog_group_cocktail.lxml +++ b/inter/aus/xml/page_catalog_group_cocktail.lxml @@ -1,34 +1,35 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml" - - - Var Menu8Selected = "PressForever" - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml" - - - - - -;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml" - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml" + + + Var Menu8Selected = "PressForever" + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml" + + + + + +;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml" + + + + 10 497 @@ -40,74 +41,83 @@ Var block_index_override = 0 Var block_index_move = 0 +;dummy_layout.inc ; ==================> Len = 3 - ; - 11-99-05-0001 - + ; - 51-99-05-0001 - 33 22 225 296 - Flag( 11-99-05-0001.Button,$Sum1199050001) + Flag( 51-99-05-0001.Button,$Sum5199050001) + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Petrol Fumes + + Petrol Fumes + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Gold lable, soda + + Gold lable, soda + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0017.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0017.Button + StringFmt( $51-99-05-0017.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5199050017 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0017.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5199050017 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0018 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0018.Button,$Sum5199050018) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Big Kid + + Big Kid + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Gold lable, water + + Gold lable, water + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0018.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0018.Button + StringFmt( $51-99-05-0018.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5199050018 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0018.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5199050018 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0019 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0019.Button,$Sum5199050019) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Peach Smash + + Peach Smash + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Peach Syrup, Limenade ,\nSoda, Ice, Gin + + Peach Syrup, Limenade ,\nSoda, Ice, Gin + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0019.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0019.Button + StringFmt( $51-99-05-0019.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5199050019 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0019.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5199050019 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0020 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0020.Button,$Sum5199050020) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Melon Fizz + + Melon Fizz + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Melon Syrup, Limenade ,\nSoda, Ice, Gin + + Melon Syrup, Limenade ,\nSoda, Ice, Gin + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0020.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0020.Button + StringFmt( $51-99-05-0020.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5199050020 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0020.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5199050020 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0021 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0021.Button,$Sum5199050021) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Yuzu Collins + + Yuzu Collins + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Yuzu Syrup, Limenade ,\nSoda, Ice, Gin + + Yuzu Syrup, Limenade ,\nSoda, Ice, Gin + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0021.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0021.Button + StringFmt( $51-99-05-0021.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5199050021 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0021.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5199050021 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0022 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0022.Button,$Sum5199050022) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Gin Collins + + Gin Collins + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Gin, Limenade, Sugar, Soda and Ice + + Gin, Limenade, Sugar, Soda and Ice + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0022.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0022.Button + StringFmt( $51-99-05-0022.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5199050022 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0022.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5199050022 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0023 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0023.Button,$Sum5199050023) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + The Floral + + The Floral + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Peach Syrup, Jasmine Tea ,\nWater, Ice, Gin + + Peach Syrup, Jasmine Tea ,\nWater, Ice, Gin + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0023.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0023.Button + StringFmt( $51-99-05-0023.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5199050023 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0023.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5199050023 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0024 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0024.Button,$Sum5199050024) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Combination + + Combination + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Melon Syrup, Limenade ,\nSoda, Ice, Vodka + + Melon Syrup, Limenade ,\nSoda, Ice, Vodka + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0024.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0024.Button + StringFmt( $51-99-05-0024.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5199050024 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0024.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5199050024 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0025 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0025.Button,$Sum5199050025) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Ume Ume + + Ume Ume + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Yuzu Syrup, Plum Syrup, Limenade ,\nSoda, Ice, Vodka + + Yuzu Syrup, Plum Syrup, Limenade ,\nSoda, Ice, Vodka + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0025.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0025.Button + StringFmt( $51-99-05-0025.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5199050025 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0025.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5199050025 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0026 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0026.Button,$Sum5199050026) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Like Sex\non The Beach + + Like Sex\non The Beach + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Peach Syrup, Limenade ,\nPineapple juice ,Soda, Ice, Vodka + + Peach Syrup, Limenade ,\nPineapple juice ,Soda, Ice, Vodka + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0026.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0026.Button + StringFmt( $51-99-05-0026.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5199050026 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0026.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5199050026 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0027 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0027.Button,$Sum5199050027) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Plum Highball + + Plum Highball + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Yuzu Syrup, Limenade ,\nSoda, Ice, Gold label + + Yuzu Syrup, Limenade ,\nSoda, Ice, Gold label + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0027.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0027.Button + StringFmt( $51-99-05-0027.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5199050027 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0027.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5199050027 000013 @@ -3722,9 +6806,9 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - + + + + + + diff --git a/inter/aus/xml/page_catalog_group_winter_warmers.lxml b/inter/aus/xml/page_catalog_group_winter_warmers.lxml index f9b6b7d4..70b25fc4 100644 --- a/inter/aus/xml/page_catalog_group_winter_warmers.lxml +++ b/inter/aus/xml/page_catalog_group_winter_warmers.lxml @@ -1,35 +1,35 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml" - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - Var MenuWinterWarmersCatalogState = "PressForever" - - - ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml" - - - - -;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml" - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml" + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + Var MenuWinterWarmersCatalogState = "PressForever" + + + ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml" + + + + +;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml" + + + + + + 10 497 @@ -42,42 +42,6 @@ Var block_index_move = 0 ;dummy_layout.inc - - "Enable" - 33 - 22 - 998 - 617 - - 0 - 0 - "ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner_big.png" - - - - 33 - 22 - 225 - 296 - "Enable" - ; empty block - - - 33 - 22 - 225 - 296 - "Enable" - ; empty block - - - 33 - 22 - 225 - 296 - "Enable" - ; empty block - ; ==================> Len = 3 ; 51-03-01-0002 - - @@ -6668,16 +6632,30 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - Var BigButtonEnable = "Enable" - Refresh - - - Var BigButtonEnable = "Invisible" - Refresh - - - - - + + + + + + + Var BigButtonEnable = "Enable" + Refresh + + + Var BigButtonEnable = "Invisible" + Refresh + + + + + diff --git a/inter/mys/xml/page_brewing3Conti.xml b/inter/mys/xml/page_brewing3Conti.xml new file mode 100644 index 00000000..2c578ee8 --- /dev/null +++ b/inter/mys/xml/page_brewing3Conti.xml @@ -0,0 +1,1293 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + Var ActionOKCase = 0 + Var Seeker = "curr" + + If PayCredit = 0 Then + Var PayCredit = 1 + CoinBack + EndIf + + ;Var PayCredit = 0 + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/topping2_en" + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" + Else + Var DirImage = "ROOT/taobin_project/image/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/topping2" + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf + + Var next_pic_bn = DirImage + "/bn_add_order.png" + Var next_pic_bp = DirImage + "/bp_add_order.png" + Var text_next_order = DirImage + "/text_next_order.png" + + Var topup_credit_bn = DirImage + "/bn_topup_credit.png" + Var topup_credit_bp = DirImage + "/bp_topup_credit.png" + + Var EnableTopupCreditBetweenBrew = "Invisible" + + If NextOrder = "true" Then + Var EnableSelectMenuBetweenBrew = "Invisible" + Else + Var EnableSelectMenuBetweenBrew = "Enable" + EndIf + + If GetFreeFromError = 1 Then + Var EnableSelectMenuBetweenBrew = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" + EndIf + + If EnableSelectMenuBetweenBrew = "Enable" Then + Var EnableSelectMenuBetweenBrewBlink = "Enable" + Else + Var EnableSelectMenuBetweenBrewBlink = "Invisible" + EndIf + + + Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png" + If Seeker.thankLidFlag = 1 Then + Var bg_strawlid = DirImage2 + "/bg_strawSmall.png" + Var LidStateX = "Invisible" + EndIf + + Var TimeoutWaitPay = 10 + + Var PayReference = "" + Var PayType = "newpay" + Var MachineState_Result = 0 + + If LastMakeDrinkResult = "success" Then + Var MachineState_Result = 1 + EndIf + + If LastMakeDrinkResult = "fail" Then + Var MachineState_Result = 2 + EndIf + + + Var ExtendData = Seeker.ExtendData + Var SelectDrink = Seeker.selected_a_drink + Var ServiceAmount2 = Seeker.ServiceAmount2 + + DEBUGVAR Seeker + DEBUGVAR Seeker.selected_a_drink + DEBUGVAR Seeker.ServiceAmount2 + + DEBUGVAR Seeker.CodeNumber + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + + ; On open move from page_brewing3.xml + Var countClick2 = 0 + + Var Timeout = 0 + + Var PrintCoinAmount = 0 + + Var AddData = 0 + + DEBUGVAR Seeker.TNumberTaobinMember + DEBUGVAR Seeker.PointTaobinStr + + If Seeker.TNumberTaobinMember = "" Then + + Else + If Seeker.PayWithQR = 1 Then + Var VendingTSIDTmp1 = VendingTSIDTmp + Else + Var VendingTSIDTmp1 = "" + EndIf + + + Var BmiYear = Seeker.PointTaobinStr + Var PointCrm = "" + If Seeker.FromConsent = 1 Then + Var PointCrm = "pdpa1" + EndIf + Var GetScore = VendingTSIDTmp1 + If Seeker.TaobinErrorNetwork = 0 Then + Var Cid = 11 + Var AddData = 1 + ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore + Else + Var PointCrm = "" + Var Cid = 14 + Var AddData = 1 + ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore + EndIf + + Var VendingTSIDTmp1 = "" + EndIf + + If Seeker.VendingCode = "MKFOO" Then + Var AddData = 0 + EndIf + + If MyMintEnable = 1 Then + If FromMyMintPro = 1 Then + Var AddData = 0 + EndIf + EndIf + + If ProBadValentineEnable = 1 Then + If FromBadValentinePro = 1 Then + Var AddData = 0 + EndIf + EndIf + + If LipitPro = 1 Then + If FromLipitPro = 1 Then + If Seeker.CodeChannel = 1 Then + If Seeker.CollectPointMain = 1 Then + Else + Var AddData = 0 + EndIf + EndIf + EndIf + EndIf + + If LedLidBlink = "true" Then + Var LedLidBlink = "no" + LED LedDoorLid Blink 255 255 255 255 + EndIf + + + Var CreditReference = Seeker.CreditReferenceTmp + Var VendingDiscount = Seeker.VendingDiscount + Var VendingCampaign = Seeker.VendingCampaign + Var TxReference = Seeker.TxRef1 + DEBUGVAR TxReference + + + Var DirImage = "ROOT/taobin_project/image/complete/" + Var next_pic_bg = DirImage + "/Preparing.png" + + Var bg_strawlid_ST = "Invisible" + Var bg_strawProblem_ST = "Invisible" + Var StrawStateX = "Invisible" + Var LidStateX = "Invisible" + + If Seeker.CreditCard = 1 Then + Var EnableSelectMenuBetweenBrew = "Invisible" + EndIf + + Var CreditCardVoid = 0 + + DEBUGVAR ButtonGameCountDownState + + + + + + + If CreditCardVoid = 1 Then + Var ChangeOK = 2 + EndIf + + If ActionOKCase = 1 Then + If Seeker.CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + DEBUGVAR SessionID2 + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + Var ECommerce = "" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.VendingCode + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + Var ActionOKCase = 2 + + SAVELOG "back_to_main from line > 142." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + + Else + + SAVELOG "back_to_main from line > 147." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + EndIf + + Else + + + + EndIf + + If waitAckPay = 1 Then + SAVELOG "waitAckPay = 1" + Open "ROOT/taobin_project/xml/page_drinkok.xml" + + EndIf + + + + + If ActionOKCase = 1 Then + If Seeker.CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + DEBUGVAR SessionID2 + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + Var ECommerce = "" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.VendingCode + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + Var ActionOKCase = 2 + + SAVELOG "back_to_main from line > 204." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + + Else + SAVELOG "back_to_main from line > 173." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + EndIf + + Else + + + + EndIf + + + + 1000 + + + Var Timeout = Timeout + 1 + + If MOVE_CUP_TO_DOOR = "true" Then + Var MOVE_CUP_TO_DOOR = "false" + EndIf + + If BREW_COUNT_DOWN_FROM_APP = "on" Then + Var CountDownBrewing = BREW_CNT + Else + + If CountDownBrewing > 0 Then + Var CountDownBrewing = CountDownBrewing - 1 + EndIf + Endif + + If Simulation = "true" Then + If CountDownBrewing = 0 Then + ;Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + EndIf + + If Timeout = 4 Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3" + EndIf + + ; run test; + ;If CountDownBrewing = 40 Then + ; Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;EndIf + If CountDownBrewing = 0 Then + ;Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + + Var ShowCountDownBrewing = CountDownBrewing + + + If Timeout > 540 Then + SAVELOG "back_to_main from line > 217." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + EndIf + + + If Timeout > 480 Then + Var MachineState_Result = 2 + EndIf + + If ChangeFlag = 1 Then + Var ChangeTimeout = ChangeTimeout + 1 + EndIf + + If waitAckPay = 1 Then + If Timeout > 60 Then + Var VendingTSIDTmp1 = "" + SAVELOG "waitAckPay = 1 tineout > 60" + + Open "ROOT/taobin_project/xml/page_drinkok.xml" + + EndIf + EndIf + + If waitAckPay = 2 Then + If Timeout > TimeoutWaitPay Then + + If Seeker.CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + DEBUGVAR SessionID2 + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + Var ECommerce = "" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.VendingCode + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + EndIf + + SAVELOG "back_to_main from line > 309." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + EndIf + EndIf + + + If ChangeOK = 2 Then + If ActionOKCase = 0 Then + + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + + If Seeker.TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = Seeker.TNumberTaobinMember + EndIf + + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + + + If HURR_FOREVER = "S:0" Then + Var HURR_FOREVER = "F:1303" + EndIf + + + Var PayDetail = "2/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel + + + + ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" + + Var ServiceType = "coffee" + Var ServiceCredit = SelectDrink + Var SuggestID = "" + Var SessionID2 = "" + + + Var PayDetail2 = Seeker.PayDetail2 + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + + + ;If Seeker.CodeChannel = 0 Then + ; SAVELOG "back_to_main from line > 315." + ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + ;EndIf + + Var waitAckPay = 2 + Var TimeoutWaitPay = 45 + Var Timeout = 5 + Var ActionOKCase = 1 + + EndIf + EndIf + + If ChangeTimeout > 30 Then + If ActionOKCase = 0 Then + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + + If Seeker.TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = Seeker.TNumberTaobinMember + EndIf + + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + + + If HURR_FOREVER = "S:0" Then + Var HURR_FOREVER = "F:1303" + EndIf + + Var PayDetail = "2/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel + + ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" + + + Var ServiceType = "coffee" + Var ServiceCredit = SelectDrink + Var SuggestID = "" + Var SessionID2 = "" + + + Var PayDetail2 = Seeker.PayDetail2 + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + + ;If Seeker.CodeChannel = 0 Then + ; SAVELOG "back_to_main from line > 357." + ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + ;EndIf + + Var waitAckPay = 2 + Var TimeoutWaitPay = 45 + Var Timeout = 5 + Var ActionOKCase = 1 + + EndIf + EndIf + + If ChangeOK = 3 Then + If ActionOKCase = 0 Then + + Var SVT = "coffee" + Var ACC = "0899999999" + + If Seeker.TNumberTaobinMember = "" Then + Else + Var ACC = Seeker.TNumberTaobinMember + EndIf + + + If HURR_FOREVER = "S:0" Then + Var HURR_FOREVER = "F:1303" + EndIf + + Var PayDetail = "2/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel + + + + + Var DEE = PayDetail + + PAYEXT SVT ACC VendingTSIDTmp DEE + + CoinBack + + + Var ActionOKCase = 1 + If Seeker.CodeChannel = 0 Then + SAVELOG "back_to_main from line > 391." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + EndIf + + Var waitAckPay = 2 + Var TimeoutWaitPay = 45 + Var Timeout = 5 + + + + + EndIf + EndIf + + If MachineState_Result = 1 Then + + ;Var MachineState_Result = 2 + + EndIf + + If MachineState_Result = 1 Then + DEBUGVAR PaySuccessWithDaemonTask + + If waitAckPay = 0 Then + + Var waitAckPay = 0 + Var Timeout = 0 + + Var ProcessText = "" + + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + + If Seeker.TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = Seeker.TNumberTaobinMember + EndIf + + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + + If AddData = 1 Then + Var Cid = 26 + DEBUGVAR "Brewing3Conti" + DEBUGVAR Seeker + DEBUGVAR Seeker.UseGet15Discount + If NewCollectPoint = 1 Then + If Seeker.UseGet15Discount = 1 Then + Var Cid = 39 + Else + Var Cid = 40 + Var PreviousSeeker.UseGetDrink5Bath = 0 + EndIf + EndIf + + AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore + EndIf + + Var ServiceType = "coffee" + Var ServiceCredit = SelectDrink + Var SuggestID = "" + + Var PayDetail = "2/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel + + + ;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" + + If GetFreeFromError = 1 Then + Var Seeker.CodeChannel = 1 + Var Seeker.VendingCode = "C48" + Var Seeker.CodeNumber = "0000000000" + Var VendingCampaign = ServiceAmount2 + EndIf + + If Seeker.PayWithQR = 0 Then + If Seeker.CodeChannel = 1 Then + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + Seeker.VendingCode + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + SelectDrink + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + BoxID + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "S" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + Seeker.CodeNumber + Var SessionID2 = SessionID2 + "/" + + If Seeker.CreditCard = 1 Then + + CashlessReq SUCCESS + ;CashlessReq FAIL + + EndIf + Var PayDetail2 = Seeker.PayDetail2 + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Else + + + If Seeker.CreditCard = 1 Then + + + CashlessReq SUCCESS + ;CashlessReq FAIL + + EndIf + Var PayDetail2 = Seeker.PayDetail2 + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + + + EndIf + + + Else + + ;no wait ack pay + Var waitAckPay = 0 + + Var SVT = "coffee" + Var ACC = "0899999999" + Var DEE = PayDetail + + If Seeker.TNumberTaobinMember = "" Then + Else + Var ACC = Seeker.TNumberTaobinMember + EndIf + + PAYEXT SVT ACC VendingTSIDTmp DEE + + CoinBack + + + EndIf + + EndIf + + __CMD "clear-stock-data" 0 "-" "-" + + Var ServiceSuccess = "yes" + If waitAckPay = 0 Then + + SAVELOG "waitAckPay = 0 Timeout" + + Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + + EndIf + + If MachineState_Result = 2 Then + + SAVELOG MachineStage + + If ErrTimeout = 0 Then + Var ErrTimeout = 1 + + If AddData = 1 Then + Var Cid = 26 + + If NewCollectPoint = 1 Then + If Seeker.UseGet15Discount = 1 Then + Var Cid = 39 + Else + Var Cid = 40 + Var PreviousSeeker.UseGetDrink5Bath = 0 + EndIf + EndIf + + AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore + EndIf + + + If Seeker.PayWithQR = 0 Then + + If Seeker.CreditCard = 1 Then + CashlessReq FAIL + Var ChangeFlag = 1 + Var CreditCardVoid = 1 + Else + + + If Seeker.CodeChannel = 0 Then + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + + If Seeker.StoreCreditFlag = 1 Then + Var ChangeOK = 2 + Else + If GetFreeFromError = 1 Then + Var ChangeOK = 2 + Else + Change ServiceAmount2 + EndIf + + EndIf + + EndIf + + Else + + If Seeker.VendingCode = "MKFOO" Then + Var Cid = 33 + Var PointCrm = "0" + Var GetScore = "1" + Var TelephoneNumberx = "0899999999" + AddData Cid Seeker.TNumberTaobinMember Seeker.CodeNumber PointCrm GetScore + Var Seeker.CodeChannel = 0 + EndIf + + If CoinAmount > 0 Then + + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign + + If Seeker.StoreCreditFlag = 1 Then + Var ChangeOK = 2 + Else + Change ServiceAmount3 + EndIf + + EndIf + Else + Var ChangeOK = 2 + EndIf + + + EndIf + EndIf + + Else + Var ChangeOK = 3 + EndIf + + + + + + + + + + + + ;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail.xml" + + ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + + ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" + ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" + + EndIf + EndIf + + + + DEBUGVAR LastMakeDrinkResult + DEBUGVAR MachineStage + + + If LastMakeDrinkResult = "success" Then + Var MachineState_Result = 1 + EndIf + + If LastMakeDrinkResult = "fail" Then + Var MachineState_Result = 2 + EndIf + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + If RoadShow = "true" Then + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + Else + Var MachineState_Result = 2 + EndIf + EndIf + + If MachineState_Result > 0 Then + Var EnableSelectMenuBetweenBrew = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" + EndIf + + If EnableSelectMenuBetweenBrew = "Enable" Then + If EnableSelectMenuBetweenBrewBlink = "Enable" Then + Var EnableSelectMenuBetweenBrewBlink = "Invisible" + Else + Var EnableSelectMenuBetweenBrewBlink = "Enable" + EndIf + + Else + Var EnableSelectMenuBetweenBrewBlink = "Invisible" + EndIf + + DEBUGVAR CountUpBrewing + ; animation video loop + If AnimationOn = "true" Then + Var CountUpBrewing = CountUpBrewing + 1 + + Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime + + If PreviseStepVideo = SlotVideo Then + ;SAVELOG SlotVideo + Else + Var PreviseStepVideo = SlotVideo + ;SAVELOG PreviseStepVideo + ;SAVELOG SlotVideo + ;SAVELOG CountUpBrewing + + ;Var CountDownVideoTime = CountDownVideoTimeReload + + Var StepVideo = SlotVideo + 2 + + ;SAVELOG StepVideo + + If StepVideo = 1 Then + Var videoID = VideoID1 + EndIf + If StepVideo = 2 Then + Var videoID = VideoID2 + EndIf + If StepVideo = 3 Then + Var videoID = VideoID3 + EndIf + If StepVideo = 4 Then + Var videoID = VideoID4 + EndIf + If StepVideo = 5 Then + Var videoID = VideoID5 + EndIf + If StepVideo = 6 Then + Var videoID = VideoID6 + EndIf + If StepVideo = 7 Then + Var videoID = VideoID7 + EndIf + If StepVideo = 8 Then + Var videoID = VideoID8 + EndIf + If StepVideo = 9 Then + Var videoID = VideoID9 + EndIf + + ;SAVELOG videoID + + If videoID = 0 Then + + Else + If videoID = "---" Then + + Else + + Var VideoPlayFile = VideoPath + Var VideoPlayFile = VideoPlayFile + VideoFileBegin + Var VideoPlayFile = VideoPlayFile + videoID + Var VideoPlayFile = VideoPlayFile + VideoFileEnd + + Var PictureFile = PicturePath + Var PictureFile = PictureFile + PictureBegin + Var PictureFile = PictureFile + videoID + Var PictureFile = PictureFile + PictureEnd + + DEBUGVAR VideoPlayFile + DEBUGVAR PictureFile + EndIf + EndIf + EndIf + EndIf + + + If IgnoreNetCore = "true" Then + If CountDownBrewing = 0 Then + SAVELOG "CountDownBrewing = 0" + Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + EndIf + + + If ButtonGameCountDown > 0 Then + If ButtonGameCountDown = 1 Then + Var ButtonGameCountDownState = "Invisible" + Var ButtonGamePressToPlayState = "Enable" + EndIf + Var ButtonGameCountDown = ButtonGameCountDown - 1 + DEBUGVAR ButtonGameCountDown + EndIf + + + DEBUGVAR BREW_CNT + DEBUGVAR ButtonGamePressToPlayState + If BREW_CNT > 60 Then + + Else + Var ButtonGamePressToPlayState = "Invisible" + Var Game01Enable = 0 + EndIf + + + + + + Refresh + TimerReset + + + + + + + +; this copy in file menu_brew2.xml and menu_lid_straw.xml + + If ChangeStatus = "payout-end" Then + If ChangeFlag = 1 Then + Var ChangeOK = 2 + EndIf + EndIf + + + + +;include="ROOT/taobin_project/inc/video.inc" + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + 60 + 1290 + PictureFile + + +; +; 60 +; 1649 +; BottomText +; + + + 0 + 1655 +EnableSelectMenuBetweenBrew + text_next_order + + + + 835 + 1735 +EnableSelectMenuBetweenBrewBlink + "ROOT/taobin_project/image/page_payment/arrow_1.png" + + + + + +; + + 751 + 413 + IMG_CNT + +; + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + + + + + + + + + + 526 + 1680 + 241 + 204 + ButtonGamePressToPlayState + "ROOT/taobin_project/app/game/TAMATIAN-01.gif" + + + + 526 + 1680 + 241 + 204 + ButtonGamePressToPlayState + + DEBUGVAR Game01Enable + SAVELOG "Press play game conti" + Var Game01Enable = 0 + Var ButtonGamePressToPlayState = "Invisible" + RunApp "com.NDF.taobin" + + + + + + + +; straw left + + + + + + +; LID left + + + + + + + + diff --git a/inter/sgp/xml/page_brewing3Conti.xml b/inter/sgp/xml/page_brewing3Conti.xml new file mode 100644 index 00000000..2c578ee8 --- /dev/null +++ b/inter/sgp/xml/page_brewing3Conti.xml @@ -0,0 +1,1293 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + Var ActionOKCase = 0 + Var Seeker = "curr" + + If PayCredit = 0 Then + Var PayCredit = 1 + CoinBack + EndIf + + ;Var PayCredit = 0 + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/topping2_en" + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" + Else + Var DirImage = "ROOT/taobin_project/image/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/topping2" + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf + + Var next_pic_bn = DirImage + "/bn_add_order.png" + Var next_pic_bp = DirImage + "/bp_add_order.png" + Var text_next_order = DirImage + "/text_next_order.png" + + Var topup_credit_bn = DirImage + "/bn_topup_credit.png" + Var topup_credit_bp = DirImage + "/bp_topup_credit.png" + + Var EnableTopupCreditBetweenBrew = "Invisible" + + If NextOrder = "true" Then + Var EnableSelectMenuBetweenBrew = "Invisible" + Else + Var EnableSelectMenuBetweenBrew = "Enable" + EndIf + + If GetFreeFromError = 1 Then + Var EnableSelectMenuBetweenBrew = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" + EndIf + + If EnableSelectMenuBetweenBrew = "Enable" Then + Var EnableSelectMenuBetweenBrewBlink = "Enable" + Else + Var EnableSelectMenuBetweenBrewBlink = "Invisible" + EndIf + + + Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png" + If Seeker.thankLidFlag = 1 Then + Var bg_strawlid = DirImage2 + "/bg_strawSmall.png" + Var LidStateX = "Invisible" + EndIf + + Var TimeoutWaitPay = 10 + + Var PayReference = "" + Var PayType = "newpay" + Var MachineState_Result = 0 + + If LastMakeDrinkResult = "success" Then + Var MachineState_Result = 1 + EndIf + + If LastMakeDrinkResult = "fail" Then + Var MachineState_Result = 2 + EndIf + + + Var ExtendData = Seeker.ExtendData + Var SelectDrink = Seeker.selected_a_drink + Var ServiceAmount2 = Seeker.ServiceAmount2 + + DEBUGVAR Seeker + DEBUGVAR Seeker.selected_a_drink + DEBUGVAR Seeker.ServiceAmount2 + + DEBUGVAR Seeker.CodeNumber + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + + ; On open move from page_brewing3.xml + Var countClick2 = 0 + + Var Timeout = 0 + + Var PrintCoinAmount = 0 + + Var AddData = 0 + + DEBUGVAR Seeker.TNumberTaobinMember + DEBUGVAR Seeker.PointTaobinStr + + If Seeker.TNumberTaobinMember = "" Then + + Else + If Seeker.PayWithQR = 1 Then + Var VendingTSIDTmp1 = VendingTSIDTmp + Else + Var VendingTSIDTmp1 = "" + EndIf + + + Var BmiYear = Seeker.PointTaobinStr + Var PointCrm = "" + If Seeker.FromConsent = 1 Then + Var PointCrm = "pdpa1" + EndIf + Var GetScore = VendingTSIDTmp1 + If Seeker.TaobinErrorNetwork = 0 Then + Var Cid = 11 + Var AddData = 1 + ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore + Else + Var PointCrm = "" + Var Cid = 14 + Var AddData = 1 + ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore + EndIf + + Var VendingTSIDTmp1 = "" + EndIf + + If Seeker.VendingCode = "MKFOO" Then + Var AddData = 0 + EndIf + + If MyMintEnable = 1 Then + If FromMyMintPro = 1 Then + Var AddData = 0 + EndIf + EndIf + + If ProBadValentineEnable = 1 Then + If FromBadValentinePro = 1 Then + Var AddData = 0 + EndIf + EndIf + + If LipitPro = 1 Then + If FromLipitPro = 1 Then + If Seeker.CodeChannel = 1 Then + If Seeker.CollectPointMain = 1 Then + Else + Var AddData = 0 + EndIf + EndIf + EndIf + EndIf + + If LedLidBlink = "true" Then + Var LedLidBlink = "no" + LED LedDoorLid Blink 255 255 255 255 + EndIf + + + Var CreditReference = Seeker.CreditReferenceTmp + Var VendingDiscount = Seeker.VendingDiscount + Var VendingCampaign = Seeker.VendingCampaign + Var TxReference = Seeker.TxRef1 + DEBUGVAR TxReference + + + Var DirImage = "ROOT/taobin_project/image/complete/" + Var next_pic_bg = DirImage + "/Preparing.png" + + Var bg_strawlid_ST = "Invisible" + Var bg_strawProblem_ST = "Invisible" + Var StrawStateX = "Invisible" + Var LidStateX = "Invisible" + + If Seeker.CreditCard = 1 Then + Var EnableSelectMenuBetweenBrew = "Invisible" + EndIf + + Var CreditCardVoid = 0 + + DEBUGVAR ButtonGameCountDownState + + + + + + + If CreditCardVoid = 1 Then + Var ChangeOK = 2 + EndIf + + If ActionOKCase = 1 Then + If Seeker.CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + DEBUGVAR SessionID2 + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + Var ECommerce = "" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.VendingCode + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + Var ActionOKCase = 2 + + SAVELOG "back_to_main from line > 142." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + + Else + + SAVELOG "back_to_main from line > 147." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + EndIf + + Else + + + + EndIf + + If waitAckPay = 1 Then + SAVELOG "waitAckPay = 1" + Open "ROOT/taobin_project/xml/page_drinkok.xml" + + EndIf + + + + + If ActionOKCase = 1 Then + If Seeker.CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + DEBUGVAR SessionID2 + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + Var ECommerce = "" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.VendingCode + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + Var ActionOKCase = 2 + + SAVELOG "back_to_main from line > 204." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + + Else + SAVELOG "back_to_main from line > 173." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + EndIf + + Else + + + + EndIf + + + + 1000 + + + Var Timeout = Timeout + 1 + + If MOVE_CUP_TO_DOOR = "true" Then + Var MOVE_CUP_TO_DOOR = "false" + EndIf + + If BREW_COUNT_DOWN_FROM_APP = "on" Then + Var CountDownBrewing = BREW_CNT + Else + + If CountDownBrewing > 0 Then + Var CountDownBrewing = CountDownBrewing - 1 + EndIf + Endif + + If Simulation = "true" Then + If CountDownBrewing = 0 Then + ;Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + EndIf + + If Timeout = 4 Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3" + EndIf + + ; run test; + ;If CountDownBrewing = 40 Then + ; Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;EndIf + If CountDownBrewing = 0 Then + ;Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + + Var ShowCountDownBrewing = CountDownBrewing + + + If Timeout > 540 Then + SAVELOG "back_to_main from line > 217." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + EndIf + + + If Timeout > 480 Then + Var MachineState_Result = 2 + EndIf + + If ChangeFlag = 1 Then + Var ChangeTimeout = ChangeTimeout + 1 + EndIf + + If waitAckPay = 1 Then + If Timeout > 60 Then + Var VendingTSIDTmp1 = "" + SAVELOG "waitAckPay = 1 tineout > 60" + + Open "ROOT/taobin_project/xml/page_drinkok.xml" + + EndIf + EndIf + + If waitAckPay = 2 Then + If Timeout > TimeoutWaitPay Then + + If Seeker.CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + DEBUGVAR SessionID2 + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + Var ECommerce = "" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.VendingCode + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + EndIf + + SAVELOG "back_to_main from line > 309." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + EndIf + EndIf + + + If ChangeOK = 2 Then + If ActionOKCase = 0 Then + + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + + If Seeker.TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = Seeker.TNumberTaobinMember + EndIf + + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + + + If HURR_FOREVER = "S:0" Then + Var HURR_FOREVER = "F:1303" + EndIf + + + Var PayDetail = "2/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel + + + + ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" + + Var ServiceType = "coffee" + Var ServiceCredit = SelectDrink + Var SuggestID = "" + Var SessionID2 = "" + + + Var PayDetail2 = Seeker.PayDetail2 + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + + + ;If Seeker.CodeChannel = 0 Then + ; SAVELOG "back_to_main from line > 315." + ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + ;EndIf + + Var waitAckPay = 2 + Var TimeoutWaitPay = 45 + Var Timeout = 5 + Var ActionOKCase = 1 + + EndIf + EndIf + + If ChangeTimeout > 30 Then + If ActionOKCase = 0 Then + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + + If Seeker.TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = Seeker.TNumberTaobinMember + EndIf + + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + + + If HURR_FOREVER = "S:0" Then + Var HURR_FOREVER = "F:1303" + EndIf + + Var PayDetail = "2/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel + + ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" + + + Var ServiceType = "coffee" + Var ServiceCredit = SelectDrink + Var SuggestID = "" + Var SessionID2 = "" + + + Var PayDetail2 = Seeker.PayDetail2 + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + + ;If Seeker.CodeChannel = 0 Then + ; SAVELOG "back_to_main from line > 357." + ; Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + ;EndIf + + Var waitAckPay = 2 + Var TimeoutWaitPay = 45 + Var Timeout = 5 + Var ActionOKCase = 1 + + EndIf + EndIf + + If ChangeOK = 3 Then + If ActionOKCase = 0 Then + + Var SVT = "coffee" + Var ACC = "0899999999" + + If Seeker.TNumberTaobinMember = "" Then + Else + Var ACC = Seeker.TNumberTaobinMember + EndIf + + + If HURR_FOREVER = "S:0" Then + Var HURR_FOREVER = "F:1303" + EndIf + + Var PayDetail = "2/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel + + + + + Var DEE = PayDetail + + PAYEXT SVT ACC VendingTSIDTmp DEE + + CoinBack + + + Var ActionOKCase = 1 + If Seeker.CodeChannel = 0 Then + SAVELOG "back_to_main from line > 391." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + EndIf + + Var waitAckPay = 2 + Var TimeoutWaitPay = 45 + Var Timeout = 5 + + + + + EndIf + EndIf + + If MachineState_Result = 1 Then + + ;Var MachineState_Result = 2 + + EndIf + + If MachineState_Result = 1 Then + DEBUGVAR PaySuccessWithDaemonTask + + If waitAckPay = 0 Then + + Var waitAckPay = 0 + Var Timeout = 0 + + Var ProcessText = "" + + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + + If Seeker.TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = Seeker.TNumberTaobinMember + EndIf + + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + + If AddData = 1 Then + Var Cid = 26 + DEBUGVAR "Brewing3Conti" + DEBUGVAR Seeker + DEBUGVAR Seeker.UseGet15Discount + If NewCollectPoint = 1 Then + If Seeker.UseGet15Discount = 1 Then + Var Cid = 39 + Else + Var Cid = 40 + Var PreviousSeeker.UseGetDrink5Bath = 0 + EndIf + EndIf + + AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore + EndIf + + Var ServiceType = "coffee" + Var ServiceCredit = SelectDrink + Var SuggestID = "" + + Var PayDetail = "2/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + Var PayDetail = PayDetail + "/XML|" + Var PayDetail = PayDetail + Seeker.OrderChanel + + + ;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" + + If GetFreeFromError = 1 Then + Var Seeker.CodeChannel = 1 + Var Seeker.VendingCode = "C48" + Var Seeker.CodeNumber = "0000000000" + Var VendingCampaign = ServiceAmount2 + EndIf + + If Seeker.PayWithQR = 0 Then + If Seeker.CodeChannel = 1 Then + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + Seeker.VendingCode + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + SelectDrink + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + BoxID + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "S" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + Seeker.CodeNumber + Var SessionID2 = SessionID2 + "/" + + If Seeker.CreditCard = 1 Then + + CashlessReq SUCCESS + ;CashlessReq FAIL + + EndIf + Var PayDetail2 = Seeker.PayDetail2 + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Else + + + If Seeker.CreditCard = 1 Then + + + CashlessReq SUCCESS + ;CashlessReq FAIL + + EndIf + Var PayDetail2 = Seeker.PayDetail2 + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + + + EndIf + + + Else + + ;no wait ack pay + Var waitAckPay = 0 + + Var SVT = "coffee" + Var ACC = "0899999999" + Var DEE = PayDetail + + If Seeker.TNumberTaobinMember = "" Then + Else + Var ACC = Seeker.TNumberTaobinMember + EndIf + + PAYEXT SVT ACC VendingTSIDTmp DEE + + CoinBack + + + EndIf + + EndIf + + __CMD "clear-stock-data" 0 "-" "-" + + Var ServiceSuccess = "yes" + If waitAckPay = 0 Then + + SAVELOG "waitAckPay = 0 Timeout" + + Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + + EndIf + + If MachineState_Result = 2 Then + + SAVELOG MachineStage + + If ErrTimeout = 0 Then + Var ErrTimeout = 1 + + If AddData = 1 Then + Var Cid = 26 + + If NewCollectPoint = 1 Then + If Seeker.UseGet15Discount = 1 Then + Var Cid = 39 + Else + Var Cid = 40 + Var PreviousSeeker.UseGetDrink5Bath = 0 + EndIf + EndIf + + AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore + EndIf + + + If Seeker.PayWithQR = 0 Then + + If Seeker.CreditCard = 1 Then + CashlessReq FAIL + Var ChangeFlag = 1 + Var CreditCardVoid = 1 + Else + + + If Seeker.CodeChannel = 0 Then + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + + If Seeker.StoreCreditFlag = 1 Then + Var ChangeOK = 2 + Else + If GetFreeFromError = 1 Then + Var ChangeOK = 2 + Else + Change ServiceAmount2 + EndIf + + EndIf + + EndIf + + Else + + If Seeker.VendingCode = "MKFOO" Then + Var Cid = 33 + Var PointCrm = "0" + Var GetScore = "1" + Var TelephoneNumberx = "0899999999" + AddData Cid Seeker.TNumberTaobinMember Seeker.CodeNumber PointCrm GetScore + Var Seeker.CodeChannel = 0 + EndIf + + If CoinAmount > 0 Then + + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign + + If Seeker.StoreCreditFlag = 1 Then + Var ChangeOK = 2 + Else + Change ServiceAmount3 + EndIf + + EndIf + Else + Var ChangeOK = 2 + EndIf + + + EndIf + EndIf + + Else + Var ChangeOK = 3 + EndIf + + + + + + + + + + + + ;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail.xml" + + ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + + ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" + ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" + + EndIf + EndIf + + + + DEBUGVAR LastMakeDrinkResult + DEBUGVAR MachineStage + + + If LastMakeDrinkResult = "success" Then + Var MachineState_Result = 1 + EndIf + + If LastMakeDrinkResult = "fail" Then + Var MachineState_Result = 2 + EndIf + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + If RoadShow = "true" Then + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + Else + Var MachineState_Result = 2 + EndIf + EndIf + + If MachineState_Result > 0 Then + Var EnableSelectMenuBetweenBrew = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" + EndIf + + If EnableSelectMenuBetweenBrew = "Enable" Then + If EnableSelectMenuBetweenBrewBlink = "Enable" Then + Var EnableSelectMenuBetweenBrewBlink = "Invisible" + Else + Var EnableSelectMenuBetweenBrewBlink = "Enable" + EndIf + + Else + Var EnableSelectMenuBetweenBrewBlink = "Invisible" + EndIf + + DEBUGVAR CountUpBrewing + ; animation video loop + If AnimationOn = "true" Then + Var CountUpBrewing = CountUpBrewing + 1 + + Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime + + If PreviseStepVideo = SlotVideo Then + ;SAVELOG SlotVideo + Else + Var PreviseStepVideo = SlotVideo + ;SAVELOG PreviseStepVideo + ;SAVELOG SlotVideo + ;SAVELOG CountUpBrewing + + ;Var CountDownVideoTime = CountDownVideoTimeReload + + Var StepVideo = SlotVideo + 2 + + ;SAVELOG StepVideo + + If StepVideo = 1 Then + Var videoID = VideoID1 + EndIf + If StepVideo = 2 Then + Var videoID = VideoID2 + EndIf + If StepVideo = 3 Then + Var videoID = VideoID3 + EndIf + If StepVideo = 4 Then + Var videoID = VideoID4 + EndIf + If StepVideo = 5 Then + Var videoID = VideoID5 + EndIf + If StepVideo = 6 Then + Var videoID = VideoID6 + EndIf + If StepVideo = 7 Then + Var videoID = VideoID7 + EndIf + If StepVideo = 8 Then + Var videoID = VideoID8 + EndIf + If StepVideo = 9 Then + Var videoID = VideoID9 + EndIf + + ;SAVELOG videoID + + If videoID = 0 Then + + Else + If videoID = "---" Then + + Else + + Var VideoPlayFile = VideoPath + Var VideoPlayFile = VideoPlayFile + VideoFileBegin + Var VideoPlayFile = VideoPlayFile + videoID + Var VideoPlayFile = VideoPlayFile + VideoFileEnd + + Var PictureFile = PicturePath + Var PictureFile = PictureFile + PictureBegin + Var PictureFile = PictureFile + videoID + Var PictureFile = PictureFile + PictureEnd + + DEBUGVAR VideoPlayFile + DEBUGVAR PictureFile + EndIf + EndIf + EndIf + EndIf + + + If IgnoreNetCore = "true" Then + If CountDownBrewing = 0 Then + SAVELOG "CountDownBrewing = 0" + Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + EndIf + + + If ButtonGameCountDown > 0 Then + If ButtonGameCountDown = 1 Then + Var ButtonGameCountDownState = "Invisible" + Var ButtonGamePressToPlayState = "Enable" + EndIf + Var ButtonGameCountDown = ButtonGameCountDown - 1 + DEBUGVAR ButtonGameCountDown + EndIf + + + DEBUGVAR BREW_CNT + DEBUGVAR ButtonGamePressToPlayState + If BREW_CNT > 60 Then + + Else + Var ButtonGamePressToPlayState = "Invisible" + Var Game01Enable = 0 + EndIf + + + + + + Refresh + TimerReset + + + + + + + +; this copy in file menu_brew2.xml and menu_lid_straw.xml + + If ChangeStatus = "payout-end" Then + If ChangeFlag = 1 Then + Var ChangeOK = 2 + EndIf + EndIf + + + + +;include="ROOT/taobin_project/inc/video.inc" + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + 60 + 1290 + PictureFile + + +; +; 60 +; 1649 +; BottomText +; + + + 0 + 1655 +EnableSelectMenuBetweenBrew + text_next_order + + + + 835 + 1735 +EnableSelectMenuBetweenBrewBlink + "ROOT/taobin_project/image/page_payment/arrow_1.png" + + + + + +; + + 751 + 413 + IMG_CNT + +; + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + + + + + + + + + + 526 + 1680 + 241 + 204 + ButtonGamePressToPlayState + "ROOT/taobin_project/app/game/TAMATIAN-01.gif" + + + + 526 + 1680 + 241 + 204 + ButtonGamePressToPlayState + + DEBUGVAR Game01Enable + SAVELOG "Press play game conti" + Var Game01Enable = 0 + Var ButtonGamePressToPlayState = "Invisible" + RunApp "com.NDF.taobin" + + + + + + + +; straw left + + + + + + +; LID left + + + + + + + + diff --git a/xml/event/promotion_energy_drink_1_bath.xml b/xml/event/promotion_energy_drink_1_bath.xml index 2d97cc9c..5dc779eb 100644 --- a/xml/event/promotion_energy_drink_1_bath.xml +++ b/xml/event/promotion_energy_drink_1_bath.xml @@ -3629,9 +3629,9 @@ Sugar, Biscof" Flag( 12-03-03-0061.Button,Disable=Invisible,$Sum1203030061)