diff --git a/lua_probject/base_project/Game/Controller/GameController.lua b/lua_probject/base_project/Game/Controller/GameController.lua index ab3b1a5b..696d0432 100644 --- a/lua_probject/base_project/Game/Controller/GameController.lua +++ b/lua_probject/base_project/Game/Controller/GameController.lua @@ -164,8 +164,9 @@ function M:ExitWitnessGame(pid, gid, rid) local _data = {} _data["pid"] = pid _data["room_id"] = rid + -- _data["session"] = _client:getSession() _client:send(Protocol.GAME_Exit_WITNESS_ROOM, _data) - -- _client:destroy() + _client:destroy() end --聊天 @@ -180,7 +181,7 @@ function M:SendInteraction(playid, type, parm, callback) local _data = {} _data['playerid'] = playid _data['type'] = type - _data['parm'] = tonumber(parm) + _data['parm'] = parm -- _data['gid'] = 1 _client:send(Protocol.GAME_INTERACTION, _data, function(res) if callback then diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index 43e3ebfa..8281cf2c 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -1002,18 +1002,34 @@ end ---@param platform function GetPlatform() ---@param militarys table 战绩id列表 ---@param is_read number 0是将选中战绩设置为未读，1是将选中战绩选择为已读 -function M:FG_SetGroupRecordReadStatus(group_id, platform, militarys, is_read, callback) +---@param tagId number 战绩所属的玩家 +function M:FG_SetGroupRecordReadStatus(group_id, platform, militarys, is_read, tagId, callback) local _client = ControllerManager.GroupClient local data = {} data.id = group_id data.platform = platform data.militarys = militarys data.is_read = is_read + data.tagId = tagId _client:send(Protocol.WEB_FG_SET_RECORD_READ, data, function(res) callback(res) end) end +---comment 发送分数限制协议，仅起源互娱（情怀）使用 +---@param group_id number 亲友圈id +---@param dayType number 分数限制类型，type为1是限制一天，type为2是限制两天 +---@param callback function +function M:FG_SetGroupRecordUpdateDayType(group_id, dayType, callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.dayType = dayType + _client:send(Protocol.WEB_FG_SET_DAY_SCORE, data, function(res) + callback(res) + end) +end + -- 获取战绩 function M:FG_GetGroupRecordSpe(group_id, platform, qid, includeMembers, limit, num, begin_time, end_time, time_type, callback) @@ -1600,14 +1616,13 @@ end ---@param mj_score number 麻将限制分 ---@param pk_score number 扑克限制分 ---@param callback function 回调函数 -function M:FG_SetJoinScore(group_id, playerId, mj_score, pk_score, day, callback) +function M:FG_SetJoinScore(group_id, playerId, mj_score, pk_score, callback) local _client = ControllerManager.GroupClient local _data = {} _data.id = group_id _data.playerId = playerId _data.mj_score = mj_score _data.pk_score = pk_score - _data.day = day _client:send(Protocol.WEB_FG_SET_JOIN_SCORE, _data, function(res) callback(res) end) diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index ee4a6749..5bdf6856 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -331,6 +331,8 @@ Protocol = { WEB_FG_GET_MEMBER_STAT = "group/log/get_member_stat", -- 修改战绩阅读状态 WEB_FG_SET_RECORD_READ = "group/log/read_records", + -- 修改分数限制天数（情怀，起源互娱） + WEB_FG_SET_DAY_SCORE = "group/update_day_score", -- 获取合伙人统计 WEB_FG_GET_PARTNER_STAT = "group/log/get_partner_stat", --获取钻石消耗统计 diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua index 04e78e24..1e007f32 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua @@ -32,8 +32,8 @@ function M:init(url, lev, res) self._view:GetChild('name').text = string.format("%s(%s)", info.nick, info.uid) self._view:GetChild('text_allRounds').text = info.total_round self._view:GetChild('text_joinTime').text = os.date('%Y-%m-%d %H:%M', info.join_time) - self._view:GetChild('text_score_majiang').text = MJScore - self._view:GetChild('text_score_poker').text = PKScore + self._view:GetChild('text_score_majiang').text = -MJScore + self._view:GetChild('text_score_poker').text = -PKScore ImageLoad.Load(icon_url, self._view:GetChild('btn_head'):GetChild('icon')) @@ -57,7 +57,7 @@ function M:init(url, lev, res) ViewUtil.ShowOneChooose("修改限制分失败" .. res.ReturnCode) else MJScore = tonumber(text) - self._view:GetChild('text_score_majiang').text = MJScore + self._view:GetChild('text_score_majiang').text = -MJScore end end) end) @@ -71,7 +71,7 @@ function M:init(url, lev, res) ViewUtil.ShowOneChooose("修改限制分失败" .. res.ReturnCode) else PKScore = tonumber(text) - self._view:GetChild('text_score_poker').text = PKScore + self._view:GetChild('text_score_poker').text = -PKScore end end) end) diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua index ca162309..a858b692 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua @@ -64,7 +64,6 @@ function FamilyNumberRecord.New(root, page) self.text_score_poker.text = 0 - self.PKScore self._viewText_titleRecord.emojies = EmojiDitc.EmojiesDitc self._viewText_titleRecord.text = string.format("%s 成员记录", self._text_groupTitle) - self._view:GetChild('text_residueDiamond').text = root._group.diamo self._view:GetChild('text_timeRecord').text = os.date('%Y-%m-%d %H:%M:%S', os.time()) self._view:GetController('lev').selectedIndex = group.lev == 1 and 0 or 1 @@ -100,8 +99,20 @@ function FamilyNumberRecord.New(root, page) self:OnClickSortType() end) + ctr_limitDay.selectedIndex = 0 ctr_limitDay.onChanged:Set(function() + if self.ctr_limitDay_isReverting then + self.ctr_limitDay_isReverting = false + return + end --写限制分数 + fgCtr:FG_SetGroupRecordUpdateDayType(group_id, ctr_limitDay.selectedIndex + 1, function(res) + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "分数限制分设置失败") + self.ctr_limitDay_isReverting = true + ctr_limitDay.selectedIndex = 1 - ctr_limitDay.selectedIndex + end + end) end) self.ctr_numberRecord.onChanged:Set(function() @@ -152,7 +163,7 @@ function FamilyNumberRecord.New(root, page) else day = 2 end - fgCtr:FG_SetJoinScore(group_id, 0, tonumber(text), self.MJScore, day, function(res) + fgCtr:FG_SetJoinScore(group_id, 0, tonumber(text), self.MJScore, function(res) if res.ReturnCode ~= 0 then ViewUtil.ShowOneChooose("修改限制分失败" .. res.ReturnCode) else @@ -172,7 +183,7 @@ function FamilyNumberRecord.New(root, page) else day = 2 end - fgCtr:FG_SetJoinScore(group_id, 0, self.MJScore, tonumber(text), day, function(res) + fgCtr:FG_SetJoinScore(group_id, 0, self.MJScore, tonumber(text), function(res) if res.ReturnCode ~= 0 then ViewUtil.ShowOneChooose("修改限制分失败" .. res.ReturnCode) else @@ -184,11 +195,19 @@ function FamilyNumberRecord.New(root, page) end) self._view:GetChild('btn_allChoose').onClick:Set(function() self._flag_allChoose = self.records[self.gameTypeNum][self.readStatusNum].childNum + for i = 1, self.records[self.gameTypeNum][self.readStatusNum].childNum do + local info = self.records[self.gameTypeNum][self.readStatusNum][i] + 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 + end self._viewlist_numberRecordDetail:RefreshVirtualList() end) self._view:GetChild('btn_allChooseRead').onClick:Set(function() local newReadType = 3 - self.readStatusNum - fgCtr:FG_SetGroupRecordReadStatus(group_id, GetPlatform(), self.military.list, newReadType - 1, + fgCtr:FG_SetGroupRecordReadStatus(group_id, GetPlatform(), self.military.list, newReadType - 1, self._tagId, function(res) pt(res) if res.ReturnCode ~= 0 then @@ -196,11 +215,22 @@ function FamilyNumberRecord.New(root, page) else self.ctr_numberRecord.selectedIndex = 1 self:OnClickNumberRank(group_id, self.rankNumber.uid, self.rankNumber.round) + self.military = { size = 0, list = {} } end end) end) self._view:GetChild('btn_allChooseReverse').onClick:Set(function() self._flag_allChooseReverse = self.records[self.gameTypeNum][self.readStatusNum].childNum + local military_bar = { size = 0, list = {} } + for i = 1, self.records[self.gameTypeNum][self.readStatusNum].childNum do + local info = self.records[self.gameTypeNum][self.readStatusNum][i] + if not self.military[info.military_id] then + military_bar.size = self.military.size + 1 + military_bar[info.military_id] = military_bar.size + table.insert(military_bar.list, info.military_id) + end + end + self.military = military_bar self._viewlist_numberRecordDetail:RefreshVirtualList() end) @@ -220,18 +250,25 @@ function FamilyNumberRecord.New(root, page) if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取总信息失败") else - -- MJScore = tonumber(res.Data.mj_score) - -- PKScore = tonumber(res.Data.pk_score) - -- text_score_majiang.text = 0 - MJScore - -- text_score_poker.text = 0 - PKScore + local res_data = res.Data + self._view:GetChild('text_residueDiamond').text = res_data.diamo + text_allRound.text = res_data.round + text_winNum.text = res_data.win_count + text_useDiamond.text = res_data.diamo_cost + self.MJScore = tonumber(res.Data.mj_score) + self.PKScore = tonumber(res.Data.pk_score) + self.text_score_majiang.text = 0 - self.MJScore + self.text_score_poker.text = 0 - self.PKScore + self.ctr_limitDay_isReverting = true + ctr_limitDay.selectedIndex = res_data.dayType - 1 end end) return self end function M:InitBoxType() - local items = { "扑克", "麻将" } - local values = { "0", "1" } + local items = { "麻将", "扑克" } + local values = { "1", "0" } local games = DataManager.SelfUser.games for i = 1, #games do @@ -239,7 +276,7 @@ function M:InitBoxType() table.insert(values, tostring(games[i].game_id)) end - self._data_seletedType = "0" + self._data_seletedType = "1" return items, values end @@ -283,7 +320,12 @@ function M:NumverRecordRenderer() self.ctr_numberRecord.selectedIndex = 2 self.gameTypeNum = index + 1 self.readStatusNum = 2 - self._viewlist_numberRecordDetail.numItems = info.childNum + self.military = { size = 0, list = {} } + if self._viewlist_numberRecordDetail.numItems == info.childNum then + self._viewlist_numberRecordDetail:RefreshVirtualList() + else + self._viewlist_numberRecordDetail.numItems = info.childNum + end end) end numberRankListRead.numItems = 2 @@ -302,7 +344,12 @@ function M:NumverRecordRenderer() self.ctr_numberRecord.selectedIndex = 2 self.gameTypeNum = index + 1 self.readStatusNum = 1 - self._viewlist_numberRecordDetail.numItems = info.childNum + self.military = { size = 0, list = {} } + if self._viewlist_numberRecordDetail.numItems == info.childNum then + self._viewlist_numberRecordDetail:RefreshVirtualList() + else + self._viewlist_numberRecordDetail.numItems = info.childNum + end end) end numberRankListUnRead.numItems = 2 @@ -316,7 +363,9 @@ 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 = 0 + obj:GetChild('text_userDiamond').text = info.info + obj:GetChild('text_playName').emojies = EmojiDitc.EmojiesDitc + obj:GetChild('text_playName').text = info.pname obj:GetChild('btn_lookRecord').onClick:Set(function() self._viewList_recordDetail:RemoveChildrenToPool() for i = 1, tonumber(info.round) do @@ -330,6 +379,8 @@ function M:NumberRecordDetailRender() end self.ctr_numberRecord.selectedIndex = 3 end) + obj:GetController('seleted').onChanged:Clear() + obj:GetController('seleted').selectedIndex = self.military[info.military_id] and 1 or 0 obj:GetController('seleted').onChanged:Set(function(context) pt(getmetatable(context.sender)) if context.sender.selectedIndex == 1 then @@ -346,14 +397,6 @@ function M:NumberRecordDetailRender() 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) @@ -488,8 +531,6 @@ function M:RecursionGetNumberRank(fgCtr, index, round, win, cost) self:RecursionGetNumberRank(fgCtr, index + 1, round, win, cost) else round = math.floor(round / 2) - self._view:GetChild('text_allRound').text = round - self._view:GetChild('text_winNum').text = win self.showRank = self.rank self._viewList_numverRecord.numItems = #self.showRank end @@ -541,6 +582,7 @@ function M:RecursionGetNumberRecord(fgCtr, groupId, uid, index) else self._viewList_numberRankRead:RefreshVirtualList() self._viewList_numberRankUnRead:RefreshVirtualList() + self._tagId = uid end end end) diff --git a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua index c80bedb0..82d7cc3e 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua @@ -170,7 +170,7 @@ function M:RecordItemRenderer(data, obj) obj:GetChild('text_gameName').text = data.game_info.name obj:GetChild('text_time').text = os.date("%Y-%m-%d\n%H:%M:%S", tonumber(data.create_time)) obj:GetChild('text_roomId').text = data.room_id - obj:GetChild('text_useDiamond').text = 0 + obj:GetChild('text_useDiamond').text = data.valid_diamo obj:GetChild('btn_detail').onClick:Set(function() self._viewList_recordDetail:RemoveChildrenToPool() for i = 1, tonumber(data.round) do @@ -184,7 +184,8 @@ function M:RecordItemRenderer(data, obj) end self._ctr_cWindow.selectedIndex = 1 end) - -- obj:GetChild('text_playName').text = .name + obj:GetChild('text_playName').emojies = EmojiDitc.EmojiesDitc + obj:GetChild('text_playName').text = data.pname local resultDetailList = obj:GetChild('list_familyPlayer') resultDetailList:SetVirtual() resultDetailList.itemRenderer = function(index, obj) diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua index 16c72519..f2e80671 100644 --- a/lua_probject/base_project/Game/View/LobbyView.lua +++ b/lua_probject/base_project/Game/View/LobbyView.lua @@ -497,7 +497,7 @@ function M:GetPlayerInfoData() self:ShowPlayerInfo(data.raffle, data.diamo, data.newMail) if data.group_id ~= 0 then -- 重连 - -- self:ReconnectRoom(data.groupId) + self:ReconnectRoom(data.groupId) end end end) @@ -553,6 +553,7 @@ function M:ReconnectRoom(groupId) return else FamilyView.lastId = groupId + DataManager.SelfUser.room_id = "" ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id) end end, diff --git a/lua_probject/base_project/Game/View/PlayerInfoView2.lua b/lua_probject/base_project/Game/View/PlayerInfoView2.lua index d6db898b..c0902b8e 100644 --- a/lua_probject/base_project/Game/View/PlayerInfoView2.lua +++ b/lua_probject/base_project/Game/View/PlayerInfoView2.lua @@ -236,6 +236,7 @@ end -- 表情 语音 function M:ShowInteraction(type, str) if type == 3 then + print("lingmeng ShowInteractionq",str) Voice.DownLoad( str, function(clip) diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua index e7066e1f..c457d5cd 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua @@ -5,7 +5,7 @@ local EXClearingView = {} local M = EXClearingView -function EXClearingView.new(blur_view) +function EXClearingView.new(blur_view, data) setmetatable(M, { __index = ResultView }) local self = setmetatable({}, { __index = M }) self._full = true @@ -16,6 +16,9 @@ function EXClearingView.new(blur_view) self._currenIndex = 0 self._blur_view = blur_view self._close_zone = false + if data then + self.flag_back = data.flag_back + end -- self:InitMaPai() return self @@ -49,9 +52,17 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne local playerNum = self._view:GetController("playerNum") local showBtnTypeCtr = self._view:GetController("showType") - if result then - result.cardList = json.decode(result.cardList) - --table.sort(result.cardList) + --回放不需要显示还剩下多少牌 + if self.flag_back then + result.cardList = {} + mainCtr.selectedIndex = 1 + nextRoundBtn2.touchable = false + else + if result then + if result.cardList then + result.cardList = json.decode(result.cardList) + end + end end self.list_lastCard = self._view:GetChild('list_lastCard') diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua index 74eb2856..d3d486ad 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua @@ -61,9 +61,10 @@ end ------------------------------------------------------------ -function M:SendOutCard(card, callback) +function M:SendOutCard(data, callback) local _data = {} - _data["card"] = card + _data["card"] = data.card + _data["isTip"] = data.isTip local _room = self._room local _client = ControllerManager.GameNetClinet _client:send(TX_Protocol.GAME_DIS_CARD, _data) @@ -71,14 +72,14 @@ function M:SendOutCard(card, callback) -- 进行预删牌处理 local p = _room.self_player _room.curren_outcard_seat = -1 - list_remove(p.card_list, card) + list_remove(p.card_list, data.card) table.sort(p.card_list, self.HandCardSortAndJing) p.hand_left_count = p.hand_left_count - 1 if not p.outcard_list then p.outcard_list = {} end - p.outcard_list[#p.outcard_list + 1] = card + p.outcard_list[#p.outcard_list + 1] = data.card __pre_delete_card = true callback() end diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index b6ea5cfe..f27fc9de 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -381,7 +381,6 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...) - self:PlayMJSound("end_music.mp3") self:UnmarkSelfTuoguan() self._left_time = 0 self:UpdateCardBox(0) @@ -390,6 +389,9 @@ function M:EventInit() local total_result = arg[2] local result = arg[1] local over = arg[3] + if over < 2 or _room.curren_round > 0 then + self:PlayMJSound("end_music.mp3") + end self._clearingView = EXClearingView.new() coroutine.start(function() coroutine.wait(0.5) @@ -467,7 +469,7 @@ function M:OutCard(card) printlog("当前出牌为===>>>" .. card) local _gamectr = ControllerManager.GetController(GameController) self._room.curren_outcard_seat = -1 - _gamectr:SendOutCard(card, function() + _gamectr:SendOutCard({ card = card, isTip = self._player_card_info[1]._ctr_tip.selectedIndex == 1 }, function() local info = self._player_card_info[1] self:RemoveCursor() info:UpdateHandCard() @@ -798,8 +800,10 @@ function M:ReloadRoom(bskip) if bskip == nil or bskip == false then if not room.playing then self._state.selectedIndex = 2 + self._ctr_action.selectedIndex = 1 else self._state.selectedIndex = 1 + self._ctr_action.selectedIndex = 0 self._room._reload_flag = true end end @@ -913,7 +917,7 @@ function M:FillShowCards(obj, card, num) end end if obj.icon then - obj.icon = 'ui://Main_Majiang/201_' .. card + obj.icon = 'ui://Main_Majiang/b201_' .. card else obj:GetChild("icon").url = 'ui://Main_Majiang/201_' .. card end diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXPlayBackView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXPlayBackView.lua index 8a8413a1..ed155983 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXPlayBackView.lua @@ -138,25 +138,25 @@ function M:ShowStep(index) end end if step.cmd == Record_Event.Evt_Result then - if not self.result then - self.result = EXClearingView.new(self._root_view, true) - self.result:InitData(0, self._room, step.result_data) - self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5 - self.result._view.width = GRoot.inst.width - self.result._view.height = GRoot.inst.height - self.result._view:GetChild("btn_confirm").visible = false - self._anchor:AddChild(self.result._view) - self.result._view.x = self._anchor.x * -1 - self.result._view.y = self._anchor.y * -1 - else - self.result._view.visible = true - end - -- self.result._view:Center() - else - if self.result then - self.result._view.visible = false - end - end + if not self.result then + self.result = EXClearingView.new(self._root_view, { flag_back = true }) + self.result:InitData(0, self._room, step.result_data) + self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5 + self.result._view.width = GRoot.inst.width + self.result._view.height = GRoot.inst.height + -- self.result._view:GetChild("btn_confirm").visible = false + self._anchor:AddChild(self.result._view) + self.result._view.x = self._anchor.x * -1 + self.result._view.y = self._anchor.y * -1 + else + self.result._view.visible = true + end + -- self.result._view:Center() + -- else + -- if self.result then + -- self.result._view.visible = false + -- end + end end function M:GenerateAllStepData(data) diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXRoomConfig.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXRoomConfig.lua index 9da41e9a..6d418c41 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXRoomConfig.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXRoomConfig.lua @@ -146,7 +146,7 @@ function M:GetGameSMSize() end function M:GetGameName() - return "个旧麻将" + return "抚州麻将" end return M diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua index f2539da3..04d19481 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua @@ -65,11 +65,14 @@ function M:InitView(url) self._view:GetChild('text_time').text = os.date("%H:%M", os.time()) self._view:GetChild('text_roomId').text = room.room_id self._view:GetChild('wanfa_text').text = gamePlay - self._ctr_state = self._view:GetController("state") + self._state = self._view:GetController("state") self._text_remined = self._view:GetChild('remaining_card') self._text_round = self._view:GetChild('text_round') self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj") + self._state.onChanged:Add(function() + self:UpdatePlayerInfoView() + end) self:UpdateRound() self:InitPlayerInfoView() @@ -89,8 +92,8 @@ function M:InitView(url) for i = 1, #p.fz_list do cardInfo:UpdateFzList(p.fz_list[i], -1) end - info:FillData(p) - info._view.visible = true + -- info:FillData(p) + -- info._view.visible = true end local btn_rule = self._view:GetChild('btn_rule') @@ -121,21 +124,23 @@ function M:InitView(url) local btn_witness = self._view:GetChild('btn_pangGuang') if btn_witness then btn_witness.onClick:Set(function() - if room._flag_updateWitness then - room._flag_updateWitness = false - if viewList_witness.numItems == #room.witness_player_list then - viewList_witness:RefreshVirtualList() - else - viewList_witness.numItems = #room.witness_player_list - end - end self._view:GetController('witness').selectedIndex = 1 end) end + --直接渲染观战人员 + if viewList_witness.numItems == #room.witness_player_list then + viewList_witness:RefreshVirtualList() + else + viewList_witness.numItems = #room.witness_player_list + end + + --展示精牌 + self.jing = self._view:GetChild('jing') + self:ShowJing() ------------------------------------------------------- - self._ctr_state.selectedIndex = 4 + self._state.selectedIndex = 4 self.com_logocType.selectedIndex = 0 end @@ -153,6 +158,22 @@ function M:EventInit() print("lingmeng witness PlayerEnter") end) + _gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, function(...) + self:PlayMJSound("user_enter.mp3") + local arg = { ... } + local witnessPlayerList = arg[1] + self._room.witness_player_list = witnessPlayerList + + local _room = DataManager.CurrenRoom + local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players') + print("linemng tcp", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems) + if viewList_witness.numItems == #_room.witness_player_list then + viewList_witness:RefreshVirtualList() + else + viewList_witness.numItems = #_room.witness_player_list + end + end) + _gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...) local arg = { ... } print("lingmeng witness SendLaiZi") @@ -176,7 +197,7 @@ function M:EventInit() self._clearingView = nil end self:UpdateRound() - self._ctr_state.selectedIndex = 4 + self._state.selectedIndex = 4 local list = _room.player_list for i = 1, #list do local p = list[i] @@ -286,7 +307,7 @@ function M:EventInit() -- if #niao == 0 then self._view:GetChild("n13").visible = false end self._clearingView:InitData(0, _room, result, nil, function(...) DataManager.CurrenRoom.self_player.card_list = {} - self._ctr_state.selectedIndex = 2 + self._state.selectedIndex = 2 self._clearingView = nil end) end @@ -334,6 +355,11 @@ function M:InitPlayerInfoView() end end +local majiang_asset_path = "base/main_majiang/sound/" +function M:PlayMJSound(path) + ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path) +end + function M:NewMJPlayerCardInfoView(view, index) return MJMainView.NewMJPlayerCardInfoView(self, view, index) --[[ @@ -381,11 +407,40 @@ function M:OnFangziAction(...) -- self:__CloseTip() end +local majiang_asset_path = "base/main_majiang/sound/" +function M:PlayMJSound(path) + ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path) +end + function M:UpdateRound() self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round, self._room.room_config.round) end +function M:ShowJing() + if self._room.jing then + self.jing.visible = true + MJPlayerCardInfoView.fillCard2(self, self.jing, "202_", self._room.jing) + else + self.jing.visible = false + end +end + +function M:UpdatePlayerInfoView() + self._player_info = {} + local _player_info = self._player_info + local list = self._room.player_list + + for i = 1, self._room.room_config.people_num do + local seat = self:GetPos(list[i].seat) + local tem = self._view:GetChild(string.format("player_info%d_%d", seat, + (self._state.selectedIndex == 4 and 1 or 0) + 1)) + _player_info[seat] = PlayerInfoView.new(tem, self) + _player_info[seat]:FillData(list[i]) + printlog("lingmeng _player_info", tem, seat, list[i].self_user.nick_name) + end +end + function M:OnUpdate() if (self._popEvent) then local func = self._gamectr:PopEvent() diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/ExtendConfig.lua b/lua_probject/extend_project/extend/majiang/fuzhou/ExtendConfig.lua index bdfb8424..0cb32845 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/ExtendConfig.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/ExtendConfig.lua @@ -113,7 +113,7 @@ function M:FillRoomData(s2croom) p.fz_list[#p.fz_list + 1] = fz end if not playing and room.curren_round > 0 then - self.GetGameController():PlayerReady() + -- self.GetGameController():PlayerReady() end end end @@ -191,6 +191,7 @@ function M:FillWitnessData(pd_data) room.banker_seat = bank_seat room.curren_turn_seat = active_seat room.curren_round = _tableInfo["round"] + room.witness_player_list = _tableInfo["playerSpectatorData"] local _info_list = _tableInfo["playerData"] for i = 1, #_info_list do local _jp = _info_list[i] diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua index a528af41..12ed3bb8 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua @@ -5,7 +5,7 @@ local EXClearingView = {} local M = EXClearingView -function EXClearingView.new(blur_view) +function EXClearingView.new(blur_view, data) setmetatable(M, { __index = ResultView }) local self = setmetatable({}, { __index = M }) self._full = true @@ -16,6 +16,9 @@ function EXClearingView.new(blur_view) self._currenIndex = 0 self._blur_view = blur_view self._close_zone = false + if data then + self.flag_back = data.flag_back + end -- self:InitMaPai() return self @@ -49,9 +52,17 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne local playerNum = self._view:GetController("playerNum") local showBtnTypeCtr = self._view:GetController("showType") - if result then - result.cardList = json.decode(result.cardList) - --table.sort(result.cardList) + --回放不需要显示还剩下多少牌 + if self.flag_back then + result.cardList = {} + mainCtr.selectedIndex = 1 + nextRoundBtn2.touchable = false + else + if result then + if result.cardList then + result.cardList = json.decode(result.cardList) + end + end end self.list_lastCard = self._view:GetChild('list_lastCard') diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua index dcbc3aa7..954260df 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua @@ -61,25 +61,26 @@ end ------------------------------------------------------------ -function M:SendOutCard(card, callback) +function M:SendOutCard(data, callback) local _data = {} - _data["card"] = card - _data["isTip"] = false + _data["card"] = data.card + _data["isTip"] = data.isTip local _room = self._room local _client = ControllerManager.GameNetClinet + _client:send(TX_Protocol.GAME_DIS_CARD, _data) -- 进行预删牌处理 local p = _room.self_player _room.curren_outcard_seat = -1 - list_remove(p.card_list, card) + list_remove(p.card_list, data.card) table.sort(p.card_list, self.HandCardSortAndJing) p.hand_left_count = p.hand_left_count - 1 if not p.outcard_list then p.outcard_list = {} end - p.outcard_list[#p.outcard_list + 1] = card + p.outcard_list[#p.outcard_list + 1] = data.card __pre_delete_card = true callback() end diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index 7f352ebb..e39ae0ce 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -92,10 +92,6 @@ function M:InitView(url) if room.playing or room.curren_round > 0 then self:ReloadRoom() end - - ---------为了下次复现出牌情况 - --self._viewText_testName = self._view:GetChild('text_testName') - --self._viewText_testName.text = 0 end function M:__BuGang(cardInfo, callback) @@ -477,7 +473,6 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...) - self:PlayMJSound("end_music.mp3") self:UnmarkSelfTuoguan() self._left_time = 0 self:UpdateCardBox(0) @@ -486,6 +481,9 @@ function M:EventInit() local total_result = arg[2] local result = arg[1] local over = arg[3] + if over < 2 or _room.curren_round > 0 then + self:PlayMJSound("end_music.mp3") + end self._clearingView = EXClearingView.new() coroutine.start(function() coroutine.wait(0.5) @@ -563,7 +561,7 @@ function M:OutCard(card) printlog("当前出牌为===>>>" .. card) local _gamectr = ControllerManager.GetController(GameController) self._room.curren_outcard_seat = -1 - _gamectr:SendOutCard(card, function() + _gamectr:SendOutCard({ card = card, isTip = self._player_card_info[1]._ctr_tip.selectedIndex == 1 }, function() local info = self._player_card_info[1] self:RemoveCursor() info:UpdateHandCard() @@ -894,8 +892,10 @@ function M:ReloadRoom(bskip) if bskip == nil or bskip == false then if not room.playing then self._state.selectedIndex = 2 + self._ctr_action.selectedIndex = 1 else self._state.selectedIndex = 1 + self._ctr_action.selectedIndex = 0 self._room._reload_flag = true end end @@ -1009,7 +1009,7 @@ function M:FillShowCards(obj, card, num) end end if obj.icon then - obj.icon = 'ui://Main_Majiang/201_' .. card + obj.icon = 'ui://Main_Majiang/b201_' .. card else obj:GetChild("icon").url = 'ui://Main_Majiang/201_' .. card end diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXPlayBackView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXPlayBackView.lua index dc787c4a..21081566 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXPlayBackView.lua @@ -139,24 +139,24 @@ function M:ShowStep(index) end if step.cmd == Record_Event.Evt_Result then if not self.result then - self.result = EXClearingView.new(self._root_view, true) - self.result:InitData(0, self._room, step.result_data) - self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5 - self.result._view.width = GRoot.inst.width - self.result._view.height = GRoot.inst.height - self.result._view:GetChild("btn_confirm").visible = false - self._anchor:AddChild(self.result._view) - self.result._view.x = self._anchor.x * -1 - self.result._view.y = self._anchor.y * -1 - else - self.result._view.visible = true - end - -- self.result._view:Center() - else - if self.result then - self.result._view.visible = false - end - end + self.result = EXClearingView.new(self._root_view, { flag_back = true }) + self.result:InitData(0, self._room, step.result_data) + self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5 + self.result._view.width = GRoot.inst.width + self.result._view.height = GRoot.inst.height + -- self.result._view:GetChild("btn_confirm").visible = false + self._anchor:AddChild(self.result._view) + self.result._view.x = self._anchor.x * -1 + self.result._view.y = self._anchor.y * -1 + else + self.result._view.visible = true + end + -- self.result._view:Center() + -- else + -- if self.result then + -- self.result._view.visible = false + -- end + end end function M:GenerateAllStepData(data) diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXRoomConfig.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXRoomConfig.lua index 818b310b..73002aa2 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXRoomConfig.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXRoomConfig.lua @@ -146,7 +146,7 @@ function M:GetGameSMSize() end function M:GetGameName() - return "个旧麻将" + return "金溪麻将" end return M diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua index 3c5bedb0..5fe8f139 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua @@ -64,21 +64,24 @@ function M:InitView(url) self._view:GetChild('text_time').text = os.date("%H:%M", os.time()) self._view:GetChild('text_roomId').text = room.room_id self._view:GetChild('wanfa_text').text = gamePlay - self._ctr_state = self._view:GetController("state") + self._state = self._view:GetController("state") self._text_remined = self._view:GetChild('remaining_card') self._text_round = self._view:GetChild('text_round') self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj") + self._state.onChanged:Add(function() + self:UpdatePlayerInfoView() + end) self:UpdateRound() - self:InitPlayerInfoView() + -- self:InitPlayerInfoView() self._player_card_info = {} local _player_card_info = self._player_card_info for i = 1, #room.player_list do local p = room.player_list[i] local index = self:GetPos(p.seat) print("lingmeng index", index) - local info = self._player_info[index] + -- local info = self._player_info[index] local tem = self._view:GetChild("player_card_info" .. index) _player_card_info[index] = self:NewMJPlayerCardInfoView(tem, index) local cardInfo = _player_card_info[index] @@ -88,8 +91,8 @@ function M:InitView(url) for i = 1, #p.fz_list do cardInfo:UpdateFzList(p.fz_list[i], -1) end - info:FillData(p) - info._view.visible = true + -- info:FillData(p) + -- info._view.visible = true end local btn_rule = self._view:GetChild('btn_rule') @@ -136,7 +139,7 @@ function M:InitView(url) self:ShowJing() ------------------------------------------------------- - self._ctr_state.selectedIndex = 4 + self._state.selectedIndex = 4 self.com_logocType.selectedIndex = 3 end @@ -193,7 +196,7 @@ function M:EventInit() self._clearingView = nil end self:UpdateRound() - self._ctr_state.selectedIndex = 4 + self._state.selectedIndex = 4 local list = _room.player_list for i = 1, #list do local p = list[i] @@ -303,7 +306,7 @@ function M:EventInit() -- if #niao == 0 then self._view:GetChild("n13").visible = false end self._clearingView:InitData(0, _room, result, nil, function(...) DataManager.CurrenRoom.self_player.card_list = {} - self._ctr_state.selectedIndex = 2 + self._state.selectedIndex = 2 self._clearingView = nil end) end @@ -403,6 +406,11 @@ function M:OnFangziAction(...) -- self:__CloseTip() end +local majiang_asset_path = "base/main_majiang/sound/" +function M:PlayMJSound(path) + ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path) +end + function M:UpdateRound() self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round, self._room.room_config.round) @@ -417,6 +425,21 @@ function M:ShowJing() end end +function M:UpdatePlayerInfoView() + self._player_info = {} + local _player_info = self._player_info + local list = self._room.player_list + + for i = 1, self._room.room_config.people_num do + local seat = self:GetPos(list[i].seat) + local tem = self._view:GetChild(string.format("player_info%d_%d", seat, + (self._state.selectedIndex == 4 and 1 or 0) + 1)) + _player_info[seat] = PlayerInfoView.new(tem, self) + _player_info[seat]:FillData(list[i]) + printlog("lingmeng _player_info", tem, seat, list[i].self_user.nick_name) + end +end + function M:OnUpdate() if (self._popEvent) then local func = self._gamectr:PopEvent() diff --git a/lua_probject/extend_project/extend/majiang/jinxi/ExtendConfig.lua b/lua_probject/extend_project/extend/majiang/jinxi/ExtendConfig.lua index 13557409..025c2aa9 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/ExtendConfig.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/ExtendConfig.lua @@ -81,9 +81,6 @@ function M:FillRoomData(s2croom) if (reload) then local _reloadInfo = s2croom["reloadInfo"] - local _hand_card = _reloadInfo["hand_card"] - room.self_player.card_list = _hand_card - table.sort(_hand_card, self.HandCardSortAndJing) local active_seat = _reloadInfo["active_seat"] local bank_seat = _reloadInfo["banker_seat"] @@ -100,6 +97,10 @@ function M:FillRoomData(s2croom) if jing then room.jing = jing end + --将排序放在精牌后面 + local _hand_card = _reloadInfo["hand_card"] + room.self_player.card_list = _hand_card + table.sort(_hand_card, self.HandCardSortAndJing) for i = 1, #_info_list do local tem = _info_list[i] local playerid = tem["playerid"] @@ -119,7 +120,7 @@ function M:FillRoomData(s2croom) p.fz_list[#p.fz_list + 1] = fz end if not playing and room.curren_round > 0 then - self.GetGameController():PlayerReady() + -- self.GetGameController():PlayerReady() end end end diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua index f701e838..5c790d0b 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua @@ -288,6 +288,15 @@ 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 + 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) diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua index 74b22614..85543df9 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua @@ -49,6 +49,7 @@ function M:SendNextCard(card) local _data = {} _data["card"] = tonumber(card) local _client = ControllerManager.GameNetClinet + _client:send(TX_Protocol.GAME_NEXT_CARD, _data) end @@ -67,6 +68,7 @@ function M:SendOutCard(data, callback) _data["isTip"] = data.isTip local _room = self._room local _client = ControllerManager.GameNetClinet + _client:send(TX_Protocol.GAME_DIS_CARD, _data) -- 进行预删牌处理 diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index 209f0462..5059b80d 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -92,10 +92,6 @@ function M:InitView(url) if room.playing or room.curren_round > 0 then self:ReloadRoom() end - - ---------为了下次复现出牌情况 - --self._viewText_testName = self._view:GetChild('text_testName') - --self._viewText_testName.text = 0 end function M:__BuGang(cardInfo, callback) @@ -221,7 +217,6 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...) -- self:ShowHuTip() - --测试用记录出牌权次数 --self._viewText_testName.text = 0 self:UpdateRound() self._state.selectedIndex = 1 @@ -483,9 +478,9 @@ function M:EventInit() local total_result = arg[2] local result = arg[1] local over = arg[3] - if over < 2 or _room.curren_round > 0 then - self:PlayMJSound("end_music.mp3") - end + -- if over < 2 or _room.curren_round > 0 then + -- self:PlayMJSound("end_music.mp3") + -- end self._clearingView = EXClearingView.new() coroutine.start(function() coroutine.wait(0.5) @@ -893,8 +888,10 @@ function M:ReloadRoom(bskip) if bskip == nil or bskip == false then if not room.playing then self._state.selectedIndex = 2 + self._ctr_action.selectedIndex = 1 else self._state.selectedIndex = 1 + self._ctr_action.selectedIndex = 0 self._room._reload_flag = true end end @@ -1008,7 +1005,7 @@ function M:FillShowCards(obj, card, num) end end if obj.icon then - obj.icon = 'ui://Main_Majiang/201_' .. card + obj.icon = 'ui://Main_Majiang/b201_' .. card else obj:GetChild("icon").url = 'ui://Main_Majiang/201_' .. card end diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua index b1288a75..185c85de 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua @@ -65,21 +65,24 @@ function M:InitView(url) self._view:GetChild('text_time').text = os.date("%H:%M", os.time()) self._view:GetChild('text_roomId').text = room.room_id self._view:GetChild('wanfa_text').text = gamePlay - self._ctr_state = self._view:GetController("state") + self._state = self._view:GetController("state") self._text_remined = self._view:GetChild('remaining_card') self._text_round = self._view:GetChild('text_round') self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj") + self._state.onChanged:Add(function() + self:UpdatePlayerInfoView() + end) self:UpdateRound() - self:InitPlayerInfoView() + -- self:InitPlayerInfoView() self._player_card_info = {} local _player_card_info = self._player_card_info for i = 1, #room.player_list do local p = room.player_list[i] local index = self:GetPos(p.seat) print("lingmeng index", index) - local info = self._player_info[index] + -- local info = self._player_info[index] local tem = self._view:GetChild("player_card_info" .. index) _player_card_info[index] = self:NewMJPlayerCardInfoView(tem, index) local cardInfo = _player_card_info[index] @@ -89,8 +92,8 @@ function M:InitView(url) for i = 1, #p.fz_list do cardInfo:UpdateFzList(p.fz_list[i], -1) end - info:FillData(p) - info._view.visible = true + -- info:FillData(p) + -- info._view.visible = true end local btn_rule = self._view:GetChild('btn_rule') @@ -121,21 +124,23 @@ function M:InitView(url) local btn_witness = self._view:GetChild('btn_pangGuang') if btn_witness then btn_witness.onClick:Set(function() - if room._flag_updateWitness then - room._flag_updateWitness = false - if viewList_witness.numItems == #room.witness_player_list then - viewList_witness:RefreshVirtualList() - else - viewList_witness.numItems = #room.witness_player_list - end - end self._view:GetController('witness').selectedIndex = 1 end) end + --直接渲染观战人员 + if viewList_witness.numItems == #room.witness_player_list then + viewList_witness:RefreshVirtualList() + else + viewList_witness.numItems = #room.witness_player_list + end + + --展示精牌 + self.jing = self._view:GetChild('jing') + self:ShowJing() ------------------------------------------------------- - self._ctr_state.selectedIndex = 4 + self._state.selectedIndex = 4 self.com_logocType.selectedIndex = 2 end @@ -153,6 +158,22 @@ function M:EventInit() print("lingmeng witness PlayerEnter") end) + _gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, function(...) + self:PlayMJSound("user_enter.mp3") + local arg = { ... } + local witnessPlayerList = arg[1] + self._room.witness_player_list = witnessPlayerList + + local _room = DataManager.CurrenRoom + local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players') + print("linemng tcp", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems) + if viewList_witness.numItems == #_room.witness_player_list then + viewList_witness:RefreshVirtualList() + else + viewList_witness.numItems = #_room.witness_player_list + end + end) + _gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...) local arg = { ... } print("lingmeng witness SendLaiZi") @@ -176,7 +197,7 @@ function M:EventInit() self._clearingView = nil end self:UpdateRound() - self._ctr_state.selectedIndex = 4 + self._state.selectedIndex = 4 local list = _room.player_list for i = 1, #list do local p = list[i] @@ -286,7 +307,7 @@ function M:EventInit() -- if #niao == 0 then self._view:GetChild("n13").visible = false end self._clearingView:InitData(0, _room, result, nil, function(...) DataManager.CurrenRoom.self_player.card_list = {} - self._ctr_state.selectedIndex = 2 + self._state.selectedIndex = 2 self._clearingView = nil end) end @@ -329,12 +350,17 @@ function M:InitPlayerInfoView() self._player_info = {} local _player_info = self._player_info for i = 1, self._room.room_config.people_num do - local tem = self._view:GetChild(string.format("player_info%d_2", i)) + local tem = self._view:GetChild(string.format("player_info%d_%d", i, (self._state.selectedIndex % 2) + 1)) _player_info[i] = PlayerInfoView.new(tem, self) tem.visible = false end end +local majiang_asset_path = "base/main_majiang/sound/" +function M:PlayMJSound(path) + ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path) +end + function M:NewMJPlayerCardInfoView(view, index) return MJMainView.NewMJPlayerCardInfoView(self, view, index) --[[ @@ -392,6 +418,30 @@ function M:UpdateRound() self._room.room_config.round) end +function M:ShowJing() + if self._room.jing then + self.jing.visible = true + MJPlayerCardInfoView.fillCard2(self, self.jing, "202_", self._room.jing) + else + self.jing.visible = false + end +end + +function M:UpdatePlayerInfoView() + self._player_info = {} + local _player_info = self._player_info + local list = self._room.player_list + + for i = 1, self._room.room_config.people_num do + local seat = self:GetPos(list[i].seat) + local tem = self._view:GetChild(string.format("player_info%d_%d", seat, + (self._state.selectedIndex == 4 and 1 or 0) + 1)) + _player_info[seat] = PlayerInfoView.new(tem, self) + _player_info[seat]:FillData(list[i]) + printlog("lingmeng _player_info", tem, seat, list[i].self_user.nick_name) + end +end + function M:OnUpdate() if (self._popEvent) then local func = self._gamectr:PopEvent() diff --git a/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua b/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua index 36e27fba..d6e4b640 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua @@ -81,9 +81,7 @@ function M:FillRoomData(s2croom) if (reload) then local _reloadInfo = s2croom["reloadInfo"] - local _hand_card = _reloadInfo["hand_card"] - room.self_player.card_list = _hand_card - table.sort(_hand_card, self.HandCardSortAndJing) + local active_seat = _reloadInfo["active_seat"] local bank_seat = _reloadInfo["banker_seat"] @@ -100,6 +98,10 @@ function M:FillRoomData(s2croom) if jing then room.jing = jing end + --将排序放在精牌后面 + local _hand_card = _reloadInfo["hand_card"] + room.self_player.card_list = _hand_card + table.sort(_hand_card, self.HandCardSortAndJing) for i = 1, #_info_list do local tem = _info_list[i] local playerid = tem["playerid"] @@ -119,7 +121,7 @@ function M:FillRoomData(s2croom) p.fz_list[#p.fz_list + 1] = fz end if not playing and room.curren_round > 0 then - self.GetGameController():PlayerReady() + -- self.GetGameController():PlayerReady() end end end @@ -141,6 +143,10 @@ function M:FillPlayBackData(pd_data) room.curren_round = _tableInfo["round"] local _info_list = _tableInfo["playerData"] + local jing = _tableInfo["jing"] + if jing then + room.jing = jing + end for i = 1, #_info_list do local _jp = _info_list[i] local p = room:NewPlayer() @@ -197,6 +203,7 @@ function M:FillWitnessData(pd_data) room.banker_seat = bank_seat room.curren_turn_seat = active_seat room.curren_round = _tableInfo["round"] + room.witness_player_list = _tableInfo["playerSpectatorData"] local jing = _tableInfo["jing"] if jing then room.jing = jing diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua index c1a366d0..e64c3ac1 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua @@ -5,7 +5,7 @@ local EXClearingView = {} local M = EXClearingView -function EXClearingView.new(blur_view) +function EXClearingView.new(blur_view, data) setmetatable(M, { __index = ResultView }) local self = setmetatable({}, { __index = M }) self._full = true @@ -16,6 +16,9 @@ function EXClearingView.new(blur_view) self._currenIndex = 0 self._blur_view = blur_view self._close_zone = false + if data then + self.flag_back = data.flag_back + end -- self:InitMaPai() return self @@ -49,9 +52,17 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne local playerNum = self._view:GetController("playerNum") local showBtnTypeCtr = self._view:GetController("showType") - if result then - result.cardList = json.decode(result.cardList) - --table.sort(result.cardList) + --回放不需要显示还剩下多少牌 + if self.flag_back then + result.cardList = {} + mainCtr.selectedIndex = 1 + nextRoundBtn2.touchable = false + else + if result then + if result.cardList then + result.cardList = json.decode(result.cardList) + end + end end self.list_lastCard = self._view:GetChild('list_lastCard') diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua index 5d8688d7..dc223f4a 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua @@ -61,24 +61,26 @@ end ------------------------------------------------------------ -function M:SendOutCard(card, callback) +function M:SendOutCard(data, callback) local _data = {} - _data["card"] = card + _data["card"] = data.card + _data["isTip"] = data.isTip local _room = self._room local _client = ControllerManager.GameNetClinet + _client:send(TX_Protocol.GAME_DIS_CARD, _data) -- 进行预删牌处理 local p = _room.self_player _room.curren_outcard_seat = -1 - list_remove(p.card_list, card) + list_remove(p.card_list, data.card) table.sort(p.card_list, self.HandCardSortAndJing) p.hand_left_count = p.hand_left_count - 1 if not p.outcard_list then p.outcard_list = {} end - p.outcard_list[#p.outcard_list + 1] = card + p.outcard_list[#p.outcard_list + 1] = data.card __pre_delete_card = true callback() end diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index 1926a7bd..6dac11c6 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -256,7 +256,6 @@ function M:EventInit() local _gcm_outcard_url = "ui://Main_Majiang/Gcm_OutCard" _gamectr:AddEventListener(TX_GameEvent.OutCard, function(...) self:__CloseTip() - self._left_time = 0 local arg = { ... } local p = arg[1] local card = arg[2] @@ -478,7 +477,6 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...) - self:PlayMJSound("end_music.mp3") self:UnmarkSelfTuoguan() self._left_time = 0 self:UpdateCardBox(0) @@ -487,6 +485,9 @@ function M:EventInit() local total_result = arg[2] local result = arg[1] local over = arg[3] + if over < 2 or _room.curren_round > 0 then + self:PlayMJSound("end_music.mp3") + end self._clearingView = EXClearingView.new() coroutine.start(function() coroutine.wait(0.5) @@ -564,7 +565,7 @@ function M:OutCard(card) printlog("当前出牌为===>>>" .. card) local _gamectr = ControllerManager.GetController(GameController) self._room.curren_outcard_seat = -1 - _gamectr:SendOutCard(card, function() + _gamectr:SendOutCard({ card = card, isTip = self._player_card_info[1]._ctr_tip.selectedIndex == 1 }, function() local info = self._player_card_info[1] self:RemoveCursor() info:UpdateHandCard() @@ -819,7 +820,7 @@ function M:OnFangziAction(...) local seat = (self._room.room_config.people_num == 2 and fz.from_seat == 2) and 2 or fz.from_seat - 1 info:UpdateFzList(fz, index, true, seat) local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi - print(getcard) + printlog(getcard) info:UpdateHandCard(getcard) self:__CloseTip() end @@ -896,8 +897,10 @@ function M:ReloadRoom(bskip) if bskip == nil or bskip == false then if not room.playing then self._state.selectedIndex = 2 + self._ctr_action.selectedIndex = 1 else self._state.selectedIndex = 1 + self._ctr_action.selectedIndex = 0 self._room._reload_flag = true end end @@ -1011,7 +1014,7 @@ function M:FillShowCards(obj, card, num) end end if obj.icon then - obj.icon = 'ui://Main_Majiang/201_' .. card + obj.icon = 'ui://Main_Majiang/b201_' .. card else obj:GetChild("icon").url = 'ui://Main_Majiang/201_' .. card end diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXPlayBackView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXPlayBackView.lua index 1e13f663..74dda0b8 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXPlayBackView.lua @@ -136,27 +136,27 @@ function M:ShowStep(index) if self._niao then self._niao:Dispose() end - end - if step.cmd == Record_Event.Evt_Result then - if not self.result then - self.result = EXClearingView.new(self._root_view, true) - self.result:InitData(0, self._room, step.result_data) - self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5 - self.result._view.width = GRoot.inst.width - self.result._view.height = GRoot.inst.height - self.result._view:GetChild("btn_confirm").visible = false - self._anchor:AddChild(self.result._view) - self.result._view.x = self._anchor.x * -1 - self.result._view.y = self._anchor.y * -1 - else - self.result._view.visible = true - end - -- self.result._view:Center() - else - if self.result then - self.result._view.visible = false - end - end + end + if step.cmd == Record_Event.Evt_Result then + if not self.result then + self.result = EXClearingView.new(self._root_view, { flag_back = true }) + self.result:InitData(0, self._room, step.result_data) + self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5 + self.result._view.width = GRoot.inst.width + self.result._view.height = GRoot.inst.height + -- self.result._view:GetChild("btn_confirm").visible = false + self._anchor:AddChild(self.result._view) + self.result._view.x = self._anchor.x * -1 + self.result._view.y = self._anchor.y * -1 + else + self.result._view.visible = true + end + -- self.result._view:Center() + -- else + -- if self.result then + -- self.result._view.visible = false + -- end + end end function M:GenerateAllStepData(data) diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua index fbcef278..313bc0c0 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua @@ -64,14 +64,17 @@ function M:InitView(url) self._view:GetChild('text_time').text = os.date("%H:%M", os.time()) self._view:GetChild('text_roomId').text = room.room_id self._view:GetChild('wanfa_text').text = gamePlay - self._ctr_state = self._view:GetController("state") + self._state = self._view:GetController("state") self._text_remined = self._view:GetChild('remaining_card') self._text_round = self._view:GetChild('text_round') self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj") + self._state.onChanged:Add(function() + self:UpdatePlayerInfoView() + end) self:UpdateRound() - self:InitPlayerInfoView() + -- self:InitPlayerInfoView() self._player_card_info = {} local _player_card_info = self._player_card_info for i = 1, #room.player_list do @@ -88,8 +91,8 @@ function M:InitView(url) for i = 1, #p.fz_list do cardInfo:UpdateFzList(p.fz_list[i], -1) end - info:FillData(p) - info._view.visible = true + -- info:FillData(p) + -- info._view.visible = true end local btn_rule = self._view:GetChild('btn_rule') @@ -120,21 +123,23 @@ function M:InitView(url) local btn_witness = self._view:GetChild('btn_pangGuang') if btn_witness then btn_witness.onClick:Set(function() - if room._flag_updateWitness then - room._flag_updateWitness = false - if viewList_witness.numItems == #room.witness_player_list then - viewList_witness:RefreshVirtualList() - else - viewList_witness.numItems = #room.witness_player_list - end - end self._view:GetController('witness').selectedIndex = 1 end) end + --直接渲染观战人员 + if viewList_witness.numItems == #room.witness_player_list then + viewList_witness:RefreshVirtualList() + else + viewList_witness.numItems = #room.witness_player_list + end + + --展示精牌 + self.jing = self._view:GetChild('jing') + self:ShowJing() ------------------------------------------------------- - self._ctr_state.selectedIndex = 4 + self._state.selectedIndex = 4 self.com_logocType.selectedIndex = 1 end @@ -152,6 +157,22 @@ function M:EventInit() print("lingmeng witness PlayerEnter") end) + _gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, function(...) + self:PlayMJSound("user_enter.mp3") + local arg = { ... } + local witnessPlayerList = arg[1] + self._room.witness_player_list = witnessPlayerList + + local _room = DataManager.CurrenRoom + local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players') + print("linemng tcp", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems) + if viewList_witness.numItems == #_room.witness_player_list then + viewList_witness:RefreshVirtualList() + else + viewList_witness.numItems = #_room.witness_player_list + end + end) + _gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...) local arg = { ... } print("lingmeng witness SendLaiZi") @@ -175,7 +196,7 @@ function M:EventInit() self._clearingView = nil end self:UpdateRound() - self._ctr_state.selectedIndex = 4 + self._state.selectedIndex = 4 local list = _room.player_list for i = 1, #list do local p = list[i] @@ -285,7 +306,7 @@ function M:EventInit() -- if #niao == 0 then self._view:GetChild("n13").visible = false end self._clearingView:InitData(0, _room, result, nil, function(...) DataManager.CurrenRoom.self_player.card_list = {} - self._ctr_state.selectedIndex = 2 + self._state.selectedIndex = 2 self._clearingView = nil end) end @@ -333,6 +354,11 @@ function M:InitPlayerInfoView() end end +local majiang_asset_path = "base/main_majiang/sound/" +function M:PlayMJSound(path) + ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path) +end + function M:NewMJPlayerCardInfoView(view, index) return MJMainView.NewMJPlayerCardInfoView(self, view, index) --[[ @@ -380,11 +406,40 @@ function M:OnFangziAction(...) -- self:__CloseTip() end +local majiang_asset_path = "base/main_majiang/sound/" +function M:PlayMJSound(path) + ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path) +end + function M:UpdateRound() self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round, self._room.room_config.round) end +function M:ShowJing() + if self._room.jing then + self.jing.visible = true + MJPlayerCardInfoView.fillCard2(self, self.jing, "202_", self._room.jing) + else + self.jing.visible = false + end +end + +function M:UpdatePlayerInfoView() + self._player_info = {} + local _player_info = self._player_info + local list = self._room.player_list + + for i = 1, self._room.room_config.people_num do + local seat = self:GetPos(list[i].seat) + local tem = self._view:GetChild(string.format("player_info%d_%d", seat, + (self._state.selectedIndex == 4 and 1 or 0) + 1)) + _player_info[seat] = PlayerInfoView.new(tem, self) + _player_info[seat]:FillData(list[i]) + printlog("lingmeng _player_info", tem, seat, list[i].self_user.nick_name) + end +end + function M:OnUpdate() if (self._popEvent) then local func = self._gamectr:PopEvent() diff --git a/lua_probject/extend_project/extend/majiang/nancheng/ExtendConfig.lua b/lua_probject/extend_project/extend/majiang/nancheng/ExtendConfig.lua index 6d55eb2e..1559bc78 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/ExtendConfig.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/ExtendConfig.lua @@ -95,6 +95,7 @@ function M:FillRoomData(s2croom) room.curren_outcard_seat = _reloadInfo["curren_outcard_seat"] room.last_outcard_seat = last_outcard_seat room.playing = playing + room.reload = reload for i = 1, #_info_list do local tem = _info_list[i] local playerid = tem["playerid"] @@ -114,7 +115,7 @@ function M:FillRoomData(s2croom) p.fz_list[#p.fz_list + 1] = fz end if not playing and room.curren_round > 0 then - self.GetGameController():PlayerReady() + -- self.GetGameController():PlayerReady() end end end @@ -192,6 +193,7 @@ function M:FillWitnessData(pd_data) room.banker_seat = bank_seat room.curren_turn_seat = active_seat room.curren_round = _tableInfo["round"] + room.witness_player_list = _tableInfo["playerSpectatorData"] local _info_list = _tableInfo["playerData"] for i = 1, #_info_list do local _jp = _info_list[i] diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua index f2694aa0..dee06a67 100644 --- a/lua_probject/main_project/main/majiang/MJMainView.lua +++ b/lua_probject/main_project/main/majiang/MJMainView.lua @@ -669,7 +669,7 @@ function M:ShowHand(msg) if infoView.class ~= "PlayerSelfCardInfoView" then printlog("ShowHand", player.seat) table.sort(player.hand_card, self.HandCardSortAndJing) - infoView:ShowHand(player.hand_card) + infoView:ShowHand(player.hand_card, self:GetPos(player.seat) == 1) end end end @@ -757,7 +757,7 @@ function M:OnHuCard(...) local player = self._room:GetPlayerBySeat(win_seat) self:RemoveCursor() --info:UpdateHandCard(false, false) - info:ShowHuCard(win_card) + info:ShowHuCard(win_card, index == 1) self.cHuCardEffect.selectedIndex = 1 diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua index 9a9201a1..863cee25 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua @@ -484,7 +484,7 @@ end function M:ShowHand(cards) local list = self._view_handCardList - local cardType = self._viewText_cardInfo["Out_Card"] + local cardType = self._viewText_cardInfo["Hand_Card"] if self._viewText_cardInfo['IS_SIDE'] == "true" then list = self._view:GetChild('List_HandCard2') cardType = self._viewText_cardInfo["Hand_Card"] @@ -501,14 +501,27 @@ 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) +function M:ShowHuCard(card, flag_isme) self.winCard = card self._view_getCard:RemoveChildrenToPool() local btn_card = self._view_getCard:AddItemFromPool() self:fillCard2(btn_card, self._viewText_cardInfo['Out_Card'], card, 1) self._ctr_getCard.selectedIndex = 1 + 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 return M diff --git a/wb_new_ui/assets/Family/NumberRecord/Component/btn_chooseTime.xml b/wb_new_ui/assets/Family/NumberRecord/Component/btn_chooseTime.xml index 678d1e10..3b1dbbb7 100644 --- a/wb_new_ui/assets/Family/NumberRecord/Component/btn_chooseTime.xml +++ b/wb_new_ui/assets/Family/NumberRecord/Component/btn_chooseTime.xml @@ -2,8 +2,8 @@ - - + + 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 7896d344..c5036ba4 100644 --- a/wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailChild.xml +++ b/wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailChild.xml @@ -2,24 +2,37 @@ - + + + + + + + + +