diff --git a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua
index 4e0702c8..fccb4f7f 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua
+++ b/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)
diff --git a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua
index d88161b7..50320dce 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua
+++ b/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
diff --git a/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua b/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua
index f9d8a518..d73888b3 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua
+++ b/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
- ViewUtil.ShowOneChooose("加入失败" .. res.ReturnCode)
+ if res.ReturnCode == 0 then
+ ViewUtil.ShowOneChooose("已申请加入亲友圈" .. res.ReturnCode)
else
+ ViewUtil.ShowOneChooose("申请加入亲友圈失败" .. res.ReturnCode)
end
end)
--先换成邀请玩家
diff --git a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
index ba02a4f7..920e7d19 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
+++ b/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
- 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
+ self:Refalsh()
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
diff --git a/lua_probject/base_project/Game/View/Family/FamilyMyfamilyList.lua b/lua_probject/base_project/Game/View/Family/FamilyMyfamilyList.lua
new file mode 100644
index 00000000..c35b6948
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberRemark.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRemark.lua
new file mode 100644
index 00000000..14cf2c0e
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua
index 4804e994..c752f8e8 100644
--- a/lua_probject/base_project/Game/View/FamilyView.lua
+++ b/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()
diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua
index b87b35ec..f06080b1 100644
--- a/lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua
+++ b/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
diff --git a/wb_new_ui/assets/Family/CreateAndJoin/com_createAndJoin.xml b/wb_new_ui/assets/Family/CreateAndJoin/com_createAndJoin.xml
index cad44d14..08d51729 100644
--- a/wb_new_ui/assets/Family/CreateAndJoin/com_createAndJoin.xml
+++ b/wb_new_ui/assets/Family/CreateAndJoin/com_createAndJoin.xml
@@ -14,9 +14,9 @@
-
+
-
+
-
diff --git a/wb_new_ui/assets/Family/Main.xml b/wb_new_ui/assets/Family/Main.xml
index 1c5375a2..f1a03176 100644
--- a/wb_new_ui/assets/Family/Main.xml
+++ b/wb_new_ui/assets/Family/Main.xml
@@ -9,8 +9,9 @@
+
-
+
@@ -19,7 +20,7 @@
-
+
@@ -27,23 +28,23 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -55,7 +56,7 @@
-
+
@@ -80,7 +81,7 @@
-
+
@@ -88,14 +89,14 @@
-
+
-
+
@@ -106,7 +107,7 @@
-
+
@@ -175,5 +176,13 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Main/Image/hall_club_common_tittle_icon1.png b/wb_new_ui/assets/Family/Main/Image/hall_club_common_tittle_icon1.png
new file mode 100644
index 00000000..190d0bdb
Binary files /dev/null and b/wb_new_ui/assets/Family/Main/Image/hall_club_common_tittle_icon1.png differ
diff --git a/wb_new_ui/assets/Family/MyFamily/Component/btn_bg.xml b/wb_new_ui/assets/Family/MyFamily/Component/btn_bg.xml
new file mode 100644
index 00000000..8460c3fc
--- /dev/null
+++ b/wb_new_ui/assets/Family/MyFamily/Component/btn_bg.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/MyFamily/Component/btn_confirmNotice.xml b/wb_new_ui/assets/Family/MyFamily/Component/btn_confirmNotice.xml
new file mode 100644
index 00000000..f988e908
--- /dev/null
+++ b/wb_new_ui/assets/Family/MyFamily/Component/btn_confirmNotice.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/MyFamily/Component/btn_editNotice.xml b/wb_new_ui/assets/Family/MyFamily/Component/btn_editNotice.xml
new file mode 100644
index 00000000..124b06cb
--- /dev/null
+++ b/wb_new_ui/assets/Family/MyFamily/Component/btn_editNotice.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/MyFamily/Component/btn_familyManage.xml b/wb_new_ui/assets/Family/MyFamily/Component/btn_familyManage.xml
new file mode 100644
index 00000000..80b70888
--- /dev/null
+++ b/wb_new_ui/assets/Family/MyFamily/Component/btn_familyManage.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/MyFamily/Component/btn_familyRank.xml b/wb_new_ui/assets/Family/MyFamily/Component/btn_familyRank.xml
new file mode 100644
index 00000000..833e8191
--- /dev/null
+++ b/wb_new_ui/assets/Family/MyFamily/Component/btn_familyRank.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/MyFamily/Component/btn_familyRecord.xml b/wb_new_ui/assets/Family/MyFamily/Component/btn_familyRecord.xml
new file mode 100644
index 00000000..f454614c
--- /dev/null
+++ b/wb_new_ui/assets/Family/MyFamily/Component/btn_familyRecord.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/MyFamily/Component/btn_myFamilylist.xml b/wb_new_ui/assets/Family/MyFamily/Component/btn_myFamilylist.xml
new file mode 100644
index 00000000..c8acd40d
--- /dev/null
+++ b/wb_new_ui/assets/Family/MyFamily/Component/btn_myFamilylist.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/MyFamily/Component/btn_quitNotice.xml b/wb_new_ui/assets/Family/MyFamily/Component/btn_quitNotice.xml
new file mode 100644
index 00000000..570cff29
--- /dev/null
+++ b/wb_new_ui/assets/Family/MyFamily/Component/btn_quitNotice.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/MyFamily/Component/item_myFamilyList.xml b/wb_new_ui/assets/Family/MyFamily/Component/item_myFamilyList.xml
new file mode 100644
index 00000000..441f20f9
--- /dev/null
+++ b/wb_new_ui/assets/Family/MyFamily/Component/item_myFamilyList.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/MyFamily/Image/4-1.png b/wb_new_ui/assets/Family/MyFamily/Image/4-1.png
new file mode 100644
index 00000000..ef528a4c
Binary files /dev/null and b/wb_new_ui/assets/Family/MyFamily/Image/4-1.png differ
diff --git a/wb_new_ui/assets/Family/MyFamily/Image/4-4.png b/wb_new_ui/assets/Family/MyFamily/Image/4-4.png
new file mode 100644
index 00000000..1f659038
Binary files /dev/null and b/wb_new_ui/assets/Family/MyFamily/Image/4-4.png differ
diff --git a/wb_new_ui/assets/Family/MyFamily/Image/CommonRes_3.png b/wb_new_ui/assets/Family/MyFamily/Image/CommonRes_3.png
new file mode 100644
index 00000000..b131e750
Binary files /dev/null and b/wb_new_ui/assets/Family/MyFamily/Image/CommonRes_3.png differ
diff --git a/wb_new_ui/assets/Family/MyFamily/Image/Group 556.png b/wb_new_ui/assets/Family/MyFamily/Image/Group 556.png
new file mode 100644
index 00000000..b5aaa2cf
Binary files /dev/null and b/wb_new_ui/assets/Family/MyFamily/Image/Group 556.png differ
diff --git a/wb_new_ui/assets/Family/MyFamily/Image/Rectangle 259.png b/wb_new_ui/assets/Family/MyFamily/Image/Rectangle 259.png
new file mode 100644
index 00000000..f550bd4d
Binary files /dev/null and b/wb_new_ui/assets/Family/MyFamily/Image/Rectangle 259.png differ
diff --git a/wb_new_ui/assets/Family/MyFamily/Image/Rectangle 260.png b/wb_new_ui/assets/Family/MyFamily/Image/Rectangle 260.png
new file mode 100644
index 00000000..fdd44804
Binary files /dev/null and b/wb_new_ui/assets/Family/MyFamily/Image/Rectangle 260.png differ
diff --git a/wb_new_ui/assets/Family/MyFamily/Image/Rectangle 39.png b/wb_new_ui/assets/Family/MyFamily/Image/Rectangle 39.png
new file mode 100644
index 00000000..caaec09b
Binary files /dev/null and b/wb_new_ui/assets/Family/MyFamily/Image/Rectangle 39.png differ
diff --git a/wb_new_ui/assets/Family/MyFamily/Image/Rectangle 40.png b/wb_new_ui/assets/Family/MyFamily/Image/Rectangle 40.png
new file mode 100644
index 00000000..7d4d930f
Binary files /dev/null and b/wb_new_ui/assets/Family/MyFamily/Image/Rectangle 40.png differ
diff --git a/wb_new_ui/assets/Family/MyFamily/Image/hall_club_common_btntext_queding.png b/wb_new_ui/assets/Family/MyFamily/Image/hall_club_common_btntext_queding.png
new file mode 100644
index 00000000..c05c8ccf
Binary files /dev/null and b/wb_new_ui/assets/Family/MyFamily/Image/hall_club_common_btntext_queding.png differ
diff --git a/wb_new_ui/assets/Family/MyFamily/Image/hall_club_common_club_liebiao_btntext_guanli.png b/wb_new_ui/assets/Family/MyFamily/Image/hall_club_common_club_liebiao_btntext_guanli.png
new file mode 100644
index 00000000..4d96aa97
Binary files /dev/null and b/wb_new_ui/assets/Family/MyFamily/Image/hall_club_common_club_liebiao_btntext_guanli.png differ
diff --git a/wb_new_ui/assets/Family/MyFamily/Image/hall_club_common_club_liebiao_icon_renshu.png b/wb_new_ui/assets/Family/MyFamily/Image/hall_club_common_club_liebiao_icon_renshu.png
new file mode 100644
index 00000000..23e76705
Binary files /dev/null and b/wb_new_ui/assets/Family/MyFamily/Image/hall_club_common_club_liebiao_icon_renshu.png differ
diff --git a/wb_new_ui/assets/Family/MyFamily/com_myFamily.xml b/wb_new_ui/assets/Family/MyFamily/com_myFamily.xml
index c6dd1394..a6dc3261 100644
--- a/wb_new_ui/assets/Family/MyFamily/com_myFamily.xml
+++ b/wb_new_ui/assets/Family/MyFamily/com_myFamily.xml
@@ -1,9 +1,12 @@
-
-
+
+
-
+
+
+
+
@@ -25,36 +28,50 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/MyFamily/com_myFamilyList.xml b/wb_new_ui/assets/Family/MyFamily/com_myFamilyList.xml
new file mode 100644
index 00000000..13afd530
--- /dev/null
+++ b/wb_new_ui/assets/Family/MyFamily/com_myFamilyList.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/NumberRemark/com_numberRemark.xml b/wb_new_ui/assets/Family/NumberRemark/com_numberRemark.xml
new file mode 100644
index 00000000..129bf2ad
--- /dev/null
+++ b/wb_new_ui/assets/Family/NumberRemark/com_numberRemark.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml
index a4417b67..22292fe3 100644
--- a/wb_new_ui/assets/Family/package.xml
+++ b/wb_new_ui/assets/Family/package.xml
@@ -292,11 +292,37 @@
+<<<<<<< HEAD
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> fa6b4bed7bcee64adb3ac8c11539d49a166a56db
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/Win_SetTag.xml b/wb_new_ui/assets/NewGroup/Win_SetTag.xml
index 68190de6..5aa7bc75 100644
--- a/wb_new_ui/assets/NewGroup/Win_SetTag.xml
+++ b/wb_new_ui/assets/NewGroup/Win_SetTag.xml
@@ -1,23 +1,19 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Btn/btn_numberRemarkConfirm.xml b/wb_new_ui/assets/NewGroup/component/Btn/btn_numberRemarkConfirm.xml
new file mode 100644
index 00000000..996f66f0
--- /dev/null
+++ b/wb_new_ui/assets/NewGroup/component/Btn/btn_numberRemarkConfirm.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Btn/btn_numberRemarkQuit.xml b/wb_new_ui/assets/NewGroup/component/Btn/btn_numberRemarkQuit.xml
new file mode 100644
index 00000000..d7c3bff0
--- /dev/null
+++ b/wb_new_ui/assets/NewGroup/component/Btn/btn_numberRemarkQuit.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/images/common/CommonRes_3.png b/wb_new_ui/assets/NewGroup/images/common/CommonRes_3.png
new file mode 100644
index 00000000..b131e750
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/common/CommonRes_3.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/common/Rectangle 262.png b/wb_new_ui/assets/NewGroup/images/common/Rectangle 262.png
new file mode 100644
index 00000000..6aee461d
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/common/Rectangle 262.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/common/Rectangle 39.png b/wb_new_ui/assets/NewGroup/images/common/Rectangle 39.png
new file mode 100644
index 00000000..caaec09b
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/common/Rectangle 39.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/common/Rectangle 40.png b/wb_new_ui/assets/NewGroup/images/common/Rectangle 40.png
new file mode 100644
index 00000000..7d4d930f
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/common/Rectangle 40.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/common/hall_club_common_btntext_queding.png b/wb_new_ui/assets/NewGroup/images/common/hall_club_common_btntext_queding.png
new file mode 100644
index 00000000..c05c8ccf
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/common/hall_club_common_btntext_queding.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/common/title_top.png b/wb_new_ui/assets/NewGroup/images/common/title_top.png
new file mode 100644
index 00000000..374b7580
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/common/title_top.png differ
diff --git a/wb_new_ui/assets/NewGroup/package.xml b/wb_new_ui/assets/NewGroup/package.xml
index 11937a7c..f55d83ca 100644
--- a/wb_new_ui/assets/NewGroup/package.xml
+++ b/wb_new_ui/assets/NewGroup/package.xml
@@ -823,6 +823,14 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png
index fe2e3307..bd3bc905 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png
index 561d9cb6..fe2e3307 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png
index 51726e7d..03738651 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png
index d4ab9ce8..d8426f99 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes
index 7dd22f14..3e4463a6 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes differ