退出房间、申请加入

2025-07-10 03:14:40 +08:00 · 2025-07-10 03:14:40 +08:00 · 15b1b53e3b
parent ae902d0c42
commit 15b1b53e3b
9 changed files with 64 additions and 18 deletions
--- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua
+++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua
@ -15,6 +15,7 @@ GroupMgrEvent = {
    InviteResponse = "InviteResponse",
    IsOpenChatRoom = "IsOpenChatRoom",
    ChatRoomData = "ChatRoomData",
+    OnNewApply = "OnNewApply",
 }

 GroupMgrController = {
@ -263,6 +264,7 @@ function M:OnEvtMessage(evt_data)
    local group = DataManager.groups:get(self.groupId)
    group.joins = evt_data.joins
    group.update_joins = true
+    DispatchEvent(self._dispatcher, GroupMgrEvent.OnNewApply, evt_data)
 end

 -- 被邀请事件
--- a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua
@ -49,11 +49,13 @@ function M:ClickBtn(isAllow, uid)
        if res.ReturnCode ~= 0 then
            ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败")
        else
-            --ViewUtil.ShowOneChooose("审核成功")
-            self:InitList()
-            --NumberRemark:TryShow()
+            if isAllow == 1 then
                local tagView = GroupSetTagView.new(self._group.id, uid)
                tagView:Show()
+            else
+
+            end
+            self:InitList()
        end
    end)
 end
--- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua
@ -23,6 +23,7 @@ function FamilyEventView.new(root)
    mgr_ctr:AddEventListener(GroupMgrEvent.InviteResponse, handler(self, self._evtInviteResponse))
    mgr_ctr:AddEventListener(GroupMgrEvent.IsOpenChatRoom, handler(self, self._evtIsOpenChatRoom))
    mgr_ctr:AddEventListener(GroupMgrEvent.ChatRoomData, handler(self, self._evtChatRoomData))
+    mgr_ctr:AddEventListener(GroupMgrEvent.OnNewApply, handler(self, self._evtOnNewApply))
    return self
 end

@ -76,6 +77,11 @@ function M:_evtNewMailTip(...)
    print("family event _evtNewMailTip")
 end

+function M:_evtOnNewApply()
+    print("_evtOnNewApply")
+    self._child_familyAuditNumber:InitList()
+end
+
 function M:_evtInviteResponse(...)
    local arg = { ... }
    local invite_id = arg[1]
--- a/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua
@ -121,10 +121,8 @@ function FamilyJoinAndCreate:JoinRoom(roomId)
    --后端似乎还未调通
    self:ClearNumTex()
    fgCtr:FG_JoinGroup(tonumber(roomId), function(res)
-        if res.ReturnCode == 0 then
-            ViewUtil.ShowOneChooose("已申请加入亲友圈" .. res.ReturnCode)
-        else
-            ViewUtil.ShowOneChooose("申请加入亲友圈失败" .. res.ReturnCode)
+        if res.ReturnCode ~= 0 then
+            ViewUtil.ErrorTip(res.ReturnCode)
        end
    end)
    --先换成邀请玩家
--- a/lua_probject/extend_project/extend/majiang/jinxi/EXSettingView.lua
+++ b/lua_probject/extend_project/extend/majiang/jinxi/EXSettingView.lua
@ -7,7 +7,9 @@ setmetatable(M, { __index = BaseWindow })

 function EXSettingView:Show(room)
    self._room = room
-    local roomOwner = self._room.owner_id
+
+    -- 房主，第一个进房间的人
+    local roomOwner = self._room.player_list[1].self_user.account_id

    if roomOwner == DataManager.SelfUser.account_id then
        self.cBtn.selectedIndex = 1
@ -62,7 +64,7 @@ function M:init(url)
        -- GameApplication.Instance.MusicMute = btn_music.selected;
    end)

-    local _btn_logout = self._view:GetChild('btn_closeRoom')
+    local _btn_logout = self._view:GetChild('btn_cancelRoom')
    _btn_logout.onClick:Set(function()
        if self._mainView.dismiss_room_cd_time > 0 then
            ViewUtil.ErrorTip(nil, "您还处于解散冷却时间当中，请稍后重试！")
@ -72,11 +74,15 @@ function M:init(url)
        end
    end)

-    self._view:GetChild("btn_cancelRoom").onClick:Set(function()
+    self._view:GetChild("btn_closeRoom").onClick:Set(function()
        local _gamectr = ControllerManager.GetController(GameController)
        _gamectr:LevelRoom(function(res)
            print("退出房间")
-            pt(res)
+            if res.ReturnCode ~= 0 then
+                ViewUtil.ErrorTip(res.ReturnCode)
+                return
+            end
+            ViewManager.ChangeView(ViewManager.View_Family)
        end)
    end)
 end
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXSettingView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXSettingView.lua
@ -5,6 +5,21 @@ 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'
@ -24,6 +39,8 @@ function M:init(url)
    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

@ -47,7 +64,7 @@ function M:init(url)
        -- GameApplication.Instance.MusicMute = btn_music.selected;
    end)

-    local _btn_logout = self._view:GetChild('btn_closeRoom')
+    local _btn_logout = self._view:GetChild('btn_cancelRoom')
    _btn_logout.onClick:Set(function()
        if self._flag_witness then
            local _room = DataManager.CurrenRoom
@ -64,6 +81,18 @@ function M:init(url)
            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
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
  <controller name="sdk" pages="0,,1," selected="0"/>
  <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
  <controller name="3d" pages="0,,1," selected="0"/>
@ -124,23 +124,23 @@
    <group id="n179_eqmd" name="center_text" xy="418,489" size="1696,172" advanced="true">
      <relation target="" sidePair="center-center"/>
    </group>
-    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,921" size="153,120">
+    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="100,808" size="153,120">
      <gearDisplay controller="state" pages="0,2"/>
      <gearXY controller="state" pages="0,1,2" values="1189,921|100,808|1183,921" default="1183,921"/>
      <gearSize controller="state" pages="0,1" values="153,120,1,1|153,120,1,1" default="144,144,1,1"/>
      <relation target="" sidePair="center-center,bottom-bottom"/>
    </component>
-    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="739,916" size="153,132">
+    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="100,796" size="153,132">
      <gearDisplay controller="state" pages="1,3,4"/>
      <gearXY controller="state" pages="1,3,4" values="100,796|73,784|71,774" default="739,916"/>
      <relation target="n118_pkx5" sidePair="right-left,top-top"/>
    </component>
-    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,274" size="153,132">
+    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1834,63" size="153,132">
      <gearDisplay controller="state" pages="0,2"/>
      <gearXY controller="state" pages="0,1,2" values="1189,274|1834,63|1188,274" default="1188,909"/>
      <relation target="" sidePair="center-center,top-top"/>
    </component>
-    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1886,538" size="153,132">
+    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1819,82" size="153,132">
      <gearDisplay controller="state" pages="1,3,4"/>
      <gearXY controller="state" pages="0,1,3,4" values="1886,538|1819,82|1740,46|1752,62" default="1192,928"/>
      <relation target="n155_gi99" sidePair="left-right,top-top"/>
@ -148,6 +148,7 @@
    <text id="n162_qz7i" name="text_testName" xy="47,178" size="266,49" visible="false" fontSize="36" color="#ffffff" bold="true" text="|一个玩家的名字"/>
    <component id="n159_ckvb" name="Comp_ConterBox" src="gjnb107" fileName="Main_new/Main/Comp_ConterBox.xml" xy="1091,348" size="350,293" group="n169_gmbn">
      <gearDisplay controller="state" pages="1,3,4"/>
+      <relation target="" sidePair="center-center"/>
    </component>
    <group id="n169_gmbn" name="conter_box" xy="1091,348" size="350,293"/>
    <component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2172,12" size="141,117" group="n138_lu84">
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Setting/Setting.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Setting/Setting.xml
@ -30,9 +30,11 @@
    <group id="n32_xblm" name="music" xy="205,531" size="1071,94"/>
    <component id="n16_qt01" name="btn_closeRoom" src="pkx5sv" fileName="Main_new/Main/Component/btn_closeRoom.xml" xy="539,674" scale="1.2,1.2">
      <gearDisplay controller="cBtn" pages="0"/>
+      <relation target="" sidePair="center-center"/>
    </component>
    <component id="n20_xblm" name="btn_cancelRoom" src="xblm1ac" fileName="Main_new/Main/Component/btn_cancelRoom.xml" xy="511,674">
      <gearDisplay controller="cBtn" pages="1"/>
+      <relation target="" sidePair="center-center"/>
    </component>
  </displayList>
 </component>
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes