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

2024-12-10 09:00:00 +07:00 · 2024-12-10 09:00:00 +07:00 · 95f314dc53
commit 95f314dc53
parent b9752145aa 7669b77c77
1157 changed files with 100747 additions and 51887 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,5 @@
 cip
 video/_main_page.mp4
 .DS_Store
-.vscode
+.vscode
+.zed
--- a/app/game/game01.tgz.aa
+++ b/app/game/game01.tgz.aa
--- a/app/game/game01.tgz.ab
+++ b/app/game/game01.tgz.ab
--- a/app/game/game01.tgz.ac
+++ b/app/game/game01.tgz.ac
--- a/app/game/game01.tgz.ad
+++ b/app/game/game01.tgz.ad
--- a/app/game/game01.tgz.ae
+++ b/app/game/game01.tgz.ae
--- a/app/game/game01.tgz.af
+++ b/app/game/game01.tgz.af
--- a/app/game/game01.tgz.ag
+++ b/app/game/game01.tgz.ag
--- a/app/game/game01.tgz.ah
+++ b/app/game/game01.tgz.ah
--- a/app/game/game01.tgz.ai
+++ b/app/game/game01.tgz.ai
--- a/app/game/last-cmd
+++ b/app/game/last-cmd
@ -1 +0,0 @@
-cd /mnt/sdcard/coffeevending/taobin_project/app/game; cat game01.tgz.a* | tar -xz
--- a/image/before_member/bn_change_pass_mmr.png
+++ b/image/before_member/bn_change_pass_mmr.png
--- a/image/before_member/bn_check_coupon_mmr.png
+++ b/image/before_member/bn_check_coupon_mmr.png
--- a/image/before_member/bn_topup_credit_mmr.png
+++ b/image/before_member/bn_topup_credit_mmr.png
--- a/image/before_member/bp_change_pass_mmr.png
+++ b/image/before_member/bp_change_pass_mmr.png
--- a/image/before_member/bp_check_coupon_mmr.png
+++ b/image/before_member/bp_check_coupon_mmr.png
--- a/image/before_member/bp_topup_credit_mmr.png
+++ b/image/before_member/bp_topup_credit_mmr.png
--- a/image/collect_point1_mmr/bn_back.png
+++ b/image/collect_point1_mmr/bn_back.png
--- a/image/collect_point1_mmr/bn_ignore.png
+++ b/image/collect_point1_mmr/bn_ignore.png
--- a/image/collect_point1_mmr/bn_negative.png
+++ b/image/collect_point1_mmr/bn_negative.png
--- a/image/collect_point1_mmr/bn_negative2.png
+++ b/image/collect_point1_mmr/bn_negative2.png
--- a/image/collect_point1_mmr/bn_positive.png
+++ b/image/collect_point1_mmr/bn_positive.png
--- a/image/collect_point1_mmr/bp_back.png
+++ b/image/collect_point1_mmr/bp_back.png
--- a/image/collect_point1_mmr/bp_negative.png
+++ b/image/collect_point1_mmr/bp_negative.png
--- a/image/collect_point1_mmr/bp_negative2.png
+++ b/image/collect_point1_mmr/bp_negative2.png
--- a/image/collect_point1_mmr/bp_positive.png
+++ b/image/collect_point1_mmr/bp_positive.png
--- a/image/collect_point1_mmr/img2_eng.png
+++ b/image/collect_point1_mmr/img2_eng.png
--- a/image/collect_point1_mmr/img3.png
+++ b/image/collect_point1_mmr/img3.png
--- a/image/collect_point1_mmr/img4.png
+++ b/image/collect_point1_mmr/img4.png
--- a/image/collect_point1_mmr/text_1.png
+++ b/image/collect_point1_mmr/text_1.png
--- a/image/collect_point1_mmr/text_2.png
+++ b/image/collect_point1_mmr/text_2.png
--- a/image/collect_point1_mmr/text_3.png
+++ b/image/collect_point1_mmr/text_3.png
--- a/image/collect_point1_mmr/text_4.png
+++ b/image/collect_point1_mmr/text_4.png
--- a/image/collect_point1_mmr/text_5.png
+++ b/image/collect_point1_mmr/text_5.png
--- a/image/collect_point1_mmr/text_6.png
+++ b/image/collect_point1_mmr/text_6.png
--- a/image/collect_point1_mmr/text_7.png
+++ b/image/collect_point1_mmr/text_7.png
--- a/image/collect_point1_mmr/text_edit-1.png
+++ b/image/collect_point1_mmr/text_edit-1.png
--- a/image/collect_point1_mmr/text_edit.png
+++ b/image/collect_point1_mmr/text_edit.png
--- a/image/collect_point1_mmr/text_edit2.png
+++ b/image/collect_point1_mmr/text_edit2.png
--- a/image/collectiing_mmr/Businessman_sorry.png
+++ b/image/collectiing_mmr/Businessman_sorry.png
--- a/image/collectiing_mmr/Businessman_sorry2.png
+++ b/image/collectiing_mmr/Businessman_sorry2.png
--- a/image/collectiing_mmr/Exit.png
+++ b/image/collectiing_mmr/Exit.png
--- a/image/collectiing_mmr/Group.png
+++ b/image/collectiing_mmr/Group.png
--- a/image/collectiing_mmr/PinFailed.png
+++ b/image/collectiing_mmr/PinFailed.png
--- a/image/collectiing_mmr/PinSuccess.png
+++ b/image/collectiing_mmr/PinSuccess.png
--- a/image/collectiing_mmr/alpha.png
+++ b/image/collectiing_mmr/alpha.png
--- a/image/collectiing_mmr/bd_confirm.png
+++ b/image/collectiing_mmr/bd_confirm.png
--- a/image/collectiing_mmr/bd_pay_with_ccard1.png
+++ b/image/collectiing_mmr/bd_pay_with_ccard1.png
--- a/image/collectiing_mmr/bd_pay_with_codeAEON.png
+++ b/image/collectiing_mmr/bd_pay_with_codeAEON.png
--- a/image/collectiing_mmr/bd_pay_with_codeAIS.png
+++ b/image/collectiing_mmr/bd_pay_with_codeAIS.png
--- a/image/collectiing_mmr/bd_pay_with_codeDtac.png
+++ b/image/collectiing_mmr/bd_pay_with_codeDtac.png
--- a/image/collectiing_mmr/bd_pay_with_codeKBANK.png
+++ b/image/collectiing_mmr/bd_pay_with_codeKBANK.png
--- a/image/collectiing_mmr/bd_pay_with_codeLH.png
+++ b/image/collectiing_mmr/bd_pay_with_codeLH.png
--- a/image/collectiing_mmr/bd_pay_with_codeLotus.png
+++ b/image/collectiing_mmr/bd_pay_with_codeLotus.png
--- a/image/collectiing_mmr/bd_pay_with_codeMCard.png
+++ b/image/collectiing_mmr/bd_pay_with_codeMCard.png
--- a/image/collectiing_mmr/bd_pay_with_codeRabbit.png
+++ b/image/collectiing_mmr/bd_pay_with_codeRabbit.png
--- a/image/collectiing_mmr/bd_pay_with_codeThe1.png
+++ b/image/collectiing_mmr/bd_pay_with_codeThe1.png
--- a/image/collectiing_mmr/bd_pay_with_codeTrue.png
+++ b/image/collectiing_mmr/bd_pay_with_codeTrue.png
--- a/image/collectiing_mmr/bd_pay_with_dolfin.png
+++ b/image/collectiing_mmr/bd_pay_with_dolfin.png
--- a/image/collectiing_mmr/bd_pay_with_lazpay.png
+++ b/image/collectiing_mmr/bd_pay_with_lazpay.png
--- a/image/collectiing_mmr/bd_pay_with_linepay.png
+++ b/image/collectiing_mmr/bd_pay_with_linepay.png
--- a/image/collectiing_mmr/bd_pay_with_make.png
+++ b/image/collectiing_mmr/bd_pay_with_make.png
--- a/image/collectiing_mmr/bd_pay_with_maxme.png
+++ b/image/collectiing_mmr/bd_pay_with_maxme.png
--- a/image/collectiing_mmr/bd_pay_with_shoppy.png
+++ b/image/collectiing_mmr/bd_pay_with_shoppy.png
--- a/image/collectiing_mmr/bd_pay_with_true.png
+++ b/image/collectiing_mmr/bd_pay_with_true.png
--- a/image/collectiing_mmr/bd_pay_with_wechat.png
+++ b/image/collectiing_mmr/bd_pay_with_wechat.png
--- a/image/collectiing_mmr/bn_0.png
+++ b/image/collectiing_mmr/bn_0.png
--- a/image/collectiing_mmr/bn_1.png
+++ b/image/collectiing_mmr/bn_1.png
--- a/image/collectiing_mmr/bn_2.png
+++ b/image/collectiing_mmr/bn_2.png
--- a/image/collectiing_mmr/bn_3.png
+++ b/image/collectiing_mmr/bn_3.png
--- a/image/collectiing_mmr/bn_4.png
+++ b/image/collectiing_mmr/bn_4.png
--- a/image/collectiing_mmr/bn_5.png
+++ b/image/collectiing_mmr/bn_5.png
--- a/image/collectiing_mmr/bn_6.png
+++ b/image/collectiing_mmr/bn_6.png
--- a/image/collectiing_mmr/bn_7.png
+++ b/image/collectiing_mmr/bn_7.png
--- a/image/collectiing_mmr/bn_8.png
+++ b/image/collectiing_mmr/bn_8.png
--- a/image/collectiing_mmr/bn_9.png
+++ b/image/collectiing_mmr/bn_9.png
--- a/image/collectiing_mmr/bn_back-1.png
+++ b/image/collectiing_mmr/bn_back-1.png
--- a/image/collectiing_mmr/bn_back.png
+++ b/image/collectiing_mmr/bn_back.png
--- a/image/collectiing_mmr/bn_back2.png
+++ b/image/collectiing_mmr/bn_back2.png
--- a/image/collectiing_mmr/bn_back3.png
+++ b/image/collectiing_mmr/bn_back3.png
--- a/image/collectiing_mmr/bn_cancel2.png
+++ b/image/collectiing_mmr/bn_cancel2.png
--- a/image/collectiing_mmr/bn_cancel3.png
+++ b/image/collectiing_mmr/bn_cancel3.png
--- a/image/collectiing_mmr/bn_cancel4.png
+++ b/image/collectiing_mmr/bn_cancel4.png
--- a/image/collectiing_mmr/bn_catalog.png
+++ b/image/collectiing_mmr/bn_catalog.png
--- a/image/collectiing_mmr/bn_close.png
+++ b/image/collectiing_mmr/bn_close.png
--- a/image/collectiing_mmr/bn_confirm.png
+++ b/image/collectiing_mmr/bn_confirm.png
--- a/image/collectiing_mmr/bn_confirm2.png
+++ b/image/collectiing_mmr/bn_confirm2.png
--- a/image/collectiing_mmr/bn_continue.png
+++ b/image/collectiing_mmr/bn_continue.png
--- a/image/collectiing_mmr/bn_door_open.png
+++ b/image/collectiing_mmr/bn_door_open.png
--- a/image/collectiing_mmr/bn_door_open2-1.png
+++ b/image/collectiing_mmr/bn_door_open2-1.png
--- a/image/collectiing_mmr/bn_door_open2.png
+++ b/image/collectiing_mmr/bn_door_open2.png
--- a/image/collectiing_mmr/bn_getPin.png
+++ b/image/collectiing_mmr/bn_getPin.png
--- a/image/collectiing_mmr/bn_getSMSPage.png
+++ b/image/collectiing_mmr/bn_getSMSPage.png
--- a/image/collectiing_mmr/bn_ignore.png
+++ b/image/collectiing_mmr/bn_ignore.png
--- a/image/collectiing_mmr/bn_number.png
+++ b/image/collectiing_mmr/bn_number.png
--- a/image/collectiing_mmr/bn_other.png
+++ b/image/collectiing_mmr/bn_other.png
--- a/image/collectiing_mmr/bn_pay_with_ccard1.png
+++ b/image/collectiing_mmr/bn_pay_with_ccard1.png
--- a/image/collectiing_mmr/bn_pay_with_codeAEON.png
+++ b/image/collectiing_mmr/bn_pay_with_codeAEON.png
--- a/image/collectiing_mmr/bn_pay_with_codeAIS.png
+++ b/image/collectiing_mmr/bn_pay_with_codeAIS.png
--- a/image/collectiing_mmr/bn_pay_with_codeDtac.png
+++ b/image/collectiing_mmr/bn_pay_with_codeDtac.png
--- a/Show more
+++ b/Show more
				`@ -1 +0,0 @@`
				`cd /mnt/sdcard/coffeevending/taobin_project/app/game; cat game01.tgz.a* \| tar -xz`