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 @@ + + + + + + + + + + + + + + + + + +