From e3ecd62ea3d784daa6d211f3d8779d61e3c221f0 Mon Sep 17 00:00:00 2001 From: Lihao7788 <2470304407@qq.com> Date: Thu, 8 May 2025 16:55:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AC=AC=E4=BA=8C=E5=A5=97ra?= =?UTF-8?q?wImage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ModuleUI/上下移动RawImage.meta | 8 + .../SheXiangJi2_RawImage.renderTexture | 0 .../SheXiangJi2_RawImage.renderTexture.meta | 0 .../ZhaoXiangJi2_RawImage.renderTexture | 0 .../ZhaoXiangJi2_RawImage.renderTexture.meta | 0 .../Scenes/03_ChangJingXuNiPaiShe.unity | 152 ++++++++++++- .../摄像机摄影/TuiJingTou.playable | 212 ++++++++++++++++++ Data/Xml/03_ChangJingXuNiPaiShe.xml | 42 +++- 8 files changed, 408 insertions(+), 6 deletions(-) create mode 100644 Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage.meta rename Assets/Projects/AnHuiSheYing/ModuleUI/{ => 上下移动RawImage}/SheXiangJi2_RawImage.renderTexture (100%) rename Assets/Projects/AnHuiSheYing/ModuleUI/{ => 上下移动RawImage}/SheXiangJi2_RawImage.renderTexture.meta (100%) rename Assets/Projects/AnHuiSheYing/ModuleUI/{ => 上下移动RawImage}/ZhaoXiangJi2_RawImage.renderTexture (100%) rename Assets/Projects/AnHuiSheYing/ModuleUI/{ => 上下移动RawImage}/ZhaoXiangJi2_RawImage.renderTexture.meta (100%) diff --git a/Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage.meta b/Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage.meta new file mode 100644 index 00000000..970a0d67 --- /dev/null +++ b/Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1d3b8c1ebc3928849b46ea42f8a019c2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Projects/AnHuiSheYing/ModuleUI/SheXiangJi2_RawImage.renderTexture b/Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/SheXiangJi2_RawImage.renderTexture similarity index 100% rename from Assets/Projects/AnHuiSheYing/ModuleUI/SheXiangJi2_RawImage.renderTexture rename to Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/SheXiangJi2_RawImage.renderTexture diff --git a/Assets/Projects/AnHuiSheYing/ModuleUI/SheXiangJi2_RawImage.renderTexture.meta b/Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/SheXiangJi2_RawImage.renderTexture.meta similarity index 100% rename from Assets/Projects/AnHuiSheYing/ModuleUI/SheXiangJi2_RawImage.renderTexture.meta rename to Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/SheXiangJi2_RawImage.renderTexture.meta diff --git a/Assets/Projects/AnHuiSheYing/ModuleUI/ZhaoXiangJi2_RawImage.renderTexture b/Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/ZhaoXiangJi2_RawImage.renderTexture similarity index 100% rename from Assets/Projects/AnHuiSheYing/ModuleUI/ZhaoXiangJi2_RawImage.renderTexture rename to Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/ZhaoXiangJi2_RawImage.renderTexture diff --git a/Assets/Projects/AnHuiSheYing/ModuleUI/ZhaoXiangJi2_RawImage.renderTexture.meta b/Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/ZhaoXiangJi2_RawImage.renderTexture.meta similarity index 100% rename from Assets/Projects/AnHuiSheYing/ModuleUI/ZhaoXiangJi2_RawImage.renderTexture.meta rename to Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/ZhaoXiangJi2_RawImage.renderTexture.meta diff --git a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity index d5051446..4b52fae7 100644 --- a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity +++ b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity @@ -13736,7 +13736,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &892345878 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14378,6 +14378,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 919385950} m_CullTransparentMesh: 1 +--- !u!1 &922446202 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 922446203} + - component: {fileID: 922446205} + - component: {fileID: 922446204} + m_Layer: 5 + m_Name: RawImage2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &922446203 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 922446202} + 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: 958765592} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &922446204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 922446202} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 8400000, guid: 69125cd9c53ef8a4ba44dc2e888fa2de, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &922446205 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 922446202} + m_CullTransparentMesh: 1 --- !u!1 &929023486 GameObject: m_ObjectHideFlags: 0 @@ -15226,6 +15298,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 900732043} + - {fileID: 922446203} - {fileID: 2066338424} - {fileID: 18566204} m_Father: {fileID: 892345881} @@ -16535,6 +16608,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 222601866} + - {fileID: 1843504964} - {fileID: 398612549} - {fileID: 184937891} - {fileID: 30222685} @@ -20859,6 +20933,10 @@ PlayableDirector: value: {fileID: 274698421} - key: {fileID: 8341348829213963693, guid: 1369e5d21884bf94a858f43f93de1d12, type: 2} value: {fileID: 274698421} + - key: {fileID: -262090757783867317, guid: 1369e5d21884bf94a858f43f93de1d12, type: 2} + value: {fileID: 274698419} + - key: {fileID: 4881605440741089279, guid: 1369e5d21884bf94a858f43f93de1d12, type: 2} + value: {fileID: 1300625924} m_ExposedReferences: m_References: [] --- !u!1 &1323305826 @@ -31734,6 +31812,78 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 4344788843934612036, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3} +--- !u!1 &1843504963 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1843504964} + - component: {fileID: 1843504966} + - component: {fileID: 1843504965} + m_Layer: 5 + m_Name: RawImage2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1843504964 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1843504963} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0020000564} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1044465924} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1843504965 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1843504963} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 8400000, guid: 111aa23c85ccc9643ba1a909157d0e72, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1843504966 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1843504963} + m_CullTransparentMesh: 1 --- !u!1 &1864737259 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Projects/AnHuiSheYing/TimelineClips/摄像机摄影/TuiJingTou.playable b/Assets/Projects/AnHuiSheYing/TimelineClips/摄像机摄影/TuiJingTou.playable index 2777bb1d..670e0687 100644 --- a/Assets/Projects/AnHuiSheYing/TimelineClips/摄像机摄影/TuiJingTou.playable +++ b/Assets/Projects/AnHuiSheYing/TimelineClips/摄像机摄影/TuiJingTou.playable @@ -357,6 +357,99 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &-262090757783867317 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3} + m_Name: Activation Track + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: 6488051541827762348} + m_Duration: 0.5 + m_TimeScale: 1 + m_ParentTrack: {fileID: -262090757783867317} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Active + m_Markers: + m_Objects: [] + m_PostPlaybackState: 3 --- !u!114 &-230961194204519656 MonoBehaviour: m_ObjectHideFlags: 1 @@ -483,6 +576,8 @@ MonoBehaviour: m_Tracks: - {fileID: 393728327898648067} - {fileID: 602540114805184014} + - {fileID: -262090757783867317} + - {fileID: 4881605440741089279} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -1061,6 +1156,123 @@ AnimationClip: m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: [] +--- !u!114 &4881605440741089279 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3} + m_Name: Activation Track (1) + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: 8308664593014450492} + m_Duration: 0.5 + m_TimeScale: 1 + m_ParentTrack: {fileID: 4881605440741089279} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Active + m_Markers: + m_Objects: [] + m_PostPlaybackState: 3 +--- !u!114 &6488051541827762348 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} + m_Name: ActivationPlayableAsset + m_EditorClassIdentifier: +--- !u!114 &8308664593014450492 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} + m_Name: ActivationPlayableAsset + m_EditorClassIdentifier: --- !u!114 &8341348829213963693 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Data/Xml/03_ChangJingXuNiPaiShe.xml b/Data/Xml/03_ChangJingXuNiPaiShe.xml index e65dad5d..c4a018ea 100644 --- a/Data/Xml/03_ChangJingXuNiPaiShe.xml +++ b/Data/Xml/03_ChangJingXuNiPaiShe.xml @@ -106,6 +106,7 @@ + @@ -127,10 +128,11 @@ - + + @@ -144,6 +146,8 @@ + + @@ -592,8 +596,7 @@ - - + @@ -606,7 +609,6 @@ - @@ -638,7 +640,7 @@ - + @@ -741,13 +743,21 @@ + + + + + + + + @@ -756,6 +766,11 @@ + + + + + @@ -786,6 +801,10 @@ + + + + @@ -2229,6 +2248,12 @@ + + + + + + @@ -2247,6 +2272,9 @@ + + + @@ -2279,6 +2307,10 @@ + + + +