From a0567af52210bd3f719e1657acef461b9fff2731 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Thu, 12 Jun 2025 21:56:00 +0800 Subject: [PATCH] 1 --- .../AssetRaw/UI/UIGameWorldRankForm.prefab | 137 ++++++++++++++---- .../HotFix/GameLogic/UI/UIGameBattle.cs | 8 +- .../GameLogic/UI/UIGameWorldRankItem.cs | 1 + 3 files changed, 112 insertions(+), 34 deletions(-) diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameWorldRankForm.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameWorldRankForm.prefab index 7a4592e6..469559d5 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameWorldRankForm.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameWorldRankForm.prefab @@ -200,9 +200,9 @@ RectTransform: - {fileID: 8023940097793488118} m_Father: {fileID: 6481773459769904457} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140.665, y: -108.1915} m_SizeDelta: {x: 281.33, y: 65.461} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &200501205009473746 @@ -327,9 +327,9 @@ RectTransform: - {fileID: 2792281987871447315} m_Father: {fileID: 6615650786298566649} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140.665, y: -32.7305} m_SizeDelta: {x: 281.33, y: 65.461} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &276719536655800209 @@ -2140,6 +2140,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 +--- !u!1 &1601097740390366305 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8545423246230004880} + - component: {fileID: 7054625827861606009} + - component: {fileID: 8191932196071112556} + m_Layer: 5 + m_Name: Img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8545423246230004880 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1601097740390366305} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 826311576916127066} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 353, y: 18.5} + m_SizeDelta: {x: 70, y: 66} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7054625827861606009 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1601097740390366305} + m_CullTransparentMesh: 1 +--- !u!114 &8191932196071112556 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1601097740390366305} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 317f03ce55a5b864ab0236b58931c088, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1614872208064592998 GameObject: m_ObjectHideFlags: 0 @@ -2312,6 +2387,7 @@ RectTransform: - {fileID: 2669978239474154758} - {fileID: 8582991567433281135} - {fileID: 1290729932463348030} + - {fileID: 8545423246230004880} m_Father: {fileID: 2437165979603071288} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -2351,6 +2427,7 @@ MonoBehaviour: m_Score: {fileID: 6758929203519133182} m_GongXian: {fileID: 7943501947076435089} m_RankInde: {fileID: 1897737020224266078} + Img: {fileID: 8191932196071112556} --- !u!1 &1681518453653186886 GameObject: m_ObjectHideFlags: 0 @@ -4342,14 +4419,14 @@ RectTransform: m_GameObject: {fileID: 3491758741529285161} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_LocalScale: {x: 1.022655, y: 1.022655, z: 1.022655} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 826311576916127066} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 349.04184, y: 1} + m_AnchoredPosition: {x: 355, y: -31.9} m_SizeDelta: {x: 107.9163, y: 39.4938} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &442681237643629642 @@ -4903,9 +4980,9 @@ RectTransform: - {fileID: 9030882274381824097} m_Father: {fileID: 3876095348166231963} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140.665, y: -108.1915} m_SizeDelta: {x: 281.33, y: 65.461} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3667215415194037700 @@ -6090,9 +6167,9 @@ RectTransform: - {fileID: 1433038476311377606} m_Father: {fileID: 6615650786298566649} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140.665, y: -108.1915} m_SizeDelta: {x: 281.33, y: 65.461} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4477962257020829267 @@ -6682,9 +6759,9 @@ RectTransform: - {fileID: 3077925587153795311} m_Father: {fileID: 6615650786298566649} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140.665, y: -183.6525} m_SizeDelta: {x: 281.33, y: 65.461} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5062344623320057105 @@ -8508,7 +8585,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4509257640494837750 RectTransform: m_ObjectHideFlags: 0 @@ -9627,9 +9704,9 @@ RectTransform: - {fileID: 7744653743268160647} m_Father: {fileID: 3876095348166231963} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140.665, y: -32.7305} m_SizeDelta: {x: 281.33, y: 65.461} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7751436202518068782 @@ -9876,9 +9953,9 @@ RectTransform: - {fileID: 62564676697924059} m_Father: {fileID: 3876095348166231963} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140.665, y: -183.6525} m_SizeDelta: {x: 281.33, y: 65.461} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8130673716903527307 @@ -10121,9 +10198,9 @@ RectTransform: - {fileID: 1744202003753769275} m_Father: {fileID: 6481773459769904457} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140.665, y: -32.7305} m_SizeDelta: {x: 281.33, y: 65.461} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8427671472801870119 @@ -10761,9 +10838,9 @@ RectTransform: - {fileID: 7872341174629404075} m_Father: {fileID: 6481773459769904457} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140.665, y: -183.6525} m_SizeDelta: {x: 281.33, y: 65.461} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &9007677206475752522 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index 5ee8c0ef..62eb5bcc 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -201,7 +201,7 @@ namespace GameLogic { // 更新界面逻辑 // 目前固定两百个点赞逻辑。 - m_tmp_ShiJianValue.text = string.Format("{0}/150", DataGameSceneManager.Instance.m_LiShiShiJianLikeCount); + m_tmp_ShiJianValue.text = string.Format("{0}/{1}", DataGameSceneManager.Instance.m_LiShiShiJianLikeCount, DataGameSceneManager.Instance.m_LiShiShiJianLikeCountMax); m_img_JinDu.fillAmount = (float)(DataGameSceneManager.Instance.m_LiShiShiJianLikeCount / (float)DataGameSceneManager.Instance.m_LiShiShiJianLikeCountMax); @@ -395,7 +395,7 @@ namespace GameLogic // 先播放视频 string videoName = ConfigSystem.Instance.Tables.TbTeamConfig.Get(teamId).ImgName; - GameModule.Audio.Play(TEngine.AudioType.UISound, videoName+ "_Audio", false, 1, true); + GameModule.Audio.Play(TEngine.AudioType.UISound, videoName + "_Audio", false, 1, true); m_video_SjVideo.loopPointReached += (v) => { @@ -465,8 +465,8 @@ namespace GameLogic return; } - m_rectBgList.GetChild(teamId-1).gameObject.SetActive(true); - m_rectSdx.GetChild(teamId-1).gameObject.SetActive(true); + m_rectBgList.GetChild(teamId - 1).gameObject.SetActive(true); + m_rectSdx.GetChild(teamId - 1).gameObject.SetActive(true); m_rectSceneFx.GetChild(teamId - 1).gameObject.SetActive(true); m_rectSpeed.GetChild(teamId - 1).gameObject.SetActive(true); m_rectTopFx.GetChild(teamId - 1).gameObject.SetActive(true); diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameWorldRankItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameWorldRankItem.cs index d50b086d..644c1913 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameWorldRankItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameWorldRankItem.cs @@ -16,6 +16,7 @@ namespace GameLogic public TextMeshProUGUI m_Score; public TextMeshProUGUI m_GongXian; public TextMeshProUGUI m_RankInde; + public Image Img; public void OnInit(int i, PlayRankData playRankData) {