diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift02.MP3 b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift02_Audio.MP3 similarity index 100% rename from UnityProject/Assets/AssetRaw/Audios/zqdn/Gift02.MP3 rename to UnityProject/Assets/AssetRaw/Audios/zqdn/Gift02_Audio.MP3 diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift02.MP3.meta b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift02_Audio.MP3.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Audios/zqdn/Gift02.MP3.meta rename to UnityProject/Assets/AssetRaw/Audios/zqdn/Gift02_Audio.MP3.meta diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift03.MP3 b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift03_Audio.MP3 similarity index 100% rename from UnityProject/Assets/AssetRaw/Audios/zqdn/Gift03.MP3 rename to UnityProject/Assets/AssetRaw/Audios/zqdn/Gift03_Audio.MP3 diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift03.MP3.meta b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift03_Audio.MP3.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Audios/zqdn/Gift03.MP3.meta rename to UnityProject/Assets/AssetRaw/Audios/zqdn/Gift03_Audio.MP3.meta diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift04.MP3 b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift04_Audio.MP3 similarity index 100% rename from UnityProject/Assets/AssetRaw/Audios/zqdn/Gift04.MP3 rename to UnityProject/Assets/AssetRaw/Audios/zqdn/Gift04_Audio.MP3 diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift04.MP3.meta b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift04_Audio.MP3.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Audios/zqdn/Gift04.MP3.meta rename to UnityProject/Assets/AssetRaw/Audios/zqdn/Gift04_Audio.MP3.meta diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift05.MP3 b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift05_Audio.MP3 similarity index 100% rename from UnityProject/Assets/AssetRaw/Audios/zqdn/Gift05.MP3 rename to UnityProject/Assets/AssetRaw/Audios/zqdn/Gift05_Audio.MP3 diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift05.MP3.meta b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift05_Audio.MP3.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Audios/zqdn/Gift05.MP3.meta rename to UnityProject/Assets/AssetRaw/Audios/zqdn/Gift05_Audio.MP3.meta diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift06.MP3 b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift06_Audio.MP3 similarity index 100% rename from UnityProject/Assets/AssetRaw/Audios/zqdn/Gift06.MP3 rename to UnityProject/Assets/AssetRaw/Audios/zqdn/Gift06_Audio.MP3 diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift06.MP3.meta b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift06_Audio.MP3.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Audios/zqdn/Gift06.MP3.meta rename to UnityProject/Assets/AssetRaw/Audios/zqdn/Gift06_Audio.MP3.meta diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift07.MP3 b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift07_Audio.MP3 similarity index 100% rename from UnityProject/Assets/AssetRaw/Audios/zqdn/Gift07.MP3 rename to UnityProject/Assets/AssetRaw/Audios/zqdn/Gift07_Audio.MP3 diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift07.MP3.meta b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift07_Audio.MP3.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Audios/zqdn/Gift07.MP3.meta rename to UnityProject/Assets/AssetRaw/Audios/zqdn/Gift07_Audio.MP3.meta diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift08.MP3 b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift08_Audio.MP3 similarity index 100% rename from UnityProject/Assets/AssetRaw/Audios/zqdn/Gift08.MP3 rename to UnityProject/Assets/AssetRaw/Audios/zqdn/Gift08_Audio.MP3 diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift08.MP3.meta b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift08_Audio.MP3.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Audios/zqdn/Gift08.MP3.meta rename to UnityProject/Assets/AssetRaw/Audios/zqdn/Gift08_Audio.MP3.meta diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift09.MP3 b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift09_Audio.MP3 similarity index 100% rename from UnityProject/Assets/AssetRaw/Audios/zqdn/Gift09.MP3 rename to UnityProject/Assets/AssetRaw/Audios/zqdn/Gift09_Audio.MP3 diff --git a/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift09.MP3.meta b/UnityProject/Assets/AssetRaw/Audios/zqdn/Gift09_Audio.MP3.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Audios/zqdn/Gift09.MP3.meta rename to UnityProject/Assets/AssetRaw/Audios/zqdn/Gift09_Audio.MP3.meta diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab index 92c34c48..b32da4d0 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab @@ -59,7 +59,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 184672823821139294} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -69,12 +69,12 @@ RectTransform: - {fileID: 4214133391535205399} - {fileID: 7553640713918008100} - {fileID: 4424235173735084240} - m_Father: {fileID: 2338385386102721414} + m_Father: {fileID: 1508900408836313865} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.75, y: 0.2857666} + m_SizeDelta: {x: -1.5, y: -0.5715332} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &202483145928531018 GameObject: @@ -748,7 +748,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: ba88c9b94cf65ec40b95f6b0a859e29d, type: 2} m_Color: {r: 0.10196078, g: 0.1809915, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -25995,9 +25995,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1508900408836313865} - - {fileID: 4982030497614920511} - - {fileID: 3736817874055198994} - - {fileID: 6033434420635246474} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -35996,7 +35993,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2423690419254802813} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -36006,12 +36003,12 @@ RectTransform: - {fileID: 4639531916980255452} - {fileID: 2397591265962526211} - {fileID: 259592695359127055} - m_Father: {fileID: 2338385386102721414} + m_Father: {fileID: 1508900408836313865} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.75, y: 0.2857666} + m_SizeDelta: {x: -1.5, y: -0.5715332} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2593143868542972836 GameObject: @@ -36147,7 +36144,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 560d72cd131afef4ba7ce6807c70b435, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 0.34509805} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -36531,6 +36528,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 4982030497614920511} + - {fileID: 3736817874055198994} + - {fileID: 6033434420635246474} - {fileID: 2090319480340751313} - {fileID: 245133209852100473} - {fileID: 6282578790962902355} @@ -76567,7 +76567,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: ba88c9b94cf65ec40b95f6b0a859e29d, type: 2} m_Color: {r: 0.10196078, g: 0.5656291, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -76606,7 +76606,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7031927170101600824} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -76616,12 +76616,12 @@ RectTransform: - {fileID: 6045065208568952750} - {fileID: 8059303560156873943} - {fileID: 6120632717750543533} - m_Father: {fileID: 2338385386102721414} + m_Father: {fileID: 1508900408836313865} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.75, y: 0.2857666} + m_SizeDelta: {x: -1.5, y: -0.5715332} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7280053383048790945 GameObject: @@ -76682,7 +76682,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: ba88c9b94cf65ec40b95f6b0a859e29d, type: 2} m_Color: {r: 1, g: 0.4690413, b: 0.103773475, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -86832,7 +86832,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: ba88c9b94cf65ec40b95f6b0a859e29d, type: 2} m_Color: {r: 0.10196078, g: 0.30715278, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: diff --git a/UnityProject/Assets/AssetRaw/UI/UIGmForm.prefab b/UnityProject/Assets/AssetRaw/UI/UIGmForm.prefab index c356907f..d2298f0a 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGmForm.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGmForm.prefab @@ -2058,7 +2058,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8197620294860182702 RectTransform: m_ObjectHideFlags: 0 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index 519dd464..3f042d2c 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -15,6 +15,9 @@ namespace GameLogic class UIGameBattle : UIWindow { #region 脚本工具生成的代码 + private RectTransform m_rectSdx; + private RectTransform m_rectSceneFx; + private RectTransform m_rectSpeed; private RectTransform m_rectBgList; private Image m_img_BT; private TextMeshProUGUI m_tmpTimer; @@ -33,11 +36,11 @@ namespace GameLogic private TextMeshProUGUI m_tmpCount; private RawImage m_rimg_ViewTexture; private VideoPlayer m_video_Video; - private RectTransform m_rectSdx; - private RectTransform m_rectSceneFx; - private RectTransform m_rectSpeed; protected override void ScriptGenerator() { + m_rectSdx = FindChildComponent("Bg/m_rectSdx"); + m_rectSceneFx = FindChildComponent("Bg/m_rectSceneFx"); + m_rectSpeed = FindChildComponent("Bg/m_rectSpeed"); m_rectBgList = FindChildComponent("Bg/m_rectBgList"); m_img_BT = FindChildComponent("Bg/Top/m_img_BT"); m_tmpTimer = FindChildComponent("Bg/Top/m_img_BT/m_tmpTimer"); @@ -56,9 +59,6 @@ namespace GameLogic m_tmpCount = FindChildComponent("Bg/m_rect_GiftPanel/GiftItem/Item/m_tmpCount"); m_rimg_ViewTexture = FindChildComponent("Bg/BattleBg/m_rimg_ViewTexture"); m_video_Video = FindChildComponent("Bg/BattleBg/m_video_Video"); - m_rectSdx = FindChildComponent("m_rectSdx"); - m_rectSceneFx = FindChildComponent("m_rectSceneFx"); - m_rectSpeed = FindChildComponent("m_rectSpeed"); m_btnSetting.onClick.AddListener(OnClickSettingBtn); m_btnRank.onClick.AddListener(OnClickRankBtn); } @@ -71,15 +71,7 @@ namespace GameLogic } private async void OnClickRankBtn() { - List playRankDatas = await DataGameModelManager.Instance.C2S_GetResultRank(1); - if (playRankDatas != null) - { - // 整理参数传进来 - object[] objects = new object[2]; - objects[0] = GameRankType.本周排行榜; - objects[1] = playRankDatas; - GameModule.UI.ShowUI(objects); - } + GameModule.UI.ShowUI(); } #endregion