diff --git a/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua b/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua index b628c44d..93dfc4fb 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua @@ -127,6 +127,10 @@ end -- 新战绩推到时刷新一条 function FamilyChatRoom:OnNewChatRefalsh(arg) + if self.group == nil then + return + end + self.list_chat.numItems = #self.group.records or 0 --[[ diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index 271a2378..a9feb78e 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -737,7 +737,7 @@ function M:EventInit() _gamectr:AddEventListener(GameEvent.AddScore, handler(self, self.OnAddScoreAnimation)) - _gamectr:AddEventListener(GameEvent.MISSILE, handler(self, self.OnMissile)) + --_gamectr:AddEventListener(GameEvent.MISSILE, handler(self, self.OnMissile)) _gamectr:AddEventListener( GameEvent.DeskBreak, @@ -1083,6 +1083,7 @@ function M:OnAddScoreAnimation(...) end end +--[[ function M:OnMissile(...) local arg = {...} print("OnMissile 有人发表情了") @@ -1090,6 +1091,7 @@ function M:OnMissile(...) --self:Missile() end +]] function M:OnUpdateInfo(...) local arg = { ... } diff --git a/lua_probject/base_project/Game/View/PlayerInfoView.lua b/lua_probject/base_project/Game/View/PlayerInfoView.lua index b4fb878b..27127f53 100644 --- a/lua_probject/base_project/Game/View/PlayerInfoView.lua +++ b/lua_probject/base_project/Game/View/PlayerInfoView.lua @@ -400,7 +400,7 @@ function M:ScoreAnimation(score) self._list_scoreAnimation.xy = Rxy self.cScore.selectedIndex = 0 end) - self._list_scoreAnimation:TweenFade(0, 3):OnComplete(function() + self._list_scoreAnimation:TweenFade(0, 6):OnComplete(function() self._list_scoreAnimation:TweenFade(1, 0) end) end diff --git a/lua_probject/base_project/Game/View/PlayerInfoView2.lua b/lua_probject/base_project/Game/View/PlayerInfoView2.lua index 1ce5b86d..1c098418 100644 --- a/lua_probject/base_project/Game/View/PlayerInfoView2.lua +++ b/lua_probject/base_project/Game/View/PlayerInfoView2.lua @@ -399,7 +399,7 @@ function M:ScoreAnimation(score) self._list_scoreAnimation.xy = Rxy self.cScore.selectedIndex = 0 end) - self._list_scoreAnimation:TweenFade(0, 3):OnComplete(function() + self._list_scoreAnimation:TweenFade(0, 6):OnComplete(function() self._list_scoreAnimation:TweenFade(1, 0) end) end diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index 008b7264..4a36dea5 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -9,13 +9,6 @@ local SettingView = import(".EXSettingView") local PlayerInfoView = import(".EXPlayerInfoView") local M = {} - -local bg_config = { - { id = 1, url = "extend/majiang/fuzhou/bg/bg1", thumb = "ui://Extend_MJ_FuZhou/bg1" }, - { id = 2, url = "extend/majiang/fuzhou/bg/bg2", thumb = "ui://Extend_MJ_FuZhou/bg2" }, - { id = 3, url = "extend/majiang/fuzhou/bg/bg3", thumb = "ui://Extend_MJ_FuZhou/bg3" }, - { id = 4, url = "extend/majiang/fuzhou/bg/bg4", thumb = "ui://Extend_MJ_FuZhou/bg4" } -} --- Create a new ZZ_MainView function M.new() setmetatable(M, { __index = MJMainView }) @@ -31,19 +24,16 @@ function M:InitView(url) local room = self._room self._style = 1 self._gps_style = 1 - self._full = true + --self._full = true + self._scale = true UIPackage.AddPackage("extend/majiang/fuzhou/ui/Extend_MJ_FuZhou") -- if self._room.room_config.people_num == 2 then -- MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num) -- else -- MJMainView.InitView(self, "ui://Main_Majiang/Main_" .. room.room_config.people_num .. "_s2") -- end - local use_custom_bg = true MJMainView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num), - use_custom_bg, bg_config) - if use_custom_bg then - TableBG.LoadTableBG(1, self._room.game_id, self._root_view, bg_config) - end + true, nil) self._hu_tip = HuTipView.new(self) self.selectLaiziBtn = self._view:GetChild('selectlaizi') @@ -54,6 +44,7 @@ function M:InitView(url) self.Laizi2Btn.visible = true self.bugangnum = self._view:GetChild("bugangnum") + self.com_logocType.selectedIndex = 0 --lingmeng --[[ MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num) diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua index 5a89bed9..6ea7c562 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua @@ -10,11 +10,6 @@ local WitnessView = require("Game.View.WitnessView") local Record_Event = import(".RecordEvent") -local bg_config = { - { id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01" }, - { id = 2, url = "base/main_majiang/bg/bg2", thumb = "ui://Main_Majiang/b02" }, - { id = 3, url = "base/main_majiang/bg/bg3", thumb = "ui://Main_Majiang/b03" } -} local M = {} @@ -51,6 +46,7 @@ function M:InitView(url) BaseView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num)) self:EventInit() UpdateBeat:Add(self.OnUpdate, self) + WitnessView.InitView(self) local centerBox = self._view:GetChild("Comp_ConterBox") self._ctr_cardbox = centerBox:GetController("seat") @@ -60,13 +56,6 @@ function M:InitView(url) self._anchor = self._view:GetChild("mask_tips") ------------------渲染桌面信息-------------------------- - - local use_custom_bg = true - local default_bg = 1 - if use_custom_bg then - TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config) - end - local config = ExtendManager.GetExtendConfig(room.game_id) local mode = config:GetGameInfo() local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config)) @@ -102,15 +91,6 @@ function M:InitView(url) info._view.visible = true end - -------------按钮初始化------------------------------ - local changeTable = self._view:GetChild('btn_change') - if changeTable then - changeTable.onClick:Set(function() - default_bg = default_bg + 1 > #bg_config and 1 or default_bg + 1 - TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config) - end) - end - local btn_rule = self._view:GetChild('btn_rule') if btn_rule ~= nil then btn_rule.onClick:Set(function() diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index 3e1355ee..dd0c66f8 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -9,13 +9,6 @@ local SettingView = import(".EXSettingView") local PlayerInfoView = import(".EXPlayerInfoView") local M = {} - -local bg_config = { - { id = 1, url = "extend/majiang/jinxi/bg/bg1", thumb = "ui://Extend_MJ_JinXi/bg1" }, - { id = 2, url = "extend/majiang/jinxi/bg/bg2", thumb = "ui://Extend_MJ_JinXi/bg2" }, - { id = 3, url = "extend/majiang/jinxi/bg/bg3", thumb = "ui://Extend_MJ_JinXi/bg3" }, - { id = 4, url = "extend/majiang/jinxi/bg/bg4", thumb = "ui://Extend_MJ_JinXi/bg4" } -} --- Create a new ZZ_MainView function M.new() setmetatable(M, { __index = MJMainView }) @@ -40,7 +33,7 @@ function M:InitView(url) -- end local use_custom_bg = true MJMainView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num), - use_custom_bg, bg_config) + use_custom_bg, nil) self._hu_tip = HuTipView.new(self) self.selectLaiziBtn = self._view:GetChild('selectlaizi') @@ -51,6 +44,7 @@ function M:InitView(url) self.Laizi2Btn.visible = true self.bugangnum = self._view:GetChild("bugangnum") + self.com_logocType.selectedIndex = 3 --lingmeng --[[ MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num) diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua index 913755e2..2f24551d 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua @@ -10,12 +10,6 @@ local WitnessView = require("Game.View.WitnessView") local Record_Event = import(".RecordEvent") -local bg_config = { - { id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01" }, - { id = 2, url = "base/main_majiang/bg/bg2", thumb = "ui://Main_Majiang/b02" }, - { id = 3, url = "base/main_majiang/bg/bg3", thumb = "ui://Main_Majiang/b03" } -} - local M = {} --- Create a new @@ -51,6 +45,7 @@ function M:InitView(url) BaseView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num)) self:EventInit() UpdateBeat:Add(self.OnUpdate, self) + WitnessView.InitView(self) local centerBox = self._view:GetChild("Comp_ConterBox") self._ctr_cardbox = centerBox:GetController("seat") @@ -60,13 +55,6 @@ function M:InitView(url) self._anchor = self._view:GetChild("mask_tips") ------------------渲染桌面信息-------------------------- - - local use_custom_bg = true - local default_bg = 1 - if use_custom_bg then - TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config) - end - local config = ExtendManager.GetExtendConfig(room.game_id) local mode = config:GetGameInfo() local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config)) @@ -102,15 +90,6 @@ function M:InitView(url) info._view.visible = true end - -------------按钮初始化------------------------------ - local changeTable = self._view:GetChild('btn_change') - if changeTable then - changeTable.onClick:Set(function() - default_bg = default_bg + 1 > #bg_config and 1 or default_bg + 1 - TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config) - end) - end - local btn_rule = self._view:GetChild('btn_rule') if btn_rule ~= nil then btn_rule.onClick:Set(function() diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index 7f8f3a3b..92523e76 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -9,13 +9,6 @@ local SettingView = import(".EXSettingView") local PlayerInfoView = import(".EXPlayerInfoView") local M = {} - -local bg_config = { - { id = 1, url = "extend/majiang/lichuan/bg/bg1", thumb = "ui://Extend_MJ_LiChuan/bg1" }, - { id = 2, url = "extend/majiang/lichuan/bg/bg2", thumb = "ui://Extend_MJ_LiChuan/bg2" }, - { id = 3, url = "extend/majiang/lichuan/bg/bg3", thumb = "ui://Extend_MJ_LiChuan/bg3" }, - { id = 4, url = "extend/majiang/lichuan/bg/bg4", thumb = "ui://Extend_MJ_LiChuan/bg4" } -} --- Create a new ZZ_MainView function M.new() setmetatable(M, { __index = MJMainView }) @@ -38,9 +31,8 @@ function M:InitView(url) -- else -- MJMainView.InitView(self, "ui://Main_Majiang/Main_" .. room.room_config.people_num .. "_s2") -- end - local use_custom_bg = true MJMainView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num), - use_custom_bg, bg_config) + true, nil) self._hu_tip = HuTipView.new(self) self.selectLaiziBtn = self._view:GetChild('selectlaizi') @@ -51,6 +43,8 @@ function M:InitView(url) self.Laizi2Btn.visible = true self.bugangnum = self._view:GetChild("bugangnum") + self.com_logocType.selectedIndex = 2 + --lingmeng --[[ MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num) diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua index 339be809..2858a27c 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua @@ -11,12 +11,6 @@ local WitnessView = require("Game.View.WitnessView") local Record_Event = import(".RecordEvent") -local bg_config = { - { id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01" }, - { id = 2, url = "base/main_majiang/bg/bg2", thumb = "ui://Main_Majiang/b02" }, - { id = 3, url = "base/main_majiang/bg/bg3", thumb = "ui://Main_Majiang/b03" } -} - local M = {} --- Create a new @@ -52,6 +46,8 @@ function M:InitView(url) BaseView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num)) self:EventInit() UpdateBeat:Add(self.OnUpdate, self) + WitnessView.InitView(self) + local centerBox = self._view:GetChild("Comp_ConterBox") self._ctr_cardbox = centerBox:GetController("seat") @@ -61,13 +57,6 @@ function M:InitView(url) self._anchor = self._view:GetChild("mask_tips") ------------------渲染桌面信息-------------------------- - - local use_custom_bg = true - local default_bg = 1 - if use_custom_bg then - TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config) - end - local config = ExtendManager.GetExtendConfig(room.game_id) local mode = config:GetGameInfo() local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config)) @@ -103,15 +92,6 @@ function M:InitView(url) info._view.visible = true end - -------------按钮初始化------------------------------ - local changeTable = self._view:GetChild('btn_change') - if changeTable then - changeTable.onClick:Set(function() - default_bg = default_bg + 1 > #bg_config and 1 or default_bg + 1 - TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config) - end) - end - local btn_rule = self._view:GetChild('btn_rule') if btn_rule ~= nil then btn_rule.onClick:Set(function() diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index e8d9fabf..1da475b3 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -9,13 +9,6 @@ local SettingView = import(".EXSettingView") local PlayerInfoView = import(".EXPlayerInfoView") local M = {} - -local bg_config = { - { id = 1, url = "extend/majiang/nancheng/bg/bg1", thumb = "ui://Extend_MJ_NanCheng/bg1" }, - { id = 2, url = "extend/majiang/nancheng/bg/bg2", thumb = "ui://Extend_MJ_NanCheng/bg2" }, - { id = 3, url = "extend/majiang/nancheng/bg/bg3", thumb = "ui://Extend_MJ_NanCheng/bg3" }, - { id = 4, url = "extend/majiang/nancheng/bg/bg4", thumb = "ui://Extend_MJ_NanCheng/bg4" } -} --- Create a new ZZ_MainView function M.new() setmetatable(M, { __index = MJMainView }) @@ -38,12 +31,8 @@ function M:InitView(url) -- else -- MJMainView.InitView(self, "ui://Main_Majiang/Main_" .. room.room_config.people_num .. "_s2") -- end - local use_custom_bg = true MJMainView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num), - use_custom_bg, bg_config) - if use_custom_bg then - TableBG.LoadTableBG(1, self._room.game_id, self._root_view, bg_config) - end + true, nil) self._hu_tip = HuTipView.new(self) self.selectLaiziBtn = self._view:GetChild('selectlaizi') @@ -54,6 +43,7 @@ function M:InitView(url) self.Laizi2Btn.visible = true self.bugangnum = self._view:GetChild("bugangnum") + self.com_logocType.selectedIndex = 1 --lingmeng --[[ MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num) diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua index 43071c43..f54f5386 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua @@ -10,12 +10,6 @@ local WitnessView = require("Game.View.WitnessView") local Record_Event = import(".RecordEvent") -local bg_config = { - { id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01" }, - { id = 2, url = "base/main_majiang/bg/bg2", thumb = "ui://Main_Majiang/b02" }, - { id = 3, url = "base/main_majiang/bg/bg3", thumb = "ui://Main_Majiang/b03" } -} - local M = {} --- Create a new @@ -51,6 +45,7 @@ function M:InitView(url) BaseView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num)) self:EventInit() UpdateBeat:Add(self.OnUpdate, self) + WitnessView.InitView(self) local centerBox = self._view:GetChild("Comp_ConterBox") self._ctr_cardbox = centerBox:GetController("seat") @@ -60,13 +55,6 @@ function M:InitView(url) self._anchor = self._view:GetChild("mask_tips") ------------------渲染桌面信息-------------------------- - - local use_custom_bg = true - local default_bg = 1 - if use_custom_bg then - TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config) - end - local config = ExtendManager.GetExtendConfig(room.game_id) local mode = config:GetGameInfo() local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config)) @@ -102,15 +90,6 @@ function M:InitView(url) info._view.visible = true end - -------------按钮初始化------------------------------ - local changeTable = self._view:GetChild('btn_change') - if changeTable then - changeTable.onClick:Set(function() - default_bg = default_bg + 1 > #bg_config and 1 or default_bg + 1 - TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config) - end) - end - local btn_rule = self._view:GetChild('btn_rule') if btn_rule ~= nil then btn_rule.onClick:Set(function() diff --git a/lua_probject/main_project/main/majiang/MJCheckG.lua b/lua_probject/main_project/main/majiang/MJCheckG.lua index f1ef2894..39d87ee6 100644 --- a/lua_probject/main_project/main/majiang/MJCheckG.lua +++ b/lua_probject/main_project/main/majiang/MJCheckG.lua @@ -29,11 +29,17 @@ function M:init(url) self.coroutine = coroutine.start(function(...) self.valueTemp = 0 while self.valueTemp < 100 do + + -- 让他在72的时候卡顿一下 + if self.valueTemp > 72 and self.valueTemp < 80 then + + end + self.valueTemp = self.valueTemp + math.random(4) self.silder.value = self.valueTemp coroutine.wait(0.1) end - showText.text = "检测完成，没有外挂痕迹" + showText.text = "检测完毕,环境安全" coroutine.wait(2) self:Destroy() end) diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua index ae6c992a..6f13c223 100644 --- a/lua_probject/main_project/main/majiang/MJMainView.lua +++ b/lua_probject/main_project/main/majiang/MJMainView.lua @@ -57,6 +57,8 @@ function M:InitView(url, use_custom_bg, custom_bg_config) self._ctr_cardbox = centerBox:GetController("seat") self._tex_leftTime = centerBox:GetChild("Text_Time") + self.com_logocType = _view:GetChild("com_logo"):GetController("cType") + if self._room.card_type == 2 then self:Change3d(true) else diff --git a/lua_probject/main_project/main/poker/PKCheckG.lua b/lua_probject/main_project/main/poker/PKCheckG.lua index 2515d753..369b9b75 100644 --- a/lua_probject/main_project/main/poker/PKCheckG.lua +++ b/lua_probject/main_project/main/poker/PKCheckG.lua @@ -33,7 +33,7 @@ function M:init(url) self.silder.value = self.valueTemp coroutine.wait(0.1) end - showText.text = "检测完成，没有外挂痕迹" + showText.text = "检测完毕,环境安全" coroutine.wait(2) self:Destroy() end) diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml index aea2ba52..dc75b0fa 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml @@ -1,12 +1,12 @@ - + - + @@ -88,15 +88,15 @@ - - + + - +