界面修改

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -49,7 +49,7 @@ function GroupMgrController.new()
     self._eventmap[Protocol.FGMGR_EVT_UPDATE_GROUP] = self.OnEvtUpdateGroup
     self._eventmap[Protocol.FGMGR_EVT_NEW_MAIL] = self.OnEvtNewMailTip
     self._eventmap[Protocol.FGMGR_RESPONSE_INVITE] = self.FG_ResponseInvited
-    self._eventmap[Protocol.WEB_FG_ISOPEN_CHATROOM] = self.FG_Isopen_ChatRoom
+    self._eventmap[Protocol.FGMGR_EVT_ISOPEN_CHATROOM] = self.FG_Isopen_ChatRoom
     -- self:connect(callback)
     return self
 end
@@ -297,7 +297,7 @@ function M:FG_OPEN_ISOPEN_CHATROOM(groupId, callback)
     local _data = {}
     _data.groupId = groupId
     _data.uid = DataManager.SelfUser.account_id
-    self._mgr_client:send(Protocol.WEB_FG_OPEN_ISOPEN_CHATROOM, _data, function(res)
+    self._mgr_client:send(Protocol.FGMGR_EVT_OPEN_ISOPEN_CHATROOM, _data, function(res)
         callback(res)
     end)
 end
@@ -307,7 +307,7 @@ 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)
+    self._mgr_client:send(Protocol.FGMGR_EVT_CLOSE_ISOPEN_CHATROOM, _data, function(res)
         callback(res)
     end)
 end
@@ -395,7 +395,7 @@ function M:OnExit()
 end
 
 function M:__OnNetEvent(msg)
-    ---- print("消息ID===>>"..msg.Command)
+    print("消息ID===>>"..msg.Command)
     local func = self._eventmap[msg.Command]
     if (func ~= nil) then func(self, msg.Data) end
 end

lua_probject/base_project/Game/Protocol.lua

@@ -382,12 +382,12 @@ Protocol = {
     -- 未读邮件提示事件
     FGMGR_EVT_NEW_MAIL              = "update_mail_tip",
     -- 设置允许成员查看聊天室
-    WEB_FG_OPEN_ISOPEN_CHATROOM     = "13001",
+    FGMGR_EVT_OPEN_ISOPEN_CHATROOM     = "13001",
     -- 设置不允许成员查看聊天室
-    WEB_FG_CLOSE_ISOPEN_CHATROOM    = "13002",
+    FGMGR_EVT_CLOSE_ISOPEN_CHATROOM    = "13002",
 
     -- 监听聊天室是否开启
-    WEB_FG_ISOPEN_CHATROOM          = "12011",
+    FGMGR_EVT_ISOPEN_CHATROOM          = "12011",
     -- 设置是否允许观战
     WEB_FG_SET_CANWATCH             = "set_group_guest",
 

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

@@ -41,7 +41,6 @@ local function GetPlayerFromGroupData(playerId, group)
 end
 
 local function AllUid(deskList)
-
     local re = {}
     for _, player in pairs(deskList) do
         re[#re + 1] = player.uid
@@ -49,8 +48,16 @@ local function AllUid(deskList)
     return re
 end
 
-local function AddPlayer(data, self)
+local function Exists(id, deskList)
+    for _, player in pairs(deskList) do
+        if id == player.uid then 
+            return true
+        end
+    end
+    return false
+end
 
+local function AddPlayer(data, self)
     if self.sending then
         ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
         return
@@ -59,6 +66,12 @@ local function AddPlayer(data, self)
     -- 点击弹出选择成员界面
     local view = FamilySelectNumber.New()
     view:Show(self.root._group.id, function(number)
+
+        if Exists(number.uid, data.deskList) then
+            ViewUtil.ShowBannerOnScreenCenter("设置失败,成员已经在关系中")
+            return
+        end
+
         local players = AllUid(data.deskList)
         players[#players + 1] = number.uid
         self.sending = true
@@ -115,7 +128,6 @@ local function DelPalyer(data, uid, self)
 end
 
 local function DelDesk(data, self)
-
     if self.sending then
         ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
         return
@@ -225,7 +237,6 @@ end
 
 
 function BanDesk:TryShow(r)
-
     local view = BanDesk.New()
 
     self.root = r
@@ -258,7 +269,6 @@ function BanDesk.New()
 end
 
 function BanDesk:Init()
-
     self.sending = false
 
     self.btn_close = self._view:GetChild("btn_close")
@@ -291,11 +301,9 @@ function BanDesk:Init()
     self.list_banItem.itemRenderer = function(index, obj)
         list_banItemRenderer(index, obj, self)
     end
-
 end
 
 function BanDesk:Reflash()
-
     local fgCtr = ControllerManager.GetController(NewGroupController)
     local groupId = self.root._group.id
 
@@ -305,7 +313,6 @@ function BanDesk:Reflash()
 end
 
 function BanDesk:GetBanTableCallback(res)
-
     self.BanData = Sort(res.Data.ban_list)
     self.list_banItem.numItems = #self.BanData
 
@@ -314,7 +321,6 @@ function BanDesk:GetBanTableCallback(res)
     local btn_addBanItem = addBanItem:GetChild("btn_addBanItem")
     addBanItem:GetController("cStyle").selectedIndex = 1
     btn_addBanItem.onClick:Set(function()
-
         if self.sending then
             ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
             return
@@ -345,5 +351,4 @@ function BanDesk:CloseRemaskWindow()
     self.cSetName.selectedIndex = 0
 end
 
-
 return BanDesk

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

@@ -21,7 +21,7 @@ function FamilyEventView.new(root)
     mgr_ctr:AddEventListener(GroupMgrEvent.UpdateGroup, handler(self, self._evtUpdateGroup))
     mgr_ctr:AddEventListener(GroupMgrEvent.NewMailTip, handler(self, self._evtNewMailTip))
     mgr_ctr:AddEventListener(GroupMgrEvent.InviteResponse, handler(self, self._evtInviteResponse))
-    mgr_ctr:AddEventListener(GroupMgrEvent.IsOpenChatRoom, handler(self, self._evtInviteResponse))
+    mgr_ctr:AddEventListener(GroupMgrEvent.IsOpenChatRoom, handler(self, self._evtIsOpenChatRoom))
     return self
 end
 

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

@@ -25,10 +25,15 @@ function FamilyRoomCard.New()
     BaseWindow.init(Instance, "ui://Family/com_roomCard")
 
     Instance._close_destroy = true
+    Instance.btn_close = Instance._view:GetChild("btn_close")
     Instance.list_bayCrad = Instance._view:GetChild("list_bayCrad")
     Instance.tex_curCard = Instance._view:GetChild('tex_curCard')
     Instance.tex_famliyCard = Instance._view:GetChild("tex_famliyCard")
 
+    Instance.btn_close.onClick:Set(function()
+        Instance:Close()
+    end)
+
     Instance.list_bayCrad.itemRenderer = function(index, obj)
         local _idx = index +1
         local num = data[_idx].num

lua_probject/base_project/Main.lua

@@ -59,7 +59,7 @@ function Main()
     FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("SIYUAN", "base/static/fonts/SIYUAN.TTF"), null)
     FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("方正胖娃_GBK", "base/static/fonts/方正胖娃_GBK.TTF"), null)
     FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("方正粗圆_GBK", "base/static/fonts/方正粗圆_GBK.TTF"), null)
-    --FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("FZCuYuan-M03","base/static/fonts/FZCuYuan-M03.TTF"),null)
+    FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("FZCuYuan-M03","base/static/fonts/FZCuYuan-M03.TTF"),null)
     --FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("HYFangLiJ","base/static/fonts/HYFangLiJ.ttf"),null)
     _game_info = json.decode(GameApplication.Instance.GameInfo)
     --_game_info["login_url"]="http://8.134.59.224:8101/"

wb_new_ui/assets/Family/InviteFamily/Component/btn_close.xml

@@ -2,7 +2,9 @@
 <component size="111,111" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n3_86ct" name="n3" src="86ct7cve" fileName="InviteFamily/Image/Group 26.png" xy="0,0"/>
+    <image id="n3_86ct" name="n3" src="sfjv7d3j" fileName="MyFamily/Image/CommonRes_3.png" xy="0,0" size="111,111">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
   <Button/>
 </component>

wb_new_ui/assets/Family/Main.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="familyType" exported="true" homePageType="specific" homePage="6" pages="6,空,0,main,1,playEdit,4,createAndJoin,5,numberList,7,numberRecord,8,auditNumber" selected="1"/>
+  <controller name="familyType" exported="true" homePageType="specific" homePage="6" pages="6,空,0,main,1,playEdit,4,createAndJoin,5,numberList,7,numberRecord,8,auditNumber" selected="4"/>
   <controller name="createOrJoin" pages="0,create,1,join" selected="0"/>
   <controller name="listFamily" pages="0,,1,,10,,11,,12,,13,,14,,15," selected="0"/>
   <controller name="numberRecordRank" pages="0,,1,,3," selected="0"/>
@@ -8,7 +8,7 @@
   <controller name="showChooseTime" pages="0,,1," selected="0"/>
   <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="1"/>
+  <controller name="familyBan" pages="0,,1," selected="0"/>
   <controller name="cMyfamilyList" pages="0,,1," selected="0"/>
   <controller name="cIsChatRoom" pages="0,,1," selected="0">
     <remark page="0" value="关闭聊天室"/>
@@ -120,7 +120,16 @@
     <group id="n34_86ct" name="main" xy="0,0" size="2530,1154" advanced="true">
       <gearDisplay controller="familyType" pages="0"/>
     </group>
-    <image id="n74_86ct" name="n74" src="86ct7cwm" fileName="NumberList/Image/numberListTitle.png" xy="1014,18" group="n81_86ct"/>
+    <image id="n392_f1fu" name="n392" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="967,24" group="n395_f1fu">
+      <relation target="n393_f1fu" sidePair="left-left"/>
+    </image>
+    <text id="n393_f1fu" name="n393" xy="1084,27" size="364,94" group="n395_f1fu" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" text="亲友圈成员">
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <image id="n394_f1fu" name="n394" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1502,24" group="n395_f1fu" flip="hz">
+      <relation target="n393_f1fu" sidePair="right-right"/>
+    </image>
+    <group id="n395_f1fu" name="n395" xy="967,24" size="598,99" 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"/>
     <image id="n373_c8pn" name="n373" src="c8pn7cyw" fileName="NumberList/Image/Rectangle 113.png" xy="408,189" group="n81_86ct"/>
@@ -136,8 +145,8 @@
       <item/>
     </list>
     <component id="n79_86ct" name="btn_search" src="86ct7cwi" fileName="NumberList/Component/btn_search.xml" xy="1863,195" size="204,72" group="n81_86ct"/>
-    <group id="n81_86ct" name="bg_numberList" xy="387,18" size="1758,1131" group="n82_86ct"/>
+    <group id="n81_86ct" name="bg_numberList" xy="387,24" size="1758,1125" group="n82_86ct"/>
-    <group id="n82_86ct" name="numberList" xy="387,18" size="1758,1131" advanced="true">
+    <group id="n82_86ct" name="numberList" xy="387,24" size="1758,1125" advanced="true">
       <gearDisplay controller="familyType" pages="5"/>
     </group>
     <component id="n380_n74n" name="com_createAndJoin" src="n74n7d11" fileName="CreateAndJoin/com_createAndJoin.xml" xy="0,0" size="2532,1170">

wb_new_ui/assets/Family/SelectNumber/com_SelectNumber.xml

@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
   <displayList>
-    <image id="n0_txni" name="n0" src="86ct7cwm" fileName="NumberList/Image/numberListTitle.png" xy="1014,19"/>
+    <image id="n10_f1fu" name="n10" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="967,24" group="n13_f1fu">
+      <relation target="n11_f1fu" sidePair="left-left"/>
+    </image>
+    <text id="n11_f1fu" name="n11" xy="1084,27" size="364,94" group="n13_f1fu" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" text="亲友圈成员">
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <image id="n12_f1fu" name="n12" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1502,24" group="n13_f1fu" flip="hz">
+      <relation target="n11_f1fu" sidePair="right-right"/>
+    </image>
+    <group id="n13_f1fu" name="n13" xy="967,24" size="598,99"/>
     <image id="n1_txni" name="n1" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="387,166" size="1758,984"/>
     <image id="n2_txni" name="n2" src="86ct7cvb" fileName="GamePlay/Image/Rectangle 112.png" xy="402,184" size="1728,948"/>
     <image id="n3_txni" name="n3" src="c8pn7cyw" fileName="NumberList/Image/Rectangle 113.png" xy="408,190"/>

wb_new_ui/assets/Family/com_roomCard.xml

@@ -12,5 +12,6 @@
       <item/>
       <item/>
     </list>
+    <component id="n9_f1fu" name="btn_close" src="sfjv7d3k" fileName="MyFamily/Component/btn_quitNotice.xml" xy="1135,-28"/>
   </displayList>
 </component>

wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+  assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+  assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_yry6yx.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+  assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+  assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+  assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+  assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+  assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes.meta

@@ -3,5 +3,5 @@ guid: 326fa64ee0dd8b94aa86fa1978e56fa5
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+  assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/static/fonts/方正粗圆_GBK.ttf.meta

@@ -19,5 +19,5 @@ TrueTypeFontImporter:
   useLegacyBoundsCalculation: 0
   shouldRoundAdvanceValue: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: base/static/cdca520f4b13217a3dbd2189f62db36d
   assetBundleVariant: