diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index ee41e2e4..7320ac08 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/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 diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index 8b4d6d8a..22da8435 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/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 diff --git a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua index b559b8c4..9fde4c26 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua +++ b/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 diff --git a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua index 288cbf44..c5d62174 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua +++ b/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 diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 6fe99888..6c04f8d5 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/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 @@ -348,7 +352,7 @@ end function M:ReflashMember() local list_familyNumber = self._view:GetChild('list_familyNumber') if list_familyNumber.itemRenderer == nil then - + end if list_familyNumber.numItems == #self._group.members then @@ -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) @@ -640,9 +644,9 @@ function M:UpdateFamilyRoom(fgCtr, id) pt(roomList) --list_room.numItems = all_num - if list_room.numItems == all_num then + if list_room.numItems == all_num then list_room:RefreshVirtualList() - else + else list_room.numItems = all_num end end @@ -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 diff --git a/lua_probject/base_project/Game/View/SettingView.lua b/lua_probject/base_project/Game/View/SettingView.lua index fe1c12d5..1a97ec85 100644 --- a/lua_probject/base_project/Game/View/SettingView.lua +++ b/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 diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index e049fb07..df128298 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/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') diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXSettingView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXSettingView.lua index 51905481..ecd0d58c 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXSettingView.lua +++ b/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 diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua index bedbc9db..15ae7317 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua +++ b/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) diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index 35298d5f..954568a9 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/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') diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua index 194ca7bb..1ddf40e1 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua +++ b/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() diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index f247fb47..591ac8b2 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/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') diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua index 0b55b989..a91ca3ba 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua +++ b/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() diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index 573aeb17..722e5cfc 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/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') diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua index 7591cc12..3c0ec713 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua +++ b/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() diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua index 7e930f74..0f1255ac 100644 --- a/lua_probject/main_project/main/majiang/MJMainView.lua +++ b/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() diff --git a/lua_probject/main_project/main/majiang/MJSettingViewNew.lua b/lua_probject/main_project/main/majiang/MJSettingViewNew.lua index 4e455f6f..b84a9845 100644 --- a/lua_probject/main_project/main/majiang/MJSettingViewNew.lua +++ b/lua_probject/main_project/main/majiang/MJSettingViewNew.lua @@ -1,22 +1,50 @@ local SettingView = require("Game.View.SettingView") local TableBG = require("Game.Data.TableBG") local MJSettingViewNew = { - -- 修改牌 - onUpdataCardCallback = nil + -- 修改牌 + onUpdataCardCallback = nil } 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) - setmetatable(SettingView, {__index = BaseWindow}) - setmetatable(M, {__index = SettingView}) - local self = setmetatable({}, {__index = M}) +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.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,45 +53,80 @@ 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) + + 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.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.slider_sound.onChanged:Add(function() + -- GameApplication.Instance.SoundValue = slider_sound.value + -- btn_sound.selected = false + -- GameApplication.Instance.SoundMute = false; + end) + + 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() - SettingView.init(self, url) - - - 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) + 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 - self:Destroy() - 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() - 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) + 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() return TableBG.GetBGConfig() @@ -98,7 +161,7 @@ function M:Change3d(mode,oldCardType) item.onClick:Call(); break end - end + end end local bg_id = self._view:GetController("bg").selectedIndex + 1 @@ -162,8 +225,8 @@ function M:Show() ctr_card.selectedIndex=ctr_cardIndex - local list_cardtype = DataManager.CardTypeList - if DataManager.CurrenRoom then + local list_cardtype = DataManager.CardTypeList + if DataManager.CurrenRoom then list_cardtype[game_id] = ctr_cardIndex Utils.SaveLocalFile("CardTypeData",json.encode(list_cardtype)) end @@ -178,10 +241,10 @@ function M:Show() self.onChangeCardCallback() local cardtype = ctr_card.selectedIndex - local list_cardtype = DataManager.CardTypeList - if DataManager.CurrenRoom then + local list_cardtype = DataManager.CardTypeList + if DataManager.CurrenRoom then local game_id = tostring(DataManager.CurrenRoom.game_id) - if not list_cardtype[game_id] or list_cardtype[game_id] ~= cardtype then + if not list_cardtype[game_id] or list_cardtype[game_id] ~= cardtype then list_cardtype[game_id] = cardtype Utils.SaveLocalFile("CardTypeData",json.encode(list_cardtype)) end @@ -216,10 +279,10 @@ function M:Change3DMode() DataManager.CurrenRoom.card_type = 2 - local list_cardtype = DataManager.CardTypeList - if DataManager.CurrenRoom then + local list_cardtype = DataManager.CardTypeList + if DataManager.CurrenRoom then local game_id = tostring(DataManager.CurrenRoom.game_id) - if not list_cardtype[game_id] or list_cardtype[game_id] ~= cardtype then + if not list_cardtype[game_id] or list_cardtype[game_id] ~= cardtype then list_cardtype[game_id] = cardtype Utils.SaveLocalFile("CardTypeData",json.encode(list_cardtype)) end @@ -235,4 +298,6 @@ function M:UpdateIndex() ctr_card.selectedIndex = room.card_type end -return M \ No newline at end of file +]] + +return M diff --git a/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml b/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml index 4b54b4a5..7a02226e 100644 --- a/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml +++ b/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Comp_FZTips.xml b/wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Comp_FZTips.xml index f650accf..bef156fb 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Comp_FZTips.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Comp_FZTips.xml @@ -1,10 +1,8 @@ - + - - - - + + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_Tips.xml b/wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_Tips.xml index afe1560c..4d5a62db 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_Tips.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_Tips.xml @@ -1,37 +1,38 @@ - + - + - + - + + - + - + - + - + - + - + - + - + - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml index bac0f8f3..05b5638e 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml @@ -4,8 +4,8 @@ - - + + @@ -85,7 +85,7 @@ - + diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes index bf95f433..0aa9e2f9 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes index 66b44090..a73760c8 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json index af385fff..ab54858e 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init2_1.json +++ b/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" } ] diff --git a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset index ad8f23e5..4f4dac17 100644 --- a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset +++ b/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}