diff --git a/CHANGELOG.md b/CHANGELOG.md index b4e2550..c0305b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,5 +4,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.0.1] - 21 October 2024 -- Initial Release \ No newline at end of file +## [0.3.1] - 3 February 2024 +- Microphone dropdown component +- Component and sample updates + +## [0.3.0] - 21 January 2024 +- WebGL audio support + +## [0.2.0] - 6 December 2024 +- API updates and request unification +- Audio receiver fixes +- Sample project updates + +## [0.1.0] - 21 October 2024 +- Initial Release diff --git a/Editor/EditorUtilities.cs b/Editor/EditorUtilities.cs index bfd687e..14523fb 100644 --- a/Editor/EditorUtilities.cs +++ b/Editor/EditorUtilities.cs @@ -19,7 +19,7 @@ public class EditorUtilities : MonoBehaviour /// Actions to take once component is created in the canvas. public static void CreateInCanvas(string name, Action callback) where T: UIBehaviour { - var canvas = FindObjectOfType(); + var canvas = FindFirstObjectByType(); if (Selection.activeTransform == null) { if (canvas == null) @@ -43,7 +43,7 @@ public static void CreateInCanvas(string name, Action callback) wh } } - var eventSystem = FindObjectOfType(); + var eventSystem = FindFirstObjectByType(); if (eventSystem == null) { eventSystem = LoadAndInstantiate(EVENT_SYSTEM_FILE_NAME); diff --git a/Editor/UI/NeocortexAudioChatInput.cs b/Editor/UI/NeocortexAudioChatInputEditor.cs similarity index 100% rename from Editor/UI/NeocortexAudioChatInput.cs rename to Editor/UI/NeocortexAudioChatInputEditor.cs diff --git a/Editor/UI/NeocortexAudioChatInput.cs.meta b/Editor/UI/NeocortexAudioChatInputEditor.cs.meta similarity index 100% rename from Editor/UI/NeocortexAudioChatInput.cs.meta rename to Editor/UI/NeocortexAudioChatInputEditor.cs.meta diff --git a/Editor/UI/NeocortexTextChatInput.cs b/Editor/UI/NeocortexTextChatInputEditor.cs similarity index 100% rename from Editor/UI/NeocortexTextChatInput.cs rename to Editor/UI/NeocortexTextChatInputEditor.cs diff --git a/Editor/UI/NeocortexTextChatInput.cs.meta b/Editor/UI/NeocortexTextChatInputEditor.cs.meta similarity index 100% rename from Editor/UI/NeocortexTextChatInput.cs.meta rename to Editor/UI/NeocortexTextChatInputEditor.cs.meta diff --git a/Editor/WebGLTemplateImporter.cs b/Editor/WebGLTemplateImporter.cs index ae74d7e..0872ef3 100644 --- a/Editor/WebGLTemplateImporter.cs +++ b/Editor/WebGLTemplateImporter.cs @@ -39,14 +39,15 @@ private static void OnEditorLoaded() EditorPrefs.DeleteKey(ImportCompletedKey); - try{ + try + { CopyDirectory(SourceFolder, DestinationFolder); AssetDatabase.Refresh(); Debug.Log($"WebGL Template copied to {DestinationFolder} successfully."); } catch (System.Exception ex) { - Debug.LogError($"Failed to copy WebGL Template: {ex.Message}"); + Debug.LogWarning($"Failed to copy WebGL Template: {ex.Message}"); } } diff --git a/Runtime/API/V1/Services/WebRequest.cs b/Runtime/API/V1/Services/WebRequest.cs index 6412f63..c3d7de6 100644 --- a/Runtime/API/V1/Services/WebRequest.cs +++ b/Runtime/API/V1/Services/WebRequest.cs @@ -12,6 +12,12 @@ public class WebRequest protected async Task Send(ApiPayload apiRequest) { + if (settings == null || string.IsNullOrEmpty(settings.apiKey)) + { + Debug.LogError("API Key is required. Please add it in the Tools > Neocortex > API Key Setup."); + return null; + } + UnityWebRequest webRequest = new UnityWebRequest(); webRequest.url = apiRequest.url; webRequest.method = apiRequest.method; diff --git a/Runtime/NeocortexMicrophone.cs b/Runtime/NeocortexMicrophone.cs index 7f26672..498cdc2 100644 --- a/Runtime/NeocortexMicrophone.cs +++ b/Runtime/NeocortexMicrophone.cs @@ -4,6 +4,19 @@ namespace Neocortex { public sealed class NeocortexMicrophone { + public static string[] devices + { + get + { + #if !UNITY_WEBGL || UNITY_EDITOR + return Microphone.devices; + #else + Debug.Log("Use browser settings for microphone access."); + return new string[] { "Use browser settings for microphone access." }; + #endif + } + } + public static AudioClip Start(string deviceName, bool loop, int lengthSec, int frequency) { #if !UNITY_WEBGL || UNITY_EDITOR @@ -17,8 +30,6 @@ public static void End(string deviceName) { #if !UNITY_WEBGL || UNITY_EDITOR Microphone.End(deviceName); - #else - return null; #endif } diff --git a/Runtime/UI/NeocortexAudioChatInput.cs b/Runtime/UI/NeocortexAudioChatInput.cs index f6a2b5e..e899857 100644 --- a/Runtime/UI/NeocortexAudioChatInput.cs +++ b/Runtime/UI/NeocortexAudioChatInput.cs @@ -4,6 +4,8 @@ namespace Neocortex { + [SelectionBase] + [AddComponentMenu("Neocortex/Audio Chat Input", 0)] public class NeocortexAudioChatInput : UIBehaviour { [SerializeField] private AudioReceiver audioReceiver; diff --git a/Runtime/UI/NeocortexChatPanel.cs b/Runtime/UI/NeocortexChatPanel.cs index 3767aae..9845c7c 100644 --- a/Runtime/UI/NeocortexChatPanel.cs +++ b/Runtime/UI/NeocortexChatPanel.cs @@ -5,7 +5,7 @@ namespace Neocortex { [SelectionBase] - [AddComponentMenu("UI/Neocortex/Chat Panel")] + [AddComponentMenu("Neocortex/Chat Panel", 0)] public class NeocortexChatPanel : ScrollRect { private NeocortexMessage messageItemPrefab; diff --git a/Runtime/UI/NeocortexMicrophoneDropdown.cs b/Runtime/UI/NeocortexMicrophoneDropdown.cs index 754a1ea..99b267e 100644 --- a/Runtime/UI/NeocortexMicrophoneDropdown.cs +++ b/Runtime/UI/NeocortexMicrophoneDropdown.cs @@ -13,7 +13,7 @@ protected override void Awake() options.Clear(); - foreach (string device in Microphone.devices) + foreach (string device in NeocortexMicrophone.devices) { options.Add(new OptionData(device)); } diff --git a/Runtime/UI/NeocortexTextChatInput.cs b/Runtime/UI/NeocortexTextChatInput.cs index b7a7e83..421cf46 100644 --- a/Runtime/UI/NeocortexTextChatInput.cs +++ b/Runtime/UI/NeocortexTextChatInput.cs @@ -5,6 +5,8 @@ namespace Neocortex { + [SelectionBase] + [AddComponentMenu("Neocortex/Text Chat Input", 0)] public class NeocortexTextChatInput : UIBehaviour { [SerializeField] private InputField inputField; diff --git a/Runtime/UI/NeocortexThinkingIndicator.cs b/Runtime/UI/NeocortexThinkingIndicator.cs index b008f64..79d3ee6 100644 --- a/Runtime/UI/NeocortexThinkingIndicator.cs +++ b/Runtime/UI/NeocortexThinkingIndicator.cs @@ -1,4 +1,3 @@ -using UnityEditor; using UnityEngine; using UnityEngine.EventSystems; @@ -6,7 +5,7 @@ namespace Neocortex { [SelectionBase] [RequireComponent(typeof(Animator))] - [AddComponentMenu("UI/Neocortex/Thinking Indicator")] + [AddComponentMenu("Neocortex/Thinking Indicator", 0)] public sealed class NeocortexThinkingIndicator : UIBehaviour { private readonly static int IS_VISIBLE = Animator.StringToHash("IsVisible"); diff --git a/Samples~/Text and Audio Samples/Audio Sample.unity b/Samples~/Text and Audio Samples/Audio Sample.unity index f2816cf..4a1ea3b 100644 --- a/Samples~/Text and Audio Samples/Audio Sample.unity +++ b/Samples~/Text and Audio Samples/Audio Sample.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -42,8 +42,8 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -66,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -96,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -388,9 +385,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 452547057} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -440,8 +436,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &452547059 Transform: m_ObjectHideFlags: 0 @@ -724,6 +724,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 1420307631} + m_Resource: {fileID: 1420307631} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -1826,7 +1827,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!95 &1821888823 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1840,6 +1841,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -2570,58 +2572,47 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1850851989} m_Modifications: - - target: {fileID: 7096255273550292191, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7096255273550292191, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_Name value: Character Visuals objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -2632,14 +2623,13 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} --- !u!4 &2257841345455660679 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + m_CorrespondingSourceObject: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} m_PrefabInstance: {fileID: 2257841345455660678} m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 1850851989} - {fileID: 1670874809} - {fileID: 540140214} + - {fileID: 1850851989} diff --git a/Samples~/Text and Audio Samples/Chat Sample.unity b/Samples~/Text and Audio Samples/Chat Sample.unity index ba1b14c..f37f740 100644 --- a/Samples~/Text and Audio Samples/Chat Sample.unity +++ b/Samples~/Text and Audio Samples/Chat Sample.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -42,8 +42,8 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -66,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -96,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -243,81 +240,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 64, y: 0} m_Pivot: {x: 1, y: 0.5} ---- !u!1 &168931491 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 168931492} - - component: {fileID: 168931494} - - component: {fileID: 168931493} - m_Layer: 5 - m_Name: Item Checkmark - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &168931492 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 168931491} - 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: 731742046} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 10, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &168931493 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 168931491} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &168931494 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 168931491} - m_CullTransparentMesh: 1 --- !u!1 &174939746 GameObject: m_ObjectHideFlags: 0 @@ -363,7 +285,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5e6726b6a76dc27458cfb50d0d840e9a, type: 3} m_Name: m_EditorClassIdentifier: - projectId: cm5bfrtra0001lc031re4tmbd + projectId: OnChatResponseReceived: m_PersistentCalls: m_Calls: [] @@ -384,58 +306,47 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 174939750} m_Modifications: - - target: {fileID: 7096255273550292191, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7096255273550292191, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_Name value: Character Visuals objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -446,8 +357,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} --- !u!4 &298253128 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + m_CorrespondingSourceObject: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} m_PrefabInstance: {fileID: 298253127} m_PrefabAsset: {fileID: 0} --- !u!1 &403571905 @@ -560,7 +470,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!95 &413511726 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -574,6 +484,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -926,93 +837,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 649944142} m_CullTransparentMesh: 1 ---- !u!1 &731742045 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 731742046} - - component: {fileID: 731742047} - m_Layer: 5 - m_Name: Item - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &731742046 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 731742045} - 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: - - {fileID: 1195818839} - - {fileID: 168931492} - - {fileID: 1028235768} - m_Father: {fileID: 1529554369} - 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} - m_SizeDelta: {x: 0, y: 48} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &731742047 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 731742045} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1195818840} - toggleTransition: 1 - graphic: {fileID: 168931493} - m_Group: {fileID: 0} - onValueChanged: - m_PersistentCalls: - m_Calls: [] - m_IsOn: 1 --- !u!1 &786370010 GameObject: m_ObjectHideFlags: 0 @@ -1088,82 +912,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 786370010} m_CullTransparentMesh: 1 ---- !u!1 &787917408 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 787917409} - - component: {fileID: 787917412} - - component: {fileID: 787917411} - m_Layer: 5 - m_Name: Template - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &787917409 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 787917408} - 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: - - {fileID: 1555563183} - m_Father: {fileID: 1885843486} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 64} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &787917411 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 787917408} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 802d6333b5d61cc428dca1696d22f34c, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &787917412 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 787917408} - m_CullTransparentMesh: 1 --- !u!1 &899170458 GameObject: m_ObjectHideFlags: 0 @@ -1190,9 +938,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 899170458} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -1242,8 +989,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &899170460 Transform: m_ObjectHideFlags: 0 @@ -1282,7 +1033,7 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 ---- !u!1 &1028235767 +--- !u!1 &1218599814 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1290,232 +1041,78 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1028235768} - - component: {fileID: 1028235770} - - component: {fileID: 1028235769} + - component: {fileID: 1218599815} + - component: {fileID: 1218599817} + - component: {fileID: 1218599816} + - component: {fileID: 1218599818} m_Layer: 5 - m_Name: Item Label + m_Name: InputField m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1028235768 +--- !u!224 &1218599815 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1028235767} + m_GameObject: {fileID: 1218599814} 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: 731742046} + m_Children: + - {fileID: 1374764111} + - {fileID: 512205435} + m_Father: {fileID: 1840686700} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 5, y: -0.5} - m_SizeDelta: {x: -30, y: -3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1028235769 + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 432, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1218599816 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1028235767} + m_GameObject: {fileID: 1218599814} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Option A ---- !u!222 &1028235770 + m_Sprite: {fileID: 21300000, guid: 802d6333b5d61cc428dca1696d22f34c, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1218599817 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1028235767} + m_GameObject: {fileID: 1218599814} m_CullTransparentMesh: 1 ---- !u!1 &1195818838 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1195818839} - - component: {fileID: 1195818841} - - component: {fileID: 1195818840} - m_Layer: 5 - m_Name: Item Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1195818839 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1195818838} - 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: 731742046} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1195818840 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1195818838} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d934fe9acdbf6f84ba4720f473a0ca9e, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1195818841 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1195818838} - m_CullTransparentMesh: 1 ---- !u!1 &1218599814 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1218599815} - - component: {fileID: 1218599817} - - component: {fileID: 1218599816} - - component: {fileID: 1218599818} - m_Layer: 5 - m_Name: InputField - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1218599815 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1218599814} - 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: - - {fileID: 1374764111} - - {fileID: 512205435} - m_Father: {fileID: 1840686700} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 432, y: 0} - m_Pivot: {x: 0, y: 0.5} ---- !u!114 &1218599816 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1218599814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 802d6333b5d61cc428dca1696d22f34c, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1218599817 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1218599814} - m_CullTransparentMesh: 1 ---- !u!114 &1218599818 -MonoBehaviour: +--- !u!114 &1218599818 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2123,7 +1720,6 @@ RectTransform: - {fileID: 413511730} - {fileID: 649944144} - {fileID: 1840686700} - - {fileID: 1885843486} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2299,133 +1895,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1512180528} m_CullTransparentMesh: 1 ---- !u!1 &1529554368 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1529554369} - - component: {fileID: 1529554370} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1529554369 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1529554368} - 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: - - {fileID: 731742046} - m_Father: {fileID: 1555563183} - 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} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &1529554370 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1529554368} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!1 &1555563182 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1555563183} - - component: {fileID: 1555563186} - - component: {fileID: 1555563185} - m_Layer: 5 - m_Name: Viewport - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1555563183 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1555563182} - 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: - - {fileID: 1529554369} - m_Father: {fileID: 787917409} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 8, y: -8} - m_SizeDelta: {x: -16, y: -16} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1555563185 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1555563182} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.003921569} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 802d6333b5d61cc428dca1696d22f34c, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1555563186 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1555563182} - m_CullTransparentMesh: 1 --- !u!1 &1731069476 GameObject: m_ObjectHideFlags: 0 @@ -2569,85 +2038,6 @@ Transform: m_Children: [] m_Father: {fileID: 1388893197} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1825989211 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1825989212} - - component: {fileID: 1825989214} - - component: {fileID: 1825989213} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1825989212 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1825989211} - 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: 1885843486} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -64, y: -16} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1825989213 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1825989211} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 24 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Option A ---- !u!222 &1825989214 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1825989211} - m_CullTransparentMesh: 1 --- !u!1 &1840686698 GameObject: m_ObjectHideFlags: 0 @@ -2703,223 +2093,10 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -432} m_SizeDelta: {x: 512, y: 64} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1850826612 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1850826613} - - component: {fileID: 1850826615} - - component: {fileID: 1850826614} - m_Layer: 5 - m_Name: Arrow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1850826613 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850826612} - 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: 1885843486} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -32, y: 0} - m_SizeDelta: {x: 32, y: 32} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1850826614 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850826612} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10915, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1850826615 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850826612} - m_CullTransparentMesh: 1 ---- !u!1 &1885843485 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1885843486} - - component: {fileID: 1885843489} - - component: {fileID: 1885843488} - - component: {fileID: 1885843487} - m_Layer: 5 - m_Name: Dropdown (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1885843486 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1885843485} - 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: - - {fileID: 1825989212} - - {fileID: 1850826613} - - {fileID: 787917409} - m_Father: {fileID: 1388893197} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 570, y: 0} - m_SizeDelta: {x: 512, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1885843487 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1885843485} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0d0b652f32a2cc243917e4028fa0f046, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1885843488} - m_Template: {fileID: 787917409} - m_CaptionText: {fileID: 1825989213} - m_CaptionImage: {fileID: 0} - m_ItemText: {fileID: 1028235769} - m_ItemImage: {fileID: 0} - m_Value: 0 - m_Options: - m_Options: - - m_Text: Option A - m_Image: {fileID: 0} - - m_Text: Option B - m_Image: {fileID: 0} - - m_Text: Option C - m_Image: {fileID: 0} - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_AlphaFadeSpeed: 0.15 ---- !u!114 &1885843488 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1885843485} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 802d6333b5d61cc428dca1696d22f34c, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1885843489 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1885843485} - m_CullTransparentMesh: 1 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 174939750} - {fileID: 1297163508} - {fileID: 1388893197} + - {fileID: 174939750} diff --git a/Samples~/Text and Audio Samples/WebGL Audio Sample.unity b/Samples~/Text and Audio Samples/WebGL Audio Sample.unity index d15b9fb..90fbd96 100644 --- a/Samples~/Text and Audio Samples/WebGL Audio Sample.unity +++ b/Samples~/Text and Audio Samples/WebGL Audio Sample.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -42,8 +42,8 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -66,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -96,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -375,7 +372,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!95 &222976250 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -389,6 +386,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -752,58 +750,47 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1318295054} m_Modifications: - - target: {fileID: 7096255273550292191, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7096255273550292191, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_Name value: Character Visuals objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + - target: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -814,8 +801,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} --- !u!4 &616814069 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, - type: 3} + m_CorrespondingSourceObject: {fileID: 7719522783077959134, guid: c1da51de8aa6a934ba81ae966b7046ce, type: 3} m_PrefabInstance: {fileID: 616814068} m_PrefabAsset: {fileID: 0} --- !u!1 &672248277 @@ -1034,9 +1020,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727776101} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -1086,8 +1071,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!1 &895810389 GameObject: m_ObjectHideFlags: 0 @@ -2085,6 +2074,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -2787,6 +2777,6 @@ CanvasRenderer: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 1318295054} - {fileID: 944550575} - {fileID: 112153985} + - {fileID: 1318295054} diff --git a/package.json b/package.json index 990b976..c6157de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "link.neocortex.sdk", - "version": "0.3.0", + "version": "0.3.1", "displayName": "Neocortex Unity SDK", "description": "Conversational AI for Games Simplified. With Neocortex SDK, create dynamic in-game conversations with AI-powered smart characters using our node-based editor and SDKs.", "unity": "2020.3", @@ -14,7 +14,11 @@ "npcs", "character", "character ai", - "game ai" + "game ai", + "smart agent", + "game agent", + "agentic ai", + "agentic npc" ], "author": { "name": "Neocortex",