退出亲友圈，充值房卡放开权限

lua_probject/base_project/Game/Controller/Broadcast.lua

@@ -42,5 +42,5 @@ BroadcastEvent = {
     OnJoinsChange = 'OnJoinsChange',
     OnMemberChange = "OnMemberChange",
     OnOutFamily = "OnOutFamily",
+    OnOutFamily2 = "OnOutFamily2",
 }
-

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -611,6 +611,9 @@ function M:OnMemberOut(evt_data)
     local uid = evt_data.uid
     local groupId = evt_data.groupId
     local group = DataManager.groups:get(groupId)
+    if not group then
+        return
+    end
     group:delMember(uid)
     DispatchEvent(self._dispatcher, GroupMgrEvent.OnFamilyMemberOut, evt_data)
     Broadcast.Send(BroadcastEvent.Reflash)

lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua

@@ -26,6 +26,7 @@ function FamilyAuditNumber.new(root)
     self.class = "FamilyAuditNumber"
     self._scale = true
     self._animation = false
+    self._close_destroy = true
     self:init("ui://Family/com_auditNumber")
     return self
 end
@@ -39,7 +40,7 @@ function FamilyAuditNumber:init(url)
     self.list_auditNumberList = self._view:GetChild('list_auditNumberList')
 
     self.btn_close.onClick:Set(function()
-        self:Close()
+        self:Destroy()
     end)
 
     self.list_auditNumberList.itemRenderer = function(index, obj)

lua_probject/base_project/Game/View/Family/FamilyEventView.lua

@@ -333,6 +333,10 @@ function M:_evtOnFamilyReflash(...)
 
         group.joins = joins
 
+        if not group.joinsData or #group.joinsData < 1 then
+            return
+        end
+
         for _, data in pairs(group.joinsData) do
             if data.id == uid then
                 table.remove(group.joinsData, _)
@@ -377,21 +381,27 @@ function M:_evtOnFamilyMemberOut(...)
     local uid = arg.uid
     local groupId = arg.groupId
     local name = arg.name
+    local reflashType = arg.reflashType
 
     local group = DataManager.groups:get(groupId)
+    local tips = "成员 【%s(%s)】退出了【%s(%s)】亲友圈"
+    tips = string.format(tips, DataManager.SelfUser.nick_name, DataManager.SelfUser.account_id, group.name, groupId)
 
     local view = ViewManager.GetCurrenView()
-    if view.class ~= "FamilyMainView" then
+    if view.class ~= "FamilyMainView" or not group then
         return
     end
     if uid == DataManager.SelfUser.account_id then
-        if view._group.id == groupId then
+        DataManager.groups:del(groupId)
+        if #DataManager.groups.groupList == 0 then
             view._close_destroy = true
             ViewManager.ChangeView(ViewManager.View_Lobby)
+        else
+            if view._group.id == groupId then
+                view:Reflash()
+            end
         end
     end
-    local tips = "成员 【%s(%s)】退出了【%s(%s)】亲友圈"
-    tips = string.format(tips, name, uid, group.name, groupId)
     local win = MsgWindow.new(view._view, tips, MsgWindow.MsgMode.OnlyOk)
     win:Show()
 end

lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua

@@ -51,7 +51,8 @@ function FamilyJoinAndCreate:init(root)
                 ViewUtil.CloseModalWait2()
                 if res.ReturnCode == 0 then
                     root.familyType.selectedIndex = 1
-                    root:ConnetFamily(1, DataManager.groups.groupList, true)
+                    -- root:ConnetFamily(1, DataManager.groups.groupList, true)
+                    root:Reflash()
                 else
                     ViewUtil.ErrorTip(res.ReturnCode, '创建大联盟失败!')
                 end

lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua

@@ -67,7 +67,15 @@ local function QuitFamily(self)
                 return
             end
             self.networkSending = false
-            Broadcast.Send(BroadcastEvent.OnOutFamily)
+            -- if #DataManager.groups.groupList == 0 then
+            --     local view = ViewManager.GetCurrenView()
+            --     if view.class == "FamilyMainView" then
+            --         view._close_destroy = true
+            --     end
+            --     ViewManager.ChangeView(ViewManager.View_Lobby)
+            -- else
+            Broadcast.Send(BroadcastEvent.OnOutFamily2)
+            -- end
             self:Close()
         end)
     end)

lua_probject/base_project/Game/View/Family/FamilyMyfamilyList.lua

@@ -68,7 +68,7 @@ end
 
 function FamilyMyfamilyList:Show()
     Broadcast.AddListener(BroadcastEvent.OnJoinsChange, RefalshJoinsRedPoint, self)
-    Broadcast.AddListener(BroadcastEvent.OnOutFamily, self.Refalsh, self)
+    Broadcast.AddListener(BroadcastEvent.OnOutFamily2, self.Refalsh, self)
 
     HideMainView(self)
     self:Refalsh()
@@ -77,7 +77,7 @@ end
 
 function FamilyMyfamilyList:Close()
     Broadcast.RemoveListener(BroadcastEvent.OnJoinsChange, RefalshJoinsRedPoint)
-    Broadcast.RemoveListener(BroadcastEvent.OnOutFamily, self.Refalsh)
+    Broadcast.RemoveListener(BroadcastEvent.OnOutFamily2, self.Refalsh)
 
     ShowMainView(self)
     BaseView.Close(self)

lua_probject/base_project/Game/View/Family/FamilyRoomCard.lua

@@ -69,16 +69,16 @@ function FamilyRoomCard.New()
         obj:GetController("cColor").selectedIndex = data[_idx].colorIndex
 
         obj.onClick:Set(function()
-            if Instance.group and Instance.group.lev ~= 1 then
+            -- if Instance.group and Instance.group.lev ~= 1 then
-                local _curren_msg =
+            --     local _curren_msg =
-                    MsgWindow.new(
+            --         MsgWindow.new(
-                        Instance._root_view,
+            --             Instance._root_view,
-                        "只有管理员可以充值",
+            --             "只有管理员可以充值",
-                        MsgWindow.MsgMode.OnlyOk
+            --             MsgWindow.MsgMode.OnlyOk
-                    )
+            --         )
-                _curren_msg:Show()
+            --     _curren_msg:Show()
-                return
+            --     return
-            end
+            -- end
             if DataManager.SelfUser.diamo < num then
                 local _curren_msg =
                     MsgWindow.new(

lua_probject/base_project/Game/View/FamilyView.lua

@@ -124,6 +124,7 @@ function FamilyView.new()
     local self = setmetatable({}, { __index = M })
     self.class = 'FamilyMainView'
     self._full = true
+    self._full_offset = false
     -- self._close_destroy = false
     self._fristRoom = true
     self:init('ui://Family/Main')
@@ -133,7 +134,6 @@ end
 function M:init(url)
     BaseView.InitView(self, url)
     -- self._close_destroy = false
-    self._full_offset = false
     local view = self._view
     self.lastTime = os.time()
 
@@ -161,7 +161,7 @@ function M:init(url)
     self.cChatRoomRedPoint = self.btn_chatRoom:GetController("cRedPoint")
 
     self:InitCloseClick()
-
+    self._view:GetController('listFamily').selectedIndex = -1
     --[[
     fgCtr:FG_GroupList(function(res)
         print("获取所有圈信息")
@@ -229,17 +229,20 @@ function M:init(url)
         local group = DataManager.groups.groupList[j]
         obj:GetChild("title").emojies = EmojiDitc.EmojiesDitc
         obj.text = Utils.TextOmit(group.name, 6, "...")
-        obj.onClick:Add(function()
+        obj.onClick:Set(function()
             if self._group ~= nil and group.id == self._group.id then
                 --ViewUtil.ErrorTip(-1,"已在家族中")
                 return
             end
+            self._view:GetController('listFamily').selectedIndex = i
             self:RefNotice(group.id)
             self.curGroupIndex = j
             self:ConnetFamily(j, DataManager.groups.groupList)
         end)
     end
 
+
+
     self.familyType.selectedIndex = 1
 
     self._view:GetChild('btn_showALlStartRoom').onClick:Set(function()
@@ -573,7 +576,6 @@ end
 
 function M:EnterGroup(fgCtr, id)
     fgCtr:FG_EnterGroup(id, function(res)
-        ViewUtil:CloseModalWait2()
         ViewUtil:CloseModalWait2()
         if res.ReturnCode ~= 0 then
             if res.ReturnCode == 101 then
@@ -601,9 +603,6 @@ function M:OnEnterGroupCallBack()
 
     self:UpdateFamilyRoom(fgCtr, self._group.id)
 
-    --ViewUtil.ShowModalWait2(self._root_view, "正在加载亲友圈权限中......")
-    --self:ChangeOther()
-
     ViewUtil.CloseModalWait2()
 
     self:ReflashChatRoomRedPoint()
@@ -648,7 +647,7 @@ function M:UpdateFamilyRoom(fgCtr, id)
         show_num = #playList + #readyRoom
         self._view:GetChild('n364').text = string.format("已开启***桌游戏")
     end
-    self._view:GetChild('btn_showALlStartRoom'):GetController('isOpen').selectedIndex = self._group.isOpenStartRoom
+    self._view:GetChild('btn_showALlStartRoom'):GetController('isOpen').selectedIndex = self._group.isOpenStartRoom or 0
     list_room.itemRenderer = function(index, obj)
         if index < #readyRoom then
             local newIndex = index + 1
@@ -890,8 +889,6 @@ function M:ConnetFamily(index, groups)
     DataManager.CurrenGroup = self._group
     self._view:GetChild('text_familyId').text = self._group.id
     self._view:GetController('lev').selectedIndex = self._group.lev - 1
-    print("===================================self._group")
-    pt(self._group)
     self._roomNum = self._group.room_num
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
@@ -900,20 +897,6 @@ function M:ConnetFamily(index, groups)
     Utils.SaveLocalFile("Family_lastID" .. DataManager.SelfUser.account_id, self._group.id)
     self:EnterGroup(fgCtr, self._group.id)
 
-    --[[
-    ViewUtil.ShowModalWait2(self._root_view, "正在加载亲友圈权限中......")
-    self:ChangeOther(tonumber(self._group.lev) + 1)
-    allLoad = 1
-
-    ViewUtil.ShowModalWait2(self._root_view, "正在加载成员列表中......")
-    allLoad = allLoad +
-        self:ChangeNumber(fgCtr, self._group.id, 0, self._group.total_member_num, false,
-            1)
-
-    ViewUtil.ShowModalWait2(self._root_view, "正在加载房间列表中......")
-
-    allLoad = allLoad + self:EnterGroup(fgCtr, self._group.id)
-    ]]
     UpdateBeat:Add(self.OnUpdate, self)
 
     if self._group.isOpenChatRoom == 1 then

wb_new_ui/assets/Family/Main.xml

@@ -2,7 +2,7 @@
 <component size="2532,1170">
   <controller name="familyType" exported="true" homePageType="specific" homePage="6" pages="6,空,0,main,1,playEdit,4,createAndJoin,5,numberList,7,numberRecord,8,auditNumber" selected="1"/>
   <controller name="createOrJoin" pages="0,create,1,join" selected="0"/>
-  <controller name="listFamily" pages="0,,1,,10,,11,,12,,13,,14,,15," selected="0"/>
+  <controller name="listFamily" pages="0,,1,,10,,11,,12,,13,,14,,15,,16,,17,,18,,19,,20,,21,,22,,23,,24,,25,,26,,27,,28," selected="0"/>
   <controller name="numberRecordRank" pages="0,,1,,3," selected="0"/>
   <controller name="numberRecord" pages="0,,1,,3," selected="0"/>
   <controller name="showChooseTime" pages="0,,1," selected="0"/>

wb_unity_pro/Assets/Scripts/VerCheck.cs

@@ -24,7 +24,7 @@ public class VerCheck : MonoBehaviour
     // Use this for initialization
     void Start()
     {
-        
+        //Debug.Log($"Stage.inst.safeArea = {Stage.inst.safeArea}");
         GameApplication.Instance.isAndroid64bit = IsAndroid64bit();
         CreateVersionView();
         StartCoroutine(CheckNet());

wb_unity_pro/Assets/StreamingAssets/init2_1.json

@@ -1,91 +1,91 @@
 [
   {
     "lua_path": "/tolua_project,/base_project,/main_project",
-    "ver": "1.0.29",
+    "ver": "1.0.6",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
     "version": "1.0.29"
   },
   {
-    "ver": "1.0.22",
+    "ver": "1.0.6",
     "name": "common",
     "check": true,
     "bundle": "base/common",
     "version": "1.0.22"
   },
   {
-    "ver": "1.0.23",
+    "ver": "1.0.6",
     "name": "login",
     "check": true,
     "bundle": "base/login",
     "version": "1.0.23"
   },
   {
-    "ver": "1.0.24",
+    "ver": "1.0.6",
     "name": "lobby",
     "check": true,
     "bundle": "base/lobby",
     "version": "1.0.24"
   },
   {
-    "ver": "1.0.23",
+    "ver": "1.0.6",
     "name": "Family",
     "check": true,
     "bundle": "base/Family",
     "version": "1.0.23"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.6",
     "name": "chat",
     "check": true,
     "bundle": "base/chat",
     "version": "1.0.8"
   },
   {
-    "ver": "1.0.21",
+    "ver": "1.0.6",
     "name": "newgroup",
     "check": true,
     "bundle": "base/newgroup",
     "version": "1.0.21"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.6",
     "name": "rank",
     "check": true,
     "version": "1.0.8",
     "bundle": "base/rank"
   },
   {
-    "ver": "1.0.25",
+    "ver": "1.0.6",
     "name": "main_majiang",
     "check": true,
     "version": "1.0.25",
     "bundle": "base/main_majiang"
   },
   {
-    "ver": "1.0.23",
+    "ver": "1.0.6",
     "name": "main_poker",
     "check": true,
     "version": "1.0.23",
     "bundle": "base/main_poker"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.6",
     "name": "main_zipai",
     "check": true,
     "version": "1.0.8",
     "bundle": "base/main_zipai"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.6",
     "name": "static",
     "check": true,
     "bundle": "base/static",
     "version": "1.0.8"
   },
   {
-    "ver": "1.0.21",
+    "ver": "1.0.6",
     "is_res": true,
     "name": "embed",
     "check": true,
@@ -93,14 +93,14 @@
     "version": "1.0.21"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.6",
     "name": "main_pokemajiang",
     "check": true,
     "version": "1.0.8",
     "bundle": "base/main_pokemajiang"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.6",
     "name": "main_zipaimajiang",
     "check": true,
     "version": "1.0.8",

wb_unity_pro/ProjectSettings/GraphicsSettings.asset

@@ -39,7 +39,6 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}