diff --git a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity index 4b52fae7..d4d74a19 100644 --- a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity +++ b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity @@ -12463,9 +12463,9 @@ GameObject: - component: {fileID: 795731035} - component: {fileID: 795731038} - component: {fileID: 795731036} - m_Layer: 5 + m_Layer: 8 m_Name: Camera_DanFan - m_TagString: Untagged + m_TagString: LuZhiCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -13280,9 +13280,9 @@ GameObject: - component: {fileID: 855702972} - component: {fileID: 855702974} - component: {fileID: 855702973} - m_Layer: 0 + m_Layer: 8 m_Name: Camera - m_TagString: Untagged + m_TagString: LuZhiCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -13397,6 +13397,37 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!1 &859524010 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 859524011} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &859524011 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 859524010} + serializedVersion: 2 + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &874819495 GameObject: m_ObjectHideFlags: 0 @@ -20950,9 +20981,9 @@ GameObject: - component: {fileID: 1323305827} - component: {fileID: 1323305829} - component: {fileID: 1323305828} - m_Layer: 5 + m_Layer: 8 m_Name: Camera_DanFan - m_TagString: Untagged + m_TagString: LuZhiCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -35986,9 +36017,9 @@ GameObject: - component: {fileID: 2096553538} - component: {fileID: 2096553540} - component: {fileID: 2096553539} - m_Layer: 5 + m_Layer: 8 m_Name: Camera_SheXiangJi - m_TagString: Untagged + m_TagString: LuZhiCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -37317,3 +37348,4 @@ SceneRoots: - {fileID: 673520163} - {fileID: 892345881} - {fileID: 1425832206} + - {fileID: 859524011} diff --git a/Data/Audio/BgMusic.mp3 b/Data/Audio/BgMusic.mp3 new file mode 100644 index 00000000..9b079d43 Binary files /dev/null and b/Data/Audio/BgMusic.mp3 differ diff --git a/Data/Video/Recordings/Movie_001.mp4 b/Data/Video/Recordings/Movie_001.mp4 new file mode 100644 index 00000000..d21e8fe9 Binary files /dev/null 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 new file mode 100644 index 00000000..3b4167d2 Binary files /dev/null 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 new file mode 100644 index 00000000..1c3b6e6e Binary files /dev/null and b/Data/Video/Recordings/Movie_003.mp4 differ diff --git a/Data/Video/升降镜头.mp4 b/Data/Video/升降镜头.mp4 new file mode 100644 index 00000000..f9d2eff6 Binary files /dev/null and b/Data/Video/升降镜头.mp4 differ diff --git a/Data/Video/推拉镜头.mp4 b/Data/Video/推拉镜头.mp4 new file mode 100644 index 00000000..66840889 Binary files /dev/null and b/Data/Video/推拉镜头.mp4 differ diff --git a/Data/Video/摇镜头.mp4 b/Data/Video/摇镜头.mp4 new file mode 100644 index 00000000..6b662ac4 Binary files /dev/null and b/Data/Video/摇镜头.mp4 differ diff --git a/Data/Video/移镜头.mp4 b/Data/Video/移镜头.mp4 new file mode 100644 index 00000000..966f1667 Binary files /dev/null and b/Data/Video/移镜头.mp4 differ diff --git a/Data/Video/跟镜头.mp4 b/Data/Video/跟镜头.mp4 new file mode 100644 index 00000000..933c5558 Binary files /dev/null and b/Data/Video/跟镜头.mp4 differ diff --git a/Data/Xml/03_ChangJingXuNiPaiShe.xml b/Data/Xml/03_ChangJingXuNiPaiShe.xml index ec3912ba..0d447e05 100644 --- a/Data/Xml/03_ChangJingXuNiPaiShe.xml +++ b/Data/Xml/03_ChangJingXuNiPaiShe.xml @@ -735,28 +735,26 @@ - + + + + + - - - - - - - diff --git a/Packages/manifest.json b/Packages/manifest.json index 1d80c3dc..ed5caed9 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,12 +2,14 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", + "com.unity.assetbundlebrowser": "1.7.0", "com.unity.collab-proxy": "2.2.0", "com.unity.feature.development": "1.0.1", "com.unity.ide.rider": "3.0.27", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.recorder": "4.0.3", "com.unity.render-pipelines.universal": "14.0.9", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", @@ -44,7 +46,6 @@ "com.unity.modules.video": "1.0.0", "com.unity.modules.vr": "1.0.0", "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0", - "com.unity.assetbundlebrowser": "1.7.0" + "com.unity.modules.xr": "1.0.0" } } diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index f0d22f42..0799cf6d 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -112,6 +112,15 @@ "dependencies": {}, "url": "https://packages.unity.cn" }, + "com.unity.recorder": { + "version": "4.0.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.timeline": "1.0.0" + }, + "url": "https://packages.unity.cn" + }, "com.unity.render-pipelines.core": { "version": "14.0.9", "depth": 1, diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 05db6c81..4ceaa2cf 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -2,30 +2,46 @@ %TAG !u! tag:unity3d.com,2011: --- !u!159 &1 EditorSettings: - m_AssetPipelineMode: 1 m_ObjectHideFlags: 0 - serializedVersion: 10 - m_ExternalVersionControlSupport: Visible Meta Files + serializedVersion: 12 m_SerializationMode: 2 m_LineEndingsForNewScripts: 0 m_DefaultBehaviorMode: 0 m_PrefabRegularEnvironment: {fileID: 0} m_PrefabUIEnvironment: {fileID: 0} m_SpritePackerMode: 0 + m_SpritePackerCacheSize: 10 m_SpritePackerPaddingPower: 1 + m_Bc7TextureCompressor: 0 m_EtcTextureCompressorBehavior: 1 m_EtcTextureFastCompressor: 1 m_EtcTextureNormalCompressor: 2 m_EtcTextureBestCompressor: 4 m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;asmref;rsp m_ProjectGenerationRootNamespace: - m_CollabEditorSettings: - inProgressEnabled: 1 m_EnableTextureStreamingInEditMode: 1 m_EnableTextureStreamingInPlayMode: 1 + m_EnableEditorAsyncCPUTextureLoading: 0 m_AsyncShaderCompilation: 1 + m_PrefabModeAllowAutoSave: 1 m_EnterPlayModeOptionsEnabled: 0 m_EnterPlayModeOptions: 3 - m_ShowLightmapResolutionOverlay: 1 + m_GameObjectNamingDigits: 1 + m_GameObjectNamingScheme: 0 + m_AssetNamingUsesSpace: 1 + m_InspectorUseIMGUIDefaultInspector: 0 m_UseLegacyProbeSampleCount: 0 m_SerializeInlineMappingsOnOneLine: 1 + m_DisableCookiesInLightmapper: 1 + m_AssetPipelineMode: 1 + m_RefreshImportMode: 0 + m_CacheServerMode: 0 + m_CacheServerEndpoint: + m_CacheServerNamespacePrefix: default + m_CacheServerEnableDownload: 1 + m_CacheServerEnableUpload: 1 + m_CacheServerEnableAuth: 0 + m_CacheServerEnableTls: 0 + m_CacheServerValidationMode: 2 + m_CacheServerDownloadBatchSize: 128 + m_EnableEnlightenBakedGI: 0 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 6d8f30e1..42bad0f7 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - LuZhiCamera layers: - Default - TransparentFX @@ -13,7 +14,7 @@ TagManager: - UI - bur - BG - - + - LuZhiCamera - - -