diff --git a/image/page_doing/bn_send_report_straw.png b/image/page_doing/bn_send_report_straw.png new file mode 100644 index 00000000..efc64ba8 Binary files /dev/null and b/image/page_doing/bn_send_report_straw.png differ diff --git a/image/page_doing/bn_send_report_straw_en.png b/image/page_doing/bn_send_report_straw_en.png new file mode 100644 index 00000000..99bc38ff Binary files /dev/null and b/image/page_doing/bn_send_report_straw_en.png differ diff --git a/image/page_doing/bp_send_report_straw.png b/image/page_doing/bp_send_report_straw.png new file mode 100644 index 00000000..bac51cd9 Binary files /dev/null and b/image/page_doing/bp_send_report_straw.png differ diff --git a/image/page_doing/bp_send_report_straw_en.png b/image/page_doing/bp_send_report_straw_en.png new file mode 100644 index 00000000..802d31b3 Binary files /dev/null and b/image/page_doing/bp_send_report_straw_en.png differ diff --git a/xml/page_board.xml b/xml/page_board.xml index 8f5e2613..6727d092 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -187,13 +187,13 @@ If TaobinOnlineX = "true" Then + Var EventTurnOn = 0 Var CountDownShowButton = 35 Var ShowButtonClickFull = "Invisible" Var VideoMainPage = "ROOT/taobin_project/video/main_page.mp4" DEBUGVAR SystemDateMonth DEBUGVAR SystemDateDay - Var EventTurnOn = 0 If SystemDateMonth = 10 Then diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index c995aac6..4d8882a1 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -20,7 +20,7 @@ Var bg_strawlid_ST = "Enable" Var bg_strawProblem_ST = "Invisible" - Var bg_strawProblem_Y = 1470 + ;Var bg_strawProblem_Y = 1470 Var bg_strawProblem = DirImage2 + "/bg_strawProblem.png" Var straw_problem_flag = 0 @@ -32,7 +32,7 @@ If Seeker.lidAction = 0 Then Else - Var bg_strawProblem_Y = 1680 + ;Var bg_strawProblem_Y = 1680 Var bg_strawlid_ST = "Invisible" Var LidStateX = "Invisible" Var StrawStateX = "Invisible" @@ -82,6 +82,8 @@ If show_eng = "true" Then + Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_en.png" + Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_en.png" If CART_COUNT > 0 Then If CART_INDEX < CART_COUNT Then @@ -112,6 +114,8 @@ Else + Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw.png" + Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw.png" If CART_COUNT > 0 Then If CART_INDEX < CART_COUNT Then @@ -168,6 +172,12 @@ Var DelayButton = 0 + + If GetMoreStrawCount = 0 Then + Var bg_strawProblem_ST = "Enable" + EndIf + + 500 @@ -617,10 +627,11 @@