设置界面

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -278,6 +278,17 @@ function M:OnEvtMessage(evt_data)
     local group = DataManager.groups:get(self.groupId)
     group.joins = evt_data.joins
     group.update_joins = true
+
+    local msg = {}
+    msg.nick = evt_data.nick
+    msg.id = evt_data.uid
+    msg.portrait = evt_data.portrait
+    msg.tag = evt_data.remark
+
+    group.joinsData = group.joinsData or {}
+
+    group.joinsData[#group.joinsData + 1] = msg
+
     DispatchEvent(self._dispatcher, GroupMgrEvent.OnNewApply, evt_data)
 end
 

lua_probject/base_project/Game/Controller/NewGroupController.lua

@@ -203,6 +203,8 @@ function M:FG_GroupJoins(id, callback)
     local data    = {}
     data.id       = id
     _client:send(Protocol.WEB_FG_GROUP_JOINS, data, function(res)
+        local group = DataManager.groups:get(id)
+        group.joinsData = res.Data.joins
         callback(res)
     end)
 end

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

@@ -6,7 +6,9 @@ local FamilyAuditNumber = {}
 local M = FamilyAuditNumber
 
 local function AddItem(self, index, obj)
-    local info = self.data[index + 1]
+    local group = DataManager.groups:get(self._group.id)
+    local info = group.joinsData[index + 1]
+
     obj:GetChild('text_name').text = info.nick
     obj:GetChild('text_id').text = info.id
     obj:GetChild('text_tag').text = "备注: " .. info.tag
@@ -24,8 +26,6 @@ function FamilyAuditNumber.new(root)
     setmetatable(M, { __index = root })
     local self = setmetatable({}, { __index = M })
 
-    --self:Show()
-    
     return self
 end
 
@@ -36,7 +36,7 @@ function M:Show()
             ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败")
             return
         else
-            self.data = res.Data.joins
+            --self.data[self._group.id] = res.Data.joins
             self.familyType.selectedIndex = 6
             local list = self._view:GetChild('list_auditNumberList')
             --list:RemoveChildrenToPool()
@@ -44,7 +44,8 @@ function M:Show()
             list.itemRenderer = function(index, obj)
                 AddItem(self, index, obj)
             end
-            list.numItems = #self.data
+            local group = DataManager.groups:get(self._group.id)
+            list.numItems = #group.joinsData
         end
     end)
 end
@@ -61,12 +62,18 @@ function M:ClickBtn(isAllow, uid)
             else
 
             end
+            local group = DataManager.groups:get(self._group.id)
+            group.joins = group.joins - 1
             self:Show()
+            self:ChangeOther()
         end
     end)
 end
 
 function M:OnNewApply(arg)
+    local group = DataManager.groups:get(self._group.id)
+
+    --[[
     arg = arg[1]
 
     local msg = {}
@@ -74,11 +81,13 @@ function M:OnNewApply(arg)
     msg.id = arg.uid
     msg.portrait = arg.portrait
     msg.tag = arg.remark
-    self.data[#self.data + 1] = msg
+    local groupInfo = self.data[self._group.id]
+    groupInfo[#groupInfo + 1] = msg
+    ]]
 
     local list = self._view:GetChild('list_auditNumberList')
     local obj = list:AddItemFromPool()
-    AddItem(self, #self.data - 1, obj)
+    AddItem(self, #group.joinsData - 1, obj)
 end
 
 return M

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

@@ -27,8 +27,10 @@ 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))
+    mgr_ctr:AddEventListener(GroupMgrEvent.OnFamilyReflash, handler(self, self._evtOnFamilyReflash))
     mgr_ctr:AddEventListener(GroupMgrEvent.OnFamilyRoomReflash, handler(self, self._evtOnFamilyRoomReflash))
+
+    print("家族添加监听")
     return self
 end
 
@@ -51,22 +53,45 @@ function M:RemoveAll()
     mgr_ctr:RemoveEventListener(GroupMgrEvent.OnNewRecord, handler(self, self._evtOnNewRecord))
     mgr_ctr:RemoveEventListener(GroupMgrEvent.Onpush_assistant, handler(self, self._evtOnPush_assistant))
     mgr_ctr:RemoveEventListener(GroupMgrEvent.OnMemberState, handler(self, self._evtOnMemberState))
-    mgr_ctr:RemoveEventListener(GroupMgrEvent.OnFamilyReflash, handler(self, self._evtOnFamilyRoomReflash))
+    mgr_ctr:RemoveEventListener(GroupMgrEvent.OnFamilyRoomReflash, handler(self, self._evtOnFamilyRoomReflash))
+
+    print("家族去除监听")
 end
 
 function M:_evtAddPlay(...)
     local arg = { ... }
     print("family event _evtAddPlay")
+
+    local view = ViewManager.GetCurrenView()
+    if view.class ~= "FamilyMainView" then
+        return
+    end
+
+    view:UpdateFamilyRoom(nil, view._group.id)
 end
 
 function M:_evtDelPlay(...)
     local arg = { ... }
     print("family event _evtDelPlay")
+
+    local view = ViewManager.GetCurrenView()
+    if view.class ~= "FamilyMainView" then
+        return
+    end
+
+    view:UpdateFamilyRoom(nil, view._group.id)
 end
 
 function M:_evtUpdatePlay(...)
     local arg = { ... }
     print("family event _evtUpdatePlay")
+
+    local view = ViewManager.GetCurrenView()
+    if view.class ~= "FamilyMainView" then
+        return
+    end
+
+    view:UpdateFamilyRoom(nil, view._group.id)
 end
 
 function M:_evtAddRoom(...)
@@ -100,7 +125,12 @@ function M:_evtUpdateGroup(...)
     if view.class ~= "FamilyMainView" then
         return
     end
+
+    -- 刷新名字
     view:ReflashFamilyList()
+
+    -- 刷新打烊
+    view:ReflashBan()
     print("family event _evtUpdateGroup")
 end
 
@@ -118,7 +148,7 @@ function M:_evtOnNewApply(...)
     if view.class ~= "FamilyMainView" then
         return
     end
-    view:RefalshMoreBtn()
+    view:ChangeOther()
     self._child_familyAuditNumber:OnNewApply(arg)
 end
 
@@ -233,7 +263,7 @@ function M:_evtOnPush_assistant(...)
     local groupId = arg[1].id
     local lev = arg[1].lev
 
-    if groupId ~= view._group.id then
+    if view._group == nil or groupId ~= view._group.id then
         return
     end
 
@@ -268,7 +298,7 @@ function M:_evtOnFamilyRoomReflash(...)
         return
     end
 
-    if groupId ~= view._group.id then
+    if view._group == nil or groupId ~= view._group.id then
         return
     end
 

lua_probject/base_project/Game/View/FamilyView.lua

@@ -280,12 +280,12 @@ function M:AuditNumber()
 end
 
 function M:UpdataRedPointAuditNumber(obj)
-    if self._child_familyAuditNumber.data == nil or #self._child_familyAuditNumber.data <= 0 then
+    if self._group.joins == nil or self._group.joins <= 0 then
         obj:GetController("cRedPoint").selectedIndex = 0
         return
     end
 
-    local redPointNum = #self._child_familyAuditNumber.data
+    local redPointNum = self._group.joins
     if redPointNum > 99 then
         redPointNum = "99+"
     end
@@ -335,12 +335,16 @@ function M:BanFamily()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "一键打样失败")
             else
-                self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0
+                self:ReflashBan()
                 self:RefalshMoreBtn()
             end
         end)
 end
 
+function M:ReflashBan()
+    self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0
+end
+
 function M:BanDeskmate()
     self.FamilyBanDesk = FamilyBanDesk:TryShow(self)
 end
@@ -409,7 +413,7 @@ function M:OnEnterGroupCallBack()
         end
 
         local ApplyRp = {}
-
+        self:ChangeOther()
         --[[
         for _,rp in pairs(ApplyRp) do
             local group = DataManager.groups:get()
@@ -428,7 +432,7 @@ function M:OnEnterGroupCallBack()
     FamilyOnline(self._group.id, self)
 
     ViewUtil.ShowModalWait(self._root_view, "正在加载亲友圈权限中......")
-    self:ChangeOther(tonumber(self._group.lev) + 1)
+    self:ChangeOther()
 
     ViewUtil.ShowModalWait(self._root_view, "正在加载成员列表中......")
     self:ChangeNumber(fgCtr, self._group.id, 0, self._group.total_member_num, false, 1)
@@ -782,7 +786,6 @@ function M:OnUpdate()
             self._view:GetChild('list_familyNumber').numItems = #self._group.members
         end
     end
-    
 end
 
 local IDENTITY_LIST = {
@@ -919,7 +922,9 @@ local MORE_LIST = {
     },
 }
 
-function M:ChangeOther(i)
+function M:ChangeOther()
+    local i = tonumber(self._group.lev) + 1
+
     local otherList = IDENTITY_LIST[i].otherList
     local list_other = self._view:GetChild('list_other')
     self._lev = i
@@ -987,6 +992,7 @@ function M:RefalshMoreBtn()
 end
 
 function M:Close()
+    print("家族界面退出")
     self._familyEventView:RemoveAll()
     BaseView.Close(self)
 end

lua_probject/base_project/Game/View/SettingView.lua

@@ -184,6 +184,7 @@ function M:Show()
     end
 end
 
+--[[
 function M:Destroy()
     local bg_id = self._view:GetController('bg').selectedIndex + 1
     if self._bg ~= bg_id then
@@ -192,6 +193,7 @@ function M:Destroy()
     end
     BaseWindow.Destroy(self)
 end
+]]
 
 function M:SetCanDissroom(enable)
     self._btn_dismiss_room.enabled = enable

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

@@ -87,12 +87,6 @@ function M:InitView(url)
         self._showNextName = nil
     end)
 
-    local btn_closeRoom = self._view:GetChild("btn_setting")
-    btn_closeRoom.onClick:Add(handler(self, function()
-        local settingView = SettingView.new(self)
-        settingView:Show(self._room)
-    end))
-
     --------
     self:PlayerChangeLineState()
 
@@ -635,7 +629,7 @@ function M:__FangziTip(tip, weight)
     local _ctr_tips = info._ctr_tip
 
     local _lit_fanzi = _chipeng_tip:GetChild("list")
-    _lit_fanzi:SetVirtual()
+    --_lit_fanzi:SetVirtual()
     local _tlist = tip.tip_map_id
     _lit_fanzi.itemRenderer = function(index, obj)
         local type = obj:GetController('type')

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

@@ -1,7 +1,22 @@
 --设置窗口对象
+local MJSettingViewNew = require("main.majiang.MJSettingViewNew")
 
 local EXSettingView = {}
 
+function EXSettingView.new(main_view, flag_witness)
+    local self = setmetatable({}, { __index = MJSettingViewNew })
+    self.class = 'EXSettingView'
+    self._close_destroy = true
+    self._mainView = main_view
+    self._flag_witness = flag_witness
+    MJSettingViewNew.new(main_view, flag_witness)
+    --self:init('ui://Main_Majiang/Setting')
+    return self
+end
+
+--[[
+local EXSettingView = {}
+
 local M = EXSettingView
 setmetatable(M, { __index = BaseWindow })
 
@@ -94,5 +109,5 @@ function M:init(url)
         end)
     end)
 end
-
-return M
+]]
+return EXSettingView

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

@@ -5,6 +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 Record_Event = import(".RecordEvent")
@@ -19,7 +20,7 @@ local M = {}
 
 --- Create a new
 function M.new()
-    setmetatable(M, { __index = BaseView })
+    setmetatable(M, { __index = WitnessView })
     local self = setmetatable({}, { __index = M })
     self.class = "EXMJWitness"
     self:init()
@@ -41,6 +42,7 @@ function M:init()
     self._style = 1
     self._popEvent = true
     self:InitView()
+    WitnessView.init(self)
 end
 
 function M:InitView(url)

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

@@ -83,12 +83,6 @@ function M:InitView(url)
         self._showNextName = nil
     end)
 
-    local btn_closeRoom = self._view:GetChild("btn_setting")
-    btn_closeRoom.onClick:Add(handler(self, function()
-        local settingView = SettingView.new(self)
-        settingView:Show(self._room)
-    end))
-
 
     --------
     self:PlayerChangeLineState()
@@ -627,7 +621,7 @@ function M:__FangziTip(tip, weight)
     local _ctr_tips = info._ctr_tip
 
     local _lit_fanzi = _chipeng_tip:GetChild("list")
-    _lit_fanzi:SetVirtual()
+    --_lit_fanzi:SetVirtual()
     local _tlist = tip.tip_map_id
     _lit_fanzi.itemRenderer = function(index, obj)
         local type = obj:GetController('type')

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

@@ -5,6 +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 Record_Event = import(".RecordEvent")
@@ -19,7 +20,7 @@ local M = {}
 
 --- Create a new
 function M.new()
-    setmetatable(M, { __index = BaseView })
+    setmetatable(M, { __index = WitnessView })
     local self = setmetatable({}, { __index = M })
     self.class = "EXMJWitness"
     self:init()

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

@@ -84,12 +84,6 @@ function M:InitView(url)
         self._showNextName = nil
     end)
 
-    local btn_setting = self._view:GetChild("btn_setting")
-    btn_setting.onClick:Add(handler(self, function()
-        local settingView = SettingView.new(self)
-        settingView:Show(self._room)
-    end))
-
     --------
     self:PlayerChangeLineState()
 
@@ -630,7 +624,7 @@ function M:__FangziTip(tip, weight)
     local _ctr_tips = info._ctr_tip
 
     local _lit_fanzi = _chipeng_tip:GetChild("list")
-    _lit_fanzi:SetVirtual()
+    --_lit_fanzi:SetVirtual()
     local _tlist = tip.tip_map_id
     _lit_fanzi.itemRenderer = function(index, obj)
         local type = obj:GetController('type')

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

@@ -6,6 +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 Record_Event = import(".RecordEvent")
@@ -20,7 +21,7 @@ local M = {}
 
 --- Create a new
 function M.new()
-    setmetatable(M, { __index = BaseView })
+    setmetatable(M, { __index = WitnessView })
     local self = setmetatable({}, { __index = M })
     self.class = "EXMJWitness"
     self:init()

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

@@ -86,12 +86,6 @@ function M:InitView(url)
         self._showNextName = nil
     end)
 
-    local btn_closeRoom = self._view:GetChild("btn_setting")
-    btn_closeRoom.onClick:Add(handler(self, function()
-        local settingView = SettingView.new(self)
-        settingView:Show(self._room)
-    end))
-
     --------
     self:PlayerChangeLineState()
 
@@ -632,7 +626,7 @@ function M:__FangziTip(tip, weight)
     local _ctr_tips = info._ctr_tip
 
     local _lit_fanzi = _chipeng_tip:GetChild("list")
-    _lit_fanzi:SetVirtual()
+    --_lit_fanzi:SetVirtual()
     local _tlist = tip.tip_map_id
     _lit_fanzi.itemRenderer = function(index, obj)
         local type = obj:GetController('type')

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

@@ -5,6 +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 Record_Event = import(".RecordEvent")
@@ -19,7 +20,7 @@ local M = {}
 
 --- Create a new
 function M.new()
-    setmetatable(M, { __index = BaseView })
+    setmetatable(M, { __index = WitnessView })
     local self = setmetatable({}, { __index = M })
     self.class = "EXMJWitness"
     self:init()

lua_probject/main_project/main/majiang/MJMainView.lua

@@ -17,6 +17,7 @@ setmetatable(M, { __index = MainView })
 
 local default_bg = 1
 function M:InitView(url, use_custom_bg, custom_bg_config)
+    
     -- 加载牌型数据
     if not DataManager.CardTypeList then
         local json_data = Utils.LoadLocalFile("CardTypeData")
@@ -30,6 +31,7 @@ function M:InitView(url, use_custom_bg, custom_bg_config)
 
     UIPackage.AddPackage("base/main_majiang/ui/Main_Majiang")
     MainView.InitView(self, url)
+    self.btn_setting = self._view:GetChild("btn_setting")
     local _view = self._view
     self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj")
     bg_config = custom_bg_config == nil and bg_config or custom_bg_config
@@ -208,6 +210,11 @@ function M:InitView(url, use_custom_bg, custom_bg_config)
 
     self:InitXiPai()
     self:InitXiPai1()
+
+    self.btn_setting.onClick:Set(function()
+        local view = MJSettingView.new(self)
+        view:Show()
+    end)
 end
 
 function M:InitXiPai()

lua_probject/main_project/main/majiang/MJSettingViewNew.lua

@@ -6,17 +6,45 @@ local MJSettingViewNew = {
 }
 local M = MJSettingViewNew
 
+local function IsRoomOwer()
+    --local roomOwner = self._room.player_list[1].self_user.account_id
+    local roomOwner = DataManager.CurrenRoom.player_list[1].self_user.account_id
+    return roomOwner == DataManager.SelfUser.account_id
+end
+
+function M:Reflash()
+    if IsRoomOwer() then
+        self.cBtn.selectedIndex = 1
+    end
+
+    if DataManager.CurrenRoom.playing then
+        self.cBtn.selectedIndex = 1
+    end
+
+    if self.flag_witness then
+        self.cBtn.selectedIndex = 0
+    end
+end
+
+function M:Show()
+    BaseWindow.Show(self)
+    self:Reflash()
+end
+
 -- show_dialect是否显示'切换方言'选项
-function MJSettingViewNew.new(blur_view, show_dialect)
+function MJSettingViewNew.new(blur_view, flag_witness)
     setmetatable(SettingView, { __index = BaseWindow })
     setmetatable(M, { __index = SettingView })
     local self = setmetatable({}, { __index = M })
     self.class = "MJSettingViewNew"
-    self._currenIndex = 0
     self._blur_view = blur_view
+    self._flag_witness = flag_witness
     self.onCallback = event("onCallback", true)
     self.onChangeCardCallback = event("onCallback", true)
     self.onChangeLanguageCallback = event("onCallback", true)
+    self._mainView = blur_view
+    --[[
+    self._currenIndex = 0
     self.stateIndex = 0
     self.cd_time = 0
     self._btn_dismiss_room_enable = true
@@ -25,44 +53,79 @@ function MJSettingViewNew.new(blur_view, show_dialect)
     self._close_zone = true
     self._show_dialect = show_dialect
     self:init("ui://Main_Majiang/SettingWindow2")
+    ]]
+    self._scale = true
+    self:init("ui://Main_Majiang/Setting")
 
     return self
 end
+
 function M:init(url)
+    BaseWindow.init(self, url)
 
-    SettingView.init(self, url)
+    self.slider_sound = self._view:GetChild('slider_vedio_sound')
+    self.slider_music = self._view:GetChild('slider_vedio_music')
 
+    self.btn_music = self._view:GetChild('btn_vedio_music')
+    self.btn_sound = self._view:GetChild('btn_vedio_sound')
+    self.btn_cancelRoom = self._view:GetChild("btn_cancelRoom")
+    self.btn_closeRoom = self._view:GetChild("btn_closeRoom")
 
-    self._view:GetChild("btn_close22").onClick:Set(function( ... )
-        local bg_id = self._view:GetController("bg").selectedIndex + 1
-        if self._bg ~= bg_id then
-            self._bg = bg_id
-            TableBG.SaveTableBG(self._game_id, self._bg)
-        end
-        self:Destroy()
+    self.cBtn = self._view:GetController('cBtn')
+
+    self.slider_music.onChanged:Add(function()
+        -- GameApplication.Instance.MusicValue = slider_music.value
+        -- btn_music.selected = false
+        -- GameApplication.Instance.MusicMute = false;
     end)
 
-    self._view:GetChild("btn_close").onClick:Set(function( ... )
-        local bg_id = self._view:GetController("bg").selectedIndex + 1
-        if self._bg ~= bg_id  then
-            self._bg = bg_id
-            TableBG.SaveTableBG(self._game_id, self._bg)
-        end
-        self:Destroy()
+    self.slider_sound.onChanged:Add(function()
+        -- GameApplication.Instance.SoundValue = slider_sound.value
+        -- btn_sound.selected = false
+        -- GameApplication.Instance.SoundMute = false;
     end)
 
-    if self._show_dialect == true then
-        self._view:GetController("show_dialect").selectedIndex = 1
-        local ctr_language = self._view:GetController("language")
-        ctr_language.selectedIndex = self:GetLanguage()
-        ctr_language.onChanged:Set(function()
-            self:SaveLanguage(ctr_language.selectedIndex)
-            if self.onChangeLanguageCallback then
-                self:onChangeLanguageCallback(ctr_language.selectedIndex)
+    self.btn_sound.onClick:Add(function()
+        -- GameApplication.Instance.SoundMute = btn_sound.selected;
+    end)
+
+    self.btn_music.onClick:Add(function()
+        -- GameApplication.Instance.MusicMute = btn_music.selected;
+    end)
+
+
+    self.btn_cancelRoom.onClick:Set(function()
+        if self._mainView.dismiss_room_cd_time > 0 then
+            ViewUtil.ErrorTip(nil, "您还处于解散冷却时间当中，请稍后重试！")
+            return
         end
+
+        local _gamectr = ControllerManager.GetController(GameController)
+        _gamectr:AskDismissRoom()
+    end)
+
+    self.btn_closeRoom.onClick:Set(function()
+    
+        if self._flag_witness then
+            local _room = DataManager.CurrenRoom
+            self._mainView._gamectr:ExitWitnessGame(_room.play_id, _room.game_id, _room.room_id)
+            ViewManager.ChangeView(ViewManager.View_Family)
+            return
+        end
+
+        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
-end
+
+--[[
 
 --赋值bg_config
 function M:GetBGConfig()
@@ -235,4 +298,6 @@ function M:UpdateIndex()
     ctr_card.selectedIndex = room.card_type
 end
 
+]]
+
 return M

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1620,180">
-  <controller name="type" pages="0,玩法匹配,1,加入房间" selected="0"/>
+  <controller name="type" pages="0,玩法匹配,1,加入房间" selected="1"/>
   <controller name="num" pages="0,,1,,2," selected="0"/>
   <displayList>
     <image id="n23_jrro" name="n23" src="q2iu7d5k" fileName="Main/Image/bg_mainListChild(1).png" xy="0,0" size="1326,180">
@@ -28,7 +28,7 @@
       <gearDisplay controller="num" pages="1,2"/>
     </component>
     <group id="n29_q2iu" name="n29" xy="12,51" size="186,111"/>
-    <richtext id="n2_in3i" name="game_type" xy="205,13" size="1075,64" group="n30_q2iu" font="ui://27vd145bh35o7ika" fontSize="48" color="#474747" leading="0" autoSize="none" text="（抚州麻将）123123456">
+    <richtext id="n2_in3i" name="game_type" xy="205,13" size="938,64" group="n30_q2iu" font="ui://27vd145bh35o7ika" fontSize="48" color="#474747" leading="0" autoSize="none" text="（抚州麻将）123123456">
       <relation target="" sidePair="width-width"/>
     </richtext>
     <text id="n3_in3i" name="n3" xy="244,71" size="115,49" group="n30_q2iu" font="ui://27vd145bh35o7il2" fontSize="36" color="#474747" leading="0" autoSize="none" text="玩法：12316"/>

wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Comp_FZTips.xml

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="2266,161">
+<component size="2266,202">
   <displayList>
-    <list id="n0_nee3" name="list" xy="0,0" size="2266,161" layout="row" overflow="scroll" scroll="horizontal" colGap="36" defaultItem="ui://v0j9abjynee3119" align="right" renderOrder="descent" autoClearItems="true">
-      <item/>
-      <item/>
-      <item/>
+    <list id="n0_nee3" name="list" xy="1,0" size="2266,202" layout="row" overflow="hidden" scroll="horizontal" colGap="16" defaultItem="ui://v0j9abjynee3119" autoItemSize="false" align="right" renderOrder="descent" autoClearItems="true">
+      <relation target="" sidePair="width-width,height-height"/>
       <item/>
       <item/>
       <item/>

wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_Tips.xml

@@ -1,37 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="384,161" extention="Button">
+<component size="499,202" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="type" pages="0,过,1,吃,2,碰,3,杠,4,胡" selected="4"/>
+  <controller name="type" pages="0,过,1,吃,2,碰,3,杠,4,胡" selected="0"/>
   <displayList>
-    <image id="n3_nee3" name="n3" src="nee3118" fileName="Main_new/FZTips/Image/Group 236.png" xy="0,0">
+    <image id="n3_nee3" name="n3" src="nee3118" fileName="Main_new/FZTips/Image/Group 236.png" xy="0,0" size="499,202">
       <gearDisplay controller="type" pages="0"/>
     </image>
-    <image id="n4_nee3" name="n4" src="nee3112" fileName="Main_new/FZTips/Image/blue.png" xy="0,0">
+    <image id="n4_nee3" name="n4" src="nee3112" fileName="Main_new/FZTips/Image/blue.png" xy="0,0" size="499,202">
       <gearDisplay controller="type" pages="1,2,3,4"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n5_nee3" name="n5" src="nee3113" fileName="Main_new/FZTips/Image/chi.png" xy="52,30">
+    <image id="n5_nee3" name="n5" src="nee3113" fileName="Main_new/FZTips/Image/chi.png" xy="50,45" size="119,112">
       <gearDisplay controller="type" pages="1"/>
     </image>
-    <image id="n6_nee3" name="n6" src="nee3116" fileName="Main_new/FZTips/Image/peng.png" xy="52,31">
+    <image id="n6_nee3" name="n6" src="nee3116" fileName="Main_new/FZTips/Image/peng.png" xy="50,45" size="119,112">
       <gearDisplay controller="type" pages="2"/>
     </image>
-    <image id="n7_nee3" name="n7" src="nee3115" fileName="Main_new/FZTips/Image/hu.png" xy="81,29">
+    <image id="n7_nee3" name="n7" src="nee3115" fileName="Main_new/FZTips/Image/hu.png" xy="96,41" size="119,112">
       <gearDisplay controller="type" pages="4"/>
     </image>
-    <image id="n8_nee3" name="n8" src="nee3114" fileName="Main_new/FZTips/Image/gang.png" xy="52,32">
+    <image id="n8_nee3" name="n8" src="nee3114" fileName="Main_new/FZTips/Image/gang.png" xy="50,45" size="119,112">
       <gearDisplay controller="type" pages="3"/>
     </image>
-    <component id="n9_nee3" name="btn_Card1" src="nee311a" fileName="Main_new/FZTips/Component/btn_FZCard.xml" xy="221,52">
+    <component id="n9_nee3" name="btn_Card1" src="nee311a" fileName="Main_new/FZTips/Component/btn_FZCard.xml" xy="162,37" size="87,87">
       <gearDisplay controller="type" pages="1,2,3,4"/>
-      <gearXY controller="type" pages="1,2,3,4" values="162,52|162,52|162,52|221,52" default="162,37"/>
+      <gearXY controller="type" pages="1,2,3,4" values="182,57|182,57|182,57|265,54" default="162,37"/>
     </component>
-    <component id="n10_nee3" name="btn_Card2" src="nee311a" fileName="Main_new/FZTips/Component/btn_FZCard.xml" xy="218,52">
+    <component id="n10_nee3" name="btn_Card2" src="nee311a" fileName="Main_new/FZTips/Component/btn_FZCard.xml" xy="265,57" size="87,87">
       <gearDisplay controller="type" pages="1,2,3"/>
     </component>
-    <component id="n11_nee3" name="btn_Card3" src="nee311a" fileName="Main_new/FZTips/Component/btn_FZCard.xml" xy="274,52">
+    <component id="n11_nee3" name="btn_Card3" src="nee311a" fileName="Main_new/FZTips/Component/btn_FZCard.xml" xy="348,57" size="87,87">
       <gearDisplay controller="type" pages="1,2,3"/>
     </component>
-    <component id="n12_nee3" name="btn_Card4" src="nee311a" fileName="Main_new/FZTips/Component/btn_FZCard.xml" xy="218,40">
+    <component id="n12_nee3" name="btn_Card4" src="nee311a" fileName="Main_new/FZTips/Component/btn_FZCard.xml" xy="265,42" size="87,87">
       <gearDisplay controller="type" pages="3"/>
     </component>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml

@@ -4,8 +4,8 @@
   <controller name="ting" pages="0,,1," selected="0"/>
   <controller name="site" pages="0,2-1,1,2-2" selected="0"/>
   <controller name="getCard" pages="0,,1," selected="1"/>
-  <controller name="seletedGetCard" pages="0,,1," selected="1"/>
-  <controller name="tip" pages="0,,1," selected="0"/>
+  <controller name="seletedGetCard" pages="0,,1," selected="0"/>
+  <controller name="tip" pages="0,,1," selected="1"/>
   <controller name="showGuoHu" pages="0,,1," selected="0"/>
   <displayList>
     <component id="n27" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-152,-1357" size="2022,111">
@@ -85,7 +85,7 @@
       <item/>
     </list>
     <graph id="n40_ckvb" name="area_allDown" xy="0,-283" size="1978,264" type="rect" lineSize="0" fillColor="#00ffffff"/>
-    <component id="n39_nee3" name="Comp_FZTips" src="nee311b" fileName="Main_new/FZTips/Comp_FZTips.xml" xy="-325,-170">
+    <component id="n39_nee3" name="Comp_FZTips" src="nee311b" fileName="Main_new/FZTips/Comp_FZTips.xml" xy="204,-285">
       <gearDisplay controller="tip" pages="1"/>
     </component>
     <image id="n41_kzuz" name="n41" src="kzuz142" fileName="Main_new/Main/Image/opt_hu_tips.png" xy="413,-137" size="1314,208" group="n48_kzuz" aspect="true"/>

wb_unity_pro/Assets/StreamingAssets/init2_1.json

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

wb_unity_pro/ProjectSettings/GraphicsSettings.asset

@@ -38,7 +38,6 @@ 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}