diff --git a/Assets/Projects/AnHuiSheYing/ModuleUI/SheXiangJiRawImage.renderTexture b/Assets/Projects/AnHuiSheYing/ModuleUI/SheXiangJiRawImage.renderTexture index 65b26da9..3750b699 100644 --- a/Assets/Projects/AnHuiSheYing/ModuleUI/SheXiangJiRawImage.renderTexture +++ b/Assets/Projects/AnHuiSheYing/ModuleUI/SheXiangJiRawImage.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 256 - m_Height: 256 + m_Width: 1000 + m_Height: 1000 m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 94 diff --git a/Assets/Projects/AnHuiSheYing/ModuleUI/ZhaoXiangJi_RawImage.renderTexture b/Assets/Projects/AnHuiSheYing/ModuleUI/ZhaoXiangJi_RawImage.renderTexture index 8f21de70..16feea7d 100644 --- a/Assets/Projects/AnHuiSheYing/ModuleUI/ZhaoXiangJi_RawImage.renderTexture +++ b/Assets/Projects/AnHuiSheYing/ModuleUI/ZhaoXiangJi_RawImage.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 256 - m_Height: 256 + m_Width: 1000 + m_Height: 1000 m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 94 diff --git a/Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/SheXiangJi2_RawImage.renderTexture b/Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/SheXiangJi2_RawImage.renderTexture index eafd51be..a633422d 100644 --- a/Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/SheXiangJi2_RawImage.renderTexture +++ b/Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/SheXiangJi2_RawImage.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 256 - m_Height: 256 + m_Width: 1000 + m_Height: 1000 m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 94 diff --git a/Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/ZhaoXiangJi2_RawImage.renderTexture b/Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/ZhaoXiangJi2_RawImage.renderTexture index d696414c..a3f8d65f 100644 --- a/Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/ZhaoXiangJi2_RawImage.renderTexture +++ b/Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/ZhaoXiangJi2_RawImage.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 256 - m_Height: 256 + m_Width: 1000 + m_Height: 1000 m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 94 diff --git a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity index d4d74a19..0ac8c9d5 100644 --- a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity +++ b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity @@ -4158,6 +4158,9 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: -5242914350902673157, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3} m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8361194689003124512, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3} + insertIndex: 5 + addedObject: {fileID: 1753487111} - targetCorrespondingSourceObject: {fileID: 1842023655691888546, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3} insertIndex: -1 addedObject: {fileID: 855702972} @@ -4636,7 +4639,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1590792851390580316, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -10798,6 +10801,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 676667036} m_CullTransparentMesh: 1 +--- !u!4 &689678966 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8361194689003124512, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3} + m_PrefabInstance: {fileID: 263410733} + m_PrefabAsset: {fileID: 0} --- !u!1 &689943053 GameObject: m_ObjectHideFlags: 0 @@ -15336,8 +15344,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -384.36902, y: 266.98413} - m_SizeDelta: {x: 768.738, y: 490.5805} + m_AnchoredPosition: {x: -357, y: 231} + m_SizeDelta: {x: 700, y: 450} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &958765593 MonoBehaviour: @@ -16653,8 +16661,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -384.36902, y: 266.98413} - m_SizeDelta: {x: 768.738, y: 490.5805} + m_AnchoredPosition: {x: -357, y: 231} + m_SizeDelta: {x: 700, y: 450} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1044465925 MonoBehaviour: @@ -20293,7 +20301,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4526973580622911719, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7121778146626024556, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -30224,6 +30232,89 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1743675696} m_CullTransparentMesh: 1 +--- !u!1 &1753487110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1753487111} + - component: {fileID: 1753487113} + - component: {fileID: 1753487112} + m_Layer: 0 + m_Name: SM_Shexiangji5 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1753487111 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1753487110} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.000000039115548, y: 0.00007265597, z: -0.0000000013969839} + m_LocalScale: {x: 0.25156373, y: 0.25156373, z: 0.25156373} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 689678966} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1753487112 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1753487110} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a3c3f55381f077f4fae0d6f68c80b19c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1753487113 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1753487110} + m_Mesh: {fileID: 7453440671676911713, guid: 2dfa8f7d13438d6409b9d2d8e233d540, type: 3} --- !u!1 &1759906462 GameObject: m_ObjectHideFlags: 0 diff --git a/Data/Video/Recordings/Image_01.jpg b/Data/Video/Recordings/Image_01.jpg new file mode 100644 index 00000000..de60dd65 Binary files /dev/null and b/Data/Video/Recordings/Image_01.jpg differ diff --git a/Data/Video/Recordings/Movie_001.mp4 b/Data/Video/Recordings/Movie_001.mp4 index d21e8fe9..884de957 100644 Binary files a/Data/Video/Recordings/Movie_001.mp4 and b/Data/Video/Recordings/Movie_001.mp4 differ diff --git a/Data/Video/Recordings/Movie_002.mp4 b/Data/Video/Recordings/Movie_002.mp4 index 3b4167d2..884de957 100644 Binary files a/Data/Video/Recordings/Movie_002.mp4 and b/Data/Video/Recordings/Movie_002.mp4 differ diff --git a/Data/Video/Recordings/Movie_003.mp4 b/Data/Video/Recordings/Movie_003.mp4 deleted file mode 100644 index 1c3b6e6e..00000000 Binary files a/Data/Video/Recordings/Movie_003.mp4 and /dev/null differ diff --git a/Data/Xml/03_ChangJingXuNiPaiShe.xml b/Data/Xml/03_ChangJingXuNiPaiShe.xml index 80289647..274e915e 100644 --- a/Data/Xml/03_ChangJingXuNiPaiShe.xml +++ b/Data/Xml/03_ChangJingXuNiPaiShe.xml @@ -297,7 +297,7 @@ - + @@ -909,7 +909,7 @@ - + @@ -1356,10 +1356,7 @@ - - - - + @@ -1373,7 +1370,7 @@ - + @@ -1411,12 +1408,16 @@ + + + + @@ -1457,8 +1458,8 @@ - - + + @@ -1669,8 +1670,8 @@ - - + + @@ -1770,7 +1771,7 @@ - + @@ -1793,7 +1794,7 @@ - + @@ -2422,7 +2423,7 @@ - +