diff --git a/Assets/ArtRes/Animation/OfficeMan.controller b/Assets/ArtRes/Animation/OfficeMan.controller index 94949c0..71a583a 100644 --- a/Assets/ArtRes/Animation/OfficeMan.controller +++ b/Assets/ArtRes/Animation/OfficeMan.controller @@ -37,7 +37,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -9105721202407392744} - m_Position: {x: 350, y: 170, z: 0} + m_Position: {x: 360, y: 160, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/ArtRes/Models/Materials/fa 3.mat b/Assets/ArtRes/Models/Materials/fa 3.mat new file mode 100644 index 0000000..f3be741 --- /dev/null +++ b/Assets/ArtRes/Models/Materials/fa 3.mat @@ -0,0 +1,129 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1102268470454046786 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fa 3 + m_Shader: {fileID: -6465566751694194690, guid: 1a207e3bee00db44b940e6f362a8e148, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: + - _EMISSION + - _NORMALMAP + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BASE_COLOR_MAP: + m_Texture: {fileID: 2800000, guid: ac0fa7a6c8e3e9748ab5ea12b509a74a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BUMP_MAP: + m_Texture: {fileID: 2800000, guid: 7ac4f17a81480f9488d8ddc90d0d7b47, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EMISSION_COLOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _METALNESS_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _REFLECTIONS_COLOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _REFLECTIONS_IOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _REFLECTIONS_ROUGHNESS_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TRANSPARENCY_MAP: + m_Texture: {fileID: 2800000, guid: ac0fa7a6c8e3e9748ab5ea12b509a74a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _BASE_COLOR_WEIGHT: 1 + - _BUMP_MAP_STRENGTH: 0.3 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EMISSION_WEIGHT: 1 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _METALNESS: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 + - _REFLECTIONS_IOR: 1.52 + - _REFLECTIONS_ROUGHNESS: 0.45 + - _REFLECTIONS_WEIGHT: 0.089999996 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _TRANSPARENCY: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BASE_COLOR: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _REFLECTIONS_COLOR: {r: 0.058823533, g: 0.058823533, b: 0.058823533, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/ArtRes/Models/Materials/fa 3.mat.meta b/Assets/ArtRes/Models/Materials/fa 3.mat.meta new file mode 100644 index 0000000..6927638 --- /dev/null +++ b/Assets/ArtRes/Models/Materials/fa 3.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 482ab6e3e4be675498aeb4d483d88112 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ArtRes/Models/Materials/fa 4.mat b/Assets/ArtRes/Models/Materials/fa 4.mat new file mode 100644 index 0000000..3f823c2 --- /dev/null +++ b/Assets/ArtRes/Models/Materials/fa 4.mat @@ -0,0 +1,129 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fa 4 + m_Shader: {fileID: -6465566751694194690, guid: 1a207e3bee00db44b940e6f362a8e148, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: + - _EMISSION + - _NORMALMAP + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BASE_COLOR_MAP: + m_Texture: {fileID: 2800000, guid: ac0fa7a6c8e3e9748ab5ea12b509a74a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BUMP_MAP: + m_Texture: {fileID: 2800000, guid: 7ac4f17a81480f9488d8ddc90d0d7b47, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EMISSION_COLOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _METALNESS_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _REFLECTIONS_COLOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _REFLECTIONS_IOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _REFLECTIONS_ROUGHNESS_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TRANSPARENCY_MAP: + m_Texture: {fileID: 2800000, guid: ac0fa7a6c8e3e9748ab5ea12b509a74a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _BASE_COLOR_WEIGHT: 1 + - _BUMP_MAP_STRENGTH: 0.3 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EMISSION_WEIGHT: 1 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _METALNESS: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 + - _REFLECTIONS_IOR: 1.52 + - _REFLECTIONS_ROUGHNESS: 0.45 + - _REFLECTIONS_WEIGHT: 0.089999996 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _TRANSPARENCY: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BASE_COLOR: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _REFLECTIONS_COLOR: {r: 0.058823533, g: 0.058823533, b: 0.058823533, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &9035544008942703316 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/ArtRes/Models/Materials/fa 4.mat.meta b/Assets/ArtRes/Models/Materials/fa 4.mat.meta new file mode 100644 index 0000000..a935bec --- /dev/null +++ b/Assets/ArtRes/Models/Materials/fa 4.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e25f56cf933cf6a4d99752f737f4b319 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ArtRes/Models/Materials/vm_v2_024_bump.mat b/Assets/ArtRes/Models/Materials/vm_v2_024_bump.mat new file mode 100644 index 0000000..8d1b68a --- /dev/null +++ b/Assets/ArtRes/Models/Materials/vm_v2_024_bump.mat @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: vm_v2_024_bump + m_Shader: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BASE_COLOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BUMP_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EMISSION_COLOR_MAP: + 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} + - _METALNESS_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: e5e32ee5f59b86146b7b919b35180a7b, type: 3} + 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} + - _REFLECTIONS_COLOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _REFLECTIONS_IOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _REFLECTIONS_ROUGHNESS_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TRANSPARENCY_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _BASE_COLOR_WEIGHT: 1 + - _BUMP_MAP_STRENGTH: 0.3 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EMISSION_WEIGHT: 1 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _METALNESS: 0 + - _Metallic: 0.5 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 + - _REFLECTIONS_IOR: 1.52 + - _REFLECTIONS_ROUGHNESS: 0 + - _REFLECTIONS_WEIGHT: 1 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _TRANSPARENCY: 0 + - _UVSec: 0 + - _UseAoMap: 0 + - _UseColorMap: 1 + - _UseEmissiveMap: 0 + - _UseMetallicMap: 0 + - _UseNormalMap: 0 + - _UseRoughnessMap: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BASE_COLOR: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.7353569, g: 0.7353569, b: 0.7353569, a: 1} + - _Color: {r: 0.7075472, g: 0.7075472, b: 0.7075472, a: 1} + - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _REFLECTIONS_COLOR: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UvOffset: {r: 0, g: 0, b: 0, a: 0} + - _UvTiling: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] +--- !u!114 &27682945464226754 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/ArtRes/Models/Materials/vm_v2_024_bump.mat.meta b/Assets/ArtRes/Models/Materials/vm_v2_024_bump.mat.meta new file mode 100644 index 0000000..ad765ca --- /dev/null +++ b/Assets/ArtRes/Models/Materials/vm_v2_024_bump.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a83ec9c025d2ca4448617865a4c66916 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ArtRes/Models/Materials/工具箱-2.mat b/Assets/ArtRes/Models/Materials/工具箱-2.mat new file mode 100644 index 0000000..aa488bc --- /dev/null +++ b/Assets/ArtRes/Models/Materials/工具箱-2.mat @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u5DE5\u5177\u7BB1-2" + m_Shader: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BASE_COLOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BUMP_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EMISSION_COLOR_MAP: + 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} + - _METALNESS_MAP: + 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} + - _REFLECTIONS_COLOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _REFLECTIONS_IOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _REFLECTIONS_ROUGHNESS_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TRANSPARENCY_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _BASE_COLOR_WEIGHT: 1 + - _BUMP_MAP_STRENGTH: 0.3 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EMISSION_WEIGHT: 1 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.8 + - _GlossyReflections: 1 + - _METALNESS: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 + - _REFLECTIONS_IOR: 1.52 + - _REFLECTIONS_ROUGHNESS: 0 + - _REFLECTIONS_WEIGHT: 1 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _TRANSPARENCY: 0 + - _UVSec: 0 + - _UseAoMap: 0 + - _UseColorMap: 0 + - _UseEmissiveMap: 0 + - _UseMetallicMap: 0 + - _UseNormalMap: 0 + - _UseRoughnessMap: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BASE_COLOR: {r: 0.05755396, g: 0.05755396, b: 0.05755396, a: 1} + - _BaseColor: {r: 0.26608282, g: 0.26608282, b: 0.26608282, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _REFLECTIONS_COLOR: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UvOffset: {r: 0, g: 0, b: 0, a: 0} + - _UvTiling: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] +--- !u!114 &2128229024904009973 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/ArtRes/Models/Materials/工具箱-2.mat.meta b/Assets/ArtRes/Models/Materials/工具箱-2.mat.meta new file mode 100644 index 0000000..fbf2410 --- /dev/null +++ b/Assets/ArtRes/Models/Materials/工具箱-2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 33f38b1b23383d44abab531971dd8ed0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ArtRes/Models/Materials/工具箱-3.mat b/Assets/ArtRes/Models/Materials/工具箱-3.mat new file mode 100644 index 0000000..ca46b5c --- /dev/null +++ b/Assets/ArtRes/Models/Materials/工具箱-3.mat @@ -0,0 +1,128 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2455574063206207898 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u5DE5\u5177\u7BB1-3" + m_Shader: {fileID: -6465566751694194690, guid: 44245ab89240f51459a5077d7145c452, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BASE_COLOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BUMP_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EMISSION_COLOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _METALNESS_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _REFLECTIONS_COLOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _REFLECTIONS_IOR_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _REFLECTIONS_ROUGHNESS_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TRANSPARENCY_MAP: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _BASE_COLOR_WEIGHT: 1 + - _BUMP_MAP_STRENGTH: 0.3 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EMISSION_WEIGHT: 1 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _METALNESS: 0.502 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 + - _REFLECTIONS_IOR: 1.52 + - _REFLECTIONS_ROUGHNESS: 0 + - _REFLECTIONS_WEIGHT: 1 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _TRANSPARENCY: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BASE_COLOR: {r: 0.6603774, g: 0.6603774, b: 0.6603774, a: 1} + - _BaseColor: {r: 0.7353569, g: 0.7353569, b: 0.7353569, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _REFLECTIONS_COLOR: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/ArtRes/Models/Materials/工具箱-3.mat.meta b/Assets/ArtRes/Models/Materials/工具箱-3.mat.meta new file mode 100644 index 0000000..6748fce --- /dev/null +++ b/Assets/ArtRes/Models/Materials/工具箱-3.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8fb1cd39d1d2ced42b1ce92482709447 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ArtRes/Models/Materials/高粱果实.mat b/Assets/ArtRes/Models/Materials/高粱果实.mat index f4c3431..048e567 100644 --- a/Assets/ArtRes/Models/Materials/高粱果实.mat +++ b/Assets/ArtRes/Models/Materials/高粱果实.mat @@ -23,6 +23,7 @@ Material: m_Name: "\u9AD8\u7CB1\u679C\u5B9E" m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: + - _ALPHATEST_ON - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 6 @@ -127,7 +128,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _AlphaClip: 0 + - _AlphaClip: 1 - _BASE_COLOR_WEIGHT: 1 - _BUMP_MAP_STRENGTH: 0.3 - _Blend: 0 diff --git a/Assets/ArtRes/Models/教师(伸手动画).fbx b/Assets/ArtRes/Models/教师(伸手动画).fbx index 7593546..3aa2bb7 100644 Binary files a/Assets/ArtRes/Models/教师(伸手动画).fbx and b/Assets/ArtRes/Models/教师(伸手动画).fbx differ diff --git a/Assets/ArtRes/Models/教师(伸手动画).fbx.meta b/Assets/ArtRes/Models/教师(伸手动画).fbx.meta index fb26e84..73ec5cb 100644 --- a/Assets/ArtRes/Models/教师(伸手动画).fbx.meta +++ b/Assets/ArtRes/Models/教师(伸手动画).fbx.meta @@ -8,7 +8,7 @@ ModelImporter: materialImportMode: 2 materialName: 0 materialSearch: 1 - materialLocation: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 diff --git a/Assets/ArtRes/Texture/vm_v2_024_bump.jpg b/Assets/ArtRes/Texture/vm_v2_024_bump.jpg new file mode 100644 index 0000000..3400620 Binary files /dev/null and b/Assets/ArtRes/Texture/vm_v2_024_bump.jpg differ diff --git a/Assets/ArtRes/Texture/vm_v2_024_bump.jpg.meta b/Assets/ArtRes/Texture/vm_v2_024_bump.jpg.meta new file mode 100644 index 0000000..216dc1e --- /dev/null +++ b/Assets/ArtRes/Texture/vm_v2_024_bump.jpg.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: e5e32ee5f59b86146b7b919b35180a7b +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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + 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: 8192 + 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: 8192 + 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: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HQB/Scene/10002_2002_03_LiveScene-test.unity b/Assets/HQB/Scene/10002_2002_03_LiveScene-test.unity index 4a1dbf6..cc45edf 100644 --- a/Assets/HQB/Scene/10002_2002_03_LiveScene-test.unity +++ b/Assets/HQB/Scene/10002_2002_03_LiveScene-test.unity @@ -199,63 +199,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 3417751804086596371, guid: 543377e480fab384db837fbf32857c2e, type: 3} ---- !u!1001 &437509738 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} - propertyPath: m_LocalPosition.x - value: 5.6683784 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} - propertyPath: m_LocalPosition.y - value: 2.1927092 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} - propertyPath: m_LocalPosition.z - value: -139.08707 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} - propertyPath: m_Name - value: "\u6559\u5E08\uFF08\u5F85\u673A\u52A8\u753B\uFF09" - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} --- !u!1 &479279932 stripped GameObject: m_CorrespondingSourceObject: {fileID: -3569136676398138436, guid: 543377e480fab384db837fbf32857c2e, type: 3} @@ -307,7 +250,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} propertyPath: m_LocalPosition.x @@ -350,9 +293,8 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 7561753228374517298, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} - - {fileID: 8259647949277795141, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} - - {fileID: 2399593117623680743, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} + - {fileID: 0} + - {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} --- !u!1 &590408330 stripped GameObject: @@ -506,7 +448,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &750740227 GameObject: @@ -604,7 +546,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &827966436 PrefabInstance: @@ -615,7 +557,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3} propertyPath: m_RootOrder - value: 11 + value: 10 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3} propertyPath: m_LocalPosition.x @@ -667,6 +609,89 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3} +--- !u!1001 &885825242 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 3c4efde06dda5f2459a3fecf3471ae17, type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c4efde06dda5f2459a3fecf3471ae17, type: 3} + propertyPath: m_LocalPosition.x + value: 5.6683784 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c4efde06dda5f2459a3fecf3471ae17, type: 3} + propertyPath: m_LocalPosition.y + value: 2.1927092 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c4efde06dda5f2459a3fecf3471ae17, type: 3} + propertyPath: m_LocalPosition.z + value: -139.08707 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c4efde06dda5f2459a3fecf3471ae17, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c4efde06dda5f2459a3fecf3471ae17, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c4efde06dda5f2459a3fecf3471ae17, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c4efde06dda5f2459a3fecf3471ae17, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c4efde06dda5f2459a3fecf3471ae17, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c4efde06dda5f2459a3fecf3471ae17, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3c4efde06dda5f2459a3fecf3471ae17, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 3c4efde06dda5f2459a3fecf3471ae17, type: 3} + propertyPath: m_Name + value: "\u6559\u5E08\uFF08\u4F38\u624B\u52A8\u753B\uFF09" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c4efde06dda5f2459a3fecf3471ae17, type: 3} +--- !u!1 &885825243 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3c4efde06dda5f2459a3fecf3471ae17, type: 3} + m_PrefabInstance: {fileID: 885825242} + m_PrefabAsset: {fileID: 0} +--- !u!95 &885825244 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 885825243} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: ec3b382f5c471af49bb2c9f740b13c7d, type: 3} + m_Controller: {fileID: 9100000, guid: 17a7fbd6727d90e44b8e9159e5f08945, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1001 &920617056 PrefabInstance: m_ObjectHideFlags: 0 @@ -676,7 +701,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3} propertyPath: m_LocalPosition.x @@ -774,7 +799,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 543377e480fab384db837fbf32857c2e, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 543377e480fab384db837fbf32857c2e, type: 3} propertyPath: m_LocalPosition.x @@ -849,7 +874,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: bb9c532ae1143d34d8245bbea5f5ce9b, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bb9c532ae1143d34d8245bbea5f5ce9b, type: 3} propertyPath: m_LocalPosition.x @@ -944,11 +969,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1643659032} - {fileID: 1840674608} - - {fileID: 1584834557} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &1580293549 stripped GameObject: @@ -969,68 +992,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -4886929517496684665, guid: 543377e480fab384db837fbf32857c2e, type: 3} ---- !u!1001 &1584834556 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1464743438} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: fadc62ef26458d5419e179d8a7bcce31, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: fadc62ef26458d5419e179d8a7bcce31, type: 3} - propertyPath: m_LocalPosition.x - value: -3.6678119 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: fadc62ef26458d5419e179d8a7bcce31, type: 3} - propertyPath: m_LocalPosition.y - value: -1.2411855 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: fadc62ef26458d5419e179d8a7bcce31, type: 3} - propertyPath: m_LocalPosition.z - value: 5.045093 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: fadc62ef26458d5419e179d8a7bcce31, type: 3} - propertyPath: m_LocalRotation.w - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: fadc62ef26458d5419e179d8a7bcce31, type: 3} - propertyPath: m_LocalRotation.x - value: -0.5 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: fadc62ef26458d5419e179d8a7bcce31, type: 3} - propertyPath: m_LocalRotation.y - value: -0.5 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: fadc62ef26458d5419e179d8a7bcce31, type: 3} - propertyPath: m_LocalRotation.z - value: -0.5 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: fadc62ef26458d5419e179d8a7bcce31, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: fadc62ef26458d5419e179d8a7bcce31, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: fadc62ef26458d5419e179d8a7bcce31, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: fadc62ef26458d5419e179d8a7bcce31, type: 3} - propertyPath: m_Name - value: "\u9AD8\u7CB1\uFF08\u6BD4\u5BF9\uFF09" - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: fadc62ef26458d5419e179d8a7bcce31, type: 3} ---- !u!4 &1584834557 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: fadc62ef26458d5419e179d8a7bcce31, type: 3} - m_PrefabInstance: {fileID: 1584834556} - m_PrefabAsset: {fileID: 0} --- !u!1 &1597163595 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7422468867304708052, guid: 543377e480fab384db837fbf32857c2e, type: 3} @@ -1069,68 +1030,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 8342827997910653767, guid: 543377e480fab384db837fbf32857c2e, type: 3} ---- !u!1001 &1643659031 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1464743438} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 4f5a9824fe659644ab3959aed343dc37, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4f5a9824fe659644ab3959aed343dc37, type: 3} - propertyPath: m_LocalPosition.x - value: -2.1632664 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4f5a9824fe659644ab3959aed343dc37, type: 3} - propertyPath: m_LocalPosition.y - value: -1.1574645 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4f5a9824fe659644ab3959aed343dc37, type: 3} - propertyPath: m_LocalPosition.z - value: 4.9936476 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4f5a9824fe659644ab3959aed343dc37, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4f5a9824fe659644ab3959aed343dc37, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4f5a9824fe659644ab3959aed343dc37, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4f5a9824fe659644ab3959aed343dc37, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4f5a9824fe659644ab3959aed343dc37, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4f5a9824fe659644ab3959aed343dc37, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4f5a9824fe659644ab3959aed343dc37, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 4f5a9824fe659644ab3959aed343dc37, type: 3} - propertyPath: m_Name - value: "\u5256\u9762\u571F\u58E4" - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4f5a9824fe659644ab3959aed343dc37, type: 3} ---- !u!4 &1643659032 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4f5a9824fe659644ab3959aed343dc37, type: 3} - m_PrefabInstance: {fileID: 1643659031} - m_PrefabAsset: {fileID: 0} --- !u!1 &1730488779 GameObject: m_ObjectHideFlags: 0 @@ -1329,7 +1228,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1840258526 MonoBehaviour: @@ -1521,7 +1420,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1875192044 MonoBehaviour: @@ -1726,5 +1625,5 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} diff --git a/Assets/Plugins/ModularFirstPersonController/FirstPersonController/FirstPersonController.cs b/Assets/Plugins/ModularFirstPersonController/FirstPersonController/FirstPersonController.cs index 022491c..9fff43f 100644 --- a/Assets/Plugins/ModularFirstPersonController/FirstPersonController/FirstPersonController.cs +++ b/Assets/Plugins/ModularFirstPersonController/FirstPersonController/FirstPersonController.cs @@ -214,7 +214,7 @@ public class FirstPersonController : MonoBehaviour private void Update() { - if (!EventSystem.current.IsPointerOverGameObject()) return; + //if (!EventSystem.current.IsPointerOverGameObject()) return; float scrollValue = Input.GetAxis("Mouse ScrollWheel"); if (scrollValue != 0) {