合并冲突

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

@@ -4,9 +4,10 @@ local FamilyInviteFamilyView = {}
 
 local M = FamilyInviteFamilyView
 
-function FamilyInviteFamilyView.new(root)
+function FamilyInviteFamilyView.new(group, root)
     setmetatable(M, { __index = root })
     local self = setmetatable({}, { __index = M })
+    self._group = group
     local numbers = self._group.members
     print("lingmengFamilyInviteFamilyView", self._group.lev)
     pt(self._group)

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

@@ -1,3 +1,6 @@
+--local NumberRemark = import(".FamilyNumberRemark")
+local GroupSetTagView = import("..NewGroup.GroupSetTagView")
+
 local FamilyAuditNumber = {}
 
 local M = FamilyAuditNumber
@@ -46,8 +49,11 @@ function M:ClickBtn(isAllow, uid)
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败")
         else
-            ViewUtil.ShowOneChooose("审核成功")
+            --ViewUtil.ShowOneChooose("审核成功")
             self:InitList()
+            --NumberRemark:TryShow()
+            local tagView = GroupSetTagView.new(self._group.id, uid)
+            tagView:Show()
         end
     end)
 end

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

@@ -118,9 +118,10 @@ function FamilyJoinAndCreate:JoinRoom(roomId)
     --后端似乎还未调通
     self:ClearNumTex()
     fgCtr:FG_JoinGroup(tonumber(roomId), function(res)
-        if res.ReturnCode ~= 0 then
+        if res.ReturnCode == 0 then
-            ViewUtil.ShowOneChooose("加入失败" .. res.ReturnCode)
+            ViewUtil.ShowOneChooose("已申请加入亲友圈" .. res.ReturnCode)
         else
+            ViewUtil.ShowOneChooose("申请加入亲友圈失败" .. res.ReturnCode)
         end
     end)
     --先换成邀请玩家

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

@@ -15,30 +15,16 @@ end
 
 --endregion
 
-function FamilyMyFamily:TryShow(r)
+function FamilyMyFamily:TryShow(groupId, r)
     self:Init()
     root = r
+    self.groupId = groupId
     self:Show()
 end
 
 function FamilyMyFamily:Show()
 
-    local family = root._group
+    self:Refalsh()
-    pt(family)
-    if not family then
-        -- 跳转创建家族界面
-        root:CreateFamily()
-        return
-    end
-
-    self.tex_fName.text = family.name
-    self.tex_playerName.text = "亲友圈号:" .. family.id
-    self.tex_fNumber.text = family.member_num
-    self.tex_cradNum.text = family.diamo
-    self.tex_nocice.text = family.notice
-    ImageLoad.Load(family.o_portrait, self.loader_icon)
-
-    self.cStyle.selectedIndex = family.lev -1
 
     HideMainView()
     BaseWindow.Show(self)
@@ -49,13 +35,30 @@ function FamilyMyFamily:Close()
     ShowMainView()
 end
 
+function FamilyMyFamily:Refalsh()
+
+    --local family = root._group
+    local family = DataManager.groups.groupMap[self.groupId]
+
+    self.tex_fName.text = family.name
+    self.tex_playerName.text = "亲友圈号:" .. family.id
+    self.tex_fNumber.text = family.member_num
+    self.tex_cradNum.text = family.diamo
+    self.tex_nocice.text = family.notice
+    ImageLoad.Load(family.o_portrait, self.loader_icon)
+
+    self.cStyle.selectedIndex = family.lev -1
+end
+
 function FamilyMyFamily:Init()
     setmetatable(FamilyMyFamily, { __index = BaseWindow })
-    BaseWindow.init(self, 'ui://Family/com_myFamily')
+
-    -- 设置成组件的形式
     self._close_destroy = true
     self._full = true
     self._animation = false
+    self._full_offset = false
+    BaseWindow.init(self, 'ui://Family/com_myFamily')
+    -- 隐藏背景图
     self._root_view:GetChild("win_mode").visible = false
 
     self._view:GetChild("btn_close").onClick:Set(function()
@@ -77,8 +80,15 @@ function FamilyMyFamily:Init()
     self.btn_applyMsg = self._view:GetChild("btn_applyMsg")
     self.btn_buyCrad = self._view:GetChild("btn_buyCrad")
     self.btn_checkNumber = self._view:GetChild("btn_checkNumber")
+    self.btn_editNotice = self._view:GetChild("btn_editNotice")
+    self.btn_quitNotice = self._view:GetChild("btn_quitNotice")
+    self.btn_bgNotice = self._view:GetChild("btn_bgNotice")
+    self.btn_confirmNotice = self._view:GetChild("btn_confirmNotice")
+
+    self.input_notice = self._view:GetChild("input_notice")
 
     self.cStyle = self._view:GetController("cStyle")
+    self.cWindow = self._view:GetController("cWindow")
 
     self.btn_playSet.onClick:Set(function()
         self:Close()
@@ -97,7 +107,8 @@ function FamilyMyFamily:Init()
 
     self.btn_checkNumber.onClick:Set(function()
         self:Close()
-        root:AllNumber()
+        local family = DataManager.groups.groupMap[self.groupId]
+        root:OpenAllNumber(family)
     end)
 
     self.btn_applyMsg.onClick:Set(function()
@@ -113,6 +124,46 @@ function FamilyMyFamily:Init()
         end)
     end)
 
+    self.btn_quitNotice.onClick:Set(function()
+        self.cWindow.selectedIndex = 0
+    end)
+
+    self.btn_bgNotice.onClick:Set(function()
+        self.cWindow.selectedIndex = 0
+    end)
+
+    self.btn_editNotice.onClick:Set(function()
+        self.cWindow.selectedIndex = 1
+    end)
+
+    self.btn_confirmNotice.onClick:Set(function()
+        local family = root._group
+        local fgCtr = ControllerManager.GetController(NewGroupController)
+        fgCtr:FG_UpdateGroupInfo(
+            family.id,
+            family.name,
+            self.input_notice.text,
+            not family.ban,
+            family.dissolve_opt,
+            family.kick_opt,
+            family.apply,
+            family.ban_chat1,
+            family.ban_chat2,
+            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:Refalsh()
+                    self.cWindow.selectedIndex = 0
+                end
+            end
+        )
+    end)
+
     return self
 end
 

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

@@ -0,0 +1,99 @@
+local FamilyMyFamily = import(".FamilyMyFamily")
+
+--#region LOCAL
+
+local FamilyMyfamilyList = {}
+
+local function HideMainView(self)
+    self.rootLastIndex = self.FamilyView.familyType.selectedIndex
+    self.FamilyView.familyType.selectedIndex = 0
+end
+
+local function ShowMainView(self)
+    self.FamilyView.familyType.selectedIndex = self.rootLastIndex or 1
+end
+
+--#endregion
+
+function FamilyMyfamilyList:TryShow(root)
+    local Instance = self.New(root)
+    Instance:Show()
+end
+
+function FamilyMyfamilyList.New(root)
+    setmetatable(FamilyMyfamilyList, { __index = BaseWindow })
+    local Instance = setmetatable({}, { __index = FamilyMyfamilyList })
+    Instance._full = true
+    Instance._close_destroy = true
+    Instance._full_offset = false
+
+    BaseWindow.init(Instance, "ui://Family/com_myFamilyList")
+    -- 隐藏背景图
+    Instance._root_view:GetChild("win_mode").visible = false
+
+    Instance.FamilyView = root
+    Instance:Init()
+
+    return Instance
+end
+
+function FamilyMyfamilyList:Refalsh()
+    self.list_familys.numItems = #DataManager.groups.groupList
+end
+
+function FamilyMyfamilyList:Show()
+    HideMainView(self)
+    self:Refalsh()
+    BaseWindow.Show(self)
+end
+
+function FamilyMyfamilyList:Init()
+
+    self.list_familys = self._view:GetChild("list_familys")
+    self.btn_close = self._view:GetChild("btn_close")
+
+    self.btn_close.onClick:Set(function()
+        self:Close()
+    end)
+
+    self.list_familys.itemRenderer = function(index, obj)
+        local groups = DataManager.groups.groupList
+        local group = groups[index +1]
+
+        local tex_familyId = obj:GetChild("tex_familyId")
+        local tex_familyName = obj:GetChild("tex_familyName")
+        local tex_familyNumber = obj:GetChild("tex_familyNumber")
+        local btn_familyManage = obj:GetChild("btn_familyManage")
+        local btn_record = obj:GetChild("btn_record")
+        local btn_rank = obj:GetChild("btn_rank")
+        local loader_icon = obj:GetChild("loader_icon")
+
+        tex_familyId.text = group.id
+        tex_familyName.text = group.name
+        tex_familyNumber.text = group.total_member_num
+        ImageLoad.Load(group.o_portrait, loader_icon)
+
+        btn_familyManage.onClick:Set(function()
+            self:Close()
+            self.FamilyView:OpenMyFamily(group.id)
+        end)
+
+        btn_record.onClick:Set(function()
+            self:Close()
+            self.FamilyView:FamilyRecord()
+        end)
+
+        btn_rank.onClick:Set(function()
+        
+        end)
+    end
+
+    pt(DataManager.groups.groupList)
+end
+
+function FamilyMyfamilyList:Close()
+    ShowMainView(self)
+    BaseWindow.Close(self)
+end
+
+return FamilyMyfamilyList

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

@@ -0,0 +1,42 @@
+local FamilyNumberRemark = {}
+
+function FamilyNumberRemark:TryShow()
+    local inst = self.New()
+    inst:Init()
+    inst:Show()
+end
+
+function FamilyNumberRemark.New()
+    setmetatable(FamilyNumberRemark, { __index = BaseWindow })
+    local inst = setmetatable({}, { __index = FamilyNumberRemark })
+    inst._close_destroy = true
+    inst._close_zone = true
+    BaseWindow.init(inst, "ui://Family/com_numberRemark")
+    
+    inst:Init()
+    return inst
+end
+
+function FamilyNumberRemark:Show()
+    BaseWindow.Show(self)
+end
+
+function FamilyNumberRemark:Init()
+
+    self.input_remark = self._view:GetChild("input_remark")
+    self.btn_quit = self._view:GetChild("btn_quit")
+    self.btn_confirm = self._view:GetChild("btn_confirm")
+    self.btn_bg = self._view:GetChild("btn_bg")
+
+    self.btn_bg.onClick:Set(function()
+        self:Close()
+    end)
+
+    self.btn_quit.onClick:Set(function()
+        self:Close()
+    end)
+
+    self.btn_confirm.onClick:Set()
+end
+
+return FamilyNumberRemark

lua_probject/base_project/Game/View/FamilyView.lua

@@ -14,6 +14,7 @@ local FamilyEventView = import(".Family.FamilyEventView")
 local FamilyBanDesk = import(".Family.FamilyBanDesk")
 local FamilyMyFamily = import(".Family.FamilyMyFamily")
 local FamilyRoomCard = import(".Family.FamilyRoomCard")
+local FamilyMyfamilyList = import(".Family.FamilyMyfamilyList")
 ---
 FamilyView = {}
 
@@ -40,7 +41,12 @@ function M:init(url)
 
     self.familyType = view:GetController('familyType')
     self.btn_close = view:GetChild('btn_close')
+    self.btn_myFamilyList = view:GetChild("btn_myFamilyList")
+    self.btn_creatFamily = view:GetChild("btn_creatFamily")
+    self.btn_joinFamily = view:GetChild("btn_joinFamily")
     self._mgr_ctr = ControllerManager.GetController(GroupMgrController)
+    self.cMyfamilyList = view:GetController("cMyfamilyList")
+    self.btn_quitMyfamilyTab = view:GetChild("btn_quitMyfamilyTab")
 
     self:InitCloseClick()
 
@@ -65,7 +71,27 @@ function M:init(url)
     end
     -------绑定我的亲友圈按钮
     view:GetChild('btn_myfamily').onClick:Set(function()
-        FamilyMyFamily:TryShow(self)
+        self.cMyfamilyList.selectedIndex = 1
+    end)
+
+    self.btn_myFamilyList.onClick:Set(function()
+        self.cMyfamilyList.selectedIndex = 0
+        --FamilyMyFamily:TryShow(self)
+        FamilyMyfamilyList:TryShow(self)
+    end)
+
+    self.btn_creatFamily.onClick:Set(function()
+        self.cMyfamilyList.selectedIndex = 0
+        self:CreateFamily()
+    end)
+
+    self.btn_joinFamily.onClick:Set(function()
+        self.cMyfamilyList.selectedIndex = 0
+        self:CreateFamily()
+    end)
+
+    self.btn_quitMyfamilyTab.onClick:Set(function()
+        self.cMyfamilyList.selectedIndex = 0
     end)
 end
 
@@ -120,9 +146,13 @@ function M:PlayEdit()
     self.lastType = 1
 end
 
+function M:OpenMyFamily(groupId)
+    FamilyMyFamily:TryShow(groupId, self)
+end
+
 function M:AllNumber()
     self.lastType = 1
-    self._child_familyAllNumbers = FamilyAllNumbers.new(self)
+    self._child_familyAllNumbers = FamilyAllNumbers.new(self._group, self)
 end
 
 function M:AuditNumber()
@@ -145,6 +175,11 @@ function M:ShowAllRank()
     self._ViewChild_AllRank:ShouRanks()
 end
 
+function M:OpenAllNumber(group)
+    self.lastType = 1
+    self._child_familyAllNumbers = FamilyAllNumbers.new(group, self)
+end
+
 function M:MoreBtn()
     local ctr_more = self._view:GetController('moreBtn')
     self._view:GetChild('bg_moreBtnBack').onClick:Set(function()

lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua

@@ -4,6 +4,7 @@ local GroupSetTagView = {}
 local M = GroupSetTagView
 
 function GroupSetTagView.new(group_id, member, callback)
+    UIPackage.AddPackage('base/newgroup/ui/NewGroup')
     setmetatable(M, {__index = BaseWindow})
     local self = setmetatable({}, {__index = M})
     self.class = "GroupSetTagView"
@@ -18,14 +19,19 @@ function M:init(url, member)
   	BaseWindow.init(self,url)
 
   	local tex_tag = self._view:GetChild("tex_tag")
+
+    --[[ 你是谁，为什么会在这里
   	if tag ~= 0 then
   		tex_tag.text = member.score
   	end
+    ]]
+
   	self._view:GetChild("btn_ok").onClick:Set(function()
         ViewUtil.ShowModalWait(nil)
-  		local score = tonumber(tex_tag.text) or 0
+  		--local score = tonumber(tex_tag.text) or 0
+        local score = tex_tag.text
         local fgCtr = ControllerManager.GetController(NewGroupController)
-        fgCtr:FG_SetMemberTag(self.group_id, member.uid, score, function(res)
+        fgCtr:FG_SetMemberTag(self.group_id, member, score, function(res)
             if self._is_destroy then
                 return
             end
@@ -34,7 +40,7 @@ function M:init(url, member)
                 ViewUtil.ErrorTip(res.ReturnCode, "备注失败")
             else
                 ViewUtil.ShowBannerOnScreenCenter("备注成功")
-                member.score = score
+                --member.score = score
                 self:Destroy()
                 self.callback(true)
             end

wb_new_ui/assets/Family/CreateAndJoin/com_createAndJoin.xml

@@ -14,9 +14,9 @@
     <image id="n10_n74n" name="n10" src="86ct7cvp" fileName="CreateAndJoin/Image/image 43.png" xy="879,705" group="n15_n74n"/>
     <image id="n5_n74n" name="n5" src="n74n7d15" fileName="CreateAndJoin/Image/Group 141.png" xy="789,435" group="n15_n74n"/>
     <text id="n6_n74n" name="n6" xy="800,318" size="674,86" group="n15_n74n" font="ui://27vd145bh35o7ill" fontSize="66" color="#9e3635" align="center" vAlign="middle" autoSize="none" text="请输入俱乐部号"/>
-    <text id="n8_n74n" name="text_FamilyId" xy="821,458" size="664,76" group="n15_n74n" font="ui://27vd145bh35o7iju" fontSize="54" color="#ffffff" vAlign="middle" letterSpacing="76" autoSize="none" text="999999"/>
+    <text id="n8_n74n" name="text_FamilyId" xy="821,458" size="664,76" group="n15_n74n" font="ui://27vd145bh35o7iju" fontSize="54" color="#ffffff" vAlign="middle" letterSpacing="76" autoSize="none" autoClearText="true" text="999999"/>
     <text id="n9_n74n" name="n9" xy="816,582" size="642,98" group="n15_n74n" font="ui://27vd145bh35o7ill" fontSize="36" color="#9e3635" autoSize="none" text="小提示:您可以根据朋友分享的俱乐部口令加入他的亲友圈"/>
-    <list id="n14_n74n" name="list_keyBoard" xy="1527,325" size="678,700" group="n15_n74n" layout="flow_hz" overflow="scroll" lineGap="18" colGap="24" defaultItem="ui://htcn7v3r86ct7cw6">
+    <list id="n14_n74n" name="list_keyBoard" xy="1527,325" size="678,700" group="n15_n74n" layout="flow_hz" overflow="hidden" lineGap="18" colGap="24" defaultItem="ui://htcn7v3r86ct7cw6" align="center" vAlign="middle">
       <relation target="" sidePair="width-width,height-height"/>
       <item>
         <property target="text_num" propertyId="0" value="1"/>

wb_new_ui/assets/Family/Main.xml

@@ -9,8 +9,9 @@
   <controller name="lev" pages="0,1,1,2,2,3" selected="0"/>
   <controller name="moreBtn" pages="0,,1," selected="0"/>
   <controller name="familyBan" pages="0,,1," selected="0"/>
+  <controller name="cMyfamilyList" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n33_86ct" name="n33" src="jrro7cyp" fileName="Main/Image/loginBg.png" xy="1,0" group="n17_in3i">
+    <image id="n33_86ct" name="n33" src="jrro7cyp" fileName="Main/Image/loginBg.png" xy="1,0" size="2531,1170" group="n17_in3i">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n14_in3i" name="n14" src="jrro7cyd" fileName="Main/Image/bt_top.png" xy="0,0" group="n17_in3i">
@@ -19,7 +20,7 @@
     <component id="n3_in3i" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6" group="n17_in3i"/>
     <group id="n17_in3i" name="bg" xy="0,0" size="2532,1170"/>
     <image id="n11_in3i" name="n11" src="jrro7cye" fileName="Main/Image/bg_topTitle.png" xy="1036,23" group="n34_86ct"/>
-    <component id="n10_in3i" name="btn_family_record" src="in3i7cud" fileName="Main/Component/btn_family_record.xml" xy="399,15" size="328,108" group="n34_86ct">
+    <component id="n10_in3i" name="btn_family_record" src="in3i7cud" fileName="Main/Component/btn_family_record.xml" xy="399,14" size="328,108" group="n34_86ct">
       <gearDisplay controller="lev" pages="0,1"/>
       <relation target="" sidePair="left-left%,top-top%"/>
     </component>
@@ -27,23 +28,23 @@
     <component id="n8_in3i" name="btn_showALlStartRoom" src="in3i7cuc" fileName="Main/Component/btn_showALlStartRoom.xml" xy="1849,29" group="n34_86ct">
       <gearDisplay controller="lev" pages="0,1"/>
     </component>
-    <image id="n353_jrro" name="n353" src="jrro7cy2" fileName="Main/Image/bg_left1.png" xy="28,143" group="n360_jrro">
+    <image id="n353_jrro" name="n353" src="jrro7cy2" fileName="Main/Image/bg_left1.png" xy="28,143" size="420,1011" group="n360_jrro">
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
-    <image id="n354_jrro" name="n354" src="jrro7cyn" fileName="Main/Image/bg_left2.png" xy="48,161" group="n360_jrro">
+    <image id="n354_jrro" name="n354" src="jrro7cyn" fileName="Main/Image/bg_left2.png" xy="48,161" size="384,978" group="n360_jrro">
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
     <group id="n360_jrro" name="bg_left" xy="28,143" size="420,1011" group="n34_86ct"/>
-    <image id="n355_jrro" name="n355" src="jrro7cyl" fileName="Main/Image/bg_main1.png" xy="460,143" group="n362_jrro">
+    <image id="n355_jrro" name="n355" src="jrro7cyl" fileName="Main/Image/bg_main1.png" xy="460,143" size="2070,1011" group="n362_jrro">
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
-    <image id="n356_jrro" name="n356" src="jrro7cyk" fileName="Main/Image/bg_main2.png" xy="480,161" group="n362_jrro">
+    <image id="n356_jrro" name="n356" src="jrro7cyk" fileName="Main/Image/bg_main2.png" xy="479,161" size="2034,978" group="n362_jrro">
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
-    <image id="n357_jrro" name="n357" src="jrro7cyj" fileName="Main/Image/bg_main3.png" xy="490,278" group="n362_jrro">
+    <image id="n357_jrro" name="n357" src="jrro7cyj" fileName="Main/Image/bg_main3.png" xy="490,278" size="2010,852" group="n362_jrro">
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
-    <image id="n358_jrro" name="n358" src="jrro7cyi" fileName="Main/Image/bg_main4.png" xy="859,290" group="n362_jrro">
+    <image id="n358_jrro" name="n358" src="jrro7cyi" fileName="Main/Image/bg_main4.png" xy="859,290" size="1632,828" group="n362_jrro">
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
     <image id="n363_jrro" name="n363" src="jrro7cyf" fileName="Main/Image/bg_mainOpenGame.png" xy="871,299" group="n362_jrro"/>
@@ -55,7 +56,7 @@
       <relation target="n5_in3i" sidePair="center-center,bottom-bottom%"/>
     </text>
     <group id="n23_in3i" name="inviteFriends" xy="514,323" size="321,99" group="n34_86ct"/>
-    <list id="n19_in3i" name="list_other" xy="48,161" size="384,978" group="n34_86ct" overflow="scroll" defaultItem="ui://htcn7v3rin3i7cun" autoClearItems="true">
+    <list id="n19_in3i" name="list_other" xy="48,161" size="384,977" group="n34_86ct" overflow="scroll" defaultItem="ui://htcn7v3rin3i7cun" autoClearItems="true">
       <relation target="" sidePair="height-height%,left-left%"/>
       <item/>
       <item/>
@@ -80,7 +81,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n24_in3i" name="list_familyNumber" xy="516,437" size="322,679" group="n34_86ct" overflow="scroll" lineGap="13" defaultItem="ui://htcn7v3rin3i7cur">
+    <list id="n24_in3i" name="list_familyNumber" xy="515,437" size="322,679" group="n34_86ct" overflow="scroll" lineGap="13" defaultItem="ui://htcn7v3rin3i7cur">
       <relation target="" sidePair="height-height,left-left%"/>
       <item/>
       <item/>
@@ -88,14 +89,14 @@
       <item/>
       <item/>
     </list>
-    <list id="n28_in3i" name="list_room" xy="870,367" size="1620,743" group="n34_86ct" overflow="scroll" lineGap="10" defaultItem="ui://htcn7v3rin3i7cuh" autoClearItems="true">
+    <list id="n28_in3i" name="list_room" xy="869,367" size="1620,743" group="n34_86ct" overflow="scroll" lineGap="10" defaultItem="ui://htcn7v3rin3i7cuh" autoClearItems="true">
       <relation target="" sidePair="height-height,left-left%"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <text id="n364_jrro" name="n364" xy="1606,308" size="147,42" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="30" color="#444444" text="dangqian">
+    <text id="n364_jrro" name="n364" xy="1605,308" size="147,42" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="30" color="#444444" text="dangqian">
       <relation target="n28_in3i" sidePair="center-center,bottom-top"/>
     </text>
     <graph id="n371_ajr3" name="bh_ban" xy="860,297" size="1644,814" group="n34_86ct" type="rect" lineSize="0" fillColor="#66000000">
@@ -106,7 +107,7 @@
       <gearDisplay controller="familyBan" pages="1"/>
     </text>
     <component id="n381_ieus" name="btn_chatRoom" src="ieus7d1c" fileName="Main/Component/btn_chatRoom.xml" xy="584,1020" group="n34_86ct"/>
-    <group id="n34_86ct" name="main" xy="28,15" size="2502,1139" advanced="true">
+    <group id="n34_86ct" name="main" xy="28,14" size="2502,1140" advanced="true">
       <gearDisplay controller="familyType" pages="0"/>
     </group>
     <image id="n35_86ct" name="n35" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="297,171" size="2034,981" group="n39_86ct"/>
@@ -175,5 +176,13 @@
       <gearDisplay controller="moreBtn" pages="1"/>
     </group>
     <text id="n87_qz7i" name="n87" xy="-503,661" size="0,0" fontSize="66" color="#ffffff" bold="true" text=""/>
+    <component id="n390_yk1o" name="btn_quitMyfamilyTab" src="sfjv7d3g" fileName="MyFamily/Component/btn_bg.xml" xy="0,0" size="2532,1170" group="n386_yk1o" alpha="0"/>
+    <image id="n385_yk1o" name="n385" src="yk1o7d41" fileName="MyFamily/Image/Group 556.png" xy="2185,110" group="n386_yk1o"/>
+    <component id="n387_yk1o" name="btn_myFamilyList" src="yk1o7d42" fileName="MyFamily/Component/btn_myFamilylist.xml" xy="2186,109" size="234,91" group="n386_yk1o"/>
+    <component id="n388_yk1o" name="btn_creatFamily" src="yk1o7d42" fileName="MyFamily/Component/btn_myFamilylist.xml" xy="2186,201" size="234,91" group="n386_yk1o"/>
+    <component id="n389_yk1o" name="btn_joinFamily" src="yk1o7d42" fileName="MyFamily/Component/btn_myFamilylist.xml" xy="2186,292" size="234,91" group="n386_yk1o"/>
+    <group id="n386_yk1o" name="n386" xy="0,0" size="2532,1170" advanced="true">
+      <gearDisplay controller="cMyfamilyList" pages="1"/>
+    </group>
   </displayList>
 </component>

wb_new_ui/assets/Family/MyFamily/Component/btn_bg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,20" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n0_sfjv" name="n0" xy="0,0" size="100,20" alpha="0.35" touchable="false" type="rect" lineSize="0" fillColor="#ff000000">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Family/MyFamily/Component/btn_confirmNotice.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="423,162" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_sfjv" src="sfjv7d3m" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

wb_new_ui/assets/Family/MyFamily/Component/btn_editNotice.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="48,60" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_sfjv" src="ieus7d1y" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

wb_new_ui/assets/Family/MyFamily/Component/btn_familyManage.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="310,120" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_yk1o" name="n0" src="yk1o7d3v" fileName="MyFamily/Image/hall_club_common_club_liebiao_btntext_guanli.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button downEffect="dark" downEffectValue="0.9"/>
+</component>

wb_new_ui/assets/Family/MyFamily/Component/btn_familyRank.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="366,120" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_yk1o" name="n0" src="yk1o7d3t" fileName="MyFamily/Image/4-1.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button downEffect="dark" downEffectValue="0.9"/>
+</component>

wb_new_ui/assets/Family/MyFamily/Component/btn_familyRecord.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="304,120" pivot="0.5,0.5" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_yk1o" name="n0" src="yk1o7d3u" fileName="MyFamily/Image/4-4.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button downEffect="dark" downEffectValue="0.9"/>
+</component>

wb_new_ui/assets/Family/MyFamily/Component/btn_myFamilylist.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="229,91" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="1"/>
+  <displayList>
+    <graph id="n0_yk1o" name="n0" xy="0,0" size="229,91" alpha="0" touchable="false" type="rect" lineSize="0" fillColor="#ff999999">
+      <gearDisplay controller="button" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <graph id="n1_yk1o" name="n1" xy="0,0" size="229,91" alpha="0" touchable="false" type="rect" lineSize="0" fillColor="#ff999999">
+      <gearDisplay controller="button" pages="2"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <graph id="n2_yk1o" name="n2" xy="0,0" size="229,91" alpha="0.4" touchable="false" type="rect" lineSize="0" fillColor="#ff999999">
+      <gearDisplay controller="button" pages="1,3"/>
+      <gearLook controller="button" pages="1" values="0.4,0,0,0" default="0,0,0,0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+  </displayList>
+  <Button downEffect="dark" downEffectValue="0.8"/>
+</component>

wb_new_ui/assets/Family/MyFamily/Component/btn_quitNotice.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="162,162" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_sfjv" src="sfjv7d3j" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

wb_new_ui/assets/Family/MyFamily/Component/item_myFamilyList.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1980,234">
+  <displayList>
+    <image id="n0_yk1o" name="n0" src="yk1o7d3r" fileName="MyFamily/Image/Rectangle 259.png" xy="0,0" size="1980,249"/>
+    <loader id="n1_yk1o" name="loader_icon" xy="30,24" size="186,186"/>
+    <image id="n2_yk1o" name="n2" src="yk1o7d3s" fileName="MyFamily/Image/Rectangle 260.png" xy="246,24" size="1710,186"/>
+    <component id="n3_yk1o" name="btn_rank" src="yk1o7d3x" fileName="MyFamily/Component/btn_familyRank.xml" xy="912,57"/>
+    <component id="n4_yk1o" name="btn_record" src="yk1o7d3y" fileName="MyFamily/Component/btn_familyRecord.xml" xy="1299,57"/>
+    <component id="n5_yk1o" name="btn_familyManage" src="yk1o7d3z" fileName="MyFamily/Component/btn_familyManage.xml" xy="1623,57"/>
+    <image id="n6_yk1o" name="n6" src="yk1o7d40" fileName="MyFamily/Image/hall_club_common_club_liebiao_icon_renshu.png" xy="555,54"/>
+    <text id="n7_yk1o" name="tex_familyId" xy="282,52" size="243,49" font="ui://27vd145bg2mo7ij0" fontSize="36" color="#940f0e" vAlign="middle" autoSize="none" text="940F0E"/>
+    <text id="n8_yk1o" name="tex_familyName" xy="282,112" size="292,64" font="ui://27vd145bg2mo7ij0" fontSize="48" color="#333333" vAlign="middle" autoSize="none" text="333333"/>
+    <text id="n9_yk1o" name="tex_familyNumber" xy="595,43" size="272,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#333333" vAlign="middle" autoSize="none" text="333333"/>
+  </displayList>
+</component>

wb_new_ui/assets/Family/MyFamily/com_myFamily.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="cStyle" pages="0,,1,,2," selected="0">
+  <controller name="cStyle" pages="0,,1,,2," selected="1">
-    <remark page="0" value="普通"/>
+    <remark page="0" value="群主"/>
     <remark page="1" value="助理"/>
-    <remark page="2" value="群主"/>
+    <remark page="2" value="普通"/>
+  </controller>
+  <controller name="cWindow" pages="0,,1," selected="0">
+    <remark page="1" value="修改公告界面"/>
   </controller>
   <displayList>
     <image id="n0_ieus" name="n0" src="mc627d05" fileName="Main/Image/Rectangle 91.png" xy="228,165" size="2076,993"/>
@@ -25,36 +28,50 @@
     <text id="n11_ieus" name="n11" xy="830,468" size="342,86" font="ui://27vd145bh35o7il2" fontSize="66" color="#444444" align="right" vAlign="middle" autoSize="none" text="亲友圈成员"/>
     <text id="n12_ieus" name="n12" xy="830,578" size="342,86" font="ui://27vd145bh35o7il2" fontSize="66" color="#444444" align="right" vAlign="middle" autoSize="none" text="剩余房卡数"/>
     <text id="n13_ieus" name="n13" xy="830,688" size="342,86" font="ui://27vd145bh35o7il2" fontSize="66" color="#444444" align="right" vAlign="middle" autoSize="none" text="公告"/>
-    <text id="n16_ieus" name="tex_fName" xy="1233,256" size="987,77" font="ui://27vd145bh35o7il2" fontSize="54" color="#111111" autoSize="none" text="文本文本文本文本文本文本文本"/>
+    <text id="n16_ieus" name="tex_fName" xy="1233,256" size="987,77" font="ui://27vd145bh35o7il2" fontSize="54" color="#111111" autoSize="none" autoClearText="true" text="文本文本文本文本文本文本文本"/>
-    <text id="n17_ieus" name="tex_wxId" xy="1233,364" size="987,77" font="ui://27vd145bh35o7il2" fontSize="54" color="#111111" autoSize="none" text="文本文本文本文本文本文本文本"/>
+    <text id="n17_ieus" name="tex_wxId" xy="1233,364" size="987,77" font="ui://27vd145bh35o7il2" fontSize="54" color="#111111" autoSize="none" autoClearText="true" text="文本文本文本文本文本文本文本"/>
-    <text id="n18_ieus" name="tex_fNumber" xy="1233,472" size="356,77" font="ui://27vd145bh35o7il2" fontSize="54" color="#111111" autoSize="none" text="文本文本文本文本文本文本文本"/>
+    <text id="n18_ieus" name="tex_fNumber" xy="1233,472" size="356,77" font="ui://27vd145bh35o7il2" fontSize="54" color="#111111" autoSize="none" autoClearText="true" text="文本文本文本文本文本文本文本"/>
-    <text id="n19_ieus" name="tex_cradNum" xy="1233,580" size="356,77" font="ui://27vd145bh35o7il2" fontSize="54" color="#111111" autoSize="none" text="文本文本文本文本文本文本文本"/>
+    <text id="n19_ieus" name="tex_cradNum" xy="1233,580" size="356,77" font="ui://27vd145bh35o7il2" fontSize="54" color="#111111" autoSize="none" autoClearText="true" text="文本文本文本文本文本文本文本"/>
-    <text id="n20_ieus" name="tex_nocice" xy="1233,688" size="987,362" font="ui://27vd145bh35o7il2" fontSize="54" color="#111111" autoSize="ellipsis" text="文本文本文本文本文本文本文本"/>
+    <text id="n20_ieus" name="tex_nocice" xy="1233,688" size="987,362" font="ui://27vd145bh35o7il2" fontSize="54" color="#111111" autoSize="ellipsis" autoClearText="true" text="文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本"/>
-    <text id="n22_ieus" name="tex_playerName" xy="334,219" size="388,64" font="ui://27vd145bg2mo7ij0" fontSize="48" color="#8e0305" align="center" vAlign="middle" autoSize="none" text="玩家玩家玩家玩家"/>
+    <text id="n22_ieus" name="tex_playerName" xy="334,219" size="388,64" font="ui://27vd145bg2mo7ij0" fontSize="48" color="#8e0305" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="玩家玩家玩家玩家"/>
     <component id="n23_ieus" name="btn_quitFamily" src="ieus7d1v" fileName="MyFamily/Component/btn_quitFamily.xml" xy="363,943"/>
     <component id="n25_ieus" name="btn_invite" src="ieus7d1x" fileName="MyFamily/Component/btn_invite.xml" xy="363,832"/>
-    <image id="n27_ieus" name="n27" src="ieus7d1y" fileName="MyFamily/Image/hall_club_btn_bj.png" xy="2142,970"/>
+    <component id="n28_ieus" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6"/>
-    <component id="n28_ieus" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6">
-      <relation target="" sidePair="top-top"/>
-    </component>
     <component id="n24_ieus" name="btn_playSet" src="ieus7d1w" fileName="MyFamily/Component/btn_playSet.xml" xy="363,721">
-      <gearDisplay controller="cStyle" pages="1,2"/>
+      <gearDisplay controller="cStyle" pages="0,1"/>
     </component>
     <component id="n26_ieus" name="btn_czRecord" src="ieus7d1u" fileName="MyFamily/Component/btn_czRecord.xml" xy="363,610">
-      <gearDisplay controller="cStyle" pages="1,2"/>
+      <gearDisplay controller="cStyle" pages="0,1"/>
     </component>
     <component id="n30_ieus" name="btn_hideNumber" src="ieus7d27" fileName="MyFamily/Component/btn_hideNumber.xml" xy="1632,468">
-      <gearDisplay controller="cStyle" pages="1,2"/>
+      <gearDisplay controller="cStyle" pages="0,1"/>
     </component>
     <component id="n31_ieus" name="btn_checkNumber" src="ieus7d24" fileName="MyFamily/Component/btn_checkNumber.xml" xy="1944,465">
-      <gearDisplay controller="cStyle" pages="1,2"/>
+      <gearDisplay controller="cStyle" pages="0,1"/>
     </component>
     <component id="n32_ieus" name="btn_buyCrad" src="ieus7d25" fileName="MyFamily/Component/btn_buyCard.xml" xy="1944,573">
-      <gearDisplay controller="cStyle" pages="1,2"/>
+      <gearDisplay controller="cStyle" pages="0,1"/>
     </component>
     <component id="n33_ieus" name="btn_applyMsg" src="ieus7d26" fileName="MyFamily/Component/btn_applyMsg.xml" xy="1929,24">
-      <gearDisplay controller="cStyle" pages="1,2"/>
+      <gearDisplay controller="cStyle" pages="0,1"/>
       <relation target="" sidePair="top-top"/>
     </component>
+    <component id="n34_sfjv" name="btn_editNotice" src="sfjv7d3f" fileName="MyFamily/Component/btn_editNotice.xml" xy="2142,970">
+      <gearDisplay controller="cStyle" pages="0,1"/>
+    </component>
+    <component id="n36_sfjv" name="btn_bgNotice" src="sfjv7d3g" fileName="MyFamily/Component/btn_bg.xml" xy="0,0" size="2532,1170" group="n42_sfjv">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <image id="n38_sfjv" name="n38" src="sfjv7d3h" fileName="MyFamily/Image/Rectangle 39.png" xy="619,133" size="1296,903" group="n42_sfjv"/>
+    <image id="n43_sfjv" name="n43" src="sfjv7d3l" fileName="MyFamily/Image/Rectangle 40.png" xy="648,188" size="1236,813" group="n42_sfjv"/>
+    <image id="n40_sfjv" name="n40" src="c8pn7czw" fileName="RoomCrad/Image/title_top.png" xy="630,124" group="n42_sfjv"/>
+    <component id="n41_sfjv" name="btn_quitNotice" src="sfjv7d3k" fileName="MyFamily/Component/btn_quitNotice.xml" xy="1777,89" group="n42_sfjv"/>
+    <image id="n44_sfjv" name="n44" src="ieus7d1p" fileName="MyFamily/Image/Rectangle 267.png" xy="696,318" size="1140,457" group="n42_sfjv"/>
+    <text id="n45_sfjv" name="input_notice" xy="707,331" size="1129,457" group="n42_sfjv" font="ui://27vd145bh35o7il1" fontSize="54" color="#111111" autoSize="none" autoClearText="true" text="文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本" input="true"/>
+    <component id="n46_sfjv" name="btn_confirmNotice" src="sfjv7d3n" fileName="MyFamily/Component/btn_confirmNotice.xml" xy="1054,805" group="n42_sfjv"/>
+    <text id="n47_sfjv" name="n47" xy="1020,133" size="492,127" group="n42_sfjv" font="ui://27vd145bh35o7ilc" fontSize="90" color="#ffffff" align="center" autoSize="none" text="修改公告"/>
+    <group id="n42_sfjv" name="n42" xy="0,0" size="2532,1170" advanced="true">
+      <gearDisplay controller="cWindow" pages="1"/>
+    </group>
   </displayList>
 </component>

wb_new_ui/assets/Family/MyFamily/com_myFamilyList.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="2532,1170">
+  <displayList>
+    <image id="n0_yk1o" name="n0" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="967,27" group="n1_yk1o">
+      <relation target="n2_yk1o" sidePair="left-left"/>
+    </image>
+    <text id="n2_yk1o" name="n2" xy="1084,30" size="364,94" group="n1_yk1o" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" text="查看亲友圈">
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <image id="n3_yk1o" name="n3" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1502,27" group="n1_yk1o" flip="hz">
+      <relation target="n2_yk1o" sidePair="right-right"/>
+    </image>
+    <group id="n1_yk1o" name="n1" xy="967,27" size="598,99"/>
+    <image id="n5_yk1o" name="n5" src="mc627d05" fileName="Main/Image/Rectangle 91.png" xy="228,186" size="2076,960"/>
+    <image id="n6_yk1o" name="n6" src="ieus7d1e" fileName="Main/Image/Rectangle 121.png" xy="246,204" size="2040,924"/>
+    <component id="n4_yk1o" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6"/>
+    <list id="n7_yk1o" name="list_familys" xy="246,234" size="2040,865" layout="flow_vt" overflow="scroll" lineGap="36" defaultItem="ui://htcn7v3ryk1o7d3q" align="center" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

wb_new_ui/assets/Family/NumberRemark/com_numberRemark.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1272,867">
+  <displayList>
+    <component id="n5_yk1o" name="btn_bg" src="sfjv7d3g" fileName="MyFamily/Component/btn_bg.xml" xy="-614,-216" size="2500,1300"/>
+    <image id="n1_yk1o" name="n1" src="sfjv7d3h" fileName="MyFamily/Image/Rectangle 39.png" xy="-10,0" size="1291,884"/>
+    <image id="n2_yk1o" name="n2" src="sfjv7d3l" fileName="MyFamily/Image/Rectangle 40.png" xy="18,36" size="1236,813"/>
+    <image id="n3_yk1o" name="n3" src="c8pn7czw" fileName="RoomCrad/Image/title_top.png" xy="0,-5"/>
+    <text id="n4_yk1o" name="n4" xy="158,0" size="955,128" font="ui://27vd145bh35o7ilc" fontSize="90" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="审批成功"/>
+    <image id="n7_yk1o" name="n7" src="ieus7d1p" fileName="MyFamily/Image/Rectangle 267.png" xy="66,223" size="1140,96"/>
+    <text id="n9_yk1o" name="n9" xy="135,396" size="1002,236" font="ui://27vd145bh35o7ill" fontSize="48" color="#833035" leading="17" autoSize="none" text="小提示:&#xA;1.此备注名称作为用户标志方便确认用户。&#xA;2.此备注只能群主在“成员管理”界面查看"/>
+    <text id="n8_yk1o" name="input_remark" xy="89,213" size="1094,116" font="ui://27vd145bh35o7ill" fontSize="60" color="#a59f9a" vAlign="middle" autoSize="none" autoClearText="true" text="为群成员添加备注信息" input="true"/>
+    <component id="n6_yk1o" name="btn_quit" src="sfjv7d3k" fileName="MyFamily/Component/btn_quitNotice.xml" xy="1146,-36"/>
+    <component id="n10_yk1o" name="btn_confirm" src="sfjv7d3n" fileName="MyFamily/Component/btn_confirmNotice.xml" xy="432,660"/>
+  </displayList>
+</component>

wb_new_ui/assets/Family/package.xml

@@ -292,11 +292,37 @@
     <image id="jydr7d42" name="Group 363.png" path="/Rank/Image/"/>
     <component id="jydr7d43" name="comp_listChild.xml" path="/Rank/Component/"/>
     <image id="o2rw7d3e" name="hall_club_button_aremovassi.png" path="/NumberDetail/Image/"/>
+<<<<<<< HEAD
     <component id="lgoh7d44" name="comp_numberRecord.xml" path="/NumberRecord/" exported="true"/>
     <component id="lgoh7d45" name="combBox_sort.xml" path="/NumberRecord/Component/" exported="true"/>
     <component id="lgoh7d46" name="combBox_sort_item.xml" path="/NumberRecord/Component/"/>
     <component id="lgoh7d47" name="combBox_sort_popup.xml" path="/NumberRecord/Component/"/>
     <image id="lgoh7d4b" name="createRoom_6.png" path="/NumberRecord/Image/"/>
+=======
+    <component id="sfjv7d3f" name="btn_editNotice.xml" path="/MyFamily/Component/"/>
+    <component id="sfjv7d3g" name="btn_bg.xml" path="/MyFamily/Component/"/>
+    <image id="sfjv7d3h" name="Rectangle 39.png" path="/MyFamily/Image/" scale="9grid" scale9grid="59,53,51,62"/>
+    <image id="sfjv7d3j" name="CommonRes_3.png" path="/MyFamily/Image/"/>
+    <component id="sfjv7d3k" name="btn_quitNotice.xml" path="/MyFamily/Component/"/>
+    <image id="sfjv7d3l" name="Rectangle 40.png" path="/MyFamily/Image/" scale="9grid" scale9grid="28,23,56,46"/>
+    <image id="sfjv7d3m" name="hall_club_common_btntext_queding.png" path="/MyFamily/Image/"/>
+    <component id="sfjv7d3n" name="btn_confirmNotice.xml" path="/MyFamily/Component/"/>
+    <component id="yk1o7d3o" name="com_myFamilyList.xml" path="/MyFamily/" exported="true"/>
+    <image id="yk1o7d3p" name="hall_club_common_tittle_icon1.png" path="/Main/Image/"/>
+    <component id="yk1o7d3q" name="item_myFamilyList.xml" path="/MyFamily/Component/"/>
+    <image id="yk1o7d3r" name="Rectangle 259.png" path="/MyFamily/Image/" scale="9grid" scale9grid="24,22,193,192"/>
+    <image id="yk1o7d3s" name="Rectangle 260.png" path="/MyFamily/Image/" scale="9grid" scale9grid="22,22,131,143"/>
+    <image id="yk1o7d3t" name="4-1.png" path="/MyFamily/Image/"/>
+    <image id="yk1o7d3u" name="4-4.png" path="/MyFamily/Image/"/>
+    <image id="yk1o7d3v" name="hall_club_common_club_liebiao_btntext_guanli.png" path="/MyFamily/Image/"/>
+    <component id="yk1o7d3x" name="btn_familyRank.xml" path="/MyFamily/Component/"/>
+    <component id="yk1o7d3y" name="btn_familyRecord.xml" path="/MyFamily/Component/"/>
+    <component id="yk1o7d3z" name="btn_familyManage.xml" path="/MyFamily/Component/"/>
+    <image id="yk1o7d40" name="hall_club_common_club_liebiao_icon_renshu.png" path="/MyFamily/Image/"/>
+    <image id="yk1o7d41" name="Group 556.png" path="/MyFamily/Image/"/>
+    <component id="yk1o7d42" name="btn_myFamilylist.xml" path="/MyFamily/Component/"/>
+    <component id="yk1o7d43" name="com_numberRemark.xml" path="/NumberRemark/" exported="true"/>
+>>>>>>> fa6b4bed7bcee64adb3ac8c11539d49a166a56db
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/NewGroup/Win_SetTag.xml

@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="978,603">
+<component size="1272,867">
   <controller name="type" pages="0,,1,,2,,3," selected="0"/>
   <controller name="show_superior" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
-    <component id="n49_hsbh" name="n49" src="eeqmcgu" fileName="Win_Frame_full.xml" pkg="27vd145b" xy="0,0" size="978,603" controller="show_line,0,show_di,0,style,2">
+    <image id="n89_yk1o" name="n89" src="yk1o7i9b" fileName="images/common/Rectangle 39.png" xy="-10,30" size="1290,854"/>
-      <relation target="" sidePair="width-width,height-height"/>
+    <image id="n88_yk1o" name="n88" src="yk1o7i9e" fileName="images/common/Rectangle 40.png" xy="18,36" size="1236,813"/>
-    </component>
+    <image id="n79_s98c" name="n79" src="yk1o7i9d" fileName="images/common/title_top.png" xy="0,-6"/>
-    <image id="n79_s98c" name="n79" src="csp47i47" fileName="mgr/imgs/fagpack/bt.png" xy="315,6" visible="false"/>
+    <image id="n84_s98c" name="n84" src="yk1o7i9c" fileName="images/common/Rectangle 262.png" xy="66,260" size="1140,96"/>
-    <image id="n80_s98c" name="n80" src="s98c7i6a" fileName="mgr/imgs/fagpack/bt_wanjiabeizhu.png" xy="411,12" visible="false"/>
+    <text id="n77_nk4v" name="tex_tag" xy="66,260" size="1140,96" font="ui://27vd145bh35o7im7" fontSize="60" color="#a59f9a" align="center" vAlign="middle" ubb="true" autoSize="shrink" bold="true" autoClearText="true" text="" input="true" prompt="为群成员添加备注信息" maxLength="10">
-    <image id="n84_s98c" name="n84" src="s98c7i5u" fileName="font/images/win/shurukuang5.png" pkg="27vd145b" xy="337,266" size="269,56"/>
-    <text id="n77_nk4v" name="tex_tag" xy="353,267" size="251,49" font="Microsoft YaHei" fontSize="25" color="#495f55" align="center" vAlign="middle" ubb="true" autoSize="shrink" bold="true" autoClearText="true" text="" input="true" prompt="请输入备注数值" maxLength="10" restrict="[0-9/-]" keyboardType="4">
       <relation target="" sidePair="width-width"/>
     </text>
-    <component id="n74_nk4v" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="210,455" group="n76_nk4v">
+    <text id="n85_yk1o" name="n85" xy="0,0" size="1272,139" font="ui://27vd145bh35o7ilc" fontSize="90" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="审批成功"/>
-      <Button title=" " titleColor="#a65e3e" titleFontSize="36" icon="ui://27vd145bcvc87i5i"/>
+    <component id="n87_yk1o" name="btn_close" src="yk1o7i9j" fileName="component/Btn/btn_numberRemarkQuit.xml" xy="1146,-36" group="n76_nk4v"/>
-    </component>
+    <component id="n86_yk1o" name="btn_ok" src="yk1o7i9h" fileName="component/Btn/btn_numberRemarkConfirm.xml" xy="424,660" group="n76_nk4v"/>
-    <component id="n75_nk4v" name="btn_close" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="542,455" group="n76_nk4v">
+    <group id="n76_nk4v" name="n76" xy="424,-36" size="884,858"/>
-      <Button title=" " titleColor="#ffffff" titleFontSize="36" icon="ui://27vd145bcvc87i5s"/>
+    <text id="n90_yk1o" name="n90" xy="132,393" size="1018,262" font="ui://27vd145bh35o7ill" fontSize="48" color="#833035" leading="17" autoSize="none" text="小提示:&#xA;1.此备注名称作为用户标志方便确认用户。&#xA;2.此备注只能群主在“成员管理”界面查看。"/>
-    </component>
-    <group id="n76_nk4v" name="n76" xy="210,455" size="594,82"/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/component/Btn/btn_numberRemarkConfirm.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="423,162" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_yk1o" src="yk1o7i9g" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

wb_new_ui/assets/NewGroup/component/Btn/btn_numberRemarkQuit.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="162,162" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_yk1o" src="yk1o7i9f" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

wb_new_ui/assets/NewGroup/package.xml

@@ -823,6 +823,14 @@
     <component id="kwdo7i98" name="item_partner_banplays.xml" path="/mgr/component/reward/"/>
     <component id="8h207i99" name="Win_PartnerBanPls.xml" path="/" exported="true"/>
     <image id="i2za7i9a" name="button_02.png" path="/images/info/"/>
+    <image id="yk1o7i9b" name="Rectangle 39.png" path="/images/common/" scale="9grid" scale9grid="58,49,50,69"/>
+    <image id="yk1o7i9c" name="Rectangle 262.png" path="/images/common/" scale="9grid" scale9grid="23,24,46,48"/>
+    <image id="yk1o7i9d" name="title_top.png" path="/images/common/"/>
+    <image id="yk1o7i9e" name="Rectangle 40.png" path="/images/common/" scale="9grid" scale9grid="22,20,72,54"/>
+    <image id="yk1o7i9f" name="CommonRes_3.png" path="/images/common/"/>
+    <image id="yk1o7i9g" name="hall_club_common_btntext_queding.png" path="/images/common/"/>
+    <component id="yk1o7i9h" name="btn_numberRemarkConfirm.xml" path="/component/Btn/"/>
+    <component id="yk1o7i9j" name="btn_numberRemarkQuit.xml" path="/component/Btn/"/>
   </resources>
   <publish name="NewGroup" path="..\wb_unity_pro\Assets\ART\base\newgroup\ui" packageCount="2"/>
 </packageDescription>