亲友圈上下级关系给分，邀请加入，主页动画

lua_probject/base_project/Game/View/LobbyView.lua

@@ -1,4 +1,3 @@
-
 --大厅View对象
 --author：--
 
@@ -18,26 +17,27 @@ local M = {}
 
 function LobbyView.new()
     --print("new lobbyView!!!!")
-    setmetatable(M, {__index = BaseView})
+    setmetatable(M, { __index = BaseView })
-    local self = setmetatable({}, {__index = M})
+    local self = setmetatable({}, { __index = M })
     self.class = "LobbyView"
- 
+
     UIPackage.AddPackage("base/lobby/ui/Lobby")
     self.lobby_pause_time = 0
     self._full = true
     self:InitView("ui://Lobby/Main")
     self._close_destroy = false
-    
+
     return self
 end
 
-
 function M:InitView(url)
-   -- print("init lobbyView!!!!")
+    -- print("init lobbyView!!!!")
-    BaseView.InitView(self ,url)
+    BaseView.InitView(self, url)
     self._full_offset = false
     local view = self._view
 
+    self:InitClip()
+
     local btn_head = view:GetChild("btn_head")
     ImageLoad.Load(DataManager.SelfUser.head_url, btn_head._iconObject)
     btn_head.onClick:Set(function()
@@ -46,7 +46,7 @@ function M:InitView(url)
         --     ImageLoad.Load(DataManager.SelfUser.head_url, btn_head._iconObject)
         -- end)
         -- headView:Show()
-        local lobbyHeadView = LobbyHeadView.new(DataManager.SelfUser,DataManager.SelfUser.agent,function ()
+        local lobbyHeadView = LobbyHeadView.new(DataManager.SelfUser, DataManager.SelfUser.agent, function()
             ImageLoad.Load(DataManager.SelfUser.head_url, btn_head._iconObject)
         end)
         lobbyHeadView:Show()
@@ -59,74 +59,74 @@ function M:InitView(url)
         --     ImageLoad.Load(DataManager.SelfUser.head_url, btn_head._iconObject)
         -- end)
         -- headView:Show()
-        local lobbyHeadView = LobbyHeadView.new(DataManager.SelfUser,DataManager.SelfUser.agent,function ()
+        local lobbyHeadView = LobbyHeadView.new(DataManager.SelfUser, DataManager.SelfUser.agent, function()
             ImageLoad.Load(DataManager.SelfUser.head_url, btn_head._iconObject)
         end)
         lobbyHeadView:Show()
     end)
 
     view:GetChild("tex_name").text = DataManager.SelfUser.nick_name
-    view:GetChild("tex_id").text =  tostring(DataManager.SelfUser.account_id)
+    view:GetChild("tex_id").text = tostring(DataManager.SelfUser.account_id)
 
     view:GetChild("gcm_diamo").text = tostring(DataManager.SelfUser.diamo)
 
 
     local btn_joinroom = self._view:GetChild("btn_joinroom")
-    btn_joinroom.onClick:Add(handler(self , self.OnJoinRoomAction))
+    btn_joinroom.onClick:Add(handler(self, self.OnJoinRoomAction))
-	--btn_joinroom.displayObject.gameObject:SetActive(false)
+    --btn_joinroom.displayObject.gameObject:SetActive(false)
-	
+
-	local createRoomBtn=self._view:GetChild("btn_ChuangJian")
+    local createRoomBtn = self._view:GetChild("btn_ChuangJian")
     --createRoomBtn.touchable = false
-	createRoomBtn.onClick:Set(function ()
+    createRoomBtn.onClick:Set(function()
-            local _createRoomView = CreateRoomView.new(1)
+        local _createRoomView = CreateRoomView.new(1)
-            _createRoomView.onCeateRoom = function ()
+        _createRoomView.onCeateRoom = function()
-                ViewManager.ChangeView(ViewManager.View_Main,DataManager.CurrenRoom.game_id)
+            ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id)
-            end
+        end
-            _createRoomView:Show()
+        _createRoomView:Show()
-        end)
+    end)
-	
+
-	
+
     local btn_agent = self._view:GetChild("btn_agent")
-   --[[ btn_agent.onClick:Set(function()
+    --[[ btn_agent.onClick:Set(function()
         local headView = HeadView.new(DataManager.SelfUser,true)
         headView:Show()
     end)--]]
-	btn_agent.displayObject.gameObject:SetActive(false)
+    btn_agent.displayObject.gameObject:SetActive(false)
-	
+
     local btn_record = self._view:GetChild("btn_record")
-    btn_record.onClick:Add(handler(self, function ()
+    btn_record.onClick:Add(handler(self, function()
-       local _rankView = RankView.new(self,true)
+        local _rankView = RankView.new(self, true)
         _rankView:Show()
     end))
-	--btn_record.displayObject.gameObject:SetActive(false)
+    --btn_record.displayObject.gameObject:SetActive(false)
 
     local btn_video = self._view:GetChild("btn_video")
     --[[btn_video.onClick:Set(function ()
         local _rankView = RankView.new(self,true)
         _rankView:Show()
     end)--]]
-	btn_video.displayObject.gameObject:SetActive(false)
+    btn_video.displayObject.gameObject:SetActive(false)
 
     local btn_setting = self._view:GetChild("btn_setting")
-    btn_setting.onClick:Set(handler (self , function ()
+    btn_setting.onClick:Set(handler(self, function()
         local settingView = LobbySettingView.new()
         settingView:Show()
     end))
 
     local btn_exit = self._view:GetChild("btn_exit")
-    btn_exit.onClick:Set(handler (self , function ()
+    btn_exit.onClick:Set(handler(self, function()
         local _curren_msg = MsgWindow.new(self._root_view, '确认退出游戏', MsgWindow.MsgMode.OkAndCancel)
-        _curren_msg.onOk:Add( function()
+        _curren_msg.onOk:Add(function()
             Application.Quit()
         end)
         _curren_msg:Show()
     end))
 
-	local lst_userBG = self._view:GetChild("n118")
+    local lst_userBG = self._view:GetChild("n118")
-	lst_userBG.displayObject.gameObject:SetActive(false)
+    lst_userBG.displayObject.gameObject:SetActive(false)
     local lst_user = self._view:GetChild("lst_user")
-	lst_user.displayObject.gameObject:SetActive(false)
+    lst_user.displayObject.gameObject:SetActive(false)
-   --[[ lst_user.onClickItem:Set(function (context)
+    --[[ lst_user.onClickItem:Set(function (context)
         if context.data.name == "real" then
             local real_view = RealAddressView.new(0)
             real_view:Show()
@@ -138,64 +138,64 @@ function M:InitView(url)
             phone_view:Show()
         end
     end)--]]
-     -- self:__ShowShare()
+    -- self:__ShowShare()
 
 
     local btn_notice = self._view:GetChild("btn_notice")
-   --[[ btn_notice.onClick:Set(function()
+    --[[ btn_notice.onClick:Set(function()
       local noticeView = NoticeView.new(self._root_view)
       noticeView:FillData(DataManager.SelfUser.notices.data)
       noticeView:Show()
     end)
 --]]
-	btn_notice.displayObject.gameObject:SetActive(false)
+    btn_notice.displayObject.gameObject:SetActive(false)
-	
+
     local btn_service = self._view:GetChild("btn_service")
     --[[btn_service.onClick:Set(function()
         self:__show_service()
     end)--]]
-	btn_service.displayObject.gameObject:SetActive(false)
+    btn_service.displayObject.gameObject:SetActive(false)
 
-    
+
-    self.groupMainView = GroupMainView.new(self._view:GetChild("group"),self._root_view,self._view)
+    self.groupMainView = GroupMainView.new(self._view:GetChild("group"), self._root_view, self._view)
     --self.groupMainView:Show()
-   
+
-	local btn_more_group = self._view:GetChild("btn_more_group")
+    local btn_more_group = self._view:GetChild("btn_more_group")
-		btn_more_group.onClick:Set(function()
+    btn_more_group.onClick:Set(function()
-			--self.groupMainView._view.visible = true
+        --self.groupMainView._view.visible = true
-			ViewUtil.ShowModalWait(self._root_view,"请稍等，获取牌友圈中...")
+        ViewUtil.ShowModalWait(self._root_view, "请稍等，获取牌友圈中...")
-			local enterGroupCallBackFunc=function (code)
+        local enterGroupCallBackFunc = function(code)
-				 ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait()
-				if code==0 then
+            if code == 0 then
-					self.groupMainView._view.visible = true
+                self.groupMainView._view.visible = true
-				else
+            else
-					ViewUtil.ErrorTip(10000000,"获取牌友圈失败，请检查网络设置！")
+                ViewUtil.ErrorTip(10000000, "获取牌友圈失败，请检查网络设置！")
-					printlog("获取圈子数据失败=======>>>>")
+                printlog("获取圈子数据失败=======>>>>")
-				end
+            end
-			end
+        end
-			self.groupMainView:Show(nil,enterGroupCallBackFunc)
+        self.groupMainView:Show(nil, enterGroupCallBackFunc)
-		end)
+    end)
-	
+
     -- local btn_more_group = self._view:GetChild("btn_more_group")
     -- btn_more_group.touchable = true
     -- btn_more_group.onClick:Set(function()
-	-- 	local groups = DataManager.groups.groupList
+    -- 	local groups = DataManager.groups.groupList
     --     if #groups == 0 then
     --         self.groupMainView._view.visible = true
-	-- 		self.groupMainView:Show()
+    -- 		self.groupMainView:Show()
-	-- 		-- if not DataManager.SelfUser.phone then
+    -- 		-- if not DataManager.SelfUser.phone then
-	-- 		-- 	local phone_view = PhoneBindView.new()
+    -- 		-- 	local phone_view = PhoneBindView.new()
-	-- 		-- 	phone_view:Show()
+    -- 		-- 	phone_view:Show()
-	-- 		-- 	return
+    -- 		-- 	return
-	-- 		-- end
+    -- 		-- end
-	-- 	else
+    -- 	else
-	-- 		self.groupMainView:DEnterGroup()
+    -- 		self.groupMainView:DEnterGroup()
-	-- 	end
+    -- 	end
-	-- 	--self.groupMainView:DEnterGroup()
+    -- 	--self.groupMainView:DEnterGroup()
-        
+
     -- end)
-	
+
-	-- self.btn_joingroup.onClick:Set(function()
+    -- self.btn_joingroup.onClick:Set(function()
     --     local groups = DataManager.groups.groupList
     --     if #groups == 0 then
     --         local jgv = JoinGroupView.new(self._root_view)
@@ -218,10 +218,10 @@ function M:InitView(url)
     --     end
     -- end)
     -- self.btn_joingroup.touchable = true
-	
+
 
     local lst_game = self._view:GetChild("lst_game")
-	lst_game.displayObject.gameObject:SetActive(false)
+    lst_game.displayObject.gameObject:SetActive(false)
     --[[local games = DataManager.SelfUser.games
     for i = 1, math.min( 4,#games ) do
         local tem = games[i]
@@ -247,68 +247,66 @@ function M:InitView(url)
     self:__GetMessage()
 end
 
-
 function M:OnJoinRoomAction(context)
     local joinRoomView = JoinRoomView.new(self._root_view)
     joinRoomView:Show()
 end
 
 function M:__show_service()
-    local _buy_win = BaseWindow.new("ui://Lobby/Win_service",self._root_view)
+    local _buy_win = BaseWindow.new("ui://Lobby/Win_service", self._root_view)
     _buy_win._close_destroy = true
     _buy_win:Show()
     local sview = _buy_win._view
     local btn_copy = sview:GetChild("btn_copy")
-    btn_copy.onClick:Set(function ()
+    btn_copy.onClick:Set(function()
-        GameApplication.Instance:CopyToClipboard("xbkf888108")--湘北
+        GameApplication.Instance:CopyToClipboard("xbkf888108") --湘北
         -- GameApplication.Instance:CopyToClipboard("ttwmq008")--fb
         _buy_win:Destroy()
     end)
 end
 
 function M:__GetMessage(data)
-  --  print("on GetMessage~~~~~~~~~~~~~~~~~~~~~~~~~~~")
+    --  print("on GetMessage~~~~~~~~~~~~~~~~~~~~~~~~~~~")
-  if not data or not data.notice_list then
+    if not data or not data.notice_list then
-    self._mesList = ""
+        self._mesList = ""
-  else
+    else
-    local message = self._view:GetChild("com_message")
+        local message = self._view:GetChild("com_message")
-    message.visible = true
+        message.visible = true
-    local mesl = {}
+        local mesl = {}
-    for i = 1, #data.notice_list do
+        for i = 1, #data.notice_list do
-      mesl[i] = data.notice_list[i].informContent
+            mesl[i] = data.notice_list[i].informContent
+        end
+        self._mesList = mesl
     end
-    self._mesList = mesl
+
-  end
+    self:__moveMsg(0)
-  
-  self:__moveMsg(0)
 end
 
 function M:__PopMsg(index)
-  local num = #self._mesList
+    local num = #self._mesList
-  index = index + 1
+    index = index + 1
-  if index > num then index = 1 end
+    if index > num then index = 1 end
-  local str = tostring(self._mesList[index])
+    local str = tostring(self._mesList[index])
-  if str == nil or str == "nil" then str = "" end
+    if str == nil or str == "nil" then str = "" end
- return index ,string.gsub(str, "\r", "" )
+    return index, string.gsub(str, "\r", "")
 end
 
 function M:__moveMsg(index)
-   -- print("on moveMsg!!!!!!!!!!!!!!!!!!!!!!!!!")
+    -- print("on moveMsg!!!!!!!!!!!!!!!!!!!!!!!!!")
     if not self._tex_message then return end
-    index, self._tex_message.text =self:__PopMsg(index)
+    index, self._tex_message.text = self:__PopMsg(index)
     self._tex_message.x = self._message.width
 
     if self._mesTw then
         TweenUtils.Kill(self._mesTw)
     end
-    local change =  -self._message.width *2
+    local change = -self._message.width * 2
     local dd = self._tex_message.width / self._message.width
     if dd < 1 then dd = 1 end
-    self._mesTw = TweenUtils.TweenFloat(0,1*dd,10*dd,function(value)
+    self._mesTw = TweenUtils.TweenFloat(0, 1 * dd, 10 * dd, function(value)
-        
+        self._tex_message.x = self._message.width + (change * value)
-        self._tex_message.x =self._message.width +   (change * value)
     end)
-    TweenUtils.OnComplete(self._mesTw,function ()
+    TweenUtils.OnComplete(self._mesTw, function()
         self._mesTw = nil
         if (#self._mesList == 0) then
             self:__GetMessage()
@@ -319,19 +317,18 @@ function M:__moveMsg(index)
     end)
 end
 
-
 function M:__ShowShare()
     local pop_share = self._view:GetChild("pop_share")
     local shareUrl = GetGameInfo("invite_link") .. "?uid=" .. DataManager.SelfUser.account_id
-	--print("shareUrl=================")
+    --print("shareUrl=================")
-	--print(shareUrl)
+    --print(shareUrl)
     local btn_wx_session = pop_share:GetChild("btn_wx_session")
-    btn_wx_session.onClick:Add(function ()
+    btn_wx_session.onClick:Add(function()
-        shareQRCodePicture(shareUrl,0)
+        shareQRCodePicture(shareUrl, 0)
     end)
     local btn_wx_line = pop_share:GetChild("btn_wx_line").asButton
-    btn_wx_line.onClick:Add(function ()
+    btn_wx_line.onClick:Add(function()
-        shareQRCodePicture(shareUrl,1)
+        shareQRCodePicture(shareUrl, 1)
     end)
 end
 
@@ -344,9 +341,9 @@ function M:OnUpdate()
     end
 end
 
-function M:Close(  )
+function M:Close()
     BaseView.Close(self)
-    UpdateBeat:Remove(self.OnUpdate,self)
+    UpdateBeat:Remove(self.OnUpdate, self)
     coroutine.stopAll()
     if self._mesTw then
         TweenUtils.Kill(self._mesTw)
@@ -356,7 +353,7 @@ function M:Close(  )
 end
 
 function M:Destroy()
-    UpdateBeat:Remove(self.OnUpdate,self)
+    UpdateBeat:Remove(self.OnUpdate, self)
     if self._mesTw then
         TweenUtils.Kill(self._mesTw)
     end
@@ -371,7 +368,7 @@ function M:Show()
     --print("on lobbyView show~~~~~~")
     BaseView.Show(self)
     ViewUtil.PlaySoundBg()
-    UpdateBeat:Add(self.OnUpdate,self)
+    UpdateBeat:Add(self.OnUpdate, self)
 
     -- 如果在圈子内的房间，显示tip
     local user = DataManager.SelfUser
@@ -380,9 +377,9 @@ function M:Show()
         local msg_tip = MsgWindow.new(self._root_view, "还在圈子的房间中，现在重连吗？", MsgWindow.MsgMode.OkAndCancel)
         msg_tip.onOk:Add(function()
             if self.groupMainView ~= nil then
-              self.groupMainView:Show(user.group_id)
+                self.groupMainView:Show(user.group_id)
             end
-        end) 
+        end)
         msg_tip:Show()
         tem.auto_show = false
     else
@@ -413,15 +410,15 @@ end
 function M:GetPlayerInfoData()
     local loddyCtr1 = ControllerManager.GetController(LoddyController)
     loddyCtr1:UpdatePlayerInfo(function(result, data)
-    if result then
+        if result then
-      self:ShowPlayerInfo(data.raffle, data.diamo, data.newMail)
+            self:ShowPlayerInfo(data.raffle, data.diamo, data.newMail)
-    end
+        end
-  end)
+    end)
 end
 
 function M:ShowPlayerInfo(raffle, diamo, newMail)
     self._view:GetChild("gcm_diamo"):GetChild("title").text = diamo or 0
-end 
+end
 
 function M:OnApplicationPause()
     ControllerManager.WebClient:clearActionQueue()
@@ -443,4 +440,58 @@ function M:OnApplicationActive()
             DataManager.SelfUser.cur_group:Reconnect()
         end
     end
-end
+end
+
+function M:InitClip()
+    local taohuaEnd = 114
+    local taohuaName = "ui://Lobby/taohua_00"
+    local taohua = self._view:GetChild('clip_bg')
+    local taohuaIndex = 0
+
+    local renwuEnd = 143
+    local renwuName = "ui://Lobby/renwu-AE_00"
+    local renwu = self._view:GetChild('clip_renwu')
+    local renwuIndex = 0
+
+    local pukeEnd = 60
+    local pukeName = "ui://Lobby/puke_00"
+    local puke = self._view:GetChild('btn_ChuangJian')
+    local pukeIndex = 0
+
+    local jiangbeiEnd = 150
+    local jiangbeiName = "ui://Lobby/jiangbei_00"
+    local jiangbei = self._view:GetChild('btn_more_group')
+    local jiangbeiIndex = 0
+
+    local hechengEnd = 96
+    local hechengName = "ui://Lobby/hecheng 1_00"
+    local hecheng = self._view:GetChild('btn_joinroom')
+    local hechengIndex = 0
+    coroutine.start(
+        function()
+            while true do
+                taohuaIndex = self:ReplaceClip1(taohuaEnd, taohua, taohuaIndex, taohuaName)
+                renwuIndex = self:ReplaceClip1(renwuEnd, renwu, renwuIndex, renwuName)
+                pukeIndex = self:ReplaceClip2(pukeEnd, puke, pukeIndex, pukeName)
+                jiangbeiIndex = self:ReplaceClip2(jiangbeiEnd, jiangbei, jiangbeiIndex, jiangbeiName)
+                hechengIndex = self:ReplaceClip2(hechengEnd, hecheng, hechengIndex, hechengName)
+            end
+        end
+    )
+end
+
+function M:ReplaceClip1(e, t, i, n)
+    if i > e then
+        i = 0
+    end
+    t.url = string.format("%s%03d", n, i)
+    return i + 1
+end
+
+function M:ReplaceClip2(e, t, i, n)
+    if i > e then
+        i = 0
+    end
+    t.icon = string.format("%s%03d", n, i)
+    return i + 1
+end

lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua

@@ -11,6 +11,8 @@ local GroupMngFagPackView = import('.GroupMngFagPackView')
 local GroupMailView = import('.GroupMailView')
 local GroupSelectPlayView = import('.GroupSelectPlayView')
 local GroupMngSettingView = import('.GroupMngSettingView')
+local GroupMngMemberInviteView = import(".MngView.GroupMngMemberInviteView")
+local GroupMngMemberHpListView = import(".MngView.GroupMngMemberHpListView")
 -- local HeadView = require('Game/View/LobbyHeadView')
 GroupNumberInputView_Game = import(".MngView.GroupNumberInputView")
 
@@ -1626,10 +1628,13 @@ function M:__refreshManager()
     btn_partner.onClick:Set(
         function()
             --print("成员..........................................")
-            if not self.mng_view_invite then
+            if not self.mng_view3 then
-                self.mng_view_invite = GroupManagerView.new(self._root_view, self.curGroup.id, 5)
+                self.mng_view3 = GroupManagerView.new(self._root_view, self.curGroup.id, 5)
+                self.mng_view3:SetCurrentGroupInfoViewIns(function()
+                    self:OnclickMember()
+                end)
             end
-            self.mng_view_invite:Show()
+            self.mng_view3:Show()
             -- self:SetRoomListVisible(false)
         end
     )
@@ -1795,15 +1800,23 @@ function M:__loadGroupData()
                 ---[[
                 btn_invite.onClick:Set(function()
                     --print("成员..........................................")
-                    if not self.mng_view3 then
+                    if not self.mng_view_invite then
-                        self.mng_view3 = GroupManagerView.new(self._root_view, self.curGroup.id, 6)
+                        self.mng_view_invite = GroupMngMemberInviteView.new(self.curGroup.id)
-                        self.mng_view3:SetCurrentGroupInfoViewIns(function()
-                            self:OnclickMember()
-                        end)
                     end
-                    self.mng_view3:Show()
+                    print("lingmeng-self.mng_view_invite", self.mng_view_invite)
+                    self.mng_view_invite:Show()
                     -- self:SetRoomListVisible(false)
                 end)
+
+                --查看成员hp值，带分配
+                local btn_hp = self._view:GetChild('btn_hp')
+                btn_hp.onClick:Set(function()
+                    if not self.mng_view_hp then
+                        self.mng_view_hp = GroupMngMemberHpListView.new(self.curGroup.id)
+                    end
+                    print("lingmeng-self.mng_view_invite", self.mng_view_hp)
+                    self.mng_view_hp:Show()
+                end)
                 --]]
 
                 -- local btn_rank = self._view:GetChild("btn_rank")
@@ -2045,6 +2058,9 @@ function M:Destroy()
     if self.mng_view_invite then
         self.mng_view_invite:Destroy()
     end
+    if self.mng_view_hp then
+        self.mng_view_hp:Destroy()
+    end
     DataManager.SelfUser.cur_group = nil
     if self._tw_notice then
         self._tw_notice:Stop()

lua_probject/base_project/Game/View/NewGroup/MngView/GroupAddMemberInfoView.lua

@@ -2,59 +2,56 @@ local GroupAddMemberInfoView = {}
 
 local M = GroupAddMemberInfoView
 
-function GroupAddMemberInfoView.new(group_id,member_id)
+function GroupAddMemberInfoView.new(group_id, member_id)
-    setmetatable(M, {__index = BaseView})
+	setmetatable(M, { __index = BaseView })
-    local self = setmetatable({}, {__index = M})
+	local self = setmetatable({}, { __index = M })
-    self.class = "GroupAddMemberInfoView"
+	self.class = "GroupAddMemberInfoView"
-    self.group_id = group_id
+	self.group_id = group_id
-    self.member_id = member_id
+	self.member_id = member_id
-    self:init("ui://NewGroup/Win_PlayerInfoForAdd")
+	self:init("ui://NewGroup/Win_PlayerInfoForAdd")
-    return self
+	return self
 end
 
 function M:init(url)
-  	BaseWindow.init(self,url)
+	BaseWindow.init(self, url)
-  	self.Tx=self._view:GetChild("btn_head")
+	self.Tx = self._view:GetChild("btn_head")
-	self.Name=self._view:GetChild("tex_name")
+	self.Name = self._view:GetChild("tex_name")
-	self.Id=self._view:GetChild("tex_id")
+	self.Id = self._view:GetChild("tex_id")
 	self._view:GetChild("btn_close").onClick:Set(
-							function ()
+		function()
-								self:Destroy()
+			self:Destroy()
-							end
+		end
-						)
+	)
 	self._view:GetChild("btn_qc").onClick:Set(
-							function ()
+		function()
-								self:Destroy()
+			self:Destroy()
-							end
+		end
-						)
+	)
 	self._view:GetChild("btn_qd").onClick:Set(
-			function ()
+		function()
-				ViewUtil.ShowModalWait()
+			ViewUtil.ShowModalWait()
-				local fgCtr = ControllerManager.GetController(NewGroupController)
+			local fgCtr = ControllerManager.GetController(NewGroupController)
-				fgCtr:FG_AddMember(
+			fgCtr:FG_AddMember(
-					self.group_id,
+				self.group_id,
-					self.member_id,
+				self.member_id,
-					function (response)
+				function(response)
-						ViewUtil.CloseModalWait()
+					ViewUtil.CloseModalWait()
-						if (response.ReturnCode == 0) then
+					if (response.ReturnCode == 0) then
-							ViewUtil.ShowBannerOnScreenCenter('添加成功！', 1)
+						ViewUtil.ShowBannerOnScreenCenter('添加成功！', 1)
-						else
+					else
-							ViewUtil.ErrorTip(response.ReturnCode, '邀请玩家失败！')
+						ViewUtil.ErrorTip(response.ReturnCode, '邀请玩家失败！')
-						end
 					end
-				)
+				end
-			end
+			)
-						)
+		end
-						
+	)
 end
 
-
 function M:SetAddMember(data)
 	ImageLoad.Load(data.portrait, self.Tx._iconObject)
-	self.Name.text=data.nick
+	self.Name.text = data.nick
-	self.Id.text=data.uid
+	self.Id.text = data.uid
 	self:Show()
 end
 
-
+return M
-return M

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua

@@ -0,0 +1,596 @@
+-- 牌友圈成员列表
+local GroupNumberInputView = import('.GroupNumberInputView')
+local GroupMemberFagLogView = import('.GroupMemberFagLogView')
+local GroupSetPermissionView = import('.GroupSetPermissionView')
+local GroupBanSameTableView = import('.GroupBanSameTableView')
+local GroupMemberOperateView = import('.GroupMemberOperateView')
+local GroupAddMemberInfoView = import('.GroupAddMemberInfoView')
+local GroupStatMember = import('.GroupStatMember')
+local GroupMngFagPackView = import('../GroupMngFagPackView')
+
+
+local MngPermission = import('.MngPermission')
+
+local GroupMngMemberHpListView = {
+    numberMap = {}
+}
+
+local M = GroupMngMemberHpListView
+setmetatable(M, { __index = BaseWindow })
+
+local gid
+function GroupMngMemberHpListView.new(group_id, blur_view)
+    local self = setmetatable({}, { __index = M })
+    self.class = 'GroupMngMemberListView1'
+    self.group_id = group_id
+    self.curGroup = DataManager.groups:get(self.group_id)
+    self.member_data = {}
+    self.online = 2
+    self.stype = 1
+    self:FillView()
+    return self
+end
+
+function M:initData()
+    if self._view:GetController('page').selectedIndex == 0 then
+        self:GetMemberData(0)
+    elseif self._view:GetController('page').selectedIndex == 1 then
+        self:GetMemberData(0)
+        --self:GetJoinsData()
+    end
+end
+
+-- 管理员权限
+local MngPermissionList = {
+    DeleteMember = 1,
+    -- 删除成员
+    AddMember = 2,
+    --添加成员
+    SetFag = 3,
+    --设置体力值
+    BanPlaying = 4,
+    --禁止游戏
+    BanSameTable = 5
+    --禁止同桌
+}
+local function CheckPermission(lev, permission)
+    if lev == 2 and not permission then
+        ViewUtil.ErrorTip(nil, '您无权操作！如有需要请联系盟主。', 1)
+        return false
+    end
+    return true
+end
+
+function M:FillView()
+    BaseWindow.init(self, 'ui://NewGroup/View_GroupMemberHpList')
+
+    local rtype = self._view:GetChild("n132")
+    rtype.visible = false
+
+    rtype.onChanged:Set(function()
+        if tostring(self.online) == rtype.value then
+            return
+        end
+        self.online = tonumber(rtype.value)
+        self:GetMemberData(0)
+        --printlog("aaaaaaaa222222222222222222222222222222")
+    end)
+
+    local rtype = self._view:GetChild("n136")
+
+    rtype.onClick:Set(function()
+        self:GetMemberData(0)
+        --printlog("aaaaaaaa222222222222222222222222222222")
+    end)
+
+    -- 初始化成员列表
+    self.lst_member = self._view:GetChild('lst_member')
+    self.lst_member:SetVirtual()
+    self.lst_member.itemRenderer = function(index, obj)
+        self:OnRenderItem(index, obj)
+    end
+    self.lst_member.scrollPane.onPullUpRelease:Set(
+        function()
+            --printlog("aaaaaaaaaaaaaaaaaaaaaa   bbbbbbbbbbbbbbbbbb   ",self.lst_member.numItems)
+            self:GetMemberData(self.lst_member.numItems)
+        end
+    )
+
+    --local n50=self._view:GetChild('n50')
+    --print(n50)
+    --n50.displayObject.gameObject.transform.localPosition.x=214
+    --print(n50.displayObject.gameObject.transform.localPosition.x)
+    -- 搜索玩家
+    local ctr_search = self._view:GetController('search')
+    self._view:GetChild('btn_search').onClick:Set(
+        function()
+            ViewUtil.ShowModalWait(nil)
+            local text = self._view:GetChild('tex_id').text
+            local qid, qnick
+            if text == "" then
+                ViewUtil.CloseModalWait()
+                ViewUtil.ErrorTip(nil, '输入不能为空')
+                return
+            end
+            qid = tonumber(text) or 0
+            qnick = text
+            local fgCtr = ControllerManager.GetController(NewGroupController)
+            fgCtr:FG_FindMember(
+                self.group_id,
+                qid,
+                function(res)
+                    ViewUtil.CloseModalWait()
+                    if self._is_destroy then
+                        return
+                    end
+                    if res.ReturnCode ~= 0 then
+                        ViewUtil.ErrorTip(res.ReturnCode, '找不到成员')
+                    else
+                        self._view:GetChild('tex_id').text = ''
+                        ctr_search.selectedIndex = 1
+                        local item_result = self._view:GetChild('lst_member_find')
+                        item_result:RemoveChildrenToPool()
+
+                        for j = 1, #res.Data.members do
+                            local tem = item_result:AddItemFromPool()
+                            self:FillItem(tem, res.Data.members[j], true, j)
+                        end
+                    end
+                end,
+                qnick
+            )
+        end
+    )
+    local btn_back = self._view:GetChild('btn_back')
+    btn_back.onClick:Set(
+        function()
+            self.lst_member.numItems = #self.member_data
+        end
+    )
+
+    local group = DataManager.groups:get(self.group_id)
+    local perm_array = MngPermission.getPermData(group.permission)
+
+    self:GetMemberData(0)
+end
+
+-- 快速访问
+function M:navigation()
+    self._view:GetController('page').selectedIndex = 2
+    self:initData()
+end
+
+-- 获取成员数据
+function M:GetMemberData(index)
+    --print("11111111111111111111")
+    --print(debug.traceback())
+    -- local iClear = false
+    -- local rtype = self._view:GetChild("n132").value
+    -- if tostring(self.online) ~= rtype then
+    --     iClear = true
+    -- end
+
+    local group = DataManager.groups:get(self.group_id)
+    if index == 0 then
+        group:clearMember()
+    end
+
+    ViewUtil.ShowModalWait(nil)
+    local fgCtr = ControllerManager.GetController(NewGroupController)
+    fgCtr:FG_GroupMembers12(
+        self.group_id,
+        index,
+        6,
+        self.stype,
+        self.online,
+        function(res)
+            ViewUtil.CloseModalWait()
+            if res.ReturnCode ~= 0 then
+                ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败')
+            else
+                self.member_data = group.members
+                self.lst_member.numItems = group.member_num
+                if index == 0 then
+                    -- self._view:GetChild('tex_memb_num').text = res.Data.member_num
+                    -- self._view:GetChild('tex_total_hp').text = d2ad(res.Data.hp_num1+res.Data.otherHp)
+                end
+            end
+        end
+    )
+end
+
+-- 修改体力值
+local function __change_fag(gid, pid, is_add, cur_hp, callback)
+    local gniv =
+        GroupNumberInputView.new(
+            nil,
+            function(num)
+                num = ad2d((is_add and num or -num))
+                ViewUtil.ShowModalWait()
+                local fgCtr = ControllerManager.GetController(NewGroupController)
+                fgCtr:FG_ChangeFag(
+                    gid,
+                    pid,
+                    num,
+                    function(res1)
+                        ViewUtil.CloseModalWait()
+                        -- if gniv._is_destroy then
+                        --     return
+                        -- end
+                        if (res1.ReturnCode == 0) then
+                            callback(res1.Data)
+                        else
+                            ViewUtil.ErrorTip(res1.ReturnCode, '更改积分失败！')
+                        end
+                    end
+                )
+                -- item:GetChild("tex_fag").text = (self_user or show_fag) and num or show_fag_str
+            end,
+            is_add and 1 or 2,
+            cur_hp and d2ad(cur_hp) or nil
+        )
+    gniv:Show()
+end
+
+-- 填充成员对象
+function M:FillItem(obj, member, refresh, index)
+    local group = DataManager.groups:get(self.group_id)
+    obj:GetChild('tex_name').text = ViewUtil.stringEllipsis(member.nick)
+    obj:GetChild('btn_head').icon = 'ui://Common/Head0'
+    obj:GetChild('tex_childId').text = index
+    ImageLoad.Load(member.portrait, obj:GetChild('btn_head')._iconObject, self.class)
+    -- obj.data = member.id
+    -- 显示玩家标签，合伙人、管理员
+    -- local ctr_type = obj:GetController('type')
+    local tex_lev = obj:GetChild('tex_lev')
+
+    if member.lev < 3 then
+        if member.lev == 1 then
+            tex_lev.text = "馆主"
+        else
+            tex_lev.text = "副馆主"
+        end
+    elseif member.partnerLev ~= 0 then
+        tex_lev.text = "董事"
+    else
+        tex_lev.text = "成员"
+    end
+
+    -- 体力值数据
+    local tex_fag = obj:GetChild('tex_fag')
+    tex_fag.text = d2ad(member.hp)
+
+    obj:GetChild('tex_id').text = '' .. member.uid
+    --obj:GetChild("tex_cost_count").text = d2ad(member.last_hp_cost)
+
+    --if member.online == 1 then
+    -- obj:GetChild('tex_last_login').text = '在线'
+    -- else
+    if member.last_time ~= 0 then
+        -- local now_time = os.date("*t",now)
+        -- local today = os.time({year=now_time.year, month=now_time.month, day=now_time.day, hour=0,min=0,sec=0})
+        -- local cha = math.ceil((today - member.last_time) / (24 * 60 *60))
+        -- if (cha > 0) then
+        --     obj:GetChild('tex_last_login').text = cha.."天前" --'最近登录\n' .. os.date('%Y/%m/%d', member.last_time)
+        -- else
+        --     obj:GetChild('tex_last_login').text = os.date('%Y/%m/%d', member.last_time)
+        -- end
+        --print("11111aaaaaaaaaaaaaaaaaaaa     ",os.date('%Y/%m/%d', member.last_time))
+        obj:GetChild('tex_last_login').text = "最近登录:" .. os.date('%Y/%m/%d', member.last_time)
+    else
+        obj:GetChild('tex_last_login').text = '加入时间\n' .. os.date('%Y/%m/%d', member.join_time)
+    end
+    -- end
+
+
+    obj:GetChild('tex_zongchangci').text = member.total_round
+    obj:GetChild('tex_ruhui').text = os.date('%Y/%m/%d %H:%M:%S', member.join_time)
+
+    --上级
+    obj:GetChild('tex_shangjiName').text = member.parentId_nick or ""
+    if member.parentId == 0 then
+        obj:GetChild('tex_shangjiID').text = ""
+    else
+        obj:GetChild('tex_shangjiID').text = member.parentId
+    end
+
+
+    local perm_array = MngPermission.getPermData(group.permission)
+    -- 体力值操作按钮事件
+    if group.lev < 3 or member.parentId == DataManager.SelfUser.account_id then
+        obj:GetController('fag').selectedIndex = 1
+    else
+        obj:GetController('fag').selectedIndex = 0
+    end
+
+    --obj:GetChild("btn_tag").title = member.score
+
+    local fgCtr = ControllerManager.GetController(NewGroupController)
+    local p = group:getMember(member.uid)
+    local mp = group:getMember(DataManager.SelfUser.account_id)
+    obj:GetChild('btn_fag_add').onClick:Set(
+        function()
+            if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then
+                return
+            end
+            __change_fag(
+                self.group_id,
+                member.uid,
+                true,
+                nil,
+                function(data)
+                    local hp = data.hp
+                    member.hp = hp
+                    if p then
+                        p.hp = hp
+                        if mp and mp ~= p then
+                            local mhp = data.mhp
+                            mp.hp = mhp
+                        end
+                    end
+                    self.lst_member.numItems = #self.member_data
+                    -- 搜索出的玩家显示
+                    if self._view:GetController('search').selectedIndex == 1 then
+                        obj:GetChild('tex_fag').text = d2ad(hp)
+                    end
+                end
+            )
+        end
+    )
+    obj:GetChild('btn_fag_minus').onClick:Set(
+        function()
+            if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then
+                return
+            end
+            __change_fag(
+                self.group_id,
+                member.uid,
+                false,
+                member.hp,
+                function(data)
+                    local hp = data.hp
+                    member.hp = hp
+                    if p then
+                        p.hp = hp
+                        if mp and mp ~= p then
+                            local mhp = data.mhp
+                            mp.hp = mhp
+                        end
+                    end
+                    self.lst_member.numItems = #self.member_data
+                    -- 搜索出的玩家显示
+                    if self._view:GetController('search').selectedIndex == 1 then
+                        obj:GetChild('tex_fag').text = d2ad(hp)
+                    end
+                end
+            )
+        end
+    )
+
+    obj:GetChild('btn_score_detail').onClick:Set(
+        function()
+            local mflv = GroupMemberFagLogView.new(self.group_id, member)
+            mflv:Show()
+        end
+    )
+
+    obj:GetChild('btn_operate').onClick:Set(
+        function()
+            local mflv =
+                GroupMemberOperateView.new(
+                    self.group_id,
+                    member,
+                    function(delete)
+                        if delete ~= nil and delete == true then
+                            local group = DataManager.groups:get(self.group_id)
+                            self.member_data = group.members
+                            self.lst_member.numItems = #self.member_data
+                            self._view:GetController('search').selectedIndex = 0
+                        else
+                            self.lst_member.numItems = self.lst_member.numItems
+                            if refresh then
+                                self:FillItem(obj, member)
+                            end
+                        end
+                    end,
+                    function()
+                        self:GetMemberData(0)
+                    end
+                )
+            mflv:Show()
+        end
+    )
+
+    local btnBxx = obj:GetChild('btn_bxx')
+    btnBxx.visible = (not (member.lev == 3 and member.partnerLev == 0)) and
+        not (DataManager.SelfUser.account_id == member.uid)
+    --btnBxx.visible = not (DataManager.SelfUser.account_id == member.uid)
+    obj:GetChild('btn_bxx').onClick:Set(
+        function()
+            local ctrNum = 1
+            -- if not (member.lev == 3 and member.partnerLev == 0) then
+            --     ctrNum = 2
+            -- end
+            ctrNum = 2
+            local gmv = GroupMngFagPackView.new(self.curGroup.id, self._root_view, ctrNum, member.uid)
+            gmv:SetCallback(
+                function()
+                    btnBxx.selected = false
+                end
+            )
+            gmv:Show()
+        end
+    )
+
+    local superBtn = obj:GetChild('super_btn')
+    superBtn.visible = group.lev == 1
+    -- obj:GetChild("super_btn").onClick:Set(
+    --     function()
+    --         ViewUtil.ShowModalWait(nil)
+    --         local text = member.uid
+    --         local qid, qnick
+    --         if text == "" then
+    --             ViewUtil.CloseModalWait()
+    --             ViewUtil.ErrorTip(nil, '输入不能为空')
+    --             return
+    --         end
+    --         qid = tonumber(text) or 0
+    --         qnick = tostring(text)
+    --         local fgCtr = ControllerManager.GetController(NewGroupController)
+    --         fgCtr:FG_FindMember(
+    --             self.group_id,
+    --             qid,
+    --             function(res)
+    --                 ViewUtil.CloseModalWait()
+    --                 if self._is_destroy then
+    --                     return
+    --                 end
+    --                 if res.ReturnCode ~= 0 then
+    --                     ViewUtil.ErrorTip(res.ReturnCode, '找不到成员')
+    --                 else
+    --                     self._view:GetChild('tex_id').text = ''
+    --                     self._view:GetController('search').selectedIndex = 1
+    --                     local item_result = self._view:GetChild('lst_member_find')
+    --                     item_result:RemoveChildrenToPool()
+
+    --                     for j = 1, #res.Data.members do
+    --                         local tem = item_result:AddItemFromPool()
+    --                         self:FillItem(tem, res.Data.members[j], true, j)
+    --                     end
+    --                 end
+    --             end,
+    --             qnick,
+    --             1
+    --         )
+    --     end
+    -- )
+    obj:GetChild("super_btn").onClick:Set(
+        function()
+            ViewUtil.ShowModalWait(nil)
+            local text = member.uid
+            local tempNumberList = self.numberMap[text]
+            if tempNumberList == nil then
+                tempNumberList = {}
+                for j = 1, #self.member_data do
+                    local number = self.member_data[j]
+                    if number.parentId == text then
+                        table.insert(tempNumberList, number)
+                    end
+                end
+                self.numberMap[text] = tempNumberList
+            end
+            self._view:GetChild('tex_id').text = ''
+            self._view:GetController('search').selectedIndex = 1
+            local item_result = self._view:GetChild('lst_member_find')
+            item_result:RemoveChildrenToPool()
+
+            ViewUtil.CloseModalWait()
+            for j = 1, #tempNumberList do
+                local tem = item_result:AddItemFromPool()
+                self:FillItem(tem, tempNumberList[j], true, j)
+            end
+        end
+    )
+end
+
+function M:OnRenderItem(index, obj)
+    --printlog("aaaaaaaaaawwwwwwwwwwwwwwwwwwwwwwwwwwww    ",index)
+    local member = self.member_data[index + 1]
+    if member then
+        self:FillItem(obj, member, false, index + 1)
+    end
+end
+
+--获取申请列表
+function M:GetJoinsData()
+    local group = DataManager.groups:get(self.group_id)
+    if group.joins > 0 then
+        ViewUtil.ShowModalWait()
+        local fgCtr = ControllerManager.GetController(NewGroupController)
+        fgCtr:FG_GroupJoins(
+            self.group_id,
+            function(res)
+                ViewUtil.CloseModalWait()
+                if (res.ReturnCode == 0) then
+                    local joins = res.Data.joins
+                    group.joins = #joins
+                    if #joins == 0 then
+                        group.update_joins = true
+                    end
+                    self:FillJoinList(joins)
+                else
+                    ViewUtil.ErrorTip(res.ReturnCode, '获取申请列表失败！')
+                    self:FillJoinList({})
+                end
+            end
+        )
+    else
+        self:FillJoinList({})
+    end
+end
+
+--填充申请
+function M:FillJoinList(data)
+    local lst_joins = self._view:GetChild('lst_joins')
+    lst_joins:RemoveChildrenToPool()
+    for i = 1, #data do
+        local item = lst_joins:AddItemFromPool()
+        item:GetChild('tex_name').text = ViewUtil.stringEllipsis(data[i].nick)
+        item:GetChild('tex_id').text = data[i].id
+        local btn_head = item:GetChild('btn_head')
+        ImageLoad.Load(data[i].portrait, btn_head._iconObject)
+        item:GetChild('btn_yes').onClick:Set(
+            function()
+                self:VerifyPlayerJoin(data[i].id, true)
+            end
+        )
+        item:GetChild('btn_no').onClick:Set(
+            function()
+                self:VerifyPlayerJoin(data[i].id, false)
+            end
+        )
+    end
+end
+
+function M:VerifyPlayerJoin(id, allow)
+    ViewUtil.ShowModalWait()
+    local fgCtr = ControllerManager.GetController(NewGroupController)
+    fgCtr:FG_GroupVerifyJoin(
+        self.group_id,
+        id,
+        allow,
+        function(res)
+            ViewUtil.CloseModalWait()
+            if (res.ReturnCode == 0) then
+                self:GetJoinsData()
+            else
+                ViewUtil.ErrorTip(res.ReturnCode, '操作申请失败')
+            end
+        end
+    )
+end
+
+function M:OnNumButtonAction(context)
+    local typer = string.sub(context.sender.name, 5)
+    if typer == 'del' then
+        if (self._currenIndex > 0) then
+            self._currenIndex = self._currenIndex - 1
+            self._texnum_str = string.sub(self._texnum_str, 0, self._currenIndex)
+            self.tex_num.text = self._texnum_str
+        end
+    else
+        if (self._currenIndex < 6) then
+            self._currenIndex = self._currenIndex + 1
+            self._texnum_str = self._texnum_str .. typer
+            self.tex_num.text = self._texnum_str
+        end
+    end
+end
+
+function M:ClearNumTex()
+    self._texnum_str = ''
+    self._currenIndex = 0
+    self.tex_num.text = self._texnum_str
+end
+
+return M

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberInviteView.lua

@@ -12,10 +12,10 @@ local MngPermission = import('.MngPermission')
 local GroupMngMemberInviteView = {}
 
 local M = GroupMngMemberInviteView
-
+setmetatable(M, { __index = BaseWindow })
 local gid
 function GroupMngMemberInviteView.new(group_id, blur_view)
-    local self = M
+    local self = setmetatable({}, { __index = M })
     self.class = 'GroupMngMemberInviteView'
     self.group_id = group_id
     self.member_data = {}
@@ -23,14 +23,6 @@ function GroupMngMemberInviteView.new(group_id, blur_view)
     return self
 end
 
-function M:initData()
-    -- if self._view:GetController('page').selectedIndex == 0 then
-    --     self:GetMemberData(0)
-    -- elseif self._view:GetController('page').selectedIndex == 1 then
-    --     self:GetJoinsData()
-    -- end
-end
-
 -- 管理员权限
 local MngPermissionList = {
     DeleteMember = 1,
@@ -53,7 +45,7 @@ local function CheckPermission(lev, permission)
 end
 
 function M:FillView()
-    self._view = UIPackage.CreateObjectFromURL('ui://NewGroup/View_GroupMemberInvite')
+    BaseWindow.init(self, 'ui://NewGroup/View_GroupMemberInviteAlone')
 
     local group = DataManager.groups:get(self.group_id)
     local perm_array = MngPermission.getPermData(group.permission)

lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua

@@ -17,7 +17,6 @@ local GroupMngPartnerStatView = import(".GroupMngPartnerStatView")
 local GroupMngMemberInfoView = import(".GroupMngMemberInfoView")
 local GroupMngXingYunStatView = import(".GroupMngXingYunStatView")
 local GroupMngZuanShiStatView = import(".GroupMngZuanShiStatView")
-local GroupMngMemberInviteView = import(".GroupMngMemberInviteView")
 local MngPageConfig = {}
 
 -- 界面配置表
@@ -46,7 +45,6 @@ MngPageConfig.PageList = {
 	{ id = 22, title = "数据统计", view = GroupMngMemberInfoView, refresh = true, clear_image = true, anchorOffset = 300 },
 	{ id = 23, title = "玩家数据", view = GroupMngXingYunStatView, refresh = true, clear_image = true, anchorOffset = 300 },
 	{ id = 24, title = "局数统计", view = GroupMngZuanShiStatView, refresh = true, clear_image = true, anchorOffset = 300 },
-	{ id = 25, title = "邀请玩家", view = GroupMngMemberInviteView, refresh = true, clear_image = true, anchorOffset = 300 },
 }
 
 -- Config定义不同职位的人，通过不同按钮进入显示的内容
@@ -101,10 +99,11 @@ MngPageConfig.Config = {
 		{ 20, 10, 21 },
 		{ 20, 10, 21 },
 	},
+	--暂时弹出查看
 	{
-		{ 25 },
+		{ 20 },
-		{ 25 },
+		{ 20 },
-		{ 25 },
+		{ 20 },
 	},
 }
 

wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info

@@ -1,5 +1,8 @@
 {
   "objectStatus": {
+    "n118_ker3": {
+      "hidden": true
+    },
     "n54_lwcl": {
       "hidden": true
     },
@@ -21,6 +24,9 @@
     "n140_csp4": {
       "hidden": true
     },
+    "n108_ker3": {
+      "hidden": true
+    },
     "n50_lwcl": {
       "hidden": true
     },

wb_new_ui/.objs/metas/m7iejg46/10snh5j.info

@@ -9,9 +9,6 @@
     "n214_ovii": {
       "hidden": true
     },
-    "n190_nk4v": {
-      "hidden": true
-    },
     "n229_csp4": {
       "hidden": true
     },

wb_new_ui/.objs/metas/m7iejg46/ilon7ia2.info

@@ -0,0 +1,7 @@
+{
+  "objectStatus": {
+    "n109_ovii": {
+      "hidden": true
+    }
+  }
+}

wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info

@@ -0,0 +1,16 @@
+{
+  "objectStatus": {
+    "n132_z384": {
+      "hidden": true
+    },
+    "n35_rpaz": {
+      "hidden": true
+    },
+    "n33_rpaz": {
+      "hidden": true
+    },
+    "n69_jd7v": {
+      "hidden": true
+    }
+  }
+}

wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info

@@ -0,0 +1,10 @@
+{
+  "objectStatus": {
+    "n44_rpaz": {
+      "collapsed": true
+    },
+    "n26_kwi0": {
+      "collapsed": true
+    }
+  }
+}

wb_new_ui/.objs/metas/m7iejg46/jr1l7i3c.info

@@ -1,3 +1,20 @@
 {
+  "objectStatus": {
+    "n81_jr1l": {
+      "hidden": true
+    },
+    "n78_et16": {
+      "hidden": true
+    },
+    "n80_jr1l": {
+      "hidden": true
+    },
+    "n77_et16": {
+      "hidden": true
+    },
+    "n91_j5s5": {
+      "hidden": true
+    }
+  },
   "fitScreen": "FitSize"
 }

wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info

@@ -1,9 +1,12 @@
 {
   "objectStatus": {
-    "n86_t1hq": {
+    "n69_jd7v": {
       "hidden": true
     },
-    "n69_jd7v": {
+    "n113_csp4": {
+      "hidden": true
+    },
+    "n86_t1hq": {
       "hidden": true
     }
   },

wb_new_ui/.objs/workspace.json

@@ -8,17 +8,18 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://m7iejg4610snh5j",
+    "ui://2d9xdj6zfn7fao",
-    "ui://m7iejg46csp47i3z",
+    "ui://2d9xdj6zzktq7d3s",
-    "ui://m7iejg46jiu8hef",
+    "ui://2d9xdj6zlwcl5m",
-    "ui://m7iejg46t1hqhy9",
+    "ui://2d9xdj6zker3jg",
-    "ui://m7iejg46hsbhhj2"
+    "ui://2d9xdj6zoviicm0",
+    "ui://2d9xdj6zker3je"
   ],
   "packageGroup.mine": [],
   "test.device": "720p Phone",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://m7iejg46csp47i3z",
+  "doc.activeDoc": "ui://2d9xdj6zfn7fao",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "27vd145b",
@@ -27,24 +28,16 @@
     "/component/",
     "27vd145b",
     "/component/create_room/",
-    "m7iejg46",
+    "27vd145b",
+    "/component/head/",
+    "2d9xdj6z",
     "/",
-    "m7iejg46",
+    "2d9xdj6z",
-    "/component/",
-    "m7iejg46",
-    "/component/Btn/",
-    "m7iejg46",
-    "/component/Lst_info/",
-    "m7iejg46",
-    "/component/mail/",
-    "m7iejg46",
-    "/component/nav/",
-    "m7iejg46",
     "/images/",
-    "m7iejg46",
+    "2d9xdj6z",
-    "/images/index/",
+    "/images/movieClip/",
-    "m7iejg46",
+    "x3mp2cn6",
-    "/images/info/"
+    "/"
   ],
   "auxline1": true,
   "snapToGrid": true,

wb_new_ui/assets/Lobby/Main.xml

@@ -4,20 +4,22 @@
     <action type="play_transition" fromPage="0" toPage="1" transition="t0"/>
   </controller>
   <displayList>
-    <image id="n141_ht5v" name="n141" src="ht5v7cnr" fileName="mainbg.png" xy="-209,0" size="1751,750">
+    <image id="n141_ht5v" name="n141" src="ht5v7cnr" fileName="mainbg.png" xy="-145,0">
-      <relation target="" sidePair="center-center,middle-middle"/>
+      <relation target="" sidePair="height-height,center-center,middle-middle"/>
     </image>
+    <loader id="n142_h5le" name="clip_renwu" xy="1,-34" size="879,919" url="ui://2d9xdj6zgtuv7dfj"/>
+    <loader id="n145_h5le" name="clip_bg" xy="-145,0" size="1633,972" url="ui://2d9xdj6zy1us7d3u"/>
     <image id="n49_lwcl" name="n49" src="lwclq" fileName="denglu_bg_01.png" pkg="0khx14ar" xy="-209,0" size="1770,750" aspect="true" visible="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
     <image id="n140_csp4" name="n140" src="csp47cn2" fileName="component/index/images/renwu.png" xy="109,137" size="492,614" visible="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <image id="n56_lwcl" name="n56" src="xn94cls" fileName="images/index/head_bg@2x.png" xy="79,10" size="244,62" group="n28"/>
+    <image id="n56_lwcl" name="n56" src="xn94cls" fileName="images/index/head_bg@2x.png" xy="0,0" group="n28"/>
-    <component id="n29" name="btn_head" src="kio210" fileName="component/head/Head.xml" pkg="27vd145b" xy="7,4" group="n28" aspect="true"/>
+    <component id="n29" name="btn_head" src="zktq7d3s" fileName="component/button/Head.xml" xy="12,11" size="81,81" group="n28" aspect="true"/>
     <text id="n26" name="tex_name" xy="91,14" size="233,34" group="n28" font="ui://27vd145bqz637ij2" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" text="老司机带带我"/>
     <text id="n84_mv8k" name="tex_id" xy="91,40" size="233,34" group="n28" font="ui://27vd145bqz637ij2" fontSize="22" color="#ffffff" autoSize="none" text="ID:123456"/>
-    <group id="n28" name="player_info_panel" xy="7,4" size="317,77" advanced="true">
+    <group id="n28" name="player_info_panel" xy="0,0" size="324,102" advanced="true">
       <relation target="" sidePair="left-left,top-top"/>
     </group>
     <image id="n82_m0ei" name="n82" src="ker3j4" fileName="images/index/hall_bottom.png" xy="4,638" group="n7"/>
@@ -45,34 +47,34 @@
     <group id="n7" name="menu_panel" xy="2,617" size="1263,124" advanced="true">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </group>
-    <component id="n108_ker3" name="btn_exit" src="ker3j6" fileName="component/index/Btn_menu_top.xml" xy="1236,11" group="n111_ker3">
+    <component id="n108_ker3" name="btn_exit" src="ker3j6" fileName="component/index/Btn_menu_top.xml" xy="1236,11" group="n111_ker3" visible="false">
       <relation target="" sidePair="right-right"/>
     </component>
-    <component id="n58_lwcl" name="gcm_diamo" src="lwcl5m" fileName="component/index/Cgm_gold.xml" xy="378,24" group="n111_ker3">
+    <component id="n58_lwcl" name="gcm_diamo" src="lwcl5m" fileName="component/index/Cgm_gold.xml" xy="1074,26" group="n111_ker3">
       <relation target="" sidePair="left-left"/>
     </component>
     <component id="n110_ker3" name="btn_notice" src="ker3j6" fileName="component/index/Btn_menu_top.xml" xy="1008,5" group="n111_ker3" visible="false" touchable="false">
       <Button icon="ui://2d9xdj6zker3j8"/>
     </component>
-    <group id="n111_ker3" name="menu_top" xy="378,5" size="931,79" advanced="true">
+    <group id="n111_ker3" name="menu_top" xy="1008,5" size="301,79" advanced="true">
       <relation target="" sidePair="top-top"/>
     </group>
-    <image id="n119_g8kk" name="n119" src="g8kkjt" fileName="component/group/images/hall_right_bg.png" xy="684,31" size="722,505" group="n123_g8kk" visible="false"/>
+    <image id="n119_g8kk" name="n119" src="g8kkjt" fileName="component/group/images/hall_right_bg.png" xy="693,40" size="722,505" group="n123_g8kk" visible="false"/>
-    <list id="n122_g8kk" name="lst_game" xy="708,43" size="674,245" group="n123_g8kk" visible="false" touchable="false" layout="row" overflow="hidden" scroll="horizontal" colGap="-7" defaultItem="ui://2d9xdj6zg8kkjw" autoClearItems="true">
+    <list id="n122_g8kk" name="lst_game" xy="717,52" size="674,245" group="n123_g8kk" visible="false" touchable="false" layout="row" overflow="hidden" scroll="horizontal" colGap="-7" defaultItem="ui://2d9xdj6zg8kkjw" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n113_ker3" name="btn_more_game" src="of0c7i" fileName="component/index/Btn_more_game.xml" xy="886,-52" size="119,195" group="n123_g8kk" visible="false" touchable="false"/>
+    <component id="n113_ker3" name="btn_more_game" src="of0c7i" fileName="component/index/Btn_more_game.xml" xy="895,-43" size="119,195" group="n123_g8kk" visible="false" touchable="false"/>
-    <component id="n117_ker3" name="btn_more_group" src="ker3je" fileName="component/index/Btn_more_group.xml" xy="667,224" size="258,344" group="n123_g8kk"/>
+    <component id="n120_g8kk" name="btn_join_group" src="nlwcgs" fileName="component/group/Btn_10.xml" xy="920,228" size="165,211" group="n123_g8kk" visible="false" touchable="false"/>
-    <component id="n120_g8kk" name="btn_join_group" src="nlwcgs" fileName="component/group/Btn_10.xml" xy="911,219" size="165,211" group="n123_g8kk" visible="false" touchable="false"/>
+    <component id="n114_ker3" name="btn_joinroom" src="ker3jg" fileName="component/index/Btn_join_room.xml" xy="573,356" group="n123_g8kk" touchable="false"/>
-    <component id="n114_ker3" name="btn_joinroom" src="ker3jg" fileName="component/index/Btn_join_room.xml" xy="942,418" size="196,146" group="n123_g8kk" touchable="false"/>
+    <component id="n135_ovii" name="btn_ChuangJian" src="oviicm0" fileName="component/group/Button8.xml" xy="574,153" group="n123_g8kk" touchable="false"/>
-    <component id="n135_ovii" name="btn_ChuangJian" src="oviicm0" fileName="component/group/Button8.xml" xy="943,229" size="183,180" group="n123_g8kk" touchable="false"/>
+    <component id="n117_ker3" name="btn_more_group" src="ker3je" fileName="component/index/Btn_more_group.xml" xy="898,182" group="n123_g8kk"/>
-    <group id="n123_g8kk" name="right_panel" xy="667,-52" size="739,621" advanced="true">
+    <group id="n123_g8kk" name="right_panel" xy="573,-43" size="841,603" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <image id="n118_ker3" name="n118" src="ker3jm" fileName="images/index/left_mine_bg.png" xy="48,169" group="n125_g8kk" aspect="true"/>
+    <image id="n118_ker3" name="n118" src="ker3jm" fileName="images/index/left_mine_bg.png" xy="48,169" group="n125_g8kk" aspect="true" visible="false"/>
     <list id="n124_g8kk" name="lst_user" xy="46,207" size="112,366" group="n125_g8kk" visible="false" touchable="false" layout="flow_hz" overflow="scroll" lineGap="10" defaultItem="ui://2d9xdj6zg8kkk0" align="center">
       <item icon="ui://2d9xdj6zg8kkjx" name="real"/>
       <item icon="ui://2d9xdj6zg8kkjz" name="address"/>
@@ -81,16 +83,16 @@
     <group id="n125_g8kk" name="left_panel" xy="46,169" size="112,413" advanced="true">
       <relation target="" sidePair="middle-middle"/>
     </group>
-    <component id="n129_naup" name="n129" src="naupl7" fileName="component/share/btn_mask_share.xml" xy="-1,0" size="1334,750" group="n130_naup">
+    <component id="n129_naup" name="n129" src="naupl7" fileName="component/share/btn_mask_share.xml" xy="7,-809" size="1334,750" group="n130_naup">
       <gearDisplay controller="share" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
       <Button checked="true" controller="share" page="0"/>
     </component>
-    <component id="n127_naup" name="pop_share" src="naupl6" fileName="component/share/pop_share.xml" xy="-209,558" group="n130_naup">
+    <component id="n127_naup" name="pop_share" src="naupl6" fileName="component/share/pop_share.xml" xy="-201,-251" group="n130_naup">
       <gearDisplay controller="share" pages="1"/>
       <relation target="" sidePair="bottom-bottom,center-center"/>
     </component>
-    <group id="n130_naup" name="n130" xy="-209,0" size="1751,752"/>
+    <group id="n130_naup" name="n130" xy="-201,-809" size="1751,752"/>
     <component id="n100_lumr" name="group" src="lumrgj" fileName="component/group/group.xml" xy="0,0" size="1334,750" visible="false">
       <relation target="" sidePair="width-width,height-height"/>
     </component>

wb_new_ui/assets/Lobby/component/button/Head.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="77,77" extention="Button" mask="n5_zktq" initName="btn_head">
+  <displayList>
+    <loader id="n1" name="icon" xy="0,0" size="77,77" aspect="true" url="ui://27vd145bklso1c" align="center" vAlign="middle" fill="scale">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <graph id="n5_zktq" name="n5" xy="0,0" size="77,77" type="rect" lineSize="0" corner="6"/>
+  </displayList>
+  <Button downEffect="dark" downEffectValue=".8"/>
+</component>

wb_new_ui/assets/Lobby/component/group/Button8.xml

@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="183,180" extention="Button">
+<component size="318,204" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ovii" name="n0" src="oviiclz" fileName="component/index/images/button_cjfj.png" xy="0,0" size="183,180">
+    <image id="n2_zktq" name="n2" src="zktq7d3o" fileName="component/index/images/Group 5583.png" xy="0,25"/>
-      <gearDisplay controller="button" pages="0,2"/>
+    <loader id="n4_h5le" name="icon" xy="-559,-381" size="1493,1069" url="ui://2d9xdj6zy1us7d71"/>
-      <relation target="" sidePair="width-width,height-height"/>
+    <image id="n3_zktq" name="n3" src="zktq7d3p" fileName="component/index/images/创建房间.png" xy="58,120"/>
-    </image>
-    <image id="n1_ovii" name="n1" src="oviiclz" fileName="component/index/images/button_cjfj.png" xy="0,0" size="183,180">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
   </displayList>
-  <Button downEffect="dark" downEffectValue=".8"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

wb_new_ui/assets/Lobby/component/index/Btn_join_room.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="186,137" overflow="hidden" extention="Button" initName="btn_more_game" bgColor="#66ffff">
+<component size="300,204" extention="Button" initName="btn_more_game" bgColor="#66ffff">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n10_ker3" name="n10" src="ker3jf" fileName="component/index/images/join_room_horizen.png" xy="2,0" size="186,137"/>
+    <image id="n11_zktq" name="n11" src="zktq7d3m" fileName="component/index/images/Group 444.png" xy="0,25"/>
+    <loader id="n13_h5le" name="icon" xy="-160,-100" size="679,610" url="ui://2d9xdj6zqu7u7dcu"/>
+    <image id="n12_zktq" name="n12" src="zktq7d3n" fileName="component/index/images/Group 5582.png" xy="52,122"/>
   </displayList>
-  <Button downEffect="dark" downEffectValue=".8"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

wb_new_ui/assets/Lobby/component/index/Btn_more_group.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="255,334" overflow="hidden" extention="Button" initName="btn_more_game" bgColor="#66ffff">
+<component size="265,378" overflow="hidden" extention="Button" initName="btn_more_game" bgColor="#66ffff">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n10_ker3" name="n10" src="ker3jc" fileName="component/index/images/club_more.png" xy="0,0" size="255,334"/>
+    <image id="n12_zktq" name="n12" src="zktq7d3q" fileName="component/index/images/Group 443.png" xy="0,-14"/>
+    <loader id="n13_h5le" name="icon" xy="-19,-39" size="327,423" url="ui://2d9xdj6zy1us7d8r" fill="scale"/>
+    <image id="n11_zktq" name="n11" src="zktq7d3r" fileName="component/index/images/亲友圈.png" xy="63,293"/>
   </displayList>
-  <Button downEffect="dark" downEffectValue=".8"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

wb_new_ui/assets/Lobby/component/index/Cgm_gold.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="209,49" extention="Button">
+<component size="178,51" extention="Button">
   <displayList>
-    <image id="n9_ovii" name="n9" src="oviicm5" fileName="images/index/bg_07.png" xy="0,0"/>
+    <image id="n9_ovii" name="n9" src="oviicm5" fileName="images/index/bg_07.png" xy="13,6"/>
-    <text id="n1_lwcl" name="title" xy="39,1" size="142,39" font="ui://27vd145bqz637ij2" fontSize="28" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="0"/>
+    <text id="n1_lwcl" name="title" xy="42,6" size="127,38" font="ui://27vd145bilon7ia1" fontSize="22" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" bold="true" text="0999999999"/>
-    <image id="n7_ovii" name="n7" src="oviicly" fileName="images/index/icon_zytb.png" xy="-39,-21"/>
+    <image id="n7_ovii" name="n7" src="oviicly" fileName="images/index/icon_zytb.png" xy="0,0"/>
   </displayList>
   <Button/>
 </component>