From 836b0857954bdb5e238a8e21b02c76928b3ea41d Mon Sep 17 00:00:00 2001 From: hevinci Date: Tue, 18 Jul 2023 11:21:23 +0800 Subject: [PATCH] update space shooter --- .../Asteroid/prop_asteroid_01/Materials.meta | 8 -- .../Materials/prop_asteroid_01_mat.mat | 77 ----------- .../Materials/prop_asteroid_01_mat.mat.meta | 8 -- .../prop_asteroid_01/prop_asteroid_01_mat.mat | 26 +++- .../Asteroid/prop_asteroid_02/Materials.meta | 8 -- .../Materials/prop_asteroid_02_mat.mat | 77 ----------- .../Materials/prop_asteroid_02_mat.mat.meta | 8 -- .../prop_asteroid_02/prop_asteroid_02_mat.mat | 26 +++- .../Asteroid/prop_asteroid_03/Materials.meta | 8 -- .../Materials/prop_asteroid_03_mat.mat | 77 ----------- .../Materials/prop_asteroid_03_mat.mat.meta | 8 -- .../prop_asteroid_03_dff.tif.meta | 124 +++++++++++++++--- .../prop_asteroid_03/prop_asteroid_03_mat.mat | 29 +++- .../Vehicle/vehicle_enemyShip/Materials.meta | 8 -- .../Materials/vehicle_enemyShip_glow_mat.mat | 77 ----------- .../vehicle_enemyShip_glow_mat.mat.meta | 8 -- .../Materials/vehicle_enemyShip_metal_mat.mat | 77 ----------- .../vehicle_enemyShip_metal_mat.mat.meta | 8 -- .../vehicle_enemyShip_glow_mat.mat | 33 ++++- .../vehicle_enemyShip_metal_mat.mat | 29 +++- .../vehicle_playerShip_glass_mat.mat | 29 +++- .../vehicle_playerShip_metal_mat.mat | 29 +++- .../PatchLogic/FsmNode/FsmInitialize.cs | 12 ++ .../PatchLogic/FsmNode/FsmUpdateVersion.cs | 1 + 24 files changed, 310 insertions(+), 485 deletions(-) delete mode 100644 Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/Materials.meta delete mode 100644 Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/Materials/prop_asteroid_01_mat.mat delete mode 100644 Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/Materials/prop_asteroid_01_mat.mat.meta delete mode 100644 Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/Materials.meta delete mode 100644 Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/Materials/prop_asteroid_02_mat.mat delete mode 100644 Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/Materials/prop_asteroid_02_mat.mat.meta delete mode 100644 Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/Materials.meta delete mode 100644 Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/Materials/prop_asteroid_03_mat.mat delete mode 100644 Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/Materials/prop_asteroid_03_mat.mat.meta delete mode 100644 Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials.meta delete mode 100644 Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_glow_mat.mat delete mode 100644 Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_glow_mat.mat.meta delete mode 100644 Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_metal_mat.mat delete mode 100644 Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_metal_mat.mat.meta diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/Materials.meta b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/Materials.meta deleted file mode 100644 index 842b235..0000000 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 10823e059e253a04083b6122027db930 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/Materials/prop_asteroid_01_mat.mat b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/Materials/prop_asteroid_01_mat.mat deleted file mode 100644 index 1b2a3dc..0000000 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/Materials/prop_asteroid_01_mat.mat +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: prop_asteroid_01_mat - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _NORMALMAP - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/Materials/prop_asteroid_01_mat.mat.meta b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/Materials/prop_asteroid_01_mat.mat.meta deleted file mode 100644 index b5bc937..0000000 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/Materials/prop_asteroid_01_mat.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2028e985f7c2d9740858bcf7b567af05 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/prop_asteroid_01_mat.mat b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/prop_asteroid_01_mat.mat index ca1c744..d44e651 100644 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/prop_asteroid_01_mat.mat +++ b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/prop_asteroid_01_mat.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: prop_asteroid_01_mat - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ba67c8b1d5e59dc428ad9fc9270f8353, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -27,6 +27,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -47,6 +51,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -56,24 +64,40 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _AmbiencePower: 1 + - _Brightness: 0 - _BumpScale: 1 + - _ColorToggle: 0 + - _Contrast: 1 - _Cutoff: 0.5 + - _Detail: 0 - _DetailNormalMapScale: 1 + - _DetailStrength: 1 + - _DiffusePower: 1 - _DstBlend: 0 + - _Emission: 0 + - _EmissionStrength: 1 - _GlossMapScale: 1 - _Glossiness: 0.316 - _GlossyReflections: 1 + - _Mask: 0 - _Metallic: 0 - _Mode: 0 + - _Normal: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _Phong: 0 - _Shininess: 0.112127006 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 + - _SpecularPower: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _PointLightColor: {r: 1, g: 1, b: 1, a: 1} + - _PointLightPosition: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.41911763, g: 0.39786422, b: 0.34207395, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/Materials.meta b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/Materials.meta deleted file mode 100644 index 750b78b..0000000 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 11bb85ea268af24479830c45b3b21962 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/Materials/prop_asteroid_02_mat.mat b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/Materials/prop_asteroid_02_mat.mat deleted file mode 100644 index 66a9d1f..0000000 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/Materials/prop_asteroid_02_mat.mat +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: prop_asteroid_02_mat - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _NORMALMAP - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/Materials/prop_asteroid_02_mat.mat.meta b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/Materials/prop_asteroid_02_mat.mat.meta deleted file mode 100644 index 077e474..0000000 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/Materials/prop_asteroid_02_mat.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ec1ef84828f4b1e478c51c1c468a3fb6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/prop_asteroid_02_mat.mat b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/prop_asteroid_02_mat.mat index 660669b..6df9c19 100644 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/prop_asteroid_02_mat.mat +++ b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/prop_asteroid_02_mat.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: prop_asteroid_02_mat - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ba67c8b1d5e59dc428ad9fc9270f8353, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -27,6 +27,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -47,6 +51,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -56,24 +64,40 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _AmbiencePower: 1 + - _Brightness: 0 - _BumpScale: 1 + - _ColorToggle: 0 + - _Contrast: 1 - _Cutoff: 0.5 + - _Detail: 0 - _DetailNormalMapScale: 1 + - _DetailStrength: 1 + - _DiffusePower: 1 - _DstBlend: 0 + - _Emission: 0 + - _EmissionStrength: 1 - _GlossMapScale: 1 - _Glossiness: 0.385 - _GlossyReflections: 1 + - _Mask: 0 - _Metallic: 0 - _Mode: 0 + - _Normal: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _Phong: 0 - _Shininess: 0.044885967 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 + - _SpecularPower: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _PointLightColor: {r: 1, g: 1, b: 1, a: 1} + - _PointLightPosition: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.3897059, g: 0.3606163, b: 0.29801038, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/Materials.meta b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/Materials.meta deleted file mode 100644 index 5bc80a1..0000000 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 341ae2d28a0e18a40907cf38d7113825 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/Materials/prop_asteroid_03_mat.mat b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/Materials/prop_asteroid_03_mat.mat deleted file mode 100644 index da32036..0000000 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/Materials/prop_asteroid_03_mat.mat +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: prop_asteroid_03_mat - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _NORMALMAP - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/Materials/prop_asteroid_03_mat.mat.meta b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/Materials/prop_asteroid_03_mat.mat.meta deleted file mode 100644 index 9a44e4a..0000000 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/Materials/prop_asteroid_03_mat.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bb585fc32e8ff0d4ca301d5ace6cb531 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/prop_asteroid_03_dff.tif.meta b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/prop_asteroid_03_dff.tif.meta index b30a5b2..986a146 100644 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/prop_asteroid_03_dff.tif.meta +++ b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/prop_asteroid_03_dff.tif.meta @@ -1,53 +1,145 @@ fileFormatVersion: 2 guid: 836be25be3e1e8c41ae5545bc8a9a4d7 TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 512 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 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 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/prop_asteroid_03_mat.mat b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/prop_asteroid_03_mat.mat index d801790..00bb8e8 100644 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/prop_asteroid_03_mat.mat +++ b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/prop_asteroid_03_mat.mat @@ -5,9 +5,10 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: prop_asteroid_03_mat - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ba67c8b1d5e59dc428ad9fc9270f8353, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -26,6 +27,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -46,6 +51,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,24 +64,40 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _AmbiencePower: 1 + - _Brightness: 0 - _BumpScale: 1 + - _ColorToggle: 0 + - _Contrast: 1 - _Cutoff: 0.5 + - _Detail: 0 - _DetailNormalMapScale: 1 + - _DetailStrength: 1 + - _DiffusePower: 1 - _DstBlend: 0 + - _Emission: 0 + - _EmissionStrength: 1 - _GlossMapScale: 1 - _Glossiness: 0.454 - _GlossyReflections: 1 + - _Mask: 0 - _Metallic: 0 - _Mode: 0 + - _Normal: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _Phong: 0 - _Shininess: 0.05909175 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 + - _SpecularPower: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _PointLightColor: {r: 1, g: 1, b: 1, a: 1} + - _PointLightPosition: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.33823532, g: 0.32863027, b: 0.30341697, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials.meta b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials.meta deleted file mode 100644 index 12b01c7..0000000 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cb1f7120ecd3f5e478f7505c2921cc35 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_glow_mat.mat b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_glow_mat.mat deleted file mode 100644 index 8dbd500..0000000 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_glow_mat.mat +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: vehicle_enemyShip_glow_mat - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_glow_mat.mat.meta b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_glow_mat.mat.meta deleted file mode 100644 index 6d7f41c..0000000 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_glow_mat.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 675de5eae7418564e9f77608fb14ce96 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_metal_mat.mat b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_metal_mat.mat deleted file mode 100644 index 205f618..0000000 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_metal_mat.mat +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: vehicle_enemyShip_metal_mat - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _EMISSION _NORMALMAP - m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_metal_mat.mat.meta b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_metal_mat.mat.meta deleted file mode 100644 index 2786405..0000000 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_metal_mat.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 66c224bd8cd9b7d44bf7944e32b603fe -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/vehicle_enemyShip_glow_mat.mat b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/vehicle_enemyShip_glow_mat.mat index 6bf684e..0fdd6f1 100644 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/vehicle_enemyShip_glow_mat.mat +++ b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/vehicle_enemyShip_glow_mat.mat @@ -5,9 +5,10 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: vehicle_enemyShip_glow_mat - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ba67c8b1d5e59dc428ad9fc9270f8353, type: 3} m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -26,6 +27,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -50,6 +55,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -59,19 +68,39 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _AmbiencePower: 1 + - _Brightness: 0 - _BumpScale: 1 + - _ColorToggle: 0 + - _Contrast: 1 - _Cutoff: 0.5 + - _Detail: 0 - _DetailNormalMapScale: 1 + - _DetailStrength: 1 + - _DiffusePower: 1 - _DstBlend: 0 + - _Emission: 0 - _EmissionLM: 0 + - _EmissionStrength: 1 + - _GlossMapScale: 1 - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Mask: 0 - _Metallic: 0 - _Mode: 0 + - _Normal: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _Phong: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SpecularPower: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0.50735295, g: 0.8573022, b: 1, a: 1} + - _PointLightColor: {r: 1, g: 1, b: 1, a: 1} + - _PointLightPosition: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/vehicle_enemyShip_metal_mat.mat b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/vehicle_enemyShip_metal_mat.mat index 51f25a3..3564dfd 100644 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/vehicle_enemyShip_metal_mat.mat +++ b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/vehicle_enemyShip_metal_mat.mat @@ -5,9 +5,10 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: vehicle_enemyShip_metal_mat - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ba67c8b1d5e59dc428ad9fc9270f8353, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -30,6 +31,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -50,6 +55,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -59,25 +68,41 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _AmbiencePower: 1 + - _Brightness: 0 - _BumpScale: 1 + - _ColorToggle: 0 + - _Contrast: 1 - _Cutoff: 0.5 + - _Detail: 0 - _DetailNormalMapScale: 1 + - _DetailStrength: 1 + - _DiffusePower: 1 - _DstBlend: 0 + - _Emission: 0 + - _EmissionStrength: 1 - _GlossMapScale: 1 - _Glossiness: 0.413 - _GlossyReflections: 1 + - _Mask: 0 - _Metallic: 0 - _Mode: 0 + - _Normal: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _Phong: 0 - _Shininess: 0.07927559 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 + - _SpecularPower: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _PointLightColor: {r: 1, g: 1, b: 1, a: 1} + - _PointLightPosition: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 0.4044118, g: 0.4578092, b: 1, a: 0.5019608} - _SpecColor: {r: 0.8308824, g: 0.986004, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_playerShip/vehicle_playerShip_glass_mat.mat b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_playerShip/vehicle_playerShip_glass_mat.mat index 482a392..5f6bfbe 100644 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_playerShip/vehicle_playerShip_glass_mat.mat +++ b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_playerShip/vehicle_playerShip_glass_mat.mat @@ -5,9 +5,10 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: vehicle_playerShip_glass_mat - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ba67c8b1d5e59dc428ad9fc9270f8353, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -30,6 +31,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -50,6 +55,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -59,25 +68,41 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _AmbiencePower: 1 + - _Brightness: 0 - _BumpScale: 1 + - _ColorToggle: 0 + - _Contrast: 1 - _Cutoff: 0.5 + - _Detail: 0 - _DetailNormalMapScale: 1 + - _DetailStrength: 1 + - _DiffusePower: 1 - _DstBlend: 0 + - _Emission: 0 + - _EmissionStrength: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 + - _Mask: 0 - _Metallic: 0 - _Mode: 0 + - _Normal: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _Phong: 0 - _Shininess: 0.2981632 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 + - _SpecularPower: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _PointLightColor: {r: 1, g: 1, b: 1, a: 1} + - _PointLightPosition: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 0.6014814, g: 0.8271126, b: 0.9191176, a: 0.5019608} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_playerShip/vehicle_playerShip_metal_mat.mat b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_playerShip/vehicle_playerShip_metal_mat.mat index f4f18b6..4aeda50 100644 --- a/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_playerShip/vehicle_playerShip_metal_mat.mat +++ b/Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_playerShip/vehicle_playerShip_metal_mat.mat @@ -5,9 +5,10 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: vehicle_playerShip_metal_mat - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: ba67c8b1d5e59dc428ad9fc9270f8353, type: 3} m_ShaderKeywords: _EMISSION _NORMALMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -30,6 +31,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -50,6 +55,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -59,25 +68,41 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _AmbiencePower: 1 + - _Brightness: 0 - _BumpScale: 1 + - _ColorToggle: 0 + - _Contrast: 1 - _Cutoff: 0.5 + - _Detail: 0 - _DetailNormalMapScale: 1 + - _DetailStrength: 1 + - _DiffusePower: 1 - _DstBlend: 0 + - _Emission: 0 + - _EmissionStrength: 1 - _GlossMapScale: 1 - _Glossiness: 0.515 - _GlossyReflections: 1 + - _Mask: 0 - _Metallic: 0 - _Mode: 0 + - _Normal: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _Phong: 0 - _Shininess: 0.15252854 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 + - _SpecularPower: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _PointLightColor: {r: 1, g: 1, b: 1, a: 1} + - _PointLightPosition: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 0.99264705, g: 0.9855999, b: 0.8904628, a: 0.5019608} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/PatchLogic/FsmNode/FsmInitialize.cs b/Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/PatchLogic/FsmNode/FsmInitialize.cs index 65e3d8b..cfb3f7f 100644 --- a/Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/PatchLogic/FsmNode/FsmInitialize.cs +++ b/Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/PatchLogic/FsmNode/FsmInitialize.cs @@ -74,6 +74,18 @@ internal class FsmInitialize : IStateNode initializationOperation = package.InitializeAsync(createParameters); } + // WebGL运行模式 + if(playMode == EPlayMode.WebPlayMode) + { + string defaultHostServer = GetHostServerURL(); + string fallbackHostServer = GetHostServerURL(); + var createParameters = new WebPlayModeParameters(); + createParameters.DecryptionServices = new GameDecryptionServices(); + createParameters.QueryServices = new GameQueryServices(); + createParameters.RemoteServices = new RemoteServices(defaultHostServer, fallbackHostServer); + initializationOperation = package.InitializeAsync(createParameters); + } + yield return initializationOperation; if (initializationOperation.Status == EOperationStatus.Succeed) { diff --git a/Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/PatchLogic/FsmNode/FsmUpdateVersion.cs b/Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/PatchLogic/FsmNode/FsmUpdateVersion.cs index 8330b34..66eb2e5 100644 --- a/Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/PatchLogic/FsmNode/FsmUpdateVersion.cs +++ b/Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/PatchLogic/FsmNode/FsmUpdateVersion.cs @@ -39,6 +39,7 @@ internal class FsmUpdateVersion : IStateNode if (operation.Status == EOperationStatus.Succeed) { PatchManager.Instance.PackageVersion = operation.PackageVersion; + Debug.Log($"远端最新版本为: {operation.PackageVersion}"); _machine.ChangeState(); } else