去除前端成员的权限判断

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -459,7 +459,9 @@ function M:FG_Set_Home(gameStatus)
     _data.gameStatus = gameStatus
     self._mgr_client:send(Protocol.GAME_SET_HOME, _data, function(res)
         callback(res)
+        print("FG_Set_Home 回调")
     end)
+    print("FG_Set_Home 发送")
 end
 
 function M:OnEVT_Push_Assistant(evt_data)

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

@@ -73,11 +73,6 @@ function FamilyMyFamily:ReflashJoinsRedPoint()
     local tex_redPoint = self.btn_applyMsg:GetChild("tex_redPoint")
 
     local group = DataManager.groups.groupMap[self.groupId]
-    local player = group.memberMap[DataManager.SelfUser.account_id]
-
-    if player.lev == 3 then
-        return
-    end
 
     cRedPoint.selectedIndex = 0
     if group.joins > 0 then

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

@@ -17,16 +17,6 @@ local function RefalshJoinsRedPoint(self)
     for i = 0, self.list_familys.numItems - 1 do
         local groups = DataManager.groups.groupList
         local group = groups[i + 1]
-        local player = group.memberMap[DataManager.SelfUser.account_id]
-
-        if player.lev == 3 then
-            return
-        end
-
-        local redPointNum = self._group.joins
-        if redPointNum > 99 then
-            redPointNum = "99+"
-        end
 
         local obj = self.list_familys:GetChildAt(i)
 

lua_probject/base_project/Game/View/FamilyView.lua

@@ -50,10 +50,14 @@ local function ReflashJoinsRedPoint(self)
     for _, group in pairs(DataManager.groups.groupList) do
         local player = group.memberMap[DataManager.SelfUser.account_id]
 
+        --[[
         if player.lev ~= 3 then
             _joins = _joins + group.joins
             return
         end
+        ]]
+
+        _joins = _joins + group.joins
     end
 
     btn_myfamilycRedPoint.selectedIndex = 0
@@ -383,12 +387,6 @@ function M:UpdataRedPointAuditNumber(obj)
         return
     end
 
-    local player = self._group.memberMap[DataManager.SelfUser.account_id]
-
-    if player.lev == 3 then
-        return
-    end
-
     local redPointNum = self._group.joins
     if redPointNum > 99 then
         redPointNum = "99+"
@@ -492,6 +490,7 @@ function M:ChangeNumber(fgCtr, group_id, limit, num, minus_only, sort_type)
             end
             --list_familyNumber.numItems = #self._group.members
             list_familyNumber.numItems = #self.members
+            self:ChangeOther()
             return 1
         end
     end)
@@ -513,34 +512,20 @@ end
 
 function M:OnEnterGroupCallBack()
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_Get_Apply_Count(function(res)
-        print("收到获得申请列表的数量")
-        pt(res)
-        if res.ReturnCode ~= 0 then
-            return
-        end
 
-        local ApplyRp = {}
-        self:ChangeOther()
-        --[[
-        for _,rp in pairs(ApplyRp) do
-            local group = DataManager.groups:get()
-            group.ApplyRedPoint = ApplyRp.
-        end
-        ]]
-    end)
     self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0
 
     FamilyOnline(self._group.id, self)
 
-    ViewUtil.ShowModalWait(self._root_view, "正在加载亲友圈权限中......")
-    self:ChangeOther()
-
     ViewUtil.ShowModalWait(self._root_view, "正在加载成员列表中......")
     self:ChangeNumber(fgCtr, self._group.id, 0, self._group.total_member_num, false, 1)
 
     ViewUtil.ShowModalWait(self._root_view, "正在加载房间列表中......")
     self:UpdateFamilyRoom(fgCtr, self._group.id)
+
+    --ViewUtil.ShowModalWait(self._root_view, "正在加载亲友圈权限中......")
+    --self:ChangeOther()
+
     ViewUtil.CloseModalWait()
 
     self:ReflashChatRoomRedPoint()
@@ -549,6 +534,16 @@ function M:OnEnterGroupCallBack()
 
     fgCtr:FG_Get_Online_Member(self._group.id, function(res)
     end)
+
+    fgCtr:FG_Get_Apply_Count(function(res)
+        print("收到获得申请列表的数量")
+        pt(res)
+        if res.ReturnCode ~= 0 then
+            return
+        end
+
+        self:ChangeOther()
+    end)
 end
 
 function M:UpdateFamilyRoom(fgCtr, id)

wb_unity_pro/Assets/ART/base/main_majiang/bg/bg1.png.meta

@@ -124,5 +124,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: base/main_majiang/de3462a6bae19a6c7308e43e0192028f
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/bg/bg2.png.meta

@@ -124,5 +124,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: base/main_majiang/436191dfae4c9988ef8cf1effa8b6742
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/bg/bg3.png.meta

@@ -124,5 +124,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: base/main_majiang/703f4bfe3ba7f8e7e0643a2f1694170f
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/bg/bg4.png.meta

@@ -124,5 +124,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: base/main_majiang/6ef1b27b11ed6b25e909b69fad627cbe
   assetBundleVariant: 

wb_unity_pro/Assets/StreamingAssets/init1_1.json

@@ -24,34 +24,34 @@
     "bundle": "extend/poker2/suoha"
   },
   {
-    "ver": "1.0.25",
+    "ver": "1.0.26",
     "name": "南城麻将",
     "check": true,
-    "version": "1.0.25",
+    "version": "1.0.26",
     "game_id": "86",
     "bundle": "extend/majiang/nancheng"
   },
   {
-    "ver": "1.0.26",
+    "ver": "1.0.27",
     "name": "黎川麻将",
     "check": true,
-    "version": "1.0.26",
+    "version": "1.0.27",
     "game_id": "87",
     "bundle": "extend/majiang/lichuan"
   },
   {
-    "ver": "1.0.12",
+    "ver": "1.0.13",
     "name": "金溪麻将",
     "check": true,
-    "version": "1.0.12",
+    "version": "1.0.13",
     "game_id": "88",
     "bundle": "extend/majiang/jinxi"
   },
   {
-    "ver": "1.0.11",
+    "ver": "1.0.12",
     "name": "抚州麻将",
     "check": true,
-    "version": "1.0.11",
+    "version": "1.0.12",
     "game_id": "89",
     "bundle": "extend/majiang/fuzhou"
   }

wb_unity_pro/Assets/StreamingAssets/init2_1.json

@@ -1,109 +1,109 @@
 [
   {
     "lua_path": "/tolua_project,/base_project,/main_project",
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "common",
     "check": true,
     "bundle": "base/common",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "login",
     "check": true,
     "bundle": "base/login",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "lobby",
     "check": true,
     "bundle": "base/lobby",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "Family",
     "check": true,
     "bundle": "base/Family",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "chat",
     "check": true,
     "bundle": "base/chat",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "newgroup",
     "check": true,
     "bundle": "base/newgroup",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "rank",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.9",
     "bundle": "base/rank"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "main_majiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.9",
     "bundle": "base/main_majiang"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "main_poker",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.9",
     "bundle": "base/main_poker"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "main_zipai",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.9",
     "bundle": "base/main_zipai"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "static",
     "check": true,
     "bundle": "base/static",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "is_res": true,
     "name": "embed",
     "check": true,
     "bundle": "base/embed",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "main_pokemajiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.9",
     "bundle": "base/main_pokemajiang"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "main_zipaimajiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.9",
     "bundle": "base/main_zipaimajiang"
   }
 ]

wb_unity_pro/ProjectSettings/GraphicsSettings.asset

@@ -38,7 +38,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}