From e3b7a3b0aa7e95d3d9cc7c777274a3f8d69c19e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Fri, 4 Jul 2025 23:46:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=80=E4=BA=9B=E5=B0=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/View/Family/FamilyNumberRecord.lua | 2 ++ .../Game/View/PlayerInfoView2.lua | 2 +- .../extend/majiang/fuzhou/EXMainView.lua | 10 +++--- .../extend/majiang/jinxi/EXMainView.lua | 8 ++--- .../extend/majiang/lichuan/EXMainView.lua | 8 ++--- .../extend/majiang/nancheng/EXMainView.lua | 10 +++--- .../Family/Main/Component/btn_familyName.xml | 2 +- .../Family/NumberRecord/comp_numberRecord.xml | 29 +++++++++++------- .../Main_new/Main/PlayerHead_1.xml | 4 +-- .../Main_new_2/Player_card_info_2_1.xml | 4 +-- .../ART/base/Family/ui/Family_fui.bytes | Bin 112807 -> 112863 bytes .../Plugins/Android/AndroidManifest.xml | 14 ++++----- .../Assets/Plugins/Android/network.jar | Bin 16805 -> 16741 bytes .../Assets/Scripts/Platform/WXData.cs | 4 +-- .../ProjectSettings/ProjectSettings.asset | 17 +++++----- 15 files changed, 61 insertions(+), 53 deletions(-) diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua index d998572b..8b5c1b2d 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua @@ -21,6 +21,7 @@ function FamilyNumberRecord.New(root, page) self._data_minPage = page - 1 local group_id = self.group_id + local group = DataManager.groups:get(group_id) local MJScore = 0 local PKScore = 0 local fgCtr = ControllerManager.GetController(NewGroupController) @@ -58,6 +59,7 @@ function FamilyNumberRecord.New(root, page) self._viewText_titleRecord.text = string.format("%s 成员记录", self._text_groupTitle) self._view:GetChild('text_residueDiamond').text = root._group.diamo self._view:GetChild('text_timeRecord').text = os.date('%Y-%m-%d %H:%M:%S', os.time()) + self._view:GetController('lev').selectedIndex = group.lev == 1 and 0 or 1 self:InitTimeAndSord() self:NumverRecordRenderer(group_id) diff --git a/lua_probject/base_project/Game/View/PlayerInfoView2.lua b/lua_probject/base_project/Game/View/PlayerInfoView2.lua index 24937130..6a8d6a99 100644 --- a/lua_probject/base_project/Game/View/PlayerInfoView2.lua +++ b/lua_probject/base_project/Game/View/PlayerInfoView2.lua @@ -36,7 +36,7 @@ function M:init() local view = self._view UIPackage.AddPackage('base/chat/ui/Chat') self._tex_player_name = view:GetChild('name') - self._tex_score = view:GetChild('text_score') + self._tex_score = view:GetChild('text_jifen') self._biaoqing = view:GetChild('face') self._chat = view:GetChild('chat') diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index 3a8a81db..cc7f362b 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -354,7 +354,7 @@ function M:EventInit() local index = self:GetPos(win_seat) local info = self._player_card_info[index] self:RemoveCursor() - info:UpdateHandCard(false, true) + info:UpdateHandCard(false, false) local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi") obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card @@ -488,17 +488,17 @@ function M:EventInit() card_info:Clear() card_info:ResetCardType() if _room:checkHpNonnegative() then - p.cur_hp = data[i].hp_info.cur_hp + p.cur_hp = data[i].total_score end -- info:UpdateScore() info._view:GetChild("zhanji").visible = true - local num = data[i].hp_info.total_hp + local num = data[i].total_score if num >= 0 then info._view:GetController("text_color").selectedIndex = 0 - info._view:GetChild("text_jifen").text = "+" .. d2ad(num) + info._view:GetChild("text_jifen").text = "+" .. num else info._view:GetController("text_color").selectedIndex = 1 - info._view:GetChild("text_jifen").text = d2ad(num) + info._view:GetChild("text_jifen").text = num end info._view:GetChild("mask_piao").title = "" diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index ea0dce78..0f2848d8 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -485,17 +485,17 @@ function M:EventInit() card_info:Clear() card_info:ResetCardType() if _room:checkHpNonnegative() then - p.cur_hp = data[i].hp_info.cur_hp + p.cur_hp = data[i].total_score end -- info:UpdateScore() info._view:GetChild("zhanji").visible = true - local num = data[i].hp_info.total_hp + local num = data[i].total_score if num >= 0 then info._view:GetController("text_color").selectedIndex = 0 - info._view:GetChild("text_jifen").text = "+" .. d2ad(num) + info._view:GetChild("text_jifen").text = "+" .. num else info._view:GetController("text_color").selectedIndex = 1 - info._view:GetChild("text_jifen").text = d2ad(num) + info._view:GetChild("text_jifen").text = num end info._view:GetChild("mask_piao").title = "" diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index bb29558b..a7e42722 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -490,17 +490,17 @@ function M:EventInit() card_info:Clear() card_info:ResetCardType() if _room:checkHpNonnegative() then - p.cur_hp = data[i].hp_info.cur_hp + p.cur_hp = data[i].total_score end -- info:UpdateScore() info._view:GetChild("zhanji").visible = true - local num = data[i].hp_info.total_hp + local num = data[i].total_score if num >= 0 then info._view:GetController("text_color").selectedIndex = 0 - info._view:GetChild("text_jifen").text = "+" .. d2ad(num) + info._view:GetChild("text_jifen").text = "+" .. num else info._view:GetController("text_color").selectedIndex = 1 - info._view:GetChild("text_jifen").text = d2ad(num) + info._view:GetChild("text_jifen").text = num end info._view:GetChild("mask_piao").title = "" diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index 115c3171..215c6ee7 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -353,7 +353,7 @@ function M:EventInit() local index = self:GetPos(win_seat) local info = self._player_card_info[index] self:RemoveCursor() - info:UpdateHandCard(false, true) + info:UpdateHandCard(false, false) local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi") obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card @@ -490,17 +490,17 @@ function M:EventInit() card_info:Clear() card_info:ResetCardType() if _room:checkHpNonnegative() then - p.cur_hp = data[i].hp_info.cur_hp + p.cur_hp = data[i].total_score end -- info:UpdateScore() info._view:GetChild("zhanji").visible = true - local num = data[i].hp_info.total_hp + local num = data[i].total_score if num >= 0 then info._view:GetController("text_color").selectedIndex = 0 - info._view:GetChild("text_jifen").text = "+" .. d2ad(num) + info._view:GetChild("text_jifen").text = "+" .. num else info._view:GetController("text_color").selectedIndex = 1 - info._view:GetChild("text_jifen").text = d2ad(num) + info._view:GetChild("text_jifen").text = num end info._view:GetChild("mask_piao").title = "" diff --git a/wb_new_ui/assets/Family/Main/Component/btn_familyName.xml b/wb_new_ui/assets/Family/Main/Component/btn_familyName.xml index 68a31c5f..088a08d9 100644 --- a/wb_new_ui/assets/Family/Main/Component/btn_familyName.xml +++ b/wb_new_ui/assets/Family/Main/Component/btn_familyName.xml @@ -8,7 +8,7 @@ - + diff --git a/wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml b/wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml index 08738a41..1cd8064e 100644 --- a/wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml +++ b/wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml @@ -1,10 +1,11 @@ - + + @@ -41,7 +42,7 @@ - + @@ -67,29 +68,29 @@ - + - + - + - + - + - + @@ -142,9 +143,15 @@ - - - + + + + + + + + + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml index a8b2232a..3898d748 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml @@ -1,7 +1,7 @@ - + @@ -64,7 +64,7 @@ - + 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 9a43fd86..5cf3237b 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 @@ -24,12 +24,12 @@ - + - + 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 7477c898db6fffcb9b944ca7643e74aa0f1ae876..cbc1cbe1598c92375076b965752ec8315f79e720 100644 GIT binary patch delta 279 zcmZ4fk?sCRwh1!^JHCFZi{}>quuuK9fkO}1g zsZ#=CeIULH6tM?l2Otgx@}U5(9LQ&zuFb*NJz4fB7o*AcZPTCoYlP#?N?= zg>k`j0YOH&=?{b%gBUA8Z29RyB8;;bpF-F?qKtt^YP6;=6J^wZDSRgiSGawJ7~@aY z>8>`6Len?PFdA|(G63Dl%D@P;-o}PedisBCg5I)>hTI6143qiK%Wa=6%g8eu01%x! AF8}}l delta 233 zcmccrk!|@$wh1!^JHCFZi{}>quuuK9fkdfs8 zsZ#=CeIVWq6k!KqprDNO^aeFXF-F$u+8m7C+b?i18n7|OY-i+Wyv4#eZ@PdGqulgg z!i+(T#UQr)^c)e!S&T0rY&B8FKqNI<(+`L;YQPk7h`|+ZKP1NZlXZHSHly(Lb25wu h(?3Wva!$^=Av9fCmeCNwtAz8!&x>upEX&9<8vrW0JXHVy diff --git a/wb_unity_pro/Assets/Plugins/Android/AndroidManifest.xml b/wb_unity_pro/Assets/Plugins/Android/AndroidManifest.xml index 896e1420..26c3e69a 100644 --- a/wb_unity_pro/Assets/Plugins/Android/AndroidManifest.xml +++ b/wb_unity_pro/Assets/Plugins/Android/AndroidManifest.xml @@ -1,7 +1,7 @@ @@ -23,7 +23,7 @@ android:label="@string/app_name" android:theme="@style/UnityThemeSelector"> - - + + _hY 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 delta 13458 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 HC*c19n|6;$ diff --git a/wb_unity_pro/Assets/Scripts/Platform/WXData.cs b/wb_unity_pro/Assets/Scripts/Platform/WXData.cs index 478ed75a..28f722eb 100644 --- a/wb_unity_pro/Assets/Scripts/Platform/WXData.cs +++ b/wb_unity_pro/Assets/Scripts/Platform/WXData.cs @@ -4,8 +4,8 @@ using System.Collections; public static class WXData { - const string _appId = "wx553b84f33be7a1ee"; - const string _appSecret = "20f00273fe7af898660d63b733ed40fd"; + const string _appId = "wx00fe2d6c438ecd58"; + const string _appSecret = "8dd119676c2aa0f96ae15633a2423afb"; static string _accessToken; static string _refreshToken; static string _openid; diff --git a/wb_unity_pro/ProjectSettings/ProjectSettings.asset b/wb_unity_pro/ProjectSettings/ProjectSettings.asset index 5c97b4dd..e071ce3f 100644 --- a/wb_unity_pro/ProjectSettings/ProjectSettings.asset +++ b/wb_unity_pro/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: sanmunbalone - productName: "\u6C5F\u897Falone" + companyName: qyhy + productName: "\u68CB\u6E90\u4E92\u5A31" defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1} @@ -42,8 +42,7 @@ PlayerSettings: m_SplashScreenLogos: - logo: {fileID: 0} duration: 2 - m_VirtualRealitySplashScreen: {fileID: 2800000, guid: dda4728053c74c04cade51d6daf2f62f, - type: 3} + m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 560 defaultScreenHeight: 315 @@ -171,7 +170,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.lbgame.sanmunb + Android: com.jxgame.qyhy Standalone: unity.dy.qp0101 Tizen: com.dangdanggame.csyx5 iPhone: com.lbgame.sanmu @@ -179,8 +178,8 @@ PlayerSettings: buildNumber: iPhone: 1 AndroidBundleVersionCode: 12 - AndroidMinSdkVersion: 19 - AndroidTargetSdkVersion: 30 + AndroidMinSdkVersion: 29 + AndroidTargetSdkVersion: 29 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 0 @@ -254,7 +253,7 @@ PlayerSettings: templateDefaultScene: AndroidTargetArchitectures: 1 AndroidSplashScreenScale: 2 - androidSplashScreen: {fileID: 2800000, guid: c9916e46801228c468d9f8ab835ea725, type: 3} + androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: smn.keystore' AndroidKeyaliasName: smn AndroidBuildApkPerCpuArchitecture: 0 @@ -788,7 +787,7 @@ PlayerSettings: platformArchitecture: iPhone: 1 scriptingBackend: - Android: 0 + Android: 1 Standalone: 1 iPhone: 1 il2cppCompilerConfiguration: {}