Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

2024-12-17 13:33:22 +07:00 · 2024-12-17 13:33:22 +07:00 · 31f3de5285
commit 31f3de5285
parent b1b13f5b19 f20bf0f0e1
1150 changed files with 4372 additions and 3921 deletions
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@ -783,7 +783,6 @@ Room no.13	12-99-05-0073	1	14	11	12	23	13				24	120	1:00	23
 นมคาราเมล\nบิสคอฟ	12-03-03-0041	1	17	23	22						24	120	12:00	23
 นมสตรอเบอร์รี่\nบิสคอฟ	12-03-03-0042	1	17	19	41						24	120	12:00	23
 นมมินต์\nบิสคอฟ	12-03-03-0043	1	7	59							24	120	12:00	23
-	12-03-03-0061	1	7	15							24	120	12:00	23

 HOT MELON TEA	12-99-01-0010
 ICED MELON TAIWANESE TEA	12-99-02-0012
@ -1161,6 +1160,7 @@ Strawberry milk 7Up lime  top ovaltine	12-03-03-0083	1	18	19	17	23	41	51			24	13
 นมยูสุปั่นโอรีโอภูเขาไฟ	12-03-03-0087	1	40	53	23	41					24	49	10:01	23

 ซานต้าจินเจอร์	12-03-02-0081	1	7	22	23						24	49	10:01	23
+ซานต้าจินเจอร์	12-23-02-0081	1	7	22	23						24	49	10:01	23
 ช็อกโกสโนว์เฟลก	12-03-03-0088	1	15	7	22	40	41				24	49	10:01	23
 เรนเดียร์เปปเปอร์มินต์	12-03-03-0089	1	59	7	19	41					24	49	10:01	23
 คริสมาสต์ คาเฟ ลาเต้	12-01-02-0084	1	6	7	12	22	23				24	49	10:01	23
@ -1175,3 +1175,16 @@ Strawberry milk 7Up lime  top ovaltine	12-03-03-0083	1	18	19	17	23	41	51			24	13
 ชานมชาววัง	12-02-01-0085	1	10	6	7	8	9	22			24	49	10:01	23
 ชานมชาววัง	12-02-02-0085	1	10	6	7	8	9	22	23		24	49	10:01	23
 ชานมชาววัง	12-02-03-0085	1	10	6	7	8	9	22	23	41	24	49	10:01	23
+
+คุกกี้ลาเต้ปั่น	12-01-03-0085	1	2	3	4	5	6	7	23	41	24	49	10:01	23
+คุกกี้ลาเต้ปั่น(s)	12-21-03-0085	1	2	3	4	5	6	7	23	41	24	49	10:01	23
+ชาไทยปั่นคุกกี้บัตเตอร์	12-02-03-0086	1	10	17	23	41					24	49	10:01	23
+มัทฉะลาเต้ปั่นคุกกี้บัตเตอร์	12-02-03-0087	1	6	7	8	9	23	41	23	41	24	49	10:01	23
+คุกกี้ภูเขาไฟ	12-03-03-0090	1	17	23	41				23	41	24	49	10:01	23
+จั้มบ๊ะน้ำแข็งใสปั่น	12-03-03-0091	1	17	21	23	41			23	41	24	49	10:01	23
+ชอคโกแลตคุกกี้ปั่น	12-03-03-0061	1	17	15	23	41			23	41	24	49	10:01	23
+คุกกี้ลิ้นจี่นมสดปั่น	12-03-03-0093	1	17	11	23	41			23	41	24	49	10:01	23
+เซเว่นอัพคุกกี้บัตเตอร์ปั่น	12-03-03-0092	1	17	13	18	23	41		23	41	24	49	10:01	23
+
+โอวันตินรถโรงเรียน\nภูเขาไฟ	12-03-03-0094	1	51	17	23	41					24	66	5:06	32
+โอวันตินรถโรงเรียน\nซุปเปอร์ภูเขาไฟ	12-03-03-0095	1	51	17	23	41					24	66	5:06	32
--- a/image/collectiing_mmr/bn_close.png
+++ b/image/collectiing_mmr/bn_close.png
--- a/image/collectiing_mmr/bn_door_open2.png
+++ b/image/collectiing_mmr/bn_door_open2.png
--- a/image/collectiing_mmr/bn_recieve_coupon.png
+++ b/image/collectiing_mmr/bn_recieve_coupon.png
--- a/image/collectiing_mmr/bp_close.png
+++ b/image/collectiing_mmr/bp_close.png
--- a/image/collectiing_mmr/bp_recieve_coupon.png
+++ b/image/collectiing_mmr/bp_recieve_coupon.png
--- a/image/collectiing_mmr/text23.png
+++ b/image/collectiing_mmr/text23.png
--- a/image/collectiing_mmr/text_24.png
+++ b/image/collectiing_mmr/text_24.png
--- a/image/event/lucky_draw_ads/bn_interested_mmr.png
+++ b/image/event/lucky_draw_ads/bn_interested_mmr.png
--- a/image/event/lucky_draw_ads/bn_skip_mmr.png
+++ b/image/event/lucky_draw_ads/bn_skip_mmr.png
--- a/image/event/lucky_draw_ads/bp_interested_mmr.png
+++ b/image/event/lucky_draw_ads/bp_interested_mmr.png
--- a/image/event/lucky_draw_ads/bp_skip_mmr.png
+++ b/image/event/lucky_draw_ads/bp_skip_mmr.png
--- a/image/event/lucky_draw_ads/text_mmr.png
+++ b/image/event/lucky_draw_ads/text_mmr.png
--- a/image/page_drink_disable_n2/bn_Ginger_lemon_tea_Doikum.png
+++ b/image/page_drink_disable_n2/bn_Ginger_lemon_tea_Doikum.png
--- a/image/page_drink_disable_n2/bn_hot_coffee_thai_milk_tea_SingPark.png
+++ b/image/page_drink_disable_n2/bn_hot_coffee_thai_milk_tea_SingPark.png
--- a/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png
+++ b/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png
--- a/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png
+++ b/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png
--- a/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png
+++ b/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png
--- a/image/page_drink_n/bn_hot_coffee_thai_milk_tea_SingPark.png
+++ b/image/page_drink_n/bn_hot_coffee_thai_milk_tea_SingPark.png
--- a/image/page_drink_n/bn_limeblack_tea_SingPark.png
+++ b/image/page_drink_n/bn_limeblack_tea_SingPark.png
--- a/image/page_drink_n/bn_thai_black_tea_SingPark.png
+++ b/image/page_drink_n/bn_thai_black_tea_SingPark.png
--- a/image/page_drink_n/bn_thai_milk_tea_SingPark.png
+++ b/image/page_drink_n/bn_thai_milk_tea_SingPark.png
--- a/image/page_drink_picture2_n/bn_hot_coffee_thai_milk_tea_SingPark.png
+++ b/image/page_drink_picture2_n/bn_hot_coffee_thai_milk_tea_SingPark.png
--- a/image/page_drink_picture2_n/bn_limeblack_tea_SingPark.png
+++ b/image/page_drink_picture2_n/bn_limeblack_tea_SingPark.png
--- a/image/page_drink_picture2_n/bn_thai_black_tea_SingPark.png
+++ b/image/page_drink_picture2_n/bn_thai_black_tea_SingPark.png
--- a/image/page_drink_picture2_n/bn_thai_milk_tea_SingPark.png
+++ b/image/page_drink_picture2_n/bn_thai_milk_tea_SingPark.png
--- a/image/page_drink_press_n/bn_hot_coffee_thai_milk_tea_SingPark.png
+++ b/image/page_drink_press_n/bn_hot_coffee_thai_milk_tea_SingPark.png
--- a/image/page_drink_press_n/bn_limeblack_tea_SingPark.png
+++ b/image/page_drink_press_n/bn_limeblack_tea_SingPark.png
--- a/image/page_drink_press_n/bn_thai_black_tea_SingPark.png
+++ b/image/page_drink_press_n/bn_thai_black_tea_SingPark.png
--- a/image/page_drink_press_n/bn_thai_milk_tea_SingPark.png
+++ b/image/page_drink_press_n/bn_thai_milk_tea_SingPark.png
--- a/image/page_thankyou_mmr/imgGetChange-HKG.png
+++ b/image/page_thankyou_mmr/imgGetChange-HKG.png
--- a/image/page_thankyou_mmr/imgGetChange-IDR.png
+++ b/image/page_thankyou_mmr/imgGetChange-IDR.png
--- a/image/page_thankyou_mmr/imgGetChange-MYR.png
+++ b/image/page_thankyou_mmr/imgGetChange-MYR.png
--- a/image/page_thankyou_mmr/imgGetChange-SGP.png
+++ b/image/page_thankyou_mmr/imgGetChange-SGP.png
--- a/image/page_thankyou_mmr/imgGetChange-UAE_DUBAI.png
+++ b/image/page_thankyou_mmr/imgGetChange-UAE_DUBAI.png
--- a/image/page_thankyou_mmr/imgGetChange.png
+++ b/image/page_thankyou_mmr/imgGetChange.png
--- a/image/page_thankyou_mmr/remainCredit-AUD.png
+++ b/image/page_thankyou_mmr/remainCredit-AUD.png
--- a/image/page_thankyou_mmr/remainCredit-HKG.png
+++ b/image/page_thankyou_mmr/remainCredit-HKG.png
--- a/image/page_thankyou_mmr/remainCredit-IDR.png
+++ b/image/page_thankyou_mmr/remainCredit-IDR.png
--- a/image/page_thankyou_mmr/remainCredit-MYR.png
+++ b/image/page_thankyou_mmr/remainCredit-MYR.png
--- a/image/page_thankyou_mmr/remainCredit-SGP.png
+++ b/image/page_thankyou_mmr/remainCredit-SGP.png
--- a/image/page_thankyou_mmr/remainCredit-UAE_DUBAI.png
+++ b/image/page_thankyou_mmr/remainCredit-UAE_DUBAI.png
--- a/image/page_thankyou_mmr/remainCredit.png
+++ b/image/page_thankyou_mmr/remainCredit.png
--- a/inter/tha/hardware/powder_schedule.ev
+++ b/inter/tha/hardware/powder_schedule.ev
@ -3,7 +3,7 @@

 DEBUGVAR LastTimeUseChannel10InMinute
 DEBUGVAR CurrentXMLFileName0
-SAVELOG "powder schedule version 1.05"
+SAVELOG "powder schedule version 1.06"

 DEBUGVAR PowderPayPushLowScheduleTurnOn10

@ -78,7 +78,7 @@ Else

    If PowderScheduleForCh10 = "powder-run" Then
        Var PowderScheduleForCh10 = "wait-low-test"
-        __CMD "CLI" "powder-set-channel-for-low-push-stage=10,powder-set-time-for-low-push-stage=8,powder-low-push=xml" "-" "-"
+        __CMD "CLI" "powder-set-channel-for-low-push-stage=10,powder-set-time-for-low-push-stage=2,powder-low-push=xml" "-" "-"
        DEBUGVAR PowderScheduleForCh10
        
    EndIf
--- a/inter/tha/image/before_member/bn_change_pass_mmr.png
+++ b/inter/tha/image/before_member/bn_change_pass_mmr.png
--- a/inter/tha/image/before_member/bn_check_coupon_mmr.png
+++ b/inter/tha/image/before_member/bn_check_coupon_mmr.png
--- a/inter/tha/image/before_member/bn_topup_credit_mmr.png
+++ b/inter/tha/image/before_member/bn_topup_credit_mmr.png
--- a/inter/tha/image/before_member/bp_change_pass_mmr.png
+++ b/inter/tha/image/before_member/bp_change_pass_mmr.png
--- a/inter/tha/image/before_member/bp_check_coupon_mmr.png
+++ b/inter/tha/image/before_member/bp_check_coupon_mmr.png
--- a/inter/tha/image/before_member/bp_topup_credit_mmr.png
+++ b/inter/tha/image/before_member/bp_topup_credit_mmr.png
--- a/inter/tha/image/collect_point1_mmr/bn_back.png
+++ b/inter/tha/image/collect_point1_mmr/bn_back.png
--- a/inter/tha/image/collect_point1_mmr/bn_ignore.png
+++ b/inter/tha/image/collect_point1_mmr/bn_ignore.png
--- a/inter/tha/image/collect_point1_mmr/bn_negative.png
+++ b/inter/tha/image/collect_point1_mmr/bn_negative.png
--- a/inter/tha/image/collect_point1_mmr/bn_negative2.png
+++ b/inter/tha/image/collect_point1_mmr/bn_negative2.png
--- a/inter/tha/image/collect_point1_mmr/bn_positive.png
+++ b/inter/tha/image/collect_point1_mmr/bn_positive.png
--- a/inter/tha/image/collect_point1_mmr/bp_back.png
+++ b/inter/tha/image/collect_point1_mmr/bp_back.png
--- a/inter/tha/image/collect_point1_mmr/bp_negative.png
+++ b/inter/tha/image/collect_point1_mmr/bp_negative.png
--- a/inter/tha/image/collect_point1_mmr/bp_negative2.png
+++ b/inter/tha/image/collect_point1_mmr/bp_negative2.png
--- a/inter/tha/image/collect_point1_mmr/bp_positive.png
+++ b/inter/tha/image/collect_point1_mmr/bp_positive.png
--- a/inter/tha/image/collect_point1_mmr/img2_eng.png
+++ b/inter/tha/image/collect_point1_mmr/img2_eng.png
--- a/inter/tha/image/collect_point1_mmr/img3.png
+++ b/inter/tha/image/collect_point1_mmr/img3.png
--- a/inter/tha/image/collect_point1_mmr/img4.png
+++ b/inter/tha/image/collect_point1_mmr/img4.png
--- a/inter/tha/image/collect_point1_mmr/text_1.png
+++ b/inter/tha/image/collect_point1_mmr/text_1.png
--- a/inter/tha/image/collect_point1_mmr/text_2.png
+++ b/inter/tha/image/collect_point1_mmr/text_2.png
--- a/inter/tha/image/collect_point1_mmr/text_3.png
+++ b/inter/tha/image/collect_point1_mmr/text_3.png
--- a/inter/tha/image/collect_point1_mmr/text_4.png
+++ b/inter/tha/image/collect_point1_mmr/text_4.png
--- a/inter/tha/image/collect_point1_mmr/text_5.png
+++ b/inter/tha/image/collect_point1_mmr/text_5.png
--- a/inter/tha/image/collect_point1_mmr/text_6.png
+++ b/inter/tha/image/collect_point1_mmr/text_6.png
--- a/inter/tha/image/collect_point1_mmr/text_7.png
+++ b/inter/tha/image/collect_point1_mmr/text_7.png
--- a/inter/tha/image/collect_point1_mmr/text_edit-1.png
+++ b/inter/tha/image/collect_point1_mmr/text_edit-1.png
--- a/inter/tha/image/collect_point1_mmr/text_edit.png
+++ b/inter/tha/image/collect_point1_mmr/text_edit.png
--- a/inter/tha/image/collect_point1_mmr/text_edit2.png
+++ b/inter/tha/image/collect_point1_mmr/text_edit2.png
--- a/inter/tha/image/collectiing_mmr/Businessman_sorry.png
+++ b/inter/tha/image/collectiing_mmr/Businessman_sorry.png
--- a/inter/tha/image/collectiing_mmr/Businessman_sorry2.png
+++ b/inter/tha/image/collectiing_mmr/Businessman_sorry2.png
--- a/inter/tha/image/collectiing_mmr/Exit.png
+++ b/inter/tha/image/collectiing_mmr/Exit.png
--- a/inter/tha/image/collectiing_mmr/Group.png
+++ b/inter/tha/image/collectiing_mmr/Group.png
--- a/inter/tha/image/collectiing_mmr/PinFailed.png
+++ b/inter/tha/image/collectiing_mmr/PinFailed.png
--- a/inter/tha/image/collectiing_mmr/PinSuccess.png
+++ b/inter/tha/image/collectiing_mmr/PinSuccess.png
--- a/inter/tha/image/collectiing_mmr/alpha.png
+++ b/inter/tha/image/collectiing_mmr/alpha.png
--- a/inter/tha/image/collectiing_mmr/bd_confirm.png
+++ b/inter/tha/image/collectiing_mmr/bd_confirm.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_ccard1.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_ccard1.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeAEON.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeAEON.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeAIS.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeAIS.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeDtac.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeDtac.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeKBANK.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeKBANK.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeLH.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeLH.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeLotus.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeLotus.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeMCard.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeMCard.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeRabbit.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeRabbit.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeThe1.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeThe1.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_codeTrue.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_codeTrue.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_dolfin.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_dolfin.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_lazpay.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_lazpay.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_linepay.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_linepay.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_make.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_make.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_maxme.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_maxme.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_shoppy.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_shoppy.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_true.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_true.png
--- a/inter/tha/image/collectiing_mmr/bd_pay_with_wechat.png
+++ b/inter/tha/image/collectiing_mmr/bd_pay_with_wechat.png
--- a/inter/tha/image/collectiing_mmr/bn_0.png
+++ b/inter/tha/image/collectiing_mmr/bn_0.png
--- a/Show more
+++ b/Show more