diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index 39aee266..c826c696 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -713,19 +713,22 @@ function M:__RecordTouchEnd() if self._record_time < 0.3 then self:__SetRecordEnable() end + self.__runwait_record = nil self._ctr_voice.selectedIndex = 0 GameApplication.Instance.StopMusic = GameApplication.Instance.StopMusic - 1 self._chat_Talk.onTouchEnd:Remove(self.__RecordTouchEnd, self) local room = self._room - Voice.EndRecord( - room.room_id, - DataManager.SelfUser.account_id, - function(filename) - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:SendInteraction(DataManager.SelfUser.account_id, 3, filename) - end - ) + if self._record_view_ctr.selectedIndex == 0 then + Voice.EndRecord( + room.room_id, + DataManager.SelfUser.account_id, + function(filename) + local _gamectr = ControllerManager.GetController(GameController) + _gamectr:SendInteraction(DataManager.SelfUser.account_id, 3, filename) + end + ) + end end function M:__WaitRecord() diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua index 76eb73a4..d8ba7184 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua @@ -110,6 +110,9 @@ function M:Clear() self._view_outCardList:RemoveChildren(0, -1, true) self._view_FZList:RemoveChildren(0, -1, true) self._view_getCard:RemoveChildren(0, -1, true) + if self._view:GetChild('List_HandCard2') then + self._view:GetChild('List_HandCard2'):RemoveChildren(0, -1, true) + end self._view_handCardList.selectedIndex = -1 self._click_index = self._view_handCardList.selectedIndex diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml index 2dc58a3b..ee1f27ba 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml @@ -6,14 +6,16 @@ + - + + @@ -51,10 +53,11 @@ + - + @@ -70,7 +73,7 @@ - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml index e9147bcb..21c9c9d2 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml @@ -4,13 +4,14 @@ - + + @@ -26,14 +27,16 @@ + - + + @@ -61,6 +64,7 @@ + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml index 84ced940..3ac1bb8f 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml @@ -15,14 +15,14 @@ - + - + @@ -40,7 +40,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_W.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_W.xml index cd625791..ad0e22ab 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_W.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_W.xml @@ -5,7 +5,7 @@ - + @@ -26,6 +26,7 @@ + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml index a53375b7..444ca318 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml @@ -8,7 +8,7 @@ - + @@ -254,12 +254,6 @@ - - - - - - @@ -286,5 +280,9 @@ + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml index 0145cf83..2e186c57 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml @@ -8,7 +8,7 @@ - + @@ -54,18 +54,18 @@ - - - + + + - + - + - + @@ -257,12 +257,6 @@ - - - - - - @@ -289,5 +283,9 @@ + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml index 5f21b773..a9158d2e 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml @@ -9,7 +9,6 @@ - @@ -259,12 +258,6 @@ - - - - - - @@ -302,5 +295,9 @@ + + + + \ No newline at end of file diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png index e132197c..36c235af 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png index f14cbdf2..241197bf 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png index c6100d12..1c68ddb8 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png index aeeb0308..551228c3 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes index f5da6ff7..ff91bc80 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ