diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index e059652a..b4771503 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua @@ -648,6 +648,7 @@ function M:OnRefNumberBan(evt_data) local group = DataManager.groups:get(self.groupId) group:addMember(tem) + pt("lingmeng ccc OnRefNumberBan1",evt_data) DispatchEvent(self._dispatcher, GroupMgrEvent.OnRefNumberBan, evt_data) end diff --git a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua index 571d2d58..f15ee153 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua @@ -115,7 +115,7 @@ function M:TickNumberCallback(res) end function M:RefrenMemberCallback() - print("lingmeng OnRefNumberBan") + pt("lingmeng ccc OnRefNumberBan2",self._group.members) local numbers = self._group.members local fgCtr = ControllerManager.GetController(NewGroupController) if #numbers == 0 then @@ -126,6 +126,7 @@ function M:RefrenMemberCallback() if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败") else + pt("lingmeng ccc OnRefNumberBan3",numbers) self:FillList(numbers) end end) diff --git a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua index 425315cd..982a23e2 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua @@ -13,6 +13,7 @@ end function M:AddListener() local mgr_ctr = self._mgr_ctr + mgr_ctr._cacheEvent:Clear() mgr_ctr:AddEventListener(GroupMgrEvent.AddPlay, handler(self, self._evtAddPlay)) mgr_ctr:AddEventListener(GroupMgrEvent.DelPlay, handler(self, self._evtDelPlay)) mgr_ctr:AddEventListener(GroupMgrEvent.UpdatePlay, handler(self, self._evtUpdatePlay)) diff --git a/lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua index 9a33a81d..bc1bb6b5 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua @@ -24,7 +24,6 @@ local function list_msgRender(self, index, obj) local msgText = '' if msg.m_state == 0 then - --msgText = string.format("【%s】被【%s】加入亲友圈", msg.user_name, msg.tag_name) msgText = string.format("【%s】被【%s】加入亲友圈", msg.tag_name, msg.user_name) elseif msg.m_state == 1 then msgText = string.format("【%s】退出亲友圈", msg.user_name) diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 0c0128d9..fecb6347 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -122,7 +122,7 @@ function FamilyView.new() local self = setmetatable({}, { __index = M }) self.class = 'FamilyMainView' self._full = true - self._close_destroy = false + -- self._close_destroy = false self._fristRoom = true self:init('ui://Family/Main') return self @@ -130,7 +130,7 @@ end function M:init(url) BaseView.InitView(self, url) - self._close_destroy = false + -- self._close_destroy = false self._full_offset = false local view = self._view self.lastTime = os.time() @@ -234,7 +234,6 @@ function M:init(url) end self.curGroupIndex = j - self:ConnetFamily(j, DataManager.groups.groupList) end) end @@ -256,8 +255,16 @@ function M:Reflash() if #groups > 0 then --self:ConnetFamily(1, groups) self.list_family.numItems = #DataManager.groups.groupList - local index = (self.curGroupIndex or 1) - 1 - local btn = self.list_family:GetChildAt(index) + local chooseIndex = 1 + if FamilyView.lastId then + for i = 1, #DataManager.groups.groupList do + if FamilyView.lastId == DataManager.groups.groupList[i].id then + FamilyView.lastId = nil + chooseIndex = i + end + end + end + local btn = self.list_family:GetChildAt(chooseIndex-1) btn.onClick:Call() else self:JoinFamily(true) @@ -268,7 +275,6 @@ end function M:InitCloseClick() self.btn_close.onClick:Set(function() - print("lingmengfamily", self.lastType, self.familyType.selectedIndex) if not self.lastType or self.familyType.selectedIndex == 1 then if self._group then FamilyOffline(self._group.id, self) @@ -591,9 +597,6 @@ function M:UpdateFamilyRoom(fgCtr, id) } end local roomList = self._group.rooms - print("lingmengroomList") - pt(roomList) - pt(playList) local roomCtr = ControllerManager.GetController(RoomController) list_room.itemRenderer = function(index, obj) if index < #roomList then @@ -643,6 +646,7 @@ function M:UpdateFamilyRoom(fgCtr, id) return else UpdateBeat:Remove(self.OnUpdate, self) + FamilyView.lastId = self._group.id ViewManager.ChangeView(ViewManager.View_Main, gameId) end end, @@ -668,6 +672,7 @@ function M:UpdateFamilyRoom(fgCtr, id) return else UpdateBeat:Remove(self.OnUpdate, self) + FamilyView.lastId = self._group.id ViewManager.ChangeView(ViewManager.View_Witness, gameId) end end, @@ -717,6 +722,7 @@ function M:UpdateFamilyRoom(fgCtr, id) return else UpdateBeat:Remove(self.OnUpdate, self) + FamilyView.lastId = self._group.id ViewManager.ChangeView(ViewManager.View_Main, playList[newIndex].gameId) end end, @@ -803,7 +809,6 @@ function M:ConnetFamily(index, groups) UpdateBeat:Remove(self.OnUpdate, self) ViewUtil:CloseModalWait() - self._group = DataManager.groups:get(groups[index].id) DataManager.CurrenGroup = self._group self._view:GetChild('text_familyId').text = self._group.id @@ -901,7 +906,8 @@ function M:OnUpdate() end) self.lastTime = newTime if self._view:GetChild('list_familyNumber').itemRenderer then - self._view:GetChild('list_familyNumber').numItems = #self._group.members + self.members = SortMembers(self._group.members) --local members = self._group.members + self._view:GetChild('list_familyNumber').numItems = #self.members end end end @@ -1142,6 +1148,7 @@ function M:Close() Broadcast.RemoveListener(BroadcastEvent.OnOutFamily, self.Reflash) print("家族界面退出") + self._familyEventView:RemoveAll() BaseView.Close(self) end diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/HuCardImg.lua b/lua_probject/extend_project/extend/majiang/fuzhou/HuCardImg.lua index bd687ce6..c60c7f27 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/HuCardImg.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/HuCardImg.lua @@ -1,7 +1,7 @@ local HuCardImg = { } -HuCardImg[1] = { 1 } +HuCardImg[1] = { "tile_hu" } HuCardImg[2] = { "tile_zimo" } HuCardImg[3] = { "tile_cs_shisanlan" } HuCardImg[4] = { "tile_cs_qxshisanlan" } diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png index baa7788a..b6cfca28 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes index e473368f..e154dba2 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes differ