diff --git a/Assets/AssetArt/Highlight Plus Profile.asset b/Assets/AssetArt/Highlight Plus Profile.asset new file mode 100644 index 0000000..131ad3c --- /dev/null +++ b/Assets/AssetArt/Highlight Plus Profile.asset @@ -0,0 +1,183 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 8e9253636bf2648bd813257f451f8486, type: 3} + m_Name: Highlight Plus Profile + m_EditorClassIdentifier: + effectGroup: 0 + effectGroupLayer: + serializedVersion: 2 + m_Bits: 4294967295 + effectNameFilter: + effectNameUseRegEx: 0 + combineMeshes: 0 + alphaCutOff: 0 + cullBackFaces: 1 + padding: 0 + depthClip: 0 + normalsOption: 0 + fadeInDuration: 0 + fadeOutDuration: 0 + cameraDistanceFade: 0 + cameraDistanceFadeNear: 0 + cameraDistanceFadeFar: 1000 + constantWidth: 1 + extraCoveragePixels: 0 + minimumWidth: 0 + overlay: 0 + overlayMode: 0 + overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + overlayAnimationSpeed: 1 + overlayMinIntensity: 0.5 + overlayBlending: 1 + overlayTexture: {fileID: 0} + overlayTextureUVSpace: 0 + overlayTextureScale: 1 + overlayTextureScrolling: {x: 0, y: 0} + overlayVisibility: 0 + outline: 1 + outlineColor: {r: 0, g: 0, b: 0, a: 1} + outlineColorStyle: 0 + outlineGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + outlineGradientInLocalSpace: 0 + outlineBlurPasses: 2 + outlineWidth: 0.45 + outlineQuality: 3 + outlineEdgeMode: 0 + outlineEdgeThreshold: 0.995 + outlineSharpness: 1 + outlineDownsampling: 1 + outlineOptimalBlit: 1 + outlineContourStyle: 0 + outlineVisibility: 0 + outlineIndependent: 0 + glow: 0 + glowWidth: 0.4 + glowQuality: 3 + glowBlurMethod: 0 + glowDownsampling: 2 + glowHQColor: {r: 0.64, g: 1, b: 0, a: 1} + glowDithering: 1 + glowDitheringStyle: 0 + glowOptimalBlit: 1 + glowMagicNumber1: 0.75 + glowMagicNumber2: 0.5 + glowAnimationSpeed: 1 + glowVisibility: 0 + glowBlendMode: 0 + glowBlendPasses: 1 + glowPasses: + - offset: 4 + alpha: 0.1 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 3 + alpha: 0.2 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 2 + alpha: 0.3 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 1 + alpha: 0.4 + color: {r: 0.64, g: 1, b: 0, a: 1} + glowIgnoreMask: 0 + innerGlow: 0 + innerGlowWidth: 1 + innerGlowBlendMode: 0 + innerGlowColor: {r: 1, g: 1, b: 1, a: 1} + innerGlowVisibility: 0 + targetFX: 0 + targetFXTexture: {fileID: 0} + targetFXColor: {r: 1, g: 1, b: 1, a: 1} + targetFXRotationSpeed: 50 + targetFXInitialScale: 4 + targetFXEndScale: 1.5 + targetFXScaleToRenderBounds: 1 + targetFXAlignToGround: 0 + targetFXGroundMaxDistance: 10 + targetFXGroundLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + targetFXFadePower: 32 + targetFXUseEnclosingBounds: 0 + targetFXOffset: {x: 0, y: 0, z: 0} + targetFXTransitionDuration: 0.5 + targetFXStayDuration: 1.5 + targetFXVisibility: 1 + iconFX: 0 + iconFXMesh: {fileID: 0} + iconFXLightColor: {r: 1, g: 1, b: 1, a: 1} + iconFXDarkColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + iconFXRotationSpeed: 50 + iconFXAnimationOption: 0 + iconFXAnimationAmount: 0.1 + iconFXAnimationSpeed: 3 + iconFXScale: 1 + iconFXScaleToRenderBounds: 0 + iconFXOffset: {x: 0, y: 1, z: 0} + iconFXTransitionDuration: 0.5 + iconFXStayDuration: 1.5 + seeThrough: 2 + seeThroughOccluderMask: + serializedVersion: 2 + m_Bits: 4294967295 + seeThroughOccluderMaskAccurate: 0 + seeThroughOccluderThreshold: 0.3 + seeThroughOccluderCheckInterval: 1 + seeThroughOccluderCheckIndividualObjects: 0 + seeThroughDepthOffset: 0 + seeThroughMaxDepth: 0 + seeThroughIntensity: 0.8 + seeThroughTintAlpha: 0.5 + seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1} + seeThroughNoise: 1 + seeThroughBorder: 0 + seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1} + seeThroughBorderWidth: 0.45 + seeThroughBorderOnly: 0 + seeThroughOrdered: 0 + seeThroughTexture: {fileID: 0} + seeThroughTextureUVSpace: 0 + seeThroughTextureScale: 1 + seeThroughChildrenSortingMode: 0 + hitFxInitialIntensity: 0 + hitFxMode: 0 + hitFxFadeOutDuration: 0.25 + hitFxColor: {r: 1, g: 1, b: 1, a: 1} + hitFxRadius: 0.5 diff --git a/Assets/AssetArt/Highlight Plus Profile.asset.meta b/Assets/AssetArt/Highlight Plus Profile.asset.meta new file mode 100644 index 0000000..f5621cd --- /dev/null +++ b/Assets/AssetArt/Highlight Plus Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8bf484d5d1510544a8d9b8984f131b3d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AssetRaw/Resources/YCLZT.prefab b/Assets/AssetRaw/Resources/YCLZT.prefab index 2bd3515..a362106 100644 --- a/Assets/AssetRaw/Resources/YCLZT.prefab +++ b/Assets/AssetRaw/Resources/YCLZT.prefab @@ -14,6 +14,8 @@ GameObject: - component: {fileID: 5976191897111998946} - component: {fileID: 8327893331111558037} - component: {fileID: 6362306012414248900} + - component: {fileID: 147482619995500674} + - component: {fileID: 779459602233242400} m_Layer: 7 m_Name: YCLZT m_TagString: Untagged @@ -163,11 +165,233 @@ MeshCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 422873722021720505, guid: 6904dc50e23ff314cbd27409a715815b, type: 3} +--- !u!65 &147482619995500674 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1463875728381155855} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.009599907, y: 0.01, z: 0.009545771} + m_Center: {x: -0.000000005355105, y: 0.005, z: -0.000017486978} +--- !u!114 &779459602233242400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1463875728381155855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3} + m_Name: + m_EditorClassIdentifier: + profile: {fileID: 0} + profileSync: 1 + previewInEditor: 1 + camerasLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + effectGroup: 0 + effectTarget: {fileID: 0} + effectGroupLayer: + serializedVersion: 2 + m_Bits: 4294967295 + effectNameFilter: + effectNameUseRegEx: 0 + combineMeshes: 0 + alphaCutOff: 0 + cullBackFaces: 1 + padding: 0 + ignoreObjectVisibility: 0 + reflectionProbes: 0 + GPUInstancing: 1 + optimizeSkinnedMesh: 1 + depthClip: 0 + cameraDistanceFade: 0 + cameraDistanceFadeNear: 0 + cameraDistanceFadeFar: 1000 + normalsOption: 0 + ignore: 0 + _highlighted: 0 + fadeInDuration: 1 + fadeOutDuration: 1 + flipY: 0 + constantWidth: 1 + extraCoveragePixels: 0 + minimumWidth: 0 + subMeshMask: -1 + overlay: 0 + overlayMode: 0 + overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + overlayAnimationSpeed: 0 + overlayMinIntensity: 0 + overlayBlending: 1 + overlayTexture: {fileID: 0} + overlayTextureUVSpace: 0 + overlayTextureScale: 1 + overlayTextureScrolling: {x: 0, y: 0} + overlayVisibility: 0 + outline: 1 + outlineColor: {r: 1, g: 1, b: 1, a: 1} + outlineColorStyle: 0 + outlineGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + outlineGradientInLocalSpace: 0 + outlineWidth: 0.4 + outlineBlurPasses: 2 + outlineQuality: 0 + outlineEdgeMode: 0 + outlineEdgeThreshold: 0.995 + outlineSharpness: 1 + outlineDownsampling: 2 + outlineVisibility: 0 + glowBlendMode: 0 + outlineOptimalBlit: 1 + outlineBlitDebug: 0 + outlineIndependent: 0 + outlineContourStyle: 0 + glow: 1.32 + glowWidth: 3 + glowQuality: 2 + glowBlurMethod: 0 + glowDownsampling: 2 + glowHQColor: {r: 0.19117647, g: 0.36409733, b: 1, a: 1} + glowDithering: 1 + glowDitheringStyle: 0 + glowMagicNumber1: 0.75 + glowMagicNumber2: 0.5 + glowAnimationSpeed: 1 + glowVisibility: 0 + glowOptimalBlit: 1 + glowBlitDebug: 0 + glowBlendPasses: 1 + glowPasses: + - offset: 4 + alpha: 0.1 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 3 + alpha: 0.2 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 2 + alpha: 0.3 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 1 + alpha: 0.4 + color: {r: 0.64, g: 1, b: 0, a: 1} + glowIgnoreMask: 0 + innerGlow: 0 + innerGlowWidth: 1 + innerGlowColor: {r: 1, g: 1, b: 1, a: 1} + innerGlowBlendMode: 0 + innerGlowVisibility: 0 + targetFX: 0 + targetFXTexture: {fileID: 2800000, guid: 1de3c566a6c8c405b9f6f453137273ec, type: 3} + targetFXColor: {r: 1, g: 1, b: 1, a: 1} + targetFXCenter: {fileID: 0} + targetFXRotationSpeed: 50 + targetFXInitialScale: 2 + targetFXEndScale: 1.5 + targetFXScaleToRenderBounds: 1 + targetFXUseEnclosingBounds: 0 + targetFXAlignToGround: 0 + targetFXOffset: {x: 0, y: 0, z: 0} + targetFXFadePower: 32 + targetFXGroundMaxDistance: 10 + targetFXGroundLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + targetFXTransitionDuration: 0.5 + targetFXStayDuration: 2 + targetFXVisibility: 1 + iconFX: 0 + iconFXMesh: {fileID: 0} + iconFXLightColor: {r: 1, g: 1, b: 1, a: 1} + iconFXDarkColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + iconFXCenter: {fileID: 0} + iconFXRotationSpeed: 50 + iconFXAnimationOption: 0 + iconFXAnimationAmount: 0.1 + iconFXAnimationSpeed: 3 + iconFXScale: 1 + iconFXScaleToRenderBounds: 0 + iconFXOffset: {x: 0, y: 1, z: 0} + iconFXTransitionDuration: 0.5 + iconFXStayDuration: 1.5 + seeThrough: 0 + seeThroughOccluderMask: + serializedVersion: 2 + m_Bits: 4294967295 + seeThroughOccluderThreshold: 0.3 + seeThroughOccluderMaskAccurate: 0 + seeThroughOccluderCheckInterval: 1 + seeThroughOccluderCheckIndividualObjects: 0 + seeThroughDepthOffset: 0 + seeThroughMaxDepth: 0 + seeThroughIntensity: 0.8 + seeThroughTintAlpha: 0.5 + seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1} + seeThroughNoise: 1 + seeThroughBorder: 0 + seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1} + seeThroughBorderOnly: 0 + seeThroughBorderWidth: 0.45 + seeThroughOrdered: 0 + seeThroughTexture: {fileID: 0} + seeThroughTextureUVSpace: 0 + seeThroughTextureScale: 1 + seeThroughChildrenSortingMode: 0 + rmsCount: 2 + hitFxInitialIntensity: 1 + hitFxMode: 2 + hitFxFadeOutDuration: 0.25 + hitFxColor: {r: 1, g: 1, b: 1, a: 1} + hitFxRadius: 0.5 --- !u!1 &3974195268925661852 GameObject: m_ObjectHideFlags: 0 @@ -272,7 +496,7 @@ MeshCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 @@ -358,7 +582,7 @@ MeshCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 diff --git a/Assets/GameLogic/Game/Core/Manger.meta b/Assets/GameLogic/Game/Core/Manger.meta new file mode 100644 index 0000000..4a5d7b8 --- /dev/null +++ b/Assets/GameLogic/Game/Core/Manger.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c1fc678addee0eb45810d431a1ce0394 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameLogic/Game/Core/Manger/OutLineMgr.cs b/Assets/GameLogic/Game/Core/Manger/OutLineMgr.cs new file mode 100644 index 0000000..c03a424 --- /dev/null +++ b/Assets/GameLogic/Game/Core/Manger/OutLineMgr.cs @@ -0,0 +1,47 @@ +using HighlightPlus; +using UnityEngine; + +public class OutLineMgr : Singleton +{ + private HighlightEffect lastHighlight; // 上一次命中的高亮组件 + protected override void OnUpdate() + { + base.OnUpdate(); + Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + + if (Physics.Raycast(ray, out RaycastHit hit)) + { + GameObject hitObj = hit.collider.gameObject; + HighlightEffect currentHighlight = hitObj.GetComponent(); + Debug.Log(hitObj.name); + // 如果是新物体 + if (currentHighlight != null && currentHighlight != lastHighlight) + { + // 关闭上一个高亮 + if (lastHighlight != null) + { + lastHighlight.highlighted = false; + } + // 开启当前高亮 + currentHighlight.highlighted = true; + lastHighlight = currentHighlight; + } + else if (currentHighlight == null && lastHighlight != null) + { + // 没有命中高亮物体，关闭之前的 + lastHighlight.highlighted = false; + lastHighlight = null; + } + } + else + { + // 如果什么都没命中，也关闭之前的 + if (lastHighlight != null) + { + lastHighlight.highlighted = false; + lastHighlight = null; + } + } + } + +} diff --git a/Assets/GameLogic/Game/Core/Manger/OutLineMgr.cs.meta b/Assets/GameLogic/Game/Core/Manger/OutLineMgr.cs.meta new file mode 100644 index 0000000..c5901fd --- /dev/null +++ b/Assets/GameLogic/Game/Core/Manger/OutLineMgr.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7319eb432a7f740459f78f06d63ecf91 \ No newline at end of file diff --git a/Assets/GameLogic/Origin/device/container/Container.cs b/Assets/GameLogic/Origin/device/container/Container.cs index 1d145b7..6d557d6 100644 --- a/Assets/GameLogic/Origin/device/container/Container.cs +++ b/Assets/GameLogic/Origin/device/container/Container.cs @@ -88,6 +88,7 @@ public class Container : MonoBehaviour, IMouseClick, IFollowHelp public virtual void MouseSingleClick() { + Debug.Log("MouseSingleClick"); if (Follow && FookAt) { cameraManage.ShotCut(this); diff --git a/Assets/GameLogic/Origin/event/EventCompent.cs b/Assets/GameLogic/Origin/event/EventCompent.cs index 7c146f9..cc7ac9a 100644 --- a/Assets/GameLogic/Origin/event/EventCompent.cs +++ b/Assets/GameLogic/Origin/event/EventCompent.cs @@ -16,6 +16,7 @@ public sealed class EventCompent : MonoBehaviour public event MouseClickEvent MouseClickEvents; public event MouseClickEvent MouseDoubleClickEvents; + private void Start() { List mouseClicks = ApplicationBoot.Instance.GetBeans(); diff --git a/Assets/Plugins/HighlightPlus/Demo/Demo3_HitFXExample.meta b/Assets/Plugins/HighlightPlus/Demo/Demo3_HitFXExample.meta new file mode 100644 index 0000000..a793c64 --- /dev/null +++ b/Assets/Plugins/HighlightPlus/Demo/Demo3_HitFXExample.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae08108a0d74b274ba126aad5a441c25 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/HighlightPlus/Demo/Demo3_HitFXExample/LightingData.asset b/Assets/Plugins/HighlightPlus/Demo/Demo3_HitFXExample/LightingData.asset new file mode 100644 index 0000000..b91eadb Binary files /dev/null and b/Assets/Plugins/HighlightPlus/Demo/Demo3_HitFXExample/LightingData.asset differ diff --git a/Assets/Plugins/HighlightPlus/Demo/Demo3_HitFXExample/LightingData.asset.meta b/Assets/Plugins/HighlightPlus/Demo/Demo3_HitFXExample/LightingData.asset.meta new file mode 100644 index 0000000..656108b --- /dev/null +++ b/Assets/Plugins/HighlightPlus/Demo/Demo3_HitFXExample/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 985f34143607451479f4514003821c7a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/HighlightPlus/Demo/Demo3_HitFXExample/ReflectionProbe-0.exr b/Assets/Plugins/HighlightPlus/Demo/Demo3_HitFXExample/ReflectionProbe-0.exr new file mode 100644 index 0000000..a99e576 Binary files /dev/null and b/Assets/Plugins/HighlightPlus/Demo/Demo3_HitFXExample/ReflectionProbe-0.exr differ diff --git a/Assets/Plugins/HighlightPlus/Demo/Demo3_HitFXExample/ReflectionProbe-0.exr.meta b/Assets/Plugins/HighlightPlus/Demo/Demo3_HitFXExample/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000..ba6dd36 --- /dev/null +++ b/Assets/Plugins/HighlightPlus/Demo/Demo3_HitFXExample/ReflectionProbe-0.exr.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 8480ef2f296497b4b8d2d2c42f203b4b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index 09d3f7a..7648a0c 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -32254,7 +32254,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.00011867129} + m_AnchoredPosition: {x: 0, y: 0.0006545868} m_SizeDelta: {x: 0, y: 300} m_Pivot: {x: 0, y: 1} --- !u!114 &478527198 @@ -35339,6 +35339,50 @@ Transform: m_Children: [] m_Father: {fileID: 2113888371} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &533156722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 533156723} + - component: {fileID: 533156724} + m_Layer: 0 + m_Name: OutLineMgr + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &533156723 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 533156722} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1931332747} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &533156724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 533156722} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7319eb432a7f740459f78f06d63ecf91, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &534292888 GameObject: m_ObjectHideFlags: 0 @@ -90712,7 +90756,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1614015367} m_Direction: 2 m_Value: 0 - m_Size: 0.9999856 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -110361,6 +110405,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1529331850} m_CullTransparentMesh: 1 +--- !u!1 &1530460627 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1530460628} + - component: {fileID: 1530460629} + m_Layer: 0 + m_Name: NavBake + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1530460628 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530460627} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 26.768785, y: 0.21425657, z: 6.022696} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1530460629 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530460627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AgentTypeID: 0 + m_CollectObjects: 0 + m_Size: {x: 10, y: 10, z: 10} + m_Center: {x: 0, y: 2, z: 0} + m_LayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_UseGeometry: 0 + m_DefaultArea: 0 + m_GenerateLinks: 0 + m_IgnoreNavMeshAgent: 1 + m_IgnoreNavMeshObstacle: 1 + m_OverrideTileSize: 0 + m_TileSize: 256 + m_OverrideVoxelSize: 0 + m_VoxelSize: 0.16666667 + m_MinRegionArea: 2 + m_NavMeshData: {fileID: 0} + m_BuildHeightMesh: 0 --- !u!1 &1530979958 GameObject: m_ObjectHideFlags: 0 @@ -138873,6 +138980,7 @@ Transform: - {fileID: 26754115} - {fileID: 103865097} - {fileID: 526441981} + - {fileID: 533156723} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1932955500 @@ -153431,3 +153539,4 @@ SceneRoots: - {fileID: 1276030225} - {fileID: 250411381} - {fileID: 1931332747} + - {fileID: 1530460628} diff --git a/Assets/Scenes/main/NavMesh-Map.asset b/Assets/Scenes/main/NavMesh-Map.asset new file mode 100644 index 0000000..71c0b89 Binary files /dev/null and b/Assets/Scenes/main/NavMesh-Map.asset differ diff --git a/Assets/Scenes/main/NavMesh-Map.asset.meta b/Assets/Scenes/main/NavMesh-Map.asset.meta new file mode 100644 index 0000000..b42c4d3 --- /dev/null +++ b/Assets/Scenes/main/NavMesh-Map.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e98087c8784bc142aa8173e27ee1e93 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/main/NavMesh-NavBake 1.asset b/Assets/Scenes/main/NavMesh-NavBake 1.asset new file mode 100644 index 0000000..4234a96 Binary files /dev/null and b/Assets/Scenes/main/NavMesh-NavBake 1.asset differ diff --git a/Assets/Scenes/main/NavMesh-NavBake 1.asset.meta b/Assets/Scenes/main/NavMesh-NavBake 1.asset.meta new file mode 100644 index 0000000..fadc19f --- /dev/null +++ b/Assets/Scenes/main/NavMesh-NavBake 1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 161edd7e7b0c5ae4a86d5bfbb35d7c4a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/main/NavMesh-NavBake 2.asset b/Assets/Scenes/main/NavMesh-NavBake 2.asset new file mode 100644 index 0000000..3b39e17 Binary files /dev/null and b/Assets/Scenes/main/NavMesh-NavBake 2.asset differ diff --git a/Assets/Scenes/main/NavMesh-NavBake 2.asset.meta b/Assets/Scenes/main/NavMesh-NavBake 2.asset.meta new file mode 100644 index 0000000..687b7b2 --- /dev/null +++ b/Assets/Scenes/main/NavMesh-NavBake 2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e0174d41ca894f34eaecae6491bd947a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/main/NavMesh-NavBake.asset b/Assets/Scenes/main/NavMesh-NavBake.asset new file mode 100644 index 0000000..1f6305f Binary files /dev/null and b/Assets/Scenes/main/NavMesh-NavBake.asset differ diff --git a/Assets/Scenes/main/NavMesh-NavBake.asset.meta b/Assets/Scenes/main/NavMesh-NavBake.asset.meta new file mode 100644 index 0000000..22656ca --- /dev/null +++ b/Assets/Scenes/main/NavMesh-NavBake.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc641e93374a4824493930e66e9f122b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/main/NavMesh-Plane (2).asset b/Assets/Scenes/main/NavMesh-Plane (2).asset new file mode 100644 index 0000000..22255f7 Binary files /dev/null and b/Assets/Scenes/main/NavMesh-Plane (2).asset differ diff --git a/Assets/Scenes/main/NavMesh-Plane (2).asset.meta b/Assets/Scenes/main/NavMesh-Plane (2).asset.meta new file mode 100644 index 0000000..81f3ed2 --- /dev/null +++ b/Assets/Scenes/main/NavMesh-Plane (2).asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad7ed63d5ae147d45bb5e77f3a06add1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 8ac6649..e352a8e 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -27,6 +27,15 @@ EditorUserSettings: value: 0701570051540d59595a5e2449755d44104e492f782d71697c711836e4b26568 flags: 0 RecentlyUsedSceneGuid-6: + value: 01000c075c56580d0f0d087347775d41404f4b2e7f7f7663757d1c6be1e1366f + flags: 0 + RecentlyUsedSceneGuid-7: + value: 5a07570251505d0b095c0a7043775d49134e4d73747f20692b704860e6b1633b + flags: 0 + RecentlyUsedSceneGuid-8: + value: 525202565c025f09095c0d23467709134116412c297c74662f794b37bae5313d + flags: 0 + RecentlyUsedSceneGuid-9: value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 lightmappingBakingProfile: diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index ebd778b..31b4a24 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -20,10 +20,10 @@ MonoBehaviour: y: 36 width: 1920 height: 941 - m_MinSize: {x: 500, y: 100} - m_MaxSize: {x: 40480, y: 16192} + m_MinSize: {x: 600, y: 100} + m_MaxSize: {x: 48576, y: 16192} vertical: 1 - controlID: 272 + controlID: 65811 draggingID: 0 --- !u!114 &2 MonoBehaviour: @@ -46,10 +46,10 @@ MonoBehaviour: m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 517 + x: 828 y: 79 - width: 825 - height: 711 + width: 299 + height: 578 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -75,7 +75,7 @@ MonoBehaviour: m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 - m_Stats: 0 + m_Stats: 1 m_SelectedSizes: 06000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 @@ -94,7 +94,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -103,23 +103,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 825 - height: 690 - m_Scale: {x: 0.21484375, y: 0.21484375} - m_Translation: {x: 412.5, y: 345} + width: 299 + height: 557 + m_Scale: {x: 0.07786458, y: 0.07786458} + m_Translation: {x: 149.5, y: 278.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1920 - y: -1605.8182 - width: 3840 - height: 3211.6365 + x: -1920.0001 + y: -3576.7227 + width: 3840.0002 + height: 7153.4453 m_MinimalGUI: 1 - m_defaultScale: 0.21484375 - m_LastWindowPixelSize: {x: 825, y: 711} + m_defaultScale: 0.07786458 + m_LastWindowPixelSize: {x: 299, y: 578} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -140,6 +140,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} + - {fileID: 16} - {fileID: 18} m_Position: serializedVersion: 2 @@ -147,10 +148,10 @@ MonoBehaviour: y: 0 width: 1920 height: 941 - m_MinSize: {x: 500, y: 100} - m_MaxSize: {x: 40480, y: 16192} + m_MinSize: {x: 600, y: 100} + m_MaxSize: {x: 48576, y: 16192} vertical: 0 - controlID: 273 + controlID: 65812 draggingID: 0 --- !u!114 &4 MonoBehaviour: @@ -171,12 +172,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1497 + width: 1229 height: 941 m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 1 - controlID: 274 + controlID: 65813 draggingID: 0 --- !u!114 &5 MonoBehaviour: @@ -199,12 +200,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1497 - height: 737 + width: 1229 + height: 604 m_MinSize: {x: 400, y: 50} m_MaxSize: {x: 32384, y: 8096} vertical: 0 - controlID: 275 + controlID: 65814 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -223,10 +224,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 366 - height: 737 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 228 + height: 604 + m_MinSize: {x: 201, y: 226} + m_MaxSize: {x: 4001, y: 4026} m_ActualView: {fileID: 7} m_Panes: - {fileID: 7} @@ -255,8 +256,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 79 - width: 365 - height: 711 + width: 227 + height: 578 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -270,10 +271,10 @@ MonoBehaviour: m_OverlaysVisible: 1 m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 206} - m_SelectedIDs: ec420100 - m_LastClickedID: 82668 - m_ExpandedIDs: baf8ffff401a0100441c0100061d0100521d0100201e0100501f010012200100da22010034240100bc24010018250100dc250100f8250100622c0100d22c0100642d0100fc320100e03c0100803d01002441010028420100384401005a440100b04401001c460100a6460100dc4601004647010098470100 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 783c0100 + m_LastClickedID: 0 + m_ExpandedIDs: 08c81bffe4cf1bffe0d21bff60da1bff5ae11bff68e11bffdea39fffeca39fff5639aaff6439aaff8253b2ff3e84b5ff4c84b5ffbe90c0ffcc90c0ff841cfeffd016ffffe416fffff616fffffa16ffff1617ffff9e3cffff264fffff3ccbffffe4570100b25f010040600100f8630100006a0100dc6c01006aa0270078af2700deb027000ebe2700c6c127009ccb2700d2cf2700f4cf270008d02700 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -313,12 +314,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 366 + x: 228 y: 0 - width: 151 - height: 737 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} + width: 600 + height: 604 + m_MinSize: {x: 102, y: 126} + m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 9} m_Panes: - {fileID: 9} @@ -345,10 +346,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 366 + x: 228 y: 79 - width: 149 - height: 711 + width: 598 + height: 578 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -685,11 +686,11 @@ MonoBehaviour: displayed: 1 id: AINavigationOverlay index: 0 - contents: '{"m_Layout":4,"m_Collapsed":true,"m_Floating":false,"m_FloatingSnapOffset":{"x":-206.0,"y":-239.0},"m_SnapOffsetDelta":{"x":38.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":true,"m_Floating":false,"m_FloatingSnapOffset":{"x":-206.0,"y":-239.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 1 snapOffset: {x: -206, y: -239} - snapOffsetDelta: {x: 38, y: 0} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 layout: 4 size: {x: 0, y: 0} @@ -833,9 +834,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: -13.607471, y: -10.823122, z: 64.385284} + m_Target: {x: 40.317932, y: 6.437727, z: 12.179131} speed: 2 - m_Value: {x: -13.607471, y: -10.823122, z: 64.385284} + m_Value: {x: 40.317932, y: 6.437727, z: 12.179131} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -881,13 +882,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.09291093, y: -0.25663817, z: 0.024818702, w: 0.96177644} + m_Target: {x: -0.05475964, y: -0.9509222, z: 0.24673864, w: -0.18091646} speed: 2 - m_Value: {x: 0.092905104, y: -0.25662208, z: 0.024817146, w: 0.9617161} + m_Value: {x: -0.054736044, y: -0.95051247, z: 0.24663232, w: -0.18083851} m_Size: - m_Target: 51.567867 + m_Target: 0.45809072 speed: 2 - m_Value: 51.567867 + m_Value: 0.45809072 m_Ortho: m_Target: 0 speed: 2 @@ -936,10 +937,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 517 + x: 828 y: 0 - width: 827 - height: 737 + width: 301 + height: 604 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} @@ -962,12 +963,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1344 + x: 1129 y: 0 - width: 153 - height: 737 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} + width: 100 + height: 604 + m_MinSize: {x: 102, y: 126} + m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} @@ -994,10 +995,10 @@ MonoBehaviour: m_TextWithWhitespace: "Timeline\u200B" m_Pos: serializedVersion: 2 - x: 1344 + x: 1129 y: 79 - width: 151 - height: 711 + width: 98 + height: 578 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1019,32 +1020,6 @@ MonoBehaviour: m_SelectionRoot: 0 m_SubElements: [] --- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 14} - - {fileID: 16} - m_Position: - serializedVersion: 2 - x: 0 - y: 737 - width: 1497 - height: 204 - m_MinSize: {x: 200, y: 50} - m_MaxSize: {x: 16192, y: 8096} - vertical: 0 - controlID: 319 - draggingID: 0 ---- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1060,17 +1035,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 0 - width: 925 - height: 204 + y: 604 + width: 1229 + height: 337 m_MinSize: {x: 231, y: 276} m_MaxSize: {x: 10001, y: 10026} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 14} m_Panes: + - {fileID: 14} - {fileID: 15} m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &15 + m_LastSelected: 1 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1092,9 +1068,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 816 - width: 924 - height: 178 + y: 683 + width: 1228 + height: 311 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1117,7 +1093,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Packages/com.kybernetik.animancer m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1127,16 +1103,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Packages/com.kybernetik.animancer m_LastFoldersGridSize: -1 - m_LastProjectPath: E:\UGit\AK056 + m_LastProjectPath: D:\UGit\AK056 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 15} - m_SelectedIDs: 8c560100 - m_LastClickedID: 87692 - m_ExpandedIDs: 00000000925501009455010096550100985501009a5501009c5501009e550100a0550100a2550100a455010000ca9a3bffffff7f + scrollPos: {x: 0, y: 317} + m_SelectedIDs: ec730100 + m_LastClickedID: 95212 + m_ExpandedIDs: 000000000273010004730100067301000a7301000e7301001073010016730100187301001c7301001e73010020730100227301002673010098730100d8730100da73010000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1153,7 +1129,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 14} + m_ClientGUIView: {fileID: 13} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1165,7 +1141,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000925501009455010096550100985501009a5501009c5501009e550100a0550100a2550100a455010000ca9a3bffffff7f + m_ExpandedIDs: 000000000273010004730100067301000a7301000e7301001073010016730100187301001c7301001e73010020730100227301002673010098730100d873010000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1191,9 +1167,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: ec420100 - m_LastClickedInstanceID: 82668 - m_HadKeyboardFocusLastEvent: 0 + m_SelectedInstanceIDs: 783c0100 + m_LastClickedInstanceID: 81016 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000901d0600d2510500a2a305008ea0050010cb010044a200007e69000004a5780076d9790094da7900e0590400383d04002871000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1211,7 +1187,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 14} + m_ClientGUIView: {fileID: 13} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1223,33 +1199,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 287 ---- !u!114 &16 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 925 - y: 0 - width: 572 - height: 204 - m_MinSize: {x: 102, y: 126} - m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 17} - m_Panes: - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &17 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1270,10 +1220,10 @@ MonoBehaviour: m_TextWithWhitespace: "Console\u200B" m_Pos: serializedVersion: 2 - x: 925 - y: 816 - width: 570 - height: 178 + x: 0 + y: 683 + width: 1228 + height: 311 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1285,7 +1235,7 @@ MonoBehaviour: m_SaveData: [] m_ContainerData: [] m_OverlaysVisible: 1 ---- !u!114 &18 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1300,18 +1250,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1497 + x: 1229 y: 0 - width: 423 + width: 404 height: 941 - m_MinSize: {x: 276, y: 126} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 19} + m_MinSize: {x: 277, y: 126} + m_MaxSize: {x: 4002, y: 4026} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 19} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &19 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1332,9 +1282,9 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1497 + x: 1229 y: 79 - width: 422 + width: 402 height: 915 m_SerializedDataModeController: m_DataMode: 0 @@ -1354,7 +1304,82 @@ MonoBehaviour: m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 216 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: InspectorWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1633 + y: 0 + width: 287 + height: 941 + m_MinSize: {x: 276, y: 76} + m_MaxSize: {x: 4001, y: 4026} + m_ActualView: {fileID: 19} + m_Panes: + - {fileID: 19} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &19 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_TextWithWhitespace: "Inspector\u200B" + m_Pos: + serializedVersion: 2 + x: 1633 + y: 79 + width: 286 + height: 915 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_OverlaysVisible: 1 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 151 + m_ControlHash: 1412526313 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: