From 542dc157bed6fdcd721659cf36a42f7d4a73536c Mon Sep 17 00:00:00 2001 From: 1076390229 <1076390229@qq.com> Date: Fri, 1 Aug 2025 21:13:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E8=BF=9E=E4=BF=AE=E5=A4=8D=EF=BC=8C?= =?UTF-8?q?=E5=8A=A8=E7=94=BB=E8=B0=83=E6=95=B4=EF=BC=8C=E5=B0=8F=E4=B8=89?= =?UTF-8?q?=E8=A7=92=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Controller/LoddyController.lua | 1 + .../base_project/Game/View/LobbyView.lua | 13 +++- .../base_project/Game/View/MainView.lua | 2 +- .../base_project/Game/View/PlayerInfoView.lua | 6 +- .../Game/View/PlayerInfoView2.lua | 6 +- wb_new_ui/assets/Common/MessageBox.xml | 16 ++--- wb_new_ui/assets/Common/MessageBox1.xml | 10 +-- .../component/dismiss_room/dismiss_room.xml | 4 +- .../Clearing/Component/Btn_Card_Hu.xml | 8 +-- .../Main_new/FZTips/Component/btn_FZCard.xml | 4 +- .../Main_new_2/Component/Comp_2_OutCard.xml | 3 +- .../component/ani/Ani_play_bj.xml | 9 +-- wb_new_ui/assets/Main_Majiang/package.xml | 3 + wb_new_ui/assets/dongxiao/package.xml | 1 - .../ART/base/common/ui/Common_fui.bytes | Bin 346621 -> 346917 bytes .../main_majiang/ui/Main_Majiang_atlas0.png | Bin 2590626 -> 2434719 bytes .../main_majiang/ui/Main_Majiang_atlas0_1.png | Bin 4980042 -> 4718287 bytes .../main_majiang/ui/Main_Majiang_atlas0_2.png | Bin 3590628 -> 3534598 bytes .../main_majiang/ui/Main_Majiang_atlas0_4.png | Bin 1476615 -> 1581365 bytes .../main_majiang/ui/Main_Majiang_fui.bytes | Bin 380197 -> 380222 bytes .../Assets/StreamingAssets/init2_1.json | 60 +++++++++--------- .../ProjectSettings/GraphicsSettings.asset | 1 - 22 files changed, 78 insertions(+), 69 deletions(-) diff --git a/lua_probject/base_project/Game/Controller/LoddyController.lua b/lua_probject/base_project/Game/Controller/LoddyController.lua index 35c5432f..f15cbbf3 100644 --- a/lua_probject/base_project/Game/Controller/LoddyController.lua +++ b/lua_probject/base_project/Game/Controller/LoddyController.lua @@ -261,6 +261,7 @@ function M:UpdatePlayerInfo(callback) if res.ReturnCode == 0 then DataManager.SelfUser.diamo = res.Data.diamo DataManager.SelfUser.invited = res.Data.invitation + DataManager.SelfUser.group_id = res.Data.groupId if callback then callback(true, res.Data) end -- DataManager.SelfUser.raffle = res.Data.raffle else diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua index a43517de..bf56031b 100644 --- a/lua_probject/base_project/Game/View/LobbyView.lua +++ b/lua_probject/base_project/Game/View/LobbyView.lua @@ -448,19 +448,19 @@ function M:Show() ViewUtil.PlaySoundBg() UpdateBeat:Add(self.OnUpdate, self) + -- 旧重连 + --[[ -- 如果在圈子内的房间，显示tip local user = DataManager.SelfUser local tem = user.notices if user.group_id ~= 0 then self:ReconnectRoom(user.group_id) - --[[ local msg_tip = MsgWindow.new(self._root_view, "还在圈子的房间中，现在重连吗？", MsgWindow.MsgMode.OkAndCancel) msg_tip.onOk:Add(function() self:ReconnectRoom(user.group_id) end) msg_tip:Show() tem.auto_show = false - ]] else local lobbyCtr1 = ControllerManager.GetController(LoddyController) lobbyCtr1:UpdateNotice(DataManager.SelfUser.account_id, function(result, data) @@ -472,9 +472,10 @@ function M:Show() end end) end + ]] local loddyCtr1 = ControllerManager.GetController(LoddyController) - self:GetPlayerInfoData() + --self:GetPlayerInfoData() -- 获取GPS坐标 if not DataManager.SelfUser.location or DataManager.SelfUser.location:Location2String() == "" then @@ -484,6 +485,8 @@ function M:Show() if self.groupMainView and self.groupMainView._groupInfoView then self.groupMainView._groupInfoView:hidePipei() end + + self:GetPlayerInfoData() end function M:GetPlayerInfoData() @@ -491,6 +494,10 @@ function M:GetPlayerInfoData() loddyCtr1:UpdatePlayerInfo(function(result, data) if result then self:ShowPlayerInfo(data.raffle, data.diamo, data.newMail) + if data.group_id ~= 0 then + -- 重连 + self:ReconnectRoom(data.groupId) + end end end) end diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index 3c4a60a5..9b447788 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -39,7 +39,7 @@ end local function LoadClickData() local json_data = Utils.LoadLocalFile("clickMode") - if json_data == "null" then + if json_data == nil or json_data == "null" then return "double" end diff --git a/lua_probject/base_project/Game/View/PlayerInfoView.lua b/lua_probject/base_project/Game/View/PlayerInfoView.lua index 27127f53..a7aa1a08 100644 --- a/lua_probject/base_project/Game/View/PlayerInfoView.lua +++ b/lua_probject/base_project/Game/View/PlayerInfoView.lua @@ -399,9 +399,9 @@ function M:ScoreAnimation(score) ), 2):OnComplete(function() self._list_scoreAnimation.xy = Rxy self.cScore.selectedIndex = 0 - end) - self._list_scoreAnimation:TweenFade(0, 6):OnComplete(function() - self._list_scoreAnimation:TweenFade(1, 0) + self._list_scoreAnimation:TweenFade(0, 4):OnComplete(function() + self._list_scoreAnimation:TweenFade(1, 1) + end) end) end diff --git a/lua_probject/base_project/Game/View/PlayerInfoView2.lua b/lua_probject/base_project/Game/View/PlayerInfoView2.lua index 1c098418..9fe6b418 100644 --- a/lua_probject/base_project/Game/View/PlayerInfoView2.lua +++ b/lua_probject/base_project/Game/View/PlayerInfoView2.lua @@ -398,9 +398,9 @@ function M:ScoreAnimation(score) ), 2):OnComplete(function() self._list_scoreAnimation.xy = Rxy self.cScore.selectedIndex = 0 - end) - self._list_scoreAnimation:TweenFade(0, 6):OnComplete(function() - self._list_scoreAnimation:TweenFade(1, 0) + self._list_scoreAnimation:TweenFade(0, 4):OnComplete(function() + self._list_scoreAnimation:TweenFade(1, 1) + end) end) end diff --git a/wb_new_ui/assets/Common/MessageBox.xml b/wb_new_ui/assets/Common/MessageBox.xml index 2c901566..7e40ef9d 100644 --- a/wb_new_ui/assets/Common/MessageBox.xml +++ b/wb_new_ui/assets/Common/MessageBox.xml @@ -1,20 +1,20 @@ - + - - + + - - +