From 3d4ff931d4a2c952b5a9759404c7bda7d2c0d91f Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Sat, 17 May 2025 15:34:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=87=E6=8D=A2=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/AssetRaw/UI/UIGameBattle.prefab | 402 +++++++++++++----- .../UIRaw/Raw/Scene_Texture.renderTexture | 40 ++ .../Raw/Scene_Texture.renderTexture.meta | 8 + .../HotFix/GameLogic/UI/UIGameBattle.cs | 45 +- .../Resources/TEngineGlobalSettings.asset | 2 + 5 files changed, 376 insertions(+), 121 deletions(-) create mode 100644 UnityProject/Assets/AssetRaw/UIRaw/Raw/Scene_Texture.renderTexture create mode 100644 UnityProject/Assets/AssetRaw/UIRaw/Raw/Scene_Texture.renderTexture.meta diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab index ed35f0e3..dbf2d305 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab @@ -36,6 +36,46 @@ RectTransform: m_AnchoredPosition: {x: -478.4685, y: -0.000042915} m_SizeDelta: {x: 123.0629, y: 109.66} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &184672823821139294 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3736817874055198994} + m_Layer: 5 + m_Name: m_rectSceneFx + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3736817874055198994 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 184672823821139294} + 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: + - {fileID: 987410100641298117} + - {fileID: 6679529965157160235} + - {fileID: 4214133391535205399} + - {fileID: 7553640713918008100} + - {fileID: 4424235173735084240} + m_Father: {fileID: 2338385386102721414} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!1 &202483145928531018 GameObject: m_ObjectHideFlags: 0 @@ -750,13 +790,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 748323560309116558} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 705, y: 0, z: 0} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 4995723643482600761} - m_Father: {fileID: 2338385386102721414} + m_Father: {fileID: 4982030497614920511} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &7345126827357614179 ParticleSystem: @@ -5630,81 +5670,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &900172331572250168 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6064629380577498627} - - component: {fileID: 5752702246995260914} - - component: {fileID: 8155692763251597171} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &6064629380577498627 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 900172331572250168} - 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: 2338385386102721414} - 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: -0.75, y: -0.28578} - m_SizeDelta: {x: 1080, y: 2340.5715} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5752702246995260914 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 900172331572250168} - m_CullTransparentMesh: 1 ---- !u!114 &8155692763251597171 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 900172331572250168} - 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: 0.34117648} - 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: 281d71cc588ad1d449bb92a943117354, 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 &921938253997686566 GameObject: m_ObjectHideFlags: 0 @@ -6192,13 +6157,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1396747367829687295} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 705, y: 0, z: 0} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 3075077507817889019} - m_Father: {fileID: 2338385386102721414} + m_Father: {fileID: 4982030497614920511} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &6609239025752616923 ParticleSystem: @@ -10997,6 +10962,78 @@ ParticleSystemRenderer: m_MeshWeighting2: 1 m_MeshWeighting3: 1 m_MaskInteraction: 0 +--- !u!1 &1398001882590162203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4291670090122903301} + - component: {fileID: 5200405597493658813} + m_Layer: 5 + m_Name: m_video_Video + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4291670090122903301 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1398001882590162203} + 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: 2161047130895777792} + 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: 1, y: 0.28564453} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!328 &5200405597493658813 +VideoPlayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1398001882590162203} + m_Enabled: 1 + m_VideoClip: {fileID: 0} + m_TargetCameraAlpha: 1 + m_TargetCamera3DLayout: 0 + m_TargetCamera: {fileID: 0} + m_TargetTexture: {fileID: 8400000, guid: 58db756787358044bbf61460f1ead24f, type: 2} + m_TimeReference: 0 + m_TargetMaterialRenderer: {fileID: 0} + m_TargetMaterialProperty: + m_RenderMode: 2 + m_AspectRatio: 2 + m_DataSource: 0 + m_TimeUpdateMode: 2 + m_PlaybackSpeed: 1 + m_AudioOutputMode: 2 + m_TargetAudioSources: + - {fileID: 0} + m_DirectAudioVolumes: + - 1 + m_Url: + m_EnabledAudioTracks: 01 + m_DirectAudioMutes: 00 + m_ControlledAudioTrackCount: 1 + m_PlayOnAwake: 1 + m_SkipOnDrop: 1 + m_Looping: 0 + m_WaitForFirstFrame: 1 + m_FrameReadyEventEnabled: 0 + m_VideoShaders: [] --- !u!1 &1446123294649239377 GameObject: m_ObjectHideFlags: 0 @@ -21047,13 +21084,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1896724654940960893} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 705, y: 0, z: 0} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 2406703217590529964} - m_Father: {fileID: 2338385386102721414} + m_Father: {fileID: 4982030497614920511} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &4434881904505037444 ParticleSystem: @@ -25958,17 +25995,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1508900408836313865} - - {fileID: 6064629380577498627} - - {fileID: 1488885257311926928} - - {fileID: 2187170155996320836} - - {fileID: 4639531916980255452} - - {fileID: 2397591265962526211} - - {fileID: 259592695359127055} - - {fileID: 987410100641298117} - - {fileID: 6679529965157160235} - - {fileID: 4214133391535205399} - - {fileID: 7553640713918008100} - - {fileID: 4424235173735084240} + - {fileID: 4982030497614920511} + - {fileID: 3736817874055198994} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -30947,13 +30975,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2157442592050440019} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 705, y: 0, z: 0} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 7390164460335838564} - m_Father: {fileID: 2338385386102721414} + m_Father: {fileID: 3736817874055198994} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &4709950339724095974 ParticleSystem: @@ -35944,6 +35972,46 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 +--- !u!1 &2423690419254802813 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4982030497614920511} + m_Layer: 5 + m_Name: m_rectSdx + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4982030497614920511 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2423690419254802813} + 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: + - {fileID: 1488885257311926928} + - {fileID: 2187170155996320836} + - {fileID: 4639531916980255452} + - {fileID: 2397591265962526211} + - {fileID: 259592695359127055} + m_Father: {fileID: 2338385386102721414} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2593143868542972836 GameObject: m_ObjectHideFlags: 0 @@ -36467,6 +36535,7 @@ RectTransform: - {fileID: 6282578790962902355} - {fileID: 6805953989209425366} - {fileID: 2729579121250304069} + - {fileID: 2161047130895777792} m_Father: {fileID: 2338385386102721414} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -41582,6 +41651,78 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3836920207193939514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8495552007127022817} + - component: {fileID: 5552065052100559850} + - component: {fileID: 8605671323071252673} + m_Layer: 5 + m_Name: m_rimg_ViewTexture + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8495552007127022817 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836920207193939514} + 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: 2161047130895777792} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 1, y: 0.28564453} + m_SizeDelta: {x: 980, y: 2240.0002} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5552065052100559850 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836920207193939514} + m_CullTransparentMesh: 1 +--- !u!114 &8605671323071252673 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836920207193939514} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 8400000, guid: 58db756787358044bbf61460f1ead24f, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &4037373828326674925 GameObject: m_ObjectHideFlags: 0 @@ -51755,6 +51896,43 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5285059172291478358 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2161047130895777792} + m_Layer: 5 + m_Name: BattleBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2161047130895777792 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5285059172291478358} + 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: + - {fileID: 8495552007127022817} + - {fileID: 4291670090122903301} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5594576904943662824 GameObject: m_ObjectHideFlags: 0 @@ -61732,13 +61910,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5910054719521107325} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 705, y: 0, z: 0} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1934948946467728425} - m_Father: {fileID: 2338385386102721414} + m_Father: {fileID: 3736817874055198994} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &4572204349932711927 ParticleSystem: @@ -71393,13 +71571,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6765209622505461136} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 705, y: 0, z: 0} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 2810861960239638037} - m_Father: {fileID: 2338385386102721414} + m_Father: {fileID: 4982030497614920511} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &7439112535250522765 ParticleSystem: @@ -76848,13 +77026,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8106333837114436996} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 705, y: 0, z: 0} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 8798165385616816910} - m_Father: {fileID: 2338385386102721414} + m_Father: {fileID: 3736817874055198994} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &2048203677489128224 ParticleSystem: @@ -81679,13 +81857,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8363849982366565017} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 705, y: 0, z: 0} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 4398523922144444544} - m_Father: {fileID: 2338385386102721414} + m_Father: {fileID: 3736817874055198994} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &1732801010742244804 ParticleSystem: @@ -86735,13 +86913,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8946834688955309184} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 705, y: 0, z: 0} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 6130334799207598527} - m_Father: {fileID: 2338385386102721414} + m_Father: {fileID: 3736817874055198994} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &2092128416204837448 ParticleSystem: @@ -91812,7 +91990,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 2338385386102721414} + m_TransformParent: {fileID: 4982030497614920511} m_Modifications: - target: {fileID: 4584437216545881317, guid: 22072e4e48fdd8d44a6541e32e8b6415, type: 3} propertyPath: m_LocalPosition.x @@ -91832,15 +92010,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4584437216545881317, guid: 22072e4e48fdd8d44a6541e32e8b6415, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4584437216545881317, guid: 22072e4e48fdd8d44a6541e32e8b6415, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4584437216545881317, guid: 22072e4e48fdd8d44a6541e32e8b6415, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4584437216545881317, guid: 22072e4e48fdd8d44a6541e32e8b6415, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -91866,6 +92044,10 @@ PrefabInstance: propertyPath: InitialModule.startColor.maxColor.g value: 0.59708935 objectReference: {fileID: 0} + - target: {fileID: 7142564199510495193, guid: 22072e4e48fdd8d44a6541e32e8b6415, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8039248803201545254, guid: 22072e4e48fdd8d44a6541e32e8b6415, type: 3} propertyPath: m_Name value: SDX01 @@ -91874,6 +92056,10 @@ PrefabInstance: propertyPath: m_LengthScale value: 400 objectReference: {fileID: 0} + - target: {fileID: 8390868003882764431, guid: 22072e4e48fdd8d44a6541e32e8b6415, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Raw/Scene_Texture.renderTexture b/UnityProject/Assets/AssetRaw/UIRaw/Raw/Scene_Texture.renderTexture new file mode 100644 index 00000000..bbe87bb7 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/UIRaw/Raw/Scene_Texture.renderTexture @@ -0,0 +1,40 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Scene_Texture + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 + m_Width: 1080 + m_Height: 1920 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthStencilFormat: 94 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Raw/Scene_Texture.renderTexture.meta b/UnityProject/Assets/AssetRaw/UIRaw/Raw/Scene_Texture.renderTexture.meta new file mode 100644 index 00000000..d002d2f5 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/UIRaw/Raw/Scene_Texture.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58db756787358044bbf61460f1ead24f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index 4dce7c62..0749a063 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using Cysharp.Threading.Tasks; using TMPro; using Coffee.UIExtensions; +using UnityEngine.Video; namespace GameLogic { @@ -30,6 +31,8 @@ namespace GameLogic private TextMeshProUGUI m_tmpGiftMsg; private Image m_imgGiftImg; private TextMeshProUGUI m_tmpCount; + private RawImage m_rimg_ViewTexture; + private VideoPlayer m_video_Video; protected override void ScriptGenerator() { m_rectBgList = FindChildComponent("Bg/m_rectBgList"); @@ -48,6 +51,8 @@ namespace GameLogic m_tmpGiftMsg = FindChildComponent("Bg/m_rect_GiftPanel/GiftItem/Item/m_tmpGiftMsg"); m_imgGiftImg = FindChildComponent("Bg/m_rect_GiftPanel/GiftItem/Item/m_imgGiftImg"); 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_btnSetting.onClick.AddListener(OnClickSettingBtn); m_btnRank.onClick.AddListener(OnClickRankBtn); } @@ -94,7 +99,7 @@ namespace GameLogic // 计算位置 r.anchorMin = new Vector2(0.5f, 0.5f); r.anchorMax = new Vector2(0.5f, 0.5f); - r.anchoredPosition = new Vector2(0, 478 -65 - i * (109 - 5f)); + r.anchoredPosition = new Vector2(0, 478 - 65 - i * (109 - 5f)); r.localPosition = new Vector3(r.localPosition.x, r.localPosition.y, 0); actorHItem.OnInit(i); DataGameSceneManager.Instance.m_DicTeamList.Add((i + 1).ToString(), actorHItem); @@ -163,22 +168,36 @@ namespace GameLogic private void SwitchTeamIdFunc() { + int teamId = DataGameSceneManager.Instance.m_TeamId; - for (int i = 0; i < m_rectBgList.childCount; i++) + + // 先播放视频 + string videoName = "Scene_" + (teamId + 1); + + m_video_Video.loopPointReached += (v) => { - m_rectBgList.GetChild(i).gameObject.SetActive(false); - } + for (int i = 0; i < m_rectBgList.childCount; i++) + { + m_rectBgList.GetChild(i).gameObject.SetActive(false); + } - if (teamId > m_rectBgList.childCount) - { - Log.Error("背景Id错误" + teamId); - return; - } + if (teamId > m_rectBgList.childCount) + { + Log.Error("背景Id错误" + teamId); + return; + } + + m_rectBgList.GetChild(teamId).gameObject.SetActive(true); + + // 替换UI图 + SwitchUIResource(); + }; + + var videoClip = GameModule.Resource.LoadAsset(videoName); + m_video_Video.clip = videoClip; + m_video_Video.Play(); - m_rectBgList.GetChild(teamId).gameObject.SetActive(true); - // 替换UI图 - SwitchUIResource(); } private void AddPlayerFunc(UnitPlayerData unitPlayerData) @@ -233,7 +252,7 @@ namespace GameLogic /// private void SwitchUIResource() { - m_img_BT.sprite = GameModule.Resource.LoadAsset(string.Format("zjm_{0}_BT",DataGameSceneManager.Instance.m_TeamId + 1)); + m_img_BT.sprite = GameModule.Resource.LoadAsset(string.Format("zjm_{0}_BT", DataGameSceneManager.Instance.m_TeamId + 1)); m_img_BT.SetNativeSize(); } diff --git a/UnityProject/Assets/TEngine/ResRaw/Resources/TEngineGlobalSettings.asset b/UnityProject/Assets/TEngine/ResRaw/Resources/TEngineGlobalSettings.asset index 3c2cfc11..6a4d47ef 100644 --- a/UnityProject/Assets/TEngine/ResRaw/Resources/TEngineGlobalSettings.asset +++ b/UnityProject/Assets/TEngine/ResRaw/Resources/TEngineGlobalSettings.asset @@ -86,6 +86,8 @@ MonoBehaviour: componentName: LoopListView - uiElementRegex: m_tmp componentName: TextMeshProUGUI + - uiElementRegex: m_video + componentName: VideoPlayer m_HybridCLRCustomGlobalSettings: HotUpdateAssemblies: - GameBase.dll