diff --git a/Assets/ScenesYL/BuildingScene.unity b/Assets/ScenesYL/BuildingScene.unity index 0c3ba4e..527024d 100644 --- a/Assets/ScenesYL/BuildingScene.unity +++ b/Assets/ScenesYL/BuildingScene.unity @@ -320,6 +320,78 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -3189427797568355340, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} +--- !u!114 &144116916 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 121998278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0f36456c352b534cb76fe2cc683b76d, type: 3} + m_Name: + m_EditorClassIdentifier: + cloneOnFloorType: 2 +--- !u!114 &144116917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 121998278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b133d14efd54f9841a1659ef37479be7, type: 3} + m_Name: + m_EditorClassIdentifier: + CloneableTypes: + isHandleCloneHitPoint: 0 +--- !u!114 &144116918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 121998278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e8d81443c4641144bb54392c5b90233, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &144116919 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 121998278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 77fb9be10c0901f46a68b3ee09e7972b, type: 3} + m_Name: + m_EditorClassIdentifier: + gameObjID: 7431003664179789824 + gameObjType: 102 + buildNum: + floorNum: 0 + interlayerNum: 0 + Layer: 0 + inOutType: 0 + UserId: + ShoworHidden: 0 +--- !u!114 &144116920 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 121998278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 06770370b4d869f4b963f726d21b7063, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &210392000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -402,6 +474,78 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -5826702118321648356, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} +--- !u!114 &266667683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 121998277} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0f36456c352b534cb76fe2cc683b76d, type: 3} + m_Name: + m_EditorClassIdentifier: + cloneOnFloorType: 2 +--- !u!114 &266667684 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 121998277} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b133d14efd54f9841a1659ef37479be7, type: 3} + m_Name: + m_EditorClassIdentifier: + CloneableTypes: + isHandleCloneHitPoint: 0 +--- !u!114 &266667685 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 121998277} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e8d81443c4641144bb54392c5b90233, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &266667686 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 121998277} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 77fb9be10c0901f46a68b3ee09e7972b, type: 3} + m_Name: + m_EditorClassIdentifier: + gameObjID: 7431003780143906817 + gameObjType: 102 + buildNum: + floorNum: 0 + interlayerNum: 0 + Layer: 0 + inOutType: 0 + UserId: + ShoworHidden: 0 +--- !u!114 &266667687 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 121998277} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 06770370b4d869f4b963f726d21b7063, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &303613253 MonoBehaviour: m_ObjectHideFlags: 0 @@ -955,8 +1099,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_SerializedVersion: 0 - m_AgentTypeID: -334000983 - m_CollectObjects: 1 + m_AgentTypeID: -1372625422 + m_CollectObjects: 0 m_Size: {x: 500, y: 200, z: 800} m_Center: {x: 0, y: 2, z: 0} m_LayerMask: @@ -1534,7 +1678,7 @@ MonoBehaviour: m_Center: {x: 0, y: 2, z: 0} m_LayerMask: serializedVersion: 2 - m_Bits: 1140916224 + m_Bits: 1140850688 m_UseGeometry: 0 m_DefaultArea: 0 m_GenerateLinks: 0 @@ -1543,7 +1687,7 @@ MonoBehaviour: m_OverrideTileSize: 0 m_TileSize: 256 m_OverrideVoxelSize: 0 - m_VoxelSize: 0.033333335 + m_VoxelSize: 0.060000002 m_MinRegionArea: 2 m_NavMeshData: {fileID: 23800000, guid: eb330ee417bd93e4bb60b686a8ce1b64, type: 2} m_BuildHeightMesh: 0 @@ -1611,6 +1755,10 @@ PrefabInstance: propertyPath: m_Layer value: 26 objectReference: {fileID: 0} + - target: {fileID: 448566105250902507, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} + propertyPath: m_Layer + value: 30 + objectReference: {fileID: 0} - target: {fileID: 448566105250902507, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} propertyPath: m_IsActive value: 1 @@ -1779,6 +1927,10 @@ PrefabInstance: propertyPath: m_Layer value: 30 objectReference: {fileID: 0} + - target: {fileID: 2728466996887127059, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} + propertyPath: m_Layer + value: 30 + objectReference: {fileID: 0} - target: {fileID: 3000021012051502032, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} propertyPath: m_Layer value: 26 @@ -2439,9 +2591,39 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 448566105250902507, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} insertIndex: -1 addedObject: {fileID: 144116915} + - targetCorrespondingSourceObject: {fileID: 448566105250902507, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} + insertIndex: -1 + addedObject: {fileID: 144116920} + - targetCorrespondingSourceObject: {fileID: 448566105250902507, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} + insertIndex: -1 + addedObject: {fileID: 144116919} + - targetCorrespondingSourceObject: {fileID: 448566105250902507, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} + insertIndex: -1 + addedObject: {fileID: 144116918} + - targetCorrespondingSourceObject: {fileID: 448566105250902507, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} + insertIndex: -1 + addedObject: {fileID: 144116917} + - targetCorrespondingSourceObject: {fileID: 448566105250902507, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} + insertIndex: -1 + addedObject: {fileID: 144116916} - targetCorrespondingSourceObject: {fileID: 2728466996887127059, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} insertIndex: -1 addedObject: {fileID: 266667682} + - targetCorrespondingSourceObject: {fileID: 2728466996887127059, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} + insertIndex: -1 + addedObject: {fileID: 266667687} + - targetCorrespondingSourceObject: {fileID: 2728466996887127059, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} + insertIndex: -1 + addedObject: {fileID: 266667686} + - targetCorrespondingSourceObject: {fileID: 2728466996887127059, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} + insertIndex: -1 + addedObject: {fileID: 266667685} + - targetCorrespondingSourceObject: {fileID: 2728466996887127059, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} + insertIndex: -1 + addedObject: {fileID: 266667684} + - targetCorrespondingSourceObject: {fileID: 2728466996887127059, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} + insertIndex: -1 + addedObject: {fileID: 266667683} m_SourcePrefab: {fileID: 100100000, guid: 95c18cf4ba9bfbe469a52ba950dee9fb, type: 3} --- !u!1 &153745960309963044 stripped GameObject: diff --git a/Assets/ScenesYL/BuildingScene/NavMesh-car.asset b/Assets/ScenesYL/BuildingScene/NavMesh-car.asset index 16866df..61758b6 100644 Binary files a/Assets/ScenesYL/BuildingScene/NavMesh-car.asset and b/Assets/ScenesYL/BuildingScene/NavMesh-car.asset differ diff --git a/Assets/ScenesYL/BuildingScene/NavMesh-man.asset b/Assets/ScenesYL/BuildingScene/NavMesh-man.asset index 8cf57aa..23045cc 100644 Binary files a/Assets/ScenesYL/BuildingScene/NavMesh-man.asset and b/Assets/ScenesYL/BuildingScene/NavMesh-man.asset differ diff --git a/Assets/StreamingAssets/AssetBundles/YLCJY/YLCJY b/Assets/StreamingAssets/AssetBundles/YLCJY/YLCJY index 5742344..7a8d283 100644 Binary files a/Assets/StreamingAssets/AssetBundles/YLCJY/YLCJY and b/Assets/StreamingAssets/AssetBundles/YLCJY/YLCJY differ diff --git a/Assets/StreamingAssets/AssetBundles/YLCJY/YLCJY.manifest b/Assets/StreamingAssets/AssetBundles/YLCJY/YLCJY.manifest index 271db72..e910702 100644 --- a/Assets/StreamingAssets/AssetBundles/YLCJY/YLCJY.manifest +++ b/Assets/StreamingAssets/AssetBundles/YLCJY/YLCJY.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 -UnityVersion: 6000.0.17f1c1 -CRC: 170296330 +UnityVersion: 6000.0.13f1 +CRC: 953485462 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/AssetBundles/YLCJY/buildingscene b/Assets/StreamingAssets/AssetBundles/YLCJY/buildingscene index af5b5e1..fb1a2c4 100644 Binary files a/Assets/StreamingAssets/AssetBundles/YLCJY/buildingscene and b/Assets/StreamingAssets/AssetBundles/YLCJY/buildingscene differ diff --git a/Assets/StreamingAssets/AssetBundles/YLCJY/buildingscene.manifest b/Assets/StreamingAssets/AssetBundles/YLCJY/buildingscene.manifest index 9716673..c59118f 100644 --- a/Assets/StreamingAssets/AssetBundles/YLCJY/buildingscene.manifest +++ b/Assets/StreamingAssets/AssetBundles/YLCJY/buildingscene.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 -UnityVersion: 6000.0.17f1c1 -CRC: 4065996987 +UnityVersion: 6000.0.13f1 +CRC: 3507354875 Hashes: AssetFileHash: serializedVersion: 2 - Hash: da350a7b0a1da852d265a27279e51d3c + Hash: bf7f3938569825f904cce9ba40e0fb48 TypeTreeHash: serializedVersion: 2 - Hash: 1188ec86caf434afd794b775e092b19e + Hash: ba80103e329164b2e3ecc1a9490cf89b IncrementalBuildHash: serializedVersion: 2 - Hash: 570cdf53026f6c83a466586308efa826 + Hash: 184586a390ed84e0270c6ed8a7b2b685 HashAppended: 0 ClassTypes: - Class: 1 @@ -52,13 +52,13 @@ ClassTypes: - Class: 114 Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} - Class: 114 - Script: {fileID: 11500000, guid: b0f36456c352b534cb76fe2cc683b76d, type: 3} + Script: {fileID: 11500000, guid: 06770370b4d869f4b963f726d21b7063, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 9e8d81443c4641144bb54392c5b90233, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 06770370b4d869f4b963f726d21b7063, type: 3} - Class: 114 Script: {fileID: 11500000, guid: b133d14efd54f9841a1659ef37479be7, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: b0f36456c352b534cb76fe2cc683b76d, type: 3} - Class: 115 Script: {instanceID: 0} - Class: 157 diff --git a/Assets/StreamingAssets/WebAssetBundles/YLCJY/YLCJY b/Assets/StreamingAssets/WebAssetBundles/YLCJY/YLCJY index 87c376a..807d28b 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/YLCJY/YLCJY and b/Assets/StreamingAssets/WebAssetBundles/YLCJY/YLCJY differ diff --git a/Assets/StreamingAssets/WebAssetBundles/YLCJY/YLCJY.manifest b/Assets/StreamingAssets/WebAssetBundles/YLCJY/YLCJY.manifest index 1f4b8c5..5e9e1b6 100644 --- a/Assets/StreamingAssets/WebAssetBundles/YLCJY/YLCJY.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/YLCJY/YLCJY.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 -UnityVersion: 6000.0.17f1c1 -CRC: 583330098 +UnityVersion: 6000.0.13f1 +CRC: 3018295313 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/WebAssetBundles/YLCJY/buildingscene b/Assets/StreamingAssets/WebAssetBundles/YLCJY/buildingscene index fcbe561..7ba13c3 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/YLCJY/buildingscene and b/Assets/StreamingAssets/WebAssetBundles/YLCJY/buildingscene differ diff --git a/Assets/StreamingAssets/WebAssetBundles/YLCJY/buildingscene.manifest b/Assets/StreamingAssets/WebAssetBundles/YLCJY/buildingscene.manifest index 18984ba..42a1c2a 100644 --- a/Assets/StreamingAssets/WebAssetBundles/YLCJY/buildingscene.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/YLCJY/buildingscene.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 -UnityVersion: 6000.0.17f1c1 -CRC: 3498253882 +UnityVersion: 6000.0.13f1 +CRC: 1240342544 Hashes: AssetFileHash: serializedVersion: 2 - Hash: c7223a90e7b05321b22fabd7ea117b1a + Hash: be570619fc5623b1714e86d3a01ea4d6 TypeTreeHash: serializedVersion: 2 - Hash: 1188ec86caf434afd794b775e092b19e + Hash: ba80103e329164b2e3ecc1a9490cf89b IncrementalBuildHash: serializedVersion: 2 - Hash: 422f8f2c4d903376adf03b299f53f292 + Hash: ac4db69d3591cf9cb77f414afa22a292 HashAppended: 0 ClassTypes: - Class: 1 @@ -52,13 +52,13 @@ ClassTypes: - Class: 114 Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} - Class: 114 - Script: {fileID: 11500000, guid: b0f36456c352b534cb76fe2cc683b76d, type: 3} + Script: {fileID: 11500000, guid: 06770370b4d869f4b963f726d21b7063, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 9e8d81443c4641144bb54392c5b90233, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 06770370b4d869f4b963f726d21b7063, type: 3} - Class: 114 Script: {fileID: 11500000, guid: b133d14efd54f9841a1659ef37479be7, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: b0f36456c352b534cb76fe2cc683b76d, type: 3} - Class: 115 Script: {instanceID: 0} - Class: 157 diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset index 7b9b45c..1e9b02d 100644 --- a/ProjectSettings/NavMeshAreas.asset +++ b/ProjectSettings/NavMeshAreas.asset @@ -69,11 +69,11 @@ NavMeshProjectSettings: cost: 1 - name: cost: 1 - m_LastAgentTypeID: -334000983 + m_LastAgentTypeID: -1372625422 m_Settings: - serializedVersion: 3 agentTypeID: 0 - agentRadius: 0.1 + agentRadius: 0.18 agentHeight: 1 agentSlope: 60 agentClimb: 0.5 @@ -90,7 +90,7 @@ NavMeshProjectSettings: debug: m_Flags: 0 - serializedVersion: 3 - agentTypeID: -334000983 + agentTypeID: -1372625422 agentRadius: 0.3 agentHeight: 1 agentSlope: 45 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 8dbc488..3b9b5c9 100644 Binary files a/ProjectSettings/TagManager.asset and b/ProjectSettings/TagManager.asset differ