diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index 50462183..af60cd3b 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -212,12 +212,8 @@ end function M:ShowJing() if self._room.jing then - self.jing.icon = 'ui://Main_Majiang/' .. - get_majiang_prefix(DataManager.CurrenRoom.game_id) .. "201_" .. self._room.jing self.jing.visible = true - if self.jing:GetController('jing') then - self.jing:GetController('jing').selectedIndex = 1 - end + MJPlayerCardInfoView.fillCard2(self, self.jing, "201_", self._room.jing) else self.jing.visible = false end diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index c23f904e..a77b7e55 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -211,12 +211,8 @@ end function M:ShowJing() if self._room.jing then - self.jing.icon = 'ui://Main_Majiang/' .. - get_majiang_prefix(DataManager.CurrenRoom.game_id) .. "201_" .. self._room.jing self.jing.visible = true - if self.jing:GetController('jing') then - self.jing:GetController('jing').selectedIndex = 1 - end + MJPlayerCardInfoView.fillCard2(self, self.jing, "201_", self._room.jing) else self.jing.visible = false end diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index cb171d3b..a677568b 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -209,12 +209,8 @@ end function M:ShowJing() if self._room.jing then - self.jing.icon = 'ui://Main_Majiang/' .. - get_majiang_prefix(DataManager.CurrenRoom.game_id) .. "201_" .. self._room.jing self.jing.visible = true - if self.jing:GetController('jing') then - self.jing:GetController('jing').selectedIndex = 1 - end + MJPlayerCardInfoView.fillCard2(self, self.jing, "201_", self._room.jing) else self.jing.visible = false end diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index da51bdec..e0acf799 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -210,12 +210,8 @@ end function M:ShowJing() if self._room.jing then - self.jing.icon = 'ui://Main_Majiang/' .. - get_majiang_prefix(DataManager.CurrenRoom.game_id) .. "201_" .. self._room.jing self.jing.visible = true - if self.jing:GetController('jing') then - self.jing:GetController('jing').selectedIndex = 1 - end + MJPlayerCardInfoView.fillCard2(self, self.jing, "201_", self._room.jing) else self.jing.visible = false end diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView_jiangxi.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView_jiangxi.lua index 248cabf1..918193d6 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView_jiangxi.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView_jiangxi.lua @@ -130,6 +130,7 @@ function M:UpdateHandCard(getcard, mp) end end self._ctr_getCard.selectedIndex = getcard and 1 or 0 + print("lingmenghand", self._ctr_getCard.selectedIndex, self._view_getCard.numItems, self._view_getCard.visible) end -- 获取麻将图片资源位置,可以在扩展中复写 diff --git a/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView_jiangxi.lua b/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView_jiangxi.lua index e43fa372..db355d2a 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView_jiangxi.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView_jiangxi.lua @@ -180,7 +180,7 @@ function M:__OnClickGetCard(context) self._view_handCardList.selectedIndex = -1 local button = context.sender local _room = DataManager.CurrenRoom - if (Utils.IsDoubleClick(context) and _room.curren_outcard_seat == _room.self_player.seat) then + if ((Utils.IsDoubleClick(context) or self._ctr_seletedGet.selectedIndex == 0) and _room.curren_outcard_seat == _room.self_player.seat) then local card = button.data self._mainView:OutCard(card.card_item) self._view_handCardList.selectedIndex = -1 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 4206dc85..f5eb15f1 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