diff --git a/Assets/CloneTypesTemplate/Editor/SceneTool.cs b/Assets/CloneTypesTemplate/Editor/SceneTool.cs index 2c366c7..b2f27d3 100644 --- a/Assets/CloneTypesTemplate/Editor/SceneTool.cs +++ b/Assets/CloneTypesTemplate/Editor/SceneTool.cs @@ -310,6 +310,25 @@ public class SceneTool } } } + [MenuItem("SceneTool/CheckPathFind")]//地面的楼顶(都不能走),常见为地下建筑上的花坛 + public static void CheckPathFind() + { + Transform[] obj = Selection.GetTransforms(SelectionMode.Deep); + { + for (int i = 0; i < obj.Length; i++) + { + if (obj[i].gameObject.layer == LayerMask.NameToLayer("CarRoad") || + obj[i].gameObject.layer == LayerMask.NameToLayer("SoldierRoad")) + { + if (obj[i].GetComponent<MeshRenderer>() && obj[i].GetComponent<CloneEnumsHelp>() + && !obj[i].GetComponent<PathFindable>() && !obj[i].GetComponent<NavMeshModifier>()) + { + obj[i].gameObject.AddComponent<PathFindable>(); + } + } + } + } + } [MenuItem("SceneTool/DiXiaLouDing/DouBuZou")]//地面的楼顶(都不能走),常见为地下建筑上的花坛 public static void DiXiaLouDingDouBuZou() { diff --git a/Assets/ScenesKH/BuildingScene.unity b/Assets/ScenesKH/BuildingScene.unity index 0404a6b..74b0f78 100644 --- a/Assets/ScenesKH/BuildingScene.unity +++ b/Assets/ScenesKH/BuildingScene.unity @@ -224,7 +224,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_SerializedVersion: 0 - m_AgentTypeID: 0 + m_AgentTypeID: -1372625422 m_CollectObjects: 0 m_Size: {x: 10, y: 10, z: 10} m_Center: {x: 0, y: 2, z: 0} @@ -239,7 +239,7 @@ MonoBehaviour: m_OverrideTileSize: 0 m_TileSize: 256 m_OverrideVoxelSize: 0 - m_VoxelSize: 0.05 + m_VoxelSize: 0.1 m_MinRegionArea: 2 m_NavMeshData: {fileID: 23800000, guid: 8f56def994310e046b0a6a4dfa82f5c2, type: 2} m_BuildHeightMesh: 0 diff --git a/Assets/ScenesKH/BuildingScene/NavMesh-car.asset b/Assets/ScenesKH/BuildingScene/NavMesh-car.asset index 16f942b..0014771 100644 Binary files a/Assets/ScenesKH/BuildingScene/NavMesh-car.asset and b/Assets/ScenesKH/BuildingScene/NavMesh-car.asset differ diff --git a/Assets/ScenesKH/GangWuBu.prefab b/Assets/ScenesKH/GangWuBu.prefab index 2eaa997..06e7843 100644 --- a/Assets/ScenesKH/GangWuBu.prefab +++ b/Assets/ScenesKH/GangWuBu.prefab @@ -44231,6 +44231,7 @@ GameObject: - component: {fileID: 1620755795256662796} - component: {fileID: 9181117047764438554} - component: {fileID: 5447042696292079806} + - component: {fileID: 2616828793632868576} m_Layer: 16 m_Name: GuanQuDM001 m_TagString: Untagged @@ -44376,6 +44377,18 @@ MonoBehaviour: m_EditorClassIdentifier: CloneableTypes: isHandleCloneHitPoint: 0 +--- !u!114 &2616828793632868576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6988975338455849717} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 43929be615d468749bba2f9917117a45, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6991960276644624331 GameObject: m_ObjectHideFlags: 0 @@ -61164,6 +61177,7 @@ GameObject: - component: {fileID: 1383009876188193501} - component: {fileID: 4152550344191366250} - component: {fileID: 7870274401256961934} + - component: {fileID: 1835127486835455921} m_Layer: 15 m_Name: GuanQuML m_TagString: Untagged @@ -61309,6 +61323,18 @@ MonoBehaviour: m_EditorClassIdentifier: CloneableTypes: isHandleCloneHitPoint: 0 +--- !u!114 &1835127486835455921 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9039939433162814050} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 43929be615d468749bba2f9917117a45, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &9056061156568069869 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Settings/WEB_RPAsset.asset b/Assets/Settings/WEB_RPAsset.asset index 8f9daab..ff042cd 100644 --- a/Assets/Settings/WEB_RPAsset.asset +++ b/Assets/Settings/WEB_RPAsset.asset @@ -121,7 +121,7 @@ MonoBehaviour: m_PrefilterSSAOSampleCountHigh: 1 m_PrefilterDBufferMRT1: 1 m_PrefilterDBufferMRT2: 1 - m_PrefilterDBufferMRT3: 0 + m_PrefilterDBufferMRT3: 1 m_PrefilterSoftShadowsQualityLow: 1 m_PrefilterSoftShadowsQualityMedium: 1 m_PrefilterSoftShadowsQualityHigh: 1 diff --git a/Assets/StreamingAssets/AssetBundles/KHGWB/KHGWB b/Assets/StreamingAssets/AssetBundles/KHGWB/KHGWB index d394408..49219ad 100644 Binary files a/Assets/StreamingAssets/AssetBundles/KHGWB/KHGWB and b/Assets/StreamingAssets/AssetBundles/KHGWB/KHGWB differ diff --git a/Assets/StreamingAssets/AssetBundles/KHGWB/KHGWB.manifest b/Assets/StreamingAssets/AssetBundles/KHGWB/KHGWB.manifest index c17873e..98519d6 100644 --- a/Assets/StreamingAssets/AssetBundles/KHGWB/KHGWB.manifest +++ b/Assets/StreamingAssets/AssetBundles/KHGWB/KHGWB.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.13f1 -CRC: 1890666401 +CRC: 132336565 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/AssetBundles/KHGWB/buildingscene b/Assets/StreamingAssets/AssetBundles/KHGWB/buildingscene index 2ae9673..ff02df6 100644 Binary files a/Assets/StreamingAssets/AssetBundles/KHGWB/buildingscene and b/Assets/StreamingAssets/AssetBundles/KHGWB/buildingscene differ diff --git a/Assets/StreamingAssets/AssetBundles/KHGWB/buildingscene.manifest b/Assets/StreamingAssets/AssetBundles/KHGWB/buildingscene.manifest index 3e8655e..c02c61d 100644 --- a/Assets/StreamingAssets/AssetBundles/KHGWB/buildingscene.manifest +++ b/Assets/StreamingAssets/AssetBundles/KHGWB/buildingscene.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.13f1 -CRC: 1075126327 +CRC: 2486810206 Hashes: AssetFileHash: serializedVersion: 2 - Hash: ea8e7f224fd7442037a86d1cc8c871b5 + Hash: ab2a0f3eb3df0eb186fddaaa759b32a3 TypeTreeHash: serializedVersion: 2 - Hash: 7852f3a797070c6dff28a287b8a77014 + Hash: 79102386fbe9b463e1e5a451fc8d04a6 IncrementalBuildHash: serializedVersion: 2 - Hash: 6c82eae54ad9f7db8dc0ee1c76ddf130 + Hash: 857edacf06c891a36a576886f7a7afca HashAppended: 0 ClassTypes: - Class: 1 @@ -35,6 +35,8 @@ ClassTypes: Script: {instanceID: 0} - Class: 104 Script: {instanceID: 0} +- Class: 114 + Script: {fileID: 11500000, guid: 841f4586a96f72a42897b22533d6bcad, type: 3} - Class: 114 Script: {fileID: 11500000, guid: d00f7578dda0a1c41b151766a6426479, type: 3} - Class: 114 @@ -43,6 +45,8 @@ ClassTypes: Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3} - Class: 114 Script: {fileID: 11500000, guid: de3dcbb1284b2394a8049095e2bae278, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: b0f36456c352b534cb76fe2cc683b76d, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 77fb9be10c0901f46a68b3ee09e7972b, type: 3} - Class: 114 @@ -55,10 +59,6 @@ ClassTypes: Script: {fileID: 11500000, guid: 6eeb5dc026fdf4b488bc7ae0138ab719, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 841f4586a96f72a42897b22533d6bcad, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: b0f36456c352b534cb76fe2cc683b76d, type: 3} - Class: 115 Script: {instanceID: 0} - Class: 157 diff --git a/Assets/StreamingAssets/WebAssetBundles/KHGWB/KHGWB b/Assets/StreamingAssets/WebAssetBundles/KHGWB/KHGWB index 61bc85b..bc715f8 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/KHGWB/KHGWB and b/Assets/StreamingAssets/WebAssetBundles/KHGWB/KHGWB differ diff --git a/Assets/StreamingAssets/WebAssetBundles/KHGWB/KHGWB.manifest b/Assets/StreamingAssets/WebAssetBundles/KHGWB/KHGWB.manifest index 5189eb1..0f99e2d 100644 --- a/Assets/StreamingAssets/WebAssetBundles/KHGWB/KHGWB.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/KHGWB/KHGWB.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.13f1 -CRC: 1218628275 +CRC: 513957896 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/WebAssetBundles/KHGWB/buildingscene b/Assets/StreamingAssets/WebAssetBundles/KHGWB/buildingscene index 14cf128..9e002e6 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/KHGWB/buildingscene and b/Assets/StreamingAssets/WebAssetBundles/KHGWB/buildingscene differ diff --git a/Assets/StreamingAssets/WebAssetBundles/KHGWB/buildingscene.manifest b/Assets/StreamingAssets/WebAssetBundles/KHGWB/buildingscene.manifest index 92a920e..aa82ffd 100644 --- a/Assets/StreamingAssets/WebAssetBundles/KHGWB/buildingscene.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/KHGWB/buildingscene.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.13f1 -CRC: 3335089477 +CRC: 93602806 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 7290cc9e2c5322cf2c4ec30e2599be5d + Hash: 57f68b78598ef1fcfa76c3e3183a4d7b TypeTreeHash: serializedVersion: 2 - Hash: 7852f3a797070c6dff28a287b8a77014 + Hash: 79102386fbe9b463e1e5a451fc8d04a6 IncrementalBuildHash: serializedVersion: 2 - Hash: e5ff64eb8f4fd48e5fe86dc85d42c714 + Hash: 02d29b72ce9d30752be29d5a71edb16a HashAppended: 0 ClassTypes: - Class: 1 @@ -35,6 +35,8 @@ ClassTypes: Script: {instanceID: 0} - Class: 104 Script: {instanceID: 0} +- Class: 114 + Script: {fileID: 11500000, guid: 841f4586a96f72a42897b22533d6bcad, type: 3} - Class: 114 Script: {fileID: 11500000, guid: d00f7578dda0a1c41b151766a6426479, type: 3} - Class: 114 @@ -43,6 +45,8 @@ ClassTypes: Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3} - Class: 114 Script: {fileID: 11500000, guid: de3dcbb1284b2394a8049095e2bae278, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: b0f36456c352b534cb76fe2cc683b76d, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 77fb9be10c0901f46a68b3ee09e7972b, type: 3} - Class: 114 @@ -55,10 +59,6 @@ ClassTypes: Script: {fileID: 11500000, guid: 6eeb5dc026fdf4b488bc7ae0138ab719, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 841f4586a96f72a42897b22533d6bcad, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: b0f36456c352b534cb76fe2cc683b76d, type: 3} - Class: 115 Script: {instanceID: 0} - Class: 157 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 8b2cd51..2144814 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,7 +6,7 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/ScenesKH/BuildingScene.unity + path: Assets/URPPublic/Assets/Scenes/SampleScene.unity guid: 99c9720ab356a0642a771bea13969a05 m_configObjects: com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}