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/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/inter/tha/image/collectiing_mmr/bn_1.png
+++ b/inter/tha/image/collectiing_mmr/bn_1.png
--- a/inter/tha/image/collectiing_mmr/bn_2.png
+++ b/inter/tha/image/collectiing_mmr/bn_2.png
--- a/inter/tha/image/collectiing_mmr/bn_3.png
+++ b/inter/tha/image/collectiing_mmr/bn_3.png
--- a/inter/tha/image/collectiing_mmr/bn_4.png
+++ b/inter/tha/image/collectiing_mmr/bn_4.png
--- a/inter/tha/image/collectiing_mmr/bn_5.png
+++ b/inter/tha/image/collectiing_mmr/bn_5.png
--- a/inter/tha/image/collectiing_mmr/bn_6.png
+++ b/inter/tha/image/collectiing_mmr/bn_6.png
--- a/inter/tha/image/collectiing_mmr/bn_7.png
+++ b/inter/tha/image/collectiing_mmr/bn_7.png
--- a/inter/tha/image/collectiing_mmr/bn_8.png
+++ b/inter/tha/image/collectiing_mmr/bn_8.png
--- a/inter/tha/image/collectiing_mmr/bn_9.png
+++ b/inter/tha/image/collectiing_mmr/bn_9.png
--- a/inter/tha/image/collectiing_mmr/bn_back-1.png
+++ b/inter/tha/image/collectiing_mmr/bn_back-1.png
--- a/inter/tha/image/collectiing_mmr/bn_back.png
+++ b/inter/tha/image/collectiing_mmr/bn_back.png
--- a/inter/tha/image/collectiing_mmr/bn_back2.png
+++ b/inter/tha/image/collectiing_mmr/bn_back2.png
--- a/inter/tha/image/collectiing_mmr/bn_back3.png
+++ b/inter/tha/image/collectiing_mmr/bn_back3.png
--- a/inter/tha/image/collectiing_mmr/bn_cancel2.png
+++ b/inter/tha/image/collectiing_mmr/bn_cancel2.png
--- a/inter/tha/image/collectiing_mmr/bn_cancel3.png
+++ b/inter/tha/image/collectiing_mmr/bn_cancel3.png
--- a/inter/tha/image/collectiing_mmr/bn_cancel4.png
+++ b/inter/tha/image/collectiing_mmr/bn_cancel4.png
--- a/inter/tha/image/collectiing_mmr/bn_catalog.png
+++ b/inter/tha/image/collectiing_mmr/bn_catalog.png
--- a/inter/tha/image/collectiing_mmr/bn_close.png
+++ b/inter/tha/image/collectiing_mmr/bn_close.png
--- a/inter/tha/image/collectiing_mmr/bn_confirm.png
+++ b/inter/tha/image/collectiing_mmr/bn_confirm.png
--- a/inter/tha/image/collectiing_mmr/bn_confirm2.png
+++ b/inter/tha/image/collectiing_mmr/bn_confirm2.png
--- a/inter/tha/image/collectiing_mmr/bn_continue.png
+++ b/inter/tha/image/collectiing_mmr/bn_continue.png
--- a/inter/tha/image/collectiing_mmr/bn_door_open.png
+++ b/inter/tha/image/collectiing_mmr/bn_door_open.png
--- a/inter/tha/image/collectiing_mmr/bn_door_open2-1.png
+++ b/inter/tha/image/collectiing_mmr/bn_door_open2-1.png
--- a/inter/tha/image/collectiing_mmr/bn_door_open2.png
+++ b/inter/tha/image/collectiing_mmr/bn_door_open2.png
--- a/inter/tha/image/collectiing_mmr/bn_getPin.png
+++ b/inter/tha/image/collectiing_mmr/bn_getPin.png
--- a/inter/tha/image/collectiing_mmr/bn_getSMSPage.png
+++ b/inter/tha/image/collectiing_mmr/bn_getSMSPage.png
--- a/inter/tha/image/collectiing_mmr/bn_ignore.png
+++ b/inter/tha/image/collectiing_mmr/bn_ignore.png
--- a/inter/tha/image/collectiing_mmr/bn_number.png
+++ b/inter/tha/image/collectiing_mmr/bn_number.png
--- a/inter/tha/image/collectiing_mmr/bn_other.png
+++ b/inter/tha/image/collectiing_mmr/bn_other.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_ccard1.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_ccard1.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeAEON.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeAEON.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeAIS.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeAIS.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeDtac.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeDtac.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeKBANK.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeKBANK.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeLH.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeLH.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeLotus.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeLotus.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeMCard.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeMCard.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeRabbit.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeRabbit.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeThe1.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeThe1.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeTrue.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeTrue.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_codeXXX.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_codeXXX.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_dolfin.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_dolfin.png
--- a/inter/tha/image/collectiing_mmr/bn_pay_with_lazpay.png
+++ b/inter/tha/image/collectiing_mmr/bn_pay_with_lazpay.png
--- a/Show more
+++ b/Show more