From 774638e45397a01ca627868c91c248f175b2dbc7 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Wed, 4 Jun 2025 05:06:28 +0800 Subject: [PATCH] 1 --- UnityProject/Assets/AssetRaw/UI/GJSK.prefab | 14 +++ .../Assets/AssetRaw/UI/UIGameBattle.prefab | 107 ++++++++++++++++++ .../ZQDN/FX/Shaders/Shader Graphs_nao.mat | 2 +- .../Assets/AssetRaw/{UI => }/ZhiLi.prefab | 0 .../AssetRaw/{UI => }/ZhiLi.prefab.meta | 0 .../GameScripts/HotFix/GameLogic/UI/UIGJSK.cs | 19 ++++ .../HotFix/GameLogic/UI/UIGJSK.cs.meta | 11 ++ .../HotFix/GameLogic/UI/UIGameBattle.cs | 9 ++ 8 files changed, 161 insertions(+), 1 deletion(-) rename UnityProject/Assets/AssetRaw/{UI => }/ZhiLi.prefab (100%) rename UnityProject/Assets/AssetRaw/{UI => }/ZhiLi.prefab.meta (100%) create mode 100644 UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGJSK.cs create mode 100644 UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGJSK.cs.meta diff --git a/UnityProject/Assets/AssetRaw/UI/GJSK.prefab b/UnityProject/Assets/AssetRaw/UI/GJSK.prefab index 2b2d7d92..eb38c174 100644 --- a/UnityProject/Assets/AssetRaw/UI/GJSK.prefab +++ b/UnityProject/Assets/AssetRaw/UI/GJSK.prefab @@ -651,6 +651,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3744406855852541135} + - component: {fileID: 2180175338147116660} m_Layer: 5 m_Name: GJSK m_TagString: Untagged @@ -683,6 +684,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2180175338147116660 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6688080243091238059} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d349d0bb94a29a47922da414a286f17, type: 3} + m_Name: + m_EditorClassIdentifier: + m_timerText: {fileID: 1198276023718990308} --- !u!1 &7729453330309790274 GameObject: m_ObjectHideFlags: 0 diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab index 4dbea392..3c0c4d03 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab @@ -37358,6 +37358,7 @@ RectTransform: - {fileID: 6805953989209425366} - {fileID: 2729579121250304069} - {fileID: 2161047130895777792} + - {fileID: 1439052953720149583} - {fileID: 1774168000858424399} - {fileID: 6349199766664341784} - {fileID: 7639078275878196855} @@ -98459,6 +98460,112 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3} m_PrefabInstance: {fileID: 1749071072740984990} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2309859779378909824 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1508900408836313865} + m_Modifications: + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6688080243091238059, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_Name + value: m_rectGjsk + objectReference: {fileID: 0} + - target: {fileID: 6688080243091238059, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} +--- !u!224 &1439052953720149583 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3} + m_PrefabInstance: {fileID: 2309859779378909824} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2708602225140092782 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Shaders/Shader Graphs_nao.mat b/UnityProject/Assets/AssetRaw/ZQDN/FX/Shaders/Shader Graphs_nao.mat index 6cc84cc2..a6b87800 100644 --- a/UnityProject/Assets/AssetRaw/ZQDN/FX/Shaders/Shader Graphs_nao.mat +++ b/UnityProject/Assets/AssetRaw/ZQDN/FX/Shaders/Shader Graphs_nao.mat @@ -41,7 +41,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _Alpha: 1 + - _Alpha: 0.24063015 - _Light: 1 - _QueueControl: 0 - _QueueOffset: 0 diff --git a/UnityProject/Assets/AssetRaw/UI/ZhiLi.prefab b/UnityProject/Assets/AssetRaw/ZhiLi.prefab similarity index 100% rename from UnityProject/Assets/AssetRaw/UI/ZhiLi.prefab rename to UnityProject/Assets/AssetRaw/ZhiLi.prefab diff --git a/UnityProject/Assets/AssetRaw/UI/ZhiLi.prefab.meta b/UnityProject/Assets/AssetRaw/ZhiLi.prefab.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/UI/ZhiLi.prefab.meta rename to UnityProject/Assets/AssetRaw/ZhiLi.prefab.meta diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGJSK.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGJSK.cs new file mode 100644 index 00000000..df760d81 --- /dev/null +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGJSK.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; + +namespace GameLogic +{ + public class UIGJSK : MonoBehaviour + { + // Start is called before the first frame update + public TextMeshProUGUI m_timerText; + + // Update is called once per frame + void Update() + { + m_timerText.text = "Time: " + DataGameSceneManager.Instance.m_GameTimerLen.ToString("F2") + "s"; + } + } +} diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGJSK.cs.meta b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGJSK.cs.meta new file mode 100644 index 00000000..40c0a5d4 --- /dev/null +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGJSK.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6d349d0bb94a29a47922da414a286f17 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index fc800a79..25f4ec11 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -37,6 +37,7 @@ namespace GameLogic private TextMeshProUGUI m_tmpCount; private RawImage m_rimg_ViewTexture; private VideoPlayer m_video_Video; + private RectTransform m_rectGjsk; private Image m_img_HuangJinShiDai; private Text m_textHuangJinInfo; private Button m_btn_StartBtn; @@ -68,6 +69,7 @@ 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_rectGjsk = FindChildComponent("Bg/m_rectGjsk"); m_img_HuangJinShiDai = FindChildComponent("Bg/m_img_HuangJinShiDai"); m_textHuangJinInfo = FindChildComponent("Bg/m_img_HuangJinShiDai/m_textHuangJinInfo"); m_btn_StartBtn = FindChildComponent