申请信息红点

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -314,6 +314,8 @@ function M:OnEvtMessage(evt_data)
     group.joinsData[#group.joinsData + 1] = msg
 
     DispatchEvent(self._dispatcher, GroupMgrEvent.OnNewApply, evt_data)
+
+    Broadcast.Send(BroadcastEvent.OnJoinsChange)
 end
 
 -- 被邀请事件

lua_probject/base_project/Game/Controller/NewGroupController.lua

@@ -47,6 +47,7 @@ function M:FG_GroupList(callback)
                 group.wechatId = tem.wechatId
                 group.groupDiamo = tem.groupDiamo
                 group.messageCount = tem.messageCount
+                group.joins = tem.joins
                 l_groups:add(group)
             end
         end
@@ -1699,3 +1700,21 @@ function M:FG_Get_Online_Member(groupId, callback)
         callback(res)
     end)
 end
+
+-- 获取某个家族的详细信息
+function M:WEB_FG_GET_GROUP_DETAIL(groupId, callback)
+    local _data = {}
+    _data.id = groupId
+    local _client = ControllerManager.GroupClient
+    _client:send(Protocol.WEB_FG_GET_GROUP_DETAIL, _data, function(res)
+        local group = DataManager.groups:get(groupId)
+        local detail = res.Data.groupDetail[1]
+        group.diamo = detail.diamo
+        group.wechatId = detail.wechatId
+        group.notice = detail.notice
+        group.name = detail.name
+        group.member_num = detail.member_num
+
+        callback(res)
+    end)
+end

lua_probject/base_project/Game/Protocol.lua

@@ -295,6 +295,9 @@ Protocol = {
 
     -- get_online_member
     WEB_FG_get_online_member        = "group/get_online_member",
+
+    -- 获取某个家族的详细信息
+    WEB_FG_GET_GROUP_DETAIL          = "group/get_groupDetail",
     -------------- group-log---------------------
     -- 获取奖励日志
     WEB_FG_GET_REWARDS_LOG          = "group/log/get_reward_log",

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

@@ -93,10 +93,14 @@ function FamilyAuditNumber:ClickBtn(isAllow, uid)
 
             self:Reflash()
 
+            Broadcast.Send(BroadcastEvent.OnJoinsChange)
+
+            --[[
             local view = BaseView.FindView("FamilyMainView")
             if view then
                 view:ChangeOther()
             end
+            ]]
         end
     end)
 end

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

@@ -290,8 +290,12 @@ function M:_evtOnFamilyReflash(...)
     local reflashType = arg[1].reflashType
 
     if reflashType == "joinFamily" then
+        local uid = arg[1].uid
+
+        if DataManager.SelfUser.account_id == uid then
             view:Reflash()
         end
+    end
 
     if reflashType == "outFamily" then
         --local player = DataManager.
@@ -317,12 +321,14 @@ function M:_evtOnFamilyReflash(...)
             end
         end
 
+        Broadcast.Send(BroadcastEvent.OnJoinsChange)
+        --[[
         view:ChangeOther()
-
         local win = BaseWindow.FindWindow("FamilyAuditNumber")
         if win then
             win:Reflash()
         end
+        ]]
     end
 end
 

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

@@ -2,6 +2,7 @@
 local FamilyRoomCardRecord = import(".FamilyRoomCardRecord")
 local RoomCardRecord = import(".RoomCardRecord")
 local FamilyInviteFamilyView = import('.FamilyInviteFamilyView')
+local FamilyAuditNumber = import(".FamilyAuditNumber")
 
 --region LOCAL
 
@@ -35,6 +36,24 @@ local function ChangeFamilyConfig(data, self)
     )
 end
 
+function FamilyMyFamily:ReflashJoinsRedPoint()
+    local cRedPoint = self.btn_applyMsg:GetController("cRedPoint")
+    local tex_redPoint = self.btn_applyMsg:GetChild("tex_redPoint")
+
+    local group = DataManager.groups.groupMap[self.groupId]
+
+    cRedPoint.selectedIndex = 0
+    if group.joins > 0 then
+        cRedPoint.selectedIndex = 1
+    end
+
+    local tex = group.joins
+    if group.joins > 99 then
+        tex = "99+"
+    end
+
+    tex_redPoint.text = tex
+end
 
 --endregion
 
@@ -45,32 +64,45 @@ function FamilyMyFamily:TryShow(groupId, r)
     self:Show()
 end
 
-function FamilyMyFamily.New(groupId)
-    setmetatable(FamilyMyFamily, { __index = BaseWindow })
+function FamilyMyFamily.New()
+    setmetatable(FamilyMyFamily, { __index = BaseView })
     local inst = setmetatable({}, { __index = FamilyMyFamily })
     inst._close_destroy = true
     inst._scale = true
     inst._animation = false
     inst._full_offset = false
     inst._anim_pop = 0
-    BaseWindow.init(inst, 'ui://Family/com_myFamily')
+    inst.class = "FamilyMyFamily"
+    BaseView.InitView(inst, 'ui://Family/com_myFamily')
     -- 隐藏背景图
     inst._root_view:GetChild("win_mode").visible = false
     inst:Init()
-    inst.groupId = groupId
     return inst
 end
 
-function FamilyMyFamily:Show()
-    self:Refalsh()
+function FamilyMyFamily:Show(groupId)
+    self.groupId = groupId
 
-    --HideMainView()
-    BaseWindow.Show(self)
+    Broadcast.AddListener(BroadcastEvent.OnJoinsChange, self.ReflashJoinsRedPoint, self)
+
+    local fgCtr = ControllerManager.GetController(NewGroupController)
+    ViewUtil.ShowModalWait(self._root_view, "正在加载亲友圈数据......")
+    fgCtr:WEB_FG_GET_GROUP_DETAIL(self.groupId, function(res)
+        print("收到家族的详细信息")
+        pt(res)
+        ViewUtil.CloseModalWait()
+        if res.ReturnCode ~= 0 then
+            ViewUtil.ErrorTip(res.ReturnCode)
+        end
+        self:Refalsh()
+    end)
+    BaseView.Show(self)
 end
 
 function FamilyMyFamily:Close()
-    BaseWindow.Close(self)
-    --ShowMainView()
+    Broadcast.RemoveListener(BroadcastEvent.OnJoinsChange, self.ReflashJoinsRedPoint)
+
+    BaseView.Close(self)
 end
 
 function FamilyMyFamily:Refalsh()
@@ -94,6 +126,8 @@ function FamilyMyFamily:Refalsh()
     elseif self.showNumber == 1 then
         self.cDisplayNumber.selectedIndex = 0
     end
+
+    self:ReflashJoinsRedPoint()
 end
 
 function FamilyMyFamily:Init()
@@ -182,7 +216,7 @@ function FamilyMyFamily:Init()
         local curView = ViewManager.GetCurrenView()
         if curView.class == "FamilyMainView" then
             curView:OpenAllNumber(self.family)
-            BaseWindow.DestroyAll()
+            BaseView.DestroyAll()
         else
             local view = ViewManager.ChangeView(ViewManager.View_Family, function()
                 view:OpenAllNumber(self.family)
@@ -191,14 +225,10 @@ function FamilyMyFamily:Init()
     end)
 
     self.btn_applyMsg.onClick:Set(function()
-        local curView = ViewManager.GetCurrenView()
-        if curView.class == "FamilyMainView" then
-            curView:AuditNumber()
-        else
-            local view = ViewManager.ChangeView(ViewManager.View_Family, function()
-                view:AuditNumber()
-            end)
-        end
+        local group = DataManager.groups.groupMap[self.groupId]
+
+        local view = FamilyAuditNumber.new()
+        view:Show(group)
     end)
 
     self.btn_quitFamily.onClick:Set(function()
@@ -316,7 +346,7 @@ function FamilyMyFamily:Init()
             self.networkSending = false
             self.cTips.selectedIndex = 1
             --self:Close()
-            BaseWindow.DestroyAll()
+            BaseView.DestroyAll()
             --ControllerManager.ChangeController(NewGroupController)
             ViewManager.ChangeView(ViewManager.View_Family)
         end)

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

@@ -13,23 +13,46 @@ local function ShowMainView(self)
     self.FamilyView.familyType.selectedIndex = self.rootLastIndex or 1
 end
 
---#endregion
+local function RefalshJoinsRedPoint(self)
+    for i = 0, self.list_familys.numItems - 1 do
 
-function FamilyMyfamilyList:TryShow(root)
-    local Instance = self.New(root)
-    Instance:Show()
+        local groups = DataManager.groups.groupList
+        local group = groups[i + 1]
+
+        local obj = self.list_familys:GetChildAt(i)
+
+        local btn_familyManage = obj:GetChild("btn_familyManage")
+        local btn_familyManageRedPoint = btn_familyManage:GetController("cRedPoint")
+
+        local tex_redPoint = btn_familyManage:GetChild("tex_redPoint")
+
+        btn_familyManageRedPoint.selectedIndex = 0
+        if group.joins > 0 then
+            btn_familyManageRedPoint.selectedIndex = 1
         end
 
+        local RpTex = group.joins
+        if group.joins > 99 then
+            RpTex = "99+"
+        end
+
+        tex_redPoint.text = RpTex
+    end
+end
+
+--#endregion
+
 function FamilyMyfamilyList.New(root)
-    setmetatable(FamilyMyfamilyList, { __index = BaseWindow })
+    setmetatable(FamilyMyfamilyList, { __index = BaseView })
     local Instance = setmetatable({}, { __index = FamilyMyfamilyList })
     Instance._full = true
     Instance._close_destroy = true
     Instance._full_offset = false
     Instance._anim_pop = 0
     Instance._animation = false
+    Instance.class = "FamilyMyfamilyList"
 
-    BaseWindow.init(Instance, "ui://Family/com_myFamilyList")
+    BaseView.InitView(Instance, "ui://Family/com_myFamilyList")
     -- 隐藏背景图
     Instance._root_view:GetChild("win_mode").visible = false
 
@@ -41,16 +64,25 @@ end
 
 function FamilyMyfamilyList:Refalsh()
     self.list_familys.numItems = #DataManager.groups.groupList
+    RefalshJoinsRedPoint(self)
 end
 
 function FamilyMyfamilyList:Show()
+    Broadcast.AddListener(BroadcastEvent.OnJoinsChange, RefalshJoinsRedPoint, self)
+
     HideMainView(self)
     self:Refalsh()
-    BaseWindow.Show(self)
+    BaseView.Show(self)
+end
+
+function FamilyMyfamilyList:Close()
+    Broadcast.RemoveListener(BroadcastEvent.OnJoinsChange, RefalshJoinsRedPoint)
+
+    ShowMainView(self)
+    BaseView.Close(self)
 end
 
 function FamilyMyfamilyList:Init()
-
     self.list_familys = self._view:GetChild("list_familys")
     self.btn_close = self._view:GetChild("btn_close")
 
@@ -79,8 +111,8 @@ function FamilyMyfamilyList:Init()
         btn_familyManage.onClick:Set(function()
             --self:Close()
             --self.FamilyView:OpenMyFamily(group.id)
-            local view = FamilyMyFamily.New(group.id)
-            view:Show()
+            local view = FamilyMyFamily.New()
+            view:Show(group.id)
         end)
 
         btn_record.onClick:Set(function()
@@ -96,9 +128,9 @@ function FamilyMyfamilyList:Init()
     pt(DataManager.groups.groupList)
 end
 
-function FamilyMyfamilyList:Close()
-    ShowMainView(self)
-    BaseWindow.Close(self)
+function FamilyMyfamilyList:TryShow(root)
+    local Instance = self.New(root)
+    Instance:Show()
 end
 
 return FamilyMyfamilyList

lua_probject/base_project/Game/View/FamilyView.lua

@@ -35,6 +35,33 @@ local function FamilyOffline(groupId, self)
     end)
 end
 
+-- 刷新申请的红点
+local function ReflashJoinsRedPoint(self)
+    if self._group == nil then
+        return
+    end
+
+    local btn_myfamily = self._view:GetChild("btn_myfamily")
+    local btn_myfamilycRedPoint = btn_myfamily:GetController("cRedPoint")
+    local btn_myfamilyRedPointText = btn_myfamily:GetChild("tex_redPoint")
+
+    local group = DataManager.groups:get(self._group.id)
+
+    btn_myfamilycRedPoint.selectedIndex = 0
+    if group.joins > 0 then
+        btn_myfamilycRedPoint.selectedIndex = 1
+    end
+
+    local RpTex = group.joins
+    if group.joins > 99 then
+        RpTex = "99+"
+    end
+
+    btn_myfamilyRedPointText.text = RpTex
+
+    self:ChangeOther()
+end
+
 local function SortMembers(Members)
     local re = {}
     local online = {}
@@ -118,6 +145,7 @@ function M:init(url)
 
     self:InitCloseClick()
 
+    --[[
     fgCtr:FG_GroupList(function(res)
         print("获取所有圈信息")
         pt(res)
@@ -130,6 +158,7 @@ function M:init(url)
             self.btn_chatRoom.visible = false
         end
     end)
+    ]]
     -------绑定成员战绩按钮
     view:GetChild('btn_family_record').onClick:Set(function()
         self._child_familyNumberRecord = FamilyNumberRecord.New(self, 1)
@@ -177,11 +206,20 @@ function M:init(url)
         --FamilyChatRoom:Show(self.ChatRoomData)
         self.com_FamilyChatRoom:Show()
     end)
+
+    self:Reflash()
 end
 
 function M:Reflash()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GroupList(function(res)
+        print("获取所有圈信息")
+        pt(res)
+
+        if res.ReturnCode ~= 0 then
+            ViewUtil.ErrorTip(res.ReturnCode)
+        end
+
         local groups = res.Data.groups
         if #groups > 0 then
             self.familyType.selectedIndex = 1
@@ -190,6 +228,8 @@ function M:Reflash()
             self:JoinFamily(true)
             self.btn_chatRoom.visible = false
         end
+
+        --Broadcast.Send(BroadcastEvent.OnJoinsChange)
     end)
 end
 
@@ -492,6 +532,8 @@ function M:OnEnterGroupCallBack()
 
     self:ReflashChatRoomRedPoint()
 
+    ReflashJoinsRedPoint(self)
+
     fgCtr:FG_Get_Online_Member(self._group.id, function(res)
     end)
 end
@@ -990,7 +1032,7 @@ function M:ChangeOther()
         obj:GetChild('title').text = cfg.name
         obj.onClick:Set(handler(self, cfg.Fct))
 
-        print("cfg.redPointFct", cfg.redPointFct)
+        --print("cfg.redPointFct", cfg.redPointFct)
         if cfg.redPointFct then
             cfg.redPointFct(self, obj)
         end
@@ -1009,7 +1051,7 @@ function M:ChangeMore()
         obj.onClick:Add(function()
             self._view:GetController('moreBtn').selectedIndex = 0
         end)
-        print("cfg.redPointFct", cfg.redPointFct)
+        --print("cfg.redPointFct", cfg.redPointFct)
         if cfg.redPointFct then
             cfg.redPointFct(self, obj)
         end
@@ -1063,7 +1105,15 @@ function M:ReflashChatRoomRedPoint()
     tex_redPoint.text = tex
 end
 
+function M:Show()
+    Broadcast.AddListener(BroadcastEvent.OnJoinsChange, ReflashJoinsRedPoint, self)
+
+    BaseView.Show(self)
+end
+
 function M:Close()
+    Broadcast.RemoveListener(BroadcastEvent.OnJoinsChange, ReflashJoinsRedPoint)
+
     print("家族界面退出")
     self._familyEventView:RemoveAll()
     BaseView.Close(self)

lua_probject/base_project/Main.lua

@@ -13,6 +13,7 @@ require 'Game.DataManager'
 require "Game.ExtendManager"
 require "Game.ExtendHotupdate"
 require "TableData"
+require "Game.Controller.Broadcast"
 
 local EmojiLuaHelper = import("Game.View.Common.EmojiLuaHelper")
 import("Game.GroupUpdataHelper")

lua_probject/extend_project/extend/Common/EXsettingView.lua

@@ -1,98 +0,0 @@
---设置窗口对象
-
-local EXSettingView = {}
-
-local M = EXSettingView
-setmetatable(M, { __index = BaseWindow })
-
-function EXSettingView:Show(room)
-    self._room = room
-
-    -- 房主，第一个进房间的人
-    local roomOwner = self._room.player_list[1].self_user.account_id
-
-    if roomOwner == DataManager.SelfUser.account_id then
-        self.cBtn.selectedIndex = 1
-    else
-        self.cBtn.selectedIndex = 0
-    end
-
-    BaseWindow.Show(self)
-end
-
-function EXSettingView.new(main_view, flag_witness)
-    local self = setmetatable({}, { __index = M })
-    self.class = 'EXSettingView'
-    self._close_destroy = true
-    self._mainView = main_view
-    self._flag_witness = flag_witness
-    self:init('ui://Main_Majiang/Setting')
-    return self
-end
-
-function M:init(url)
-    BaseWindow.init(self, url)
-
-    local view = self._view
-    local slider_sound = view:GetChild('slider_vedio_sound')
-    local slider_music = view:GetChild('slider_vedio_music')
-    local btn_music = view:GetChild('btn_vedio_music')
-    local btn_sound = view:GetChild('btn_vedio_sound')
-
-    self.cBtn = self._view:GetController('cBtn')
-
-    -- slider_sound.value = GameApplication.Instance.SoundValue
-    -- slider_music.value = GameApplication.Instance.MusicValue
-
-    slider_music.onChanged:Add(function()
-        -- GameApplication.Instance.MusicValue = slider_music.value
-        -- btn_music.selected = false
-        -- GameApplication.Instance.MusicMute = false;
-    end)
-
-    slider_sound.onChanged:Add(function()
-        -- GameApplication.Instance.SoundValue = slider_sound.value
-        -- btn_sound.selected = false
-        -- GameApplication.Instance.SoundMute = false;
-    end)
-
-    btn_sound.onClick:Add(function()
-        -- GameApplication.Instance.SoundMute = btn_sound.selected;
-    end)
-
-    btn_music.onClick:Add(function()
-        -- GameApplication.Instance.MusicMute = btn_music.selected;
-    end)
-
-    local _btn_logout = self._view:GetChild('btn_cancelRoom')
-    _btn_logout.onClick:Set(function()
-        if self._flag_witness then
-            local _room = DataManager.CurrenRoom
-            pt(_room)
-            self._mainView._gamectr:ExitWitnessGame(_room.play_id, _room.game_id,
-                _room.room_id)
-            ViewManager.ChangeView(ViewManager.View_Family)
-        else
-            if self._mainView.dismiss_room_cd_time > 0 then
-                ViewUtil.ErrorTip(nil, "您还处于解散冷却时间当中，请稍后重试！")
-            else
-                local _gamectr = ControllerManager.GetController(GameController)
-                _gamectr:AskDismissRoom()
-            end
-        end
-    end)
-
-    self._view:GetChild("btn_closeRoom").onClick:Set(function()
-        local _gamectr = ControllerManager.GetController(GameController)
-        _gamectr:LevelRoom(function(res)
-            print("退出房间")
-            if res.ReturnCode ~= 0 then
-                ViewUtil.ErrorTip(res.ReturnCode)
-                return
-            end
-            ViewManager.ChangeView(ViewManager.View_Family)
-        end)
-    end)
-end
-
-return M

lua_probject/extend_project/extend/Common/WitnessView.lua

@@ -1,14 +0,0 @@
-local MJSettingView = require("main.majiang.MJSettingViewNew")
-
-local WitnessView = {}
-setmetatable(WitnessView, { __index = BaseView })
-function WitnessView:init()
-    self.btn_setting = self._view:GetChild("btn_setting")
-
-    self.btn_setting.onClick:Set(function()
-            local view = MJSettingView.new(self, true)
-        view:Show()
-    end)
-end
-
-return WitnessView

lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua

@@ -5,7 +5,7 @@ local PlayerInfoView = import(".EXPlayerInfoView")
 local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView")
 local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView")
 local TableBG = require("Game.Data.TableBG")
-local WitnessView = require("extend.Common.WitnessView")
+local WitnessView = require("Game.View.WitnessView")
 
 
 local Record_Event = import(".RecordEvent")

lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua

@@ -5,7 +5,7 @@ local PlayerInfoView = import(".EXPlayerInfoView")
 local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView")
 local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView")
 local TableBG = require("Game.Data.TableBG")
-local WitnessView = require("extend.Common.WitnessView")
+local WitnessView = require("Game.View.WitnessView")
 
 
 local Record_Event = import(".RecordEvent")

lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua

@@ -6,7 +6,7 @@ local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView")
 local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView")
 local SettingView = import(".EXSettingView")
 local TableBG = require("Game.Data.TableBG")
-local WitnessView = require("extend.Common.WitnessView")
+local WitnessView = require("Game.View.WitnessView")
 
 
 local Record_Event = import(".RecordEvent")

lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua

@@ -5,7 +5,7 @@ local PlayerInfoView = import(".EXPlayerInfoView")
 local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView")
 local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView")
 local TableBG = require("Game.Data.TableBG")
-local WitnessView = require("extend.Common.WitnessView")
+local WitnessView = require("Game.View.WitnessView")
 
 
 local Record_Event = import(".RecordEvent")

wb_new_ui/assets/FGAssist/invite/panel_assist.xml

@@ -2,16 +2,10 @@
 <component size="843,1140">
   <controller name="unfold" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n0_cioe" name="n0" src="cioehn1" fileName="invite/image/tool/hd.png" xy="0,0" size="843,1140">
+    <image id="n0_cioe" name="n0" src="cioehn1" fileName="invite/image/tool/hd.png" xy="0,0" size="843,1140" color="#cad8df">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n7_vmtu" name="n7" src="vmtuho8" fileName="invite/image/tool/btdk.png" xy="263,18" visible="false">
-      <relation target="" sidePair="center-center"/>
-    </image>
-    <image id="n8_vmtu" name="n8" src="vmtuho9" fileName="invite/image/tool/yqhybtz.png" xy="338,37" visible="false">
-      <relation target="" sidePair="center-center"/>
-    </image>
-    <list id="n10_vmtu" name="lst_player" xy="54,66" size="723,1049" layout="flow_hz" overflow="scroll" lineGap="18" colGap="18" defaultItem="ui://vplxondscioehn7" align="center" autoClearItems="true">
+    <list id="n10_vmtu" name="lst_player" xy="54,96" size="723,1008" layout="flow_hz" overflow="scroll" lineGap="18" colGap="18" defaultItem="ui://vplxondscioehn7" align="center" autoClearItems="true">
       <relation target="" sidePair="width-width"/>
       <item/>
       <item/>
@@ -23,5 +17,6 @@
     </list>
     <component id="n11_vmtu" name="btn_refresh" src="cioehn6" fileName="invite/component/invite/btn_reload.xml" xy="-269,1169" size="82,98" visible="false"/>
     <component id="n12_vmtu" name="btn_auto_invite" src="vmtuhoc" fileName="invite/component/invite/btn_auto_invite.xml" xy="-637,1169" visible="false"/>
+    <text id="n13_xo4i" name="n13" xy="278,24" size="274,72" font="ui://27vd145bg2mo7ij0" fontSize="54" text="亲友圈好友"/>
   </displayList>
 </component>

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

@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="282,78" 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="n4_jrro" name="n4" src="jrro7cy3" fileName="Main/Image/btn_myRoom.png" xy="0,0"/>
+    <image id="n5_qi56" name="n5" src="icft7d63" fileName="Main/Image/Group 687.png" xy="235,-15">
+      <gearDisplay controller="cRedPoint" pages="1"/>
+    </image>
+    <text id="n6_qi56" name="tex_redPoint" xy="235,-15" 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 mode="Radio"/>
 </component>

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

@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="375,111" 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_ieus" name="n0" src="ieus7d20" fileName="MyFamily/Image/shewnqingxiaoxi.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
+    <image id="n1_xo4i" name="n1" src="icft7d63" fileName="Main/Image/Group 687.png" xy="319,-2">
+      <gearDisplay controller="cRedPoint" pages="1"/>
+    </image>
+    <text id="n2_xo4i" name="tex_redPoint" xy="319,-2" 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/Main_Majiang/Main_new/Setting/Setting.xml

@@ -11,7 +11,7 @@
     </image>
     <text id="n21_xblm" name="title_click" xy="205,263" size="151,94" group="n24_xblm" font="ui://27vd145bh35o7ilb" fontSize="72" color="#695741" leading="0" letterSpacing="5" text="音效"/>
     <component id="n22_xblm" name="btn_singleClick" src="xblm1ad" fileName="checkbtn_click.xml" xy="427,285" group="n24_xblm" customData="n2.text = &quot;双击&quot;">
-      <Button title="单击" controller="cBtnSelect" page="0"/>
+      <Button checked="true" title="单击" controller="cBtnSelect" page="0"/>
     </component>
     <component id="n23_xblm" name="btn_doubleClick" src="xblm1ad" fileName="checkbtn_click.xml" xy="646,285" group="n24_xblm" customData="n2.text = &quot;双击&quot;">
       <Button title="单击" controller="cBtnSelect" page="1"/>
@@ -29,13 +29,14 @@
     </component>
     <component id="n31_xblm" name="btn_vedio_music" src="xblm1ak" fileName="component/Setting/Component/btn_vedio.xml" xy="1198,544" group="n32_xblm"/>
     <group id="n32_xblm" name="music" xy="205,531" size="1071,94"/>
-    <component id="n16_qt01" name="btn_closeRoom" src="pkx5sv" fileName="Main_new/Main/Component/btn_closeRoom.xml" xy="539,674" scale="1.2,1.2">
+    <component id="n16_qt01" name="btn_closeRoom" src="pkx5sv" fileName="Main_new/Main/Component/btn_closeRoom.xml" xy="514,674" size="409,160">
       <gearDisplay controller="cBtn" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </component>
-    <component id="n20_xblm" name="btn_cancelRoom" src="xblm1ac" fileName="Main_new/Main/Component/btn_cancelRoom.xml" xy="511,674">
+    <component id="n20_xblm" name="btn_cancelRoom" src="xblm1ac" fileName="Main_new/Main/Component/btn_cancelRoom.xml" xy="480,674">
       <gearDisplay controller="cBtn" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </component>
+    <component id="n33_xo4i" name="n33" src="xo4i1br" fileName="Main_new/Main/Component/btn_vipCancel.xml" xy="1037,715"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1460,6 +1460,23 @@
     <image id="fj6f1bn" name="微信图片_20250726215551_78.png" path="/images/"/>
     <image id="l4fo1bo" name="btn_show_result.png" path="/Main_new/Main/Image/"/>
     <image id="l4fo1bp" name="btn_continu_game.png" path="/Main_new/Main/Image/"/>
+    <image id="xo4i1bq" name="dismiss1.png" path="/Main_new/Image/"/>
+    <component id="xo4i1br" name="btn_vipCancel.xml" path="/Main_new/Main/Component/"/>
+    <image id="qi561dr" name="Group 196.png" path="/Main_new/Main/Image/"/>
+    <image id="qi561ds" name="Group 195.png" path="/Main_new/Main/Image/"/>
+    <image id="qi561dt" name="Group 192.png" path="/Main_new/Main/Image/"/>
+    <image id="qi561du" name="Group 205(1).png" path="/Main_new/Chat/Image/"/>
+    <image id="qi561dv" name="Vector@3x.png" path="/component/setting/Image/"/>
+    <image id="qi561dw" name="Rectangle 77@3x.png" path="/component/setting/Image/"/>
+    <image id="qi561dx" name="image 26@3x.png" path="/component/setting/Image/"/>
+    <image id="qi561dy" name="Group 82@3x.png" path="/component/setting/Image/"/>
+    <image id="qi561dz" name="btn_dianxinchongzhi_2.png" path="/component/setting/Image/"/>
+    <image id="qi561e0" name="btn_dianxinchongzhi_1.png" path="/component/setting/Image/"/>
+    <component id="qi561e1" name="slider_vedio_grip.xml" path="/component/setting/Component/"/>
+    <component id="qi561e2" name="slider_vedio.xml" path="/component/setting/Component/"/>
+    <component id="qi561e3" name="btn_vedio.xml" path="/component/setting/Component/"/>
+    <image id="qi561e8" name="Group 207.png" path="/Main_new/Main/Image/"/>
+    <image id="qi561e9" name="Group 346.png" path="/Main_new/Main/Image/"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>

wb_unity_pro/Assets/StreamingAssets/init1_1.json

@@ -1,9 +1,9 @@
 [
   {
-    "ver": "1.0.21",
+    "ver": "1.0.22",
     "name": "跑得快",
     "check": true,
-    "version": "1.0.21",
+    "version": "1.0.22",
     "game_id": "66",
     "bundle": "extend/poker/runfast"
   },
@@ -24,34 +24,34 @@
     "bundle": "extend/poker2/suoha"
   },
   {
-    "ver": "1.0.23",
+    "ver": "1.0.25",
     "name": "南城麻将",
     "check": true,
-    "version": "1.0.23",
+    "version": "1.0.25",
     "game_id": "86",
     "bundle": "extend/majiang/nancheng"
   },
   {
-    "ver": "1.0.24",
+    "ver": "1.0.26",
     "name": "黎川麻将",
     "check": true,
-    "version": "1.0.24",
+    "version": "1.0.26",
     "game_id": "87",
     "bundle": "extend/majiang/lichuan"
   },
   {
-    "ver": "1.0.19",
+    "ver": "1.0.12",
     "name": "金溪麻将",
     "check": true,
-    "version": "1.0.19",
+    "version": "1.0.12",
     "game_id": "88",
     "bundle": "extend/majiang/jinxi"
   },
   {
-    "ver": "1.0.18",
+    "ver": "1.0.11",
     "name": "抚州麻将",
     "check": true,
-    "version": "1.0.18",
+    "version": "1.0.11",
     "game_id": "89",
     "bundle": "extend/majiang/fuzhou"
   }

wb_unity_pro/Assets/StreamingAssets/init2_1.json

@@ -1,109 +1,109 @@
 [
   {
     "lua_path": "/tolua_project,/base_project,/main_project",
-    "ver": "1.0.7",
+    "ver": "1.0.8",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
-    "version": "1.0.7"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.7",
+    "ver": "1.0.8",
     "name": "common",
     "check": true,
     "bundle": "base/common",
-    "version": "1.0.7"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.7",
+    "ver": "1.0.8",
     "name": "login",
     "check": true,
     "bundle": "base/login",
-    "version": "1.0.7"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.7",
+    "ver": "1.0.8",
     "name": "lobby",
     "check": true,
     "bundle": "base/lobby",
-    "version": "1.0.7"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.7",
+    "ver": "1.0.8",
     "name": "Family",
     "check": true,
     "bundle": "base/Family",
-    "version": "1.0.7"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.7",
+    "ver": "1.0.8",
     "name": "chat",
     "check": true,
     "bundle": "base/chat",
-    "version": "1.0.7"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.7",
+    "ver": "1.0.8",
     "name": "newgroup",
     "check": true,
     "bundle": "base/newgroup",
-    "version": "1.0.7"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.7",
+    "ver": "1.0.8",
     "name": "rank",
     "check": true,
-    "version": "1.0.7",
+    "version": "1.0.8",
     "bundle": "base/rank"
   },
   {
-    "ver": "1.0.7",
+    "ver": "1.0.8",
     "name": "main_majiang",
     "check": true,
-    "version": "1.0.7",
+    "version": "1.0.8",
     "bundle": "base/main_majiang"
   },
   {
-    "ver": "1.0.7",
+    "ver": "1.0.8",
     "name": "main_poker",
     "check": true,
-    "version": "1.0.7",
+    "version": "1.0.8",
     "bundle": "base/main_poker"
   },
   {
-    "ver": "1.0.7",
+    "ver": "1.0.8",
     "name": "main_zipai",
     "check": true,
-    "version": "1.0.7",
+    "version": "1.0.8",
     "bundle": "base/main_zipai"
   },
   {
-    "ver": "1.0.7",
+    "ver": "1.0.8",
     "name": "static",
     "check": true,
     "bundle": "base/static",
-    "version": "1.0.7"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.7",
+    "ver": "1.0.8",
     "is_res": true,
     "name": "embed",
     "check": true,
     "bundle": "base/embed",
-    "version": "1.0.7"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.7",
+    "ver": "1.0.8",
     "name": "main_pokemajiang",
     "check": true,
-    "version": "1.0.7",
+    "version": "1.0.8",
     "bundle": "base/main_pokemajiang"
   },
   {
-    "ver": "1.0.7",
+    "ver": "1.0.8",
     "name": "main_zipaimajiang",
     "check": true,
-    "version": "1.0.7",
+    "version": "1.0.8",
     "bundle": "base/main_zipaimajiang"
   }
 ]

wb_unity_pro/ProjectSettings/GraphicsSettings.asset

@@ -38,6 +38,7 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

wb_unity_pro/ProjectSettings/ProjectSettings.asset

@@ -178,8 +178,8 @@ PlayerSettings:
   buildNumber:
     iPhone: 1
   AndroidBundleVersionCode: 12
-  AndroidMinSdkVersion: 21
-  AndroidTargetSdkVersion: 30
+  AndroidMinSdkVersion: 22
+  AndroidTargetSdkVersion: 22
   AndroidPreferredInstallLocation: 1
   aotOptions: 
   stripEngineCode: 0
@@ -787,7 +787,7 @@ PlayerSettings:
   platformArchitecture:
     iPhone: 1
   scriptingBackend:
-    Android: 0
+    Android: 1
     Standalone: 1
     iPhone: 1
   il2cppCompilerConfiguration: {}