From efcbef979e0a98b2e5e6957420fd5d49cb73d4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com>
Date: Wed, 3 Sep 2025 21:58:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=91=E5=BE=97=E5=BF=AB=E5=88=9B=E5=BB=BA?=
=?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controller/NewGroupController.lua.rej | 10 -
.../Game/View/Family/FamilyAuditNumber.lua | 2 +-
.../Game/View/Family/FamilyChatRoom.lua | 6 +-
.../Game/View/Family/FamilyEventView.lua | 2 +-
.../base_project/Game/View/WitnessView.lua | 3 +
.../extend/majiang/lichuan/EXClearingView.lua | 8 +-
.../Family/ChatRoom/Component/item_player.xml | 13 +-
.../Family/ChatRoom/Component/item_record.xml | 6 +-
.../ChatRoom/Component/ting_corner_icon.png | Bin 0 -> 1659 bytes
.../Family/ChatRoom/Component/效果图.png | Bin 0 -> 436647 bytes
.../assets/Family/ChatRoom/com_chatRoom.xml | 8 +-
.../Family/Main/Component/btn_joinGame.xml | 2 +-
.../Family/Main/Component/c_roomChild.xml | 14 +-
wb_new_ui/assets/Family/package.xml | 2 +
.../Label_Detail_Play.xml | 1 +
.../Main/Component/down/btn_join.xml | 2 +-
.../Main/Component/player_info/head.xml | 4 +-
.../component/main/component/Btn_phone.xml | 4 +-
.../Login/component/main/component/Btn_wx.xml | 4 +-
.../main/component/Checkbox_agree.xml | 4 +-
.../phone_login/component/btn_login.xml | 4 +-
.../Clearing/Component/Btn_Card_Hu.xml | 2 +-
.../Clearing/Component/Btn_Card_JiangMa.xml | 2 +-
.../Clearing/Component/Btn_RemindCard.xml | 8 +-
.../Main_new/Clearing/Component/jing(1).png | Bin 0 -> 1787 bytes
.../Main_new/Clearing/Component/jing.png | Bin 0 -> 6036 bytes
.../Clearing/Component/ting_corner_icon.png | Bin 0 -> 5604 bytes
.../Main_new/Clearing/clearing.xml | 6 +-
.../Main_new/FZTips/Component/btn_FZCard.xml | 2 +-
.../Main_new/Main/Btn_Card_jiangxi.xml | 2 +-
.../Main_new/Main/Btn_Card_new_4.xml | 2 +-
.../Main_new/Main/Component/Comp_jing.xml | 2 +-
.../allCardsToShow/Btn_Card_jiangxi_show.xml | 2 +-
.../Btn_Card_jiangxi_show_101.xml | 2 +-
.../Btn_Card_jiangxi_show_102.xml | 2 +-
.../Btn_Card_jiangxi_show_103.xml | 2 +-
.../Btn_Card_jiangxi_show_104.xml | 2 +-
.../Btn_Card_jiangxi_show_105.xml | 2 +-
.../Btn_Card_jiangxi_show_106.xml | 2 +-
.../Btn_Card_jiangxi_show_107.xml | 2 +-
.../Btn_Card_jiangxi_show_108.xml | 2 +-
.../Btn_Card_jiangxi_show_109.xml | 2 +-
.../Btn_Card_jiangxi_show_201.xml | 2 +-
.../Btn_Card_jiangxi_show_202.xml | 2 +-
.../Btn_Card_jiangxi_show_203.xml | 2 +-
.../Btn_Card_jiangxi_show_204.xml | 2 +-
.../Btn_Card_jiangxi_show_205.xml | 2 +-
.../Btn_Card_jiangxi_show_206.xml | 2 +-
.../Btn_Card_jiangxi_show_207.xml | 2 +-
.../Btn_Card_jiangxi_show_208.xml | 2 +-
.../Btn_Card_jiangxi_show_209.xml | 2 +-
.../Btn_Card_jiangxi_show_301.xml | 2 +-
.../Btn_Card_jiangxi_show_302.xml | 2 +-
.../Btn_Card_jiangxi_show_303.xml | 2 +-
.../Btn_Card_jiangxi_show_304.xml | 2 +-
.../Btn_Card_jiangxi_show_305.xml | 2 +-
.../Btn_Card_jiangxi_show_306.xml | 2 +-
.../Btn_Card_jiangxi_show_307.xml | 2 +-
.../Btn_Card_jiangxi_show_308.xml | 2 +-
.../Btn_Card_jiangxi_show_309.xml | 2 +-
.../Btn_Card_jiangxi_show_401.xml | 2 +-
.../Btn_Card_jiangxi_show_402.xml | 2 +-
.../Btn_Card_jiangxi_show_403.xml | 2 +-
.../Btn_Card_jiangxi_show_404.xml | 2 +-
.../Btn_Card_jiangxi_show_501.xml | 2 +-
.../Btn_Card_jiangxi_show_502.xml | 2 +-
.../Btn_Card_jiangxi_show_503.xml | 2 +-
.../Main_new/Main/Image/Group 38.png | Bin 45962 -> 0 bytes
.../Main_new/Main/Image/jing 1.png | Bin 40355 -> 0 bytes
.../Main_Majiang/Main_new/Main/Image/jing.png | Bin 0 -> 6036 bytes
.../Main_new/Main/OutCard_left_jiangxi.xml | 2 +-
.../Main_new/Main/OutCard_right_jiangxi.xml | 2 +-
.../Main_new/Main/OutCard_self_jiangxi.xml | 2 +-
.../Main_new/Main/OutCard_self_new_4.xml | 2 +-
.../Main_new_2/Component/Btn_HandCard.xml | 2 +-
.../Main_new_2/Component/Comp_2_OutCard.xml | 2 +-
.../NewHandCard/Component/Btn_Card.xml | 2 +-
.../Component/com_OutCard_Vertical.xml | 2 +-
.../Main_new/Main_new_2_jiangxi.xml | 12 +-
.../Main_new_3/Component/Comp_3_OutCard2.xml | 2 +-
.../Main_new_3/Component/Comp_3_OutCard3.xml | 2 +-
.../Main_new_4/Component/Btn_HandCard.xml | 4 +-
.../Main_new_4/Component/Comp_4_1_FZ_Card.xml | 2 +-
.../Main_new_4/Component/Comp_4_2_FZ_Card.xml | 2 +-
.../Main_new_4/Component/Comp_4_3_FZ_Card.xml | 2 +-
.../Main_new_4/Component/Comp_4_OutCard2.xml | 2 +-
.../Main_new_4/Component/Comp_4_OutCard3.xml | 2 +-
.../Main_new_4/Component/Comp_4_OutCard4.xml | 2 +-
.../Main_new_4/Component/Comp_HandCard3.xml | 2 +-
.../Main_style_2/card/Btn_Card.xml | 2 +-
.../Main_Majiang/component/card/Btn_Card.xml | 2 +-
.../component/card/OutCard_self.xml | 2 +-
.../component/card/OutCard_top.xml | 2 +-
.../component/card/OutCard_top_jaingxi.xml | 2 +-
.../Main_Majiang/images/cards/1/102_101.png | Bin 4208 -> 0 bytes
.../Main_Majiang/images/cards/1/102_102.png | Bin 4502 -> 0 bytes
.../Main_Majiang/images/cards/1/102_103.png | Bin 4548 -> 0 bytes
.../Main_Majiang/images/cards/1/102_104.png | Bin 4671 -> 0 bytes
.../Main_Majiang/images/cards/1/102_105.png | Bin 4718 -> 0 bytes
.../Main_Majiang/images/cards/1/102_106.png | Bin 4707 -> 0 bytes
.../Main_Majiang/images/cards/1/102_107.png | Bin 4464 -> 0 bytes
.../Main_Majiang/images/cards/1/102_108.png | Bin 4376 -> 0 bytes
.../Main_Majiang/images/cards/1/102_109.png | Bin 4527 -> 0 bytes
.../Main_Majiang/images/cards/1/102_201.png | Bin 4581 -> 0 bytes
.../Main_Majiang/images/cards/1/102_202.png | Bin 4244 -> 0 bytes
.../Main_Majiang/images/cards/1/102_203.png | Bin 4137 -> 0 bytes
.../Main_Majiang/images/cards/1/102_204.png | Bin 5009 -> 0 bytes
.../Main_Majiang/images/cards/1/102_205.png | Bin 5427 -> 0 bytes
.../Main_Majiang/images/cards/1/102_206.png | Bin 5552 -> 0 bytes
.../Main_Majiang/images/cards/1/102_207.png | Bin 5300 -> 0 bytes
.../Main_Majiang/images/cards/1/102_208.png | Bin 5757 -> 0 bytes
.../Main_Majiang/images/cards/1/102_209.png | Bin 6326 -> 0 bytes
.../Main_Majiang/images/cards/1/102_301.png | Bin 4573 -> 0 bytes
.../Main_Majiang/images/cards/1/102_302.png | Bin 3101 -> 0 bytes
.../Main_Majiang/images/cards/1/102_303.png | Bin 17741 -> 0 bytes
.../Main_Majiang/images/cards/1/102_304.png | Bin 4540 -> 0 bytes
.../Main_Majiang/images/cards/1/102_305.png | Bin 5245 -> 0 bytes
.../Main_Majiang/images/cards/1/102_306.png | Bin 5844 -> 0 bytes
.../Main_Majiang/images/cards/1/102_307.png | Bin 4665 -> 0 bytes
.../Main_Majiang/images/cards/1/102_308.png | Bin 5443 -> 0 bytes
.../Main_Majiang/images/cards/1/102_309.png | Bin 5385 -> 0 bytes
.../Main_Majiang/images/cards/1/102_400.png | Bin 3841 -> 0 bytes
.../Main_Majiang/images/cards/1/102_401.png | Bin 3841 -> 0 bytes
.../Main_Majiang/images/cards/1/102_402.png | Bin 3720 -> 0 bytes
.../Main_Majiang/images/cards/1/102_403.png | Bin 3741 -> 0 bytes
.../Main_Majiang/images/cards/1/102_404.png | Bin 3524 -> 0 bytes
.../Main_Majiang/images/cards/1/102_406.png | Bin 3741 -> 0 bytes
.../Main_Majiang/images/cards/1/102_409.png | Bin 3524 -> 0 bytes
.../Main_Majiang/images/cards/1/102_412.png | Bin 3198 -> 0 bytes
.../Main_Majiang/images/cards/1/102_415.png | Bin 4301 -> 0 bytes
.../Main_Majiang/images/cards/1/102_418.png | Bin 2866 -> 0 bytes
.../Main_Majiang/images/cards/1/102_421.png | Bin 4116 -> 0 bytes
.../Main_Majiang/images/cards/1/102_424.png | Bin 3741 -> 0 bytes
.../Main_Majiang/images/cards/1/102_427.png | Bin 4086 -> 0 bytes
.../Main_Majiang/images/cards/1/102_430.png | Bin 3801 -> 0 bytes
.../Main_Majiang/images/cards/1/102_433.png | Bin 4193 -> 0 bytes
.../Main_Majiang/images/cards/1/102_436.png | Bin 4169 -> 0 bytes
.../Main_Majiang/images/cards/1/102_439.png | Bin 3921 -> 0 bytes
.../Main_Majiang/images/cards/1/102_442.png | Bin 4563 -> 0 bytes
.../Main_Majiang/images/cards/1/102_501.png | Bin 3198 -> 0 bytes
.../Main_Majiang/images/cards/1/102_502.png | Bin 4301 -> 0 bytes
.../Main_Majiang/images/cards/1/102_503.png | Bin 2866 -> 0 bytes
.../Main_Majiang/images/cards/102_00.png | Bin 3144 -> 0 bytes
.../Main_Majiang/images/cards/2/201_101.png | Bin 14651 -> 0 bytes
.../Main_Majiang/images/cards/2/201_102.png | Bin 15209 -> 0 bytes
.../Main_Majiang/images/cards/2/201_103.png | Bin 15546 -> 0 bytes
.../Main_Majiang/images/cards/2/201_104.png | Bin 15847 -> 0 bytes
.../Main_Majiang/images/cards/2/201_105.png | Bin 16005 -> 0 bytes
.../Main_Majiang/images/cards/2/201_106.png | Bin 16056 -> 0 bytes
.../Main_Majiang/images/cards/2/201_107.png | Bin 15466 -> 0 bytes
.../Main_Majiang/images/cards/2/201_108.png | Bin 15389 -> 0 bytes
.../Main_Majiang/images/cards/2/201_109.png | Bin 15539 -> 0 bytes
.../Main_Majiang/images/cards/2/201_201.png | Bin 17120 -> 0 bytes
.../Main_Majiang/images/cards/2/201_202.png | Bin 15355 -> 0 bytes
.../Main_Majiang/images/cards/2/201_203.png | Bin 15318 -> 0 bytes
.../Main_Majiang/images/cards/2/201_204.png | Bin 17586 -> 0 bytes
.../Main_Majiang/images/cards/2/201_205.png | Bin 19327 -> 0 bytes
.../Main_Majiang/images/cards/2/201_206.png | Bin 20132 -> 0 bytes
.../Main_Majiang/images/cards/2/201_207.png | Bin 20502 -> 0 bytes
.../Main_Majiang/images/cards/2/201_208.png | Bin 18236 -> 0 bytes
.../Main_Majiang/images/cards/2/201_209.png | Bin 23078 -> 0 bytes
.../Main_Majiang/images/cards/2/201_301.png | Bin 16100 -> 0 bytes
.../Main_Majiang/images/cards/2/201_302.png | Bin 11571 -> 0 bytes
.../Main_Majiang/images/cards/2/201_303.png | Bin 27639 -> 0 bytes
.../Main_Majiang/images/cards/2/201_304.png | Bin 14931 -> 0 bytes
.../Main_Majiang/images/cards/2/201_305.png | Bin 16741 -> 0 bytes
.../Main_Majiang/images/cards/2/201_306.png | Bin 18435 -> 0 bytes
.../Main_Majiang/images/cards/2/201_307.png | Bin 16104 -> 0 bytes
.../Main_Majiang/images/cards/2/201_308.png | Bin 17899 -> 0 bytes
.../Main_Majiang/images/cards/2/201_309.png | Bin 18413 -> 0 bytes
.../Main_Majiang/images/cards/2/201_401.png | Bin 13380 -> 0 bytes
.../Main_Majiang/images/cards/2/201_402.png | Bin 12858 -> 0 bytes
.../Main_Majiang/images/cards/2/201_403.png | Bin 13084 -> 0 bytes
.../Main_Majiang/images/cards/2/201_404.png | Bin 12093 -> 0 bytes
.../Main_Majiang/images/cards/2/201_405.png | Bin 11591 -> 0 bytes
.../Main_Majiang/images/cards/2/201_406.png | Bin 15467 -> 0 bytes
.../Main_Majiang/images/cards/2/201_407.png | Bin 9405 -> 0 bytes
.../Main_Majiang/images/cards/2/201_421.png | Bin 14295 -> 0 bytes
.../Main_Majiang/images/cards/2/201_424.png | Bin 13353 -> 0 bytes
.../Main_Majiang/images/cards/2/201_427.png | Bin 14571 -> 0 bytes
.../Main_Majiang/images/cards/2/201_430.png | Bin 13580 -> 0 bytes
.../Main_Majiang/images/cards/2/201_433.png | Bin 14507 -> 0 bytes
.../Main_Majiang/images/cards/2/201_436.png | Bin 14685 -> 0 bytes
.../Main_Majiang/images/cards/2/201_439.png | Bin 14165 -> 0 bytes
.../Main_Majiang/images/cards/2/201_442.png | Bin 15479 -> 0 bytes
.../Main_Majiang/images/cards/2/201_501.png | Bin 11591 -> 0 bytes
.../Main_Majiang/images/cards/2/201_502.png | Bin 15467 -> 0 bytes
.../Main_Majiang/images/cards/2/201_503.png | Bin 9405 -> 0 bytes
.../Main_Majiang/images/cards/2/202_101.png | Bin 9717 -> 0 bytes
.../Main_Majiang/images/cards/2/202_102.png | Bin 10486 -> 0 bytes
.../Main_Majiang/images/cards/2/202_103.png | Bin 10816 -> 0 bytes
.../Main_Majiang/images/cards/2/202_104.png | Bin 11176 -> 0 bytes
.../Main_Majiang/images/cards/2/202_105.png | Bin 11403 -> 0 bytes
.../Main_Majiang/images/cards/2/202_106.png | Bin 11433 -> 0 bytes
.../Main_Majiang/images/cards/2/202_107.png | Bin 10743 -> 0 bytes
.../Main_Majiang/images/cards/2/202_108.png | Bin 10569 -> 0 bytes
.../Main_Majiang/images/cards/2/202_109.png | Bin 10803 -> 0 bytes
.../Main_Majiang/images/cards/2/202_201.png | Bin 12252 -> 0 bytes
.../Main_Majiang/images/cards/2/202_202.png | Bin 10439 -> 0 bytes
.../Main_Majiang/images/cards/2/202_203.png | Bin 10292 -> 0 bytes
.../Main_Majiang/images/cards/2/202_204.png | Bin 13002 -> 0 bytes
.../Main_Majiang/images/cards/2/202_205.png | Bin 14867 -> 0 bytes
.../Main_Majiang/images/cards/2/202_206.png | Bin 15852 -> 0 bytes
.../Main_Majiang/images/cards/2/202_207.png | Bin 16415 -> 0 bytes
.../Main_Majiang/images/cards/2/202_208.png | Bin 11746 -> 0 bytes
.../Main_Majiang/images/cards/2/202_209.png | Bin 19267 -> 0 bytes
.../Main_Majiang/images/cards/2/202_301.png | Bin 11390 -> 0 bytes
.../Main_Majiang/images/cards/2/202_302.png | Bin 6280 -> 0 bytes
.../Main_Majiang/images/cards/2/202_303.png | Bin 22887 -> 0 bytes
.../Main_Majiang/images/cards/2/202_304.png | Bin 10760 -> 0 bytes
.../Main_Majiang/images/cards/2/202_305.png | Bin 12947 -> 0 bytes
.../Main_Majiang/images/cards/2/202_306.png | Bin 15062 -> 0 bytes
.../Main_Majiang/images/cards/2/202_307.png | Bin 11732 -> 0 bytes
.../Main_Majiang/images/cards/2/202_308.png | Bin 13961 -> 0 bytes
.../Main_Majiang/images/cards/2/202_309.png | Bin 14453 -> 0 bytes
.../Main_Majiang/images/cards/2/202_401.png | Bin 8277 -> 0 bytes
.../Main_Majiang/images/cards/2/202_402.png | Bin 7676 -> 0 bytes
.../Main_Majiang/images/cards/2/202_403.png | Bin 7865 -> 0 bytes
.../Main_Majiang/images/cards/2/202_404.png | Bin 6905 -> 0 bytes
.../Main_Majiang/images/cards/2/202_405.png | Bin 6380 -> 0 bytes
.../Main_Majiang/images/cards/2/202_406.png | Bin 10422 -> 0 bytes
.../Main_Majiang/images/cards/2/202_407.png | Bin 4587 -> 0 bytes
.../Main_Majiang/images/cards/2/202_421.png | Bin 9181 -> 0 bytes
.../Main_Majiang/images/cards/2/202_424.png | Bin 7975 -> 0 bytes
.../Main_Majiang/images/cards/2/202_427.png | Bin 9297 -> 0 bytes
.../Main_Majiang/images/cards/2/202_430.png | Bin 8242 -> 0 bytes
.../Main_Majiang/images/cards/2/202_433.png | Bin 9352 -> 0 bytes
.../Main_Majiang/images/cards/2/202_436.png | Bin 9302 -> 0 bytes
.../Main_Majiang/images/cards/2/202_439.png | Bin 8873 -> 0 bytes
.../Main_Majiang/images/cards/2/202_442.png | Bin 10454 -> 0 bytes
.../Main_Majiang/images/cards/2/202_501.png | Bin 6380 -> 0 bytes
.../Main_Majiang/images/cards/2/202_502.png | Bin 10422 -> 0 bytes
.../Main_Majiang/images/cards/2/202_503.png | Bin 4587 -> 0 bytes
.../Main_Majiang/images/cards/2/203_421.png | Bin 11324 -> 0 bytes
.../Main_Majiang/images/cards/2/203_424.png | Bin 11183 -> 0 bytes
.../Main_Majiang/images/cards/2/203_427.png | Bin 11551 -> 0 bytes
.../Main_Majiang/images/cards/2/203_430.png | Bin 11087 -> 0 bytes
.../Main_Majiang/images/cards/2/203_433.png | Bin 11928 -> 0 bytes
.../Main_Majiang/images/cards/2/203_436.png | Bin 10633 -> 0 bytes
.../Main_Majiang/images/cards/2/203_439.png | Bin 11688 -> 0 bytes
.../Main_Majiang/images/cards/2/203_442.png | Bin 10298 -> 0 bytes
.../Main_Majiang/images/cards/202_00.png | Bin 7918 -> 0 bytes
.../Main_Majiang/images/cards/3/302_101.png | Bin 4212 -> 0 bytes
.../Main_Majiang/images/cards/3/302_102.png | Bin 4526 -> 0 bytes
.../Main_Majiang/images/cards/3/302_103.png | Bin 4572 -> 0 bytes
.../Main_Majiang/images/cards/3/302_104.png | Bin 4674 -> 0 bytes
.../Main_Majiang/images/cards/3/302_105.png | Bin 4753 -> 0 bytes
.../Main_Majiang/images/cards/3/302_106.png | Bin 4718 -> 0 bytes
.../Main_Majiang/images/cards/3/302_107.png | Bin 4486 -> 0 bytes
.../Main_Majiang/images/cards/3/302_108.png | Bin 4390 -> 0 bytes
.../Main_Majiang/images/cards/3/302_109.png | Bin 4535 -> 0 bytes
.../Main_Majiang/images/cards/3/302_201.png | Bin 4605 -> 0 bytes
.../Main_Majiang/images/cards/3/302_202.png | Bin 4250 -> 0 bytes
.../Main_Majiang/images/cards/3/302_203.png | Bin 4153 -> 0 bytes
.../Main_Majiang/images/cards/3/302_204.png | Bin 5039 -> 0 bytes
.../Main_Majiang/images/cards/3/302_205.png | Bin 5460 -> 0 bytes
.../Main_Majiang/images/cards/3/302_206.png | Bin 5552 -> 0 bytes
.../Main_Majiang/images/cards/3/302_207.png | Bin 5361 -> 0 bytes
.../Main_Majiang/images/cards/3/302_208.png | Bin 5798 -> 0 bytes
.../Main_Majiang/images/cards/3/302_209.png | Bin 6433 -> 0 bytes
.../Main_Majiang/images/cards/3/302_301.png | Bin 4617 -> 0 bytes
.../Main_Majiang/images/cards/3/302_302.png | Bin 3123 -> 0 bytes
.../Main_Majiang/images/cards/3/302_303.png | Bin 18403 -> 0 bytes
.../Main_Majiang/images/cards/3/302_304.png | Bin 4566 -> 0 bytes
.../Main_Majiang/images/cards/3/302_305.png | Bin 5268 -> 0 bytes
.../Main_Majiang/images/cards/3/302_306.png | Bin 5911 -> 0 bytes
.../Main_Majiang/images/cards/3/302_307.png | Bin 4690 -> 0 bytes
.../Main_Majiang/images/cards/3/302_308.png | Bin 5481 -> 0 bytes
.../Main_Majiang/images/cards/3/302_309.png | Bin 5433 -> 0 bytes
.../Main_Majiang/images/cards/3/302_400.png | Bin 3853 -> 0 bytes
.../Main_Majiang/images/cards/3/302_403.png | Bin 3787 -> 0 bytes
.../Main_Majiang/images/cards/3/302_406.png | Bin 3803 -> 0 bytes
.../Main_Majiang/images/cards/3/302_409.png | Bin 3562 -> 0 bytes
.../Main_Majiang/images/cards/3/302_412.png | Bin 3231 -> 0 bytes
.../Main_Majiang/images/cards/3/302_415.png | Bin 4326 -> 0 bytes
.../Main_Majiang/images/cards/3/302_418.png | Bin 2874 -> 0 bytes
.../Main_Majiang/images/cards/3/302_421.png | Bin 4139 -> 0 bytes
.../Main_Majiang/images/cards/3/302_424.png | Bin 3729 -> 0 bytes
.../Main_Majiang/images/cards/3/302_427.png | Bin 4094 -> 0 bytes
.../Main_Majiang/images/cards/3/302_430.png | Bin 3815 -> 0 bytes
.../Main_Majiang/images/cards/3/302_433.png | Bin 4147 -> 0 bytes
.../Main_Majiang/images/cards/3/302_436.png | Bin 4184 -> 0 bytes
.../Main_Majiang/images/cards/3/302_439.png | Bin 3916 -> 0 bytes
.../Main_Majiang/images/cards/3/302_442.png | Bin 4561 -> 0 bytes
.../Main_Majiang/images/cards/302_00.png | Bin 3144 -> 0 bytes
.../Main_Majiang/images/cards/back_left.png | Bin 2726 -> 0 bytes
.../Main_Majiang/images/cards/back_right.png | Bin 2726 -> 0 bytes
.../Main_Majiang/images/cards/back_top.png | Bin 1174 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_101.png | Bin 17687 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_102.png | Bin 18289 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_103.png | Bin 18584 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_104.png | Bin 18913 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_105.png | Bin 18899 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_106.png | Bin 18985 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_107.png | Bin 18577 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_108.png | Bin 18197 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_109.png | Bin 18560 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_201.png | Bin 19945 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_202.png | Bin 18171 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_203.png | Bin 18626 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_204.png | Bin 19910 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_205.png | Bin 21572 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_206.png | Bin 21766 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_207.png | Bin 22746 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_208.png | Bin 23612 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_209.png | Bin 25568 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_301.png | Bin 19575 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_302.png | Bin 14576 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_303.png | Bin 15916 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_304.png | Bin 17290 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_305.png | Bin 18315 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_306.png | Bin 19446 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_307.png | Bin 18100 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_308.png | Bin 19869 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_309.png | Bin 19732 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_401.png | Bin 17159 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_402.png | Bin 16409 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_403.png | Bin 16573 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_404.png | Bin 15553 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_405.png | Bin 15393 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_406.png | Bin 19125 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_407.png | Bin 13169 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_421.png | Bin 19715 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_424.png | Bin 19082 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_427.png | Bin 19186 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_430.png | Bin 19558 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_433.png | Bin 19923 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_436.png | Bin 18260 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_439.png | Bin 19627 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_442.png | Bin 20110 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_501.png | Bin 15393 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_502.png | Bin 19125 -> 0 bytes
.../Main_Majiang/images/cards2/1/a201_503.png | Bin 13169 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_101.png | Bin 11672 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_102.png | Bin 12544 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_103.png | Bin 12911 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_104.png | Bin 13198 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_105.png | Bin 13205 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_106.png | Bin 13297 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_107.png | Bin 12780 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_108.png | Bin 12246 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_109.png | Bin 12820 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_201.png | Bin 14732 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_202.png | Bin 12634 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_203.png | Bin 12887 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_204.png | Bin 14364 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_205.png | Bin 16555 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_206.png | Bin 16701 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_207.png | Bin 17770 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_208.png | Bin 18968 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_209.png | Bin 21839 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_301.png | Bin 14123 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_302.png | Bin 8073 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_303.png | Bin 9756 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_304.png | Bin 11691 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_305.png | Bin 13464 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_306.png | Bin 15089 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_307.png | Bin 12533 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_308.png | Bin 14704 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_309.png | Bin 14906 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_401.png | Bin 11427 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_402.png | Bin 10492 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_403.png | Bin 10544 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_404.png | Bin 9272 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_405.png | Bin 9270 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_406.png | Bin 13357 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_407.png | Bin 6920 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_421.png | Bin 14283 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_424.png | Bin 13645 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_427.png | Bin 13711 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_430.png | Bin 14042 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_433.png | Bin 14555 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_436.png | Bin 12563 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_439.png | Bin 14259 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_442.png | Bin 15016 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_501.png | Bin 9270 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_502.png | Bin 13357 -> 0 bytes
.../Main_Majiang/images/cards2/2/a202_503.png | Bin 6920 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_101.png | Bin 4941 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_102.png | Bin 5104 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_103.png | Bin 5142 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_104.png | Bin 5204 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_105.png | Bin 5193 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_106.png | Bin 5185 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_107.png | Bin 5139 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_108.png | Bin 5035 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_109.png | Bin 5146 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_201.png | Bin 5299 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_202.png | Bin 5072 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_203.png | Bin 5006 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_204.png | Bin 5304 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_205.png | Bin 5519 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_206.png | Bin 5488 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_207.png | Bin 5646 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_208.png | Bin 5710 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_209.png | Bin 6170 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_301.png | Bin 5270 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_302.png | Bin 4373 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_303.png | Bin 4665 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_304.png | Bin 4891 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_305.png | Bin 5165 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_306.png | Bin 5458 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_307.png | Bin 5112 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_308.png | Bin 5395 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_309.png | Bin 5521 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_400.png | Bin 5026 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_401.png | Bin 5026 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_402.png | Bin 4792 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_403.png | Bin 4888 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_404.png | Bin 4619 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_406.png | Bin 4888 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_409.png | Bin 4619 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_412.png | Bin 4539 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_415.png | Bin 5225 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_418.png | Bin 4291 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_421.png | Bin 5335 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_424.png | Bin 5219 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_427.png | Bin 5283 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_430.png | Bin 5301 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_433.png | Bin 5393 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_436.png | Bin 5127 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_439.png | Bin 5324 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_442.png | Bin 5444 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_501.png | Bin 4539 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_502.png | Bin 5225 -> 0 bytes
.../Main_Majiang/images/cards2/3/a102_503.png | Bin 4291 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_101.png | Bin 4930 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_102.png | Bin 5083 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_103.png | Bin 5136 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_104.png | Bin 5192 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_105.png | Bin 5182 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_106.png | Bin 5176 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_107.png | Bin 5131 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_108.png | Bin 5018 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_109.png | Bin 5141 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_201.png | Bin 5308 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_202.png | Bin 5091 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_203.png | Bin 5024 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_204.png | Bin 5296 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_205.png | Bin 5542 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_206.png | Bin 5493 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_207.png | Bin 5624 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_208.png | Bin 5697 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_209.png | Bin 6138 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_301.png | Bin 5236 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_302.png | Bin 4360 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_303.png | Bin 4647 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_304.png | Bin 4920 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_305.png | Bin 5178 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_306.png | Bin 5446 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_307.png | Bin 5092 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_308.png | Bin 5361 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_309.png | Bin 5506 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_400.png | Bin 4990 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_401.png | Bin 4990 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_402.png | Bin 4777 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_403.png | Bin 4881 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_404.png | Bin 4599 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_406.png | Bin 4881 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_409.png | Bin 4599 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_412.png | Bin 4542 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_415.png | Bin 5214 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_418.png | Bin 4298 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_421.png | Bin 5345 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_424.png | Bin 5258 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_427.png | Bin 5270 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_430.png | Bin 5319 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_433.png | Bin 5379 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_436.png | Bin 5143 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_439.png | Bin 5350 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_442.png | Bin 5466 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_501.png | Bin 4542 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_502.png | Bin 5214 -> 0 bytes
.../Main_Majiang/images/cards2/4/a302_503.png | Bin 4298 -> 0 bytes
.../Main_Majiang/images/cards2/a102_00.png | Bin 3431 -> 0 bytes
.../Main_Majiang/images/cards2/a202_00.png | Bin 28149 -> 0 bytes
.../Main_Majiang/images/cards2/a302_00.png | Bin 3431 -> 0 bytes
.../Main_Majiang/images/cards2/aback_left.png | Bin 18096 -> 0 bytes
.../images/cards2/aback_right.png | Bin 18096 -> 0 bytes
.../Main_Majiang/images/cards2/aback_top.png | Bin 17680 -> 0 bytes
wb_new_ui/assets/Main_Majiang/package.xml | 392 +-----------------
.../ART/base/Family/ui/Family_fui.bytes | Bin 126005 -> 126431 bytes
.../Assets/ART/base/lobby/ui/Lobby_fui.bytes | Bin 123539 -> 123548 bytes
.../Assets/ART/base/login/ui/Login_fui.bytes | Bin 8818 -> 8854 bytes
.../main_majiang/ui/Main_Majiang_atlas0.png | Bin 3177586 -> 4161867 bytes
.../main_majiang/ui/Main_Majiang_atlas0_1.png | Bin 5165798 -> 4096173 bytes
.../main_majiang/ui/Main_Majiang_atlas0_2.png | Bin 3658239 -> 1355322 bytes
.../main_majiang/ui/Main_Majiang_atlas0_3.png | Bin 1450416 -> 1251478 bytes
.../main_majiang/ui/Main_Majiang_atlas0_4.png | Bin 1251478 -> 0 bytes
.../ui/Main_Majiang_atlas0_4.png.meta | 92 ----
.../main_majiang/ui/Main_Majiang_fui.bytes | Bin 386658 -> 356192 bytes
.../ui/Info_Poker_RunFastNew_fui.bytes | Bin 31342 -> 31448 bytes
.../Assets/Scripts/Core/LuaNetClient.cs | 4 +-
.../Assets/Scripts/Platform/GPSAddress.cs | 35 +-
494 files changed, 164 insertions(+), 614 deletions(-)
delete mode 100644 lua_probject/base_project/Game/Controller/NewGroupController.lua.rej
create mode 100644 wb_new_ui/assets/Family/ChatRoom/Component/ting_corner_icon.png
create mode 100644 wb_new_ui/assets/Family/ChatRoom/Component/效果图.png
create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/jing(1).png
create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/jing.png
create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/ting_corner_icon.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/Group 38.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/jing 1.png
create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/jing.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_101.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_102.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_103.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_104.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_105.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_106.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_107.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_108.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_109.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_201.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_202.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_203.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_204.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_205.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_206.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_207.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_208.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_209.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_301.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_302.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_303.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_304.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_305.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_306.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_307.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_308.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_309.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_400.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_401.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_402.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_403.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_404.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_406.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_409.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_412.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_415.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_418.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_421.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_424.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_427.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_430.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_433.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_436.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_439.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_442.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_501.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_502.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/1/102_503.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/102_00.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_101.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_102.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_103.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_104.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_105.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_106.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_107.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_108.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_109.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_201.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_202.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_203.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_204.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_205.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_206.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_207.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_208.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_209.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_301.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_302.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_303.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_304.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_305.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_306.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_307.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_308.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_309.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_401.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_402.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_403.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_404.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_405.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_406.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_407.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_421.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_424.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_427.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_430.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_433.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_436.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_439.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_442.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_501.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_502.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/201_503.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_101.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_102.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_103.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_104.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_105.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_106.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_107.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_108.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_109.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_201.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_202.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_203.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_204.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_205.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_206.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_207.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_208.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_209.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_301.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_302.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_303.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_304.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_305.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_306.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_307.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_308.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_309.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_401.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_402.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_403.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_404.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_405.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_406.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_407.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_421.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_424.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_427.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_430.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_433.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_436.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_439.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_442.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_501.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_502.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/202_503.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/203_421.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/203_424.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/203_427.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/203_430.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/203_433.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/203_436.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/203_439.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/2/203_442.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/202_00.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_101.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_102.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_103.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_104.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_105.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_106.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_107.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_108.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_109.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_201.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_202.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_203.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_204.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_205.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_206.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_207.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_208.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_209.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_301.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_302.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_303.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_304.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_305.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_306.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_307.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_308.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_309.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_400.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_403.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_406.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_409.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_412.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_415.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_418.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_421.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_424.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_427.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_430.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_433.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_436.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_439.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/3/302_442.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/302_00.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/back_left.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/back_right.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards/back_top.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_101.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_102.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_103.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_104.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_105.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_106.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_107.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_108.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_109.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_201.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_202.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_203.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_204.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_205.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_206.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_207.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_208.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_209.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_301.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_302.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_303.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_304.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_305.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_306.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_307.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_308.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_309.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_401.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_402.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_403.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_404.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_405.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_406.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_407.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_421.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_424.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_427.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_430.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_433.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_436.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_439.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_442.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_501.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_502.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/1/a201_503.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_101.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_102.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_103.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_104.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_105.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_106.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_107.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_108.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_109.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_201.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_202.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_203.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_204.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_205.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_206.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_207.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_208.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_209.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_301.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_302.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_303.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_304.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_305.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_306.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_307.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_308.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_309.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_401.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_402.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_403.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_404.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_405.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_406.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_407.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_421.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_424.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_427.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_430.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_433.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_436.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_439.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_442.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_501.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_502.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/2/a202_503.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_101.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_102.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_103.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_104.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_105.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_106.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_107.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_108.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_109.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_201.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_202.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_203.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_204.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_205.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_206.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_207.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_208.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_209.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_301.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_302.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_303.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_304.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_305.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_306.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_307.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_308.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_309.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_400.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_401.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_402.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_403.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_404.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_406.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_409.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_412.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_415.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_418.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_421.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_424.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_427.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_430.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_433.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_436.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_439.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_442.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_501.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_502.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/3/a102_503.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_101.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_102.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_103.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_104.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_105.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_106.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_107.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_108.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_109.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_201.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_202.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_203.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_204.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_205.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_206.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_207.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_208.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_209.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_301.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_302.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_303.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_304.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_305.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_306.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_307.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_308.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_309.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_400.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_401.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_402.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_403.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_404.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_406.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_409.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_412.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_415.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_418.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_421.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_424.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_427.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_430.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_433.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_436.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_439.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_442.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_501.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_502.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/4/a302_503.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/a102_00.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/a202_00.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/a302_00.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/aback_left.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/aback_right.png
delete mode 100644 wb_new_ui/assets/Main_Majiang/images/cards2/aback_top.png
delete mode 100644 wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png
delete mode 100644 wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png.meta
diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua.rej b/lua_probject/base_project/Game/Controller/NewGroupController.lua.rej
deleted file mode 100644
index 05b7c8c8..00000000
--- a/lua_probject/base_project/Game/Controller/NewGroupController.lua.rej
+++ /dev/null
@@ -1,10 +0,0 @@
-diff a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua (rejected hunks)
-@@ -147,6 +147,8 @@
- data.ban_chat2 = ban_chat2
- data.option = option
- data.show_num = showNum
-+ print("FG_UpdateGroupInfo")
-+ pt(data)
- _client:send(Protocol.WEB_FG_UPDATE_GROUP_INFO, data, function(res)
- callback(res)
- end)
diff --git a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua
index f01e04fd..9af59ee2 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua
@@ -88,7 +88,7 @@ function FamilyAuditNumber:ClickBtn(isAllow, uid, tag)
for _, joinInfo in pairs(group.joinsData) do
if joinInfo.id == uid then
- group.joinsData[_] = nil
+ table.remove(group.joinsData, _)
end
end
diff --git a/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua b/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua
index 93dfc4fb..fb6bc709 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua
@@ -24,6 +24,7 @@ local function list_players_Renderer(index, obj, players, self)
tex_name.text = player.nick
tex_id.text = player.accId
tex_score.text = player.score
+ obj:GetController('cCouler').selectedIndex = player.score >= 0 and 0 or 1
ImageLoad.Load(player.portrait, loader_icon)
if player.winer then
@@ -47,8 +48,8 @@ local function ChatItemRenderer(index, obj, self)
local tex_name = obj:GetChild("tex_name")
local tex_roomIdRound = obj:GetChild("tex_roomIdRound")
- tex_time.text = os.date("游戏结算：%m月%d号 %X", record.create_time) --data.create_time
- tex_name.text = play.game_name --record.game_info.name
+ tex_time.text = os.date("游戏结算：%m月%d号 %X", record.create_time) --data.create_time
+ tex_name.text = play.game_name --record.game_info.name
local roundTex = record.round .. "/" .. record.maxRound
tex_roomIdRound.text = record.room_id .. "\n" .. roundTex
@@ -126,7 +127,6 @@ end
-- 新战绩推到时刷新一条
function FamilyChatRoom:OnNewChatRefalsh(arg)
-
if self.group == nil then
return
end
diff --git a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua
index da6481f8..744a152b 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua
@@ -330,7 +330,7 @@ function M:_evtOnFamilyReflash(...)
for _, data in pairs(group.joinsData) do
if data.id == uid then
- group.joinsData[_] = nil
+ table.remove(group.joinsData, _)
end
end
diff --git a/lua_probject/base_project/Game/View/WitnessView.lua b/lua_probject/base_project/Game/View/WitnessView.lua
index a0f1dc4e..75826cad 100644
--- a/lua_probject/base_project/Game/View/WitnessView.lua
+++ b/lua_probject/base_project/Game/View/WitnessView.lua
@@ -59,6 +59,9 @@ function WitnessView:DoNoticeAnimation()
if self.noticeIndex > #DataManager.GameNotice then
self.noticeIndex = 1
end
+
+ --强制让牌类型为1，只有一种牌
+ self._room.card_type = 1
end
return WitnessView
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
index cf759caf..fed28f1a 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
@@ -338,13 +338,13 @@ function M:fillResult1(room, peopleNum, total_result)
resultInfoComp:GetController("win").selectedIndex = totalInfoList.total_score >= 0 and 1 or 0
if totalInfoList.seat == bigWin.seat then
resultInfoComp:GetController("bigWin").selectedIndex = 1
- else
- resultInfoComp:GetController("bigWin").selectedIndex = 0
+ -- else
+ -- resultInfoComp:GetController("bigWin").selectedIndex = 0
end
if totalInfoList.seat == bestPao.seat then
resultInfoComp:GetController("fangPao").selectedIndex = 1
- else
- resultInfoComp:GetController("fangPao").selectedIndex = 0
+ -- else
+ -- resultInfoComp:GetController("fangPao").selectedIndex = 0
end
end
end
diff --git a/wb_new_ui/assets/Family/ChatRoom/Component/item_player.xml b/wb_new_ui/assets/Family/ChatRoom/Component/item_player.xml
index ba6e8407..df791cff 100644
--- a/wb_new_ui/assets/Family/ChatRoom/Component/item_player.xml
+++ b/wb_new_ui/assets/Family/ChatRoom/Component/item_player.xml
@@ -3,13 +3,18 @@
-
+
+
+
+
-
-
-
+
+
+
+
+
diff --git a/wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml b/wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml
index a041951b..f0fb5603 100644
--- a/wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml
+++ b/wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml
@@ -2,9 +2,9 @@
-
-
-
+
+
+