diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 620b95503..25a029b46 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -237,63 +237,221 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1f1852e60e7132046b79863fb1d23af0, type: 3} ---- !u!1001 &141877640 -PrefabInstance: +--- !u!4 &141729588 +Transform: m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 141888020} serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 125852, guid: 58ac37417e60e534f91138088a3e6f70, type: 3} - propertyPath: m_Name - value: Dialogue Manager - objectReference: {fileID: 0} - - target: {fileID: 425660, guid: 58ac37417e60e534f91138088a3e6f70, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 425660, guid: 58ac37417e60e534f91138088a3e6f70, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 425660, guid: 58ac37417e60e534f91138088a3e6f70, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 425660, guid: 58ac37417e60e534f91138088a3e6f70, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 425660, guid: 58ac37417e60e534f91138088a3e6f70, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 425660, guid: 58ac37417e60e534f91138088a3e6f70, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 425660, guid: 58ac37417e60e534f91138088a3e6f70, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 425660, guid: 58ac37417e60e534f91138088a3e6f70, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 425660, guid: 58ac37417e60e534f91138088a3e6f70, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 425660, guid: 58ac37417e60e534f91138088a3e6f70, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 58ac37417e60e534f91138088a3e6f70, type: 3} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &141888020 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 141729588} + - component: {fileID: 148551824} + - component: {fileID: 148629854} + - component: {fileID: 148550368} + m_Layer: 0 + m_Name: Dialogue Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &148550368 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 141888020} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dddab24af7a02a54c9631fd5c532d7c4, type: 3} + m_Name: + m_EditorClassIdentifier: + inputDevice: 1 + joystickKeyCodesToCheck: 4a0100004b0100004c01000051010000 + joystickButtonsToCheck: [] + joystickAxesToCheck: [] + joystickAxisThreshold: 0.5 + keyButtonsToCheck: [] + keyCodesToCheck: 1b000000 + keyInputSwitchesModeTo: 1 + alwaysAutoFocus: 0 + detectMouseControl: 1 + mouseMoveThreshold: 0.1 + controlCursorState: 1 + enforceCursorOnPause: 0 + controlGraphicRaycasters: 0 + backKeyCodes: 4b010000 + backButtons: + - Cancel + submitButton: Submit + singleton: 1 + onUseKeyboard: + m_PersistentCalls: + m_Calls: [] + onUseJoystick: + m_PersistentCalls: + m_Calls: [] + onUseMouse: + m_PersistentCalls: + m_Calls: [] + onUseTouch: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &148551824 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 141888020} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab8b685e62a9aeb4a9472b30ec2d86d9, type: 3} + m_Name: + m_EditorClassIdentifier: + initialDatabase: {fileID: 11400000, guid: bde86f268240d1041a808e449d9cac43, type: 2} + displaySettings: + conversationOverrideSettings: + useOverrides: 0 + overrideSubtitleSettings: 0 + showNPCSubtitlesDuringLine: 1 + showNPCSubtitlesWithResponses: 1 + showPCSubtitlesDuringLine: 0 + skipPCSubtitleAfterResponseMenu: 0 + subtitleCharsPerSecond: 30 + minSubtitleSeconds: 2 + continueButton: 0 + overrideSequenceSettings: 0 + defaultSequence: + defaultPlayerSequence: + defaultResponseMenuSequence: + overrideInputSettings: 0 + alwaysForceResponseMenu: 1 + includeInvalidEntries: 0 + responseTimeout: 0 + emTagForOldResponses: 0 + emTagForInvalidResponses: 0 + cancelSubtitle: + key: 27 + buttonName: + cancelConversation: + key: 27 + buttonName: + dialogueUI: {fileID: 101180, guid: 5ba51781a19f8a843abeb2d304d0d26e, type: 3} + defaultCanvas: {fileID: 1049919591} + localizationSettings: + language: + useSystemLanguage: 0 + textTable: {fileID: 0} + subtitleSettings: + showNPCSubtitlesDuringLine: 1 + showNPCSubtitlesWithResponses: 1 + showPCSubtitlesDuringLine: 0 + allowPCSubtitleReminders: 0 + skipPCSubtitleAfterResponseMenu: 1 + subtitleCharsPerSecond: 30 + minSubtitleSeconds: 2 + continueButton: 2 + requireContinueOnLastLine: 0 + richTextEmphases: 1 + informSequenceStartAndEnd: 0 + cameraSettings: + sequencerCamera: {fileID: 0} + alternateCameraObject: {fileID: 0} + cameraAngles: {fileID: 0} + keepCameraPositionAtConversationEnd: 0 + showSubtitleOnEmptyContinue: 0 + defaultSequence: Delay({{end}}) + defaultPlayerSequence: + defaultResponseMenuSequence: + entrytagFormat: 0 + reportMissingAudioFiles: 0 + disableInternalSequencerCommands: 0 + inputSettings: + alwaysForceResponseMenu: 1 + includeInvalidEntries: 0 + responseTimeout: 0 + responseTimeoutAction: 0 + emTagForOldResponses: 0 + emTagForInvalidResponses: 0 + qteButtons: + - Fire1 + - Fire2 + cancel: + key: 0 + buttonName: + cancelConversation: + key: 0 + buttonName: + barkSettings: + allowBarksDuringConversations: 1 + barkCharsPerSecond: 0 + minBarkSeconds: 0 + defaultBarkSequence: + alertSettings: + allowAlertsDuringConversations: 0 + alertCheckFrequency: 0 + alertCharsPerSecond: 0 + minAlertSeconds: 0 + persistentDataSettings: + recordPersistentDataOn: 1 + includeActorData: 1 + includeAllItemData: 0 + includeLocationData: 0 + includeStatusAndRelationshipData: 1 + includeAllConversationFields: 0 + saveConversationSimStatusWithField: + saveDialogueEntrySimStatusWithField: + asyncGameObjectBatchSize: 1000 + asyncDialogueEntryBatchSize: 100 + initializeNewVariables: 1 + allowSimultaneousConversations: 0 + interruptActiveConversations: 0 + includeSimStatus: 0 + instantiateDatabase: 1 + preloadResources: 1 + warmUpConversationController: 0 + dontHideImmediateDuringWarmup: 0 + dontDestroyOnLoad: 1 + allowOnlyOneInstance: 1 + onStartTriggerWaitForSaveDataApplied: 0 + dialogueTimeMode: 0 + debugLevel: 2 +--- !u!114 &148629854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 141888020} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b24a5606b164c84db0d3ed3ee8256e1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_parent: {fileID: 1049919592} + m_prefabs: + - {fileID: 168688, guid: a5c98dfcec76e1847a0aa8d7c8a93459, type: 3} + - {fileID: 121952, guid: 720348da784b8fa49a7c48365da6f1b1, type: 3} + - {fileID: 162630, guid: f40d1072f56eeb04f9c104b7c4a8811f, type: 3} + m_position: 0 --- !u!1 &165021634 GameObject: m_ObjectHideFlags: 0 @@ -1957,37 +2115,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 109afa56f22782a4baef8705031c807a, type: 3} m_PrefabInstance: {fileID: 1081115323} m_PrefabAsset: {fileID: 0} ---- !u!1 &1163828192 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1163828193} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1163828193 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163828192} - 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1178042444 GameObject: m_ObjectHideFlags: 0 @@ -2954,7 +3081,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _persistent: 0 - k__BackingField: {fileID: 1665075871} k__BackingField: {fileID: 1665075870} --- !u!114 &1665075870 MonoBehaviour: @@ -2981,6 +3107,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7ab08469541b2aa45818fa36bbcb9cf7, type: 3} m_Name: m_EditorClassIdentifier: + _persistent: 0 + _customerDataSo: {fileID: 11400000, guid: e6ce9d58057b580479880585947969d8, type: 2} _customerPrefab: {fileID: -2302002259734456648, guid: 23195e611c71ad44b8a1ccb2b6e0efe5, type: 3} _customerSpawnTransform: {fileID: 1038321203} _checkEmptySeatInterval: 0.5 @@ -3562,10 +3690,9 @@ SceneRoots: - {fileID: 1628404463} - {fileID: 91463582} - {fileID: 1472541870} + - {fileID: 141729588} - {fileID: 1665075868} - {fileID: 852387592} - {fileID: 1253205195} - {fileID: 20736010} - {fileID: 5626406452199475265} - - {fileID: 1163828193} - - {fileID: 141877640} diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs index 806770fc1..6b4efb199 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs @@ -19,7 +19,7 @@ namespace BlueWater.BehaviorTrees.Actions public override void OnStart() { - TycoonManager.Instance.CustomerManager.TryFindEmptySeat(_customer); + CustomerManager.Instance.TryFindEmptySeat(_customer); } public override TaskStatus OnUpdate() diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderBeverage.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderBeverage.cs new file mode 100644 index 000000000..0d4fd0d8f --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderBeverage.cs @@ -0,0 +1,81 @@ +using System; +using BehaviorDesigner.Runtime.Tasks; +using BlueWater.Items; +using BlueWater.Npcs.Customers; +using BlueWater.Uis; +using PixelCrushers.DialogueSystem; +using UnityEngine; +using Action = BehaviorDesigner.Runtime.Tasks.Action; + +namespace BlueWater.BehaviorTrees.Actions +{ + [TaskCategory("Custom/Npc/Customer")] + [Serializable] + public class OrderBeverage : Action + { + private Customer _customer; + private CustomerData _customerData; + private FoodBalloonUi _foodBalloonUi; + + public override void OnAwake() + { + _customer = GetComponent(); + _customerData = _customer.CustomerData; + } + + public override void OnStart() + { + _foodBalloonUi = _customer.FoodBalloonUi; + // TODO : 음료가 다양해질 때 수정해야함 + _foodBalloonUi.OrderFood(40001, _customerData.WaitTime, _customerData.HurryTime); + + _customer.OnInteraction += HandleBeverageInteraction; + _customer.RegisterPlayerInteraction(); + } + + public override TaskStatus OnUpdate() + { + if (_foodBalloonUi.IsFoodReceive()) + { + _customer.OnInteraction -= HandleBeverageInteraction; + _customer.UnregisterPlayerInteraction(); + return TaskStatus.Success; + } + + if (_foodBalloonUi.IsWaitTimeOver()) + { + _foodBalloonUi.CancelOrder(); + _customer.OnInteraction -= HandleBeverageInteraction; + _customer.UnregisterPlayerInteraction(); + _customer.AddHappyPoint(-1); + return TaskStatus.Failure; + } + + return TaskStatus.Running; + } + + private void HandleBeverageInteraction() + { + var tycoonPlayer = GameManager.Instance.CurrentTycoonPlayer; + var carriedBeverageData = tycoonPlayer.GetCurrentFoodData(); + if (carriedBeverageData == null) + { + Debug.Log("플레이어가 가지고 있는 음식의 데이터가 없습니다."); + return; + } + + // TODO : 음료가 다양해질 때 수정해야함 + if (carriedBeverageData.Idx == 40001) + { + tycoonPlayer.GiveFood(); + _foodBalloonUi.ReceiveFood(); + _customer.SetFood(carriedBeverageData); + if (carriedBeverageData.Quality == ItemQuality.High) + { + _customer.AddHappyPoint(1); + } + // TODO : 음료를 마시는 애니메이션 + } + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderBeverage.cs.meta b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderBeverage.cs.meta new file mode 100644 index 000000000..0fcddfef5 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderBeverage.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d302614c61dba1e48bba44126ecb20c6 diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs index 0855abe49..e1b36333c 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs @@ -1,7 +1,9 @@ using System; using BehaviorDesigner.Runtime.Tasks; +using BlueWater.Items; using BlueWater.Npcs.Customers; using BlueWater.Uis; +using PixelCrushers.DialogueSystem; using UnityEngine; using Action = BehaviorDesigner.Runtime.Tasks.Action; @@ -12,22 +14,25 @@ namespace BlueWater.BehaviorTrees.Actions public class OrderFood : Action { private Customer _customer; + private CustomerData _customerData; private FoodBalloonUi _foodBalloonUi; private int _orderFoodIdx; public override void OnAwake() { _customer = GetComponent(); + _customerData = _customer.CustomerData; } public override void OnStart() { _foodBalloonUi = _customer.FoodBalloonUi; _orderFoodIdx = 40001; - _foodBalloonUi.OrderFood(_orderFoodIdx, 15f); + _foodBalloonUi.OrderFood(_orderFoodIdx, _customerData.WaitTime, _customerData.HurryTime); _customer.OnInteraction += HandleFoodInteraction; _customer.RegisterPlayerInteraction(); + DialogueManager.Bark("OrderFood", _customer.transform); } public override TaskStatus OnUpdate() @@ -68,6 +73,10 @@ namespace BlueWater.BehaviorTrees.Actions tycoonPlayer.GiveFood(); _foodBalloonUi.ReceiveFood(); _customer.SetFood(carriedFoodData); + if (carriedFoodData.Quality == ItemQuality.High) + { + _customer.AddHappyPoint(1); + } // TODO : 음식을 테이블에 깔고 먹는 행동 } } diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional.meta b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional.meta new file mode 100644 index 000000000..879dd23dd --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ea4719344d4e75d45b2093f871feee0c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CheckOrderBeverage.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CheckOrderBeverage.cs new file mode 100644 index 000000000..a358516c1 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CheckOrderBeverage.cs @@ -0,0 +1,25 @@ +using System; +using BehaviorDesigner.Runtime.Tasks; +using BlueWater.Npcs.Customers; + +namespace BlueWater.BehaviorTrees.Actions +{ + [TaskCategory("Custom/Npc/Customer")] + [Serializable] + public class CheckOrderBeverage : Conditional + { + private Customer _customer; + private CustomerData _customerData; + + public override void OnAwake() + { + _customer = GetComponent(); + _customerData = _customer.CustomerData; + } + + public override TaskStatus OnUpdate() + { + return _customerData.IsOrderedBeverage() ? TaskStatus.Success : TaskStatus.Failure; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CheckOrderBeverage.cs.meta b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CheckOrderBeverage.cs.meta new file mode 100644 index 000000000..a8e20e0d6 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CheckOrderBeverage.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b526cf22fd8dfe946853b85b4b30c507 diff --git a/Assets/02.Scripts/Character/Npc/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer.cs index 6bdbc3f6a..8270c50ee 100644 --- a/Assets/02.Scripts/Character/Npc/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer.cs @@ -8,6 +8,7 @@ using BlueWater.Players.Tycoons; using BlueWater.Tycoons; using BlueWater.Uis; using Pathfinding; +using PixelCrushers.DialogueSystem; using Sirenix.OdinInspector; using UnityEngine; @@ -38,6 +39,9 @@ namespace BlueWater.Npcs.Customers [field: SerializeField] public MeshRenderer MeshRenderer { get; private set; } + [field: SerializeField] + public BarkTrigger BarkTrigger { get; private set; } + [field: SerializeField] public Canvas InteractionCanvas { get; private set; } @@ -48,6 +52,9 @@ namespace BlueWater.Npcs.Customers public FoodBalloonUi FoodBalloonUi { get; private set; } // Classes + [field: SerializeField, Required] + public CustomerData CustomerData { get; private set; } + [field: SerializeField, Required] public SpineController SpineController { get; private set; } @@ -59,6 +66,8 @@ namespace BlueWater.Npcs.Customers private IAstarAI _astarAi; public TableSeat TableSeat { get; private set; } + + public int HappyPoint { get; private set; } private bool _isMoving; @@ -118,7 +127,7 @@ namespace BlueWater.Npcs.Customers { if (_isQuitting) return; - TycoonManager.Instance.CustomerManager.UnregisterCustomer(this); + CustomerManager.Instance.UnregisterCustomer(this); } #endregion @@ -136,6 +145,7 @@ namespace BlueWater.Npcs.Customers BehaviorTree = GetComponent(); VisualLook = transform.Find("VisualLook"); MeshRenderer = VisualLook.GetComponent(); + BarkTrigger = transform.Find("DialogueSystem").GetComponent(); InteractionCanvas = transform.Find("InteractionCanvas").GetComponent(); InteractionCanvas.worldCamera = TycoonCameraManager.Instance.UiCamera; InteractionUi = InteractionCanvas.transform.Find("InteractionUi"); @@ -150,6 +160,8 @@ namespace BlueWater.Npcs.Customers public void Initialize() { + CustomerData = CustomerManager.Instance.GetRandomCustomerData(); + AIMovement.SetMoveSpeed(CustomerData.MoveSpeed); BehaviorTree.EnableBehavior(); } @@ -237,6 +249,17 @@ namespace BlueWater.Npcs.Customers } } + public void AddHappyPoint(int value) => HappyPoint += value; + + public void Bark(string conversation = null) + { + if (!string.IsNullOrEmpty(conversation)) + { + BarkTrigger.conversation = conversation; + } + BarkTrigger.OnUse(); + } + #endregion } } \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Npc/CustomerData.cs b/Assets/02.Scripts/Character/Npc/CustomerData.cs new file mode 100644 index 000000000..154dda861 --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/CustomerData.cs @@ -0,0 +1,52 @@ +using System; +using BlueWater.Interfaces; +using Sirenix.OdinInspector; +using UnityEngine; +using Random = UnityEngine.Random; + +namespace BlueWater.Npcs.Customers +{ + [Serializable] + public class CustomerData : IIdx + { + [BoxGroup("Json 데이터 영역")] + [field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")] + public int Idx { get; set; } + + [field: SerializeField, Tooltip("이름"), BoxGroup("Json 데이터 영역")] + public string Name { get; set; } + + [field: SerializeField, Tooltip("이동속도"), BoxGroup("Json 데이터 영역")] + public int MoveSpeed { get; set; } + + [field: SerializeField, Tooltip("음식을 먹는 시간"), BoxGroup("Json 데이터 영역")] + public int EatingTime { get; set; } + + [field: SerializeField, Tooltip("음식을 여유롭게 기다리는 시간"), BoxGroup("Json 데이터 영역")] + public int WaitTime { get; set; } + + [field: SerializeField, Tooltip("음식을 재촉하는 시간"), BoxGroup("Json 데이터 영역")] + public int HurryTime { get; set; } + + [field: SerializeField, Tooltip("기본 만족도"), BoxGroup("Json 데이터 영역")] + public int BaseHappyPoint { get; set; } + + [field: SerializeField, Tooltip("선호하는 음식 우선순위1"), BoxGroup("Json 데이터 영역")] + public int PreferredFood1 { get; set; } + + [field: SerializeField, Tooltip("선호하는 음식 우선순위2"), BoxGroup("Json 데이터 영역")] + public int PreferredFood2 { get; set; } + + [field: SerializeField, Tooltip("선호하는 음식 우선순위3"), BoxGroup("Json 데이터 영역")] + public int PreferredFood3 { get; set; } + + [field: SerializeField, Tooltip("음료를 주문할 확률"), BoxGroup("Json 데이터 영역")] + public int OrderBeverageRate { get; set; } + + public bool IsOrderedBeverage() + { + var dropChance = Random.Range(0, 101); + return dropChance <= OrderBeverageRate; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Npc/CustomerData.cs.meta b/Assets/02.Scripts/Character/Npc/CustomerData.cs.meta new file mode 100644 index 000000000..c45685eb5 --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/CustomerData.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7624bd13d9c76c848b2eb338a909619b diff --git a/Assets/02.Scripts/Character/Npc/CustomerDataSo.cs b/Assets/02.Scripts/Character/Npc/CustomerDataSo.cs new file mode 100644 index 000000000..f78049065 --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/CustomerDataSo.cs @@ -0,0 +1,23 @@ +using System.Collections.Generic; +using BlueWater.Interfaces; +using UnityEngine; + +namespace BlueWater.Npcs.Customers +{ + [CreateAssetMenu(fileName = "CustomerDataTable", menuName = "ScriptableObjects/CustomerDataTable")] + public class CustomerDataSo : ScriptableObject, IDataContainer + { + [field: SerializeField] + public List CustomerDatas { get; private set; } + + public List GetData() + { + return CustomerDatas; + } + + public void SetData(List customerDatas) + { + CustomerDatas = customerDatas; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Npc/CustomerDataSo.cs.meta b/Assets/02.Scripts/Character/Npc/CustomerDataSo.cs.meta new file mode 100644 index 000000000..0208ca1b5 --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/CustomerDataSo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7da6888bb8af7de45985429156f60ee0 diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonFoodHandler.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonFoodHandler.cs index 1ae29ac24..e3a7f3335 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonFoodHandler.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonFoodHandler.cs @@ -31,7 +31,7 @@ namespace BlueWater.Players.Tycoons _foodRenderer = transform.Find("VisualLook/Food").GetComponent(); } - public void CarryFood(int foodIdx) + public void CarryFood(int foodIdx, ItemQuality itemQuality) { if (_isCarriedFood) { @@ -39,7 +39,10 @@ namespace BlueWater.Players.Tycoons return; } - _currentFoodData = _itemManager.GetItemDataByIdx(foodIdx); + _currentFoodData = new ItemData(_itemManager.GetItemDataByIdx(foodIdx)) + { + Quality = itemQuality + }; if (_currentFoodData == null) { Debug.LogError($"{foodIdx} 해당 음식을 등록할 수 없습니다."); diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs index 7809431db..64431930c 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs @@ -110,7 +110,7 @@ namespace BlueWater.Players.Tycoons } // Wrapping - public void CarryFood(int foodIdx) => TycoonFoodHandler.CarryFood(foodIdx); + public void CarryFood(int foodIdx, ItemQuality itemQuality) => TycoonFoodHandler.CarryFood(foodIdx, itemQuality); public void GiveFood() => TycoonFoodHandler.GiveFood(); public void DiscardFood() => TycoonFoodHandler.DiscardFood(); public ItemData GetCurrentFoodData() => TycoonFoodHandler.GetCurrentFoodData(); diff --git a/Assets/02.Scripts/Editor/JsonHelperEditor.cs b/Assets/02.Scripts/Editor/JsonHelperEditor.cs index 4f41298ea..608e8eb9a 100644 --- a/Assets/02.Scripts/Editor/JsonHelperEditor.cs +++ b/Assets/02.Scripts/Editor/JsonHelperEditor.cs @@ -2,6 +2,7 @@ using System.IO; using BlueWater.Interfaces; using BlueWater.Items; +using BlueWater.Npcs.Customers; using BlueWater.Utility; using UnityEditor; using UnityEngine; @@ -15,7 +16,9 @@ namespace BlueWater.Editors private enum DataType { None = 0, - ItemDataTable + ItemDataTable, + CustomerDataTable, + FoodDataTable } private string _jsonFilePath = "Assets/Resources/Json/FileName"; @@ -69,6 +72,12 @@ namespace BlueWater.Editors case DataType.ItemDataTable: LoadData(); break; + case DataType.CustomerDataTable: + LoadData(); + break; + case DataType.FoodDataTable: + LoadData(); + break; default: EditorUtility.DisplayDialog("경고 메세지", "데이터 타입이 제대로 설정되어있는지 확인해주세요.", "OK"); Debug.LogError("데이터 타입이 제대로 설정되어있는지 확인해주세요."); diff --git a/Assets/02.Scripts/Item/Food.meta b/Assets/02.Scripts/Item/Food.meta new file mode 100644 index 000000000..44939ad2b --- /dev/null +++ b/Assets/02.Scripts/Item/Food.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 737e996fcfc26f744bd10911bbae0798 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/Item/Food/FoodData.cs b/Assets/02.Scripts/Item/Food/FoodData.cs new file mode 100644 index 000000000..641ef84c2 --- /dev/null +++ b/Assets/02.Scripts/Item/Food/FoodData.cs @@ -0,0 +1,78 @@ +using System; +using BlueWater.Interfaces; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Items +{ + public enum FoodType + { + None = 0, + SkewerGrill, + Soup, + IronPlateMeat, + Dessert, + } + + public enum FoodTaste + { + None = 0, + Savory, + Spicy, + Salty, + Sweet + } + + [Serializable] + public class FoodData : IIdx + { + [BoxGroup("Json 데이터 영역")] + [field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")] + public int Idx { get; set; } + + [field: SerializeField, Tooltip("이름"), BoxGroup("Json 데이터 영역")] + public string Name { get; set; } + + [field: SerializeField, Tooltip("음식의 종류"), BoxGroup("Json 데이터 영역")] + public FoodType Type { get; set; } + + [field: SerializeField, Tooltip("음식의 맛"), BoxGroup("Json 데이터 영역")] + public FoodTaste Taste { get; set; } + + [field: SerializeField, Tooltip("음식 제작 시간"), BoxGroup("Json 데이터 영역")] + public int CookTime { get; set; } + + [field: SerializeField, Tooltip("음식 제작에 나오는 접시 수"), BoxGroup("Json 데이터 영역")] + public int Plate { get; set; } + + [field: SerializeField, Tooltip("1번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] + public string IngredientIdx1 { get; set; } + + [field: SerializeField, Tooltip("1번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] + public string IngredientQuantity1 { get; set; } + + [field: SerializeField, Tooltip("2번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] + public string IngredientIdx2 { get; set; } + + [field: SerializeField, Tooltip("2번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] + public string IngredientQuantity2 { get; set; } + + [field: SerializeField, Tooltip("3번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] + public string IngredientIdx3 { get; set; } + + [field: SerializeField, Tooltip("3번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] + public string IngredientQuantity3 { get; set; } + + [field: SerializeField, Tooltip("4번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] + public string IngredientIdx4 { get; set; } + + [field: SerializeField, Tooltip("4번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] + public string IngredientQuantity4 { get; set; } + + [field: SerializeField, Tooltip("5번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] + public string IngredientIdx5 { get; set; } + + [field: SerializeField, Tooltip("5번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] + public string IngredientQuantity5 { get; set; } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Food/FoodData.cs.meta b/Assets/02.Scripts/Item/Food/FoodData.cs.meta new file mode 100644 index 000000000..ab71f5ce2 --- /dev/null +++ b/Assets/02.Scripts/Item/Food/FoodData.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 657985a4ff714ca4f8e65158b0a8e72f diff --git a/Assets/02.Scripts/Item/Food/FoodDataSo.cs b/Assets/02.Scripts/Item/Food/FoodDataSo.cs new file mode 100644 index 000000000..84cd7f466 --- /dev/null +++ b/Assets/02.Scripts/Item/Food/FoodDataSo.cs @@ -0,0 +1,23 @@ +using System.Collections.Generic; +using BlueWater.Interfaces; +using UnityEngine; + +namespace BlueWater.Items +{ + [CreateAssetMenu(fileName = "FoodDataTable", menuName = "ScriptableObjects/FoodDataTable")] + public class FoodDataSo : ScriptableObject, IDataContainer + { + [field: SerializeField] + public List FoodDatas { get; private set; } + + public List GetData() + { + return FoodDatas; + } + + public void SetData(List foodDatas) + { + FoodDatas = foodDatas; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Food/FoodDataSo.cs.meta b/Assets/02.Scripts/Item/Food/FoodDataSo.cs.meta new file mode 100644 index 000000000..ad64dca67 --- /dev/null +++ b/Assets/02.Scripts/Item/Food/FoodDataSo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e22dd2055785c2f4dadcf76fb593edf4 diff --git a/Assets/02.Scripts/Item/ItemData.cs b/Assets/02.Scripts/Item/ItemData.cs index c1daa5872..d52ec92bb 100644 --- a/Assets/02.Scripts/Item/ItemData.cs +++ b/Assets/02.Scripts/Item/ItemData.cs @@ -26,6 +26,13 @@ namespace BlueWater.Items Seasoning } + public enum ItemQuality + { + None = 0, + Normal, + High + } + [Serializable] public class ItemData : IIdx { @@ -41,6 +48,9 @@ namespace BlueWater.Items [field: SerializeField, Tooltip("재료 종류"), BoxGroup("Json 데이터 영역")] public ItemType Type { get; set; } + + [field: SerializeField, Tooltip("아이템 품질"), BoxGroup("Json 데이터 영역")] + public ItemQuality Quality { get; set; } [field: SerializeField, Tooltip("가격"), BoxGroup("Json 데이터 영역")] public int Price { get; set; } @@ -57,5 +67,19 @@ namespace BlueWater.Items [field: SerializeField, BoxGroup("직접 추가하는 영역")] public Item ItemPrefab { get; set; } + + public ItemData(ItemData itemData) + { + Idx = itemData.Idx; + Name = itemData.Name; + Category = itemData.Category; + Type = itemData.Type; + Quality = itemData.Quality; + Price = itemData.Price; + Weight = itemData.Weight; + Description = itemData.Description; + Sprite = itemData.Sprite; + ItemPrefab = itemData.ItemPrefab; + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Item/ItemDropTableSo.cs b/Assets/02.Scripts/Item/ItemDropTableSo.cs index db6b69dbb..c37438469 100644 --- a/Assets/02.Scripts/Item/ItemDropTableSo.cs +++ b/Assets/02.Scripts/Item/ItemDropTableSo.cs @@ -8,7 +8,7 @@ using UnityEngine; using UnityEditor; #endif -namespace BlueWater +namespace BlueWater.Items { public class ItemDropTableSo : ScriptableObject { diff --git a/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs b/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs index 7432e7aa1..8cebc99ec 100644 --- a/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs +++ b/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs @@ -1,3 +1,4 @@ +using BlueWater.Items; using UnityEngine; namespace BlueWater.Tycoons @@ -9,7 +10,8 @@ namespace BlueWater.Tycoons public override void Interaction() { - GameManager.Instance.CurrentTycoonPlayer.CarryFood(_beverageIdx); + // TODO : 미니게임을 시작하고, 성공 여부에 따라 음식 품질 부여 + GameManager.Instance.CurrentTycoonPlayer.CarryFood(_beverageIdx, ItemQuality.None); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/ScriptableObject/Item/FoodDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/FoodDataTable.asset new file mode 100644 index 000000000..7ed0a40fd --- /dev/null +++ b/Assets/02.Scripts/ScriptableObject/Item/FoodDataTable.asset @@ -0,0 +1,111 @@ +%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: e22dd2055785c2f4dadcf76fb593edf4, type: 3} + m_Name: FoodDataTable + m_EditorClassIdentifier: + k__BackingField: + - k__BackingField: 30001 + k__BackingField: "\uC2AC\uB77C\uC784 \uD478\uB529" + k__BackingField: 4 + k__BackingField: 4 + k__BackingField: 20 + k__BackingField: 10 + k__BackingField: 10108 + k__BackingField: 1 + k__BackingField: 10706 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + - k__BackingField: 30002 + k__BackingField: "\uC5BC\uC74C\uB3C4\uCE58 \uD325\uBE59\uC218" + k__BackingField: 4 + k__BackingField: 4 + k__BackingField: 20 + k__BackingField: 10 + k__BackingField: 10109 + k__BackingField: 1 + k__BackingField: 10706 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + - k__BackingField: 30003 + k__BackingField: "\uCF54\uBFD4\uC18C \uBFD4 \uD280\uAE40" + k__BackingField: 2 + k__BackingField: 4 + k__BackingField: 20 + k__BackingField: 10 + k__BackingField: 10106 + k__BackingField: 1 + k__BackingField: 10506 + k__BackingField: 1 + k__BackingField: 10704 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + - k__BackingField: 30004 + k__BackingField: "\uCF54\uBFD4\uC18C \uB4B7\uB2E4\uB9AC \uACE0\uAE30" + k__BackingField: 3 + k__BackingField: 1 + k__BackingField: 40 + k__BackingField: 10 + k__BackingField: 10107 + k__BackingField: 1 + k__BackingField: 10507 + k__BackingField: 1 + k__BackingField: 10701 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + - k__BackingField: 30005 + k__BackingField: "\uBC31\uC0C1\uC5B4 \uD1B5\uAD6C\uC774" + k__BackingField: 1 + k__BackingField: 1 + k__BackingField: 20 + k__BackingField: 10 + k__BackingField: 10201 + k__BackingField: 1 + k__BackingField: 10404 + k__BackingField: 1 + k__BackingField: 10508 + k__BackingField: 1 + k__BackingField: 10704 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 0 + - k__BackingField: 30006 + k__BackingField: "\uBC84\uD130 \uC870\uAC1C \uAD6C\uC774" + k__BackingField: 3 + k__BackingField: 4 + k__BackingField: 25 + k__BackingField: 10 + k__BackingField: 10603 + k__BackingField: 1 + k__BackingField: 10503 + k__BackingField: 1 + k__BackingField: 10705 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 diff --git a/Assets/02.Scripts/ScriptableObject/Item/FoodDataTable.asset.meta b/Assets/02.Scripts/ScriptableObject/Item/FoodDataTable.asset.meta new file mode 100644 index 000000000..badf0879a --- /dev/null +++ b/Assets/02.Scripts/ScriptableObject/Item/FoodDataTable.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7b282dfe68d23cd48a8f437ae2cd7dde +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/ScriptableObject/Npc.meta b/Assets/02.Scripts/ScriptableObject/Npc.meta new file mode 100644 index 000000000..2cb6f9c7f --- /dev/null +++ b/Assets/02.Scripts/ScriptableObject/Npc.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 10babf7f1ce571b4b98b6e4eb65f3c23 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/ScriptableObject/Npc/CustomerDataTable.asset b/Assets/02.Scripts/ScriptableObject/Npc/CustomerDataTable.asset new file mode 100644 index 000000000..123e51d59 --- /dev/null +++ b/Assets/02.Scripts/ScriptableObject/Npc/CustomerDataTable.asset @@ -0,0 +1,99 @@ +%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: 7da6888bb8af7de45985429156f60ee0, type: 3} + m_Name: CustomerDataTable + m_EditorClassIdentifier: + k__BackingField: + - k__BackingField: 10001 + k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uD3C9\uBC94\uD558\uACE0 + \uAE09\uD55C Ai1" + k__BackingField: 3 + k__BackingField: 5 + k__BackingField: 5 + k__BackingField: 5 + k__BackingField: 3 + k__BackingField: 2 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 100 + - k__BackingField: 10002 + k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uD3C9\uBC94\uD558\uACE0 + \uAE09\uD55C Ai2" + k__BackingField: 3 + k__BackingField: 5 + k__BackingField: 5 + k__BackingField: 5 + k__BackingField: 3 + k__BackingField: 1 + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 100 + - k__BackingField: 10003 + k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uB290\uB9AC\uACE0 \uB290\uAE0B\uD55C + Ai1" + k__BackingField: 2 + k__BackingField: 15 + k__BackingField: 15 + k__BackingField: 15 + k__BackingField: 3 + k__BackingField: 1 + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 100 + - k__BackingField: 10004 + k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uBE60\uB974\uACE0 \uD3C9\uBC94\uD55C + Ai1" + k__BackingField: 4 + k__BackingField: 10 + k__BackingField: 10 + k__BackingField: 10 + k__BackingField: 3 + k__BackingField: 1 + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 100 + - k__BackingField: 10005 + k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uBE60\uB974\uACE0 \uD3C9\uBC94\uD55C + Ai2" + k__BackingField: 4 + k__BackingField: 10 + k__BackingField: 10 + k__BackingField: 10 + k__BackingField: 3 + k__BackingField: 2 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 100 + - k__BackingField: 10006 + k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uBE60\uB974\uACE0 \uB290\uAE0B\uD55C + Ai1" + k__BackingField: 4 + k__BackingField: 10 + k__BackingField: 15 + k__BackingField: 15 + k__BackingField: 3 + k__BackingField: 1 + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 100 + - k__BackingField: 10007 + k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uBE60\uB974\uACE0 \uB290\uAE0B\uD55C + Ai2" + k__BackingField: 4 + k__BackingField: 10 + k__BackingField: 15 + k__BackingField: 15 + k__BackingField: 3 + k__BackingField: 2 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 100 diff --git a/Assets/02.Scripts/ScriptableObject/Npc/CustomerDataTable.asset.meta b/Assets/02.Scripts/ScriptableObject/Npc/CustomerDataTable.asset.meta new file mode 100644 index 000000000..9334ea001 --- /dev/null +++ b/Assets/02.Scripts/ScriptableObject/Npc/CustomerDataTable.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e6ce9d58057b580479880585947969d8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/Tycoon/CustomerManager.cs b/Assets/02.Scripts/Tycoon/CustomerManager.cs index 4aa3c590f..d91fc66cd 100644 --- a/Assets/02.Scripts/Tycoon/CustomerManager.cs +++ b/Assets/02.Scripts/Tycoon/CustomerManager.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Linq; using BlueWater.Npcs.Customers; using BlueWater.Utility; using Sirenix.OdinInspector; @@ -7,9 +8,13 @@ using UnityEngine; namespace BlueWater.Tycoons { - public class CustomerManager : MonoBehaviour + public class CustomerManager : Singleton { [Title("손님 데이터")] + [SerializeField, Required] + private CustomerDataSo _customerDataSo; + private Dictionary _customerDatas; + [SerializeField, Required] private Customer _customerPrefab; @@ -29,6 +34,15 @@ namespace BlueWater.Tycoons private CustomerTableManager _customerTableManager; private Coroutine _findEmptySeatCoroutineInstance; + protected override void OnAwake() + { + _customerDatas = new Dictionary(_customerDataSo.CustomerDatas.Count); + foreach (var element in _customerDataSo.CustomerDatas) + { + _customerDatas.TryAdd(element.Idx, element); + } + } + private void Start() { _customerTableManager = TycoonManager.Instance.CustomerTableManager; @@ -96,5 +110,18 @@ namespace BlueWater.Tycoons { Utils.UnregisterList(_instanceCustomers, customer); } + + public CustomerData GetRandomCustomerData() + { + var customerDataCount = _customerDatas.Count; + if (customerDataCount == 0) + { + Debug.LogError($"{_customerDatas}의 값이 비어있습니다."); + return null; + } + + var randomIndex = Random.Range(0, customerDataCount); + return _customerDatas.ElementAt(randomIndex).Value; + } } -} +} \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/TycoonManager.cs b/Assets/02.Scripts/Tycoon/TycoonManager.cs index aa0ac9414..0c671c2da 100644 --- a/Assets/02.Scripts/Tycoon/TycoonManager.cs +++ b/Assets/02.Scripts/Tycoon/TycoonManager.cs @@ -5,9 +5,6 @@ namespace BlueWater.Tycoons { public class TycoonManager : Singleton { - [field: SerializeField] - public CustomerManager CustomerManager { get; private set; } - [field: SerializeField] public CustomerTableManager CustomerTableManager { get; private set; } @@ -19,7 +16,6 @@ namespace BlueWater.Tycoons [Button("컴포넌트 초기화")] private void InitializeComponents() { - CustomerManager = GetComponent(); CustomerTableManager = GetComponent(); } } diff --git a/Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs b/Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs index dc006ea73..6883fe69e 100644 --- a/Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs @@ -17,12 +17,6 @@ namespace BlueWater.Uis public Image FoodImage { get; private set; } [Title("주문 정보")] - [SerializeField, Tooltip("주문을 시작하고나서, 재촉하지 않는 최소한의 기다리는 시간")] - private float _defaultWaitTime = 5f; - - [SerializeField, DisableIf("@true"), Tooltip("_defaultWaitTime시간이 지나고, 재촉하는 시간")] - private float _customerWaitTime; - [SerializeField, DisableIf("@true")] private bool _isOrdered; @@ -78,18 +72,17 @@ namespace BlueWater.Uis FoodImage.sprite = _orderItemData.Sprite; } - public void OrderFood(int foodIdx, float waitTime) + public void OrderFood(int foodIdx, int waitTime, int hurryTime) { _isOrdered = true; _isWaitTimeOver = false; _isFoodReceived = false; SetFoodImage(foodIdx); - _customerWaitTime = waitTime; ShowUi(); - _tween = FillImage.DOFillAmount(1f, _customerWaitTime) + _tween = FillImage.DOFillAmount(1f, hurryTime) .SetEase(Ease.Linear) - .SetDelay(_defaultWaitTime) + .SetDelay(waitTime) .OnComplete(OnTweenComplete) .SetAutoKill(false); _tween.Restart(); diff --git a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab index 0649047b0..4cfe7bd8c 100644 --- a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab +++ b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab @@ -1,5 +1,193 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &126151493473085455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 126151493484984327} + - component: {fileID: 126151493484747657} + - component: {fileID: 126151493483491779} + m_Layer: 5 + m_Name: Main Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &126151493484984327 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126151493473085455} + 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: 126151493484884023} + m_Father: {fileID: 7293985954889289183} + 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: 2.2, y: 12.9} + m_SizeDelta: {x: 120, y: 140} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &126151493484747657 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126151493473085455} + m_CullTransparentMesh: 0 +--- !u!114 &126151493483491779 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126151493473085455} + m_Enabled: 0 + 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.392} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + 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!1 &126151493473201319 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 126151493484884023} + - component: {fileID: 126151493484754027} + - component: {fileID: 126151493483402833} + - component: {fileID: 126151493485040859} + - component: {fileID: 126151493480433323} + m_Layer: 5 + m_Name: Bubble Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &126151493484884023 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126151493473201319} + 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: 3571829164687521184} + m_Father: {fileID: 126151493484984327} + 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} +--- !u!222 &126151493484754027 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126151493473201319} + m_CullTransparentMesh: 0 +--- !u!114 &126151493483402833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126151493473201319} + m_Enabled: 0 + 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: b7f09c3867e11ae4cb69aeb93463acd6, 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!225 &126151493485040859 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126151493473201319} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!95 &126151493480433323 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126151493473201319} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 62b8011547f389344ba48f87b2ada51c, type: 2} + m_CullingMode: 0 + m_UpdateMode: 2 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &813964778509222274 GameObject: m_ObjectHideFlags: 0 @@ -12,7 +200,7 @@ GameObject: - component: {fileID: 479823629690914954} - component: {fileID: 2588384133887034894} - component: {fileID: 2961986041977982893} - m_Layer: 9 + m_Layer: 14 m_Name: VisualLook m_TagString: Untagged m_Icon: {fileID: 0} @@ -130,6 +318,208 @@ MonoBehaviour: _animationName: idle loop: 1 timeScale: 1 +--- !u!1 &2781393898199067900 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7164452667333806733} + - component: {fileID: 2294203980036400646} + - component: {fileID: 3455991743305696554} + - component: {fileID: 8501950329115254991} + - component: {fileID: 8922295334492411225} + m_Layer: 14 + m_Name: DialogueSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7164452667333806733 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2781393898199067900} + 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: 2397117528733804567} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2294203980036400646 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2781393898199067900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 274b80ab5b659c646ba9338870d14625, type: 3} + m_Name: + m_EditorClassIdentifier: + m_overrideName: + m_overrideUseMessage: + maxUseDistance: 5 + events: + onSelect: + m_PersistentCalls: + m_Calls: [] + onDeselect: + m_PersistentCalls: + m_Calls: [] + onUse: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &3455991743305696554 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2781393898199067900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} + m_Name: + m_EditorClassIdentifier: + trigger: 8192 + condition: + luaConditions: [] + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + setQuestState: 1 + questName: + questState: 0 + setQuestEntryState: 0 + questEntryNumber: 1 + questEntryState: 0 + setAnotherQuestEntryState: 0 + anotherQuestEntryNumber: 1 + anotherQuestEntryState: 0 + luaCode: + sequence: + sequenceSpeaker: {fileID: 0} + sequenceListener: {fileID: 0} + waitOneFrameOnStartOrEnable: 1 + alertMessage: + textTable: {fileID: 0} + alertDuration: 0 + sendMessages: [] + barkSource: 0 + barkConversation: + barkEntryID: -1 + barkEntryTitle: + barkText: + barkTextSequence: + barker: {fileID: 0} + barkTarget: {fileID: 0} + barkOrder: 0 + allowBarksDuringConversations: 0 + skipBarkIfNoValidEntries: 0 + cacheBarkLines: 0 + conversation: + conversationConversant: {fileID: 0} + conversationActor: {fileID: 0} + startConversationEntryID: -1 + startConversationEntryTitle: + overrideDialogueUI: {fileID: 0} + exclusive: 0 + replace: 0 + queue: 0 + skipIfNoValidEntries: 0 + preventRestartOnSameFrameEnded: 0 + stopConversationOnTriggerExit: 0 + marginToAllowTriggerExit: 0.2 + stopConversationIfTooFar: 0 + maxConversationDistance: 5 + monitorConversationDistanceFrequency: 1 + showCursorDuringConversation: 0 + pauseGameDuringConversation: 0 + setActiveActions: [] + setEnabledActions: [] + setAnimatorStateActions: [] + onExecute: + m_PersistentCalls: + m_Calls: [] + useConversationTitlePicker: 1 + useBarkTitlePicker: 1 + useQuestNamePicker: 1 + selectedDatabase: {fileID: 11400000, guid: bde86f268240d1041a808e449d9cac43, type: 2} +--- !u!114 &8501950329115254991 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2781393898199067900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a64578247383140469c45370654a984a, type: 3} + m_Name: + m_EditorClassIdentifier: + actor: Customer + persistentDataName: + portrait: {fileID: 0} + spritePortrait: {fileID: 0} + barkUISettings: + barkUI: {fileID: 9027939020919762395} + barkUIOffset: {x: 0, y: 0, z: 0} + standardDialogueUISettings: + subtitlePanelNumber: 0 + customSubtitlePanel: {fileID: 0} + customSubtitlePanelOffset: {x: 0, y: 0, z: 0} + menuPanelNumber: 0 + customMenuPanel: {fileID: 0} + customMenuPanelOffset: {x: 0, y: 0, z: 0} + useMenuPanelFor: 0 + portraitAnimatorController: {fileID: 0} + setSubtitleColor: 0 + applyColorToPrependedName: 0 + prependActorNameSeparator: ': ' + prependActorNameFormat: '{0}{1}' + subtitleColor: {r: 1, g: 1, b: 1, a: 1} +--- !u!114 &8922295334492411225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2781393898199067900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66fdf8d5019aaec4bab62570407b9cd1, type: 3} + m_Name: + m_EditorClassIdentifier: + once: 0 + conversation: OrderFood + condition: + luaConditions: [] + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + skipIfNoValidEntries: 0 + exclusive: 0 + conversant: {fileID: 0} + useConversationTitlePicker: 1 + selectedDatabase: {fileID: 0} + barkOrder: 0 + allowDuringConversations: 0 + cacheBarkLines: 0 + target: {fileID: 0} + trigger: 32 --- !u!1 &7260635347182713621 GameObject: m_ObjectHideFlags: 0 @@ -148,7 +538,7 @@ GameObject: - component: {fileID: 5279376384905517670} - component: {fileID: 17978457728262906} - component: {fileID: -2302002259734456648} - m_Layer: 9 + m_Layer: 14 m_Name: Customer m_TagString: Untagged m_Icon: {fileID: 0} @@ -169,6 +559,7 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 3748026497419659573} + - {fileID: 7164452667333806733} - {fileID: 7293985954889289183} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -400,12 +791,174 @@ MonoBehaviour: k__BackingField: {fileID: 2615952973387112450} k__BackingField: {fileID: 3748026497419659573} k__BackingField: {fileID: 2588384133887034894} + k__BackingField: {fileID: 8922295334492411225} k__BackingField: {fileID: 7800018367225963417} k__BackingField: {fileID: 7689708008984027505} k__BackingField: {fileID: 8566491437687787454} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 k__BackingField: {fileID: 5279376384905517670} k__BackingField: {fileID: 17978457728262906} k__BackingField: 1 +--- !u!1 &7812544424410854405 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3571829164687521184} + - component: {fileID: 6778029842967471712} + - component: {fileID: 4017910736750065323} + - component: {fileID: 5622065931100864621} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3571829164687521184 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7812544424410854405} + 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: 126151493484884023} + 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!222 &6778029842967471712 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7812544424410854405} + m_CullTransparentMesh: 1 +--- !u!114 &4017910736750065323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7812544424410854405} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uBB50\uAC00 \uC88B\uC744\uAE4C.." + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!210 &5622065931100864621 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7812544424410854405} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 6 + m_SortAtRoot: 0 --- !u!1001 &2718897986636601543 PrefabInstance: m_ObjectHideFlags: 0 @@ -536,13 +1089,56 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} insertIndex: -1 addedObject: {fileID: 8432469322612575415} - m_AddedComponents: [] + - targetCorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + insertIndex: -1 + addedObject: {fileID: 126151493484984327} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + insertIndex: -1 + addedObject: {fileID: 9027939020919762395} m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} --- !u!224 &7293985954889289183 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} m_PrefabInstance: {fileID: 2718897986636601543} m_PrefabAsset: {fileID: 0} +--- !u!1 &7522674838449308991 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + m_PrefabInstance: {fileID: 2718897986636601543} + m_PrefabAsset: {fileID: 0} +--- !u!114 &9027939020919762395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7522674838449308991} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35b689d0205d778479b0dac3b159c3b4, type: 3} + m_Name: + m_EditorClassIdentifier: + canvasGroup: {fileID: 126151493485040859} + barkText: + m_uiText: {fileID: 0} + m_textMeshProUGUI: {fileID: 4017910736750065323} + nameText: + m_uiText: {fileID: 0} + m_textMeshProUGUI: {fileID: 0} + includeName: 0 + portraitImage: {fileID: 0} + showPortraitImage: 0 + doneTime: 0 + animationTransitions: + showTrigger: Show + hideTrigger: Hide + duration: 3 + keepInView: 0 + waitUntilSequenceEnds: 0 + cancelWaitUntilSequenceEndsIfReplacingBark: 0 + waitForContinueButton: 0 + textDisplaySetting: 0 --- !u!224 &7689708008984027505 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5695967080072346038, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} diff --git a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab index 6ab637ca4..a2266bd0b 100644 --- a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab +++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab @@ -237,7 +237,7 @@ GameObject: - component: {fileID: 909302231676134912} m_Layer: 9 m_Name: TycoonPlayer - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/10.Fonts/TmpOutline.mat b/Assets/10.Fonts/TmpOutline.mat new file mode 100644 index 000000000..8a018a105 --- /dev/null +++ b/Assets/10.Fonts/TmpOutline.mat @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TmpOutline + m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _OutlineWidth: 0.15 + - _ScaleRatioA: 0.8333333 + m_Colors: [] + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/10.Fonts/TmpOutline.mat.meta b/Assets/10.Fonts/TmpOutline.mat.meta new file mode 100644 index 000000000..9515ef5a7 --- /dev/null +++ b/Assets/10.Fonts/TmpOutline.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e5360dce269ccc42b822a424d66fbd4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/11.BehaviorTree/Customer.asset b/Assets/11.BehaviorTree/Customer.asset index 6947346db..de39494e7 100644 --- a/Assets/11.BehaviorTree/Customer.asset +++ b/Assets/11.BehaviorTree/Customer.asset @@ -27,13 +27,16 @@ MonoBehaviour: \ub54c\uae4c\uc9c0 \ub300\uae30"},"ID":4,"Name":"Has Reached Destination","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.SetTableSeatPositionAndDirection","NodeData":{"Offset":"(250,150)","Comment":"\ud14c\uc774\ube14 \uc88c\uc11d\uc5d0 \uc704\uce58\ud558\uace0, \ud14c\uc774\ube14\uc744 \ubc14\ub77c\ubd04"},"ID":5,"Name":"Set Table Seat Position And Direction","Instant":true}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-140,150)","Comment":"\uc74c\ub8cc\ub97c - \uc8fc\ubb38\ud55c\ub2e4"},"ID":6,"Name":"Order Drink Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(-1.223877,154.022858)"},"ID":7,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-182.936584,151.88)"},"ID":8,"Name":"Order - Success Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.OrderFood","NodeData":{"Offset":"(-105.555573,145.555237)","Comment":"\uc74c\ub8cc\ub97c - \uc8fc\ubb38\ud558\uace0 \uae30\ub2e4\ub9b0\ub2e4"},"ID":9,"Name":"Order - Food","Instant":true}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(263.8887,147.777832)"},"ID":10,"Name":"Order + \uc8fc\ubb38\ud55c\ub2e4"},"ID":6,"Name":"Check Order Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(0,150)"},"ID":7,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-190,150)","Comment":"\uc74c\ub8cc + \uc8fc\ubb38 \uc5ec\ubd80 \ud655\uc778"},"ID":8,"Name":"Check Order Beverage + Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.CheckOrderBeverage","NodeData":{"Offset":"(-104.279724,147.200073)"},"ID":9,"Name":"Check + Order Beverage","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(90,146.666809)"},"ID":10,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-182.936584,151.88)"},"ID":11,"Name":"Order + Success Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.OrderBeverage","NodeData":{"Offset":"(-110,150)","Comment":"\uc74c\ub8cc\ub97c + \uc8fc\ubb38\ud55c\ub2e4"},"ID":12,"Name":"Order Beverage","Instant":true}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(213.8887,147.777832)"},"ID":13,"Name":"Order Failure Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.Move","NodeData":{"Offset":"(-120.441589,149.5423)","Comment":"\uc785\uad6c\ub85c - \ub418\ub3cc\uc544\uac04\ub2e4"},"ID":11,"Name":"Move","Instant":true,"Booleank__BackingField":true,"SharedVector3k__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":null,"Vector3mValue":"(0,0,-19)"},"SharedColliderk__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null}},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.UnityGameObject.Destroy","NodeData":{"Offset":"(116.929504,154.032043)"},"ID":12,"Name":"Destroy","Instant":true,"SharedGameObjecttargetGameObject":{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true},"Singletime":0}]}]}]}]},"DetachedTasks":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1652.77856,300)","Comment":"\ud1f4\uc7a5\ud55c\ub2e4"},"ID":13,"Name":"Sequence","Instant":true,"Disabled":true,"AbortTypeabortType":"None"},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1402.77844,300)","Comment":"\uacc4\uc0b0\ud55c\ub2e4"},"ID":14,"Name":"Sequence","Instant":true,"Disabled":true,"AbortTypeabortType":"None"},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1112.77722,300)","Comment":"\uc74c\uc2dd\uc744 - \uc8fc\ubb38\ud55c\ub2e4"},"ID":15,"Name":"Sequence","Instant":true,"Disabled":true,"AbortTypeabortType":"None"}],"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true}]}' + \ub418\ub3cc\uc544\uac04\ub2e4"},"ID":14,"Name":"Move","Instant":true,"Booleank__BackingField":true,"SharedVector3k__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":null,"Vector3mValue":"(0,0,-19)"},"SharedColliderk__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null}},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.UnityGameObject.Destroy","NodeData":{"Offset":"(116.929504,154.032043)"},"ID":15,"Name":"Destroy","Instant":true,"SharedGameObjecttargetGameObject":{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true},"Singletime":0}]}]}]},{"Type":"BlueWater.BehaviorTrees.Actions.ReturnSuccess","NodeData":{"Offset":"(220,150)","Comment":"\uc74c\ub8cc + \uc8fc\ubb38 \uc2a4\ud0b5"},"ID":16,"Name":"Return Success","Instant":true}]}]}]},"DetachedTasks":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1652.77856,300)","Comment":"\ud1f4\uc7a5\ud55c\ub2e4"},"ID":17,"Name":"Sequence","Instant":true,"Disabled":true,"AbortTypeabortType":"None"},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1402.77844,300)","Comment":"\uacc4\uc0b0\ud55c\ub2e4"},"ID":18,"Name":"Sequence","Instant":true,"Disabled":true,"AbortTypeabortType":"None"},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1112.77722,300)","Comment":"\uc74c\uc2dd\uc744 + \uc8fc\ubb38\ud55c\ub2e4"},"ID":19,"Name":"Sequence","Instant":true,"Disabled":true,"AbortTypeabortType":"None"}],"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true}]}' fieldSerializationData: typeName: [] fieldNameHash: diff --git a/Assets/BlueWater.asset b/Assets/BlueWater.asset new file mode 100644 index 000000000..b045f5eff --- /dev/null +++ b/Assets/BlueWater.asset @@ -0,0 +1,1186 @@ +%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: 935899b62f48ae5498594680ed17d133, type: 3} + m_Name: BlueWater + m_EditorClassIdentifier: + version: + author: + description: + globalUserScript: + emphasisSettings: + - color: {r: 1, g: 1, b: 1, a: 1} + bold: 0 + italic: 0 + underline: 0 + - color: {r: 1, g: 0, b: 0, a: 1} + bold: 0 + italic: 0 + underline: 0 + - color: {r: 0, g: 1, b: 0, a: 1} + bold: 0 + italic: 0 + underline: 0 + - color: {r: 0, g: 0, b: 1, a: 1} + bold: 0 + italic: 0 + underline: 0 + baseID: 1 + actors: + - id: 1 + fields: + - title: Name + value: TycoonPlayer + type: 0 + typeString: + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: "\uD0C0\uC774\uCFE4 \uD50C\uB808\uC774\uC5B4" + type: 0 + typeString: CustomFieldType_Text + - title: IsPlayer + value: True + type: 2 + typeString: CustomFieldType_Boolean + - title: Display Name + value: "\uB098" + type: 0 + typeString: + portrait: {fileID: 0} + spritePortrait: {fileID: 0} + alternatePortraits: [] + spritePortraits: [] + - id: 2 + fields: + - title: Name + value: Customer + type: 0 + typeString: + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: "\uD0C0\uC774\uCFE4 \uC190\uB2D8" + type: 0 + typeString: CustomFieldType_Text + - title: IsPlayer + value: False + type: 2 + typeString: CustomFieldType_Boolean + - title: Display Name + value: "\uC190\uB2D8" + type: 0 + typeString: + portrait: {fileID: 0} + spritePortrait: {fileID: 0} + alternatePortraits: [] + spritePortraits: [] + items: [] + locations: [] + variables: + - id: 1 + fields: + - title: Name + value: Alert + type: 0 + typeString: + - title: Initial Value + value: + type: 0 + typeString: CustomFieldType_Text + - title: Description + value: + type: 0 + typeString: + conversations: + - id: 1 + fields: + - title: Title + value: OrderFood + type: 0 + typeString: CustomFieldType_Text + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + overrideSettings: + useOverrides: 0 + overrideSubtitleSettings: 0 + showNPCSubtitlesDuringLine: 1 + showNPCSubtitlesWithResponses: 1 + showPCSubtitlesDuringLine: 0 + skipPCSubtitleAfterResponseMenu: 0 + subtitleCharsPerSecond: 30 + minSubtitleSeconds: 2 + continueButton: 0 + overrideSequenceSettings: 0 + defaultSequence: + defaultPlayerSequence: + defaultResponseMenuSequence: + overrideInputSettings: 0 + alwaysForceResponseMenu: 1 + includeInvalidEntries: 0 + responseTimeout: 0 + emTagForOldResponses: 0 + emTagForInvalidResponses: 0 + cancelSubtitle: + key: 27 + buttonName: + cancelConversation: + key: 27 + buttonName: + nodeColor: + dialogueEntries: + - id: 0 + fields: + - title: Title + value: START + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Sequence + value: None() + type: 0 + typeString: + conversationID: 1 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 1 + originDialogueID: 0 + destinationConversationID: 1 + destinationDialogueID: 1 + isConnector: 0 + priority: 2 + - originConversationID: 1 + originDialogueID: 0 + destinationConversationID: 1 + destinationDialogueID: 2 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 259 + y: 93 + width: 160 + height: 30 + - id: 1 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uC5B4\uB5A4 \uC74C\uC2DD\uC744 \uC8FC\uBB38\uD574\uBCFC\uAE4C?" + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 1 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 123 + y: 201 + width: 160 + height: 30 + - id: 2 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uC774\uAC8C \uB9DB\uC788\uC5B4\uBCF4\uC774\uB294\uB370?" + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 1 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 401 + y: 199 + width: 160 + height: 30 + entryGroups: [] + canvasScrollPosition: {x: 1, y: 20} + canvasZoom: 1 + - id: 2 + fields: + - title: Title + value: HurryFood + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + overrideSettings: + useOverrides: 0 + overrideSubtitleSettings: 0 + showNPCSubtitlesDuringLine: 1 + showNPCSubtitlesWithResponses: 1 + showPCSubtitlesDuringLine: 0 + skipPCSubtitleAfterResponseMenu: 0 + subtitleCharsPerSecond: 30 + minSubtitleSeconds: 2 + continueButton: 0 + overrideSequenceSettings: 0 + defaultSequence: + defaultPlayerSequence: + defaultResponseMenuSequence: + overrideInputSettings: 0 + alwaysForceResponseMenu: 1 + includeInvalidEntries: 0 + responseTimeout: 0 + emTagForOldResponses: 0 + emTagForInvalidResponses: 0 + cancelSubtitle: + key: 27 + buttonName: + cancelConversation: + key: 27 + buttonName: + nodeColor: + dialogueEntries: + - id: 0 + fields: + - title: Title + value: START + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Sequence + value: None() + type: 0 + typeString: + conversationID: 2 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 2 + originDialogueID: 0 + destinationConversationID: 2 + destinationDialogueID: 1 + isConnector: 0 + priority: 2 + - originConversationID: 2 + originDialogueID: 0 + destinationConversationID: 2 + destinationDialogueID: 2 + isConnector: 0 + priority: 2 + - originConversationID: 2 + originDialogueID: 0 + destinationConversationID: 2 + destinationDialogueID: 3 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 353 + y: 67 + width: 160 + height: 30 + - id: 1 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uC74C\uC2DD\uC740 \uC5B8\uC81C \uB098\uC624\uB294\uAC70\uC57C.." + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 2 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 129 + y: 172 + width: 160 + height: 30 + - id: 2 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uBC30\uACE0\uD504\uB2E4.." + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 2 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 332 + y: 170 + width: 160 + height: 30 + - id: 3 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uC8FC\uBB38 \uAE4C\uBA39\uC740\uAC70 \uC544\uB2C8\uC57C?" + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 2 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 551 + y: 170 + width: 160 + height: 30 + entryGroups: [] + canvasScrollPosition: {x: 0, y: 0} + canvasZoom: 1 + - id: 3 + fields: + - title: Title + value: EvaluateDish + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + overrideSettings: + useOverrides: 0 + overrideSubtitleSettings: 0 + showNPCSubtitlesDuringLine: 1 + showNPCSubtitlesWithResponses: 1 + showPCSubtitlesDuringLine: 0 + skipPCSubtitleAfterResponseMenu: 0 + subtitleCharsPerSecond: 30 + minSubtitleSeconds: 2 + continueButton: 0 + overrideSequenceSettings: 0 + defaultSequence: + defaultPlayerSequence: + defaultResponseMenuSequence: + overrideInputSettings: 0 + alwaysForceResponseMenu: 1 + includeInvalidEntries: 0 + responseTimeout: 0 + emTagForOldResponses: 0 + emTagForInvalidResponses: 0 + cancelSubtitle: + key: 27 + buttonName: + cancelConversation: + key: 27 + buttonName: + nodeColor: + dialogueEntries: + - id: 0 + fields: + - title: Title + value: START + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Sequence + value: None() + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 3 + originDialogueID: 0 + destinationConversationID: 3 + destinationDialogueID: 2 + isConnector: 0 + priority: 2 + - originConversationID: 3 + originDialogueID: 0 + destinationConversationID: 3 + destinationDialogueID: 3 + isConnector: 0 + priority: 2 + - originConversationID: 3 + originDialogueID: 0 + destinationConversationID: 3 + destinationDialogueID: 4 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 563.99994 + y: 64.77272 + width: 160 + height: 30 + - id: 1 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uC815\uB9D0 \uB9DB\uC788\uC5C8\uC5B4!" + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 21.318184 + y: 326.72726 + width: 160 + height: 30 + - id: 2 + fields: + - title: Title + value: "\uB9CC\uC871\uD55C \uACBD\uC6B0" + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 3 + originDialogueID: 2 + destinationConversationID: 3 + destinationDialogueID: 1 + isConnector: 0 + priority: 2 + - originConversationID: 3 + originDialogueID: 2 + destinationConversationID: 3 + destinationDialogueID: 5 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 97 + y: 198 + width: 160 + height: 30 + - id: 3 + fields: + - title: Title + value: "\uD3C9\uBC94\uD55C \uACBD\uC6B0" + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 3 + originDialogueID: 3 + destinationConversationID: 3 + destinationDialogueID: 6 + isConnector: 0 + priority: 2 + - originConversationID: 3 + originDialogueID: 3 + destinationConversationID: 3 + destinationDialogueID: 7 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 555.99994 + y: 208.77272 + width: 160 + height: 30 + - id: 4 + fields: + - title: Title + value: "\uBD88\uB9CC\uC778 \uACBD\uC6B0" + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 3 + originDialogueID: 4 + destinationConversationID: 3 + destinationDialogueID: 8 + isConnector: 0 + priority: 2 + - originConversationID: 3 + originDialogueID: 4 + destinationConversationID: 3 + destinationDialogueID: 9 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 993.46826 + y: 204.5702 + width: 160 + height: 30 + - id: 5 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uB2E4\uC74C\uC5D0 \uB610 \uC640\uC57C\uACA0\uB294\uAC78?" + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 206.3182 + y: 325.72726 + width: 160 + height: 30 + - id: 6 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uB098\uC058\uC9C0 \uC54A\uB124." + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 474.18182 + y: 325.30023 + width: 160 + height: 30 + - id: 7 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uD3C9\uBC94\uD558\uAD70." + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 661.06323 + y: 323.32965 + width: 160 + height: 30 + - id: 8 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uC815\uB9D0 \uCD5C\uC545\uC774\uC57C.." + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 903.59503 + y: 320.39294 + width: 160 + height: 30 + - id: 9 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uB108\uBB34 \uBCC4\uB85C\uC600\uC5B4.." + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 1113.7213 + y: 319.12717 + width: 160 + height: 30 + entryGroups: [] + canvasScrollPosition: {x: 0, y: 0} + canvasZoom: 0.7900002 + syncInfo: + syncActors: 0 + syncItems: 0 + syncLocations: 0 + syncVariables: 0 + syncActorsDatabase: {fileID: 0} + syncItemsDatabase: {fileID: 0} + syncLocationsDatabase: {fileID: 0} + syncVariablesDatabase: {fileID: 0} + templateJson: '{"treatItemsAsQuests":true,"actorFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Pictures","value":"[]","type":3,"typeString":"CustomFieldType_Files"},{"title":"Description","value":"","type":0,"typeString":""},{"title":"IsPlayer","value":"False","type":2,"typeString":"CustomFieldType_Boolean"}],"itemFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Pictures","value":"[]","type":3,"typeString":"CustomFieldType_Files"},{"title":"Description","value":"","type":0,"typeString":""},{"title":"Is + Item","value":"True","type":2,"typeString":"CustomFieldType_Boolean"}],"questFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Pictures","value":"[]","type":3,"typeString":"CustomFieldType_Files"},{"title":"Description","value":"","type":0,"typeString":""},{"title":"Success + Description","value":"","type":0,"typeString":""},{"title":"Failure Description","value":"","type":0,"typeString":""},{"title":"State","value":"unassigned","type":0,"typeString":""},{"title":"Is + Item","value":"False","type":2,"typeString":"CustomFieldType_Boolean"}],"locationFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Description","value":"","type":0,"typeString":""}],"variableFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Initial + Value","value":"","type":0,"typeString":""},{"title":"Description","value":"","type":0,"typeString":""}],"conversationFields":[{"title":"Title","value":"","type":0,"typeString":""},{"title":"Description","value":"","type":0,"typeString":""},{"title":"Actor","value":"0","type":5,"typeString":"CustomFieldType_Actor"},{"title":"Conversant","value":"0","type":5,"typeString":"CustomFieldType_Actor"}],"dialogueEntryFields":[{"title":"Title","value":"","type":0,"typeString":""},{"title":"Description","value":"","type":0,"typeString":""},{"title":"Actor","value":"","type":5,"typeString":"CustomFieldType_Actor"},{"title":"Conversant","value":"","type":5,"typeString":"CustomFieldType_Actor"},{"title":"Menu + Text","value":"","type":0,"typeString":""},{"title":"Dialogue Text","value":"","type":0,"typeString":""},{"title":"Sequence","value":"","type":0,"typeString":""}],"actorPrimaryFieldTitles":[],"itemPrimaryFieldTitles":[],"questPrimaryFieldTitles":[],"locationPrimaryFieldTitles":[],"variablePrimaryFieldTitles":[],"conversationPrimaryFieldTitles":[],"dialogueEntryPrimaryFieldTitles":[],"npcLineColor":{"r":1.0,"g":0.0,"b":0.0,"a":1.0},"pcLineColor":{"r":0.0,"g":0.0,"b":1.0,"a":1.0},"repeatLineColor":{"r":0.5,"g":0.5,"b":0.5,"a":1.0}}' diff --git a/Assets/Dialogue Database.asset.meta b/Assets/BlueWater.asset.meta similarity index 100% rename from Assets/Dialogue Database.asset.meta rename to Assets/BlueWater.asset.meta diff --git a/Assets/Dialogue Database (Auto-Backup).asset b/Assets/Dialogue Database (Auto-Backup).asset new file mode 100644 index 000000000..3ed339221 --- /dev/null +++ b/Assets/Dialogue Database (Auto-Backup).asset @@ -0,0 +1,1186 @@ +%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: 935899b62f48ae5498594680ed17d133, type: 3} + m_Name: Dialogue Database (Auto-Backup) + m_EditorClassIdentifier: + version: + author: + description: + globalUserScript: + emphasisSettings: + - color: {r: 1, g: 1, b: 1, a: 1} + bold: 0 + italic: 0 + underline: 0 + - color: {r: 1, g: 0, b: 0, a: 1} + bold: 0 + italic: 0 + underline: 0 + - color: {r: 0, g: 1, b: 0, a: 1} + bold: 0 + italic: 0 + underline: 0 + - color: {r: 0, g: 0, b: 1, a: 1} + bold: 0 + italic: 0 + underline: 0 + baseID: 1 + actors: + - id: 1 + fields: + - title: Name + value: TycoonPlayer + type: 0 + typeString: + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: "\uD0C0\uC774\uCFE4 \uD50C\uB808\uC774\uC5B4" + type: 0 + typeString: CustomFieldType_Text + - title: IsPlayer + value: True + type: 2 + typeString: CustomFieldType_Boolean + - title: Display Name + value: "\uB098" + type: 0 + typeString: + portrait: {fileID: 0} + spritePortrait: {fileID: 0} + alternatePortraits: [] + spritePortraits: [] + - id: 2 + fields: + - title: Name + value: Customer + type: 0 + typeString: + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: "\uD0C0\uC774\uCFE4 \uC190\uB2D8" + type: 0 + typeString: CustomFieldType_Text + - title: IsPlayer + value: False + type: 2 + typeString: CustomFieldType_Boolean + - title: Display Name + value: "\uC190\uB2D8" + type: 0 + typeString: + portrait: {fileID: 0} + spritePortrait: {fileID: 0} + alternatePortraits: [] + spritePortraits: [] + items: [] + locations: [] + variables: + - id: 1 + fields: + - title: Name + value: Alert + type: 0 + typeString: + - title: Initial Value + value: + type: 0 + typeString: CustomFieldType_Text + - title: Description + value: + type: 0 + typeString: + conversations: + - id: 1 + fields: + - title: Title + value: OrderFood + type: 0 + typeString: CustomFieldType_Text + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + overrideSettings: + useOverrides: 0 + overrideSubtitleSettings: 0 + showNPCSubtitlesDuringLine: 1 + showNPCSubtitlesWithResponses: 1 + showPCSubtitlesDuringLine: 0 + skipPCSubtitleAfterResponseMenu: 0 + subtitleCharsPerSecond: 30 + minSubtitleSeconds: 2 + continueButton: 0 + overrideSequenceSettings: 0 + defaultSequence: + defaultPlayerSequence: + defaultResponseMenuSequence: + overrideInputSettings: 0 + alwaysForceResponseMenu: 1 + includeInvalidEntries: 0 + responseTimeout: 0 + emTagForOldResponses: 0 + emTagForInvalidResponses: 0 + cancelSubtitle: + key: 27 + buttonName: + cancelConversation: + key: 27 + buttonName: + nodeColor: + dialogueEntries: + - id: 0 + fields: + - title: Title + value: START + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Sequence + value: None() + type: 0 + typeString: + conversationID: 1 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 1 + originDialogueID: 0 + destinationConversationID: 1 + destinationDialogueID: 1 + isConnector: 0 + priority: 2 + - originConversationID: 1 + originDialogueID: 0 + destinationConversationID: 1 + destinationDialogueID: 2 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 259 + y: 93 + width: 160 + height: 30 + - id: 1 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uC5B4\uB5A4 \uC74C\uC2DD\uC744 \uC8FC\uBB38\uD574\uBCFC\uAE4C?" + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 1 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 123 + y: 201 + width: 160 + height: 30 + - id: 2 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uC774\uAC8C \uB9DB\uC788\uC5B4\uBCF4\uC774\uB294\uB370?" + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 1 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 401 + y: 199 + width: 160 + height: 30 + entryGroups: [] + canvasScrollPosition: {x: 1, y: 20} + canvasZoom: 1 + - id: 2 + fields: + - title: Title + value: HurryFood + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + overrideSettings: + useOverrides: 0 + overrideSubtitleSettings: 0 + showNPCSubtitlesDuringLine: 1 + showNPCSubtitlesWithResponses: 1 + showPCSubtitlesDuringLine: 0 + skipPCSubtitleAfterResponseMenu: 0 + subtitleCharsPerSecond: 30 + minSubtitleSeconds: 2 + continueButton: 0 + overrideSequenceSettings: 0 + defaultSequence: + defaultPlayerSequence: + defaultResponseMenuSequence: + overrideInputSettings: 0 + alwaysForceResponseMenu: 1 + includeInvalidEntries: 0 + responseTimeout: 0 + emTagForOldResponses: 0 + emTagForInvalidResponses: 0 + cancelSubtitle: + key: 27 + buttonName: + cancelConversation: + key: 27 + buttonName: + nodeColor: + dialogueEntries: + - id: 0 + fields: + - title: Title + value: START + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Sequence + value: None() + type: 0 + typeString: + conversationID: 2 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 2 + originDialogueID: 0 + destinationConversationID: 2 + destinationDialogueID: 1 + isConnector: 0 + priority: 2 + - originConversationID: 2 + originDialogueID: 0 + destinationConversationID: 2 + destinationDialogueID: 2 + isConnector: 0 + priority: 2 + - originConversationID: 2 + originDialogueID: 0 + destinationConversationID: 2 + destinationDialogueID: 3 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 353 + y: 67 + width: 160 + height: 30 + - id: 1 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uC74C\uC2DD\uC740 \uC5B8\uC81C \uB098\uC624\uB294\uAC70\uC57C.." + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 2 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 129 + y: 172 + width: 160 + height: 30 + - id: 2 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uBC30\uACE0\uD504\uB2E4.." + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 2 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 332 + y: 170 + width: 160 + height: 30 + - id: 3 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uC8FC\uBB38 \uAE4C\uBA39\uC740\uAC70 \uC544\uB2C8\uC57C?" + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 2 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 551 + y: 170 + width: 160 + height: 30 + entryGroups: [] + canvasScrollPosition: {x: 0, y: 0} + canvasZoom: 1 + - id: 3 + fields: + - title: Title + value: EvaluateDish + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + overrideSettings: + useOverrides: 0 + overrideSubtitleSettings: 0 + showNPCSubtitlesDuringLine: 1 + showNPCSubtitlesWithResponses: 1 + showPCSubtitlesDuringLine: 0 + skipPCSubtitleAfterResponseMenu: 0 + subtitleCharsPerSecond: 30 + minSubtitleSeconds: 2 + continueButton: 0 + overrideSequenceSettings: 0 + defaultSequence: + defaultPlayerSequence: + defaultResponseMenuSequence: + overrideInputSettings: 0 + alwaysForceResponseMenu: 1 + includeInvalidEntries: 0 + responseTimeout: 0 + emTagForOldResponses: 0 + emTagForInvalidResponses: 0 + cancelSubtitle: + key: 27 + buttonName: + cancelConversation: + key: 27 + buttonName: + nodeColor: + dialogueEntries: + - id: 0 + fields: + - title: Title + value: START + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Sequence + value: None() + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 3 + originDialogueID: 0 + destinationConversationID: 3 + destinationDialogueID: 2 + isConnector: 0 + priority: 2 + - originConversationID: 3 + originDialogueID: 0 + destinationConversationID: 3 + destinationDialogueID: 3 + isConnector: 0 + priority: 2 + - originConversationID: 3 + originDialogueID: 0 + destinationConversationID: 3 + destinationDialogueID: 4 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 563.99994 + y: 64.77272 + width: 160 + height: 30 + - id: 1 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uC815\uB9D0 \uB9DB\uC788\uC5C8\uC5B4!" + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 21.318184 + y: 326.72726 + width: 160 + height: 30 + - id: 2 + fields: + - title: Title + value: "\uB9CC\uC871\uD55C \uACBD\uC6B0" + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 3 + originDialogueID: 2 + destinationConversationID: 3 + destinationDialogueID: 1 + isConnector: 0 + priority: 2 + - originConversationID: 3 + originDialogueID: 2 + destinationConversationID: 3 + destinationDialogueID: 5 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 97 + y: 198 + width: 160 + height: 30 + - id: 3 + fields: + - title: Title + value: "\uD3C9\uBC94\uD55C \uACBD\uC6B0" + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 3 + originDialogueID: 3 + destinationConversationID: 3 + destinationDialogueID: 6 + isConnector: 0 + priority: 2 + - originConversationID: 3 + originDialogueID: 3 + destinationConversationID: 3 + destinationDialogueID: 7 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 555.99994 + y: 208.77272 + width: 160 + height: 30 + - id: 4 + fields: + - title: Title + value: "\uBD88\uB9CC\uC778 \uACBD\uC6B0" + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 3 + originDialogueID: 4 + destinationConversationID: 3 + destinationDialogueID: 8 + isConnector: 0 + priority: 2 + - originConversationID: 3 + originDialogueID: 4 + destinationConversationID: 3 + destinationDialogueID: 9 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 993.46826 + y: 204.5702 + width: 160 + height: 30 + - id: 5 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uB2E4\uC74C\uC5D0 \uB610 \uC640\uC57C\uACA0\uB294\uAC78?" + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 206.3182 + y: 325.72726 + width: 160 + height: 30 + - id: 6 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uB098\uC058\uC9C0 \uC54A\uB124." + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 474.18182 + y: 325.30023 + width: 160 + height: 30 + - id: 7 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uD3C9\uBC94\uD558\uAD70." + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 661.06323 + y: 323.32965 + width: 160 + height: 30 + - id: 8 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uC815\uB9D0 \uCD5C\uC545\uC774\uC57C.." + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 903.59503 + y: 320.39294 + width: 160 + height: 30 + - id: 9 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 0 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 0 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uB108\uBB34 \uBCC4\uB85C\uC600\uC5B4.." + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 3 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 1113.7213 + y: 319.12717 + width: 160 + height: 30 + entryGroups: [] + canvasScrollPosition: {x: 0, y: 0} + canvasZoom: 0.7900002 + syncInfo: + syncActors: 0 + syncItems: 0 + syncLocations: 0 + syncVariables: 0 + syncActorsDatabase: {fileID: 0} + syncItemsDatabase: {fileID: 0} + syncLocationsDatabase: {fileID: 0} + syncVariablesDatabase: {fileID: 0} + templateJson: '{"treatItemsAsQuests":true,"actorFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Pictures","value":"[]","type":3,"typeString":"CustomFieldType_Files"},{"title":"Description","value":"","type":0,"typeString":""},{"title":"IsPlayer","value":"False","type":2,"typeString":"CustomFieldType_Boolean"}],"itemFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Pictures","value":"[]","type":3,"typeString":"CustomFieldType_Files"},{"title":"Description","value":"","type":0,"typeString":""},{"title":"Is + Item","value":"True","type":2,"typeString":"CustomFieldType_Boolean"}],"questFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Pictures","value":"[]","type":3,"typeString":"CustomFieldType_Files"},{"title":"Description","value":"","type":0,"typeString":""},{"title":"Success + Description","value":"","type":0,"typeString":""},{"title":"Failure Description","value":"","type":0,"typeString":""},{"title":"State","value":"unassigned","type":0,"typeString":""},{"title":"Is + Item","value":"False","type":2,"typeString":"CustomFieldType_Boolean"}],"locationFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Description","value":"","type":0,"typeString":""}],"variableFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Initial + Value","value":"","type":0,"typeString":""},{"title":"Description","value":"","type":0,"typeString":""}],"conversationFields":[{"title":"Title","value":"","type":0,"typeString":""},{"title":"Description","value":"","type":0,"typeString":""},{"title":"Actor","value":"0","type":5,"typeString":"CustomFieldType_Actor"},{"title":"Conversant","value":"0","type":5,"typeString":"CustomFieldType_Actor"}],"dialogueEntryFields":[{"title":"Title","value":"","type":0,"typeString":""},{"title":"Description","value":"","type":0,"typeString":""},{"title":"Actor","value":"","type":5,"typeString":"CustomFieldType_Actor"},{"title":"Conversant","value":"","type":5,"typeString":"CustomFieldType_Actor"},{"title":"Menu + Text","value":"","type":0,"typeString":""},{"title":"Dialogue Text","value":"","type":0,"typeString":""},{"title":"Sequence","value":"","type":0,"typeString":""}],"actorPrimaryFieldTitles":[],"itemPrimaryFieldTitles":[],"questPrimaryFieldTitles":[],"locationPrimaryFieldTitles":[],"variablePrimaryFieldTitles":[],"conversationPrimaryFieldTitles":[],"dialogueEntryPrimaryFieldTitles":[],"npcLineColor":{"r":1.0,"g":0.0,"b":0.0,"a":1.0},"pcLineColor":{"r":0.0,"g":0.0,"b":1.0,"a":1.0},"repeatLineColor":{"r":0.5,"g":0.5,"b":0.5,"a":1.0}}' diff --git a/Assets/Dialogue Database (Auto-Backup).asset.meta b/Assets/Dialogue Database (Auto-Backup).asset.meta new file mode 100644 index 000000000..529391080 --- /dev/null +++ b/Assets/Dialogue Database (Auto-Backup).asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e3997841d450d964eb6ed45e3d0b3da4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Dialogue Database.asset b/Assets/Dialogue Database.asset deleted file mode 100644 index 195e90fc6..000000000 --- a/Assets/Dialogue Database.asset +++ /dev/null @@ -1,87 +0,0 @@ -%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: 935899b62f48ae5498594680ed17d133, type: 3} - m_Name: Dialogue Database - m_EditorClassIdentifier: - version: - author: - description: - globalUserScript: - emphasisSettings: - - color: {r: 1, g: 1, b: 1, a: 1} - bold: 0 - italic: 0 - underline: 0 - - color: {r: 1, g: 0, b: 0, a: 1} - bold: 0 - italic: 0 - underline: 0 - - color: {r: 0, g: 1, b: 0, a: 1} - bold: 0 - italic: 0 - underline: 0 - - color: {r: 0, g: 0, b: 1, a: 1} - bold: 0 - italic: 0 - underline: 0 - baseID: 1 - actors: - - id: 1 - fields: - - title: Name - value: Player - type: 0 - typeString: - - title: Pictures - value: '[]' - type: 3 - typeString: CustomFieldType_Files - - title: Description - value: - type: 0 - typeString: - - title: IsPlayer - value: True - type: 2 - typeString: CustomFieldType_Boolean - portrait: {fileID: 0} - spritePortrait: {fileID: 0} - alternatePortraits: [] - spritePortraits: [] - items: [] - locations: [] - variables: - - id: 1 - fields: - - title: Name - value: Alert - type: 0 - typeString: - - title: Initial Value - value: - type: 0 - typeString: - - title: Description - value: - type: 0 - typeString: - conversations: [] - syncInfo: - syncActors: 0 - syncItems: 0 - syncLocations: 0 - syncVariables: 0 - syncActorsDatabase: {fileID: 0} - syncItemsDatabase: {fileID: 0} - syncLocationsDatabase: {fileID: 0} - syncVariablesDatabase: {fileID: 0} - templateJson: diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/AssaultGun.mat b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/AssaultGun.mat index 0ccb7bb45..2870526b7 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/AssaultGun.mat +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/AssaultGun.mat @@ -1,35 +1,139 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3952987877770314619 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: AssaultGun - m_Shader: {fileID: 3, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: [] + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: c2d2fb2c21d12d7489dd03ab23d44c3c, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: c2d2fb2c21d12d7489dd03ab23d44c3c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: c2d2fb2c21d12d7489dd03ab23d44c3c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _Shininess - second: .078125 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.078125 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 m_Colors: - data: - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - data: - first: - name: _SpecColor - second: {r: .5, g: .5, b: .5, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/Head.mat b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/Head.mat index b60ffe13e..a79f3be0b 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/Head.mat +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/Head.mat @@ -2,26 +2,137 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Head - m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: [] + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: c5e587dba7d2f5e41905075a6f0e3d3c, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: {} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: c5e587dba7d2f5e41905075a6f0e3d3c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: c5e587dba7d2f5e41905075a6f0e3d3c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 m_Colors: - data: - first: - name: _Color - second: {r: .698039234, g: .698039234, b: .698039234, a: 1} + - _BaseColor: {r: 0.69803923, g: 0.69803923, b: 0.69803923, a: 1} + - _Color: {r: 0.69803923, g: 0.69803923, b: 0.69803923, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &7032345362675047014 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/InfiltratorPistol.mat b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/InfiltratorPistol.mat index d1e76086b..93a59e0e1 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/InfiltratorPistol.mat +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/InfiltratorPistol.mat @@ -1,35 +1,139 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2324220696572027604 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: InfiltratorPistol - m_Shader: {fileID: 3, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: [] + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: d898db3a1a254844b8497217d6591192, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: d898db3a1a254844b8497217d6591192, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: d898db3a1a254844b8497217d6591192, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _Shininess - second: .078125 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.078125 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 m_Colors: - data: - first: - name: _Color - second: {r: .992156923, g: .992156923, b: .992156923, a: 1} - data: - first: - name: _SpecColor - second: {r: .5, g: .5, b: .5, a: 1} + - _BaseColor: {r: 0.9921569, g: 0.9921569, b: 0.9921569, a: 1} + - _Color: {r: 0.9921569, g: 0.9921569, b: 0.9921569, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/ReconTroop.mat b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/ReconTroop.mat index d46384abc..19666bbac 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/ReconTroop.mat +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/ReconTroop.mat @@ -1,42 +1,140 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6979615024160321570 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: ReconTroop - m_Shader: {fileID: 4, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: [] + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: 5104455d43193e54dabf2751bebd63eb, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _BumpMap - second: - m_Texture: {fileID: 2800000, guid: e568b26774dde804c8237c942f5bfdc7, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 5104455d43193e54dabf2751bebd63eb, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: e568b26774dde804c8237c942f5bfdc7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 5104455d43193e54dabf2751bebd63eb, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _Shininess - second: .078125 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.078125 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 m_Colors: - data: - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - data: - first: - name: _SpecColor - second: {r: .5, g: .5, b: .5, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/ReconTroopHelmet.mat b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/ReconTroopHelmet.mat index cabeba17e..50a27baf7 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/ReconTroopHelmet.mat +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/ReconTroopHelmet.mat @@ -1,42 +1,140 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1568208310248983730 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: ReconTroopHelmet - m_Shader: {fileID: 4, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: [] + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: 065e8646bef9bed48b5fad79551d1166, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _BumpMap - second: - m_Texture: {fileID: 2800000, guid: 50c640ab922713444a79590f02feca90, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 065e8646bef9bed48b5fad79551d1166, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 50c640ab922713444a79590f02feca90, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 065e8646bef9bed48b5fad79551d1166, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _Shininess - second: .078125 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.078125 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 m_Colors: - data: - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - data: - first: - name: _SpecColor - second: {r: .5, g: .5, b: .5, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/ReconTroopHelmetRed.mat b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/ReconTroopHelmetRed.mat index f85842f99..0eb9c4267 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/ReconTroopHelmetRed.mat +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/ReconTroopHelmetRed.mat @@ -2,41 +2,139 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: ReconTroopHelmetRed - m_Shader: {fileID: 4, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: [] + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: 9c4bc49969d983c408ad53891bef5253, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _BumpMap - second: - m_Texture: {fileID: 2800000, guid: 50c640ab922713444a79590f02feca90, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 9c4bc49969d983c408ad53891bef5253, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 50c640ab922713444a79590f02feca90, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 9c4bc49969d983c408ad53891bef5253, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _Shininess - second: .078125 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.078125 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 m_Colors: - data: - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - data: - first: - name: _SpecColor - second: {r: .5, g: .5, b: .5, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &7017594278811996887 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/ReconTroopRed.mat b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/ReconTroopRed.mat index 3b5255d7e..00402b673 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/ReconTroopRed.mat +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Recon Troop/Materials/ReconTroopRed.mat @@ -1,42 +1,140 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-9049098725410165346 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: ReconTroopRed - m_Shader: {fileID: 4, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: [] + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: 029146ce6d2836c448329c460b67d277, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _BumpMap - second: - m_Texture: {fileID: 2800000, guid: e568b26774dde804c8237c942f5bfdc7, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 029146ce6d2836c448329c460b67d277, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: e568b26774dde804c8237c942f5bfdc7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 029146ce6d2836c448329c460b67d277, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _Shininess - second: .078125 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.078125 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 m_Colors: - data: - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - data: - first: - name: _SpecColor - second: {r: .5, g: .5, b: .5, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/FloorAmaterial.mat b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/FloorAmaterial.mat index 3e140be2f..2c0598566 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/FloorAmaterial.mat +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/FloorAmaterial.mat @@ -2,53 +2,140 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: FloorAmaterial - m_Shader: {fileID: 9, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: [] - m_CustomRenderQueue: -1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + - _NORMALMAP + - _PARALLAXMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: ec41d70fedd31494c91aff098c75d76b, type: 3} - m_Scale: {x: 17, y: 4} - m_Offset: {x: 0, y: 0} - data: - first: - name: _BumpMap - second: - m_Texture: {fileID: 2800000, guid: 3ebe12b2f8f6ee54aa7fbbfcf1081017, type: 3} - m_Scale: {x: 17, y: 4} - m_Offset: {x: 0, y: 0} - data: - first: - name: _ParallaxMap - second: - m_Texture: {fileID: 2800000, guid: 3ebe12b2f8f6ee54aa7fbbfcf1081017, type: 3} - m_Scale: {x: 17, y: 4} - m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ec41d70fedd31494c91aff098c75d76b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 3ebe12b2f8f6ee54aa7fbbfcf1081017, type: 3} + m_Scale: {x: 17, y: 4} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ec41d70fedd31494c91aff098c75d76b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 2800000, guid: 3ebe12b2f8f6ee54aa7fbbfcf1081017, type: 3} + m_Scale: {x: 17, y: 4} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _Shininess - second: .069550924 - data: - first: - name: _Parallax - second: .0799999982 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.08 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.069550924 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 m_Colors: - data: - first: - name: _Color - second: {r: .78039217, g: .78039217, b: .78039217, a: 1} - data: - first: - name: _SpecColor - second: {r: .909803927, g: .88018769, b: .838446736, a: 1} + - _BaseColor: {r: 0.78039217, g: 0.78039217, b: 0.78039217, a: 1} + - _Color: {r: 0.78039217, g: 0.78039217, b: 0.78039217, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.9098039, g: 0.8801877, b: 0.83844674, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &68082789725889208 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/LargeDoorway.mat b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/LargeDoorway.mat index ee249bb63..684a5ee62 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/LargeDoorway.mat +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/LargeDoorway.mat @@ -2,64 +2,144 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: LargeDoorway - m_Shader: {fileID: 2, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: [] - m_CustomRenderQueue: -1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: 75b09da11fc5b594fadec1856f61a39d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _BumpMap - second: - m_Texture: {fileID: 2800000, guid: a6e481b095181744bbe7becae65e591e, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _Illum - second: - m_Texture: {fileID: 2800000, guid: a16ee5c1720f2e8448354b194324b6e0, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _ParallaxMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 75b09da11fc5b594fadec1856f61a39d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: a6e481b095181744bbe7becae65e591e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Illum: + m_Texture: {fileID: 2800000, guid: a16ee5c1720f2e8448354b194324b6e0, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 75b09da11fc5b594fadec1856f61a39d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _Shininess - second: .110831663 - data: - first: - name: _EmissionLM - second: 0 - data: - first: - name: _Parallax - second: .0199999996 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EmissionLM: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.11083166 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 m_Colors: - data: - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - data: - first: - name: _SpecColor - second: {r: .686567187, g: .686567187, b: .686567187, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.6865672, g: 0.6865672, b: 0.6865672, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &3599866012703779608 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/Pipe_electricBox_ts_Diff.mat b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/Pipe_electricBox_ts_Diff.mat index 3b709d9fe..ee14cc122 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/Pipe_electricBox_ts_Diff.mat +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/Pipe_electricBox_ts_Diff.mat @@ -2,42 +2,139 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Pipe_electricBox_ts_Diff - m_Shader: {fileID: 4, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: [] - m_CustomRenderQueue: -1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: e2e245c7e87f2e34a99c3bbcf5687ede, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _BumpMap - second: - m_Texture: {fileID: 2800000, guid: 03000e214160bd644a24828125d52980, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: e2e245c7e87f2e34a99c3bbcf5687ede, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 03000e214160bd644a24828125d52980, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: e2e245c7e87f2e34a99c3bbcf5687ede, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _Shininess - second: .274064213 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.2740642 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 m_Colors: - data: - first: - name: _Color - second: {r: .482352942, g: .482352942, b: .482352942, a: 1} - data: - first: - name: _SpecColor - second: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.48235294, g: 0.48235294, b: 0.48235294, a: 1} + - _Color: {r: 0.4823529, g: 0.4823529, b: 0.4823529, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &1296606065659669140 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/TerminalDiffuseMap.mat b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/TerminalDiffuseMap.mat index 0eba0293f..4bad5fbe0 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/TerminalDiffuseMap.mat +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/TerminalDiffuseMap.mat @@ -2,42 +2,139 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: TerminalDiffuseMap - m_Shader: {fileID: 4, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: [] - m_CustomRenderQueue: -1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: c0877afae8be3f64d9dddbacd49424c4, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _BumpMap - second: - m_Texture: {fileID: 2800000, guid: 944dd0f2bf6ff0449ab84e04d84e79f7, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: c0877afae8be3f64d9dddbacd49424c4, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 944dd0f2bf6ff0449ab84e04d84e79f7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: c0877afae8be3f64d9dddbacd49424c4, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _Shininess - second: .056536831 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.05653683 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 m_Colors: - data: - first: - name: _Color - second: {r: .902985096, g: .902985096, b: .902985096, a: 1} - data: - first: - name: _SpecColor - second: {r: .952941179, g: .952941179, b: .952941179, a: 1} + - _BaseColor: {r: 0.9029851, g: 0.9029851, b: 0.9029851, a: 1} + - _Color: {r: 0.9029851, g: 0.9029851, b: 0.9029851, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.9529412, g: 0.9529412, b: 0.9529412, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &3505918079302100886 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/WallDivider.mat b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/WallDivider.mat index 154b10d17..46a108dfb 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/WallDivider.mat +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/WallDivider.mat @@ -2,38 +2,144 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: WallDivider - m_Shader: {fileID: 10, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: [] - m_CustomRenderQueue: -1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + - _ENVIRONMENTREFLECTIONS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: 7c004e3a4c63de944978830bf3fc09ed, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _Illum - second: - m_Texture: {fileID: 2800000, guid: 223b2b0783e8f3b49954d2d05f4d4db7, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 7c004e3a4c63de944978830bf3fc09ed, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 223b2b0783e8f3b49954d2d05f4d4db7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Illum: + m_Texture: {fileID: 2800000, guid: 223b2b0783e8f3b49954d2d05f4d4db7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7c004e3a4c63de944978830bf3fc09ed, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _EmissionLM - second: 0 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _Emission: 1 + - _EmissionLM: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 m_Colors: - data: - first: - name: _Color - second: {r: .588235319, g: .588235319, b: .588235319, a: 1} + - _BaseColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} + - _Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &3894172825337397597 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/WallLamp-16 - Default.mat b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/WallLamp-16 - Default.mat index 639904223..ceba17802 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/WallLamp-16 - Default.mat +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/WallLamp-16 - Default.mat @@ -2,42 +2,139 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: WallLamp-16 - Default - m_Shader: {fileID: 4, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: [] - m_CustomRenderQueue: -1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: 8b54d45f6e9de8749af2703b68d562ca, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _BumpMap - second: - m_Texture: {fileID: 2800000, guid: 35bce0a0e4c3f22418e17e46c9885c71, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 8b54d45f6e9de8749af2703b68d562ca, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 35bce0a0e4c3f22418e17e46c9885c71, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 8b54d45f6e9de8749af2703b68d562ca, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _Shininess - second: .133280903 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.1332809 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 m_Colors: - data: - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - data: - first: - name: _SpecColor - second: {r: .813432813, g: .813432813, b: .813432813, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.8134328, g: 0.8134328, b: 0.8134328, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &7421200339507438341 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/WallTypeA_FloorRaft_Diff.mat b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/WallTypeA_FloorRaft_Diff.mat index 503696fee..5220a9331 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/WallTypeA_FloorRaft_Diff.mat +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/WallTypeA_FloorRaft_Diff.mat @@ -2,42 +2,139 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: WallTypeA_FloorRaft_Diff - m_Shader: {fileID: 4, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: [] - m_CustomRenderQueue: -1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: 1fd277ffd8b705847a11701bf3f564a1, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _BumpMap - second: - m_Texture: {fileID: 2800000, guid: 64441b295643376429ad43561db12131, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 1fd277ffd8b705847a11701bf3f564a1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 64441b295643376429ad43561db12131, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 1fd277ffd8b705847a11701bf3f564a1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _Shininess - second: .238937944 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.23893794 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 m_Colors: - data: - first: - name: _Color - second: {r: .611764729, g: .611764729, b: .611764729, a: 1} - data: - first: - name: _SpecColor - second: {r: .171641767, g: .171641767, b: .171641767, a: 1} + - _BaseColor: {r: 0.6117647, g: 0.6117647, b: 0.6117647, a: 1} + - _Color: {r: 0.6117647, g: 0.6117647, b: 0.6117647, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.17164177, g: 0.17164177, b: 0.17164177, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &1919813722438526479 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/ceilTypeA_Diff.mat b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/ceilTypeA_Diff.mat index 54b6bd22f..a8ba3f055 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/ceilTypeA_Diff.mat +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/ceilTypeA_Diff.mat @@ -2,34 +2,138 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: ceilTypeA_Diff - m_Shader: {fileID: 3, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: [] + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: 74003c0aca445824dbd8c5ade40e49f8, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 74003c0aca445824dbd8c5ade40e49f8, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 74003c0aca445824dbd8c5ade40e49f8, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _Shininess - second: .078125 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.078125 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 m_Colors: - data: - first: - name: _Color - second: {r: .588235319, g: .588235319, b: .588235319, a: 1} - data: - first: - name: _SpecColor - second: {r: .5, g: .5, b: .5, a: 1} + - _BaseColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} + - _Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &4137954462928681209 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/wallTanker.mat b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/wallTanker.mat index 820cbe0f9..7745778ad 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/wallTanker.mat +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Art/Scifi Environment/Materials/wallTanker.mat @@ -2,53 +2,138 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: wallTanker - m_Shader: {fileID: 3, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: [] - m_CustomRenderQueue: -1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: 139efdacaef06c5449a6d4ae9e19833d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _BumpMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _ParallaxMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 139efdacaef06c5449a6d4ae9e19833d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 139efdacaef06c5449a6d4ae9e19833d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _Shininess - second: .0936210826 - data: - first: - name: _Parallax - second: .0199999996 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.09362108 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 m_Colors: - data: - first: - name: _Color - second: {r: .447761178, g: .447761178, b: .447761178, a: 1} - data: - first: - name: _SpecColor - second: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.44776118, g: 0.44776118, b: 0.44776118, a: 1} + - _Color: {r: 0.44776112, g: 0.44776112, b: 0.44776112, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &1484658420536038975 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Data/Demo Database.asset b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Data/Demo Database.asset index 18cffd3c6..088a5611d 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Data/Demo Database.asset +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Data/Demo Database.asset @@ -1112,31 +1112,31 @@ MonoBehaviour: - title: Title value: Quest Unassigned type: 0 - typeString: + typeString: CustomFieldType_Text - title: Actor value: 3 type: 5 - typeString: + typeString: CustomFieldType_Actor - title: Conversant value: 1 type: 5 - typeString: + typeString: CustomFieldType_Actor - title: Menu Text value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Dialogue Text value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Video File value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Sequence value: type: 0 - typeString: + typeString: CustomFieldType_Text conversationID: 2 isRoot: 0 isGroup: 1 @@ -1442,8 +1442,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 204 - y: 120 + x: 205 + y: 119 width: 160 height: 30 - id: 6 @@ -1810,7 +1810,7 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 120 + x: 119 y: 70 width: 160 height: 30 @@ -2870,8 +2870,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 200 - y: 80 + x: 201 + y: 79 width: 160 height: 30 - id: 3 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Prefabs/Dialogue Manager.prefab b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Prefabs/Dialogue Manager.prefab index d767dbc59..763a2ecc4 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Prefabs/Dialogue Manager.prefab +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Prefabs/Dialogue Manager.prefab @@ -32,15 +32,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1003643122459378} + 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: - {fileID: 224904129982485434} - {fileID: 224890378261823126} - {fileID: 4003996800428378} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114937748117785014 MonoBehaviour: @@ -74,6 +75,8 @@ MonoBehaviour: alwaysForceResponseMenu: 1 includeInvalidEntries: 0 responseTimeout: 0 + emTagForOldResponses: 0 + emTagForInvalidResponses: 0 cancelSubtitle: key: 27 buttonName: @@ -95,6 +98,7 @@ MonoBehaviour: subtitleCharsPerSecond: 30 minSubtitleSeconds: 2 continueButton: 0 + requireContinueOnLastLine: 0 richTextEmphases: 1 informSequenceStartAndEnd: 0 cameraSettings: @@ -102,10 +106,12 @@ MonoBehaviour: alternateCameraObject: {fileID: 0} cameraAngles: {fileID: 0} keepCameraPositionAtConversationEnd: 0 + showSubtitleOnEmptyContinue: 0 defaultSequence: AudioWait(entrytag); Delay({{end}}) defaultPlayerSequence: AudioWait(entrytag) defaultResponseMenuSequence: entrytagFormat: 0 + reportMissingAudioFiles: 0 disableInternalSequencerCommands: 0 inputSettings: alwaysForceResponseMenu: 1 @@ -127,6 +133,7 @@ MonoBehaviour: allowBarksDuringConversations: 1 barkCharsPerSecond: 0 minBarkSeconds: 0 + defaultBarkSequence: alertSettings: allowAlertsDuringConversations: 0 alertCheckFrequency: 0 @@ -147,12 +154,13 @@ MonoBehaviour: allowSimultaneousConversations: 0 interruptActiveConversations: 0 includeSimStatus: 0 - instantiateDatabase: 0 + instantiateDatabase: 1 preloadResources: 1 warmUpConversationController: 0 dontHideImmediateDuringWarmup: 0 dontDestroyOnLoad: 1 allowOnlyOneInstance: 1 + onStartTriggerWaitForSaveDataApplied: 0 dialogueTimeMode: 0 debugLevel: 2 --- !u!114 &114041376378916948 @@ -207,23 +215,15 @@ MonoBehaviour: onUseKeyboard: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null onUseJoystick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null onUseMouse: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null onUseTouch: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &114889499020232316 MonoBehaviour: m_ObjectHideFlags: 0 @@ -238,6 +238,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_version: 0 m_saveCurrentScene: 1 + m_maxSaveSlot: 99999 m_framesToWaitBeforeApplyData: 1 m_debug: 1 --- !u!114 &114418064281648646 @@ -261,13 +262,9 @@ MonoBehaviour: onTransitionStart: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null onTransitionEnd: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null loadingSceneName: enterSceneTransition: animator: {fileID: 95430577421052368} @@ -277,13 +274,9 @@ MonoBehaviour: onTransitionStart: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null onTransitionEnd: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &114160787819640068 MonoBehaviour: m_ObjectHideFlags: 0 @@ -368,12 +361,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1092739927580670} + 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: 4240220743476432} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114499580892680844 MonoBehaviour: @@ -390,7 +384,8 @@ MonoBehaviour: startMessage: 'Welcome to the Dialogue System for Unity! - WASD moves, mouse looks, space interacts + WASD moves, mouse + looks, space interacts LMB fires, Escape opens menu' menuKey: 27 @@ -400,13 +395,9 @@ MonoBehaviour: onOpen: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null onClose: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &114124543433568960 MonoBehaviour: m_ObjectHideFlags: 0 @@ -460,9 +451,9 @@ RectTransform: 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: 224890378261823126} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -486,17 +477,17 @@ MonoBehaviour: m_GameObject: {fileID: 1172956102938826} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -506,6 +497,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1326164556581496 GameObject: m_ObjectHideFlags: 0 @@ -535,9 +527,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4240220743476432} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -561,7 +553,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -574,7 +568,7 @@ MonoBehaviour: m_GameObject: {fileID: 1326164556581496} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -591,7 +585,7 @@ MonoBehaviour: m_GameObject: {fileID: 1326164556581496} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 1 @@ -604,6 +598,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!1 &1635533227216014 GameObject: m_ObjectHideFlags: 0 @@ -635,10 +630,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 224197762265611294} m_Father: {fileID: 4240220743476432} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -662,7 +657,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 998 m_TargetDisplay: 0 @@ -675,7 +672,7 @@ MonoBehaviour: m_GameObject: {fileID: 1635533227216014} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 0 @@ -688,6 +685,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &114613399014831548 MonoBehaviour: m_ObjectHideFlags: 0 @@ -697,7 +695,7 @@ MonoBehaviour: m_GameObject: {fileID: 1635533227216014} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -719,7 +717,7 @@ CanvasGroup: m_IgnoreParentGroups: 0 --- !u!95 &95430577421052368 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -732,7 +730,10 @@ Animator: m_UpdateMode: 2 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Scenes/DemoScene2.unity b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Scenes/DemoScene2.unity index d7440088c..00fec345c 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Scenes/DemoScene2.unity +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Scenes/DemoScene2.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,38 +38,33 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 1 + serializedVersion: 12 m_GISettings: serializedVersion: 2 m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 12 m_Resolution: 1 m_BakeResolution: 50 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 0 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 0 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 1024 m_ReflectionCompression: 2 m_MixedBakeMode: 1 m_BakeBackend: 0 @@ -77,10 +72,16 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 0 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 0 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -88,15 +89,17 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: afa64c100b8fb864a8275722c5ec5a57, type: 2} --- !u!196 &5 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -109,16 +112,19 @@ NavMeshSettings: cellSize: 0.16666666 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &44477435 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100142, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 44477436} - component: {fileID: 44477438} @@ -129,35 +135,45 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 65 m_IsActive: 1 --- !u!4 &44477436 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400142, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 44477435} + serializedVersion: 2 m_LocalRotation: {x: 0.000000099748014, y: -0.7071068, z: 0.000000099748014, w: 0.7071068} m_LocalPosition: {x: -0, y: -0, z: 0.037} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1895760024} - m_RootOrder: 95 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!23 &44477437 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 2300106, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 44477435} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 33b9bd8adf938ca43b5fc608c6c74e0a, type: 2} m_StaticBatchInfo: @@ -167,6 +183,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -179,32 +196,43 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &44477438 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 3300106, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 44477435} m_Mesh: {fileID: 4300000, guid: 80c7024b261b4e84db664b41ca4d628b, type: 3} --- !u!65 &44477439 BoxCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 44477435} 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: 2 + serializedVersion: 3 m_Size: {x: 0.30000037, y: 4.2414737, z: 20} m_Center: {x: -0.1499998, y: 2.1207368, z: -2.0000005} --- !u!1 &127521604 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100182, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 127521605} - component: {fileID: 127521607} @@ -214,35 +242,45 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 65 m_IsActive: 1 --- !u!4 &127521605 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400182, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 127521604} + serializedVersion: 2 m_LocalRotation: {x: 0.29482514, y: 0.64280945, z: -0.29475117, w: -0.6426477} m_LocalPosition: {x: -2.1720588, y: -0.21448135, z: -8.380281} m_LocalScale: {x: 0.38863468, y: 0.3886346, z: 1.2343373} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 787852766} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -90.0144, z: 49.2772} --- !u!23 &127521606 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 2300132, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 127521604} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 822331cfd0cd1924d8b742e2afa46eb2, type: 2} m_StaticBatchInfo: @@ -252,6 +290,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -264,20 +303,22 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &127521607 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 3300132, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 127521604} m_Mesh: {fileID: 4300000, guid: e8a3332341b71ab438b1545155cabf1c, type: 3} --- !u!1 &510653866 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 510653867} m_Layer: 0 @@ -290,25 +331,28 @@ GameObject: --- !u!4 &510653867 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 510653866} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.41297534, z: 0, w: 0.9107423} m_LocalPosition: {x: 15.81, y: 0, z: -1.01} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 516639387} - {fileID: 1932321374} - {fileID: 1376012471} m_Father: {fileID: 1895760024} - m_RootOrder: 102 m_LocalEulerAnglesHint: {x: 0, y: 48.7838, z: 0} --- !u!1 &516639386 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100182, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 516639387} - component: {fileID: 516639389} @@ -318,35 +362,45 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 65 m_IsActive: 1 --- !u!4 &516639387 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400182, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 516639386} + serializedVersion: 2 m_LocalRotation: {x: 0.29482514, y: 0.64280945, z: -0.29475117, w: -0.6426477} m_LocalPosition: {x: -2.1720588, y: -0.21448135, z: -8.380281} m_LocalScale: {x: 0.38863468, y: 0.3886346, z: 1.2343373} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 510653867} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -90.0144, z: 49.2772} --- !u!23 &516639388 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 2300132, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 516639386} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 822331cfd0cd1924d8b742e2afa46eb2, type: 2} m_StaticBatchInfo: @@ -356,6 +410,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -368,98 +423,103 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &516639389 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 3300132, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 516639386} m_Mesh: {fileID: 4300000, guid: e8a3332341b71ab438b1545155cabf1c, type: 3} --- !u!1001 &581677108 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 817197998} m_Modifications: - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalPosition.x - value: -6.55 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalPosition.z - value: -5.88 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.y - value: 0.874691 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.w - value: 0.48468107 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 100088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 100088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: m_Name value: Enemy objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalPosition.x + value: -6.55 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalPosition.z + value: -5.88 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.48468107 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.y + value: 0.874691 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: -237.9832 objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 817197999} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: OnUse objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - m_IsPrefabParent: 0 + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} --- !u!1 &718924956 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100074, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 718924957} - component: {fileID: 718924959} @@ -474,30 +534,40 @@ GameObject: --- !u!4 &718924957 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400074, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 718924956} + serializedVersion: 2 m_LocalRotation: {x: -1.0165751e-15, y: 1, z: -0.000000021855694, w: -0.00000004371139} m_LocalPosition: {x: 2, y: 2.7858715, z: 0.06902795} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1895760024} - m_RootOrder: 98 m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} --- !u!23 &718924958 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 2300054, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 718924956} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 11fb2d248febdc846b81524c9ac75a5f, type: 2} m_StaticBatchInfo: @@ -507,6 +577,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -519,20 +590,22 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &718924959 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 3300054, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 718924956} m_Mesh: {fileID: 4300000, guid: c55569fb51e2839469e10cf061ee7ed3, type: 3} --- !u!1 &724197316 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 724197321} - component: {fileID: 724197320} @@ -549,8 +622,9 @@ GameObject: --- !u!114 &724197317 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 724197316} m_Enabled: 1 m_EditorHideFlags: 0 @@ -572,6 +646,9 @@ MonoBehaviour: setQuestEntryState: 0 questEntryNumber: 1 questEntryState: 0 + setAnotherQuestEntryState: 0 + anotherQuestEntryNumber: 1 + anotherQuestEntryState: 0 luaCode: sequence: sequenceSpeaker: {fileID: 0} @@ -584,6 +661,8 @@ MonoBehaviour: sendMessages: [] barkSource: 0 barkConversation: + barkEntryID: -1 + barkEntryTitle: barkText: barkTextSequence: barker: {fileID: 0} @@ -596,9 +675,15 @@ MonoBehaviour: conversationConversant: {fileID: 0} conversationActor: {fileID: 0} startConversationEntryID: -1 + startConversationEntryTitle: + overrideDialogueUI: {fileID: 0} exclusive: 0 + replace: 0 + queue: 0 skipIfNoValidEntries: 1 + preventRestartOnSameFrameEnded: 0 stopConversationOnTriggerExit: 0 + marginToAllowTriggerExit: 0.2 stopConversationIfTooFar: 0 maxConversationDistance: 5 monitorConversationDistanceFrequency: 1 @@ -611,6 +696,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 724197316} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -622,6 +708,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 1018410641} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -632,8 +719,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: PixelCrushers.GameObjectUnityEvent, Assembly-CSharp-firstpass, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null useConversationTitlePicker: 1 useBarkTitlePicker: 1 useQuestNamePicker: 1 @@ -641,16 +726,25 @@ MonoBehaviour: --- !u!23 &724197318 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 724197316} m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -660,6 +754,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -672,86 +767,103 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &724197319 BoxCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 724197316} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!33 &724197320 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 724197316} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &724197321 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 724197316} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 6, y: 0.5, z: -2} m_LocalScale: {x: 1, y: 1, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &772619051 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4240220743476432, guid: d4353500a4689e444a5a0ed100a259e5, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4240220743476432, guid: d4353500a4689e444a5a0ed100a259e5, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4240220743476432, guid: d4353500a4689e444a5a0ed100a259e5, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4240220743476432, guid: d4353500a4689e444a5a0ed100a259e5, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4240220743476432, guid: d4353500a4689e444a5a0ed100a259e5, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4240220743476432, guid: d4353500a4689e444a5a0ed100a259e5, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4240220743476432, guid: d4353500a4689e444a5a0ed100a259e5, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4240220743476432, guid: d4353500a4689e444a5a0ed100a259e5, type: 2} + - target: {fileID: 4240220743476432, guid: d4353500a4689e444a5a0ed100a259e5, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} + - target: {fileID: 4240220743476432, guid: d4353500a4689e444a5a0ed100a259e5, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4240220743476432, guid: d4353500a4689e444a5a0ed100a259e5, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4240220743476432, guid: d4353500a4689e444a5a0ed100a259e5, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4240220743476432, guid: d4353500a4689e444a5a0ed100a259e5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4240220743476432, guid: d4353500a4689e444a5a0ed100a259e5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4240220743476432, guid: d4353500a4689e444a5a0ed100a259e5, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4240220743476432, guid: d4353500a4689e444a5a0ed100a259e5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: d4353500a4689e444a5a0ed100a259e5, type: 2} - m_IsPrefabParent: 0 + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d4353500a4689e444a5a0ed100a259e5, type: 3} --- !u!1 &787852765 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 787852766} m_Layer: 0 @@ -764,25 +876,28 @@ GameObject: --- !u!4 &787852766 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 787852765} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.37703946, z: 0, w: 0.92619723} m_LocalPosition: {x: -6.0705643, y: 0, z: 3.1458006} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 127521605} - {fileID: 1207681476} - {fileID: 1253456248} m_Father: {fileID: 1895760024} - m_RootOrder: 103 m_LocalEulerAnglesHint: {x: 0, y: -44.3008, z: 0} --- !u!1 &817197997 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 817197998} - component: {fileID: 817198000} @@ -797,12 +912,15 @@ GameObject: --- !u!4 &817197998 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 817197997} + 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: - {fileID: 933343031} - {fileID: 2086461777} @@ -810,13 +928,13 @@ Transform: - {fileID: 1306235740} - {fileID: 1000578806} m_Father: {fileID: 0} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &817197999 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 817197997} m_Enabled: 1 m_EditorHideFlags: 0 @@ -830,6 +948,9 @@ MonoBehaviour: questConditions: - questName: Enemy Attack questState: 2 + checkQuestEntry: 0 + entryNumber: 0 + questEntryState: 0 acceptedTags: [] acceptedGameObjects: [] luaWizardIndex: -1 @@ -840,6 +961,9 @@ MonoBehaviour: setQuestEntryState: 0 questEntryNumber: 1 questEntryState: 0 + setAnotherQuestEntryState: 0 + anotherQuestEntryNumber: 1 + anotherQuestEntryState: 0 luaCode: sequence: sequenceSpeaker: {fileID: 0} @@ -851,6 +975,8 @@ MonoBehaviour: sendMessages: [] barkSource: 0 barkConversation: + barkEntryID: -1 + barkEntryTitle: barkText: barkTextSequence: barker: {fileID: 0} @@ -863,9 +989,15 @@ MonoBehaviour: conversationConversant: {fileID: 0} conversationActor: {fileID: 0} startConversationEntryID: -1 + startConversationEntryTitle: + overrideDialogueUI: {fileID: 0} exclusive: 0 + replace: 0 + queue: 0 skipIfNoValidEntries: 1 + preventRestartOnSameFrameEnded: 0 stopConversationOnTriggerExit: 0 + marginToAllowTriggerExit: 0.2 stopConversationIfTooFar: 0 maxConversationDistance: 5 monitorConversationDistanceFrequency: 1 @@ -877,8 +1009,6 @@ MonoBehaviour: onExecute: m_PersistentCalls: m_Calls: [] - m_TypeName: PixelCrushers.GameObjectUnityEvent, Assembly-CSharp-firstpass, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null useConversationTitlePicker: 1 useBarkTitlePicker: 1 useQuestNamePicker: 1 @@ -886,8 +1016,9 @@ MonoBehaviour: --- !u!114 &817198000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 817197997} m_Enabled: 1 m_EditorHideFlags: 0 @@ -900,9 +1031,10 @@ MonoBehaviour: --- !u!1 &832190524 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 832190529} - component: {fileID: 832190528} @@ -919,8 +1051,9 @@ GameObject: --- !u!114 &832190525 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 832190524} m_Enabled: 1 m_EditorHideFlags: 0 @@ -942,6 +1075,9 @@ MonoBehaviour: setQuestEntryState: 0 questEntryNumber: 1 questEntryState: 0 + setAnotherQuestEntryState: 0 + anotherQuestEntryNumber: 1 + anotherQuestEntryState: 0 luaCode: sequence: sequenceSpeaker: {fileID: 0} @@ -953,6 +1089,8 @@ MonoBehaviour: sendMessages: [] barkSource: 0 barkConversation: + barkEntryID: -1 + barkEntryTitle: barkText: barkTextSequence: barker: {fileID: 0} @@ -965,9 +1103,15 @@ MonoBehaviour: conversationConversant: {fileID: 0} conversationActor: {fileID: 0} startConversationEntryID: -1 + startConversationEntryTitle: + overrideDialogueUI: {fileID: 0} exclusive: 0 + replace: 0 + queue: 0 skipIfNoValidEntries: 1 + preventRestartOnSameFrameEnded: 0 stopConversationOnTriggerExit: 0 + marginToAllowTriggerExit: 0.2 stopConversationIfTooFar: 0 maxConversationDistance: 5 monitorConversationDistanceFrequency: 1 @@ -980,6 +1124,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 832190524} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -990,8 +1135,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: PixelCrushers.GameObjectUnityEvent, Assembly-CSharp-firstpass, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null useConversationTitlePicker: 1 useBarkTitlePicker: 1 useQuestNamePicker: 1 @@ -999,16 +1142,25 @@ MonoBehaviour: --- !u!23 &832190526 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 832190524} m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1018,6 +1170,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1030,276 +1183,332 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &832190527 BoxCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 832190524} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!33 &832190528 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 832190524} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &832190529 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 832190524} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3, y: 0.5, z: -3.619} m_LocalScale: {x: 6, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &838226341 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_LocalPosition.x + - target: {fileID: 100002, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_LocalPosition.y + - target: {fileID: 100006, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_LocalPosition.z + - target: {fileID: 100044, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_LocalRotation.x + - target: {fileID: 100050, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_LocalRotation.y + - target: {fileID: 100056, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_Name + value: Tanker + objectReference: {fileID: 0} + - target: {fileID: 100056, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_LocalRotation.z + - target: {fileID: 100060, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_LocalRotation.w - value: 1 + - target: {fileID: 100062, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} + - target: {fileID: 100066, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100080, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100088, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100092, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100096, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100102, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100124, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100144, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100146, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100154, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100156, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100158, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100166, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100172, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 100178, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100182, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_Name + value: Tanker + objectReference: {fileID: 0} + - target: {fileID: 100182, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 100156, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive + - target: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 100002, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive + - target: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 100124, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive + - target: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 100154, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive + - target: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 100006, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive + - target: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 100178, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive + - target: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 100060, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100144, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100146, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100088, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100092, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100096, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100102, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100158, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100166, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100080, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100066, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400074, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} + - target: {fileID: 400068, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} propertyPath: m_LocalPosition.x value: -6 objectReference: {fileID: 0} - - target: {fileID: 400074, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} + - target: {fileID: 400074, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + propertyPath: m_LocalPosition.x + value: -6 + objectReference: {fileID: 0} + - target: {fileID: 400074, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: -180 objectReference: {fileID: 0} - - target: {fileID: 400068, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_LocalPosition.x - value: -6 - objectReference: {fileID: 0} - - target: {fileID: 100056, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_Name - value: Tanker - objectReference: {fileID: 0} - - target: {fileID: 100182, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_Name - value: Tanker - objectReference: {fileID: 0} - - target: {fileID: 100182, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100056, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100062, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100044, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100050, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_IsPrefabParent: 0 + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + insertIndex: -1 + addedObject: {fileID: 44477436} + - targetCorrespondingSourceObject: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1604786719} + - targetCorrespondingSourceObject: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1134399587} + - targetCorrespondingSourceObject: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + insertIndex: -1 + addedObject: {fileID: 718924957} + - targetCorrespondingSourceObject: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1720645377} + - targetCorrespondingSourceObject: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1132238483} + - targetCorrespondingSourceObject: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1201663573} + - targetCorrespondingSourceObject: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + insertIndex: -1 + addedObject: {fileID: 510653867} + - targetCorrespondingSourceObject: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + insertIndex: -1 + addedObject: {fileID: 787852766} + - targetCorrespondingSourceObject: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1682202581} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} --- !u!1001 &896843758 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 817197998} m_Modifications: - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalPosition.x - value: 7.94 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalPosition.z - value: -1.93 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.y - value: 0.8829305 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.w - value: -0.46950376 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 100088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 100088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: m_Name value: Enemy objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalPosition.x + value: 7.94 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalPosition.z + value: -1.93 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.w + value: -0.46950376 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.y + value: 0.8829305 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 817197999} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: OnUse objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - m_IsPrefabParent: 0 + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} --- !u!4 &933343031 stripped Transform: - m_PrefabParentObject: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - m_PrefabInternal: {fileID: 1422063209} + m_CorrespondingSourceObject: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + m_PrefabInstance: {fileID: 1422063209} + m_PrefabAsset: {fileID: 0} --- !u!4 &1000578806 stripped Transform: - m_PrefabParentObject: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - m_PrefabInternal: {fileID: 581677108} + m_CorrespondingSourceObject: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + m_PrefabInstance: {fileID: 581677108} + m_PrefabAsset: {fileID: 0} --- !u!1 &1018410641 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1018410646} - component: {fileID: 1018410645} @@ -1316,8 +1525,9 @@ GameObject: --- !u!114 &1018410642 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1018410641} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1339,6 +1549,9 @@ MonoBehaviour: setQuestEntryState: 0 questEntryNumber: 1 questEntryState: 0 + setAnotherQuestEntryState: 0 + anotherQuestEntryNumber: 1 + anotherQuestEntryState: 0 luaCode: sequence: sequenceSpeaker: {fileID: 0} @@ -1351,6 +1564,8 @@ MonoBehaviour: sendMessages: [] barkSource: 0 barkConversation: + barkEntryID: -1 + barkEntryTitle: barkText: barkTextSequence: barker: {fileID: 0} @@ -1363,9 +1578,15 @@ MonoBehaviour: conversationConversant: {fileID: 0} conversationActor: {fileID: 0} startConversationEntryID: -1 + startConversationEntryTitle: + overrideDialogueUI: {fileID: 0} exclusive: 0 + replace: 0 + queue: 0 skipIfNoValidEntries: 1 + preventRestartOnSameFrameEnded: 0 stopConversationOnTriggerExit: 0 + marginToAllowTriggerExit: 0.2 stopConversationIfTooFar: 0 maxConversationDistance: 5 monitorConversationDistanceFrequency: 1 @@ -1378,6 +1599,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1018410641} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -1389,6 +1611,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 724197316} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -1399,8 +1622,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: PixelCrushers.GameObjectUnityEvent, Assembly-CSharp-firstpass, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null useConversationTitlePicker: 1 useBarkTitlePicker: 1 useQuestNamePicker: 1 @@ -1408,16 +1629,25 @@ MonoBehaviour: --- !u!23 &1018410643 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1018410641} m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1427,6 +1657,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1439,47 +1670,62 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1018410644 BoxCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1018410641} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!33 &1018410645 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1018410641} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1018410646 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1018410641} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: -2} m_LocalScale: {x: 1, y: 1, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1026855500 stripped GameObject: - m_PrefabParentObject: {fileID: 100046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} - m_PrefabInternal: {fileID: 1506695490} + m_CorrespondingSourceObject: {fileID: 100046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} + m_PrefabInstance: {fileID: 1506695490} + m_PrefabAsset: {fileID: 0} --- !u!114 &1026855509 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1026855500} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1491,9 +1737,10 @@ MonoBehaviour: --- !u!1 &1132238482 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100074, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1132238483} - component: {fileID: 1132238485} @@ -1508,30 +1755,40 @@ GameObject: --- !u!4 &1132238483 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400074, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1132238482} + serializedVersion: 2 m_LocalRotation: {x: -1.0165751e-15, y: 1, z: -0.000000021855694, w: -0.00000004371139} m_LocalPosition: {x: 10, y: 2.7858715, z: 0.06902795} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1895760024} - m_RootOrder: 100 m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} --- !u!23 &1132238484 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 2300054, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1132238482} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 11fb2d248febdc846b81524c9ac75a5f, type: 2} m_StaticBatchInfo: @@ -1541,6 +1798,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1553,20 +1811,22 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1132238485 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 3300054, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1132238482} m_Mesh: {fileID: 4300000, guid: c55569fb51e2839469e10cf061ee7ed3, type: 3} --- !u!1 &1134399586 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100076, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1134399587} - component: {fileID: 1134399589} @@ -1576,35 +1836,45 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 65 m_IsActive: 1 --- !u!4 &1134399587 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400076, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1134399586} + serializedVersion: 2 m_LocalRotation: {x: 0.000000099748014, y: -0.7071068, z: 0.000000099748014, w: 0.7071068} m_LocalPosition: {x: 4, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1895760024} - m_RootOrder: 97 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!23 &1134399588 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 2300056, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1134399586} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 7a27f547c4a7e434086a9186d53ce37d, type: 2} m_StaticBatchInfo: @@ -1614,6 +1884,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1626,20 +1897,22 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1134399589 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 3300056, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1134399586} m_Mesh: {fileID: 4300000, guid: ba4086086b6963e428f5771405982842, type: 3} --- !u!1 &1201663572 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100068, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1201663573} - component: {fileID: 1201663574} @@ -1653,30 +1926,33 @@ GameObject: --- !u!4 &1201663573 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400068, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1201663572} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 10, y: 2.7014902, z: -1.2486317} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1895760024} - m_RootOrder: 101 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &1201663574 Light: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 10800016, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1201663572} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 11 m_Type: 2 m_Color: {r: 0.428143, g: 0.7045279, b: 0.9098039, a: 1} m_Intensity: 12.8 m_Range: 3.88 m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -1686,6 +1962,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -1693,19 +1987,29 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 1 + m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + 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 &1207681475 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100056, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1207681476} - component: {fileID: 1207681479} @@ -1716,48 +2020,66 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 65 m_IsActive: 1 --- !u!4 &1207681476 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400056, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1207681475} + serializedVersion: 2 m_LocalRotation: {x: -0.5000001, y: -0.5, z: 0.5, w: 0.49999994} m_LocalPosition: {x: -2.1720192, y: 0.158, z: -8.530014} m_LocalScale: {x: 0.38863468, y: 0.3886346, z: 1.2343373} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 787852766} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 90} --- !u!65 &1207681477 BoxCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 6500000, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1207681475} 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: 2 + serializedVersion: 3 m_Size: {x: 3, y: 6, z: 2.539998} m_Center: {x: 2.336361, y: -0.00000047425823, z: 0.000000020924537} --- !u!23 &1207681478 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 2300042, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1207681475} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 822331cfd0cd1924d8b742e2afa46eb2, type: 2} m_StaticBatchInfo: @@ -1767,6 +2089,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1779,20 +2102,22 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1207681479 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 3300042, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1207681475} m_Mesh: {fileID: 4300000, guid: e8a3332341b71ab438b1545155cabf1c, type: 3} --- !u!1 &1253456247 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100056, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1253456248} - component: {fileID: 1253456250} @@ -1802,35 +2127,45 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 65 m_IsActive: 1 --- !u!4 &1253456248 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400056, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1253456247} + serializedVersion: 2 m_LocalRotation: {x: 0.29482514, y: 0.64280945, z: -0.29475117, w: -0.6426477} m_LocalPosition: {x: -2.172, y: -0.172, z: -9.878} m_LocalScale: {x: 0.3886348, y: 0.38863462, z: 1.2343377} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 787852766} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: -90.0144, z: 49.2772} --- !u!23 &1253456249 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 2300042, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1253456247} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 822331cfd0cd1924d8b742e2afa46eb2, type: 2} m_StaticBatchInfo: @@ -1840,6 +2175,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1852,24 +2188,27 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1253456250 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 3300042, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1253456247} m_Mesh: {fileID: 4300000, guid: e8a3332341b71ab438b1545155cabf1c, type: 3} --- !u!4 &1306235740 stripped Transform: - m_PrefabParentObject: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - m_PrefabInternal: {fileID: 2060269487} + m_CorrespondingSourceObject: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + m_PrefabInstance: {fileID: 2060269487} + m_PrefabAsset: {fileID: 0} --- !u!1 &1376012470 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100056, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1376012471} - component: {fileID: 1376012473} @@ -1879,35 +2218,45 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 65 m_IsActive: 1 --- !u!4 &1376012471 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400056, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1376012470} + serializedVersion: 2 m_LocalRotation: {x: 0.29482514, y: 0.64280945, z: -0.29475117, w: -0.6426477} m_LocalPosition: {x: -2.172, y: -0.172, z: -9.878} m_LocalScale: {x: 0.3886348, y: 0.38863462, z: 1.2343377} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 510653867} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: -90.0144, z: 49.2772} --- !u!23 &1376012472 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 2300042, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1376012470} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 822331cfd0cd1924d8b742e2afa46eb2, type: 2} m_StaticBatchInfo: @@ -1917,6 +2266,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1929,86 +2279,91 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1376012473 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 3300042, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1376012470} m_Mesh: {fileID: 4300000, guid: e8a3332341b71ab438b1545155cabf1c, type: 3} --- !u!1001 &1422063209 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 817197998} m_Modifications: - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalPosition.x - value: 10.21 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalPosition.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalPosition.z - value: -3.62 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.y - value: 0.8829305 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.w - value: -0.46950376 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalPosition.x + value: 10.21 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalPosition.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalPosition.z + value: -3.62 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.w + value: -0.46950376 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.y + value: 0.8829305 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 817197999} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: OnUse objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - m_IsPrefabParent: 0 + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} --- !u!1 &1443171654 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1443171657} - component: {fileID: 1443171656} @@ -2023,14 +2378,16 @@ GameObject: --- !u!114 &1443171655 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1443171654} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -2041,12 +2398,13 @@ MonoBehaviour: --- !u!114 &1443171656 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1443171654} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} @@ -2055,93 +2413,154 @@ MonoBehaviour: --- !u!4 &1443171657 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1443171654} + 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: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1506695490 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} - propertyPath: m_LocalPosition.x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} - propertyPath: m_LocalPosition.z - value: -7 - objectReference: {fileID: 0} - - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} + - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} propertyPath: m_RootOrder value: 10 objectReference: {fileID: 0} - - target: {fileID: 8200000, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} - propertyPath: panLevelCustomCurve.m_RotationOrder + - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} + propertyPath: m_LocalPosition.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} + propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8200000, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} - propertyPath: reverbZoneMixCustomCurve.m_RotationOrder + - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} + propertyPath: m_LocalPosition.z + value: -7 + objectReference: {fileID: 0} + - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} + propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8200002, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} - propertyPath: panLevelCustomCurve.m_RotationOrder + - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} + propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8200002, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} - propertyPath: reverbZoneMixCustomCurve.m_RotationOrder + - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} + propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} + - target: {fileID: 400046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8200002, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} + - target: {fileID: 8200000, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} + propertyPath: panLevelCustomCurve.m_RotationOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8200000, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} + propertyPath: reverbZoneMixCustomCurve.m_RotationOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8200002, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} + propertyPath: panLevelCustomCurve.m_RotationOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8200002, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} + propertyPath: reverbZoneMixCustomCurve.m_RotationOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8200002, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value value: 0 objectReference: {fileID: 0} - - target: {fileID: 11400002, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} + - target: {fileID: 11400002, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 8200000, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} - m_ParentPrefab: {fileID: 100100000, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 2} - m_IsPrefabParent: 0 + - {fileID: 8200000, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100046, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} + insertIndex: -1 + addedObject: {fileID: 1026855509} + - targetCorrespondingSourceObject: {fileID: 100076, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} + insertIndex: -1 + addedObject: {fileID: 1506695492} + m_SourcePrefab: {fileID: 100100000, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} +--- !u!1 &1506695491 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100076, guid: 6f06dd98a5f62894a9f9c0ce7e700682, type: 3} + m_PrefabInstance: {fileID: 1506695490} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1506695492 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506695491} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 --- !u!1 &1604786718 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100076, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1604786719} - component: {fileID: 1604786721} @@ -2151,35 +2570,45 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 65 m_IsActive: 1 --- !u!4 &1604786719 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400076, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1604786718} + serializedVersion: 2 m_LocalRotation: {x: 0.000000099748014, y: -0.7071068, z: 0.000000099748014, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1895760024} - m_RootOrder: 96 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!23 &1604786720 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 2300056, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1604786718} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 7a27f547c4a7e434086a9186d53ce37d, type: 2} m_StaticBatchInfo: @@ -2189,6 +2618,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2201,20 +2631,22 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1604786721 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 3300056, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1604786718} m_Mesh: {fileID: 4300000, guid: ba4086086b6963e428f5771405982842, type: 3} --- !u!1 &1682202580 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100068, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1682202581} - component: {fileID: 1682202582} @@ -2228,30 +2660,33 @@ GameObject: --- !u!4 &1682202581 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400068, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1682202580} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: 4, z: -7} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1895760024} - m_RootOrder: 104 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &1682202582 Light: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 10800016, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1682202580} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 11 m_Type: 2 m_Color: {r: 0.428143, g: 0.7045279, b: 0.9098039, a: 1} m_Intensity: 6 m_Range: 4 m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -2261,6 +2696,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -2268,19 +2721,29 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 1 + m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + 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 &1717261684 GameObject: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1717261685} m_Layer: 0 @@ -2293,22 +2756,25 @@ GameObject: --- !u!4 &1717261685 Transform: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1717261684} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.3121986, y: 0, z: 12.798235} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1720645376 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100068, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1720645377} - component: {fileID: 1720645378} @@ -2322,30 +2788,33 @@ GameObject: --- !u!4 &1720645377 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400068, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1720645376} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: 2.7014902, z: -1.2486317} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1895760024} - m_RootOrder: 99 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &1720645378 Light: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 10800016, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1720645376} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 11 m_Type: 2 m_Color: {r: 0.428143, g: 0.7045279, b: 0.9098039, a: 1} m_Intensity: 12.8 m_Range: 3.88 m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -2355,6 +2824,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -2362,101 +2849,115 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 1 + m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + 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!1001 &1873632917 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 817197998} m_Modifications: - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalPosition.x - value: -2.6458955 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalPosition.z - value: -1.8480176 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.y - value: 0.9744626 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.w - value: 0.22454974 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 100088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 100088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: m_Name value: Enemy objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalPosition.x + value: -2.6458955 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalPosition.z + value: -1.8480176 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.22454974 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9744626 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: -205.95279 objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 817197999} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: OnUse objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - m_IsPrefabParent: 0 + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} --- !u!4 &1895760024 stripped Transform: - m_PrefabParentObject: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 838226341} + m_CorrespondingSourceObject: {fileID: 400000, guid: 56aa82917f38f54449255fb7967f7a3a, type: 3} + m_PrefabInstance: {fileID: 838226341} + m_PrefabAsset: {fileID: 0} --- !u!1 &1932321373 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100056, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1932321374} - component: {fileID: 1932321377} @@ -2467,48 +2968,66 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 65 m_IsActive: 1 --- !u!4 &1932321374 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400056, guid: 56aa82917f38f54449255fb7967f7a3a, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1932321373} + serializedVersion: 2 m_LocalRotation: {x: -0.5000001, y: -0.5, z: 0.5, w: 0.49999994} m_LocalPosition: {x: -2.1720192, y: 0.158, z: -8.530014} m_LocalScale: {x: 0.38863468, y: 0.3886346, z: 1.2343373} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 510653867} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 90} --- !u!65 &1932321375 BoxCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 6500000, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1932321373} 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: 2 + serializedVersion: 3 m_Size: {x: 3, y: 6, z: 2.539998} m_Center: {x: 2.336361, y: -0.00000047425823, z: 0.000000020924537} --- !u!23 &1932321376 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 2300042, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1932321373} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 822331cfd0cd1924d8b742e2afa46eb2, type: 2} m_StaticBatchInfo: @@ -2518,6 +3037,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2530,20 +3050,22 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1932321377 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 3300042, guid: 56aa82917f38f54449255fb7967f7a3a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1932321373} m_Mesh: {fileID: 4300000, guid: e8a3332341b71ab438b1545155cabf1c, type: 3} --- !u!1 &1951613461 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1951613462} m_Layer: 0 @@ -2556,68 +3078,90 @@ GameObject: --- !u!4 &1951613462 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1951613461} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: 0, z: -8} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1966953160 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 400070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 2} - propertyPath: m_LocalPosition.x - value: 2.72 - objectReference: {fileID: 0} - - target: {fileID: 400070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 2} - propertyPath: m_LocalPosition.z - value: -4.767 - objectReference: {fileID: 0} - - target: {fileID: 400070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 2} - propertyPath: m_LocalRotation.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 2} - propertyPath: m_LocalRotation.w - value: -0.00000016292068 - objectReference: {fileID: 0} - - target: {fileID: 400070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 2} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 100070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 2} + - target: {fileID: 100070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 157572, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 194514, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 400070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 3} + propertyPath: m_LocalPosition.x + value: 2.72 + objectReference: {fileID: 0} + - target: {fileID: 400070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 3} + propertyPath: m_LocalPosition.z + value: -4.767 + objectReference: {fileID: 0} + - target: {fileID: 400070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 3} + propertyPath: m_LocalRotation.w + value: -0.00000016292068 + objectReference: {fileID: 0} + - target: {fileID: 400070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400070, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11476136, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 3} + propertyPath: m_BlockingMask.m_Bits + value: 131071 + objectReference: {fileID: 0} + - target: {fileID: 11497698, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 2} - m_IsPrefabParent: 0 + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5d271d9ea0c3c7c408e8785b0221d4ad, type: 3} --- !u!1 &2006123368 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2006123369} - component: {fileID: 2006123373} @@ -2634,21 +3178,24 @@ GameObject: --- !u!4 &2006123369 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2006123368} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: 1.5, z: -9} m_LocalScale: {x: 4, y: 3, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2006123370 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2006123368} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2669,6 +3216,9 @@ MonoBehaviour: setQuestEntryState: 0 questEntryNumber: 1 questEntryState: 0 + setAnotherQuestEntryState: 0 + anotherQuestEntryNumber: 1 + anotherQuestEntryState: 0 luaCode: sequence: LoadLevel(DemoScene1, Spawnpoint from DemoScene2) sequenceSpeaker: {fileID: 0} @@ -2680,6 +3230,8 @@ MonoBehaviour: sendMessages: [] barkSource: 0 barkConversation: + barkEntryID: -1 + barkEntryTitle: barkText: barkTextSequence: barker: {fileID: 0} @@ -2692,9 +3244,15 @@ MonoBehaviour: conversationConversant: {fileID: 0} conversationActor: {fileID: 0} startConversationEntryID: -1 + startConversationEntryTitle: + overrideDialogueUI: {fileID: 0} exclusive: 0 + replace: 0 + queue: 0 skipIfNoValidEntries: 1 + preventRestartOnSameFrameEnded: 0 stopConversationOnTriggerExit: 0 + marginToAllowTriggerExit: 0.2 stopConversationIfTooFar: 0 maxConversationDistance: 5 monitorConversationDistanceFrequency: 1 @@ -2706,8 +3264,6 @@ MonoBehaviour: onExecute: m_PersistentCalls: m_Calls: [] - m_TypeName: PixelCrushers.GameObjectUnityEvent, Assembly-CSharp-firstpass, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null useConversationTitlePicker: 1 useBarkTitlePicker: 1 useQuestNamePicker: 1 @@ -2715,135 +3271,161 @@ MonoBehaviour: --- !u!114 &2006123371 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2006123368} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 274b80ab5b659c646ba9338870d14625, type: 3} m_Name: m_EditorClassIdentifier: - overrideName: To DemoScene1 - overrideUseMessage: Spacebar to enter + m_overrideName: To DemoScene1 + m_overrideUseMessage: Spacebar to enter maxUseDistance: 3 events: onSelect: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null onDeselect: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null onUse: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!65 &2006123372 BoxCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2006123368} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!33 &2006123373 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2006123368} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &2060269487 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 817197998} m_Modifications: - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalPosition.x - value: -5.27 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalPosition.z - value: -2.6 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.y - value: 0.9201088 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalRotation.w - value: 0.39166293 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 100088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 100088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: m_Name value: Enemy objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalPosition.x + value: -5.27 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalPosition.z + value: -2.6 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.39166293 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9201088 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: -226.116 objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 817197999} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: OnUse objectReference: {fileID: 0} - - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} + - target: {fileID: 11437546, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} propertyPath: onIncrement.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - m_IsPrefabParent: 0 + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} --- !u!4 &2074564801 stripped Transform: - m_PrefabParentObject: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - m_PrefabInternal: {fileID: 1873632917} + m_CorrespondingSourceObject: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + m_PrefabInstance: {fileID: 1873632917} + m_PrefabAsset: {fileID: 0} --- !u!4 &2086461777 stripped Transform: - m_PrefabParentObject: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 2} - m_PrefabInternal: {fileID: 896843758} + m_CorrespondingSourceObject: {fileID: 400088, guid: 352b04850feb3eb4e9f7b144993fe65b, type: 3} + m_PrefabInstance: {fileID: 896843758} + m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1443171657} + - {fileID: 838226341} + - {fileID: 772619051} + - {fileID: 832190529} + - {fileID: 724197321} + - {fileID: 1018410646} + - {fileID: 1717261685} + - {fileID: 1951613462} + - {fileID: 2006123369} + - {fileID: 1966953160} + - {fileID: 1506695490} + - {fileID: 817197998} diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Scenes/DemoScene2Settings.lighting b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Scenes/DemoScene2Settings.lighting new file mode 100644 index 000000000..efd9b0cb2 --- /dev/null +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Scenes/DemoScene2Settings.lighting @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DemoScene2Settings + serializedVersion: 8 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_LightmapSizeFixed: 0 + m_UseMipmapLimits: 1 + m_BakeResolution: 50 + m_Padding: 2 + m_LightmapCompression: 0 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_EnableWorkerProcessBaking: 1 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 1 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 0 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_RespectSceneVisibilityWhenBakingGI: 0 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Scenes/DemoScene2Settings.lighting.meta b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Scenes/DemoScene2Settings.lighting.meta new file mode 100644 index 000000000..06bc42989 --- /dev/null +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Demo/Scenes/DemoScene2Settings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: afa64c100b8fb864a8275722c5ec5a57 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Art/Animation/Canvas Group Animator/Canvas Group Animator Controller.controller b/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Art/Animation/Canvas Group Animator/Canvas Group Animator Controller.controller index 65710bfc5..8208dd7c8 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Art/Animation/Canvas Group Animator/Canvas Group Animator Controller.controller +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Art/Animation/Canvas Group Animator/Canvas Group Animator Controller.controller @@ -3,8 +3,9 @@ --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Canvas Group Animator Controller serializedVersion: 5 m_AnimatorParameters: @@ -48,8 +49,9 @@ AnimatorController: --- !u!1101 &110100272 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: [] m_DstStateMachine: {fileID: 0} @@ -69,8 +71,9 @@ AnimatorStateTransition: --- !u!1101 &110134440 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - m_ConditionMode: 1 @@ -93,8 +96,9 @@ AnimatorStateTransition: --- !u!1101 &110147280 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: [] m_DstStateMachine: {fileID: 0} @@ -114,8 +118,9 @@ AnimatorStateTransition: --- !u!1101 &110163854 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - m_ConditionMode: 1 @@ -138,8 +143,9 @@ AnimatorStateTransition: --- !u!1101 &110165636 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - m_ConditionMode: 1 @@ -162,8 +168,9 @@ AnimatorStateTransition: --- !u!1101 &110166252 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - m_ConditionMode: 1 @@ -185,9 +192,10 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1101 &110176745 AnimatorStateTransition: - m_ObjectHideFlags: 3 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - m_ConditionMode: 1 @@ -209,9 +217,10 @@ AnimatorStateTransition: m_CanTransitionToSelf: 0 --- !u!1101 &110180422 AnimatorStateTransition: - m_ObjectHideFlags: 3 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - m_ConditionMode: 1 @@ -233,10 +242,11 @@ AnimatorStateTransition: m_CanTransitionToSelf: 0 --- !u!1102 &110200000 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Show m_Speed: 1 m_CycleOffset: 0 @@ -251,17 +261,20 @@ AnimatorState: m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 m_Motion: {fileID: 7400000, guid: 26b9ff14f098f4247a4857154f0a8264, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &110213112 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Start m_Speed: 1 m_CycleOffset: 0 @@ -274,17 +287,20 @@ AnimatorState: m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 m_Motion: {fileID: 7400000, guid: 0ba32211bb8ed944392b21a33b101791, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &110278892 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Unfocus m_Speed: -1 m_CycleOffset: 0 @@ -298,17 +314,20 @@ AnimatorState: m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 m_Motion: {fileID: 7400000, guid: 853fc541aa274d449b139d19d76a1381, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &110281693 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Hide m_Speed: 1 m_CycleOffset: 0 @@ -321,17 +340,20 @@ AnimatorState: m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 m_Motion: {fileID: 7400000, guid: 4e723352b8ebe9540a29335860b85a4a, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &110287092 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Focus m_Speed: 1 m_CycleOffset: 0 @@ -345,17 +367,20 @@ AnimatorState: m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 m_Motion: {fileID: 7400000, guid: 853fc541aa274d449b139d19d76a1381, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &110700000 AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 3 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Base Layer m_ChildStates: - serializedVersion: 1 @@ -363,10 +388,10 @@ AnimatorStateMachine: m_Position: {x: 120, y: -192, z: 0} - serializedVersion: 1 m_State: {fileID: 110281693} - m_Position: {x: 120, y: -132, z: 0} + m_Position: {x: 120, y: -130, z: 0} - serializedVersion: 1 m_State: {fileID: 110213112} - m_Position: {x: 126, y: -252, z: 0} + m_Position: {x: 130, y: -250, z: 0} - serializedVersion: 1 m_State: {fileID: 110287092} m_Position: {x: 372, y: -216, z: 0} diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Basic/Basic Standard Bark UI.prefab b/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Basic/Basic Standard Bark UI.prefab index 18f664fad..96a7381e1 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Basic/Basic Standard Bark UI.prefab +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Basic/Basic Standard Bark UI.prefab @@ -29,9 +29,9 @@ RectTransform: 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: 22452682} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -61,6 +61,7 @@ MonoBehaviour: 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: @@ -124,11 +125,11 @@ RectTransform: 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: 22415182} - {fileID: 22486882} m_Father: {fileID: 22467428} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -158,6 +159,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -197,6 +199,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &11420966 MonoBehaviour: m_ObjectHideFlags: 0 @@ -243,10 +246,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 1, z: 0, w: -0.00000016292068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 22452682} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -270,7 +273,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -290,7 +295,7 @@ MonoBehaviour: m_BlockingObjects: 0 m_BlockingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 131071 --- !u!225 &22588904 CanvasGroup: m_ObjectHideFlags: 0 @@ -319,7 +324,7 @@ MonoBehaviour: m_rotate180: 0 --- !u!95 &9594236 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -332,10 +337,13 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &11426712 MonoBehaviour: m_ObjectHideFlags: 0 @@ -351,8 +359,10 @@ MonoBehaviour: canvasGroup: {fileID: 22588904} barkText: m_uiText: {fileID: 11409586} + m_textMeshProUGUI: {fileID: 0} nameText: m_uiText: {fileID: 11457376} + m_textMeshProUGUI: {fileID: 0} includeName: 1 portraitImage: {fileID: 0} showPortraitImage: 0 @@ -394,9 +404,9 @@ RectTransform: 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: 22452682} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -426,6 +436,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.1953125, g: 0.1953125, b: 0.1953125, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Basic/Basic Standard Dialogue UI.prefab b/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Basic/Basic Standard Dialogue UI.prefab index df6698530..76d1585f6 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Basic/Basic Standard Dialogue UI.prefab +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Basic/Basic Standard Dialogue UI.prefab @@ -29,9 +29,9 @@ RectTransform: 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: 22493478} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -61,6 +61,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.196, g: 0.196, b: 0.196, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -129,10 +130,10 @@ RectTransform: 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: 22433532} m_Father: {fileID: 22461342} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -192,6 +193,7 @@ MonoBehaviour: 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: @@ -246,12 +248,12 @@ RectTransform: 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: 22480558} - {fileID: 22413186} - {fileID: 22495498} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -274,6 +276,7 @@ MonoBehaviour: panel: {fileID: 11457502} alertText: m_uiText: {fileID: 11411984} + m_textMeshProUGUI: {fileID: 0} queueAlerts: 1 dontQueueDuplicates: 0 waitForHideAnimation: 1 @@ -288,6 +291,7 @@ MonoBehaviour: defaultNPCSubtitlePanel: {fileID: 11466480} defaultPCSubtitlePanel: {fileID: 11413806} allowOpenSubtitlePanelsOnStartConversation: 1 + allowDialogueActorCustomPanels: 1 menuPanels: - {fileID: 11411294} defaultMenuPanel: {fileID: 11411294} @@ -330,10 +334,10 @@ RectTransform: 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: 22422554} m_Father: {fileID: 22480558} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -363,6 +367,7 @@ MonoBehaviour: 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: @@ -391,6 +396,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -421,6 +427,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11424526} + m_TargetAssemblyTypeName: m_MethodName: OnContinueAlert m_Mode: 1 m_Arguments: @@ -456,6 +463,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &11451262 MonoBehaviour: m_ObjectHideFlags: 0 @@ -504,9 +512,9 @@ RectTransform: 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: 22454054} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -536,6 +544,7 @@ MonoBehaviour: 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: @@ -622,6 +631,7 @@ RectTransform: 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: 22460086} - {fileID: 22460362} @@ -629,7 +639,6 @@ RectTransform: - {fileID: 22423754} - {fileID: 22493478} m_Father: {fileID: 22413186} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -659,6 +668,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -687,7 +697,7 @@ CanvasGroup: m_IgnoreParentGroups: 0 --- !u!95 &9556136 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -700,10 +710,13 @@ Animator: m_UpdateMode: 2 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &11424752 MonoBehaviour: m_ObjectHideFlags: 0 @@ -729,6 +742,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &11483934 MonoBehaviour: m_ObjectHideFlags: 0 @@ -780,8 +794,10 @@ MonoBehaviour: portraitImage: {fileID: 11422712} portraitName: m_uiText: {fileID: 11456524} + m_textMeshProUGUI: {fileID: 0} subtitleText: m_uiText: {fileID: 11445008} + m_textMeshProUGUI: {fileID: 0} addSpeakerName: 0 addSpeakerNameFormat: '{0}: {1}' accumulateText: 0 @@ -838,9 +854,9 @@ RectTransform: 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: 22424574} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -870,6 +886,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, 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: @@ -934,10 +951,10 @@ RectTransform: 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: 22436064} m_Father: {fileID: 22400310} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -977,11 +994,11 @@ RectTransform: 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: 22473690} - {fileID: 22497246} m_Father: {fileID: 22496680} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1023,6 +1040,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1076,9 +1094,10 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!95 &9567330 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1091,10 +1110,13 @@ Animator: m_UpdateMode: 2 m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &11457502 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1157,9 +1179,9 @@ RectTransform: 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: 22487244} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1189,6 +1211,7 @@ MonoBehaviour: 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: @@ -1254,9 +1277,9 @@ RectTransform: 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: 22487244} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1286,6 +1309,7 @@ MonoBehaviour: 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: @@ -1414,13 +1438,13 @@ RectTransform: 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: 22487244} - {fileID: 22429670} - {fileID: 22461342} - {fileID: 22418282} m_Father: {fileID: 22496680} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1450,6 +1474,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.5019608} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1478,7 +1503,7 @@ CanvasGroup: m_IgnoreParentGroups: 0 --- !u!95 &9590998 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1491,10 +1516,13 @@ Animator: m_UpdateMode: 2 m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &11458734 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1558,10 +1586,10 @@ RectTransform: 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: 22445010} m_Father: {fileID: 22414516} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1593,6 +1621,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!222 &22288868 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1616,6 +1645,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1677,6 +1707,7 @@ RectTransform: 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: 22423222} - {fileID: 22452586} @@ -1684,7 +1715,6 @@ RectTransform: - {fileID: 22410494} - {fileID: 22490548} m_Father: {fileID: 22413186} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1714,6 +1744,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1742,7 +1773,7 @@ CanvasGroup: m_IgnoreParentGroups: 0 --- !u!95 &9541122 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1755,10 +1786,13 @@ Animator: m_UpdateMode: 2 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &11458418 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1784,6 +1818,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &11432276 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1835,8 +1870,10 @@ MonoBehaviour: portraitImage: {fileID: 11405928} portraitName: m_uiText: {fileID: 11473894} + m_textMeshProUGUI: {fileID: 0} subtitleText: m_uiText: {fileID: 11489786} + m_textMeshProUGUI: {fileID: 0} addSpeakerName: 0 addSpeakerNameFormat: '{0}: {1}' accumulateText: 0 @@ -1894,9 +1931,9 @@ RectTransform: 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: 22487244} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1926,6 +1963,7 @@ MonoBehaviour: 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: @@ -2007,9 +2045,9 @@ RectTransform: 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: 22454240} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2039,6 +2077,7 @@ MonoBehaviour: 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: @@ -2082,9 +2121,9 @@ RectTransform: 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: 22429670} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2114,6 +2153,7 @@ MonoBehaviour: 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: @@ -2177,9 +2217,9 @@ RectTransform: 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: 22429670} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2209,6 +2249,7 @@ MonoBehaviour: 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: @@ -2272,9 +2313,9 @@ RectTransform: 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: 22487244} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2304,6 +2345,7 @@ MonoBehaviour: 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: @@ -2366,9 +2408,9 @@ RectTransform: 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: 22495498} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2398,6 +2440,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2439,9 +2482,9 @@ RectTransform: 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: 22480558} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2471,6 +2514,7 @@ MonoBehaviour: 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: @@ -2554,9 +2598,9 @@ RectTransform: 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: 22445010} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2586,6 +2630,7 @@ MonoBehaviour: 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: @@ -2671,10 +2716,10 @@ RectTransform: 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: 22498666} m_Father: {fileID: 22429670} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2704,6 +2749,7 @@ MonoBehaviour: 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: @@ -2732,6 +2778,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -2762,6 +2809,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11403010} + m_TargetAssemblyTypeName: m_MethodName: OnFastForward m_Mode: 1 m_Arguments: @@ -2797,6 +2845,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &11438106 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2863,11 +2912,11 @@ RectTransform: 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: 22489492} - {fileID: 22472254} m_Father: {fileID: 22461342} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2897,6 +2946,7 @@ MonoBehaviour: 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: @@ -2925,6 +2975,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -2993,10 +3044,10 @@ RectTransform: 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: 22470088} m_Father: {fileID: 22433532} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3026,6 +3077,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3054,6 +3106,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -3108,6 +3161,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &11430624 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3123,6 +3177,7 @@ MonoBehaviour: button: {fileID: 11438236} label: m_uiText: {fileID: 11499256} + m_textMeshProUGUI: {fileID: 0} setLabelColor: 1 defaultColor: {r: 1, g: 1, b: 1, a: 1} --- !u!114 &3994075428067327857 @@ -3169,11 +3224,11 @@ RectTransform: 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: 22400912} - {fileID: 22424574} m_Father: {fileID: 22418282} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -3203,6 +3258,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.5019608} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3256,6 +3312,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!225 &22510962 CanvasGroup: m_ObjectHideFlags: 0 @@ -3270,7 +3327,7 @@ CanvasGroup: m_IgnoreParentGroups: 0 --- !u!95 &9558232 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3283,10 +3340,13 @@ Animator: m_UpdateMode: 2 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &167038 GameObject: m_ObjectHideFlags: 0 @@ -3314,10 +3374,10 @@ RectTransform: 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: 22454054} m_Father: {fileID: 22413186} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -3360,8 +3420,10 @@ MonoBehaviour: panel: {fileID: 11461418} label: m_uiText: {fileID: 11435794} + m_textMeshProUGUI: {fileID: 0} inputField: m_uiInputField: {fileID: 11483786} + m_textMeshProInputField: {fileID: 0} acceptKey: 13 acceptButton: cancelKey: 27 @@ -3405,10 +3467,10 @@ RectTransform: 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: 22400070} m_Father: {fileID: 22454054} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3438,6 +3500,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.588} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3466,6 +3529,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -3502,7 +3566,10 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 0 m_CharacterLimit: 0 - m_OnEndEdit: + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnDidEndEdit: m_PersistentCalls: m_Calls: [] m_OnValueChanged: @@ -3515,6 +3582,7 @@ MonoBehaviour: m_CaretBlinkRate: 1.7 m_CaretWidth: 1 m_ReadOnly: 0 + m_ShouldActivateOnSelect: 1 --- !u!114 &11452754 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3540,6 +3608,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &114555351785628864 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3588,9 +3657,9 @@ RectTransform: 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: 22490548} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3620,6 +3689,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.196, g: 0.196, b: 0.196, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3666,9 +3736,9 @@ RectTransform: 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: 22489492} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3698,6 +3768,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.49803922, g: 0.49803922, b: 0.49803922, a: 0.49803922} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3742,9 +3813,9 @@ RectTransform: 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: 22429670} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3774,6 +3845,7 @@ MonoBehaviour: 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: @@ -3858,10 +3930,10 @@ RectTransform: 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: 22497964} m_Father: {fileID: 22487244} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3891,6 +3963,7 @@ MonoBehaviour: 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: @@ -3919,6 +3992,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -3949,6 +4023,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11417816} + m_TargetAssemblyTypeName: m_MethodName: OnFastForward m_Mode: 1 m_Arguments: @@ -4022,10 +4097,10 @@ RectTransform: 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: 22481992} m_Father: {fileID: 22400310} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4058,11 +4133,11 @@ RectTransform: 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: 22469686} - {fileID: 22472742} m_Father: {fileID: 22496680} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4097,9 +4172,9 @@ RectTransform: 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: 22472254} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4129,6 +4204,7 @@ MonoBehaviour: 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: @@ -4171,9 +4247,9 @@ RectTransform: 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: 22495498} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -4203,6 +4279,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4246,12 +4323,12 @@ RectTransform: 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: 22414516} - {fileID: 22431530} - {fileID: 22400310} m_Father: {fileID: 22413186} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -4281,6 +4358,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4309,7 +4387,7 @@ CanvasGroup: m_IgnoreParentGroups: 0 --- !u!95 &9508472 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -4322,10 +4400,13 @@ Animator: m_UpdateMode: 2 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &11411294 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4363,6 +4444,7 @@ MonoBehaviour: pcImage: {fileID: 0} pcName: m_uiText: {fileID: 0} + m_textMeshProUGUI: {fileID: 0} usePortraitNativeSize: 0 timerSlider: {fileID: 11484772} buttonAlignment: 0 @@ -4387,6 +4469,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11486648} + m_TargetAssemblyTypeName: m_MethodName: CheckScrollbar m_Mode: 1 m_Arguments: @@ -4450,10 +4533,10 @@ RectTransform: 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: 22498406} m_Father: {fileID: 22431530} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4490,10 +4573,10 @@ RectTransform: 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: 22454240} m_Father: {fileID: 22461342} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4523,6 +4606,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4551,6 +4635,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -4633,9 +4718,9 @@ RectTransform: 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: 22497246} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4665,6 +4750,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.196, g: 0.196, b: 0.196, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4714,9 +4800,9 @@ RectTransform: 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: 22429670} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4746,6 +4832,7 @@ MonoBehaviour: 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: diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Basic/Basic Standard UI Selector Elements.prefab b/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Basic/Basic Standard UI Selector Elements.prefab index 5941b8bb9..44263e7fc 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Basic/Basic Standard UI Selector Elements.prefab +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Basic/Basic Standard UI Selector Elements.prefab @@ -3,13 +3,14 @@ --- !u!1 &126380 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 22456466} - - 222: {fileID: 22269882} - - 114: {fileID: 11450052} + - component: {fileID: 22456466} + - component: {fileID: 22269882} + - component: {fileID: 11450052} m_Layer: 5 m_Name: Main Selector Panel m_TagString: Untagged @@ -17,244 +18,56 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!1 &151316 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 224: {fileID: 22451644} - - 222: {fileID: 22283998} - - 114: {fileID: 11473324} - m_Layer: 5 - m_Name: 'Reticle In Range ' - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &158816 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 224: {fileID: 22416348} - - 222: {fileID: 22224046} - - 114: {fileID: 11432482} - m_Layer: 5 - m_Name: 'Reticle Out of Range ' - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &168102 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 224: {fileID: 22400840} - - 222: {fileID: 22219264} - - 114: {fileID: 11422758} - - 114: {fileID: 11489268} - - 114: {fileID: 11461346} - m_Layer: 5 - m_Name: Selection Text Panel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &168688 -GameObject: +--- !u!224 &22456466 +RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 224: {fileID: 22454582} - - 222: {fileID: 22201382} - - 114: {fileID: 11421968} - - 114: {fileID: 11455538} - m_Layer: 5 - m_Name: Basic Standard UI Selector Elements - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &192068 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 224: {fileID: 22474240} - - 222: {fileID: 22299134} - - 114: {fileID: 11465558} - - 114: {fileID: 11422022} - - 114: {fileID: 11414880} - m_Layer: 5 - m_Name: Use Message Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &192326 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 224: {fileID: 22417012} - - 222: {fileID: 22291288} - - 114: {fileID: 11404786} - - 114: {fileID: 11419322} - - 114: {fileID: 11488978} - m_Layer: 5 - m_Name: Name Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &11404786 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126380} + 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: 22400840} + - {fileID: 22451644} + - {fileID: 22416348} + m_Father: {fileID: 22454582} + 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!222 &22269882 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126380} + m_CullTransparentMesh: 1 +--- !u!114 &11450052 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 192326} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 20 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Selection Name ---- !u!114 &11414880 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 192068} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -900027084, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 1, y: -1} - m_UseGraphicAlpha: 1 ---- !u!114 &11419322 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 192326} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: 0 - m_FlexibleHeight: 0 ---- !u!114 &11421968 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 168688} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126380} m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + 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_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &11422022 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 192068} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: 0 - m_FlexibleHeight: 0 ---- !u!114 &11422758 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 168102} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.5019608} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -263,25 +76,148 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &151316 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 22451644} + - component: {fileID: 22283998} + - component: {fileID: 11473324} + m_Layer: 5 + m_Name: 'Reticle In Range ' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &22451644 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151316} + 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: 22456466} + 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: 0, y: 0} + m_SizeDelta: {x: 32, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &22283998 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151316} + m_CullTransparentMesh: 1 +--- !u!114 &11473324 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151316} + 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.5019608} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4de85c90bbe61ed4bb3d67de9ab26f64, 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!1 &158816 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 22416348} + - component: {fileID: 22224046} + - component: {fileID: 11432482} + m_Layer: 5 + m_Name: 'Reticle Out of Range ' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &22416348 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 158816} + 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: 22456466} + 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: 0, y: 0} + m_SizeDelta: {x: 32, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &22224046 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 158816} + m_CullTransparentMesh: 1 --- !u!114 &11432482 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 158816} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.5019608} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 23dc4f9bfdcb0984995e1a58909e85d2, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -290,25 +226,77 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &11450052 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &168102 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 22400840} + - component: {fileID: 22219264} + - component: {fileID: 11422758} + - component: {fileID: 11489268} + - component: {fileID: 11461346} + m_Layer: 5 + m_Name: Selection Text Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &22400840 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 168102} + 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: 22417012} + - {fileID: 22474240} + m_Father: {fileID: 22456466} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -10} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &22219264 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 168102} + m_CullTransparentMesh: 1 +--- !u!114 &11422758 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 126380} - m_Enabled: 0 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 168102} + m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + 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.392} + m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.5019608} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -317,11 +305,131 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &11489268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 168102} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 16 + m_Right: 16 + m_Top: 8 + m_Bottom: 16 + m_ChildAlignment: 1 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &11461346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 168102} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!1 &168688 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 22454582} + - component: {fileID: 22201382} + - component: {fileID: 11421968} + - component: {fileID: 11455538} + m_Layer: 5 + m_Name: Basic Standard UI Selector Elements + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &22454582 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 168688} + 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: 22456466} + m_Father: {fileID: 0} + 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: -7} + m_SizeDelta: {x: 0, y: 15} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &22201382 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 168688} + m_CullTransparentMesh: 1 +--- !u!114 &11421968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 168688} + m_Enabled: 0 + 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: 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!114 &11455538 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 168688} m_Enabled: 1 m_EditorHideFlags: 0 @@ -331,8 +439,11 @@ MonoBehaviour: mainGraphic: {fileID: 11450052} nameText: m_uiText: {fileID: 11404786} + m_textMeshProUGUI: {fileID: 0} useMessageText: m_uiText: {fileID: 11465558} + m_textMeshProUGUI: {fileID: 0} + useRangeColors: 1 inRangeColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} outOfRangeColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} reticleInRange: {fileID: 11473324} @@ -340,38 +451,73 @@ MonoBehaviour: animationTransitions: showTrigger: Show hideTrigger: Hide ---- !u!114 &11461346 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 168102} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 +--- !u!1 &192068 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 22474240} + - component: {fileID: 22299134} + - component: {fileID: 11465558} + - component: {fileID: 11422022} + - component: {fileID: 11414880} + m_Layer: 5 + m_Name: Use Message Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &22474240 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 192068} + 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: 22400840} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!222 &22299134 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 192068} + m_CullTransparentMesh: 1 --- !u!114 &11465558 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 192068} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 16 @@ -386,249 +532,154 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 0.75 m_Text: Use Message ---- !u!114 &11473324 +--- !u!114 &11422022 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 151316} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 192068} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 4de85c90bbe61ed4bb3d67de9ab26f64, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &11488978 + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: 0 + m_FlexibleHeight: 0 + m_LayoutPriority: 1 +--- !u!114 &11414880 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 192326} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 192068} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -900027084, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} m_Name: m_EditorClassIdentifier: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 ---- !u!114 &11489268 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 168102} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 16 - m_Right: 16 - m_Top: 8 - m_Bottom: 16 - m_ChildAlignment: 1 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 ---- !u!222 &22201382 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 168688} ---- !u!222 &22219264 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 168102} ---- !u!222 &22224046 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 158816} ---- !u!222 &22269882 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 126380} ---- !u!222 &22283998 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 151316} ---- !u!222 &22291288 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 192326} ---- !u!222 &22299134 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 192068} ---- !u!224 &22400840 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 168102} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 22417012} - - {fileID: 22474240} - m_Father: {fileID: 22456466} - m_RootOrder: 0 - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -10} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 1} ---- !u!224 &22416348 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 158816} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: [] - m_Father: {fileID: 22456466} - m_RootOrder: 2 - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 32, y: 32} - m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &192326 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 22417012} + - component: {fileID: 22291288} + - component: {fileID: 11404786} + - component: {fileID: 11419322} + - component: {fileID: 11488978} + m_Layer: 5 + m_Name: Name Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!224 &22417012 RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 192326} 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22400840} - m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!224 &22451644 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 151316} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: [] - m_Father: {fileID: 22456466} - m_RootOrder: 1 - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 32, y: 32} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &22454582 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 168688} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 22456466} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -7} - m_SizeDelta: {x: 0, y: 15} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &22456466 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 126380} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 22400840} - - {fileID: 22451644} - - {fileID: 22416348} - m_Father: {fileID: 22454582} - m_RootOrder: 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!224 &22474240 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 192068} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: [] - m_Father: {fileID: 22400840} - m_RootOrder: 1 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 168688} - m_IsPrefabParent: 1 +--- !u!222 &22291288 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 192326} + m_CullTransparentMesh: 1 +--- !u!114 &11404786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 192326} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + 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: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Selection Name +--- !u!114 &11419322 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 192326} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: 0 + m_FlexibleHeight: 0 + m_LayoutPriority: 1 +--- !u!114 &11488978 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 192326} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Bubble/Bubble Template Standard Bark UI.prefab b/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Bubble/Bubble Template Standard Bark UI.prefab index b6b38d239..f6defa86f 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Bubble/Bubble Template Standard Bark UI.prefab +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Bubble/Bubble Template Standard Bark UI.prefab @@ -30,10 +30,10 @@ RectTransform: 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: 22400914} m_Father: {fileID: 22465722} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -63,6 +63,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -116,6 +117,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &135794 GameObject: m_ObjectHideFlags: 0 @@ -147,10 +149,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.005, y: 0.005, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 22431650} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -174,7 +176,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -200,6 +204,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &11475372 MonoBehaviour: m_ObjectHideFlags: 0 @@ -216,7 +221,7 @@ MonoBehaviour: m_BlockingObjects: 0 m_BlockingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 131071 --- !u!114 &11485334 MonoBehaviour: m_ObjectHideFlags: 0 @@ -246,8 +251,10 @@ MonoBehaviour: canvasGroup: {fileID: 22506366} barkText: m_uiText: {fileID: 11445092} + m_textMeshProUGUI: {fileID: 0} nameText: m_uiText: {fileID: 0} + m_textMeshProUGUI: {fileID: 0} includeName: 0 portraitImage: {fileID: 0} showPortraitImage: 0 @@ -292,10 +299,10 @@ RectTransform: 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: 22451302} m_Father: {fileID: 22431650} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -325,6 +332,7 @@ MonoBehaviour: 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: @@ -364,6 +372,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!225 &22506366 CanvasGroup: m_ObjectHideFlags: 0 @@ -378,7 +387,7 @@ CanvasGroup: m_IgnoreParentGroups: 0 --- !u!95 &9550094 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -391,10 +400,13 @@ Animator: m_UpdateMode: 2 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &144376 GameObject: m_ObjectHideFlags: 0 @@ -423,9 +435,9 @@ RectTransform: 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: 22400914} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -455,6 +467,7 @@ MonoBehaviour: 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: diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Bubble/Bubble Template Standard UI Menu Panel.prefab b/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Bubble/Bubble Template Standard UI Menu Panel.prefab index 1baa05e2d..b94f9b3e0 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Bubble/Bubble Template Standard UI Menu Panel.prefab +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Bubble/Bubble Template Standard UI Menu Panel.prefab @@ -31,10 +31,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -2.1} m_LocalScale: {x: 0.005, y: 0.005, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 22467494} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -58,7 +58,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -84,6 +86,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &11488232 MonoBehaviour: m_ObjectHideFlags: 0 @@ -100,7 +103,7 @@ MonoBehaviour: m_BlockingObjects: 0 m_BlockingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 131071 --- !u!114 &11482146 MonoBehaviour: m_ObjectHideFlags: 0 @@ -152,6 +155,7 @@ MonoBehaviour: pcImage: {fileID: 0} pcName: m_uiText: {fileID: 0} + m_textMeshProUGUI: {fileID: 0} usePortraitNativeSize: 0 timerSlider: {fileID: 0} buttonAlignment: 0 @@ -173,6 +177,7 @@ MonoBehaviour: numpadHotkeys: 0 format: '{0}. {1}' blockInputDuration: 0 + showSelectionWhileInputBlocked: 0 warnOnEmptyResponseText: 0 onContentChanged: m_PersistentCalls: @@ -218,10 +223,10 @@ RectTransform: 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: 22487628} m_Father: {fileID: 22438518} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -251,6 +256,7 @@ MonoBehaviour: 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: @@ -290,6 +296,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &11454554 MonoBehaviour: m_ObjectHideFlags: 0 @@ -304,6 +311,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -348,6 +356,7 @@ MonoBehaviour: button: {fileID: 11454554} label: m_uiText: {fileID: 11447440} + m_textMeshProUGUI: {fileID: 0} setLabelColor: 0 defaultColor: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &121446 @@ -381,10 +390,10 @@ RectTransform: 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: 22492740} m_Father: {fileID: 22460666} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -414,6 +423,7 @@ MonoBehaviour: 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: @@ -453,6 +463,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &11423782 MonoBehaviour: m_ObjectHideFlags: 0 @@ -467,6 +478,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -511,6 +523,7 @@ MonoBehaviour: button: {fileID: 11423782} label: m_uiText: {fileID: 11467338} + m_textMeshProUGUI: {fileID: 0} setLabelColor: 0 defaultColor: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &126130 @@ -541,9 +554,9 @@ RectTransform: 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: 22455090} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -573,6 +586,7 @@ MonoBehaviour: 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: @@ -619,9 +633,9 @@ RectTransform: 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: 22436170} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -651,6 +665,7 @@ MonoBehaviour: 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: @@ -699,14 +714,14 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.000015709022} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 22470800} m_Father: {fileID: 22476094} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 622, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 622, y: -116} m_SizeDelta: {x: 220, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!222 &22230288 @@ -732,6 +747,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -785,6 +801,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &144318 GameObject: m_ObjectHideFlags: 0 @@ -816,10 +833,10 @@ RectTransform: 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: 22454774} m_Father: {fileID: 22412716} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -849,6 +866,7 @@ MonoBehaviour: 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: @@ -888,6 +906,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &11461226 MonoBehaviour: m_ObjectHideFlags: 0 @@ -902,6 +921,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -946,6 +966,7 @@ MonoBehaviour: button: {fileID: 11461226} label: m_uiText: {fileID: 11440652} + m_textMeshProUGUI: {fileID: 0} setLabelColor: 0 defaultColor: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &161710 @@ -978,10 +999,10 @@ RectTransform: 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: 22436170} m_Father: {fileID: 22467494} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1011,6 +1032,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1064,6 +1086,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &167072 GameObject: m_ObjectHideFlags: 0 @@ -1094,14 +1117,14 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.000012467126} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 22455090} m_Father: {fileID: 22476094} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 402, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 402, y: -116} m_SizeDelta: {x: 220, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!222 &22290310 @@ -1127,6 +1150,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1180,6 +1204,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &186164 GameObject: m_ObjectHideFlags: 0 @@ -1208,9 +1233,9 @@ RectTransform: 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: 22470800} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1240,6 +1265,7 @@ MonoBehaviour: 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: @@ -1288,11 +1314,11 @@ RectTransform: 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: 22438518} - {fileID: 22412716} m_Father: {fileID: 22467494} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1322,6 +1348,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1361,6 +1388,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &11423320 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1405,11 +1433,11 @@ RectTransform: 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: 22460666} - {fileID: 22476094} m_Father: {fileID: 22485548} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1439,6 +1467,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1467,7 +1496,7 @@ CanvasGroup: m_IgnoreParentGroups: 0 --- !u!95 &9594818 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1480,7 +1509,10 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Bubble/Bubble Template Standard UI Subtitle Panel.prefab b/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Bubble/Bubble Template Standard UI Subtitle Panel.prefab index e6efcb06a..4c3a70f78 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Bubble/Bubble Template Standard UI Subtitle Panel.prefab +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Templates/Bubble/Bubble Template Standard UI Subtitle Panel.prefab @@ -31,10 +31,10 @@ RectTransform: 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: 22451220} m_Father: {fileID: 22400030} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -64,6 +64,7 @@ MonoBehaviour: 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: @@ -103,6 +104,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!225 &22535258 CanvasGroup: m_ObjectHideFlags: 0 @@ -117,7 +119,7 @@ CanvasGroup: m_IgnoreParentGroups: 0 --- !u!95 &9555220 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -130,10 +132,13 @@ Animator: m_UpdateMode: 2 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &109762 GameObject: m_ObjectHideFlags: 0 @@ -164,10 +169,10 @@ RectTransform: 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: 22450292} m_Father: {fileID: 22487592} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -197,6 +202,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -250,6 +256,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &122694 GameObject: m_ObjectHideFlags: 0 @@ -281,10 +288,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.005, y: 0.005, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 22400030} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -308,7 +315,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -334,6 +343,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &11488888 MonoBehaviour: m_ObjectHideFlags: 0 @@ -350,7 +360,7 @@ MonoBehaviour: m_BlockingObjects: 0 m_BlockingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 131071 --- !u!114 &11451678 MonoBehaviour: m_ObjectHideFlags: 0 @@ -388,8 +398,10 @@ MonoBehaviour: portraitImage: {fileID: 0} portraitName: m_uiText: {fileID: 0} + m_textMeshProUGUI: {fileID: 0} subtitleText: m_uiText: {fileID: 11486436} + m_textMeshProUGUI: {fileID: 0} addSpeakerName: 0 addSpeakerNameFormat: '{0}: {1}' accumulateText: 0 @@ -459,9 +471,9 @@ RectTransform: 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: 22450292} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -491,6 +503,7 @@ MonoBehaviour: 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: diff --git a/Assets/Resources/Excel/CustomerDataTable.xlsx b/Assets/Resources/Excel/CustomerDataTable.xlsx new file mode 100644 index 000000000..7f3d9553c Binary files /dev/null and b/Assets/Resources/Excel/CustomerDataTable.xlsx differ diff --git a/Assets/Resources/Excel/customer_table.xlsx.meta b/Assets/Resources/Excel/CustomerDataTable.xlsx.meta similarity index 74% rename from Assets/Resources/Excel/customer_table.xlsx.meta rename to Assets/Resources/Excel/CustomerDataTable.xlsx.meta index 2d5d873cd..3c13d000e 100644 --- a/Assets/Resources/Excel/customer_table.xlsx.meta +++ b/Assets/Resources/Excel/CustomerDataTable.xlsx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 868f1f5f8663c4fe0b2c271f50f4606d +guid: 3e00572140a6d0448b363823d6a5621b DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Excel/FoodDataTable.xlsx b/Assets/Resources/Excel/FoodDataTable.xlsx new file mode 100644 index 000000000..56295d455 Binary files /dev/null and b/Assets/Resources/Excel/FoodDataTable.xlsx differ diff --git a/Assets/Resources/Excel/FoodDataTable.xlsx.meta b/Assets/Resources/Excel/FoodDataTable.xlsx.meta new file mode 100644 index 000000000..87f84b4ff --- /dev/null +++ b/Assets/Resources/Excel/FoodDataTable.xlsx.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 96ab774d3b269f042ab5bb7ea2e14667 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Excel/ItemDataTable.xlsx b/Assets/Resources/Excel/ItemDataTable.xlsx index 140d01afc..65b28dd28 100644 Binary files a/Assets/Resources/Excel/ItemDataTable.xlsx and b/Assets/Resources/Excel/ItemDataTable.xlsx differ diff --git a/Assets/Resources/Excel/customer_table.xlsx b/Assets/Resources/Excel/customer_table.xlsx deleted file mode 100644 index e2d588d3a..000000000 Binary files a/Assets/Resources/Excel/customer_table.xlsx and /dev/null differ diff --git a/Assets/Resources/JSON/CustomerDataTable.json b/Assets/Resources/JSON/CustomerDataTable.json new file mode 100644 index 000000000..c31bdf7c4 --- /dev/null +++ b/Assets/Resources/JSON/CustomerDataTable.json @@ -0,0 +1,93 @@ +[ + { + "Idx": 10001, + "Name": "이동속도가 평범하고 급한 Ai1", + "MoveSpeed": 3, + "EatingTime": 5, + "WaitTime": 5, + "HurryTime": 5, + "BaseHappyPoint": 3, + "PreferredFood1": 2, + "PreferredFood2": 1, + "PreferredFood3": 0, + "OrderBeverageRate": 50 + }, + { + "Idx": 10002, + "Name": "이동속도가 평범하고 급한 Ai2", + "MoveSpeed": 3, + "EatingTime": 5, + "WaitTime": 5, + "HurryTime": 5, + "BaseHappyPoint": 3, + "PreferredFood1": 1, + "PreferredFood2": 2, + "PreferredFood3": 0, + "OrderBeverageRate": 50 + }, + { + "Idx": 10003, + "Name": "이동속도가 느리고 느긋한 Ai1", + "MoveSpeed": 1, + "EatingTime": 15, + "WaitTime": 15, + "HurryTime": 15, + "BaseHappyPoint": 3, + "PreferredFood1": 1, + "PreferredFood2": 2, + "PreferredFood3": 0, + "OrderBeverageRate": 50 + }, + { + "Idx": 10004, + "Name": "이동속도가 빠르고 평범한 Ai1", + "MoveSpeed": 4, + "EatingTime": 10, + "WaitTime": 10, + "HurryTime": 10, + "BaseHappyPoint": 3, + "PreferredFood1": 1, + "PreferredFood2": 2, + "PreferredFood3": 0, + "OrderBeverageRate": 50 + }, + { + "Idx": 10005, + "Name": "이동속도가 빠르고 평범한 Ai2", + "MoveSpeed": 4, + "EatingTime": 10, + "WaitTime": 10, + "HurryTime": 10, + "BaseHappyPoint": 3, + "PreferredFood1": 2, + "PreferredFood2": 1, + "PreferredFood3": 0, + "OrderBeverageRate": 50 + }, + { + "Idx": 10006, + "Name": "이동속도가 빠르고 느긋한 Ai1", + "MoveSpeed": 4, + "EatingTime": 10, + "WaitTime": 15, + "HurryTime": 15, + "BaseHappyPoint": 3, + "PreferredFood1": 1, + "PreferredFood2": 2, + "PreferredFood3": 0, + "OrderBeverageRate": 50 + }, + { + "Idx": 10007, + "Name": "이동속도가 빠르고 느긋한 Ai2", + "MoveSpeed": 4, + "EatingTime": 10, + "WaitTime": 15, + "HurryTime": 15, + "BaseHappyPoint": 3, + "PreferredFood1": 2, + "PreferredFood2": 1, + "PreferredFood3": 0, + "OrderBeverageRate": 50 + } +] \ No newline at end of file diff --git a/Assets/Resources/JSON/customer_table.json.meta b/Assets/Resources/JSON/CustomerDataTable.json.meta similarity index 75% rename from Assets/Resources/JSON/customer_table.json.meta rename to Assets/Resources/JSON/CustomerDataTable.json.meta index 80a15e359..3e6c5e0f8 100644 --- a/Assets/Resources/JSON/customer_table.json.meta +++ b/Assets/Resources/JSON/CustomerDataTable.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e306e1af477c947e2b759b1d56078e0f +guid: 109dae7e78913e04bbfdb7eeacc20658 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/Resources/JSON/FoodDataTable.json b/Assets/Resources/JSON/FoodDataTable.json new file mode 100644 index 000000000..74c15abd9 --- /dev/null +++ b/Assets/Resources/JSON/FoodDataTable.json @@ -0,0 +1,110 @@ +[ + { + "Idx": 30001, + "Name": "슬라임 푸딩", + "Type": 4, + "Taste": 4, + "CookTime": 20, + "Plate": 10, + "IngredientIdx1": 10108, + "IngredientQuantity1": 1, + "IngredientIdx2": 10706, + "IngredientQuantity2": 1, + "IngredientIdx3": 0, + "IngredientQuantity3": 0, + "IngredientIdx4": 0, + "IngredientQuantity4": 0, + "IngredientIdx5": 0, + "IngredientQuantity5": 0 + }, + { + "Idx": 30002, + "Name": "얼음도치 팥빙수", + "Type": 4, + "Taste": 4, + "CookTime": 20, + "Plate": 10, + "IngredientIdx1": 10109, + "IngredientQuantity1": 1, + "IngredientIdx2": 10706, + "IngredientQuantity2": 1, + "IngredientIdx3": 0, + "IngredientQuantity3": 0, + "IngredientIdx4": 0, + "IngredientQuantity4": 0, + "IngredientIdx5": 0, + "IngredientQuantity5": 0 + }, + { + "Idx": 30003, + "Name": "코뿔소 뿔 튀김", + "Type": 2, + "Taste": 4, + "CookTime": 20, + "Plate": 10, + "IngredientIdx1": 10106, + "IngredientQuantity1": 1, + "IngredientIdx2": 10506, + "IngredientQuantity2": 1, + "IngredientIdx3": 10704, + "IngredientQuantity3": 1, + "IngredientIdx4": 0, + "IngredientQuantity4": 0, + "IngredientIdx5": 0, + "IngredientQuantity5": 0 + }, + { + "Idx": 30004, + "Name": "코뿔소 뒷다리 고기", + "Type": 3, + "Taste": 1, + "CookTime": 40, + "Plate": 10, + "IngredientIdx1": 10107, + "IngredientQuantity1": 1, + "IngredientIdx2": 10507, + "IngredientQuantity2": 1, + "IngredientIdx3": 10701, + "IngredientQuantity3": 1, + "IngredientIdx4": 0, + "IngredientQuantity4": 0, + "IngredientIdx5": 0, + "IngredientQuantity5": 0 + }, + { + "Idx": 30005, + "Name": "백상어 통구이", + "Type": 1, + "Taste": 1, + "CookTime": 20, + "Plate": 10, + "IngredientIdx1": 10201, + "IngredientQuantity1": 1, + "IngredientIdx2": 10404, + "IngredientQuantity2": 1, + "IngredientIdx3": 10508, + "IngredientQuantity3": 1, + "IngredientIdx4": 10704, + "IngredientQuantity4": 1, + "IngredientIdx5": 0, + "IngredientQuantity5": 0 + }, + { + "Idx": 30006, + "Name": "버터 조개 구이", + "Type": 3, + "Taste": 4, + "CookTime": 25, + "Plate": 10, + "IngredientIdx1": 10603, + "IngredientQuantity1": 1, + "IngredientIdx2": 10503, + "IngredientQuantity2": 1, + "IngredientIdx3": 10705, + "IngredientQuantity3": 1, + "IngredientIdx4": 0, + "IngredientQuantity4": 0, + "IngredientIdx5": 0, + "IngredientQuantity5": 0 + } +] \ No newline at end of file diff --git a/Assets/Resources/JSON/FoodDataTable.json.meta b/Assets/Resources/JSON/FoodDataTable.json.meta new file mode 100644 index 000000000..846f9d993 --- /dev/null +++ b/Assets/Resources/JSON/FoodDataTable.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d5bd0ffef2bdb424d8c17cfc996e1795 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/JSON/ItemDataTable.json b/Assets/Resources/JSON/ItemDataTable.json index 95b3e32d9..bc4b5ba7c 100644 --- a/Assets/Resources/JSON/ItemDataTable.json +++ b/Assets/Resources/JSON/ItemDataTable.json @@ -62,6 +62,24 @@ "Weight": 100, "Desciption": "" }, + { + "Idx": 10108, + "Name": "슬라임 찌거기", + "Category": 1, + "Type": 1, + "Price": 100, + "Weight": 100, + "Desciption": "" + }, + { + "Idx": 10109, + "Name": "얼음 가시", + "Category": 1, + "Type": 1, + "Price": 100, + "Weight": 100, + "Desciption": "" + }, { "Idx": 10201, "Name": "백상어", @@ -369,12 +387,57 @@ "Desciption": "" }, { - "Idx": 30201, - "Name": "코코넛게살스튜", + "Idx": 30001, + "Name": "슬라임 푸딩", "Category": 3, - "Type": 2, - "Price": 0, - "Weight": 0, + "Type": 0, + "Price": 500, + "Weight": 100, + "Desciption": "" + }, + { + "Idx": 30002, + "Name": "얼음도치 팥빙수", + "Category": 3, + "Type": 0, + "Price": 500, + "Weight": 100, + "Desciption": "" + }, + { + "Idx": 30003, + "Name": "코뿔소 뿔 튀김", + "Category": 3, + "Type": 0, + "Price": 150, + "Weight": 100, + "Desciption": "" + }, + { + "Idx": 30004, + "Name": "코뿔소 뒷다리 고기", + "Category": 3, + "Type": 0, + "Price": 500, + "Weight": 100, + "Desciption": "" + }, + { + "Idx": 30005, + "Name": "백상어 통구이", + "Category": 3, + "Type": 0, + "Price": 150, + "Weight": 100, + "Desciption": "" + }, + { + "Idx": 30006, + "Name": "버터 조개 구이", + "Category": 3, + "Type": 0, + "Price": 140, + "Weight": 100, "Desciption": "" }, { diff --git a/Assets/Resources/JSON/customer_table.json b/Assets/Resources/JSON/customer_table.json deleted file mode 100644 index dcf9ddb4e..000000000 --- a/Assets/Resources/JSON/customer_table.json +++ /dev/null @@ -1,172 +0,0 @@ -[ - { - "idx": 10001, - "name": "wildman1", - "speed": 3, - "hurry": 3, - "wait": 3, - "base_happy_point": 30, - "taste_1": 2, - "taste_2": 1, - "taste_3": 0, - "picky_1": 11, - "picky_2": 0, - "picky_3": 0, - "bully": 0, - "tip": 11100, - "dialogue": 101 - }, - { - "idx": 10002, - "name": "wildman2", - "speed": 3, - "hurry": 3, - "wait": 3, - "base_happy_point": 30, - "taste_1": 2, - "taste_2": 1, - "taste_3": 0, - "picky_1": 11, - "picky_2": 0, - "picky_3": 0, - "bully": 0, - "tip": 22200, - "dialogue": 101 - }, - { - "idx": 10003, - "name": "viking1", - "speed": 3, - "hurry": 3, - "wait": 3, - "base_happy_point": 30, - "taste_1": 2, - "taste_2": 1, - "taste_3": 0, - "picky_1": 31, - "picky_2": 0, - "picky_3": 0, - "bully": 1, - "tip": 22200, - "dialogue": 102 - }, - { - "idx": 10004, - "name": "viking2", - "speed": 3, - "hurry": 3, - "wait": 3, - "base_happy_point": 30, - "taste_1": 2, - "taste_2": 1, - "taste_3": 0, - "picky_1": 31, - "picky_2": 0, - "picky_3": 0, - "bully": 0, - "tip": 32200, - "dialogue": 102 - }, - { - "idx": 10005, - "name": "pirate1", - "speed": 3, - "hurry": 3, - "wait": 3, - "base_happy_point": 30, - "taste_1": 1, - "taste_2": 2, - "taste_3": 0, - "picky_1": 41, - "picky_2": 0, - "picky_3": 0, - "bully": 0, - "tip": 33300, - "dialogue": 103 - }, - { - "idx": 10006, - "name": "oldman1", - "speed": 1, - "hurry": 1, - "wait": 1, - "base_happy_point": 30, - "taste_1": 1, - "taste_2": 2, - "taste_3": 0, - "picky_1": 41, - "picky_2": 0, - "picky_3": 0, - "bully": 1, - "tip": 44200, - "dialogue": 104 - }, - { - "idx": 10007, - "name": "soldier1", - "speed": 2, - "hurry": 2, - "wait": 2, - "base_happy_point": 30, - "taste_1": 1, - "taste_2": 2, - "taste_3": 0, - "picky_1": 41, - "picky_2": 0, - "picky_3": 0, - "bully": 0, - "tip": 65432, - "dialogue": 105 - }, - { - "idx": 10008, - "name": "soldier2", - "speed": 2, - "hurry": 2, - "wait": 2, - "base_happy_point": 20, - "taste_1": 1, - "taste_2": 2, - "taste_3": 0, - "picky_1": 21, - "picky_2": 0, - "picky_3": 0, - "bully": 0, - "tip": 105400, - "dialogue": 106 - }, - { - "idx": 10009, - "name": "chinaman1", - "speed": 2, - "hurry": 2, - "wait": 1, - "base_happy_point": 20, - "taste_1": 1, - "taste_2": 2, - "taste_3": 0, - "picky_1": 21, - "picky_2": 0, - "picky_3": 0, - "bully": 0, - "tip": 1510500, - "dialogue": 107 - }, - { - "idx": 10010, - "name": "knight1", - "speed": 2, - "hurry": 2, - "wait": 1, - "base_happy_point": 20, - "taste_1": 1, - "taste_2": 2, - "taste_3": 0, - "picky_1": 21, - "picky_2": 0, - "picky_3": 0, - "bully": 1, - "tip": 20201000, - "dialogue": 108 - } -] \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 30988e3ae..3f90c9e23 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -747,7 +747,7 @@ PlayerSettings: webGLCloseOnQuit: 0 webWasm2023: 0 scriptingDefineSymbols: - Android: DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 + Android: DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;USE_NEW_INPUT;USE_CINEMACHINE EmbeddedLinux: DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 GameCoreScarlett: DOTWEEN GameCoreXboxOne: DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 @@ -756,10 +756,10 @@ PlayerSettings: PS4: DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 PS5: DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 QNX: DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 - Standalone: COZY_WEATHER;COZY_3_AND_UP;COZY_URP;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;TMP_PRESENT + Standalone: COZY_WEATHER;COZY_3_AND_UP;COZY_URP;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;TMP_PRESENT;USE_NEW_INPUT;USE_CINEMACHINE VisionOS: DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 WebGL: DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 - Windows Store Apps: DOTWEEN;COZY_WEATHER;COZY_3_AND_UP;COZY_URP;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3 + Windows Store Apps: DOTWEEN;COZY_WEATHER;COZY_3_AND_UP;COZY_URP;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;USE_NEW_INPUT;USE_CINEMACHINE XboxOne: DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 iPhone: DOTWEEN tvOS: DOTWEEN;UNITY_POST_PROCESSING_STACK_V2