From d471fd04bf437a7a1f97cac8df0597d0c5ffb71c Mon Sep 17 00:00:00 2001 From: lingmeng <2029049582@qq.com> Date: Mon, 15 Jun 2026 23:56:13 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=9Ctongbu=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MngView/GroupMemberFagLogView.lua | 6 +- lua_probject/base_project/Main.lua | 2 +- .../majiang/hongzhong/EXPlayBackView.lua | 2 + .../majiang/zhuanzhuan/EXPlayBackView.lua | 2 + .../extend/poker/runfast/RunFast_MainView.lua | 43 ++++++++--- .../poker/runfast/RunFast_PlayerBackView.lua | 15 ++++ .../RunFast_PlayerSelfPokerInfoView.lua | 18 ++--- .../extend/zipai/fanpaofa/EXPlayBackView.lua | 6 +- wb_new_ui/.objs/fonts.json | 3 +- wb_new_ui/.objs/metas/m7iejg46/mpllhv5.info | 8 +- wb_new_ui/.objs/workspace.json | 42 +++++------ wb_new_ui/assets/Chat/Main.xml | 2 +- .../assets/Chat/component/Btn_YYItem.xml | 2 +- .../assets/Chat/component/MsgBubble1.xml | 2 +- .../assets/Chat/component/MsgBubble2.xml | 2 +- .../assets/Common/GlobalModalWaiting.xml | 2 +- wb_new_ui/assets/Common/Win_Frame_full.xml | 2 +- .../assets/Common/buttons/Btn_Common.xml | 2 +- .../assets/Common/buttons/Btn_Common1.xml | 2 +- .../assets/Common/buttons/Btn_Common_game.xml | 2 +- .../Common/buttons/Btn_menu_h_small.xml | 2 +- .../assets/Common/component/RightPanel.xml | 4 +- .../Common/component/RoomInfoPanel1.xml | 4 +- .../component/create_room/Btn_cr_checkbox.xml | 2 +- .../create_room/Btn_cr_checkbox2.xml | 2 +- .../create_room/Btn_mul_checkbox3.xml | 2 +- .../component/create_room/ComboBox1_item.xml | 2 +- .../Common/component/create_room/di01.xml | 2 +- .../btn_keyboard/btn_keyboard.xml | 2 +- .../btn_keyboard/btn_keyboard_clean.xml | 2 +- .../btn_keyboard/btn_keyboard_dot.xml | 2 +- .../btn_keyboard/btn_keyboard_min.xml | 2 +- .../component/dismiss_room/dismiss_room.xml | 8 +- .../component/dismiss_room/item_dimiss.xml | 2 +- .../Common/component/game/Btn_cr_checkbox.xml | 2 +- .../component/game/Btn_cr_checkbox2.xml | 2 +- .../component/game/comp_playerInfoChild.xml | 4 +- .../assets/Common/component/game/di01.xml | 2 +- .../Common/component/head/Win_headinfo.xml | 2 +- .../assets/Common/component/playerDetail.xml | 6 +- .../result/component/big_result_item.xml | 4 +- .../Common/component/rule/Component4.xml | 2 +- .../assets/Common/component/rule/GameRule.xml | 4 +- .../Common/component/rule/GameRule1.xml | 4 +- .../font/ALIBABAPUHUITI-3-55-REGULAR.TTF | Bin 0 -> 8532824 bytes .../images/btn_keyboard/Win_FagInput2.xml | 2 +- .../images/btn_keyboard/Win_FagInput2.xml | 2 +- wb_new_ui/assets/Common/package.xml | 1 + .../Extend_MJ_ChangSha/bird/Btn_Card.xml | 2 +- .../clearing/clearing_1_item.xml | 2 +- .../clearing/clearing_2_item.xml | 6 +- .../component/bird/Btn_Card.xml | 2 +- .../Extend_MJ_ChangSha/component/gamerule.xml | 2 +- .../component/qishou_hu/pop_tip_qishou.xml | 2 +- .../component/qishou_hu/pop_tip_zhongtu.xml | 2 +- .../tip_continue_win/com_continual_win.xml | 2 +- .../component/bird/Btn_Card.xml | 2 +- .../component/clearing/clearing_1_item.xml | 2 +- .../component/clearing/clearing_2_item.xml | 6 +- .../component/gamerule.xml | 2 +- .../Extend_MJ_ZhuanZhuan/HeadNameBG.xml | 6 +- .../assets/Extend_MJ_ZhuanZhuan/Main_2.xml | 6 +- .../assets/Extend_MJ_ZhuanZhuan/Main_3.xml | 6 +- .../assets/Extend_MJ_ZhuanZhuan/Main_4.xml | 6 +- .../component/bird/Btn_Card.xml | 2 +- .../component/clearing/clearing_1_item.xml | 2 +- .../component/clearing/clearing_2_item.xml | 6 +- .../component/clearing/clearing_1_liu.xml | 2 +- .../component/clearing/clearing_2_item.xml | 6 +- .../component/create_room/Btn_cr_checkbox.xml | 2 +- .../create_room/Btn_cr_checkbox2.xml | 2 +- .../component/create_room/Cgm_create_room.xml | 46 ++++++------ .../component/create_room/di01.xml | 2 +- .../Extend_Poker_ChangdeWHZ/gamerule.xml | 2 +- .../component/clearing/FullName.xml | 2 +- .../clearing/big_zipai_result_item.xml | 14 ++-- .../component/clearing/card_item.xml | 4 +- .../component/clearing/clearing.xml | 18 ++--- .../component/clearing/clearing_1_item.xml | 6 +- .../component/clearing/clearing_1_liu.xml | 2 +- .../component/clearing/clearing_2_item.xml | 6 +- .../clearing/descript_item_zipai.xml | 4 +- .../component/clearing/otherCard_item.xml | 4 +- .../clearing/otherCard_item__old.xml | 4 +- .../component/clearing/result_zipai_main.xml | 2 +- .../component/create_room/Btn_cr_checkbox.xml | 2 +- .../create_room/Btn_cr_checkbox2.xml | 2 +- .../component/create_room/Cgm_create_room.xml | 56 +++++++------- .../component/create_room/di01.xml | 2 +- .../assets/Extend_Poker_FanPaoFa/gamerule.xml | 2 +- .../component/clearing/FullName.xml | 2 +- .../component/clearing/card_item.xml | 4 +- .../component/clearing/clearing.xml | 10 +-- .../component/clearing/clearing_1_liu.xml | 2 +- .../component/clearing/clearing_2_item.xml | 6 +- .../component/create_room/Btn_cr_checkbox.xml | 2 +- .../create_room/Btn_cr_checkbox2.xml | 2 +- .../component/create_room/Cgm_create_room.xml | 56 +++++++------- .../component/create_room/di01.xml | 2 +- .../Extend_Poker_FanPaoFa_bar/gamerule.xml | 2 +- .../component/clearing/clearing_1_liu.xml | 2 +- .../component/clearing/clearing_2_item.xml | 6 +- .../component/gamerule.xml | 2 +- .../component/clearing/clearing_1_liu.xml | 2 +- .../component/clearing/clearing_2_item.xml | 6 +- .../component/create_room/Cgm_create_room.xml | 56 +++++++------- .../assets/Extend_Poker_RunBeard/gamerule.xml | 2 +- .../Component/Comp_playerOver0Info.xml | 10 +-- .../Component/Comp_playerOver1Info.xml | 14 ++-- .../Main_New/Component/Btn_SelfCard.xml | 14 ++-- .../Main_New/Player_card_info_1.xml | 2 +- .../Main_New/mask_piao.xml | 2 +- .../RunFast_Main_New_2.xml | 8 +- .../Extend_Poker_RunFastNew/clearing_new.xml | 22 +++--- .../component/head/HeadNameBG.xml | 4 +- .../component/head/PlayerHead_1.xml | 4 +- .../component/head/PlayerHead_2.xml | 4 +- .../component/newcard/1/101.xml | 10 +-- .../component/newcard/1/102.xml | 10 +-- .../component/newcard/1/103.xml | 10 +-- .../component/newcard/1/104.xml | 10 +-- .../component/newcard/1/105.xml | 10 +-- .../component/newcard/1/106.xml | 10 +-- .../component/newcard/1/107.xml | 10 +-- .../component/newcard/1/108.xml | 10 +-- .../component/newcard/1/109.xml | 10 +-- .../component/newcard/1/110.xml | 12 +-- .../component/newcard/1/111.xml | 10 +-- .../component/newcard/1/112.xml | 12 +-- .../component/newcard/1/113.xml | 10 +-- .../component/newcard/1/114.xml | 10 +-- .../component/newcard/1/115.xml | 10 +-- .../component/newcard/2/201.xml | 10 +-- .../component/newcard/2/202.xml | 10 +-- .../component/newcard/2/203.xml | 10 +-- .../component/newcard/2/204.xml | 10 +-- .../component/newcard/2/205.xml | 10 +-- .../component/newcard/2/206.xml | 10 +-- .../component/newcard/2/207.xml | 10 +-- .../component/newcard/2/208.xml | 10 +-- .../component/newcard/2/209.xml | 10 +-- .../component/newcard/2/210.xml | 10 +-- .../component/newcard/2/211.xml | 10 +-- .../component/newcard/2/212.xml | 10 +-- .../component/newcard/2/213.xml | 10 +-- .../component/newcard/2/214.xml | 10 +-- .../component/newcard/2/215.xml | 10 +-- .../component/newcard/3/301.xml | 10 +-- .../component/newcard/3/302.xml | 10 +-- .../component/newcard/3/303.xml | 10 +-- .../component/newcard/3/304.xml | 10 +-- .../component/newcard/3/305.xml | 10 +-- .../component/newcard/3/306.xml | 10 +-- .../component/newcard/3/307.xml | 10 +-- .../component/newcard/3/308.xml | 10 +-- .../component/newcard/3/309.xml | 10 +-- .../component/newcard/3/310.xml | 10 +-- .../component/newcard/3/310_1.xml | 10 +-- .../component/newcard/3/310_2.xml | 10 +-- .../component/newcard/3/311.xml | 10 +-- .../component/newcard/3/312.xml | 10 +-- .../component/newcard/3/313.xml | 10 +-- .../component/newcard/3/314.xml | 10 +-- .../component/newcard/3/315.xml | 10 +-- .../component/newcard/3/newcard2/di.xml | 2 +- .../component/newcard/4/401.xml | 10 +-- .../component/newcard/4/402.xml | 10 +-- .../component/newcard/4/403.xml | 10 +-- .../component/newcard/4/404.xml | 10 +-- .../component/newcard/4/405.xml | 10 +-- .../component/newcard/4/406.xml | 10 +-- .../component/newcard/4/407.xml | 10 +-- .../component/newcard/4/408.xml | 10 +-- .../component/newcard/4/409.xml | 10 +-- .../component/newcard/4/410.xml | 10 +-- .../component/newcard/4/411.xml | 10 +-- .../component/newcard/4/412.xml | 10 +-- .../component/newcard/4/413.xml | 10 +-- .../component/newcard/4/414.xml | 10 +-- .../component/newcard/4/415.xml | 10 +-- .../component/newcard/di(1).xml | 6 +- .../component/newcard/素材/01.png | Bin 15712 -> 1502 bytes .../component/newcard/素材/02.png | Bin 15810 -> 1793 bytes .../component/newcard/素材/03.png | Bin 15856 -> 2015 bytes .../component/newcard/素材/04.png | Bin 15653 -> 1099 bytes .../component/newcard/素材/05.png | Bin 15773 -> 1832 bytes .../component/newcard/素材/06.png | Bin 15882 -> 2149 bytes .../component/newcard/素材/07.png | Bin 15657 -> 1249 bytes .../component/newcard/素材/08.png | Bin 15946 -> 2155 bytes .../component/newcard/素材/09.png | Bin 15897 -> 2103 bytes .../component/newcard/素材/10.png | Bin 15895 -> 2319 bytes .../component/newcard/素材/11.png | Bin 15547 -> 1002 bytes .../component/newcard/素材/12.png | Bin 15938 -> 2700 bytes .../component/newcard/素材/13.png | Bin 15773 -> 1647 bytes .../component/newcard/素材/bg.png | Bin 18333 -> 45646 bytes .../component/newcard/素材/fangpian.png | Bin 15567 -> 2179 bytes .../component/newcard/素材/heitao.png | Bin 1370 -> 1631 bytes .../component/newcard/素材/hongtao.png | Bin 15754 -> 2403 bytes .../component/newcard/素材/meihua.png | Bin 1363 -> 1718 bytes .../component/clearing/clearing_1_liu.xml | 2 +- .../component/clearing/clearing_2_item.xml | 6 +- .../component/gamerule.xml | 2 +- .../Cgm_create_room_yueyang(1).xml | 2 +- .../Cgm_create_room_yueyang.xml | 4 +- .../assets/Info_MJ_ChangSha/Com_help.xml | 2 +- .../Cgm_create_room_yueyang.xml | 4 +- .../assets/Info_MJ_HongZhong/Com_help.xml | 2 +- .../Info_MJ_ZhuanZhuan/Cgm_create_room.xml | 4 +- .../Cgm_create_room_yueyang.xml | 4 +- .../assets/Info_MJ_ZhuanZhuan/Com_help.xml | 2 +- .../Info_Poker_ChangdeWHZ/Cgm_create_room.xml | 68 ++++++++--------- .../assets/Info_Poker_ChangdeWHZ/Com_help.xml | 2 +- .../component/create_room/Btn_cr_checkbox.xml | 2 +- .../create_room/Btn_cr_checkbox2.xml | 2 +- .../component/create_room/di01.xml | 2 +- .../Info_Poker_FanPaoFa/Cgm_create_room.xml | 2 +- .../component/create_room/Btn_cr_checkbox.xml | 2 +- .../create_room/Btn_cr_checkbox2.xml | 2 +- .../component/create_room/di01.xml | 2 +- .../Info_Poker_FuLuShou/Cgm_create_room.xml | 4 +- .../assets/Info_Poker_FuLuShou/Com_help.xml | 2 +- .../component/create_room/di01.xml | 2 +- .../Info_Poker_RunBeard/Cgm_create_room.xml | 70 +++++++++--------- .../assets/Info_Poker_RunBeard/Com_help.xml | 2 +- .../component/create_room/di01.xml | 2 +- .../assets/Info_Poker_RunFastNew/Com_help.xml | 2 +- .../Creat_RunFast_yueyang.xml | 4 +- .../Info_Poker_YueYangWHZ/Cgm_create_room.xml | 4 +- .../assets/Info_Poker_YueYangWHZ/Com_help.xml | 2 +- .../component/create_room/di01.xml | 2 +- wb_new_ui/assets/Lobby/SettingWindow1.xml | 6 +- wb_new_ui/assets/Lobby/Win_JoinRoom.xml | 2 +- .../component/games/component/Component2.xml | 2 +- .../component/index/win_selectAccont.xml | 8 +- .../component/notice/Cgm_message_text.xml | 2 +- .../Lobby/component/setting/Component3.xml | 2 +- .../Lobby/component/user_info/UserInfo.xml | 4 +- .../component/user_info/cgm_user_opt.xml | 2 +- .../component/user_info/user_opt/Button5.xml | 2 +- .../user_info/user_opt/iuo_address.xml | 4 +- .../user_info/user_opt/iuo_invite.xml | 2 +- .../user_info/user_opt/iuo_password.xml | 4 +- .../user_info/user_opt/iuo_phone.xml | 4 +- .../component/user_info/user_opt/iuo_real.xml | 4 +- .../component/user_info/user_opt/iuo_wx.xml | 6 +- .../user_info/win_id_password_alone.xml | 8 +- .../Lobby/component/user_info/win_phone.xml | 8 +- .../user_info/win_phone_password.xml | 14 ++-- .../component/user_info/win_real_address.xml | 20 ++--- .../user_info/win_retrieve_alone.xml | 8 +- .../component/user_info/win_user_edit.xml | 4 +- wb_new_ui/assets/Login/Main.xml | 4 +- .../Login/commpoent/phone_login/btn_login.xml | 2 +- .../Login/component/setting/Component3.xml | 2 +- wb_new_ui/assets/Main_Majiang/Main_2.xml | 2 +- wb_new_ui/assets/Main_Majiang/Main_3.xml | 2 +- wb_new_ui/assets/Main_Majiang/Main_4.xml | 2 +- .../Main_style_2/HeadNameBG(1).xml | 8 +- .../Main_Majiang/Main_style_2/HeadNameBG.xml | 6 +- .../Main_Majiang/Main_style_2/Main_2_s2.xml | 16 ++-- .../Main_Majiang/Main_style_2/Main_3_s2.xml | 6 +- .../Main_Majiang/Main_style_2/Main_4_s2.xml | 6 +- .../Main_Majiang/Main_style_2/MsgBubble2.xml | 2 +- .../Main_Majiang/Main_style_2/MsgBubble3.xml | 2 +- .../Main_style_2/PlayerHead_1_s2(1).xml | 2 +- .../Main_style_2/PlayerHead_3_s2(1).xml | 2 +- .../tip_continue_win/com_continual_win(1).xml | 2 +- .../tip_continue_win/com_continual_win.xml | 2 +- .../Main_style_2/piao_niao/mask_piao.xml | 2 +- .../Main_style_2/turn/Gcm_box_4.xml | 2 +- .../component/clearing/clearing.xml | 4 +- .../clearing/clearing1/clearing_1_item.xml | 6 +- .../clearing/clearing2/big_result_item.xml | 12 +-- .../clearing/clearing2/descript_item.xml | 4 +- .../clearing/clearing2/result_main.xml | 6 +- .../component/hu_tip/Btn_Card_Hu.xml | 2 +- .../Main_Majiang/component/hu_tip/Hu_tip.xml | 4 +- .../component/setting_new/SettingWindow2.xml | 12 +-- .../component/setting_new/btn_select_card.xml | 2 +- .../Main_Majiang/component/turn/Gcm_box_4.xml | 2 +- wb_new_ui/assets/Main_PokeMaJiang/Main_2.xml | 2 +- wb_new_ui/assets/Main_PokeMaJiang/Main_3.xml | 2 +- wb_new_ui/assets/Main_PokeMaJiang/Main_4.xml | 2 +- .../Main_style_2/HeadNameBG.xml | 6 +- .../Main_style_2/Main_2_s2.xml | 6 +- .../Main_style_2/Main_3_s2.xml | 6 +- .../Main_style_2/Main_4_s2.xml | 6 +- .../tip_continue_win/com_continual_win.xml | 2 +- .../component/setting_new/SettingWindow2.xml | 10 +-- .../component/setting_new/btn_select_card.xml | 2 +- .../component/turn/Gcm_box_4.xml | 2 +- .../setting_new/btn_select_card(1).xml | 2 +- .../component/setting_new/btn_select_card.xml | 2 +- .../Main_Poker/setting/SettingWindow1.xml | 12 +-- .../Main_RunBeard/component/Main/Main_2.xml | 8 +- .../component/Main/RoomInfoPanel1.xml | 4 +- .../Main/component/Folder/RightPanel.xml | 2 +- .../component/phone_info/Component3(1).xml | 2 +- .../component/Main/component/HeadNameBG.xml | 4 +- .../component/Main/component/PlayerHead_1.xml | 4 +- .../component/Main/component/PlayerHead_2.xml | 6 +- .../Main_RunBeard/component/MsgBubble2.xml | 2 +- .../clearing/descript_item_zipai.xml | 4 +- .../component/clearing/result_zipai_main.xml | 2 +- .../component/create_room/Btn_cr_checkbox.xml | 2 +- .../component/option/Pop_tip_choice.xml | 6 +- .../component/setting/Win_SanTingView.xml | 2 +- .../component/Main/Main_2.xml | 2 +- .../component/Main/component/PlayerHead_1.xml | 2 +- .../component/Main/component/PlayerHead_2.xml | 2 +- .../clearing/descript_item_zipai.xml | 4 +- .../component/clearing/result_zipai_main.xml | 2 +- wb_new_ui/assets/NewGroup/Win_AddFriend.xml | 2 +- wb_new_ui/assets/NewGroup/Win_AddPartner.xml | 6 +- wb_new_ui/assets/NewGroup/Win_Banklog.xml | 2 +- wb_new_ui/assets/NewGroup/Win_CreateGroup.xml | 2 +- wb_new_ui/assets/NewGroup/Win_FagInput0.xml | 2 +- .../assets/NewGroup/Win_FagInput1_qi.xml | 2 +- wb_new_ui/assets/NewGroup/Win_FagInput3.xml | 2 +- .../assets/NewGroup/Win_GroupSetting.xml | 8 +- wb_new_ui/assets/NewGroup/Win_ManagerView.xml | 2 +- .../assets/NewGroup/Win_ManagerView_old.xml | 2 +- .../assets/NewGroup/Win_PartnerBanPlays.xml | 4 +- .../NewGroup/Win_PartnerBanPlaysNew.xml | 4 +- .../assets/NewGroup/Win_PartnerBanPls.xml | 4 +- .../assets/NewGroup/Win_PartnerRewards.xml | 4 +- .../assets/NewGroup/Win_PartnerStatMember.xml | 12 +-- .../assets/NewGroup/Win_PartnerStatPlay.xml | 10 +-- .../NewGroup/Win_PartnerZuanShiMember.xml | 10 +-- .../assets/NewGroup/Win_PlayerInfoForAdd.xml | 8 +- .../assets/NewGroup/Win_PlayerInfoForAdd2.xml | 14 ++-- .../assets/NewGroup/Win_RewardsFaglog.xml | 14 ++-- wb_new_ui/assets/NewGroup/Win_SelectGames.xml | 4 +- .../NewGroup/Win_SetAddPlayerHBView.xml | 18 ++--- wb_new_ui/assets/NewGroup/Win_SetTag.xml | 2 +- wb_new_ui/assets/NewGroup/Win_StatMember.xml | 10 +-- wb_new_ui/assets/NewGroup/Win_Takelog.xml | 2 +- wb_new_ui/assets/NewGroup/Win_bxx.xml | 8 +- wb_new_ui/assets/NewGroup/Win_bxx1.xml | 8 +- .../NewGroup/component/Btn/ComboBox1_item.xml | 2 +- .../NewGroup/component/Btn/ComboBox3.xml | 2 +- .../NewGroup/component/Btn/ComboBox4.xml | 2 +- .../component/Lst_fag/Item_daily_count.xml | 4 +- .../Lst_fag/Item_fag_detail_info(1).xml | 6 +- .../component/Lst_fag/Item_fag_info.xml | 16 ++-- .../Lst_friend/Item_friend_fag_record.xml | 14 ++-- .../component/Lst_info/Btn_Game_Type.xml | 2 +- .../component/Lst_info/Btn_choose.xml | 2 +- .../NewGroup/component/Lst_info/Button6.xml | 2 +- .../component/Lst_info/Win_roomInfo.xml | 12 +-- .../component/Lst_info/btn_allGame.xml | 6 +- .../component/Lst_info/btn_layer_item.xml | 4 +- .../Lst_info/room_info/item_room_player.xml | 4 +- .../component/Lst_room/Item_room10.xml | 2 +- .../component/Lst_room/Item_room2.xml | 6 +- .../component/Lst_room/Item_room3.xml | 6 +- .../component/Lst_room/Item_room4.xml | 6 +- .../component/Lst_room/Item_room5.xml | 4 +- .../component/Lst_room/Item_room9.xml | 4 +- .../component/Lst_room/Play_room1.xml | 2 +- .../component/Lst_room/Play_room2.xml | 2 +- .../component/Lst_room/Play_room3.xml | 2 +- .../NewGroup/component/nav/Btn_menu_h2.xml | 2 +- .../component/notice/Cgm_message_text.xml | 2 +- .../component/select_play/btn_game_select.xml | 2 +- wb_new_ui/assets/NewGroup/images/Button10.xml | 2 +- .../assets/NewGroup/mgr/View_GroupFagList.xml | 40 +++++----- .../NewGroup/mgr/View_GroupFagPackStat.xml | 16 ++-- .../NewGroup/mgr/View_GroupGameSetting.xml | 4 +- .../NewGroup/mgr/View_GroupMemberInfo.xml | 8 +- .../NewGroup/mgr/View_GroupMemberInvite.xml | 2 +- .../NewGroup/mgr/View_GroupMemberList.xml | 26 +++---- .../NewGroup/mgr/View_GroupMemberList1.xml | 18 ++--- .../assets/NewGroup/mgr/View_GroupMenKang.xml | 8 +- .../NewGroup/mgr/View_GroupPartnerList.xml | 24 +++--- .../NewGroup/mgr/View_GroupPartnerList1.xml | 4 +- .../NewGroup/mgr/View_GroupPartnerStat.xml | 10 +-- .../NewGroup/mgr/View_GroupPersonStat.xml | 2 +- .../NewGroup/mgr/View_GroupPersonStat2.xml | 2 +- .../NewGroup/mgr/View_GroupPiLaoZhi.xml | 16 ++-- .../NewGroup/mgr/View_GroupProportion.xml | 28 +++---- .../assets/NewGroup/mgr/View_GroupRank.xml | 26 +++---- .../NewGroup/mgr/View_GroupXingYunStat.xml | 14 ++-- .../assets/NewGroup/mgr/View_GroupZuanShi.xml | 20 ++--- .../assets/NewGroup/mgr/Win_BanSameTable.xml | 8 +- .../assets/NewGroup/mgr/Win_MemberFagLog.xml | 10 +-- .../component/ban_table/item_ban_table.xml | 4 +- .../NewGroup/mgr/component/comm/mng_label.xml | 2 +- .../mgr/component/comm/mng_label1.xml | 2 +- .../mgr/component/fagpack/item_getreward.xml | 12 +-- .../NewGroup/mgr/component/game/game_info.xml | 2 +- .../mgr/component/game/item_mng_game.xml | 4 +- .../NewGroup/mgr/component/game/panel_fag.xml | 4 +- .../NewGroup/mgr/component/member/btn_tag.xml | 2 +- .../mgr/component/member/item_member.xml | 12 +-- .../mgr/component/member/item_member1.xml | 14 ++-- .../member/partner/item_mng_partner.xml | 8 +- .../member/partner/item_mng_partner1.xml | 2 +- .../member/partner/item_mng_partner2.xml | 8 +- .../member/partner/item_partner_stat2.xml | 20 ++--- .../partner/item_partner_stat_inMgr.xml | 10 +-- .../partner/item_partner_stat_member.xml | 14 ++-- .../member/partner/item_partner_stat_play.xml | 10 +-- .../member/partner/item_partner_zuanshi.xml | 10 +-- .../partner/item_partner_zuanshi_member.xml | 10 +-- .../member/partner/item_xingyun_stat.xml | 10 +-- .../component/numberHpAlone/item_member2.xml | 12 +-- .../component/numberHpAlone/item_member3.xml | 18 ++--- .../component/numberHpAlone/item_member4.xml | 14 ++-- .../mgr/component/play_set/item_rewards.xml | 4 +- .../mgr/component/play_set/panel_play_set.xml | 10 +-- .../proportion/Item_friend_fag_mgr_record.xml | 12 +-- .../component/proportion/item_proportion.xml | 10 +-- .../mgr/component/rank/rank_item0.xml | 8 +- .../mgr/component/rank/rank_item1.xml | 4 +- .../reward/item_partner_banplays.xml | 4 +- .../reward/item_partner_banplays2.xml | 6 +- .../component/reward/item_partner_rewards.xml | 4 +- .../assets/NewGroup/tuoguan/ComboBox1.xml | 2 +- .../NewGroup/tuoguan/ComboBox1_item.xml | 2 +- .../component/DevelopTool/DeveloperPanel.xml | 2 +- .../Assets/ART/base/chat/ui/Chat_fui.bytes | Bin 32465 -> 32477 bytes .../ART/base/common/ui/Common_fui.bytes | Bin 274716 -> 274728 bytes .../Assets/ART/base/lobby/ui/Lobby_fui.bytes | Bin 60900 -> 60912 bytes .../Assets/ART/base/login/ui/Login_fui.bytes | Bin 6826 -> 6838 bytes .../main_majiang/ui/Main_Majiang_fui.bytes | Bin 231423 -> 231435 bytes .../ui/Main_PokeMaJiang_fui.bytes | Bin 169371 -> 169383 bytes .../base/main_poker/ui/Main_Poker_fui.bytes | Bin 60551 -> 60563 bytes .../main_zipai/ui/Main_RunBeard_fui.bytes | Bin 179871 -> 179883 bytes .../ui/Main_RunBeardMaJiang_fui.bytes | Bin 156466 -> 156478 bytes .../ART/base/newgroup/ui/NewGroup_fui.bytes | Bin 351602 -> 351614 bytes .../Assets/ART/base/rank/ui/Rank_fui.bytes | Bin 17859 -> 17871 bytes .../fonts/ALIBABAPUHUITI-3-55-REGULAR.TTF | Bin 0 -> 8532824 bytes .../ALIBABAPUHUITI-3-55-REGULAR.TTF.meta | 22 ++++++ .../changsha/ui/Extend_MJ_ChangSha_fui.bytes | Bin 40986 -> 40998 bytes .../changsha/ui/Info_MJ_ChangSha_fui.bytes | Bin 21905 -> 21917 bytes .../ui/Extend_MJ_HongZhong_fui.bytes | Bin 32564 -> 32576 bytes .../hongzhong/ui/Info_MJ_HongZhong_fui.bytes | Bin 19490 -> 19502 bytes .../ui/Extend_MJ_ZhuanZhuan_fui.bytes | Bin 46450 -> 46462 bytes .../ui/Info_MJ_ZhuanZhuan_fui.bytes | Bin 22447 -> 22459 bytes .../ui/Extend_Poker_RunFastNew_atlas0.png | Bin 1651712 -> 1648719 bytes .../ui/Extend_Poker_RunFastNew_atlas0_1.png | Bin 2033788 -> 2074092 bytes .../ui/Extend_Poker_RunFastNew_fui.bytes | Bin 224051 -> 225186 bytes .../ui/Info_Poker_RunFastNew_fui.bytes | Bin 24000 -> 24012 bytes .../ui/Extend_Poker_ChangdeWHZ_fui.bytes | Bin 117336 -> 117348 bytes .../ui/Info_Poker_ChangdeWHZ_fui.bytes | Bin 38538 -> 38550 bytes .../ui/Extend_Poker_FanPaoFa_fui.bytes | Bin 144263 -> 144275 bytes .../fanpaofa/ui/Info_Poker_FanPaoFa_fui.bytes | Bin 23147 -> 23159 bytes .../ui/Extend_Poker_FuLuShou_fui.bytes | Bin 81866 -> 81878 bytes .../fulushou/ui/Info_Poker_FuLuShou_fui.bytes | Bin 14220 -> 14232 bytes .../ui/Extend_Poker_RunBeard_fui.bytes | Bin 106413 -> 106425 bytes .../runbeard/ui/Info_Poker_RunBeard_fui.bytes | Bin 25167 -> 25179 bytes .../ui/Extend_Poker_YueYangWHZ_fui.bytes | Bin 77515 -> 77527 bytes .../ui/Info_Poker_YueYangWHZ_fui.bytes | Bin 15945 -> 15957 bytes 454 files changed, 1444 insertions(+), 1378 deletions(-) create mode 100644 wb_new_ui/assets/Common/font/ALIBABAPUHUITI-3-55-REGULAR.TTF create mode 100644 wb_unity_pro/Assets/ART/base/static/fonts/ALIBABAPUHUITI-3-55-REGULAR.TTF create mode 100644 wb_unity_pro/Assets/ART/base/static/fonts/ALIBABAPUHUITI-3-55-REGULAR.TTF.meta diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua index 7ca79d6a..03049df2 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua @@ -143,7 +143,11 @@ local function __getReason(data) return "提取能量包" elseif data.reason == 15 then return "" - elseif data.reason == 18 then + elseif data.reason == 16 then + return "保险箱取出" + elseif data.reason == 17 then + return "存入保险箱" + elseif data.reason == 18 then return "保底房卡" elseif data.reason == 20 then return "洗牌" diff --git a/lua_probject/base_project/Main.lua b/lua_probject/base_project/Main.lua index 38501cb4..244d27dd 100644 --- a/lua_probject/base_project/Main.lua +++ b/lua_probject/base_project/Main.lua @@ -56,7 +56,7 @@ function Main() FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("SIYUAN", "base/static/fonts/SIYUAN.TTF"), null) FairyGUI.FontManager.RegisterFont( FairyGUI.DynamicFont.New("AlimamaFangYuanTiVF-Thin", "base/static/fonts/AlimamaFangYuanTiVF-Thin.ttf"), null) - + FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("ALIBABAPUHUITI-3-55-REGULAR", "base/static/fonts/ALIBABAPUHUITI-3-55-REGULAR.TTF"), null) _game_info = json.decode(GameApplication.Instance.GameInfo) --_game_info["login_url"]="http://8.134.59.224:8101/" --pt(_game_info) diff --git a/lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua b/lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua index 011d9c9c..3797eddc 100644 --- a/lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua @@ -28,6 +28,8 @@ function M:InitView(url) self._tex_round = self._view:GetChild("tex_round") self._tex_LeftCard = self._view:GetChild("remaining_card") self._anchor = self._view:GetChild("mask_tips") + self._view:GetChild('wanfa_text').text =(self._room.room_config.round == 1 and '红把结' or '红中麻将') .. room.room_config.config.hpData.times/100 + self._eventmap = {} self._cmdmap = {} diff --git a/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXPlayBackView.lua b/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXPlayBackView.lua index 8ea9a93e..f6795bb8 100644 --- a/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXPlayBackView.lua @@ -28,6 +28,8 @@ function M:InitView(url) self._tex_round = self._view:GetChild("tex_round") self._tex_LeftCard = self._view:GetChild("remaining_card") self._anchor = self._view:GetChild("mask_tips") + self._view:GetChild('wanfa_text').text ='转转麻将' .. room.room_config.config.hpData.times/100 + self._eventmap = {} self._cmdmap = {} diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua index 3a24665e..ff49cef6 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua @@ -139,15 +139,15 @@ function M:InitView(url) local round = self._room.curren_round or 1 local xpconfig = DataManager.CurrenRoom.room_config.config.xi_pai -- if flag_daniao then - if xpconfig then - if round > 1 then - self._ctr_action.selectedIndex = 1 - else - self._ctr_action.selectedIndex = 2 - end - else + if xpconfig then + if round > 1 then self._ctr_action.selectedIndex = 1 + else + self._ctr_action.selectedIndex = 2 end + else + self._ctr_action.selectedIndex = 1 + end -- else -- self._ctr_action.selectedIndex = 3 -- self.ctr_state.selectedIndex = 1 @@ -191,15 +191,19 @@ function M:InitView(url) self._view:GetChild('info_text'):GetChild('text').text = room.room_config:GetDes() if room.room_config.Leaf == 1 then if room.room_config.people_num == 2 then - self._view:GetChild('wanfa_text').text = (self._room.room_config.Times == 1 and '跑把结' or '跑得快') .. room.score_times + self._view:GetChild('wanfa_text').text = (self._room.room_config.Times == 1 and '跑把结' or '跑得快') .. + room.score_times else - self._view:GetChild('wanfa_text').text = (self._room.room_config.Times == 1 and '跑把结' or '跑得快') .. room.score_times + self._view:GetChild('wanfa_text').text = (self._room.room_config.Times == 1 and '跑把结' or '跑得快') .. + room.score_times end else if room.room_config.people_num == 2 then - self._view:GetChild('wanfa_text').text = (self._room.room_config.Times == 1 and '跑把结' or '跑得快') .. room.score_times + self._view:GetChild('wanfa_text').text = (self._room.room_config.Times == 1 and '跑把结' or '跑得快') .. + room.score_times else - self._view:GetChild('wanfa_text').text = (self._room.room_config.Times == 1 and '跑把结' or '跑得快') .. room.score_times + self._view:GetChild('wanfa_text').text = (self._room.room_config.Times == 1 and '跑把结' or '跑得快') .. + room.score_times end end local text_playName = self._view:GetChild('text_playName') @@ -565,6 +569,14 @@ function M:EventInit() if p.seat == self._room.self_player.seat then + local tempCardList = {} + for i, v in ipairs(cardlist) do + table.insert(tempCardList, card_info:ChangeOneCodeByFrom(v)) + end + table.sort(tempCardList, function(a, b) return a < b end) + for i, v in ipairs(tempCardList) do + cardlist[i] = card_info:ChangeCodeByTo(v) + end if self._room.room_config.people_num == 3 and self._room.room_config.fangzuobi == 1 then -- body card_info:InitPoker(cardlist, false, 1) @@ -1229,6 +1241,14 @@ function M:ReConnectForStart() head_info._view:GetChild("shengyu").text = player.hand_count end if player.seat == self._room.self_player.seat then + local tempCardList = {} + for i, v in ipairs(player.hand_list) do + table.insert(tempCardList, player_card_info:ChangeOneCodeByFrom(v)) + end + table.sort(tempCardList, function(a, b) return a < b end) + for i, v in ipairs(tempCardList) do + player.hand_list[i] = player_card_info:ChangeCodeByTo(v) + end if player.open ~= nil and player.open == 0 and self._room.room_config.people_num == 3 and self._room.room_config.fangzuobi == 1 then -- body self.MypokerList = player.hand_list @@ -1247,7 +1267,6 @@ function M:ReConnectForStart() player_card_info._ctr_time_clock.selectedIndex = 1 self._tex_leftTime = player_card_info._view_comp_clock self._left_time = 15 - else -- head_info:MarkBank(true) if player.out_card_list[1] == 0 then diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua index 9be8fd88..53b0e59f 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua @@ -82,6 +82,21 @@ function M:InitView(url) self._view:GetChild('roominfo_panel1'):GetChild('tex_beishu').text = '' end + self._view:GetChild('info_text'):GetChild('text').text = room.room_config:GetDes() + if room.room_config.Leaf == 1 then + if room.room_config.people_num == 2 then + self._view:GetChild('wanfa_text').text = (self._room.room_config.Times == 1 and '跑把结' or '跑得快') .. room.room_config.config.hpData.times/100 + else + self._view:GetChild('wanfa_text').text = (self._room.room_config.Times == 1 and '跑把结' or '跑得快') .. room.room_config.config.hpData.times/100 + end + else + if room.room_config.people_num == 2 then + self._view:GetChild('wanfa_text').text = (self._room.room_config.Times == 1 and '跑把结' or '跑得快') .. room.room_config.config.hpData.times/100 + else + self._view:GetChild('wanfa_text').text = (self._room.room_config.Times == 1 and '跑把结' or '跑得快') .. room.room_config.config.hpData.times/100 + end + end + self._cardCheck = RunFast_CardCheck:InitFlag() self._gamectr._cardCheck = self._cardCheck diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua index dd86e9dd..13510c69 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua @@ -224,6 +224,8 @@ function M:InitPoker(pokerList, isPlayAni, open) elseif DataManager.CurrenRoom.cardsize == 1 then cs = 0.95 end + local card_width = 275 * cs + if isPlayAni == true then self.cor_init_poker = coroutine.start( @@ -232,9 +234,8 @@ function M:InitPoker(pokerList, isPlayAni, open) if self._mainView._rightPanelView._settingView ~= nil then self._mainView._rightPanelView._settingView:SetBtnDismissRoomEnable(false) end - local card_width = (GRoot.inst.width*0.95 - self._view_handCard.columnGap * 14) / 15 * cs self._view_handCard.align = FairyGUI.AlignType.Left - self._view_handCard.width = card_width*15 + self._view_handCard.columnGap*14 + self._view_handCard.width = card_width * 15 + self._view_handCard.columnGap * 14 self._view_handCard:Center() for i = #pokerList, 1, -1 do if pokerList[i] == 403 then @@ -250,11 +251,11 @@ function M:InitPoker(pokerList, isPlayAni, open) self.card_list[#self.card_list + 1] = card_view btn_card.data = card_view btn_card.width = card_width - btn_card.height = btn_card.width * 1.33 * 0.95 + -- btn_card.height = btn_card.width * 1.33 * 0.95 btn_card:TweenFade(1, 0.1):OnComplete(function() btn_card.selected = false -- 先让所有牌掉下去，不知道为什么第一张牌回起来 end) - coroutine.wait(0.3 / #pokerList) + coroutine.wait(0.01) end table.sort(self.card_list, tableSortNumber) self._view_handCard.x = 0 @@ -288,8 +289,8 @@ function M:InitPoker(pokerList, isPlayAni, open) local card_view = NewCardView(btn_card, card_number_code, card_flower_code) self.card_list[#self.card_list + 1] = card_view btn_card.data = card_view - btn_card.width = (GRoot.inst.width*0.95 - self._view_handCard.columnGap * 14) / 15 * cs - btn_card.height = btn_card.width * 1.33 * 0.95 + btn_card.width = card_width + -- btn_card.height = btn_card.width * 1.33 * 0.95 end table.sort(self.card_list, tableSortNumber) self:AddTouchMoveEvent(self._view_handCard) @@ -518,11 +519,10 @@ end -- end function M:SetBtnCardColor(card, num) if DataManager.CurrenRoom.pai == 0 then - card.btn_card:GetController('choose').selectedIndex = num + card.btn_card:GetController('choose').selectedIndex = num else - card.btn_card:GetController('choose2').selectedIndex = num + card.btn_card:GetController('choose2').selectedIndex = num end - end function M:ShowPiao(piao) diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua index a0206546..eb3ce1ac 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua @@ -35,7 +35,7 @@ function M:InitView(url) self._gamectr = ControllerManager.GetController(GameController) UIPackage.AddPackage('base/main_zipai/ui/Main_RunBeard') UIPackage.AddPackage('extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa') - printlog("room.room_config.people_num"..room.room_config.people_num) + printlog("room.room_config.people_num" .. room.room_config.people_num) ZPPlayBackView.InitView(self, 'ui://Main_RunBeard/Main_' .. room.room_config.people_num) UpdateBeat:Add(self.OnUpdate, self) @@ -87,6 +87,8 @@ function M:InitView(url) local tex_roomid = rightpanel:GetChild('tex_roomid') tex_roomid.text = room.room_id rightpanel:GetChild('tex_gametype').text = room.room_config:GetGameName() + self._view:GetChild('di_text').text = + self._room.room_config:GetGameName() .. room.room_config.config.hpData.times/100 self._tex_round = self._view:GetChild('tex_round') self._tex_LeftCard = self._view:GetChild('remaining_card') @@ -102,7 +104,7 @@ function M:InitView(url) self._cmdmap[Record_Event.Evt_ChangePaiXing] = self.CmdChangePaiXing self._cmdmap[Record_Event.Evt_result] = self.onResult - + local btn_safe = self._view:GetChild('btn_safe') self.safe_arrow1 = btn_safe:GetChild("arrow1") self.safe_arrow2 = btn_safe:GetChild("arrow2") diff --git a/wb_new_ui/.objs/fonts.json b/wb_new_ui/.objs/fonts.json index 631ee453..95e515bb 100644 --- a/wb_new_ui/.objs/fonts.json +++ b/wb_new_ui/.objs/fonts.json @@ -2,6 +2,7 @@ ui://27vd145bhez87j26 ui://27vd145bhez87j25 ui://27vd145btjnvcfo ui://27vd145btjnvcfn +ui://27vd145blktg7j6h ui://27vd145bik9v7imk ui://27vd145bik9v7imf ui://27vd145bik9v7img @@ -42,8 +43,6 @@ ui://8wph7p8nyffng ui://8wph7p8nyffn1e ui://8wph7p8nyffn7w ui://8wph7p8nyffn89 -ui://9n9stu2enaueci9 -ui://9n9stu2enauecht ui://eyxz924gffp34g ui://4wmd3o8gvlhjde ui://z3z0ysurvlhj7t diff --git a/wb_new_ui/.objs/metas/m7iejg46/mpllhv5.info b/wb_new_ui/.objs/metas/m7iejg46/mpllhv5.info index 9e26dfee..4cab5d24 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/mpllhv5.info +++ b/wb_new_ui/.objs/metas/m7iejg46/mpllhv5.info @@ -1 +1,7 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n120_124ey": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index d444809b..95967219 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,39 +2,31 @@ "libview.firstColumnWidth": 413, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://m7iejg46gltdhc9", - "ui://m7iejg4610snh5j", - "ui://v0j9abjygq7ms8", - "ui://v0j9abjygq7mcc", - "ui://v0j9abjygq7m85", - "ui://lkq9ne9speuq8b", - "ui://lkq9ne9speuq5a", - "ui://v0j9abjygq7mc9", - "ui://v0j9abjygq7mca", - "ui://v0j9abjygq7mcb" + "ui://8wph7p8nyffnmy", + "ui://8wph7p8nyffn8s", + "ui://m7iejg46mpllhv2", + "ui://m7iejg46kwi0hkl", + "ui://m7iejg46mpllhv5", + "ui://8wph7p8nyffn2h", + "ui://8wph7p8nhuw1cms", + "ui://8wph7p8nhuw1cmm" ], "test.device": "Huawei Mate20", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://v0j9abjygq7ms8", + "doc.activeDoc": "ui://m7iejg46mpllhv5", "libview.twoColumn": false, "libview.expandedNodes": [ - "v0j9abjy", + "8wph7p8n", "/", - "v0j9abjy", + "8wph7p8n", "/component/", - "v0j9abjy", - "/component/card/", - "v0j9abjy", - "/component/chi_peng_effect/", - "4skil1l6", - "/", - "4skil1l6", - "/component/", - "4skil1l6", - "/component/chi_peng_effect/", - "4skil1l6", - "/component/chi_peng_effect/image/" + "8wph7p8n", + "/component/newcard/", + "8wph7p8n", + "/component/newcard/1/", + "8wph7p8n", + "/component/newcard/素材/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Chat/Main.xml b/wb_new_ui/assets/Chat/Main.xml index bd62ff04..58161dba 100644 --- a/wb_new_ui/assets/Chat/Main.xml +++ b/wb_new_ui/assets/Chat/Main.xml @@ -62,7 +62,7 @@ - + diff --git a/wb_new_ui/assets/Chat/component/Btn_YYItem.xml b/wb_new_ui/assets/Chat/component/Btn_YYItem.xml index 5aee0137..e9c87406 100644 --- a/wb_new_ui/assets/Chat/component/Btn_YYItem.xml +++ b/wb_new_ui/assets/Chat/component/Btn_YYItem.xml @@ -8,7 +8,7 @@ - + diff --git a/wb_new_ui/assets/Chat/component/MsgBubble1.xml b/wb_new_ui/assets/Chat/component/MsgBubble1.xml index 360f7179..2e60938c 100644 --- a/wb_new_ui/assets/Chat/component/MsgBubble1.xml +++ b/wb_new_ui/assets/Chat/component/MsgBubble1.xml @@ -4,7 +4,7 @@ - + diff --git a/wb_new_ui/assets/Chat/component/MsgBubble2.xml b/wb_new_ui/assets/Chat/component/MsgBubble2.xml index c5b5ecad..61c8135c 100644 --- a/wb_new_ui/assets/Chat/component/MsgBubble2.xml +++ b/wb_new_ui/assets/Chat/component/MsgBubble2.xml @@ -4,7 +4,7 @@ - + diff --git a/wb_new_ui/assets/Common/GlobalModalWaiting.xml b/wb_new_ui/assets/Common/GlobalModalWaiting.xml index 24e02b41..820f1db5 100644 --- a/wb_new_ui/assets/Common/GlobalModalWaiting.xml +++ b/wb_new_ui/assets/Common/GlobalModalWaiting.xml @@ -6,7 +6,7 @@ - + diff --git a/wb_new_ui/assets/Common/Win_Frame_full.xml b/wb_new_ui/assets/Common/Win_Frame_full.xml index fe165656..5d7da0c0 100644 --- a/wb_new_ui/assets/Common/Win_Frame_full.xml +++ b/wb_new_ui/assets/Common/Win_Frame_full.xml @@ -8,7 +8,7 @@ - + diff --git a/wb_new_ui/assets/Common/buttons/Btn_Common.xml b/wb_new_ui/assets/Common/buttons/Btn_Common.xml index 9bc3a007..864e9c6b 100644 --- a/wb_new_ui/assets/Common/buttons/Btn_Common.xml +++ b/wb_new_ui/assets/Common/buttons/Btn_Common.xml @@ -5,7 +5,7 @@ - +