diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua index a858b692..7b28e366 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua @@ -363,7 +363,7 @@ function M:NumberRecordDetailRender() obj:GetChild('text_gameName').text = info.game_info.name obj:GetChild('text_time').text = os.date('%Y-%m-%d\n%H:%M', info.create_time) obj:GetChild('text_roomID').text = info.room_id - obj:GetChild('text_userDiamond').text = info.info + obj:GetChild('text_userDiamond').text = info.valid_diamo obj:GetChild('text_playName').emojies = EmojiDitc.EmojiesDitc obj:GetChild('text_playName').text = info.pname obj:GetChild('btn_lookRecord').onClick:Set(function() @@ -563,7 +563,8 @@ function M:RecursionGetNumberRecord(fgCtr, groupId, uid, index) if records and #records > 0 then for i = 1, #records do local info = records[i] - local tempTableChild = self.records[info.game_info.gameType][tonumber(info.is_read) + 1] + local tempTableChild = self.records[info.game_info.gameType] + [tonumber(info[string.format("is_read_%s", uid)]) + 1] info.totalScore = json.decode(info.totalScore) local totalScore for i = 1, #info.totalScore do diff --git a/lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua b/lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua index a930d8cb..4d994f1b 100644 --- a/lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua @@ -615,7 +615,7 @@ function M:RunNiao(list, start_seat) local card = list[i].card coroutine.wait(0.3) item:GetTransition("appear"):Play() - item.icon = UIPackage.GetItemURL("Main_Majiang", "201_" .. card) + item.icon = UIPackage.GetItemURL("Main_Majiang", "b201_" .. card) if list[i].score > 0 then item:GetController("bg").selectedIndex = 1 end end coroutine.start(function() diff --git a/lua_probject/extend_project/extend/majiang/100zhang/EXPlayBackView.lua b/lua_probject/extend_project/extend/majiang/100zhang/EXPlayBackView.lua index 8e2bf57a..a3c17f81 100644 --- a/lua_probject/extend_project/extend/majiang/100zhang/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/majiang/100zhang/EXPlayBackView.lua @@ -7,23 +7,22 @@ local Record_Event = import(".RecordEvent") local M = {} ---- Create a new +--- Create a new function M.new() - setmetatable(M,{__index = MJPlayBackView}) - local self = setmetatable({}, {__index = M}) + setmetatable(M, { __index = MJPlayBackView }) + local self = setmetatable({}, { __index = M }) self.class = "PlayBackView" self:init() return self end - function M:InitView(url) - local room = self._room - UIPackage.AddPackage("extend/majiang/100zhang/ui/Extend_MJ_100Zhang") - MJPlayBackView.InitView(self,"ui://Main_Majiang/Main_"..room.room_config.people_num) - local _cardbox = self._view:GetChild("cardbox") - --self._view:GetChild("panel_record"):GetChild("btn_LastStep").enabled = false + local room = self._room + UIPackage.AddPackage("extend/majiang/100zhang/ui/Extend_MJ_100Zhang") + MJPlayBackView.InitView(self, "ui://Main_Majiang/Main_" .. room.room_config.people_num) + local _cardbox = self._view:GetChild("cardbox") + --self._view:GetChild("panel_record"):GetChild("btn_LastStep").enabled = false self._ctr_cardbox = _cardbox:GetController("c1") self._tex_round = self._view:GetChild("tex_round") self._tex_LeftCard = self._view:GetChild("remaining_card") @@ -41,33 +40,33 @@ function M:InitView(url) end function M:FillRoomData(data) - MJPlayBackView.FillRoomData(self) - if self._win_pic then self._win_pic:Dispose() end - if self._niao then self._niao:Dispose() end - self._currentStep = 0 - local room = DataManager.CurrenRoom - local _player_card_info = self._player_card_info - local left_count = data.info.left_card - self:UpdateLeftCard(left_count) - local round = data.info.round - self:UpdateRound(round) - - local roominfo_panel = self._view:GetChild("roominfo_panel1") - roominfo_panel:GetChild("tex_roomid").text = room.room_id - roominfo_panel:GetChild("tex_gametype").text = room.room_config:GetGameName() + MJPlayBackView.FillRoomData(self) + if self._win_pic then self._win_pic:Dispose() end + if self._niao then self._niao:Dispose() end + self._currentStep = 0 + local room = DataManager.CurrenRoom + local _player_card_info = self._player_card_info + local left_count = data.info.left_card + self:UpdateLeftCard(left_count) + local round = data.info.round + self:UpdateRound(round) - for i = 1, #room.player_list do - local p = room.player_list[i] - local card_info = _player_card_info[self:GetPos(p.seat)] - card_info:Clear() - table.sort(p.card_list, ViewUtil.HandCardSort) - card_info:UpdateHandCard(false, true) - self._player_info[i]._view:GetController("piao_niao").selectedIndex = 0 - end + local roominfo_panel = self._view:GetChild("roominfo_panel1") + roominfo_panel:GetChild("tex_roomid").text = room.room_id + roominfo_panel:GetChild("tex_gametype").text = room.room_config:GetGameName() - self:GenerateAllStepData(data) - self:UpdateStep(1) - -- self:ShowStep(0) + for i = 1, #room.player_list do + local p = room.player_list[i] + local card_info = _player_card_info[self:GetPos(p.seat)] + card_info:Clear() + table.sort(p.card_list, ViewUtil.HandCardSort) + card_info:UpdateHandCard(false, true) + self._player_info[i]._view:GetController("piao_niao").selectedIndex = 0 + end + + self:GenerateAllStepData(data) + self:UpdateStep(1) + -- self:ShowStep(0) end function M:ShowStep(index) @@ -94,7 +93,7 @@ function M:ShowStep(index) head_info._view:GetChild("mask_piao").title = "飘分 " .. p.piao_niao head_info._view:GetController("piao_niao").selectedIndex = 1 else - head_info._view:GetController("piao_niao").selectedIndex = 0 + head_info._view:GetController("piao_niao").selectedIndex = 0 end if step.cmd == Record_Event.Evt_OutCard and i == step.last_out_seat then local card = p.outcard_list[#p.outcard_list] @@ -102,7 +101,7 @@ function M:ShowStep(index) else info:UpdateOutCardList() end - if step.cmd == Record_Event.Evt_GetCard and p.seat == step.current_out_seat then + if step.cmd == Record_Event.Evt_GetCard and p.seat == step.current_out_seat then info:UpdateHandCard(true, true) else info:UpdateHandCard(false, true) @@ -125,7 +124,7 @@ function M:ShowStep(index) list:RemoveChildrenToPool() for i = 1, #niao_list do local item = list:AddItemFromPool() - item.icon = UIPackage.GetItemURL("Main_Majiang", "201_"..niao_list[i].card) + item.icon = UIPackage.GetItemURL("Main_Majiang", "b201_" .. niao_list[i].card) if niao_list[i].score > 0 then item:GetController("bg").selectedIndex = 2 end @@ -192,7 +191,7 @@ function M:GenerateAllStepData(data) end end -function M:CmdGetCard(cmd, index) +function M:CmdGetCard(cmd, index) local data = self:CopyLastStep(index) data.cmd = cmd.cmd data.current_out_seat = cmd.seat @@ -273,7 +272,7 @@ function M:CopyLastStep(index) end function M:UpdateLeftCard(num) - self._tex_LeftCard.text = "剩余 "..num.." 张牌" + self._tex_LeftCard.text = "剩余 " .. num .. " 张牌" end function M:UpdateCardBox(seat) @@ -288,11 +287,11 @@ function M:UpdateCardBox(seat) end function M:UpdateRound(round) - self._tex_round.text = "第 "..round.."/"..self._room.room_config.round.." 局" + self._tex_round.text = "第 " .. round .. "/" .. self._room.room_config.round .. " 局" end function M:UpdateStep(step) self._record:GetChild("tex_step").text = "第 " .. step .. " / " .. #self._step .. "步" end -return M \ No newline at end of file +return M diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua index 5c790d0b..cf759caf 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua @@ -292,10 +292,13 @@ function M:fillResult1(room, peopleNum, total_result) local bigWin = { seat = -1, score = 0 } local bestPao = { seat = -1, times = 0 } --循环数据得出分数最大的大赢家，以及点炮次数最多的最佳炮手 - for i = 1, total_result.info_list do + for i = 1, #total_result.info_list do if total_result.info_list[i].total_score > bigWin.score then bigWin = { seat = total_result.info_list[i].seat, score = total_result.info_list[i].total_score } end + if total_result.info_list[i].settle_log.fangpao and total_result.info_list[i].settle_log.fangpao > bestPao.times then + bestPao = { seat = total_result.info_list[i].seat, times = total_result.info_list[i].settle_log.fangpao } + end end for i, v in pairs(DataManager.SelfUser.games) do if v.game_id == room.game_id then @@ -332,8 +335,17 @@ function M:fillResult1(room, peopleNum, total_result) totalInfoList.settle_log.ming_kong or 0) resultInfoComp:GetChild('Text_FangGang').text = string.format("放杠 %d次", totalInfoList.settle_log.fanggang or 0) - 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 + end + if totalInfoList.seat == bestPao.seat then + resultInfoComp:GetController("fangPao").selectedIndex = 1 + else + resultInfoComp:GetController("fangPao").selectedIndex = 0 + end end end diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index 5059b80d..7f934003 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -838,7 +838,7 @@ function M:RunNiao(list, start_seat) local card = list[i].card coroutine.wait(0.3) item:GetTransition("appear"):Play() - item.icon = UIPackage.GetItemURL("Main_Majiang", "201_" .. card) + item.icon = UIPackage.GetItemURL("Main_Majiang", "b201_" .. card) if list[i].score > 0 then item:GetController("bg").selectedIndex = 1 end end coroutine.start(function() @@ -1007,7 +1007,7 @@ function M:FillShowCards(obj, card, num) if obj.icon then obj.icon = 'ui://Main_Majiang/b201_' .. card else - obj:GetChild("icon").url = 'ui://Main_Majiang/201_' .. card + obj:GetChild("icon").url = 'ui://Main_Majiang/b201_' .. card end if obj.title then obj.title = string.format("%d张", num) diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXPlayBackView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXPlayBackView.lua index bb58653c..26797c87 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXPlayBackView.lua @@ -124,7 +124,7 @@ function M:ShowStep(index) list:RemoveChildrenToPool() for i = 1, #niao_list do local item = list:AddItemFromPool() - item.icon = UIPackage.GetItemURL("Main_Majiang", "201_" .. niao_list[i].card) + item.icon = UIPackage.GetItemURL("Main_Majiang", "b201_" .. niao_list[i].card) if niao_list[i].score > 0 then item:GetController("bg").selectedIndex = 2 end diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua index 185c85de..98eee8e4 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua @@ -421,7 +421,7 @@ end function M:ShowJing() if self._room.jing then self.jing.visible = true - MJPlayerCardInfoView.fillCard2(self, self.jing, "202_", self._room.jing) + MJPlayerCardInfoView.fillCard2(self, self.jing, "b202_", self._room.jing) else self.jing.visible = false end diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua index dee06a67..cdeb1e01 100644 --- a/lua_probject/main_project/main/majiang/MJMainView.lua +++ b/lua_probject/main_project/main/majiang/MJMainView.lua @@ -858,7 +858,7 @@ end function M:ShowJing() if self._room.jing then self.jing.visible = true - MJPlayerCardInfoView.fillCard2(self, self.jing, "202_", self._room.jing) + MJPlayerCardInfoView.fillCard2(self, self.jing, "b202_", self._room.jing) else self.jing.visible = false end diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua index 863cee25..4da97ba5 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua @@ -501,13 +501,6 @@ function M:ShowHand(cards) self:fillCard2(obj, cardType, card, 1) end end - - if flag_isme then - self._view_getCard:GetChildAt(0):GetController('showhang').selectedIndex = 1 - self._view_getCard:GetChildAt(0):GetController('special_jing').selectedIndex = self._view_getCard:GetChildAt(0) - :GetController('jing').selectedIndex - self._view_getCard:GetChildAt(0):GetController('jing').selectedIndex = 0 - end end function M:ShowHuCard(card, flag_isme) 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 13fc6eb8..ba6e8407 100644 --- a/wb_new_ui/assets/Family/ChatRoom/Component/item_player.xml +++ b/wb_new_ui/assets/Family/ChatRoom/Component/item_player.xml @@ -3,12 +3,13 @@ + - + diff --git a/wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailChild.xml b/wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailChild.xml index c5036ba4..e9a2de74 100644 --- a/wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailChild.xml +++ b/wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailChild.xml @@ -14,16 +14,16 @@