成员备注修复、家族界面连接流程整理、倍数二级界面

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -19,6 +19,7 @@ GroupMgrEvent = {
     OnNewRecord = "OnNewRecord",
     OnMemberState = "OnMemberState",
     Onpush_assistant = "Onpush_assistant",
+    OnFamilyReflash = "OnFamilyReflash",
 }
 
 GroupMgrController = {
@@ -59,6 +60,7 @@ function GroupMgrController.new()
     self._eventmap[Protocol.FGMGR_EVT_NEWCHAT] = self.FG_Data_NewChat
     self._eventmap[Protocol.FGMGR_EVT_Member_State] = self.FG_Data_Member_State
     self._eventmap[Protocol.FGMGR_EVT_Push_Assistant] = self.OnEVT_Push_Assistant
+    self._eventmap[Protocol.WEB_FG_REFLASH] = self.FG_Data_Family_Reflash
     -- self:connect(callback)
     return self
 end
@@ -373,6 +375,15 @@ function M:FG_Get_Offline_Member(groupId, callback)
     end)
 end
 
+-- 获取申请列表的数量
+function M:FG_Get_Apply_Count(groupId, callback)
+    local _data = {}
+    _data.id = groupId
+    self._mgr_client:send(Protocol.WEB_FG_APPLYCOUNT, _data, function(res)
+        callback(res)
+    end)
+end
+
 -- 回复邀请
 -- function M:FG_ResponseInvited(id, refuse)
 --     local _data = {}
@@ -431,6 +442,12 @@ function M:FG_Data_Member_State(evt_data)
     DispatchEvent(self._dispatcher, GroupMgrEvent.OnMemberState, evt_data)
 end
 
+function M:FG_Data_Family_Reflash(evt_data)
+    print("收到家族刷新推送")
+    pt(evt_data)
+    DispatchEvent(self._dispatcher, GroupMgrEvent.OnFamilyReflash, evt_data)
+end
+
 function M:PopEvent()
     local _cacheEvent = self._cacheEvent
     if (_cacheEvent:Count() > 0) then

lua_probject/base_project/Game/Controller/NewGroupController.lua

@@ -1185,6 +1185,7 @@ function M:FG_EnterGroup(group_id, callback)
             group.notice = res.Data.notice
             group.hide_action = res.Data.hide_action
 
+            -- GroupMgrController:connect
             self.mgr_ctr = ControllerManager.GetController(GroupMgrController)
             self.mgr_ctr:connect(res.Data.host, group_id, function(res1)
                 if res1.ReturnCode == 0 then

lua_probject/base_project/Game/Protocol.lua

@@ -281,6 +281,11 @@ Protocol = {
     WEB_FG_GET_ONLINE_MEMBER        = "13005",  --"get_online_member",
     -- 退出亲友圈
     WEB_FG_GET_OFFLINE_MEMBER       = "13006",  --"get_offline_member",
+    -- 家族界面刷新推送
+    WEB_FG_REFLASH                  = "11111",
+
+    -- 获得申请列表的数量
+    WEB_FG_APPLYCOUNT               = "request_apply_count",
     -------------- group-log---------------------
     -- 获取奖励日志
     WEB_FG_GET_REWARDS_LOG          = "group/log/get_reward_log",

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

@@ -61,13 +61,14 @@ function M:FillList(numbers)
         local i = index + 1
         obj:GetController('lev').selectedIndex = numbers[i].lev - 1
         obj:GetController('ban').selectedIndex = numbers[i].ban
+        obj:GetChild('name').emojies = EmojiDitc.EmojiesDitc
         obj:GetChild('name').text = numbers[i].nick
         obj:GetChild('id').text = string.format("ID:%s", numbers[i].uid)
 
         if numbers[i].tag == "" then
             obj:GetChild("remark").text = "备注：无"
         else
-            obj:GetChild("remark").text = numbers[i].tag
+            obj:GetChild("remark").text = "备注：" .. numbers[i].tag
         end
 
         ImageLoad.Load(numbers[i].portrait, obj:GetChild('btn_head')._iconObject)

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

@@ -5,30 +5,11 @@ local FamilyAuditNumber = {}
 
 local M = FamilyAuditNumber
 
-function FamilyAuditNumber.new(root)
+local function AddItem(self, index, obj)
-    setmetatable(M, { __index = root })
+    local info = self.data[index + 1]
-    local self = setmetatable({}, { __index = M })
-
-    self:InitList()
-
-    return self
-end
-
-function M:InitList()
-    local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_GroupJoins(self._group.id, function(res)
-        pt(res)
-        if res.ReturnCode ~= 0 then
-            ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败")
-        else
-            local data = res.Data.joins
-            self.familyType.selectedIndex = 6
-            local list = self._view:GetChild('list_auditNumberList')
-            list:SetVirtual()
-            list.itemRenderer = function(index, obj)
-                local info = data[index + 1]
     obj:GetChild('text_name').text = info.nick
     obj:GetChild('text_id').text = info.id
+    obj:GetChild('text_tag').text = "备注: " .. info.tag
     obj:GetChild('text_time').text = os.date('%Y-%m-%d  %H:%M', os.time())
     ImageLoad.Load(info.portrait, obj:GetChild('btn_head')._iconObject)
     obj:GetChild('btn_allow').onClick:Set(function()
@@ -38,7 +19,32 @@ function M:InitList()
         self:ClickBtn(0, info.id)
     end)
 end
-            list.numItems = #data
+
+function FamilyAuditNumber.new(root)
+    setmetatable(M, { __index = root })
+    local self = setmetatable({}, { __index = M })
+
+    --self:Show()
+    
+    return self
+end
+
+function M:Show()
+    local fgCtr = ControllerManager.GetController(NewGroupController)
+    fgCtr:FG_GroupJoins(self._group.id, function(res)
+        if res.ReturnCode ~= 0 then
+            ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败")
+            return
+        else
+            self.data = res.Data.joins
+            self.familyType.selectedIndex = 6
+            local list = self._view:GetChild('list_auditNumberList')
+            --list:RemoveChildrenToPool()
+            --list:SetVirtual()
+            list.itemRenderer = function(index, obj)
+                AddItem(self, index, obj)
+            end
+            list.numItems = #self.data
         end
     end)
 end
@@ -55,9 +61,24 @@ function M:ClickBtn(isAllow, uid)
             else
 
             end
-            self:InitList()
+            self:Show()
         end
     end)
 end
 
+function M:OnNewApply(arg)
+    arg = arg[1]
+
+    local msg = {}
+    msg.nick = arg.nick
+    msg.id = arg.uid
+    msg.portrait = arg.portrait
+    msg.tag = arg.remark
+    self.data[#self.data + 1] = msg
+
+    local list = self._view:GetChild('list_auditNumberList')
+    local obj = list:AddItemFromPool()
+    AddItem(self, #self.data - 1, obj)
+end
+
 return M

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

@@ -27,6 +27,7 @@ function FamilyEventView.new(root)
     mgr_ctr:AddEventListener(GroupMgrEvent.OnNewRecord, handler(self, self._evtOnNewRecord))
     mgr_ctr:AddEventListener(GroupMgrEvent.Onpush_assistant, handler(self, self._evtOnPush_assistant))
     --mgr_ctr:AddEventListener(GroupMgrEvent.OnMemberState, handler(self, self._evtOnMemberState))
+    mgr_ctr:AddEventListener(GroupMgrEvent.OnFamilyReflash, handler(self, self._evtOnPush_assistant))
     return self
 end
 
@@ -103,7 +104,7 @@ function M:_evtOnNewApply(...)
     print("_evtOnNewApply")
     local arg = { ... }
     pt(arg)
-    self._child_familyAuditNumber:InitList()
+    self._child_familyAuditNumber:OnNewApply(arg)
 end
 
 function M:_evtInviteResponse(...)
@@ -213,4 +214,21 @@ function M:_evtOnPush_assistant(...)
     view:ChangeOther(lev + 1)
 end
 
+-- reflashType == "joinFamily"  成功加入了亲友圈
+function M:_evtOnFamilyReflash(...)
+    local view = ViewManager.GetCurrenView()
+    if view.class ~= "FamilyMainView" then
+        return
+    end
+
+    local arg = { ... }
+    local reflashType = arg[1].reflashType
+    local gourpId = arg[1].gourpId
+    local parm = arg[1].parm
+
+    if reflashType == "joinFamily" then 
+        view:Reflash()
+    end
+end
+
 return M

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

@@ -81,7 +81,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
+    self.tex_wxId.text = Utils.TextOmit(self.family.wechatId, 6)
     ImageLoad.Load(self.family.o_portrait, self.loader_icon)
 
     self.cStyle.selectedIndex = self.family.lev - 1
@@ -220,7 +220,7 @@ function FamilyMyFamily:Init()
                 notice = self.input_text.text
             }, self)
         end
-        self.input_text.text = ""
+        self.input_text.text = self.family.notice
         self.tex_changeTitle.text = "修改公告"
         self.cWindow.selectedIndex = 1
     end)
@@ -232,7 +232,7 @@ function FamilyMyFamily:Init()
                 name = self.input_text.text
             }, self)
         end
-        self.input_text.text = ""
+        self.input_text.text = self.family.name
         self.tex_changeTitle.text = "修改家族名字"
         self.cWindow.selectedIndex = 1
     end)
@@ -244,7 +244,7 @@ function FamilyMyFamily:Init()
                 wechatId = self.input_text.text
             }, self)
         end
-        self.input_text.text = ""
+        self.input_text.text = self.family.wechatId
         self.tex_changeTitle.text = "修改微信号"
         self.cWindow.selectedIndex = 1
     end)

lua_probject/base_project/Game/View/FamilyView.lua

@@ -56,6 +56,7 @@ function M:init(url)
     local view = self._view
     self.lastTime = os.time()
 
+    self._child_familyAuditNumber = FamilyAuditNumber.new(self)
     self.com_FamilyChatRoom = FamilyChatRoom:Init(view:GetChild('com_chatRoom'), self)
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
@@ -131,6 +132,19 @@ function M:init(url)
     end)
 end
 
+function M:Reflash()
+    fgCtr:FG_GroupList(function(res)
+        local groups = res.Data.groups
+        if #groups > 0 then
+            self.familyType.selectedIndex = 1
+            self:ConnetFamily(1, groups, true)
+        else
+            self:JoinFamily(true)
+            self.btn_chatRoom.visible = false
+        end
+    end)
+end
+
 function M:InitCloseClick()
     self.btn_close.onClick:Set(function()
         print("lingmengfamily", self.lastType, self.familyType.selectedIndex)
@@ -261,7 +275,23 @@ end
 
 function M:AuditNumber()
     self.lastType = 1
-    self._child_familyAuditNumber = FamilyAuditNumber.new(self)
+    self._child_familyAuditNumber:Show()
+    --self._child_familyAuditNumber = FamilyAuditNumber.new(self)
+end
+
+function M:UpdataRedPointAuditNumber(obj)
+    if self._child_familyAuditNumber.data == nil or #self._child_familyAuditNumber.data <= 0 then
+        obj:GetController("cRedPoint").selectedIndex = 0
+        return
+    end
+
+    local redPointNum = #self._child_familyAuditNumber.data
+    if redPointNum > 99 then
+        redPointNum = "99+"
+    end
+
+    obj:GetController("cRedPoint").selectedIndex = 1
+    obj:GetChild("tex_redPoint").text = redPointNum
 end
 
 function M:ShowShop()
@@ -343,13 +373,28 @@ function M:ChangeNumber(fgCtr, group_id, limit, num, minus_only, sort_type)
     return 0
 end
 
-function M:ConnetFamilyRoom(fgCtr, id)
+function M:EnterGroup(fgCtr, id)
     fgCtr:FG_EnterGroup(id, function(res)
         ViewUtil:CloseModalWait()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取房间列表列表失败")
         else
-            self:UpdateFamilyRoom(fgCtr, id)
+            self:OnEnterGroupCallBack()
+            return 1
+        end
+    end)
+    return 0
+end
+
+function M:OnEnterGroupCallBack()
+    local fgCtr = ControllerManager.GetController(NewGroupController)
+    self._mgr_ctr:FG_Get_Apply_Count(self._group.id, function(res)
+        print("收到获得申请列表的数量")
+        pt(res)
+        if res.ReturnCode ~= 0 then
+            return
+        end
+    end)
     self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0
 
     local mgr_ctr = ControllerManager.GetController(GroupMgrController)
@@ -360,10 +405,16 @@ function M:ConnetFamilyRoom(fgCtr, id)
 
     FamilyOnline(self._group.id, self)
 
-            return 1
+    ViewUtil.ShowModalWait(self._root_view, "正在加载亲友圈权限中......")
-        end
+    self:ChangeOther(tonumber(self._group.lev) + 1)
-    end)
+    allLoad = 1
-    return 0
+
+    ViewUtil.ShowModalWait(self._root_view, "正在加载成员列表中......")
+    self:ChangeNumber(fgCtr, self._group.id, 0, self._group.total_member_num, false, 1)
+
+    ViewUtil.ShowModalWait(self._root_view, "正在加载房间列表中......")
+    self:UpdateFamilyRoom(fgCtr, self._group.id)
+    ViewUtil.CloseModalWait()
 end
 
 function M:UpdateFamilyRoom(fgCtr, id)
@@ -402,7 +453,7 @@ function M:UpdateFamilyRoom(fgCtr, id)
             roomName = Utils.TextOmit(roomName, 6)
             obj:GetChild('game_type').emojies = EmojiDitc.EmojiesDitc
             obj:GetChild('game_type').text = string.format("（%s）%s", playGameInfoTable[roomList[newIndex].pid].gameName,
-                playGameInfoTable[roomList[newIndex].pid].name,
+                roomName,
                 roomList[newIndex].id)
             obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 1
             obj:GetController('num').selectedIndex = roomList[newIndex].maxPlayers - 2
@@ -478,8 +529,9 @@ function M:UpdateFamilyRoom(fgCtr, id)
             local gamePlay = times / 1000 .. "倍,"
             gamePlay = gamePlay .. mode:LoadConfigToDetail(playList[newIndex].config)
             obj:GetChild('Label_gameRule').title = gamePlay
-            obj:GetChild('game_type').text = string.format("（%s）%s", playList[newIndex].game_name, playList[newIndex]
+            local roomName = Utils.TextOmit(playList[newIndex].name, 6)
-                .name)
+            roomName = string.format("（%s）%s", playList[newIndex].game_name, roomName)
+            obj:GetChild('game_type').text = roomName
             obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 0
             obj:GetController('num').selectedIndex = playList[newIndex].maxPlayers - 2
             obj:GetChild('btn_joinGame').onClick:Set(function()
@@ -576,7 +628,7 @@ function M:ConnetFamily(index, groups, isCreate)
     ViewUtil:CloseModalWait()
 
     local list_family = self._view:GetChild('list_family')
-    list_family:SetVirtual()
+    --list_family:SetVirtual()
     self._group = DataManager.groups:get(groups[index].id)
     DataManager.CurrenGroup = self._group
     self._view:GetChild('text_familyId').text = self._group.id
@@ -607,6 +659,10 @@ function M:ConnetFamily(index, groups, isCreate)
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
 
+    ViewUtil.ShowModalWait(self._root_view, "正在进入亲友圈......")
+    self:EnterGroup(fgCtr, self._group.id)
+
+    --[[
     ViewUtil.ShowModalWait(self._root_view, "正在加载亲友圈权限中......")
     self:ChangeOther(tonumber(self._group.lev) + 1)
     allLoad = 1
@@ -618,7 +674,8 @@ function M:ConnetFamily(index, groups, isCreate)
 
     ViewUtil.ShowModalWait(self._root_view, "正在加载房间列表中......")
 
-    allLoad = allLoad + self:ConnetFamilyRoom(fgCtr, self._group.id)
+    allLoad = allLoad + self:EnterGroup(fgCtr, self._group.id)
+    ]]
     UpdateBeat:Add(self.OnUpdate, self)
 
     if self._group.isOpenChatRoom == 1 then
@@ -729,7 +786,8 @@ local IDENTITY_LIST = {
             },
             {
                 name = "申请消息",
-                Fct = M.AuditNumber
+                Fct = M.AuditNumber,
+                redPointFct = M.UpdataRedPointAuditNumber --开启红点
             },
             {
                 name = "查看成员",
@@ -771,7 +829,8 @@ local IDENTITY_LIST = {
             },
             {
                 name = "申请消息",
-                Fct = M.AuditNumber
+                Fct = M.AuditNumber,
+                redPointFct = M.UpdataRedPointAuditNumber --开启红点
             },
             {
                 name = "查看成员",
@@ -841,8 +900,14 @@ function M:ChangeOther(i)
     self._lev = i
     list_other:SetVirtual()
     list_other.itemRenderer = function(index, obj)
-        obj:GetChild('title').text = otherList[index + 1].name
+        local cfg = otherList[index + 1]
-        obj.onClick:Set(handler(self, otherList[index + 1].Fct))
+        obj:GetChild('title').text = cfg.name
+        obj.onClick:Set(handler(self, cfg.Fct))
+
+        print("cfg.redPointFct", cfg.redPointFct)
+        if cfg.redPointFct then
+            cfg.redPointFct(self, obj)
+        end
     end
     list_other.numItems = #otherList
 end
@@ -852,11 +917,16 @@ function M:ChangeMore()
     local list_other = self._view:GetChild('list_more')
     list_other:SetVirtual()
     list_other.itemRenderer = function(index, obj)
-        obj:GetChild('title').text = moreList[index + 1].name
+        local cfg = moreList[index + 1]
-        obj.onClick:Set(handler(self, moreList[index + 1].Fct))
+        obj:GetChild('title').text = cfg.name
+        obj.onClick:Set(handler(self, cfg.Fct))
         obj.onClick:Add(function()
             self._view:GetController('moreBtn').selectedIndex = 0
         end)
+        print("cfg.redPointFct", cfg.redPointFct)
+        if cfg.redPointFct then
+            cfg.redPointFct(self, obj)
+        end
     end
     list_other.numItems = #moreList
 end

lua_probject/base_project/Game/View/MissileSender.lua

@@ -56,6 +56,8 @@ function MissileSender.Send(url, send, target, view, animUrl, num, time)
         local obj = GetObj()
         obj:GetChild("loader").url = url
         view:AddChild(obj)
+        obj.width = send.width
+        obj.height = send.height
         obj.xy = sendPos
 
         -- 间隔

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

@@ -43,7 +43,16 @@ function M:init(url)
     BaseWindow.init(self, url)
     self.hpData = {}
 
-    self:FillGameData()
+    --self:FillGameData()
+
+    self.tex_times = self._view:GetChild("tex_times")
+
+    self.btn_changeTimes = self._view:GetChild("btn_changeTimes")
+    self.btn_closeTimesPage = self._view:GetChild("btn_closeTimesPage")
+
+    self.cTimesPage = self._view:GetController("cTimesPage")
+
+    self.SliderTimes = self._view:GetChild("SliderTimes")
 
     self._view:GetChild("btn_next").onClick:Set(function()
         if self._view:GetChild("tex_name").text == "" then
@@ -73,6 +82,24 @@ function M:init(url)
         end)
         grcv:Show()
     end)
+
+    self.btn_changeTimes.onClick:Set(function()
+        if self.cTimesPage.selectedIndex == 0 then
+            self.cTimesPage.selectedIndex = 1
+        else 
+            self.cTimesPage.selectedIndex = 0
+        end
+    end)
+
+    self.btn_closeTimesPage.onClick:Set(function()
+        self.cTimesPage.selectedIndex = 0
+    end)
+
+    self.SliderTimes.onChanged:Set(function()
+        self.tex_times.text = math.ceil(self.SliderTimes.value)
+    end)
+
+    self:FillGameData()
 end
 
 -- 显示游戏列表
@@ -109,6 +136,7 @@ function M:FillGameData()
         local tex_name = self._view:GetChild("tex_name")
         tex_name.text = self.play.name
         self._view:GetChild("tex_times").text = self.play.hp_times / 1000
+        self.SliderTimes.value = self.play.hp_times / 1000
     end
 end
 

wb_new_ui/assets/Family/AuditNumber/Component/comp_auditNumberChild.xml

@@ -11,7 +11,7 @@
     <text id="n2_jrro" name="text_name" xy="224,90" size="673,59" group="n8_g71b" font="ui://27vd145bh35o7ili" fontSize="42" color="#333333" vAlign="middle" autoSize="none" text="名字超级长">
       <relation target="" sidePair="left-left"/>
     </text>
-    <text id="n3_jrro" name="n3" xy="224,150" size="982,59" group="n8_g71b" font="ui://27vd145bh35o7ili" fontSize="42" color="#333333" vAlign="middle" autoSize="none" text="固定信息"/>
+    <text id="n3_jrro" name="text_tag" xy="224,150" size="982,59" group="n8_g71b" font="ui://27vd145bh35o7ili" fontSize="42" color="#333333" vAlign="middle" autoSize="none" text="固定信息"/>
     <text id="n4_jrro" name="text_time" xy="480,27" size="440,56" group="n8_g71b" font="ui://27vd145bh35o7ili" fontSize="42" color="#940f0e" text="2025-25-21  10:12:13"/>
     <group id="n8_g71b" name="n8" xy="30,24" size="1176,186" advanced="true">
       <relation target="" sidePair="left-left"/>

wb_new_ui/assets/Family/Main/Component/c_otherChild.xml

@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="360,105">
+  <controller name="cRedPoint" pages="0,,1," selected="1">
+    <remark page="1" value="开红点"/>
+  </controller>
   <displayList>
     <image id="n3_jrro" name="n3" src="jrro7cym" fileName="Main/Image/bg_leftLine.png" xy="0,102"/>
     <text id="n4_jrro" name="title" xy="71,16" size="217,72" font="ui://27vd145bh35o7ili" fontSize="54" color="#ad3c3a" text="好几个字">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
+    <image id="n5_icft" name="n5" src="icft7d63" fileName="Main/Image/Group 687.png" xy="297,23">
+      <gearDisplay controller="cRedPoint" pages="1"/>
+    </image>
+    <text id="n6_icft" name="tex_redPoint" xy="297,23" size="58,58" font="ui://27vd145bh35o7ilb" fontSize="43" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" text="20">
+      <gearDisplay controller="cRedPoint" pages="1"/>
+    </text>
   </displayList>
 </component>

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

@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="310,120" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="cRedPoint" pages="0,,1," selected="0">
+    <remark page="1" value="开启红点"/>
+  </controller>
   <displayList>
     <image id="n0_yk1o" name="n0" src="yk1o7d3v" fileName="MyFamily/Image/hall_club_common_club_liebiao_btntext_guanli.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
+    <image id="n1_icft" name="n1" src="icft7d63" fileName="Main/Image/Group 687.png" xy="255,-18">
+      <gearDisplay controller="cRedPoint" pages="1"/>
+    </image>
+    <text id="n2_icft" name="tex_redPoint" xy="255,-18" size="58,58" font="ui://27vd145bh35o7ilb" fontSize="43" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" text="20">
+      <gearDisplay controller="cRedPoint" pages="1"/>
+    </text>
   </displayList>
   <Button downEffect="dark" downEffectValue="0.9"/>
 </component>

wb_new_ui/assets/Family/package.xml

@@ -391,6 +391,7 @@
     <image id="oehx7d5z" name="Group 360.png" path="/InviteRoom/Image/"/>
     <component id="oehx7d60" name="btn_cancel.xml" path="/InviteRoom/Component/"/>
     <component id="oehx7d62" name="btn_enter.xml" path="/InviteRoom/Component/"/>
+    <image id="icft7d63" name="Group 687.png" path="/Main/Image/"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Missile.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="112,112" pivot="0.5,0.5">
   <displayList>
-    <loader id="n0_uans" name="loader" xy="0,0" pivot="0.5,0.5" size="112,112" url="ui://27vd145bqmc17jbx" align="center" vAlign="middle" fill="scaleFree">
+    <loader id="n0_uans" name="loader" xy="56,56" pivot="0.5,0.5" anchor="true" size="112,112" aspect="true" url="ui://27vd145bqmc17jbx" align="center" vAlign="middle" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
   </displayList>

wb_new_ui/assets/NewGroup/mgr/View_GroupGameSetting.xml

@@ -3,23 +3,40 @@
   <controller name="mng" pages="0,,1," selected="0"/>
   <controller name="page" pages="0,,1," selected="0"/>
   <controller name="update" pages="0,,1,,2," selected="0"/>
+  <controller name="cTimesPage" pages="0,,1," selected="0">
+    <remark page="0" value="关"/>
+    <remark page="1" value="开"/>
+  </controller>
   <displayList>
     <image id="n178_qmc1" name="n178" src="qmc17jbz" fileName="bg/loginBg.png" pkg="27vd145b" xy="0,0"/>
     <component id="n177_id5t" name="lst_game" src="pzuc7cx2" fileName="CreatePlay.xml" pkg="2d9xdj6z" xy="1,12" group="n163_10xl7"/>
-    <component id="n157_10xl7" name="btn_next" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="1986,991" size="426,144" group="n162_10xl7">
+    <image id="n190_icoc" name="n190" src="icoc7i9q" fileName="component/CreatePlay/Image/Rectangle 91.png" xy="565,168" size="1914,975" group="n189_icoc"/>
+    <image id="n191_icoc" name="n191" src="icoc7i9r" fileName="component/CreatePlay/Image/Rectangle 292.png" xy="564,956" group="n189_icoc"/>
+    <component id="n184_brmc" name="SliderTimes" src="brmc7i9o" fileName="mgr/SliderTimes.xml" xy="1066,511" size="1011,36" group="n189_icoc">
+      <Slider value="10" max="10" min="1"/>
+    </component>
+    <text id="n185_brmc" name="n185" xy="835,499" size="206,59" group="n189_icoc" font="ui://27vd145bh35o7il7" fontSize="44" color="#450f05" text="倍数设置: "/>
+    <component id="n193_icoc" name="btn_closeTimesPage" src="icoc7i9u" fileName="mgr/btn_closeTimesPage.xml" xy="1279,672" size="376,130" group="n189_icoc"/>
+    <text id="n187_brmc" name="n187" xy="1071,429" size="30,59" group="n189_icoc" font="ui://27vd145bh35o7ili" fontSize="44" color="#450f05" text="1"/>
+    <text id="n188_brmc" name="n188" xy="2042,429" size="55,59" group="n189_icoc" font="ui://27vd145bh35o7ili" fontSize="44" color="#450f05" text="10"/>
+    <group id="n189_icoc" name="n189" xy="564,168" size="1915,975" group="n162_10xl7" advanced="true">
+      <gearDisplay controller="cTimesPage" pages="1"/>
+    </group>
+    <component id="n157_10xl7" name="btn_next" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="1918,991" size="426,144" group="n162_10xl7">
       <Button title=" " titleColor="#167547" titleFontSize="24" icon="ui://2d9xdj6zp8hp7cz6"/>
     </component>
-    <component id="n158_10xl7" name="n158" src="kwi0hjx" fileName="mgr/component/comm/mng_label.xml" xy="706,1039" size="416,60" group="n162_10xl7" controller="type,2"/>
+    <component id="n158_10xl7" name="n158" src="kwi0hjx" fileName="mgr/component/comm/mng_label.xml" xy="638,1039" size="416,60" group="n162_10xl7" controller="type,2"/>
-    <image id="n173_vyn3" name="n173" src="l2997iht" fileName="font/images/win/shurukuang5.png" pkg="27vd145b" xy="924,1024" size="390,78" group="n162_10xl7"/>
+    <image id="n173_vyn3" name="n173" src="l2997iht" fileName="font/images/win/shurukuang5.png" pkg="27vd145b" xy="856,1024" size="390,78" group="n162_10xl7"/>
-    <component id="n160_10xl7" name="btn_color" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="1404,1015" size="135,82" group="n162_10xl7" visible="false">
+    <component id="n160_10xl7" name="btn_color" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="1336,1015" size="135,82" group="n162_10xl7" visible="false">
       <Button title=" " icon="ui://m7iejg46vyn37i5c"/>
     </component>
-    <text id="n161_10xl7" name="tex_name" xy="924,1027" size="388,76" group="n162_10xl7" font="ui://27vd145bh35o7ilb" fontSize="48" color="#222222" vAlign="middle" autoSize="shrink" autoClearText="true" text="" input="true" prompt="请输入房间名称"/>
+    <text id="n161_10xl7" name="tex_name" xy="856,1027" size="388,76" group="n162_10xl7" font="ui://27vd145bh35o7ilb" fontSize="48" color="#222222" vAlign="middle" autoSize="shrink" autoClearText="true" text="" input="true" prompt="请输入房间名称"/>
-    <text id="n174_vyn3" name="n174" xy="633,1022" size="299,86" group="n162_10xl7" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" vAlign="middle" autoSize="none" text="房间名称:"/>
+    <text id="n174_vyn3" name="n174" xy="565,1022" size="299,86" group="n162_10xl7" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" vAlign="middle" autoSize="none" text="房间名称:"/>
-    <image id="n179_qmc1" name="n179" src="l2997iht" fileName="font/images/win/shurukuang5.png" pkg="27vd145b" xy="1619,1024" size="174,78" group="n162_10xl7"/>
+    <image id="n179_qmc1" name="n179" src="l2997iht" fileName="font/images/win/shurukuang5.png" pkg="27vd145b" xy="1551,1024" size="174,78" group="n162_10xl7"/>
-    <text id="n180_qmc1" name="tex_times" xy="1619,1025" size="174,78" group="n162_10xl7" font="ui://27vd145bh35o7ilb" fontSize="48" color="#222222" align="center" vAlign="middle" autoSize="shrink" text="1" input="true"/>
+    <text id="n180_qmc1" name="tex_times" xy="1551,1025" size="174,78" group="n162_10xl7" font="ui://27vd145bh35o7ilb" fontSize="48" color="#222222" align="center" vAlign="middle" autoSize="shrink" text="1" input="true"/>
-    <text id="n181_qmc1" name="n181" xy="1458,1022" size="169,86" group="n162_10xl7" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" vAlign="middle" autoSize="none" text="倍数:"/>
+    <component id="n192_icoc" name="btn_changeTimes" src="icoc7i9s" fileName="mgr/Btn_noImage.xml" xy="1551,1025" size="174,78" group="n162_10xl7"/>
-    <group id="n162_10xl7" name="n162" xy="633,991" size="1779,144" group="n163_10xl7" advanced="true">
+    <text id="n181_qmc1" name="n181" xy="1390,1022" size="169,86" group="n162_10xl7" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" vAlign="middle" autoSize="none" text="倍数:"/>
+    <group id="n162_10xl7" name="n162" xy="564,168" size="1915,975" group="n163_10xl7" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
     <group id="n163_10xl7" name="page0" xy="1,12" size="2532,1170" advanced="true">
@@ -38,12 +55,5 @@
       <relation target="" sidePair="center-center,middle-middle"/>
       <Button icon="ui://27vd145bm0eibv" controller="page" page="0"/>
     </component>
-    <component id="n184_brmc" name="n184" src="brmc7i9o" fileName="mgr/SliderTimes.xml" xy="1134,511" size="1011,36">
-      <Slider value="10" max="100"/>
-    </component>
-    <text id="n185_brmc" name="n185" xy="903,499" size="206,59" font="ui://27vd145bh35o7il7" fontSize="44" color="#450f05" text="倍数设置: "/>
-    <image id="n186_brmc" name="n186" src="brmc7i9p" fileName="images/playEdit/queren_btn1.png" xy="1347,672" size="376,130"/>
-    <text id="n187_brmc" name="n187" xy="1139,429" size="30,59" font="ui://27vd145bh35o7ili" fontSize="44" color="#450f05" text="1"/>
-    <text id="n188_brmc" name="n188" xy="2110,429" size="55,59" font="ui://27vd145bh35o7ili" fontSize="44" color="#450f05" text="10"/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/package.xml

@@ -837,6 +837,10 @@
     <component id="brmc7i9n" name="SliderTimes_grip.xml" path="/mgr/"/>
     <component id="brmc7i9o" name="SliderTimes.xml" path="/mgr/"/>
     <image id="brmc7i9p" name="queren_btn1.png" path="/images/playEdit/"/>
+    <image id="icoc7i9q" name="Rectangle 91.png" path="/component/CreatePlay/Image/"/>
+    <image id="icoc7i9r" name="Rectangle 292.png" path="/component/CreatePlay/Image/"/>
+    <component id="icoc7i9s" name="Btn_noImage.xml" path="/mgr/"/>
+    <component id="icoc7i9u" name="btn_closeTimesPage.xml" path="/mgr/"/>
   </resources>
   <publish name="NewGroup" path="..\wb_unity_pro\Assets\ART\base\newgroup\ui" packageCount="2"/>
 </packageDescription>