同桌协议调试

lua_probject/base_project/Game/Controller/NewGroupController.lua

@@ -1270,13 +1270,16 @@ end
 ---@param id 亲友圈id 
 ---@param tableId 同桌id
 ---@param table 同桌玩家
-function M:FG_SetBanTable1(id, tableId, table, callback)
+---@param tableName 同桌备注&名字
+function M:FG_SetBanTable1(id, tableId, players, name, callback)
 
     local _data = {}
     _data.id = id
     _data.tableId = tableId
-    _data.table = table
+    _data.table = players
+    _data.tableName = name
     print("发送同桌协议")
+    pt(_data)
     local _client = ControllerManager.GroupClient
     _client:send(Protocol.SET_BAN_TABLE, _data, function(res)
         callback(res)

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

@@ -1,3 +1,5 @@
+local FamilySelectNumber = import(".FamilySelectNumber")
+
 --region LOCAL
 
 local BanDesk = {}
@@ -25,20 +27,19 @@ end
 
 --[[ 禁止同桌数据
 BanDesk.BanData = {
-    { name = "备注1", players = {{name = "大哥", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}, {name = "大哥2", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}} },
+    { name = "备注1", deskList = {{name = "大哥", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}, {name = "大哥2", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}} },
-    { name = "备注2", players = {{name = "大哥", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}, {name = "大哥3", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}} },
+    { name = "备注2", deskList = {{name = "大哥", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}, {name = "大哥3", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}} },
-    { name = "备注3", players = {{name = "大哥", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}, {name = "大哥4", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}} },
+    { name = "备注3", deskList = {{name = "大哥", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}, {name = "大哥4", portrait = "https://thirdwx.qlogo.cn/mmopen/vi_32/Q3auHgzwzM5wiaLFFbHru0weDn6qaXkzW14MLJcqEMxsv2C0EuAxPH1Cf5DGZLmd4EppPeDWlksCuXtFJQC85mw/132"}} },
 
 }]]
 
 function BanDesk:TryShow(r)
-    if not self._view then 
+
-        self:Init()
+    local view = BanDesk.New()
-    end
 
     root = r
     HideMainView()
-    self:Show()
+    view:Show()
 end
 
 function BanDesk:Show()
@@ -51,9 +52,21 @@ function BanDesk:Close()
     ShowMainView()
 end
 
-function BanDesk:Init()
+function BanDesk.New()
     setmetatable(BanDesk, {__index = BaseView})
-    self:InitView("ui://Family/com_banDesk")
+    local inst = setmetatable({}, {__index = BanDesk})
+    inst._close_destroy = true
+    inst._full = true
+    inst._animation = false
+    inst._full_offset = false
+    inst._anim_pop = 0
+    BaseWindow.init(inst, 'ui://Family/com_banDesk')
+    inst:Init()
+    inst._root_view:GetChild("win_mode").visible = false
+    return inst
+end
+
+function BanDesk:Init()
 
     self.btn_close = self._view:GetChild("btn_close")
     self.list_banItem = self._view:GetChild("list_banItem")
@@ -62,11 +75,8 @@ function BanDesk:Init()
         self:Close()
     end)
 
-    --self.list_banItem_model = {}
     self.list_banItem.itemRenderer = function(index, obj)
 
-        --self.list_banItem_model[index]
-
         local data = self.BanData[index +1]
 
         local tex_name = obj:GetChild("tex_name")
@@ -85,15 +95,27 @@ function BanDesk:Init()
             local btn_addPlayer = playerObj:GetChild("btn_addPlayer")
             local tex_name = playerObj:GetChild("tex_name")
 
-            local player = data.players[playerIndex + 1]
+            local player = data.deskList[playerIndex + 1]
 
             tex_name.text = player.name
             ImageLoad.Load(loader_icon, player.portrait)
 
         end
 
-        list_BanedPlayers.numItems = #data.players
+        list_BanedPlayers.numItems = #data.deskList
-        list_BanedPlayers:AddItemFromPool():GetController("cStyle").selectedIndex = 1
+
+        local add_play = list_BanedPlayers:AddItemFromPool()
+        add_play:GetController("cStyle").selectedIndex = 1
+        add_play:GetChild("btn_addPlayer").onClick:Set(function()
+            
+            local view = FamilySelectNumber.New()
+            view:Show(root._group.id, function(number)
+                data.deskList[#data.deskList + 1] = number.uid
+                local fgCtr = ControllerManager.GetController(NewGroupController)
+                fgCtr:FG_SetBanTable1(root._group.id, data.deskId, data.deskList, data.deskName, function() self:Reflash() end)
+            end)
+        end)
+
     end
 
 end
@@ -107,24 +129,26 @@ function BanDesk:Reflash()
         pt(res)
         self.BanData = res.Data.ban_list
         self.list_banItem.numItems = #self.BanData
-        self:GetBanTableCallback()
+        self:GetBanTableCallback(res)
     end)
 end
 
-function BanDesk:GetBanTableCallback()
+function BanDesk:GetBanTableCallback(res)
     print("BanDesk:GetBanTableCallback")
+
+    self.BanData = res.Data.ban_list
+    self.list_banItem.numItems = #self.BanData
+
     -- 最后一个添加ban按钮
     local addBanItem = self.list_banItem:AddItemFromPool()
     local btn_addBanItem = addBanItem:GetChild("btn_addBanItem")
     addBanItem:GetController("cStyle").selectedIndex = 1
-
     btn_addBanItem.onClick:Set(function()
         local fgCtr = ControllerManager.GetController(NewGroupController)
         local groupId = root._group.id
         local banList = {}
-            fgCtr:FG_SetBanTable1(groupId, -1, banList, function(res)
+        fgCtr:FG_SetBanTable1(groupId, -1, banList, "新建关系", function()
-                print("收到同桌协议")
+            self:Reflash()
-                pt(res)
         end)
     end)
 end

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

@@ -39,22 +39,21 @@ end
 
 function FamilyMyFamily:Refalsh()
 
-    --local family = root._group
+    self.family = DataManager.groups.groupMap[self.groupId]
-    local family = DataManager.groups.groupMap[self.groupId]
 
-    self.tex_fName.text = family.name
+    self.tex_fName.text = self.family.name
-    self.tex_playerName.text = "亲友圈号:" .. family.id
+    self.tex_playerName.text = "亲友圈号:" .. self.family.id
-    self.tex_fNumber.text = family.member_num
+    self.tex_fNumber.text = self.family.member_num
-    self.tex_cradNum.text = family.diamo
+    self.tex_cradNum.text = self.family.diamo
-    self.tex_nocice.text = family.notice
+    self.tex_nocice.text = self.family.notice
-    ImageLoad.Load(family.o_portrait, self.loader_icon)
+    ImageLoad.Load(self.family.o_portrait, self.loader_icon)
 
-    self.cStyle.selectedIndex = family.lev -1
+    self.cStyle.selectedIndex = self.family.lev -1
 
     -- index = 0 是显示隐藏按钮
-    self.showNumber = family.isShow
+    self.showNumber = self.family.isShow
-    print("family.isShow",family.isShow)
+    print("self.family.isShow",self.family.isShow)
-    pt(family)
+    pt(self.family)
     if self.showNumber == 0 then
         self.cDisplayNumber.selectedIndex = 1
         self.tex_fNumber.text = "*"
@@ -70,6 +69,7 @@ function FamilyMyFamily:Init()
     self._full = true
     self._animation = false
     self._full_offset = false
+    self._anim_pop = 0
     BaseWindow.init(self, 'ui://Family/com_myFamily')
     -- 隐藏背景图
     self._root_view:GetChild("win_mode").visible = false
@@ -128,8 +128,7 @@ function FamilyMyFamily:Init()
 
     self.btn_checkNumber.onClick:Set(function()
         self:Close()
-        local family = DataManager.groups.groupMap[self.groupId]
+        root:OpenAllNumber(self.family)
-        root:OpenAllNumber(family)
     end)
 
     self.btn_applyMsg.onClick:Set(function()
@@ -139,8 +138,8 @@ function FamilyMyFamily:Init()
 
     self.btn_quitFamily.onClick:Set(function()
         local fgCtr = ControllerManager.GetController(NewGroupController)
-        print("发送了退出协议 familyid = ",root._group.id)
+        print("发送了退出协议 familyid = ",self.family.id)
-        fgCtr:FG_ExitGroup(root._group.id, function(res)
+        fgCtr:FG_ExitGroup(self.family.id, function(res)
             pt(res)
         end)
     end)
@@ -158,26 +157,25 @@ function FamilyMyFamily:Init()
     end)
 
     self.btn_confirmNotice.onClick:Set(function()
-        local family = root._group
         local fgCtr = ControllerManager.GetController(NewGroupController)
         fgCtr:FG_UpdateGroupInfo(
-            family.id,
+            self.family.id,
-            family.name,
+            self.family.name,
             self.input_notice.text,
-            not family.ban,
+            not self.family.ban,
-            family.dissolve_opt,
+            self.family.dissolve_opt,
-            family.kick_opt,
+            self.family.kick_opt,
-            family.apply,
+            self.family.apply,
-            family.ban_chat1,
+            self.family.ban_chat1,
-            family.ban_chat2,
+            self.family.ban_chat2,
-            family.option,
+            self.family.option,
             0,
             function(res)
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "更改公告失败,请稍后再试")
                 else
                     ViewUtil.ErrorTip(res.ReturnCode, "修改成功！")
-                    family.notice = self.input_notice.text
+                    self.family.notice = self.input_notice.text
                     self:Refalsh()
                     self.cWindow.selectedIndex = 0
                 end
@@ -186,34 +184,51 @@ function FamilyMyFamily:Init()
     end)
 
     self.btn_hideNumber.onClick:Set(function()
-        local family = root._group
+
-        local fgCtr = ControllerManager.GetController(NewGroupController)
+        if self.isShowContenting == true then 
-        fgCtr:FG_SetGroupShow(0, family.id, function (res)
+            ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后再试。。")
-            print("收到协议M:FG_SetGroupShow")
-            pt(res)
-            if res.ReturnCode ~= 0 then 
             return
         end
-            --self.showNumber = 0
+
-            local family = DataManager.groups.groupMap[self.groupId]
+        print("点击了")
-            family.isShow = 0
+
+        local fgCtr = ControllerManager.GetController(NewGroupController)
+        self.isShowContenting = true 
+        fgCtr:FG_SetGroupShow(0, self.family.id, function (res)
+            print("收到协议M:FG_SetGroupShow")
+            pt(res)
+            self.isShowContenting = false
+            if res.ReturnCode ~= 0 then 
+                ViewUtil.ShowBannerOnScreenCenter("设置失败，请稍后再试。。")
+                return
+            end
+            self.family.isShow = 0
             self:Refalsh()
+            ViewUtil.ShowBannerOnScreenCenter("设置成功")
         end)
     end)
 
     self.btn_showNumber.onClick:Set(function()
-        local family = root._group
+        if self.isShowContenting == true then 
-        local fgCtr = ControllerManager.GetController(NewGroupController)
+            ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后再试。。")
-        fgCtr:FG_SetGroupShow(1, family.id, function (res)
-            print("收到协议M:FG_SetGroupShow")
-            pt(res)
-            if res.ReturnCode ~= 0 then 
             return
         end
-            --self.showNumber = 1
+
-            local family = DataManager.groups.groupMap[self.groupId]
+        print("点击了")
-            family.isShow = 1
+
+        local fgCtr = ControllerManager.GetController(NewGroupController)
+        self.isShowContenting = true 
+        fgCtr:FG_SetGroupShow(1, self.family.id, function (res)
+            print("收到协议M:FG_SetGroupShow")
+            pt(res)
+            self.isShowContenting = false
+            if res.ReturnCode ~= 0 then 
+                ViewUtil.ShowBannerOnScreenCenter("设置失败，请稍后再试。。")
+                return
+            end
+            self.family.isShow = 1
             self:Refalsh()
+            ViewUtil.ShowBannerOnScreenCenter("设置成功")
         end)
     end)
 

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

@@ -26,6 +26,8 @@ function FamilyMyfamilyList.New(root)
     Instance._full = true
     Instance._close_destroy = true
     Instance._full_offset = false
+    Instance._anim_pop = 0
+    Instance._animation = false
 
     BaseWindow.init(Instance, "ui://Family/com_myFamilyList")
     -- 隐藏背景图

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

@@ -0,0 +1,57 @@
+local FamilySelectNumber = {}
+
+function FamilySelectNumber.New()
+    setmetatable(FamilySelectNumber, { __index = BaseWindow})
+    local inst = setmetatable({}, { __index = FamilySelectNumber})
+    inst._full = true
+    inst._close_destroy = true
+    inst._full_offset = false
+    inst._anim_pop = 0
+    inst._animation = false
+
+    BaseWindow.init(inst, "ui://Family/com_SelectNumber")
+    
+    inst:Init()
+
+    return inst
+end
+
+function FamilySelectNumber:Show(groupId, callback)
+    self.group = DataManager.groups.groupMap[groupId]
+    self.callback = callback
+    self.list_number.numItems = #self.group.members
+    BaseWindow.Show(self)
+end
+
+function FamilySelectNumber:Init()
+    self.list_number = self._view:GetChild("list_number")
+    self.btn_search = self._view:GetChild("btn_search")
+    self.btn_close = self._view:GetChild("btn_close")
+
+    self.btn_search.onClick:Set(function()
+        
+    end)
+
+    self.btn_close.onClick:Set(function()
+        self:Close()
+    end)
+
+    self.list_number.itemRenderer = function(index, obj)
+        local i = index + 1
+        local player = self.group.members[i]
+        obj:GetController('lev').selectedIndex = player.lev - 1
+        obj:GetController('ban').selectedIndex = player.ban
+        obj:GetChild('name').text = player.nick
+        obj:GetChild('id').text = string.format("ID:%s", player.uid)
+        obj.onClick:Set(function()
+            if self.callback then 
+                self.callback(player)
+            end
+            self.callback = nil
+            self:Close()
+        end)
+    end
+    
+end
+
+return FamilySelectNumber

wb_new_ui/assets/Family/BanDesk/Component/item_banItem.xml

@@ -9,7 +9,7 @@
     <image id="n3_jw05" name="n3" src="jw057d2o" fileName="BanDesk/Image/Rectangle 257.png" xy="0,0" size="558,114" group="n10_jw05"/>
     <text id="n4_jw05" name="tex_name" xy="0,26" size="558,64" group="n10_jw05" font="ui://27vd145bg2mo7ij0" fontSize="48" color="#8b6914" align="center" vAlign="middle" autoSize="none" text="名称备注名称备注"/>
     <component id="n5_jw05" name="btn_edit" src="jw057d2q" fileName="BanDesk/Component/btn_edit.xml" xy="474,30" group="n10_jw05"/>
-    <list id="n7_jw05" name="list_BanedPlayers" xy="28,150" size="501,311" group="n10_jw05" layout="flow_hz" overflow="hidden" lineGap="18" colGap="30" defaultItem="ui://htcn7v3rjw057d2r" autoClearItems="true">
+    <list id="n7_jw05" name="list_BanedPlayers" xy="28,150" size="501,311" group="n10_jw05" layout="flow_hz" overflow="hidden" lineGap="18" colGap="30" defaultItem="ui://htcn7v3rjw057d2r" renderOrder="descent" autoClearItems="true">
       <item/>
       <item/>
       <item/>

wb_new_ui/assets/Family/SelectNumber/com_SelectNumber.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="2532,1170">
+  <displayList>
+    <image id="n0_txni" name="n0" src="86ct7cwm" fileName="NumberList/Image/numberListTitle.png" xy="1014,19"/>
+    <image id="n1_txni" name="n1" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="387,166" size="1758,984"/>
+    <image id="n2_txni" name="n2" src="86ct7cvb" fileName="GamePlay/Image/Rectangle 112.png" xy="402,184" size="1728,948"/>
+    <image id="n3_txni" name="n3" src="c8pn7cyw" fileName="NumberList/Image/Rectangle 113.png" xy="408,190"/>
+    <image id="n4_txni" name="n4" src="c8pn7cyx" fileName="NumberList/Image/Rectangle 261.png" xy="444,196"/>
+    <text id="n5_txni" name="input_search" xy="474,196" size="1377,72" font="Alibaba PuHuiTi 3.0" fontSize="42" vAlign="middle" autoSize="none" autoClearText="true" text="测试" input="true"/>
+    <list id="n6_txni" name="list_number" xy="474,297" size="1584,816" layout="flow_hz" overflow="scroll" lineGap="30" colGap="24" defaultItem="ui://htcn7v3r86ct7cwj" align="center" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n7_txni" name="btn_search" src="86ct7cwi" fileName="NumberList/Component/btn_search.xml" xy="1863,196" size="204,72"/>
+    <component id="n9_txni" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6"/>
+  </displayList>
+</component>

wb_new_ui/assets/Family/package.xml

@@ -333,6 +333,7 @@
     <image id="j0cy7d4s" name="Rectangle 266.png" path="/ChatRoom/Image/" scale="9grid" scale9grid="7,20,39,13"/>
     <image id="j0cy7d4t" name="Component 1.png" path="/MyFamily/Image/"/>
     <component id="j0cy7d4u" name="btn_showNumber.xml" path="/MyFamily/Component/"/>
+    <component id="txni7d4v" name="com_SelectNumber.xml" path="/SelectNumber/" exported="true"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>