From 71ca4cd8bdc936d96c4542dda370b98e1885776a Mon Sep 17 00:00:00 2001 From: Brian Gunn Date: Tue, 12 Jan 2021 11:27:53 -0800 Subject: [PATCH 1/2] Add terrain alignment to tortoise. Adjust patrol points --- .vsconfig | 6 +++ .../XR/GaiaXRController.unitypackage.meta | 7 --- .../Aura 2.unitypackage.meta | 7 --- .../Enviro.unitypackage.meta | 7 --- Assets/Scenes/PrincessLand.unity | 49 ++++++++++--------- Assets/TortoiseController.cs | 26 +++++++--- 6 files changed, 50 insertions(+), 52 deletions(-) create mode 100644 .vsconfig delete mode 100644 Assets/Procedural Worlds/Gaia/Asset Samples/XR/GaiaXRController.unitypackage.meta delete mode 100644 Assets/Procedural Worlds/Gaia/Shaders/Compatibility Packs/Aura 2.unitypackage.meta delete mode 100644 Assets/Procedural Worlds/Gaia/Shaders/Compatibility Packs/Enviro.unitypackage.meta diff --git a/.vsconfig b/.vsconfig new file mode 100644 index 0000000..aade28f --- /dev/null +++ b/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} diff --git a/Assets/Procedural Worlds/Gaia/Asset Samples/XR/GaiaXRController.unitypackage.meta b/Assets/Procedural Worlds/Gaia/Asset Samples/XR/GaiaXRController.unitypackage.meta deleted file mode 100644 index 2b20cfc..0000000 --- a/Assets/Procedural Worlds/Gaia/Asset Samples/XR/GaiaXRController.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c814d2df27a2eb14d9f6198b08046609 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Procedural Worlds/Gaia/Shaders/Compatibility Packs/Aura 2.unitypackage.meta b/Assets/Procedural Worlds/Gaia/Shaders/Compatibility Packs/Aura 2.unitypackage.meta deleted file mode 100644 index e5de7d1..0000000 --- a/Assets/Procedural Worlds/Gaia/Shaders/Compatibility Packs/Aura 2.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c1a880a7693de5647aa7ad099e908b3a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Procedural Worlds/Gaia/Shaders/Compatibility Packs/Enviro.unitypackage.meta b/Assets/Procedural Worlds/Gaia/Shaders/Compatibility Packs/Enviro.unitypackage.meta deleted file mode 100644 index 9aeede3..0000000 --- a/Assets/Procedural Worlds/Gaia/Shaders/Compatibility Packs/Enviro.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8f68dd1e5500b174190f64e4013d4916 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/PrincessLand.unity b/Assets/Scenes/PrincessLand.unity index 19db20d..056e17e 100644 --- a/Assets/Scenes/PrincessLand.unity +++ b/Assets/Scenes/PrincessLand.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.46205088, g: 0.16661629, b: 0.08875446, a: 1} + m_IndirectSpecularColor: {r: 0.462051, g: 0.16661629, b: 0.08875446, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -594,7 +594,7 @@ PrefabInstance: - target: {fileID: 3419380671730723436, guid: 2405ec89026ce24488bdf9b73ba73229, type: 3} propertyPath: m_RootOrder - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 3419380671730723436, guid: 2405ec89026ce24488bdf9b73ba73229, type: 3} @@ -1996,7 +1996,7 @@ Transform: m_Children: - {fileID: 1235649820} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &160123520 PrefabInstance: @@ -2121,7 +2121,7 @@ PrefabInstance: - target: {fileID: 2535473794561774150, guid: 628e2a0410032204785de27e4a6cbb3c, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 2535473794561774150, guid: 628e2a0410032204785de27e4a6cbb3c, type: 3} @@ -4597,7 +4597,7 @@ PrefabInstance: - target: {fileID: 6367628354273301364, guid: 2a06588b2a6965e4bb22878e344fa32e, type: 3} propertyPath: m_RootOrder - value: 12 + value: 13 objectReference: {fileID: 0} - target: {fileID: 6367628354273301364, guid: 2a06588b2a6965e4bb22878e344fa32e, type: 3} @@ -5067,7 +5067,7 @@ PrefabInstance: - target: {fileID: 6565259026102315539, guid: 930395c10b17fcc469ce3f738d10fbd5, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6565259026102315539, guid: 930395c10b17fcc469ce3f738d10fbd5, type: 3} @@ -5336,7 +5336,7 @@ Transform: - {fileID: 1811955221} - {fileID: 2067988149} m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &264104762 PrefabInstance: @@ -6143,7 +6143,7 @@ Transform: m_Children: - {fileID: 1705947251} m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &298121435 PrefabInstance: @@ -10243,7 +10243,7 @@ PrefabInstance: - target: {fileID: 6845963354267829052, guid: 796f4ee7253909f498dff415ec2534e8, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 6845963354267829052, guid: 796f4ee7253909f498dff415ec2534e8, type: 3} @@ -12646,7 +12646,7 @@ Transform: m_LocalScale: {x: 10, y: 10, z: 10} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &604397324 PrefabInstance: @@ -16376,7 +16376,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 779035077} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -87.1, y: -0.83, z: 43.4} + m_LocalPosition: {x: -55.7, y: -0.83, z: 52.3} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1705947251} @@ -17055,7 +17055,7 @@ PrefabInstance: - target: {fileID: 3301982758317484751, guid: 3be228291c2777f4bb158a8f309acfcf, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 3301982758317484751, guid: 3be228291c2777f4bb158a8f309acfcf, type: 3} @@ -23840,7 +23840,7 @@ Transform: - {fileID: 499475312} - {fileID: 411303041} m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &965859544 GameObject: @@ -25117,7 +25117,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!136 &1007957010 CapsuleCollider: @@ -27495,7 +27495,7 @@ Transform: m_Children: - {fileID: 1454683303} m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1050841375 PrefabInstance: @@ -28562,7 +28562,7 @@ PrefabInstance: - target: {fileID: 1848836457607822493, guid: 810faf30e433cb74fbecc70347f1bfb4, type: 3} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 1848836457607822493, guid: 810faf30e433cb74fbecc70347f1bfb4, type: 3} @@ -40413,6 +40413,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c847780c843a61a40ae54c515ba77b1b, type: 3} m_Name: m_EditorClassIdentifier: + terainMask: + serializedVersion: 2 + m_Bits: 1 --- !u!114 &1238994334 MonoBehaviour: m_ObjectHideFlags: 0 @@ -59615,7 +59618,7 @@ PrefabInstance: - target: {fileID: 7763361116735412208, guid: 4732a9066c81e2445bf39d35c978aaf3, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7763361116735412208, guid: 4732a9066c81e2445bf39d35c978aaf3, type: 3} @@ -60021,7 +60024,7 @@ PrefabInstance: - target: {fileID: 4759011978276858401, guid: 00cf35c5d8315444cacbb611b11b2967, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 4759011978276858401, guid: 00cf35c5d8315444cacbb611b11b2967, type: 3} @@ -62300,7 +62303,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1705947250} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 286, y: 26, z: 227} + m_LocalPosition: {x: 272.44, y: 26, z: 220.99} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 115099253} @@ -62444,7 +62447,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: ce372616532d17b49beb67d280603118, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ce372616532d17b49beb67d280603118, type: 3} @@ -64063,7 +64066,7 @@ PrefabInstance: - target: {fileID: 6595420649996950820, guid: abfdab393729e9c4590e4d8100295a52, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6595420649996950820, guid: abfdab393729e9c4590e4d8100295a52, type: 3} @@ -75516,7 +75519,7 @@ PrefabInstance: - target: {fileID: 3301982758317484751, guid: 3be228291c2777f4bb158a8f309acfcf, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 3301982758317484751, guid: 3be228291c2777f4bb158a8f309acfcf, type: 3} @@ -80124,7 +80127,7 @@ Material: - _WaveSteepness: 0.1 m_Colors: - _AmbientColor: {r: 0.5840786, g: 0.49693304, b: 0.60382754, a: 1} - - _EdgeWaterColor: {r: 0.099970944, g: 0.099970944, b: 0.1999712, a: 1} + - _EdgeWaterColor: {r: 0.09995217, g: 0.09995217, b: 0.19995251, a: 1} - _PW_MainLightColor: {r: 1, g: 0.4268818, b: 0.119498275, a: 1} - _PW_MainLightDir: {r: 0.8365165, g: 0.2588191, b: 0.48296306, a: 0} - _PW_MainLightSpecular: {r: 0.3137255, g: 0.27189302, b: 0.22345544, a: 1} diff --git a/Assets/TortoiseController.cs b/Assets/TortoiseController.cs index b103d98..424e2a0 100644 --- a/Assets/TortoiseController.cs +++ b/Assets/TortoiseController.cs @@ -1,18 +1,28 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; public class TortoiseController : MonoBehaviour { - // Start is called before the first frame update - void Start() + RaycastHit hit; + Vector3 theRay; + + public LayerMask terainMask; + + void FixedUpdate() { - + Align(); } - // Update is called once per frame - void Update() + private void Align() { - + theRay = -transform.up; + + if (Physics.Raycast(new Vector3(transform.position.x, transform.position.y, transform.position.z), + theRay, out hit, 20, terainMask)) + { + + Quaternion targetRotation = Quaternion.FromToRotation(transform.up, hit.normal) * transform.parent.rotation; + + transform.rotation = Quaternion.Lerp(transform.rotation, targetRotation, Time.deltaTime / 0.15f); + } } } From accdfe5019637736f400455b9b2bab585a20245d Mon Sep 17 00:00:00 2001 From: Brian Gunn Date: Tue, 12 Jan 2021 12:57:15 -0800 Subject: [PATCH 2/2] Switch time of day to morning. Make chick default to eating animation. --- .../Farm/Chick/Animations/AC_Chick.controller | 64 +++++++++---------- .../Animations/AC_Tortoise.controller | 60 ----------------- Assets/Scenes/PrincessLand.unity | 61 +++++++++--------- 3 files changed, 63 insertions(+), 122 deletions(-) diff --git a/Assets/Quirky Series/Farm/Chick/Animations/AC_Chick.controller b/Assets/Quirky Series/Farm/Chick/Animations/AC_Chick.controller index a833c55..bea3049 100644 --- a/Assets/Quirky Series/Farm/Chick/Animations/AC_Chick.controller +++ b/Assets/Quirky Series/Farm/Chick/Animations/AC_Chick.controller @@ -24,7 +24,7 @@ AnimatorController: m_Controller: {fileID: 9100000} --- !u!1101 &1101069232905013964 AnimatorStateTransition: - m_ObjectHideFlags: 3 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -112,7 +112,7 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1101 &1101331582686254366 AnimatorStateTransition: - m_ObjectHideFlags: 3 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -178,7 +178,7 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1101 &1101638671196154564 AnimatorStateTransition: - m_ObjectHideFlags: 3 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -200,7 +200,7 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1101 &1101813117540230672 AnimatorStateTransition: - m_ObjectHideFlags: 3 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -244,7 +244,7 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1102 &1102055623545321962 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -270,7 +270,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102124752476982478 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -296,7 +296,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102134918304361458 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -322,8 +322,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102173684955980844 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -349,7 +349,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102174821316947756 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -375,7 +375,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102178892989154172 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -401,8 +401,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102193044716519752 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -427,7 +427,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102264864984767498 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -454,7 +454,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102326540909826346 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -480,7 +480,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102549092563641162 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -506,7 +506,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102584978266722826 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -532,8 +532,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102642966608558264 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -558,7 +558,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102730688722344022 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -585,7 +585,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102786437799229866 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -611,7 +611,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102811079635423126 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -637,8 +637,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102831295721099748 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -664,7 +664,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102844117285483066 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -690,8 +690,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102921364481200396 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -717,7 +717,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102937364975409194 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -744,7 +744,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102959533095229884 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -770,7 +770,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102984611642155622 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -796,7 +796,7 @@ AnimatorState: m_TimeParameter: --- !u!1107 &1107902928453360364 AnimatorStateMachine: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -863,4 +863,4 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1102811079635423126} + m_DefaultState: {fileID: 1102134918304361458} diff --git a/Assets/Quirky Series/Pets/Tortoise/Animations/AC_Tortoise.controller b/Assets/Quirky Series/Pets/Tortoise/Animations/AC_Tortoise.controller index 9f4c12e..aa32ba7 100644 --- a/Assets/Quirky Series/Pets/Tortoise/Animations/AC_Tortoise.controller +++ b/Assets/Quirky Series/Pets/Tortoise/Animations/AC_Tortoise.controller @@ -53,18 +53,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} - - serializedVersion: 5 - m_Name: Movement Layer - m_StateMachine: {fileID: 6003735159942519168} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 1 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 1 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} --- !u!1101 &1101069232905013964 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -908,51 +896,3 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 1102124752476982478} ---- !u!1102 &4039161599608441190 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: TurtlePatrolling - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: f3f32a13e65031e459b36f3022517e50, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &6003735159942519168 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Movement Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 4039161599608441190} - m_Position: {x: 270, y: 110, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 4039161599608441190} diff --git a/Assets/Scenes/PrincessLand.unity b/Assets/Scenes/PrincessLand.unity index 056e17e..61722e2 100644 --- a/Assets/Scenes/PrincessLand.unity +++ b/Assets/Scenes/PrincessLand.unity @@ -15,14 +15,14 @@ RenderSettings: m_ObjectHideFlags: 0 serializedVersion: 9 m_Fog: 1 - m_FogColor: {r: 0.736, g: 0.5088, b: 0.368, a: 1} + m_FogColor: {r: 0.84400004, g: 0.78428304, b: 0.7882642, a: 1} m_FogMode: 3 m_FogDensity: 0.0008 m_LinearFogStart: 5 - m_LinearFogEnd: 1300 - m_AmbientSkyColor: {r: 0.5840786, g: 0.49693304, b: 0.60382754, a: 1} - m_AmbientEquatorColor: {r: 0.6514058, g: 0.5149178, b: 0.41788515, a: 1} - m_AmbientGroundColor: {r: 0.33245158, g: 0.22322798, b: 0.17144115, a: 1} + m_LinearFogEnd: 1100 + m_AmbientSkyColor: {r: 0.851, g: 0.86962503, b: 1, a: 1} + m_AmbientEquatorColor: {r: 0.8352941, g: 0.5805294, b: 0.58931446, a: 1} + m_AmbientGroundColor: {r: 0.255, g: 0.24727273, b: 0.24727273, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 1 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.462051, g: 0.16661629, b: 0.08875446, a: 1} + m_IndirectSpecularColor: {r: 0.52016157, g: 0.4610685, b: 0.44055277, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -4607,7 +4607,7 @@ PrefabInstance: - target: {fileID: 6367628354273301364, guid: 2a06588b2a6965e4bb22878e344fa32e, type: 3} propertyPath: m_LocalPosition.y - value: 35.815254 + value: 36.162 objectReference: {fileID: 0} - target: {fileID: 6367628354273301364, guid: 2a06588b2a6965e4bb22878e344fa32e, type: 3} @@ -11398,7 +11398,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 2 stopNaNPropagation: 1 - finalBlitToCameraTarget: 0 + finalBlitToCameraTarget: 1 antialiasingMode: 3 temporalAntialiasing: jitterSpread: 0.55 @@ -12932,7 +12932,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 3a0dd2bfddf55f747bcfc7925c2640c4, type: 3} + m_audioClip: {fileID: 8300000, guid: 2c20a7793b8880a4787fd7a24036663f, type: 3} m_PlayOnAwake: 1 m_Volume: 0.55 m_Pitch: 1 @@ -14795,7 +14795,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} m_Name: m_EditorClassIdentifier: - sharedProfile: {fileID: 11400000, guid: f00c6215d794e3b4fa7c9224ffe53339, type: 2} + sharedProfile: {fileID: 11400000, guid: 19774c7b570298d45a79f1009fae78d7, type: 2} isGlobal: 1 blendDistance: 0 weight: 1 @@ -14954,8 +14954,8 @@ Light: serializedVersion: 10 m_Type: 1 m_Shape: 0 - m_Color: {r: 1, g: 0.4268818, b: 0.119498275, a: 1} - m_Intensity: 2.5 + m_Color: {r: 1, g: 0.72329617, b: 0.5128685, a: 1} + m_Intensity: 2 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.802082 @@ -14964,7 +14964,7 @@ Light: m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 - m_Strength: 1 + m_Strength: 0.95 m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 @@ -15012,7 +15012,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} - m_LocalRotation: {x: -0.065263115, y: 0.8586165, z: -0.11303902, w: -0.4957225} + m_LocalRotation: {x: -0.16849019, y: 0.23824653, z: -0.042009316, w: -0.9555548} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -65613,16 +65613,16 @@ MonoBehaviour: m_season: 0 m_windDirection: 0 m_lodBias: 2 - m_kelvinTexture: {fileID: 0} + m_kelvinTexture: {fileID: 2800000, guid: 4bd5e15076bc61649a16cce53a3ca4f7, type: 3} m_lightSystemMode: 0 m_thirdPartyLightObject: {fileID: 0} DefaultLightingSet: 1 m_lightingMultiSceneLightingSupport: 1 m_lightingUpdateInRealtime: 1 - m_selectedLightingProfileValuesIndex: 2 + m_selectedLightingProfileValuesIndex: 0 m_profileType: 1 m_renamingProfile: 0 - m_lightingEditSettings: 1 + m_lightingEditSettings: 0 m_lightingBakeMode: 1 m_lightmappingMode: 2 m_masterSkyboxMaterial: {fileID: 2100000, guid: 11f9a890b6e86384aaf4d69fbe79a6c1, @@ -65633,7 +65633,8 @@ MonoBehaviour: m_userCustomProfile: 0 m_profileRename: m_postProcessExposure: 1.25 - m_postProcessProfileBuiltIn: {fileID: 0} + m_postProcessProfileBuiltIn: {fileID: 11400000, guid: 19774c7b570298d45a79f1009fae78d7, + type: 2} m_postProcessingProfileGUIDBuiltIn: 19774c7b570298d45a79f1009fae78d7 m_directToCamera: 1 m_postProcessingProfileGUIDURP: f730ec2a2de88db4b80f44d5c13539b0 @@ -65645,7 +65646,7 @@ MonoBehaviour: m_kelvinValue: 4583 m_sunRotation: 332 m_pwSkySunRotation: 0 - m_sunPitch: 20.00001 + m_sunPitch: 20.000013 m_sunColor: {r: 1, g: 0.72329617, b: 0.5128685, a: 1} m_sunIntensity: 2 m_lWSunColor: {r: 1, g: 0.78823537, b: 0.5294118, a: 0} @@ -67818,7 +67819,7 @@ MonoBehaviour: m_hDMicroShadows: 1 m_hDMicroShadowOpacity: 1 m_skyboxHDRI: {fileID: 8900000, guid: 60995c357a320a4488263256076c8893, type: 3} - m_skyboxTint: {r: 0.6, g: 0.40540522, b: 0.3243242, a: 1} + m_skyboxTint: {r: 0.6, g: 0.4054052, b: 0.32432416, a: 1} m_skyboxExposure: 1.1 m_skyboxRotationOffset: 0 m_sunSize: 0.04 @@ -73460,14 +73461,14 @@ MonoBehaviour: m_cameraSensorSize: {x: 70.41, y: 52.63} m_cameraFocalLength: 50 m_globalReflectionProbe: 0 - m_isUserProfileSet: 1 + m_isUserProfileSet: 0 m_enableAutoDOF: 1 m_dofLayerDetection: serializedVersion: 2 m_Bits: 3585 m_depthOfFieldFocusDistance: 50 m_reflectionProbeData: - reflectionProbeMode: 1 + reflectionProbeMode: 0 reflectionProbeRefresh: 0 reflectionCubemapCompression: 2 reflectionProbeTimeSlicingMode: 1 @@ -79828,10 +79829,10 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _Exposure: 1.1 - - _Rotation: -240 + - _Exposure: 0.95 + - _Rotation: -332 m_Colors: - - _Tint: {r: 0.6, g: 0.40540522, b: 0.3243242, a: 1} + - _Tint: {r: 0.7333333, g: 0.7510563, b: 0.7921569, a: 1} m_BuildTextureStacks: [] --- !u!1 &2128864641 GameObject: @@ -80110,7 +80111,7 @@ Material: - _NormalMoveScale: 0.0003 - _NormalTile: 512 - _PW_DstBlend: 0 - - _PW_MainLightIntensity: 2.5 + - _PW_MainLightIntensity: 2 - _PW_SSS: 1 - _PW_SSSDistortion: 0.34 - _PW_SSSPower: 1 @@ -80126,10 +80127,10 @@ Material: - _WaveSpeed: 12.5 - _WaveSteepness: 0.1 m_Colors: - - _AmbientColor: {r: 0.5840786, g: 0.49693304, b: 0.60382754, a: 1} - - _EdgeWaterColor: {r: 0.09995217, g: 0.09995217, b: 0.19995251, a: 1} - - _PW_MainLightColor: {r: 1, g: 0.4268818, b: 0.119498275, a: 1} - - _PW_MainLightDir: {r: 0.8365165, g: 0.2588191, b: 0.48296306, a: 0} + - _AmbientColor: {r: 0.851, g: 0.86962503, b: 1, a: 1} + - _EdgeWaterColor: {r: 0.09994819, g: 0.09994819, b: 0.19994855, a: 1} + - _PW_MainLightColor: {r: 1, g: 0.72329617, b: 0.5128685, a: 1} + - _PW_MainLightDir: {r: 0.44115892, g: 0.34202036, b: -0.8296993, a: 0} - _PW_MainLightSpecular: {r: 0.3137255, g: 0.27189302, b: 0.22345544, a: 1} - _PW_SSSTint: {r: 1, g: 1, b: 1, a: 1} - _ReflectionColor: {r: 0.1, g: 0.12, b: 0.17, a: 1}