diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/24、26/静态物体/Materials/M_Gou_Pi.mat b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/24、26/静态物体/Materials/M_Gou_Pi.mat index 3568ae21..d5f0ba2f 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/24、26/静态物体/Materials/M_Gou_Pi.mat +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/24、26/静态物体/Materials/M_Gou_Pi.mat @@ -25,7 +25,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 10f36425885b13c41b4f5732d27cb050, type: 3} + m_Texture: {fileID: 2800000, guid: de4f1fca678c9e34990acd4e996c5faf, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -49,7 +49,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 10f36425885b13c41b4f5732d27cb050, type: 3} + m_Texture: {fileID: 2800000, guid: de4f1fca678c9e34990acd4e996c5faf, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/24、26/静态物体/Materials/M_Gou_Pi1.mat b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/24、26/静态物体/Materials/M_Gou_Pi1.mat index 3b0f77d4..ed8d7ad9 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/24、26/静态物体/Materials/M_Gou_Pi1.mat +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/24、26/静态物体/Materials/M_Gou_Pi1.mat @@ -11,7 +11,9 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP + - _OCCLUSIONMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -29,7 +31,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 7913a7e36317f2d499fa51a2c0724647, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -57,7 +59,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 8bf8c017c403a3b489ea3855cece20a5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/主刀剃毛/sources/T_GouPiFu.jpg b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/主刀剃毛/sources/T_GouPiFu.jpg index 2a90e1b4..b1bd1225 100644 Binary files a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/主刀剃毛/sources/T_GouPiFu.jpg and b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/主刀剃毛/sources/T_GouPiFu.jpg differ diff --git a/Assets/Art/Textures/LouDi/AnimationQvan/T_GouPiFu.jpg b/Assets/Art/Textures/LouDi/AnimationQvan/T_GouPiFu.jpg index 2a90e1b4..b1bd1225 100644 Binary files a/Assets/Art/Textures/LouDi/AnimationQvan/T_GouPiFu.jpg and b/Assets/Art/Textures/LouDi/AnimationQvan/T_GouPiFu.jpg differ diff --git a/Assets/Art/Textures/LouDi/Texture.meta b/Assets/Art/Textures/LouDi/Texture.meta new file mode 100644 index 00000000..5f296b88 --- /dev/null +++ b/Assets/Art/Textures/LouDi/Texture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d3349e1ac88b2f249a43e604ddf2e711 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Textures/LouDi/Texture/T_M_Gou_Pi_AO.jpg b/Assets/Art/Textures/LouDi/Texture/T_M_Gou_Pi_AO.jpg new file mode 100644 index 00000000..27275b76 Binary files /dev/null and b/Assets/Art/Textures/LouDi/Texture/T_M_Gou_Pi_AO.jpg differ diff --git a/Assets/Art/Textures/LouDi/Texture/T_M_Gou_Pi_AO.jpg.meta b/Assets/Art/Textures/LouDi/Texture/T_M_Gou_Pi_AO.jpg.meta new file mode 100644 index 00000000..77a7e948 --- /dev/null +++ b/Assets/Art/Textures/LouDi/Texture/T_M_Gou_Pi_AO.jpg.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: 8bf8c017c403a3b489ea3855cece20a5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 2 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Textures/LouDi/Texture/T_M_Gou_Pi_Normal.jpg b/Assets/Art/Textures/LouDi/Texture/T_M_Gou_Pi_Normal.jpg new file mode 100644 index 00000000..73f4d0e1 Binary files /dev/null and b/Assets/Art/Textures/LouDi/Texture/T_M_Gou_Pi_Normal.jpg differ diff --git a/Assets/Art/Textures/LouDi/Texture/T_M_Gou_Pi_Normal.jpg.meta b/Assets/Art/Textures/LouDi/Texture/T_M_Gou_Pi_Normal.jpg.meta new file mode 100644 index 00000000..649d6479 --- /dev/null +++ b/Assets/Art/Textures/LouDi/Texture/T_M_Gou_Pi_Normal.jpg.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: 7913a7e36317f2d499fa51a2c0724647 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 2 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity index ce2e7acf..88f3abb5 100644 --- a/Assets/Scenes/LouDiXuMuQvan.unity +++ b/Assets/Scenes/LouDiXuMuQvan.unity @@ -7938,6 +7938,10 @@ PrefabInstance: propertyPath: m_Name value: MaZui_SM_gou objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 75fcd91aaad071d4ea088e94136085b3, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1772356049736442438, guid: 75fcd91aaad071d4ea088e94136085b3, type: 3} propertyPath: m_IsActive value: 0 @@ -16649,14 +16653,14 @@ PlayableDirector: m_GameObject: {fileID: 214030047} m_Enabled: 1 serializedVersion: 3 - m_PlayableAsset: {fileID: 11400000, guid: 201979285cf02074caea5ef55b74c2d2, type: 2} + m_PlayableAsset: {fileID: 11400000, guid: e1f6e95b4d824474dad0bcb00c54391c, type: 2} m_InitialState: 0 m_WrapMode: 2 m_DirectorUpdateMode: 1 m_InitialTime: 0 m_SceneBindings: - key: {fileID: 2839183319087502021, guid: e1f6e95b4d824474dad0bcb00c54391c, type: 2} - value: {fileID: 0} + value: {fileID: 425714257} - key: {fileID: -6025047863600914793, guid: e1f6e95b4d824474dad0bcb00c54391c, type: 2} value: {fileID: 0} - key: {fileID: -6367086902240157012, guid: e1f6e95b4d824474dad0bcb00c54391c, type: 2} @@ -19214,14 +19218,34 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 738442634} m_Modifications: + - target: {fileID: 338530897782708409, guid: 58fd369e5a44fdd4d9e958c15f1564e0, type: 3} + propertyPath: FurLength + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 521949659860360492, guid: 58fd369e5a44fdd4d9e958c15f1564e0, type: 3} + propertyPath: FurLength + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 744673649732410816, guid: 58fd369e5a44fdd4d9e958c15f1564e0, type: 3} + propertyPath: FurLength + value: 0 + objectReference: {fileID: 0} - target: {fileID: 902517290240769558, guid: 58fd369e5a44fdd4d9e958c15f1564e0, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1109062334076451185, guid: 58fd369e5a44fdd4d9e958c15f1564e0, type: 3} + propertyPath: FurLength + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2586924405926761215, guid: 58fd369e5a44fdd4d9e958c15f1564e0, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4696167736693234010, guid: 58fd369e5a44fdd4d9e958c15f1564e0, type: 3} + propertyPath: FurLength + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5519795950397547693, guid: 58fd369e5a44fdd4d9e958c15f1564e0, type: 3} propertyPath: m_IsActive value: 0 @@ -56517,6 +56541,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} insertIndex: -1 addedObject: {fileID: 1932204887} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} + insertIndex: -1 + addedObject: {fileID: 1932204889} m_SourcePrefab: {fileID: 100100000, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} --- !u!4 &1932204886 stripped Transform: @@ -56571,6 +56598,23 @@ PlayableDirector: value: {fileID: 1623434881} m_ExposedReferences: m_References: [] +--- !u!111 &1932204889 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1143567858} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 3060610079319413300, guid: 744bd9ab344cb8b45a497a688752387e, type: 3} + m_Animations: + - {fileID: 3060610079319413300, guid: 744bd9ab344cb8b45a497a688752387e, type: 3} + - {fileID: -6004787696405322892, guid: 744bd9ab344cb8b45a497a688752387e, type: 3} + m_WrapMode: 0 + m_PlayAutomatically: 0 + m_AnimatePhysics: 0 + m_CullingType: 0 --- !u!1 &1936713206 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/TimeLines/XiShou.playable b/Assets/TimeLines/XiShou.playable index 21478804..b87bddbb 100644 --- a/Assets/TimeLines/XiShou.playable +++ b/Assets/TimeLines/XiShou.playable @@ -220,75 +220,6 @@ MonoBehaviour: m_Parent: {fileID: 11400000} m_Children: [] m_Clips: - - m_Version: 1 - m_Start: 0.7166666666666667 - m_ClipIn: 0 - m_Asset: {fileID: -1226857116327882421} - m_Duration: 3 - m_TimeScale: 1 - m_ParentTrack: {fileID: -6025047863600914793} - 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_Version: 1 m_Start: 57.5 m_ClipIn: 0 @@ -362,18 +293,6 @@ MonoBehaviour: m_Objects: [] m_PostPlaybackState: 3 --- !u!114 &-1493220652797402703 -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 &-1226857116327882421 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml index 3123d531..b524b0ba 100644 --- a/Data/Xml/Exam.xml +++ b/Data/Xml/Exam.xml @@ -2548,7 +2548,7 @@ - + diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 130e523f..4974dda3 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -42,8 +42,8 @@ PlayerSettings: m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1920 - defaultScreenHeight: 1080 + defaultScreenWidth: 4096 + defaultScreenHeight: 2160 defaultScreenWidthWeb: 1280 defaultScreenHeightWeb: 720 m_StereoRenderingPath: 0 @@ -77,7 +77,7 @@ PlayerSettings: androidMinimumWindowHeight: 300 androidFullscreenMode: 1 androidAutoRotationBehavior: 1 - defaultIsNativeResolution: 1 + defaultIsNativeResolution: 0 macRetinaSupport: 1 runInBackground: 1 captureSingleScreen: 0