diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index 8281cf2c..e5516726 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -1762,3 +1762,13 @@ function M:FG_Get_Msg(groupId, callback) callback(res) end) end + +-- 获取亲友圈房卡记录 +function M:FG_Get_Diamond_Msg(groupId, callback) + local _data = {} + _data.id = groupId + local _client = ControllerManager.GroupClient + _client:send(Protocol.WEB_FG_Get_Diamond_Mssages, _data, function(res) + callback(res) + end) +end diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index 5bdf6856..a848357c 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -304,6 +304,9 @@ Protocol = { -- 获取消息记录 WEB_FG_Get_Mssages = "group/get_messages", + + -- 获取亲友圈房卡记录 + WEB_FG_Get_Diamond_Mssages = "group/get_diamo_messages", -------------- group-log--------------------- -- 获取奖励日志 WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log", diff --git a/lua_probject/base_project/Game/View/Common/MsgWindow.lua b/lua_probject/base_project/Game/View/Common/MsgWindow.lua index 7be7710c..afecde99 100644 --- a/lua_probject/base_project/Game/View/Common/MsgWindow.lua +++ b/lua_probject/base_project/Game/View/Common/MsgWindow.lua @@ -8,31 +8,31 @@ MsgWindow.MsgMode = { OnlyOk = 2 } MsgWindow.RES_LIST = { - "MessageBox", - "MessageBox1" + "MessageBox", + "MessageBox1" } local M = MsgWindow -function MsgWindow.new(blur_view,tip,mode,url,showCheck) - setmetatable(M, {__index = BaseWindow}) - local self = setmetatable({}, {__index = M}) +function MsgWindow.new(blur_view, tip, mode, url, showCheck) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) self.class = "MsgWindow" self._blur_view = blur_view self._close_destroy = true self._tip = tip self._mode = mode - self.onOk = event("onOk",true) - self.onCancel = event("onCancel",true) + self.onOk = event("onOk", true) + self.onCancel = event("onCancel", true) self.showCheck = showCheck - local self_url = url and url or "ui://Common/"..MsgWindow.RES_LIST[self._mode] + local self_url = url and url or "ui://Common/" .. MsgWindow.RES_LIST[self._mode] self:init(self_url) return self end function M:init(url) - BaseWindow.init(self,url) + BaseWindow.init(self, url) self._close_destroy = true self._close_zone = false local view = self._view @@ -44,16 +44,16 @@ function M:init(url) local tex_message = view:GetChild("tex_message") tex_message.emojies = EmojiDitc.EmojiesDitc if (self._tip) then tex_message.text = self._tip end - - local btn_close = view:GetChild('btn_close1') - if (btn_close~=nil) then - btn_close.onClick:Add( - function() - self:CloseEvent() - end - - ) - end + + -- local btn_close = view:GetChild('btn_close1') + -- if (btn_close~=nil) then + -- btn_close.onClick:Add( + -- function() + -- self:CloseEvent() + -- end + + -- ) + -- end self.btnCheck = view:GetChild("btnCheck") if self.btnCheck then self.btnCheck.visible = false @@ -66,7 +66,7 @@ end function M:Close() BaseWindow.Close(self) - if(self._mode == MsgWindow.MsgMode.OkAndCancel) then + if (self._mode == MsgWindow.MsgMode.OkAndCancel) then self.onCancel() end end diff --git a/lua_probject/base_project/Game/View/Family/FamilyMsgDiamond.lua b/lua_probject/base_project/Game/View/Family/FamilyMsgDiamond.lua new file mode 100644 index 00000000..c71a1fb0 --- /dev/null +++ b/lua_probject/base_project/Game/View/Family/FamilyMsgDiamond.lua @@ -0,0 +1,56 @@ +local FamilyMsgDiamond = {} + +local M = FamilyMsgDiamond + +--类型字段，1为进入游戏预扣，2为结束游戏返还 +local TypeTable = { "亲友圈开局游戏预扣", "因游戏结束返还您" } + +function M.New(data, callback) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) + self._full = true + self.class = "com_FamilyMsgRecord" + BaseWindow.init(self, 'ui://Family/com_FamilyMsgRecord') + self.data = data + self:Init() + self.closeCallback = callback + + return self +end + +function M:Init() + local list_msg = self._view:GetChild('list_msg') + list_msg.itemRenderer = function(index, obj) + self:msgRenderer(index, obj) + end + + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_Get_Diamond_Msg(self.data.groupId, function(res) + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取房卡记录失败") + else + self.msgData = res.Data.messages + list_msg.numItems = #self.msgData + end + end) +end + +function M:msgRenderer(index, obj) + local data = self.msgData + obj:GetChild('tex_time').text = os.date("%Y-%m-%d %H:%M:%S", math.floor(data[index + 1].m_time / 1000)) + obj:GetChild('tex_msg').text = string.format("%s%d房卡，剩余%d房卡", TypeTable[data[index + 1].diamo_type + 1], + data[index + 1].diamo_num, data[index + 1].diamo_cur) +end + +function M:Show(groupId) + getmetatable(M).__index.Show(self) +end + +function M:Close() + if self.closeCallback then + self.closeCallback() + end + getmetatable(M).__index.Close(self) +end + +return M diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index f525bfc4..6373d0d7 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -5,6 +5,7 @@ local LobbyShopView = import(".Lobby.LobbyShopView") local FamilAllRank = import(".Family.FamilAllRank") local FamilyNumberRecord = import(".Family.FamilyNumberRecord") local FamilyRecord = import(".Family.FamilyRecord") +local FamilyMsgDiamond = import(".Family.FamilyMsgDiamond") ---无窗口 local FamilyAllNumbers = import(".Family.FamilyAllNumbers") @@ -304,6 +305,11 @@ function M:MsgView() view:Show(self._group.id) end +function M:MsgDiamondView() + local view = FamilyMsgDiamond.New({ groupId = self._group.id }) + view:Show() +end + function M:SetIsOpenChatRoom() local mgr_ctr = ControllerManager.GetController(GroupMgrController) @@ -586,9 +592,9 @@ function M:UpdateFamilyRoom(fgCtr, id) list_room:SetVirtual() --local list_gamePlay = self._view:GetChild('list_gamePlay') --list_gamePlay:SetVirtual() - self._view:GetChild('n364').text = string.format("已开启%s桌游戏", self._group.room_num) local playList = self._group.playList local roomList = self._group.rooms + self._view:GetChild('n364').text = string.format("已开启%s桌游戏", #roomList) local roomCtr = ControllerManager.GetController(RoomController) --先对房间进行一波分类 local readyRoom = {} @@ -1040,6 +1046,10 @@ local MORE_LIST = { name = "消息记录", Fct = M.MsgView }, + { + name = "房卡记录", + Fct = M.MsgDiamondView + }, { name = "禁止同桌", Fct = M.BanDeskmate diff --git a/lua_probject/base_project/Game/View/Lobby/LobbyRecordView.lua b/lua_probject/base_project/Game/View/Lobby/LobbyRecordView.lua index ae5d8b1d..d44a05b9 100644 --- a/lua_probject/base_project/Game/View/Lobby/LobbyRecordView.lua +++ b/lua_probject/base_project/Game/View/Lobby/LobbyRecordView.lua @@ -8,9 +8,10 @@ setmetatable(M, { __index = BaseWindow }) function LobbyRecordView.new() local self = setmetatable({}, { __index = M }) self.class = 'LobbyRecordView' + self._full = true + self._full_offset = false self._close_destroy = true self:init('ui://Lobby/Record') - self._viewlist_numberRecordDetail = self._view:GetChild('list_numberRecordDetail') return self end @@ -20,90 +21,182 @@ function M:init(url) local view = self._view - self.records = { totalScore = 0, childNum = 0, winNum = 0 } + self.ctr_detail = self._view:GetController('detail') + self._view:GetChild('btn_close').onClick:Set(function() + if self.ctr_detail.selectedIndex == 0 then + self:Destroy() + else + self.ctr_detail.selectedIndex = self.ctr_detail.selectedIndex - 1 + end + end) + + self._view:GetChild('btn_lookOther').onClick:Set(function() + self._view:GetChild('input_recordId').text = "" + self._view:GetController('showLook').selectedIndex = 1 + end) + + self._view:GetChild('btn_send').onClick:Set(function() + ViewUtil.ShowOneChooose({ showText = "您查询的战报不存在" }) + end) + + local list_numberRecordDetail = self._view:GetChild('list_numberRecordDetail') + list_numberRecordDetail.itemRenderer = function(index, obj) + self:RecordRenderer(index, obj) + end + list_numberRecordDetail.scrollPane.onPullUpRelease:Set(function() + + end) + + self.list_playerName = self._view:GetChild('detail1_list_playerName') + self.list_playerName.itemRenderer = function(index, obj) + self:PlayerNameRenderer(index, obj) + end + + self.list_playerScore = self._view:GetChild('detail1_list_main') + self.list_playerScore.itemRenderer = function(index, obj) + self:PlayerScoreRenderer(index, obj) + end + + --获取个人战绩 local loddyCtr1 = ControllerManager.GetController(LoddyController) loddyCtr1:RequestRecordList(function(res) if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取战绩失败") + ViewUtil.ErrorTip(res.ReturnCode, "获取个人战绩失败") else - -- pt(loddyCtr1.recordList) - local records = res.Data.military_list - for i = 1, #records do - local info = records[i] - local tempTableChild = self.records - info.totalScore = json.decode(info.totalScore) - local totalScore = 0 - print("lingmengtotalScore", #info.totalScore, DataManager.SelfUser.account_id) - for i = 1, #info.totalScore do - pt(info.totalScore) - if info.totalScore[i].accId == DataManager.SelfUser.account_id then - totalScore = info.totalScore[i].score - end - end - if info.round ~= "1" or totalScore ~= 0 then - table.insert(tempTableChild, info) - print(tempTableChild.totalScore) - tempTableChild.totalScore = tempTableChild.totalScore + totalScore - tempTableChild.childNum = tempTableChild.childNum + 1 - tempTableChild.winNum = tempTableChild.winNum + (totalScore > 0 and 1 or 0) - end - end + self.records = res.Data.military_list + list_numberRecordDetail.numItems = #self.records end - self._viewlist_numberRecordDetail.numItems = self.records.childNum end) end -function M:NumberRecordDetailRender() - local list_numberRecordDetail = self._viewlist_numberRecordDetail - list_numberRecordDetail:SetVirtual() - list_numberRecordDetail.itemRenderer = function(index, obj) - local info = self.records - 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 = 0 - obj:GetChild('btn_lookRecord').onClick:Set(function() - print("lingmeng查看") - end) - obj:GetController('seleted').onChanged:Set(function(context) - pt(getmetatable(context.sender)) - if context.sender.selectedIndex == 1 then - if not self.military[info.military_id] then - self.military.size = self.military.size + 1 - self.military[info.military_id] = self.military.size - table.insert(self.military.list, info.military_id) - end - else - if self.military[info.military_id] then - self.military.size = self.military.size - 1 - table.remove(self.military.list, self.military[info.military_id]) - self.military[info.military_id] = nil - end - end - end) - if self._flag_allChoose and self._flag_allChoose > 0 then - obj:GetController('seleted').selectedIndex = 1 - self._flag_allChoose = self._flag_allChoose - 1 - end - if self._flag_allChooseReverse and self._flag_allChooseReverse > 0 then - obj:GetController('seleted').selectedIndex = 1 - obj:GetController('seleted').selectedIndex - self._flag_allChooseReverse = self._flag_allChooseReverse - 1 - end - local resultDetailList = obj:GetChild('list') - resultDetailList:SetVirtual() - resultDetailList.itemRenderer = function(index, obj) - local resultInfo = info.totalScore[index + 1] - ImageLoad.Load(resultInfo.portrait, obj:GetChild('btn_head')._iconObject) - obj:GetChild('text_name').text = resultInfo.nick - obj:GetChild('text_score').text = resultInfo.score - obj:GetController('colour').selectedIndex = resultInfo.score >= 0 and 1 or 0 - end - resultDetailList.numItems = #info.totalScore +--渲染初始进入的列表 +function M:RecordRenderer(index, obj) + --处理一下数据 + local data = self.records[index + 1] + if type(data.totalScore) == "string" then + data.totalScore = json.decode(data.totalScore) end + if not data.Info then + data.Info = { peopleNum = #data.totalScore } + for i, v in ipairs(data.totalScore) do + if v.accId == DataManager.SelfUser.account_id then + data.Info.win = v.score >= 0 + data.Info.score = v.score + break + end + end + end + + + --开始渲染 + obj:GetChild('text_gameName').text = data.game_info.name + obj:GetController('win').selectedIndex = data.Info.win and 1 or 0 + obj:GetChild('text_score').text = string.format("%s%d", data.Info.win and "+" or "", data.Info.score) + obj:GetChild('text_roomID').text = data.room_id + obj:GetChild('text_time1').text = os.date("%Y-%m-%d\n%H:%M:%S", tonumber(data.create_time)) + obj:GetChild('btn_lookRecord').onClick:Set(function(context) + self.ctr_detail.selectedIndex = 1 + self.detailData = data + self.list_playerScore.numItems = tonumber(data.round) + self.list_playerName.numItems = data.Info.peopleNum + end) + local list = obj:GetChild('list') + list.itemRenderer = function(index1, obj1) + self:RecordDetailRenderer(index1, obj1, data) + end + list.numItems = data.Info.peopleNum end -function M:ResetRecords() - self.records = { totalScore = 0, childNum = 0, winNum = 0 } +function M:RecordDetailRenderer(index, obj, data) + local score = data.totalScore[index + 1].score + obj:GetController('colour').selectedIndex = score >= 0 and 1 or 0 + obj:GetChild('text_score').text = string.format("%s%d", score > 0 and "+" or "", score) + obj:GetChild('text_name').text = data.totalScore[index + 1].nick +end + +function M:PlayerNameRenderer(index, obj) + local data = self.detailData + obj.text = data.totalScore[index + 1].nick +end + +function M:PlayerScoreRenderer(index, obj) + local data = self.detailData + if type(data[string.format("round_%d", index + 1)]) == "string" then + data[string.format("round_%d", index + 1)] = json.decode(data[string.format("round_%d", index + 1)]) + end + obj:GetChild('text_index').text = index + 1 + obj:GetChild('text_time').text = os.date("%m-%d\n%H:%M:%S", tonumber(data.create_time)) + local list_playerScore = obj:GetChild('list_playerScore') + list_playerScore.itemRenderer = function(index1, obj1) + obj1.text = string.format("%s%d", data[string.format("round_%d", index + 1)][index1 + 1].score > 0 and "+" or "", + data[string.format("round_%d", index + 1)][index1 + 1].score) + end + list_playerScore.numItems = data.Info.peopleNum + local allDate = data + local round = index + 1 + obj:GetChild('btn_lookBack').onClick:Set(function() + if DataManager.SelfUser.playback[allDate.military_id] ~= nil and DataManager.SelfUser.playback[allDate.military_id][round] ~= nil then + local room = ExtendManager.GetExtendConfig(allDate.game_info.game_id):NewRoom() + DataManager.CurrenRoom = room + room.lev = 1 + room.game_id = allDate.game_info.game_id + local extend = ExtendManager.GetExtendConfig(allDate.game_info.game_id) + extend:FillPlayBackData(DataManager.SelfUser.playback[allDate.military_id][round]) + if not room.self_player then + room.self_player = room:GetPlayerBySeat(1) + end + local main = self:GenaratePlayBack(ViewManager.View_PlayBack, allDate.game_info.game_id) + main._currentId = allDate.military_id + main._currentRound = round + main._totalRound = tonumber(allDate.round) + main:FillRoomData(DataManager.SelfUser.playback[allDate.military_id][round]) + else + ViewUtil.ShowModalWait(self._view) + local _data = {} + _data["military_id"] = allDate.military_id + _data["round"] = tostring(round) + local loddyCtr1 = ControllerManager.GetController(LoddyController) + loddyCtr1:RequestPlayBack(_data, function(code, data) + ViewUtil.CloseModalWait() + if code == 0 then + if DataManager.SelfUser.playback[allDate.military_id] ~= nil then + DataManager.SelfUser.playback[allDate.military_id][round] = data + else + local playback_data = {} + playback_data[round] = data + DataManager.SelfUser.playback[allDate.military_id] = playback_data + end + + local main = self:GenaratePlayBack(ViewManager.View_PlayBack, allDate.game_info.game_id) + main._currentId = allDate.military_id + main._currentRound = round + main._totalRound = tonumber(allDate.round) + main:FillRoomData(data) + main._room.lev = 1 + elseif code == 25 then + ViewUtil.ErrorTip(-1, "回放未找到！") + -- btn_play_back.grayed = true + end + end, allDate.game_info) + end + end) +end + +function M:GenaratePlayBack(id, game_id, ...) + local tem = nil + local dview_class = nil + if not dview_class then + local exconfig = ExtendManager.GetExtendConfig(game_id) + dview_class = exconfig:GetView(id) + end + if not dview_class then + return + end + local arg = { ... } + tem = dview_class.new(...) + tem.Id = id + tem:Show() + return tem end return M diff --git a/lua_probject/base_project/Game/View/Lobby/LobbyShopView.lua b/lua_probject/base_project/Game/View/Lobby/LobbyShopView.lua index 070558fd..cb9e7ca4 100644 --- a/lua_probject/base_project/Game/View/Lobby/LobbyShopView.lua +++ b/lua_probject/base_project/Game/View/Lobby/LobbyShopView.lua @@ -18,6 +18,10 @@ local SHOP_LIST = { num = 300, price = 50 }, + { + num = 30, + price = 10 + }, } function LobbyShopView.new(Fct_UpdateDiamo, groupID) @@ -36,13 +40,11 @@ function M:init(url) local view = self._view local shopList = view:GetChild("main") local fgCtr = ControllerManager.GetController(NewGroupController) - for i = 1, #SHOP_LIST do - local shopChild = UIPackage.CreateObjectFromURL('ui://Lobby/c_shop_child') - shopChild:GetChild('num').text = string.format("%s 张", SHOP_LIST[i].num) - local shopBuyBtn = shopChild:GetChild('btn_buy') - shopBuyBtn:GetChild('sprite').icon = string.format("ui://Lobby/shop_buy_%s", SHOP_LIST[i].price) - shopBuyBtn.onClick:Set(function() - local index = i; + + shopList.itemRenderer = function(index, obj) + obj.text = string.format("%d张", SHOP_LIST[index + 1].num) + obj:GetChild('btn_buy').text = string.format("%d元", SHOP_LIST[index + 1].price) + obj.onClick:Set(function() if false then --发送购买给后端 else @@ -55,7 +57,7 @@ function M:init(url) -- self.UpdateDiamo() --暂时用这个发送协议 local uid = DataManager.SelfUser.account_id - fgCtr:FG_SetFamilyDiamond(self.groupID, uid, SHOP_LIST[index].num, function(res) + fgCtr:FG_SetFamilyDiamond(self.groupID, uid, SHOP_LIST[index + 1].num, function(res) if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "重置房卡失败") else @@ -64,8 +66,9 @@ function M:init(url) end) end end) - shopList:AddChild(shopChild) end + + shopList.numItems = #SHOP_LIST end return M diff --git a/lua_probject/base_project/Game/View/ViewUtil.lua b/lua_probject/base_project/Game/View/ViewUtil.lua index 587fd221..1226f73b 100644 --- a/lua_probject/base_project/Game/View/ViewUtil.lua +++ b/lua_probject/base_project/Game/View/ViewUtil.lua @@ -306,16 +306,18 @@ function ViewUtil.stringEllipsis(szText, size, full) end -------------------------lingmeng--------------------------- -function ViewUtil.ShowOneChooose(showText, btnType, callback) +function ViewUtil.ShowOneChooose(data, callback) local pop_oneChoose = UIPackage.CreateObjectFromURL("ui://Common/pop_oneChoose") - pop_oneChoose:GetChild('text_show').text = showText + pop_oneChoose:GetChild('text_show').text = data.showText GRoot.inst:AddChild(pop_oneChoose) pop_oneChoose:Center() local btn_center = pop_oneChoose:GetChild('btn_center') - if type(btnType) == "number" then - btn_center.icon = string.format("ui://Common/btn_%d", btnType) - else - btn_center.icon = btnType + if data.btnType then + if type(data.btnType) == "number" then + btn_center.icon = string.format("ui://Common/btn_%d", data.btnType) + else + btn_center.icon = data.btnType + end end btn_center.onClick:Add(function() GRoot.inst:RemoveChild(pop_oneChoose) diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua index e64c3ac1..35239867 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua @@ -284,6 +284,18 @@ function M:fillResult1(room, peopleNum, total_result) local familyIDText = self._view:GetChild("Text_FamilyID") print("lingmeng fillResult1") pt(room) + --初始化大赢家和最佳炮手 + local bigWin = { seat = -1, score = 0 } + local bestPao = { seat = -1, times = 0 } + --循环数据得出分数最大的大赢家，以及点炮次数最多的最佳炮手 + 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 gameNameAndRoomIDText.text = string.format("%s 房号:%s", v.name, room.room_id) @@ -321,6 +333,16 @@ function M:fillResult1(room, peopleNum, total_result) 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/wb_new_ui/assets/Common/MessageBox.xml b/wb_new_ui/assets/Common/MessageBox.xml index 7e40ef9d..5430247a 100644 --- a/wb_new_ui/assets/Common/MessageBox.xml +++ b/wb_new_ui/assets/Common/MessageBox.xml @@ -1,7 +1,7 @@ - + diff --git a/wb_new_ui/assets/Common/MessageBox1.xml b/wb_new_ui/assets/Common/MessageBox1.xml index 1a2f41dc..e7814732 100644 --- a/wb_new_ui/assets/Common/MessageBox1.xml +++ b/wb_new_ui/assets/Common/MessageBox1.xml @@ -1,7 +1,7 @@ - + diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml index e746e5c7..55a87325 100644 --- a/wb_new_ui/assets/Common/package.xml +++ b/wb_new_ui/assets/Common/package.xml @@ -1184,7 +1184,7 @@ - + @@ -2082,7 +2082,7 @@ - + diff --git a/wb_new_ui/assets/Family/FamilyMsgRecord/Component/item_msg(1).xml b/wb_new_ui/assets/Family/FamilyMsgRecord/Component/item_msg(1).xml new file mode 100644 index 00000000..44237257 --- /dev/null +++ b/wb_new_ui/assets/Family/FamilyMsgRecord/Component/item_msg(1).xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Family/FamilyMsgRecord/Component/item_msg_diamond.xml b/wb_new_ui/assets/Family/FamilyMsgRecord/Component/item_msg_diamond.xml new file mode 100644 index 00000000..ead59557 --- /dev/null +++ b/wb_new_ui/assets/Family/FamilyMsgRecord/Component/item_msg_diamond.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Family/FamilyMsgRecord/Iamge/Group 650(1).png b/wb_new_ui/assets/Family/FamilyMsgRecord/Iamge/Group 650(1).png new file mode 100644 index 00000000..d0f8d45d Binary files /dev/null and b/wb_new_ui/assets/Family/FamilyMsgRecord/Iamge/Group 650(1).png differ diff --git a/wb_new_ui/assets/Family/FamilyMsgRecord/Iamge/Rectangle 290(1).png b/wb_new_ui/assets/Family/FamilyMsgRecord/Iamge/Rectangle 290(1).png new file mode 100644 index 00000000..6751a3ee Binary files /dev/null and b/wb_new_ui/assets/Family/FamilyMsgRecord/Iamge/Rectangle 290(1).png differ diff --git a/wb_new_ui/assets/Family/FamilyMsgRecord/Iamge/Rectangle 291(1).png b/wb_new_ui/assets/Family/FamilyMsgRecord/Iamge/Rectangle 291(1).png new file mode 100644 index 00000000..5a67c911 Binary files /dev/null and b/wb_new_ui/assets/Family/FamilyMsgRecord/Iamge/Rectangle 291(1).png differ diff --git a/wb_new_ui/assets/Family/FamilyMsgRecord/com_FamilyMsgDiamond.xml b/wb_new_ui/assets/Family/FamilyMsgRecord/com_FamilyMsgDiamond.xml new file mode 100644 index 00000000..967d5a02 --- /dev/null +++ b/wb_new_ui/assets/Family/FamilyMsgRecord/com_FamilyMsgDiamond.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Family/FamilyMsgRecord/com_FamilyMsgRecord.xml b/wb_new_ui/assets/Family/FamilyMsgRecord/com_FamilyMsgRecord.xml index 73a05d46..5c8023a3 100644 --- a/wb_new_ui/assets/Family/FamilyMsgRecord/com_FamilyMsgRecord.xml +++ b/wb_new_ui/assets/Family/FamilyMsgRecord/com_FamilyMsgRecord.xml @@ -7,7 +7,7 @@ - + @@ -19,9 +19,15 @@ - - - + + + + + + + + + diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml index e9d6b349..8bff6391 100644 --- a/wb_new_ui/assets/Family/package.xml +++ b/wb_new_ui/assets/Family/package.xml @@ -413,6 +413,12 @@ + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Lobby/NumberRecord/Component/btn_lookRecord.xml b/wb_new_ui/assets/Lobby/NumberRecord/Component/btn_lookRecord.xml index 14d94647..2db355b4 100644 --- a/wb_new_ui/assets/Lobby/NumberRecord/Component/btn_lookRecord.xml +++ b/wb_new_ui/assets/Lobby/NumberRecord/Component/btn_lookRecord.xml @@ -1,11 +1,10 @@ - + - - - - + + + -