界面修改调整、打开关闭聊天室协议

.gitignore

@@ -11,3 +11,4 @@
 !wb_new_ui/**
 !.gitignore
 lua_probject/.emmyrc.json
+lua_probject/base_project/Game/View/Common/FguiEmojiDict.lua

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -291,10 +291,21 @@ function M:FG_GetOnlinePlayers(callback)
 end
 
 --设置允许成员可以查看聊天室
-function M:FG_OPEN_ISOPEN_CHATROOM(callback)
+function M:FG_OPEN_ISOPEN_CHATROOM(groupId, callback)
-    self._mgr_client:send(Protocol.WEB_FG_OPEN_ISOPEN_CHATROOM, nil, function(res)
+    local _data = {}
-        print("允许成员可以查看聊天室")
+    _data.groupId = groupId
-        pt(res)
+    _data.uid = DataManager.SelfUser.account_id
+    self._mgr_client:send(Protocol.WEB_FG_OPEN_ISOPEN_CHATROOM, _data, function(res)
+        callback(res)
+    end)
+end
+
+--
+function M:FG_CLOSE_ISOPEN_CHATROOM(groupId, callback)
+    local _data = {}
+    _data.groupId = groupId
+    _data.uid = DataManager.SelfUser.account_id
+    self._mgr_client:send(Protocol.WEB_FG_CLOSE_ISOPEN_CHATROOM, _data, function(res)
         callback(res)
     end)
 end

lua_probject/base_project/Game/Controller/NewGroupController.lua

@@ -44,6 +44,7 @@ function M:FG_GroupList(callback)
                 group.isShow = tem.isShow
                 group.isOpenChatRoom = tem.isOpenChatRoom
                 group.isWatch = tem.isWatch
+                group.wechatId = tem.wechatId
                 l_groups:add(group)
             end
         end
@@ -132,7 +133,7 @@ function M:FG_TopGroup(group_id, top, callback)
     end)
 end
 
-function M:FG_UpdateGroupInfo(id, name, notice, ban, dissolve_opt, kick_opt, apply, ban_chat1, ban_chat2, option, showNum,
+function M:FG_UpdateGroupInfo(id, name, notice, ban, dissolve_opt, kick_opt, apply, ban_chat1, ban_chat2, option, showNum, wechatId,
                               callback)
     local _client = ControllerManager.GroupClient
     local data = {}
@@ -147,6 +148,7 @@ function M:FG_UpdateGroupInfo(id, name, notice, ban, dissolve_opt, kick_opt, app
     data.ban_chat2 = ban_chat2
     data.option = option
     data.show_num = showNum
+    data.wechatId = wechatId
     print("FG_UpdateGroupInfo")
     pt(data)
     _client:send(Protocol.WEB_FG_UPDATE_GROUP_INFO, data, function(res)
@@ -1596,6 +1598,7 @@ function M:GetChatRoom(groupId, callback)
 end
 
 --禁止&允许成员查看聊天室
+--[[
 function M:SetIsOpenChatRoom(groupId, value, callback)
     print("能否查看聊天室 groupId = ", groupId)
     local _client = ControllerManager.GroupClient
@@ -1606,6 +1609,7 @@ function M:SetIsOpenChatRoom(groupId, value, callback)
         callback(res)
     end)
 end
+]]
 
 -- 设置是否允许观战
 function M:SetCanWatch(groupId, value, callback)

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

@@ -9,6 +9,7 @@ function FamilyInviteFamilyView.new()
     local self = setmetatable({}, { __index = M })
     self.class = 'FamilyInviteFamilyView'
     self._close_destroy = true
+    self._new_hide = false
     self:init('ui://Family/InviteFamily')
     return self
 end

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

@@ -1,5 +1,7 @@
+--local SuoHa_PlayerSelfPokerInfoView = require("extend_project.extend.poker.suoha.SuoHa_PlayerSelfPokerInfoView")
 local FamilyRoomCardRecord = import(".FamilyRoomCardRecord")
 local RoomCardRecord = import(".RoomCardRecord")
+local FamilyInviteFamilyView = import('.FamilyInviteFamilyView')
 
 --region LOCAL
 
@@ -29,7 +31,8 @@ local function ChangeFamilyConfig(data, self)
         data.ban_chat1 or self.family.ban_chat1,
         data.ban_chat2 or self.family.ban_chat2,
         data.option or self.family.option,
-        0,
+        data.show_num or self.family.show_num,
+        data.wechatId or self.family.wechatId,
         function(res)
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "更改失败,请稍后再试")
@@ -45,7 +48,8 @@ local function ChangeFamilyConfig(data, self)
                 self.family.ban_chat1 = data.ban_chat1 or self.family.ban_chat1
                 self.family.ban_chat2 = data.ban_chat2 or self.family.ban_chat2
                 self.family.option = data.option or self.family.option
-
+                self.family.show_num = data.show_num
+                self.family.wechatId = data.wechatId
                 self:Refalsh()
                 self.cWindow.selectedIndex = 0
             end
@@ -63,16 +67,32 @@ function FamilyMyFamily:TryShow(groupId, r)
     self:Show()
 end
 
+function FamilyMyFamily.New(groupId)
+    setmetatable(FamilyMyFamily, { __index = BaseWindow })
+    local inst = setmetatable({}, { __index = FamilyMyFamily })
+    inst._close_destroy = true
+    inst._full = true
+    inst._animation = false
+    inst._full_offset = false
+    inst._anim_pop = 0
+    BaseWindow.init(inst, 'ui://Family/com_myFamily')
+    -- 隐藏背景图
+    inst._root_view:GetChild("win_mode").visible = false
+    inst:Init()
+    inst.groupId = groupId
+    return inst
+end
+
 function FamilyMyFamily:Show()
     self:Refalsh()
 
-    HideMainView()
+    --HideMainView()
     BaseWindow.Show(self)
 end
 
 function FamilyMyFamily:Close()
     BaseWindow.Close(self)
-    ShowMainView()
+    --ShowMainView()
 end
 
 function FamilyMyFamily:Refalsh()
@@ -83,6 +103,7 @@ function FamilyMyFamily:Refalsh()
     self.tex_fNumber.text = self.family.member_num
     self.tex_cradNum.text = self.family.diamo
     self.tex_nocice.text = self.family.notice
+    self.tex_wxId.text = self.family.wechatId
     ImageLoad.Load(self.family.o_portrait, self.loader_icon)
 
     self.cStyle.selectedIndex = self.family.lev - 1
@@ -98,17 +119,6 @@ function FamilyMyFamily:Refalsh()
 end
 
 function FamilyMyFamily:Init()
-    setmetatable(FamilyMyFamily, { __index = BaseWindow })
-
-    self._close_destroy = true
-    self._full = true
-    self._animation = false
-    self._full_offset = false
-    self._anim_pop = 0
-    BaseWindow.init(self, 'ui://Family/com_myFamily')
-    -- 隐藏背景图
-    self._root_view:GetChild("win_mode").visible = false
-
     self._view:GetChild("btn_close").onClick:Set(function()
         self:Close()
     end)
@@ -136,6 +146,7 @@ function FamilyMyFamily:Init()
     self.btn_confirmNotice = self._view:GetChild("btn_confirmNotice")
     self.btn_hideNumber = self._view:GetChild("btn_hideNumber")
     self.btn_showNumber = self._view:GetChild("btn_showNumber")
+    self.btn_editWx = self._view:GetChild("btn_editWx")
 
     self.input_text = self._view:GetChild("input_text")
 
@@ -143,36 +154,73 @@ function FamilyMyFamily:Init()
     self.cWindow = self._view:GetController("cWindow")
     self.cDisplayNumber = self._view:GetController("cDisplayNumber")
 
+    --pt(FairyGUI)
+    --pt(System)
+    --self.input_text.emojies = FguiEmojiDict.EmojiesDict
+
     self.btn_playSet.onClick:Set(function()
-        self:Close()
+        --self:Close()
-        root:PlayEdit()
+        --BaseWindow.DestroyAll()
+        local curView = ViewManager.GetCurrenView()
+        if curView.class == "FamilyMainView" then
+            curView:PlayEdit()
+        else
+            local view = ViewManager.ChangeView(ViewManager.View_Family, function()
+                view:PlayEdit()
+            end)
+        end
     end)
 
     self.btn_invite.onClick:Set(function()
-        self:Close()
+        local familyInviteFamilyView = FamilyInviteFamilyView.new()
-        root:ShareWx()
+        familyInviteFamilyView:Show()
     end)
 
     self.btn_buyCrad.onClick:Set(function()
-        self:Close()
+        --BaseWindow.DestroyAll()
-        root:ShowShop()
+        local curView = ViewManager.GetCurrenView()
+        if curView.class == "FamilyMainView" then
+            curView:ShowShop()
+        else
+            local view = ViewManager.ChangeView(ViewManager.View_Family, function()
+                view:ShowShop()
+            end)
+        end
     end)
 
     self.btn_czRecord.onClick:Set(function()
-        --local view = FamilyRoomCardRecord.New()
-        --view:Show()
         local view = RoomCardRecord.New()
         view:Show()
     end)
 
     self.btn_checkNumber.onClick:Set(function()
-        self:Close()
+        --self:Close()
-        root:OpenAllNumber(self.family)
+        --root:OpenAllNumber(self.family)
+
+        --BaseWindow.DestroyAll()
+        local curView = ViewManager.GetCurrenView()
+        if curView.class == "FamilyMainView" then
+            curView:OpenAllNumber(self.family)
+        else
+            local view = ViewManager.ChangeView(ViewManager.View_Family, function()
+                view:OpenAllNumber(self.family)
+            end)
+        end
     end)
 
     self.btn_applyMsg.onClick:Set(function()
-        self:Close()
+        --self:Close()
-        root:AuditNumber()
+        --root:AuditNumber()
+
+        --BaseWindow.DestroyAll()
+        local curView = ViewManager.GetCurrenView()
+        if curView.class == "FamilyMainView" then
+            curView:AuditNumber()
+        else
+            local view = ViewManager.ChangeView(ViewManager.View_Family, function()
+                view:AuditNumber()
+            end)
+        end
     end)
 
     self.btn_quitFamily.onClick:Set(function()
@@ -206,6 +254,11 @@ function FamilyMyFamily:Init()
         self.cWindow.selectedIndex = 1
     end)
 
+    self.btn_editWx.onClick:Set(function()
+        self.changeCallback = function() ChangeFamilyConfig({ wechatId = self.input_text.text }, self) end
+        self.cWindow.selectedIndex = 1
+    end)
+
     self.btn_confirmNotice.onClick:Set(function()
         self.changeCallback()
         self.cWindow.selectedIndex = 0
@@ -217,8 +270,6 @@ function FamilyMyFamily:Init()
             return
         end
 
-        print("点击了")
-
         local fgCtr = ControllerManager.GetController(NewGroupController)
         self.isShowContenting = true
         fgCtr:FG_SetGroupShow(0, self.family.id, function(res)

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

@@ -76,8 +76,10 @@ function FamilyMyfamilyList:Init()
         ImageLoad.Load(group.o_portrait, loader_icon)
 
         btn_familyManage.onClick:Set(function()
-            self:Close()
+            --self:Close()
-            self.FamilyView:OpenMyFamily(group.id)
+            --self.FamilyView:OpenMyFamily(group.id)
+            local view = FamilyMyFamily.New(group.id)
+            view:Show()
         end)
 
         btn_record.onClick:Set(function()

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

@@ -109,6 +109,9 @@ function M:init(url, lev, res)
                 flag_assistant == 1 and "助理身份" or "设置为助理"), function()
                 fgCtr:FG_SetManager(self.groupId, info.uid, flag_assistant + 1, function(res)
                     if res.ReturnCode == 0 then
+                        local g = DataManager.groups.groupMap[self.groupId]
+                        local player = g.memberMap[info.uid]
+
                         flag_assistant = 1 - flag_assistant
                         self._view:GetChild('btn_assistant'):GetController('isAssistant').selectedIndex = flag_assistant
                     else

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

@@ -0,0 +1,94 @@
+local PlayEditView = {}
+local GroupGameSettingView = import("..NewGroup.MngView.GroupGameSettingView_jaingxi")
+
+function PlayEditView.New()
+    setmetatable(PlayEditView, { __index = BaseWindow })
+    local inst = setmetatable({}, { __index = PlayEditView })
+    inst._animation = false
+    inst._full_offset = false
+    inst._anim_pop = 0
+    BaseWindow.init(inst, "ui://Family/com_playEdit")
+    inst:Init()
+    return inst
+end
+
+function PlayEditView:Show(groupId)
+    self:Refalsh(groupId)
+    BaseWindow.Show(self)
+end
+
+function PlayEditView:Refalsh(groupId)
+    self.groupId = groupId
+    self.group = DataManager.groups:get(self.groupId)
+    local playList = self.group.playList
+    self.list_gamePlay.numItems = #playList + 1
+end
+
+function PlayEditView:Init()
+
+    self.btn_quit = self._view:GetChild("btn_close")
+
+    self.list_gamePlay = self._view:GetChild('list_gamePlay')
+
+    self.btn_quit.onClick:Set(function()
+        self:Close()
+    end)
+
+    self.list_gamePlay:SetVirtual()
+    self.list_gamePlay.itemRenderer = function(index, obj)
+        local playList = self.group.playList
+        if index == 0 then
+            obj:GetController('type').selectedIndex = 0
+            obj:GetChild('num').text = string.format("%d/7", #playList)
+            obj:GetChild('btn_addPlay').onClick:Set(function()
+                local tem = GroupGameSettingView.new(self.blur_view, self.groupId, 0, nil, function(play)
+                    local group = DataManager.groups:get(self.groupId)
+                    group:addPlay(play)
+                    -- self:FillView()
+                    --self:UpdateFamilyRoom(fgCtr, self.groupId)
+                    self:Refalsh(self.groupId)
+                    printlog("刷新玩法===>>>>")
+                    group.update_play = true
+                end)
+                tem:Show()
+            end)
+            return
+        end
+        obj:GetChild('text_title').text = playList[index].game_name
+        local mode = ExtendManager.GetExtendConfig(playList[index].gameId):GetGameInfo()
+        local pId = playList[index].id
+        obj:GetChild('Label_details'):GetChild('title').text = mode:LoadConfigToDetail(playList[index].config)
+        obj:GetChild('text_playName').text = playList[index].name
+        obj:GetController('type').selectedIndex = 1
+        obj:GetChild('btn_del').onClick:Set(function()
+            ViewUtil.ShowTwoChooose("是否要删除该玩法", function()
+                local fgCtr = ControllerManager.GetController(NewGroupController)
+                fgCtr:FG_DelPlay(self.groupId, playList[index].id, function(res)
+                    if res.ReturnCode ~= 0 then
+                        local msg = Table_Error_code_Map[res.ReturnCode] or {}
+                        msg = msg.note or "操作失败"
+                        ViewUtil.ShowBannerOnScreenCenter(msg)
+                        return
+                    end
+                    
+                    --self:UpdateFamilyRoom(fgCtr, self.groupId)
+                    self:Refalsh(self.groupId)
+                end)
+            end)
+        end)
+        obj:GetChild("btn_edit").onClick:Set(function()
+            local tem = GroupGameSettingView.new(self.blur_view, self.groupId, pId, nil, function(play)
+                local group = DataManager.groups:get(self.groupId)
+                group:addPlay(play)
+                -- self:FillView()
+                --self:UpdateFamilyRoom(fgCtr, self.groupId)
+                self:Refalsh(self.groupId)
+                printlog("刷新玩法===>>>>")
+                group.update_play = true
+            end)
+            tem:Show()
+        end)
+    end
+end
+
+return PlayEditView

lua_probject/base_project/Game/View/FamilyView.lua

@@ -17,6 +17,7 @@ local FamilyRoomCard = import(".Family.FamilyRoomCard")
 local FamilyMyfamilyList = import(".Family.FamilyMyfamilyList")
 local FamilyChatRoom = import(".Family.FamilyChatRoom")
 local FamilyMsgRecord = import(".Family.FamilyMsgRecord")
+local PlayEditView = import(".Family.PlayEditView")
 ---
 FamilyView = {}
 
@@ -63,6 +64,7 @@ function M:init(url)
             self:ConnetFamily(1, groups, true)
         else
             self:JoinFamily(true)
+            self.btn_chatRoom.visible = false
         end
     end)
     -------绑定成员战绩按钮
@@ -137,28 +139,31 @@ function M:MsgView()
 end
 
 function M:SetIsOpenChatRoom()
-    local value = 1
-    if self._group.isOpenChatRoom == 1 then
-        value = 0
-    elseif self._group.isOpenChatRoom == 0 then
-        value = 1
-    end
-
     local mgr_ctr = ControllerManager.GetController(GroupMgrController)
-    mgr_ctr:FG_OPEN_ISOPEN_CHATROOM()
 
-    --[[
+    if self._group.isOpenChatRoom == 1 then
-    local fgCtr = ControllerManager.GetController(NewGroupController)
+        mgr_ctr:FG_CLOSE_ISOPEN_CHATROOM(self._group.id, function(res)
-    fgCtr:SetIsOpenChatRoom(self._group.id, value, function(res)
+            print("不允许成员可以查看聊天室")
-        print("设置开启聊天室协议")
+            pt(res)
-        pt(res)
+            if res.ReturnCode ~= 0 then
-
+                ViewUtil.ErrorTip(res.ReturnCode)
-        if res.ReturnCode ~= 0 then
+                return
-            return
+            end
-        end
+            self._group.isOpenChatRoom = 0
-        self._group.isOpenChatRoom = value
+            self:RefalshMoreBtn()
-        self:RefalshMoreBtn()
+        end)
-    end)]]
+    elseif self._group.isOpenChatRoom == 0 then
+        mgr_ctr:FG_OPEN_ISOPEN_CHATROOM(self._group.id, function(res)
+            print("允许成员可以查看聊天室")
+            pt(res)
+            if res.ReturnCode ~= 0 then
+                ViewUtil.ErrorTip(res.ReturnCode)
+                return
+            end
+            self._group.isOpenChatRoom = 1
+            self:RefalshMoreBtn()
+        end)
+    end
 end
 
 function M:SetCanWatch()
@@ -209,8 +214,10 @@ function M:JoinFamily(frist)
 end
 
 function M:PlayEdit()
-    self.familyType.selectedIndex = 2
+    --self.familyType.selectedIndex = 2
-    self.lastType = 1
+    --self.lastType = 1
+    local view = PlayEditView.New()
+    view:Show(self._group.id)
 end
 
 function M:OpenMyFamily(groupId)
@@ -313,8 +320,8 @@ end
 function M:UpdateFamilyRoom(fgCtr, id)
     local list_room = self._view:GetChild('list_room')
     list_room:SetVirtual()
-    local list_gamePlay = self._view:GetChild('list_gamePlay')
+    --local list_gamePlay = self._view:GetChild('list_gamePlay')
-    list_gamePlay:SetVirtual()
+    --list_gamePlay:SetVirtual()
     self._view:GetChild('n364').text = string.format("已开启%s桌游戏", self._group.room_num)
     local playList = self._group.playList
     --初始化玩法列表，用于房间使用
@@ -445,6 +452,7 @@ function M:UpdateFamilyRoom(fgCtr, id)
             end)
         end
     end
+    --[[
     list_gamePlay.itemRenderer = function(index, obj)
         if index == 0 then
             obj:GetController('type').selectedIndex = 0
@@ -494,11 +502,12 @@ function M:UpdateFamilyRoom(fgCtr, id)
             tem:Show()
         end)
     end
+    list_gamePlay.numItems = #playList + 1
+    ]]
     local all_num = #playList + #roomList
     -- print("=================================================list_room", list_room, list_room.numItems, all_num)
     pt(list_room)
     list_room.numItems = all_num
-    list_gamePlay.numItems = #playList + 1
 end
 
 function M:ConnetFamily(index, groups, isCreate)
@@ -542,6 +551,12 @@ function M:ConnetFamily(index, groups, isCreate)
 
     allLoad = allLoad + self:ConnetFamilyRoom(fgCtr, self._group.id)
     UpdateBeat:Add(self.OnUpdate, self)
+
+    if self._group.isOpenChatRoom == 1 then
+        self.btn_chatRoom.visible = true
+    else
+        self.btn_chatRoom.visible = false
+    end
 end
 
 -- function M:Destroy()

wb_new_ui/assets/Common/package.xml

@@ -1236,6 +1236,7 @@
     <image id="lj2n18a" name="4928.png" path="/component/record/Component/font/"/>
     <image id="lj2n18b" name="x.png" path="/component/record/Component/font/" exported="true"/>
     <font id="lj2n18c" name="MJ_recordSpeed.fnt" path="/component/record/Component/font/" exported="true"/>
+    <image id="u6337io2" name="1f600.png" path="/images/Emojies/" exported="true"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2" maxAtlasSize="2048">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Family/Main.xml

@@ -9,7 +9,7 @@
   <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="1"/>
+  <controller name="cMyfamilyList" pages="0,,1," selected="0"/>
   <controller name="cIsChatRoom" pages="0,,1," selected="0">
     <remark page="0" value="关闭聊天室"/>
     <remark page="1" value="打开聊天室"/>
@@ -120,17 +120,6 @@
     <group id="n34_86ct" name="main" xy="0,0" size="2530,1154" 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"/>
-    <image id="n36_86ct" name="n36" src="86ct7cvb" fileName="GamePlay/Image/Rectangle 112.png" xy="309,183" size="2010,957" group="n39_86ct"/>
-    <graph id="n382_ndnl" name="n382" xy="327,201" size="1974,861" group="n39_86ct" type="rect" lineColor="#ffeddfc0" fillColor="#ffeddfc0" corner="36"/>
-    <image id="n38_86ct" name="49" src="ndnl7d2c" fileName="GamePlay/Image/Group 315.png" xy="969,24" group="n39_86ct"/>
-    <list id="n37_86ct" name="list_gamePlay" xy="385,292" size="1854,720" group="n39_86ct" layout="row" overflow="scroll" scroll="horizontal" colGap="24" defaultItem="ui://htcn7v3r86ct7cv8">
-      <item url="ui://htcn7v3r86ct7cvd"/>
-    </list>
-    <text id="n383_ndnl" name="n383" xy="337,1074" size="1704,58" group="n39_86ct" font="Alimama FangYuanTi VF" fontSize="42" color="#444444" vAlign="middle" autoSize="ellipsis" text="小提示：亲友圈支持创建7个玩法，完成设置后自动在首页生成牌桌"/>
-    <group id="n39_86ct" name="palyEdit" xy="297,24" size="2034,1128" advanced="true">
-      <gearDisplay controller="familyType" pages="1"/>
-    </group>
     <image id="n74_86ct" name="n74" src="86ct7cwm" fileName="NumberList/Image/numberListTitle.png" xy="1014,18" group="n81_86ct"/>
     <image id="n75_86ct" name="n75" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="387,165" size="1758,984" group="n81_86ct"/>
     <image id="n76_86ct" name="n76" src="86ct7cvb" fileName="GamePlay/Image/Rectangle 112.png" xy="402,183" size="1728,948" group="n81_86ct"/>

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="330,99" extention="Button">
+<component size="330,99" 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_ieus" name="n0" src="ieus7d1q" fileName="MyFamily/Image/tuichuqinyouquan.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
-  <Button downEffect="dark" downEffectValue="0.9"/>
+  <Button downEffect="scale" downEffectValue="0.9"/>
 </component>

wb_new_ui/assets/Family/MyFamily/com_myFamily.xml

@@ -81,7 +81,7 @@
     <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_text" xy="707,331" size="1129,457" group="n42_sfjv" font="ui://27vd145bh35o7il1" fontSize="54" color="#111111" autoSize="none" autoClearText="true" text="文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本" input="true"/>
+    <text id="n45_sfjv" name="input_text" xy="707,331" size="1129,457" group="n42_sfjv" font="ui://27vd145bh35o7il1" fontSize="54" color="#111111" ubb="true" 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="tex_changeTitle" 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">

wb_new_ui/assets/Family/PlayEdit/com_playEdit.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="2532,1170">
+  <displayList>
+    <image id="n9_mggi" name="n9" src="jrro7cyp" fileName="Main/Image/loginBg.png" xy="1,0" size="2531,1170" group="n12_mggi">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n10_mggi" name="n10" src="jrro7cyd" fileName="Main/Image/bt_top.png" xy="0,0" group="n12_mggi">
+      <relation target="" sidePair="right-left,top-top"/>
+    </image>
+    <component id="n11_mggi" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6" group="n12_mggi"/>
+    <group id="n12_mggi" name="bg" xy="0,0" size="2532,1170"/>
+    <image id="n0_mggi" name="n0" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="249,172" size="2034,981"/>
+    <image id="n1_mggi" name="n1" src="86ct7cvb" fileName="GamePlay/Image/Rectangle 112.png" xy="261,184" size="2010,957"/>
+    <graph id="n2_mggi" name="n2" xy="279,202" size="1974,861" type="rect" lineColor="#ffeddfc0" fillColor="#ffeddfc0" corner="36"/>
+    <image id="n3_mggi" name="49" src="ndnl7d2c" fileName="GamePlay/Image/Group 315.png" xy="969,25" size="594,99"/>
+    <list id="n4_mggi" name="list_gamePlay" xy="337,293" size="1854,720" layout="row" overflow="scroll" scroll="horizontal" colGap="24" defaultItem="ui://htcn7v3r86ct7cv8">
+      <item url="ui://htcn7v3r86ct7cvd"/>
+    </list>
+    <text id="n5_mggi" name="n5" xy="289,1075" size="1704,58" font="Alimama FangYuanTi VF" fontSize="42" color="#444444" vAlign="middle" autoSize="ellipsis" text="小提示：亲友圈支持创建7个玩法，完成设置后自动在首页生成牌桌"/>
+  </displayList>
+</component>

wb_new_ui/assets/Family/package.xml

@@ -372,6 +372,7 @@
     <image id="edxg7d5f" name="Rectangle 290.png" path="/FamilyMsgRecord/Iamge/"/>
     <image id="edxg7d5g" name="Rectangle 291.png" path="/FamilyMsgRecord/Iamge/"/>
     <image id="mggi7d5h" name="look.png" path="/Main/Image/"/>
+    <component id="mggi7d5i" name="com_playEdit.xml" path="/PlayEdit/" exported="true"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>

wb_unity_pro/Assets/Scripts/Editor/EmojiTool.cs

@@ -0,0 +1,31 @@
+using System;
+using System.IO;
+using UnityEditor;
+using FairyGUI;
+using System.Collections;
+
+public class EmojiTool
+{
+    public static string path = @"C:\Users\k\Downloads\ios-emoji\ios-emoji";
+
+    [MenuItem("Fgui/EmojiTool")]
+    static void OutPutEmojiConfig() 
+    {
+        UnityEngine.Debug.Log("RUNNING");
+
+        try
+        {
+            var pngs = Directory.EnumerateFiles(path, "*.png");
+
+            foreach (var png in pngs) 
+            {
+                UnityEngine.Debug.Log($"png = {png}");
+            }
+
+        }
+        catch 
+        {
+        
+        }
+    }
+}

wb_unity_pro/Assets/Scripts/Editor/EmojiTool.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 36ef1dfd6eade3e499cac46404c8aba8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: