diff --git a/lua_probject/base_project/Game/View/FamilyViewZuo.lua b/lua_probject/base_project/Game/View/FamilyViewZuo.lua
index b1d6bc12..e71ac06d 100644
--- a/lua_probject/base_project/Game/View/FamilyViewZuo.lua
+++ b/lua_probject/base_project/Game/View/FamilyViewZuo.lua
@@ -49,6 +49,9 @@ function M:init(url)
--房间列表
self._viewList_tableList = view:GetChild('list_roomTable')
self._viewList_tableList.itemRenderer = handler(self, self.FamilyTableRenderer)
+ view:GetChild('click_closePlayDetail').onClick:Set(function()
+ view:GetController('showPlayDetail').selectedIndex = 0
+ end)
--创建亲友圈和加入亲友圈
view:GetChild('btn_createFamily').onClick:Set(function()
@@ -89,6 +92,9 @@ function M:FamilyTableRenderer(index, obj)
local playList = self._group.playList
local roomList = self._group.rooms
local tmp
+ local showDeatilFct = function()
+
+ end
if index < #playList then -- 默认玩法,开桌子之类的
tmp = playList[index + 1]
for i = 1, tmp.maxPlayers do
@@ -98,6 +104,9 @@ function M:FamilyTableRenderer(index, obj)
self:ClickMachRoom(context, tmp)
end)
end
+ obj:GetChild('icon').onClick:Set(function(context)
+ self:ClickTableShowDetail(context,{type =1})
+ end)
elseif index - #playList < #roomList then --存在的桌子
local roomInfo = roomList[index - #playList + 1]
tmp = self._group:getPlay(roomInfo.pid)
@@ -117,6 +126,9 @@ function M:FamilyTableRenderer(index, obj)
end)
end
end
+ obj:GetChild('icon').onClick:Set(function(context)
+ self:ClickTableShowDetail(context,{type =2,info=roomInfo})
+ end)
end
obj:GetController('playerNum').selectedIndex = tmp.maxPlayers - 2
obj:GetChild('text_playName').text = tmp.name
@@ -197,6 +209,17 @@ function M:ClickMachRoom(context, playinfo)
)
end
+function M:ClickTableShowDetail(context,data)
+ local data = data or {}
+ if data.type then
+ if data.type == 1 then
+
+ elseif data.type == 2 then
+
+ end
+ end
+end
+
--点击桌子进入游戏
function M:ClickJoinRoom(context, playinfo, room)
local group = DataManager.CurrenGroup
diff --git a/lua_probject/base_project/Game/View/FamilyZuo/FamilyJoinView.lua b/lua_probject/base_project/Game/View/FamilyZuo/FamilyJoinView.lua
index c86e6ad0..6b0e2e9a 100644
--- a/lua_probject/base_project/Game/View/FamilyZuo/FamilyJoinView.lua
+++ b/lua_probject/base_project/Game/View/FamilyZuo/FamilyJoinView.lua
@@ -34,7 +34,6 @@ function M:init(url)
if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode)
end
- self:Destroy()
end, "")
end)
diff --git a/lua_probject/base_project/table/xieyi.text b/lua_probject/base_project/table/xieyi.text
new file mode 100644
index 00000000..73f29293
--- /dev/null
+++ b/lua_probject/base_project/table/xieyi.text
@@ -0,0 +1,3 @@
+缺少协议 内容是自己与亲友圈的相关操作,比如说创建解散亲友圈,加入退出亲友圈
+未找到协议 玩家发送申请退出亲友圈
+未找到协议 群主可以审批玩家是否退出亲友圈
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/buttons/Btn_Bg1WithText.xml b/wb_new_ui/assets/Common/buttons/Btn_Bg1WithText.xml
new file mode 100644
index 00000000..718dac5d
--- /dev/null
+++ b/wb_new_ui/assets/Common/buttons/Btn_Bg1WithText.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/buttons/Btn_Bg1WithText1.xml b/wb_new_ui/assets/Common/buttons/Btn_Bg1WithText1.xml
new file mode 100644
index 00000000..1251ac2c
--- /dev/null
+++ b/wb_new_ui/assets/Common/buttons/Btn_Bg1WithText1.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/buttons/Btn_BgWithText.xml b/wb_new_ui/assets/Common/buttons/Btn_Bg2WithText.xml
similarity index 64%
rename from wb_new_ui/assets/Common/buttons/Btn_BgWithText.xml
rename to wb_new_ui/assets/Common/buttons/Btn_Bg2WithText.xml
index c93fb395..2214d0c0 100644
--- a/wb_new_ui/assets/Common/buttons/Btn_BgWithText.xml
+++ b/wb_new_ui/assets/Common/buttons/Btn_Bg2WithText.xml
@@ -1,11 +1,11 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Common/buttons/Btn_Bg2WithText1.xml b/wb_new_ui/assets/Common/buttons/Btn_Bg2WithText1.xml
new file mode 100644
index 00000000..303ad747
--- /dev/null
+++ b/wb_new_ui/assets/Common/buttons/Btn_Bg2WithText1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/buttons/Btn_ScrollText.xml b/wb_new_ui/assets/Common/buttons/Btn_ScrollText.xml
new file mode 100644
index 00000000..9c5a1482
--- /dev/null
+++ b/wb_new_ui/assets/Common/buttons/Btn_ScrollText.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/images/bg_huabian.png b/wb_new_ui/assets/Common/images/bg_huabian.png
new file mode 100644
index 00000000..6db1ec86
Binary files /dev/null and b/wb_new_ui/assets/Common/images/bg_huabian.png differ
diff --git a/wb_new_ui/assets/Common/images/bg_huabian1.png b/wb_new_ui/assets/Common/images/bg_huabian1.png
new file mode 100644
index 00000000..1ed33018
Binary files /dev/null and b/wb_new_ui/assets/Common/images/bg_huabian1.png differ
diff --git a/wb_new_ui/assets/Common/images/bg_huabian1_1.png b/wb_new_ui/assets/Common/images/bg_huabian1_1.png
new file mode 100644
index 00000000..426b7d3c
Binary files /dev/null and b/wb_new_ui/assets/Common/images/bg_huabian1_1.png differ
diff --git a/wb_new_ui/assets/Common/images/bt_huabian_1.png b/wb_new_ui/assets/Common/images/bt_huabian_1.png
new file mode 100644
index 00000000..8565e6a3
Binary files /dev/null and b/wb_new_ui/assets/Common/images/bt_huabian_1.png differ
diff --git a/wb_new_ui/assets/Common/images/btn_bg1WithText.png b/wb_new_ui/assets/Common/images/btn_bg1WithText.png
new file mode 100644
index 00000000..6d1f7cd4
Binary files /dev/null and b/wb_new_ui/assets/Common/images/btn_bg1WithText.png differ
diff --git a/wb_new_ui/assets/Common/images/btn_bg1WithText1.png b/wb_new_ui/assets/Common/images/btn_bg1WithText1.png
new file mode 100644
index 00000000..3f37987e
Binary files /dev/null and b/wb_new_ui/assets/Common/images/btn_bg1WithText1.png differ
diff --git a/wb_new_ui/assets/Common/images/btn_withText.png b/wb_new_ui/assets/Common/images/btn_withText.png
index 1ae9a0b8..1287a8bd 100644
Binary files a/wb_new_ui/assets/Common/images/btn_withText.png and b/wb_new_ui/assets/Common/images/btn_withText.png differ
diff --git a/wb_new_ui/assets/Common/images/btn_withText1.png b/wb_new_ui/assets/Common/images/btn_withText1.png
new file mode 100644
index 00000000..d29a9bfb
Binary files /dev/null and b/wb_new_ui/assets/Common/images/btn_withText1.png differ
diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml
index 78182b03..f7d66e71 100644
--- a/wb_new_ui/assets/Common/package.xml
+++ b/wb_new_ui/assets/Common/package.xml
@@ -2232,11 +2232,22 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/Family/FamilyCreate/FamilyCreate.xml b/wb_new_ui/assets/Family/FamilyCreate/FamilyCreate.xml
index dbad7e25..d1e0d7ff 100644
--- a/wb_new_ui/assets/Family/FamilyCreate/FamilyCreate.xml
+++ b/wb_new_ui/assets/Family/FamilyCreate/FamilyCreate.xml
@@ -2,27 +2,25 @@
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/FamilyCreate/image/创建普通休闲场.png b/wb_new_ui/assets/Family/FamilyCreate/image/创建普通休闲场.png
new file mode 100644
index 00000000..164f5f77
Binary files /dev/null and b/wb_new_ui/assets/Family/FamilyCreate/image/创建普通休闲场.png differ
diff --git a/wb_new_ui/assets/Family/FamilyJoin/FamilyJoin.xml b/wb_new_ui/assets/Family/FamilyJoin/FamilyJoin.xml
index b5e8a0a2..7a745ebd 100644
--- a/wb_new_ui/assets/Family/FamilyJoin/FamilyJoin.xml
+++ b/wb_new_ui/assets/Family/FamilyJoin/FamilyJoin.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/wb_new_ui/assets/Family/FamilyManager/compomemt/Child_PlayerManagerChild.xml b/wb_new_ui/assets/Family/FamilyManager/compomemt/Child_PlayerManagerChild.xml
index 5bd63fc3..9a8e195c 100644
--- a/wb_new_ui/assets/Family/FamilyManager/compomemt/Child_PlayerManagerChild.xml
+++ b/wb_new_ui/assets/Family/FamilyManager/compomemt/Child_PlayerManagerChild.xml
@@ -1,6 +1,6 @@
-
+
@@ -16,22 +16,22 @@
-
+
-
+
-
+
-
-
+
+
-
-
+
+
diff --git a/wb_new_ui/assets/Family/FamilyRoomCard/FamilyRoomCard.xml b/wb_new_ui/assets/Family/FamilyRoomCard/FamilyRoomCard.xml
index 6613c32c..f26b0ec3 100644
--- a/wb_new_ui/assets/Family/FamilyRoomCard/FamilyRoomCard.xml
+++ b/wb_new_ui/assets/Family/FamilyRoomCard/FamilyRoomCard.xml
@@ -37,11 +37,11 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Family/Main_zuo.xml b/wb_new_ui/assets/Family/Main_zuo.xml
index 97401c74..23ee1237 100644
--- a/wb_new_ui/assets/Family/Main_zuo.xml
+++ b/wb_new_ui/assets/Family/Main_zuo.xml
@@ -1,6 +1,7 @@
+
@@ -77,6 +78,12 @@
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/Family/Main_zuo/component/comp_playDetail.xml b/wb_new_ui/assets/Family/Main_zuo/component/comp_playDetail.xml
new file mode 100644
index 00000000..0d12d6f1
--- /dev/null
+++ b/wb_new_ui/assets/Family/Main_zuo/component/comp_playDetail.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Main_zuo/image/bg_playdetail_table.png b/wb_new_ui/assets/Family/Main_zuo/image/bg_playdetail_table.png
new file mode 100644
index 00000000..f0b0adda
Binary files /dev/null and b/wb_new_ui/assets/Family/Main_zuo/image/bg_playdetail_table.png differ
diff --git a/wb_new_ui/assets/Family/Main_zuo/image/icon_palyDetail_point.png b/wb_new_ui/assets/Family/Main_zuo/image/icon_palyDetail_point.png
new file mode 100644
index 00000000..1df5fc89
Binary files /dev/null and b/wb_new_ui/assets/Family/Main_zuo/image/icon_palyDetail_point.png differ
diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml
index 20d879b9..f9a4f028 100644
--- a/wb_new_ui/assets/Family/package.xml
+++ b/wb_new_ui/assets/Family/package.xml
@@ -511,6 +511,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/nav/sd.png b/wb_new_ui/assets/NewGroup/component/nav/sd.png
index 2e898fca..000c781e 100644
Binary files a/wb_new_ui/assets/NewGroup/component/nav/sd.png and b/wb_new_ui/assets/NewGroup/component/nav/sd.png differ
diff --git a/wb_new_ui/assets/NewGroup/component/nav/tj_bg_07.png b/wb_new_ui/assets/NewGroup/component/nav/tj_bg_07.png
index ad20a7cf..e835ef6a 100644
Binary files a/wb_new_ui/assets/NewGroup/component/nav/tj_bg_07.png and b/wb_new_ui/assets/NewGroup/component/nav/tj_bg_07.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupPlayStat.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupPlayStat.xml
index ae4ef98e..acfd2e08 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupPlayStat.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupPlayStat.xml
@@ -1,7 +1,7 @@
-
+
@@ -14,19 +14,19 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/record/item_play_record.xml b/wb_new_ui/assets/NewGroup/mgr/component/record/item_play_record.xml
index b4e641f9..0da1fd29 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/record/item_play_record.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/record/item_play_record.xml
@@ -5,21 +5,21 @@
-
-
+
+
-
+
-
+
-
+
-
+
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png
index 0aa803e2..23a9d8ec 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png
index 25016789..b8b15f61 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png
index 62c4c61f..d6ae2c35 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
index c76c3a49..0db922f0 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png
index 3ccfa391..c238532f 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png
index b4dac080..47b34b1e 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png
index a72031fc..4bf04d40 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png
index cdc6e96b..3125ab2a 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png
index 6fc9cc83..f12f96f4 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png
index ce58a885..0fc952a2 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png
index 929de641..b5981ff5 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png
index cdde999f..01b577be 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png
index 3e5b8757..5c25b139 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png
index 906c9edb..e7c3f854 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png
index a4c54f32..99f6a009 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png
index 95e94622..1f41ae7d 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png
index bd3116e9..39da3fa8 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png
index 30ac3a9d..97710bfb 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
index 16bc7864..864fed97 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes and b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes 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 47be7474..2c7fbee7 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 8bc70948..5717b5d3 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_atlas0_2.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png
deleted file mode 100644
index 0da8c56e..00000000
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png.meta b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png.meta
deleted file mode 100644
index 58fa8e16..00000000
--- a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png.meta
+++ /dev/null
@@ -1,140 +0,0 @@
-fileFormatVersion: 2
-guid: 68725cda571bdde4ebe623714930575a
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- mipmaps:
- mipMapMode: 0
- enableMipMap: 1
- sRGBTexture: 1
- linearTexture: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapsPreserveCoverage: 0
- alphaTestReferenceValue: 0.5
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- streamingMipmaps: 0
- streamingMipmapsPriority: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -100
- wrapU: -1
- wrapV: -1
- wrapW: -1
- nPOTScale: 1
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- applyGammaDecoding: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: Standalone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: iPhone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: 7
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 1
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: Android
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: WebGL
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName: base/newgroup/1876b2140d79b7dc6c2674f954027415
- assetBundleVariant:
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 955ae029..5f6309ac 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