From 8f1ce9aca429035784a85ff9508920ab4cb4abec Mon Sep 17 00:00:00 2001 From: 1076390229 <1076390229@qq.com> Date: Wed, 30 Jul 2025 18:35:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=A1=E6=81=AF=E7=BA=A2?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Controller/GroupMgrController.lua | 2 + .../Game/Controller/NewGroupController.lua | 21 +++- lua_probject/base_project/Game/Protocol.lua | 3 + .../Game/View/Family/FamilyAuditNumber.lua | 4 + .../Game/View/Family/FamilyEventView.lua | 10 +- .../Game/View/Family/FamilyMyFamily.lua | 70 +++++++++---- .../Game/View/Family/FamilyMyfamilyList.lua | 64 +++++++++--- .../base_project/Game/View/FamilyView.lua | 54 +++++++++- lua_probject/base_project/Main.lua | 1 + .../extend/Common/EXsettingView.lua | 98 ------------------ .../extend/Common/WitnessView.lua | 14 --- .../extend/majiang/fuzhou/EXWitnessView.lua | 2 +- .../extend/majiang/jinxi/EXWitnessView.lua | 2 +- .../extend/majiang/lichuan/EXWitnessView.lua | 2 +- .../extend/majiang/nancheng/EXWitnessView.lua | 2 +- .../assets/FGAssist/invite/panel_assist.xml | 11 +- .../Family/Main/Component/btn_myfamily.xml | 9 ++ .../MyFamily/Component/btn_applyMsg.xml | 9 ++ .../Main_Majiang/Main_new/Setting/Setting.xml | 7 +- wb_new_ui/assets/Main_Majiang/package.xml | 17 +++ .../ART/base/Family/ui/Family_fui.bytes | Bin 120035 -> 120517 bytes .../main_majiang/ui/Main_Majiang_atlas0.png | Bin 2516584 -> 2494466 bytes .../main_majiang/ui/Main_Majiang_atlas0_1.png | Bin 4656165 -> 4733042 bytes .../main_majiang/ui/Main_Majiang_atlas0_2.png | Bin 3695636 -> 3757290 bytes .../main_majiang/ui/Main_Majiang_fui.bytes | Bin 378668 -> 379115 bytes .../Assets/StreamingAssets/init1_1.json | 20 ++-- .../Assets/StreamingAssets/init2_1.json | 60 +++++------ .../ProjectSettings/GraphicsSettings.asset | 1 + .../ProjectSettings/ProjectSettings.asset | 6 +- 29 files changed, 278 insertions(+), 211 deletions(-) delete mode 100644 lua_probject/extend_project/extend/Common/EXsettingView.lua delete mode 100644 lua_probject/extend_project/extend/Common/WitnessView.lua diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index 0a23f8ee..effedc62 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua @@ -314,6 +314,8 @@ function M:OnEvtMessage(evt_data) group.joinsData[#group.joinsData + 1] = msg DispatchEvent(self._dispatcher, GroupMgrEvent.OnNewApply, evt_data) + + Broadcast.Send(BroadcastEvent.OnJoinsChange) end -- 被邀请事件 diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index eb244060..9aef9439 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -47,6 +47,7 @@ function M:FG_GroupList(callback) group.wechatId = tem.wechatId group.groupDiamo = tem.groupDiamo group.messageCount = tem.messageCount + group.joins = tem.joins l_groups:add(group) end end @@ -1698,4 +1699,22 @@ function M:FG_Get_Online_Member(groupId, callback) _client:send(Protocol.WEB_FG_get_online_member, _data, function(res) callback(res) end) -end \ No newline at end of file +end + +-- 获取某个家族的详细信息 +function M:WEB_FG_GET_GROUP_DETAIL(groupId, callback) + local _data = {} + _data.id = groupId + local _client = ControllerManager.GroupClient + _client:send(Protocol.WEB_FG_GET_GROUP_DETAIL, _data, function(res) + local group = DataManager.groups:get(groupId) + local detail = res.Data.groupDetail[1] + group.diamo = detail.diamo + group.wechatId = detail.wechatId + group.notice = detail.notice + group.name = detail.name + group.member_num = detail.member_num + + callback(res) + end) +end diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index 7508936a..5f96afa5 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -295,6 +295,9 @@ Protocol = { -- get_online_member WEB_FG_get_online_member = "group/get_online_member", + + -- 获取某个家族的详细信息 + WEB_FG_GET_GROUP_DETAIL = "group/get_groupDetail", -------------- group-log--------------------- -- 获取奖励日志 WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log", diff --git a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua index 683050e9..0d57cbe7 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua @@ -93,10 +93,14 @@ function FamilyAuditNumber:ClickBtn(isAllow, uid) self:Reflash() + Broadcast.Send(BroadcastEvent.OnJoinsChange) + + --[[ local view = BaseView.FindView("FamilyMainView") if view then view:ChangeOther() end + ]] end end) end diff --git a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua index b6c26c37..a51007dd 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua @@ -290,7 +290,11 @@ function M:_evtOnFamilyReflash(...) local reflashType = arg[1].reflashType if reflashType == "joinFamily" then - view:Reflash() + local uid = arg[1].uid + + if DataManager.SelfUser.account_id == uid then + view:Reflash() + end end if reflashType == "outFamily" then @@ -317,12 +321,14 @@ function M:_evtOnFamilyReflash(...) end end + Broadcast.Send(BroadcastEvent.OnJoinsChange) + --[[ view:ChangeOther() - local win = BaseWindow.FindWindow("FamilyAuditNumber") if win then win:Reflash() end + ]] end end diff --git a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua index 42e712d3..69d09c7a 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua @@ -2,6 +2,7 @@ local FamilyRoomCardRecord = import(".FamilyRoomCardRecord") local RoomCardRecord = import(".RoomCardRecord") local FamilyInviteFamilyView = import('.FamilyInviteFamilyView') +local FamilyAuditNumber = import(".FamilyAuditNumber") --region LOCAL @@ -35,6 +36,24 @@ local function ChangeFamilyConfig(data, self) ) end +function FamilyMyFamily:ReflashJoinsRedPoint() + local cRedPoint = self.btn_applyMsg:GetController("cRedPoint") + local tex_redPoint = self.btn_applyMsg:GetChild("tex_redPoint") + + local group = DataManager.groups.groupMap[self.groupId] + + cRedPoint.selectedIndex = 0 + if group.joins > 0 then + cRedPoint.selectedIndex = 1 + end + + local tex = group.joins + if group.joins > 99 then + tex = "99+" + end + + tex_redPoint.text = tex +end --endregion @@ -45,32 +64,45 @@ function FamilyMyFamily:TryShow(groupId, r) self:Show() end -function FamilyMyFamily.New(groupId) - setmetatable(FamilyMyFamily, { __index = BaseWindow }) +function FamilyMyFamily.New() + setmetatable(FamilyMyFamily, { __index = BaseView }) local inst = setmetatable({}, { __index = FamilyMyFamily }) inst._close_destroy = true inst._scale = true inst._animation = false inst._full_offset = false inst._anim_pop = 0 - BaseWindow.init(inst, 'ui://Family/com_myFamily') + inst.class = "FamilyMyFamily" + BaseView.InitView(inst, 'ui://Family/com_myFamily') -- 隐藏背景图 inst._root_view:GetChild("win_mode").visible = false inst:Init() - inst.groupId = groupId return inst end -function FamilyMyFamily:Show() - self:Refalsh() +function FamilyMyFamily:Show(groupId) + self.groupId = groupId - --HideMainView() - BaseWindow.Show(self) + Broadcast.AddListener(BroadcastEvent.OnJoinsChange, self.ReflashJoinsRedPoint, self) + + local fgCtr = ControllerManager.GetController(NewGroupController) + ViewUtil.ShowModalWait(self._root_view, "正在加载亲友圈数据......") + fgCtr:WEB_FG_GET_GROUP_DETAIL(self.groupId, function(res) + print("收到家族的详细信息") + pt(res) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode) + end + self:Refalsh() + end) + BaseView.Show(self) end function FamilyMyFamily:Close() - BaseWindow.Close(self) - --ShowMainView() + Broadcast.RemoveListener(BroadcastEvent.OnJoinsChange, self.ReflashJoinsRedPoint) + + BaseView.Close(self) end function FamilyMyFamily:Refalsh() @@ -94,6 +126,8 @@ function FamilyMyFamily:Refalsh() elseif self.showNumber == 1 then self.cDisplayNumber.selectedIndex = 0 end + + self:ReflashJoinsRedPoint() end function FamilyMyFamily:Init() @@ -182,7 +216,7 @@ function FamilyMyFamily:Init() local curView = ViewManager.GetCurrenView() if curView.class == "FamilyMainView" then curView:OpenAllNumber(self.family) - BaseWindow.DestroyAll() + BaseView.DestroyAll() else local view = ViewManager.ChangeView(ViewManager.View_Family, function() view:OpenAllNumber(self.family) @@ -191,14 +225,10 @@ function FamilyMyFamily:Init() end) self.btn_applyMsg.onClick:Set(function() - local curView = ViewManager.GetCurrenView() - if curView.class == "FamilyMainView" then - curView:AuditNumber() - else - local view = ViewManager.ChangeView(ViewManager.View_Family, function() - view:AuditNumber() - end) - end + local group = DataManager.groups.groupMap[self.groupId] + + local view = FamilyAuditNumber.new() + view:Show(group) end) self.btn_quitFamily.onClick:Set(function() @@ -316,7 +346,7 @@ function FamilyMyFamily:Init() self.networkSending = false self.cTips.selectedIndex = 1 --self:Close() - BaseWindow.DestroyAll() + BaseView.DestroyAll() --ControllerManager.ChangeController(NewGroupController) ViewManager.ChangeView(ViewManager.View_Family) end) diff --git a/lua_probject/base_project/Game/View/Family/FamilyMyfamilyList.lua b/lua_probject/base_project/Game/View/Family/FamilyMyfamilyList.lua index b208db05..0a9110b7 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyMyfamilyList.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyMyfamilyList.lua @@ -13,23 +13,46 @@ local function ShowMainView(self) self.FamilyView.familyType.selectedIndex = self.rootLastIndex or 1 end ---#endregion +local function RefalshJoinsRedPoint(self) + for i = 0, self.list_familys.numItems - 1 do -function FamilyMyfamilyList:TryShow(root) - local Instance = self.New(root) - Instance:Show() + local groups = DataManager.groups.groupList + local group = groups[i + 1] + + local obj = self.list_familys:GetChildAt(i) + + local btn_familyManage = obj:GetChild("btn_familyManage") + local btn_familyManageRedPoint = btn_familyManage:GetController("cRedPoint") + + local tex_redPoint = btn_familyManage:GetChild("tex_redPoint") + + btn_familyManageRedPoint.selectedIndex = 0 + if group.joins > 0 then + btn_familyManageRedPoint.selectedIndex = 1 + end + + local RpTex = group.joins + if group.joins > 99 then + RpTex = "99+" + end + + tex_redPoint.text = RpTex + end end +--#endregion + function FamilyMyfamilyList.New(root) - setmetatable(FamilyMyfamilyList, { __index = BaseWindow }) + setmetatable(FamilyMyfamilyList, { __index = BaseView }) local Instance = setmetatable({}, { __index = FamilyMyfamilyList }) Instance._full = true Instance._close_destroy = true Instance._full_offset = false Instance._anim_pop = 0 Instance._animation = false + Instance.class = "FamilyMyfamilyList" - BaseWindow.init(Instance, "ui://Family/com_myFamilyList") + BaseView.InitView(Instance, "ui://Family/com_myFamilyList") -- 隐藏背景图 Instance._root_view:GetChild("win_mode").visible = false @@ -41,16 +64,25 @@ end function FamilyMyfamilyList:Refalsh() self.list_familys.numItems = #DataManager.groups.groupList + RefalshJoinsRedPoint(self) end function FamilyMyfamilyList:Show() + Broadcast.AddListener(BroadcastEvent.OnJoinsChange, RefalshJoinsRedPoint, self) + HideMainView(self) self:Refalsh() - BaseWindow.Show(self) + BaseView.Show(self) +end + +function FamilyMyfamilyList:Close() + Broadcast.RemoveListener(BroadcastEvent.OnJoinsChange, RefalshJoinsRedPoint) + + ShowMainView(self) + BaseView.Close(self) end function FamilyMyfamilyList:Init() - self.list_familys = self._view:GetChild("list_familys") self.btn_close = self._view:GetChild("btn_close") @@ -60,7 +92,7 @@ function FamilyMyfamilyList:Init() self.list_familys.itemRenderer = function(index, obj) local groups = DataManager.groups.groupList - local group = groups[index +1] + local group = groups[index + 1] local tex_familyId = obj:GetChild("tex_familyId") local tex_familyName = obj:GetChild("tex_familyName") @@ -79,8 +111,8 @@ function FamilyMyfamilyList:Init() btn_familyManage.onClick:Set(function() --self:Close() --self.FamilyView:OpenMyFamily(group.id) - local view = FamilyMyFamily.New(group.id) - view:Show() + local view = FamilyMyFamily.New() + view:Show(group.id) end) btn_record.onClick:Set(function() @@ -89,16 +121,16 @@ function FamilyMyfamilyList:Init() end) btn_rank.onClick:Set(function() - + end) end pt(DataManager.groups.groupList) end -function FamilyMyfamilyList:Close() - ShowMainView(self) - BaseWindow.Close(self) +function FamilyMyfamilyList:TryShow(root) + local Instance = self.New(root) + Instance:Show() end -return FamilyMyfamilyList \ No newline at end of file +return FamilyMyfamilyList diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 4fd51308..17d57423 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -35,6 +35,33 @@ local function FamilyOffline(groupId, self) end) end +-- 刷新申请的红点 +local function ReflashJoinsRedPoint(self) + if self._group == nil then + return + end + + local btn_myfamily = self._view:GetChild("btn_myfamily") + local btn_myfamilycRedPoint = btn_myfamily:GetController("cRedPoint") + local btn_myfamilyRedPointText = btn_myfamily:GetChild("tex_redPoint") + + local group = DataManager.groups:get(self._group.id) + + btn_myfamilycRedPoint.selectedIndex = 0 + if group.joins > 0 then + btn_myfamilycRedPoint.selectedIndex = 1 + end + + local RpTex = group.joins + if group.joins > 99 then + RpTex = "99+" + end + + btn_myfamilyRedPointText.text = RpTex + + self:ChangeOther() +end + local function SortMembers(Members) local re = {} local online = {} @@ -118,6 +145,7 @@ function M:init(url) self:InitCloseClick() + --[[ fgCtr:FG_GroupList(function(res) print("获取所有圈信息") pt(res) @@ -130,6 +158,7 @@ function M:init(url) self.btn_chatRoom.visible = false end end) + ]] -------绑定成员战绩按钮 view:GetChild('btn_family_record').onClick:Set(function() self._child_familyNumberRecord = FamilyNumberRecord.New(self, 1) @@ -177,11 +206,20 @@ function M:init(url) --FamilyChatRoom:Show(self.ChatRoomData) self.com_FamilyChatRoom:Show() end) + + self:Reflash() end function M:Reflash() local fgCtr = ControllerManager.GetController(NewGroupController) fgCtr:FG_GroupList(function(res) + print("获取所有圈信息") + pt(res) + + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode) + end + local groups = res.Data.groups if #groups > 0 then self.familyType.selectedIndex = 1 @@ -190,6 +228,8 @@ function M:Reflash() self:JoinFamily(true) self.btn_chatRoom.visible = false end + + --Broadcast.Send(BroadcastEvent.OnJoinsChange) end) end @@ -492,6 +532,8 @@ function M:OnEnterGroupCallBack() self:ReflashChatRoomRedPoint() + ReflashJoinsRedPoint(self) + fgCtr:FG_Get_Online_Member(self._group.id, function(res) end) end @@ -990,7 +1032,7 @@ function M:ChangeOther() obj:GetChild('title').text = cfg.name obj.onClick:Set(handler(self, cfg.Fct)) - print("cfg.redPointFct", cfg.redPointFct) + --print("cfg.redPointFct", cfg.redPointFct) if cfg.redPointFct then cfg.redPointFct(self, obj) end @@ -1009,7 +1051,7 @@ function M:ChangeMore() obj.onClick:Add(function() self._view:GetController('moreBtn').selectedIndex = 0 end) - print("cfg.redPointFct", cfg.redPointFct) + --print("cfg.redPointFct", cfg.redPointFct) if cfg.redPointFct then cfg.redPointFct(self, obj) end @@ -1063,7 +1105,15 @@ function M:ReflashChatRoomRedPoint() tex_redPoint.text = tex end +function M:Show() + Broadcast.AddListener(BroadcastEvent.OnJoinsChange, ReflashJoinsRedPoint, self) + + BaseView.Show(self) +end + function M:Close() + Broadcast.RemoveListener(BroadcastEvent.OnJoinsChange, ReflashJoinsRedPoint) + print("家族界面退出") self._familyEventView:RemoveAll() BaseView.Close(self) diff --git a/lua_probject/base_project/Main.lua b/lua_probject/base_project/Main.lua index 8d76853b..1a662c9a 100644 --- a/lua_probject/base_project/Main.lua +++ b/lua_probject/base_project/Main.lua @@ -13,6 +13,7 @@ require 'Game.DataManager' require "Game.ExtendManager" require "Game.ExtendHotupdate" require "TableData" +require "Game.Controller.Broadcast" local EmojiLuaHelper = import("Game.View.Common.EmojiLuaHelper") import("Game.GroupUpdataHelper") diff --git a/lua_probject/extend_project/extend/Common/EXsettingView.lua b/lua_probject/extend_project/extend/Common/EXsettingView.lua deleted file mode 100644 index 51905481..00000000 --- a/lua_probject/extend_project/extend/Common/EXsettingView.lua +++ /dev/null @@ -1,98 +0,0 @@ ---设置窗口对象 - -local EXSettingView = {} - -local M = EXSettingView -setmetatable(M, { __index = BaseWindow }) - -function EXSettingView:Show(room) - self._room = room - - -- 房主，第一个进房间的人 - local roomOwner = self._room.player_list[1].self_user.account_id - - if roomOwner == DataManager.SelfUser.account_id then - self.cBtn.selectedIndex = 1 - else - self.cBtn.selectedIndex = 0 - end - - BaseWindow.Show(self) -end - -function EXSettingView.new(main_view, flag_witness) - local self = setmetatable({}, { __index = M }) - self.class = 'EXSettingView' - self._close_destroy = true - self._mainView = main_view - self._flag_witness = flag_witness - self:init('ui://Main_Majiang/Setting') - return self -end - -function M:init(url) - BaseWindow.init(self, url) - - local view = self._view - local slider_sound = view:GetChild('slider_vedio_sound') - local slider_music = view:GetChild('slider_vedio_music') - local btn_music = view:GetChild('btn_vedio_music') - local btn_sound = view:GetChild('btn_vedio_sound') - - self.cBtn = self._view:GetController('cBtn') - - -- slider_sound.value = GameApplication.Instance.SoundValue - -- slider_music.value = GameApplication.Instance.MusicValue - - slider_music.onChanged:Add(function() - -- GameApplication.Instance.MusicValue = slider_music.value - -- btn_music.selected = false - -- GameApplication.Instance.MusicMute = false; - end) - - slider_sound.onChanged:Add(function() - -- GameApplication.Instance.SoundValue = slider_sound.value - -- btn_sound.selected = false - -- GameApplication.Instance.SoundMute = false; - end) - - btn_sound.onClick:Add(function() - -- GameApplication.Instance.SoundMute = btn_sound.selected; - end) - - btn_music.onClick:Add(function() - -- GameApplication.Instance.MusicMute = btn_music.selected; - end) - - local _btn_logout = self._view:GetChild('btn_cancelRoom') - _btn_logout.onClick:Set(function() - if self._flag_witness then - local _room = DataManager.CurrenRoom - pt(_room) - self._mainView._gamectr:ExitWitnessGame(_room.play_id, _room.game_id, - _room.room_id) - ViewManager.ChangeView(ViewManager.View_Family) - else - if self._mainView.dismiss_room_cd_time > 0 then - ViewUtil.ErrorTip(nil, "您还处于解散冷却时间当中，请稍后重试！") - else - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:AskDismissRoom() - end - end - end) - - self._view:GetChild("btn_closeRoom").onClick:Set(function() - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:LevelRoom(function(res) - print("退出房间") - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode) - return - end - ViewManager.ChangeView(ViewManager.View_Family) - end) - end) -end - -return M diff --git a/lua_probject/extend_project/extend/Common/WitnessView.lua b/lua_probject/extend_project/extend/Common/WitnessView.lua deleted file mode 100644 index 9a693db3..00000000 --- a/lua_probject/extend_project/extend/Common/WitnessView.lua +++ /dev/null @@ -1,14 +0,0 @@ -local MJSettingView = require("main.majiang.MJSettingViewNew") - -local WitnessView = {} -setmetatable(WitnessView, { __index = BaseView }) -function WitnessView:init() - self.btn_setting = self._view:GetChild("btn_setting") - - self.btn_setting.onClick:Set(function() - local view = MJSettingView.new(self, true) - view:Show() - end) -end - -return WitnessView \ No newline at end of file diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua index 15ae7317..5a89bed9 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua @@ -5,7 +5,7 @@ local PlayerInfoView = import(".EXPlayerInfoView") local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView") local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView") local TableBG = require("Game.Data.TableBG") -local WitnessView = require("extend.Common.WitnessView") +local WitnessView = require("Game.View.WitnessView") local Record_Event = import(".RecordEvent") diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua index 8002483e..913755e2 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua @@ -5,7 +5,7 @@ local PlayerInfoView = import(".EXPlayerInfoView") local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView") local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView") local TableBG = require("Game.Data.TableBG") -local WitnessView = require("extend.Common.WitnessView") +local WitnessView = require("Game.View.WitnessView") local Record_Event = import(".RecordEvent") diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua index e4b397aa..339be809 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua @@ -6,7 +6,7 @@ local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView") local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView") local SettingView = import(".EXSettingView") local TableBG = require("Game.Data.TableBG") -local WitnessView = require("extend.Common.WitnessView") +local WitnessView = require("Game.View.WitnessView") local Record_Event = import(".RecordEvent") diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua index 6d4c04e4..43071c43 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua @@ -5,7 +5,7 @@ local PlayerInfoView = import(".EXPlayerInfoView") local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView") local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView") local TableBG = require("Game.Data.TableBG") -local WitnessView = require("extend.Common.WitnessView") +local WitnessView = require("Game.View.WitnessView") local Record_Event = import(".RecordEvent") diff --git a/wb_new_ui/assets/FGAssist/invite/panel_assist.xml b/wb_new_ui/assets/FGAssist/invite/panel_assist.xml index d1165578..2535e7be 100644 --- a/wb_new_ui/assets/FGAssist/invite/panel_assist.xml +++ b/wb_new_ui/assets/FGAssist/invite/panel_assist.xml @@ -2,16 +2,10 @@ - + - - - - - - - + @@ -23,5 +17,6 @@ + \ No newline at end of file diff --git a/wb_new_ui/assets/Family/Main/Component/btn_myfamily.xml b/wb_new_ui/assets/Family/Main/Component/btn_myfamily.xml index 2117d7d5..0aa75b95 100644 --- a/wb_new_ui/assets/Family/Main/Component/btn_myfamily.xml +++ b/wb_new_ui/assets/Family/Main/Component/btn_myfamily.xml @@ -1,8 +1,17 @@ + + + + + + + + +