diff --git a/Assets/Dialogue/TestDialogueBase.asset b/Assets/Dialogue/TestDialogueBase.asset index d2cb85987..23f82dd65 100644 --- a/Assets/Dialogue/TestDialogueBase.asset +++ b/Assets/Dialogue/TestDialogueBase.asset @@ -10669,12 +10669,6 @@ MonoBehaviour: destinationDialogueID: 3 isConnector: 0 priority: 2 - - originConversationID: 20 - originDialogueID: 1 - destinationConversationID: 20 - destinationDialogueID: 8 - isConnector: 0 - priority: 2 - originConversationID: 20 originDialogueID: 1 destinationConversationID: 20 @@ -10699,6 +10693,12 @@ MonoBehaviour: destinationDialogueID: 12 isConnector: 0 priority: 2 + - originConversationID: 20 + originDialogueID: 1 + destinationConversationID: 20 + destinationDialogueID: 8 + isConnector: 0 + priority: 2 conditionsString: userScript: onExecute: diff --git a/Assets/Prefabs/2= HELPERS Coliders Video Managers.prefab b/Assets/Prefabs/2= HELPERS Coliders Video Managers.prefab new file mode 100644 index 000000000..74b2e7479 --- /dev/null +++ b/Assets/Prefabs/2= HELPERS Coliders Video Managers.prefab @@ -0,0 +1,1197 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &157550179993284496 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3650695927844256586} + - component: {fileID: 6131381340082560778} + m_Layer: 0 + m_Name: Conditional stuff + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3650695927844256586 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 157550179993284496} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 153.37653, y: -30.114182, z: -275.0286} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1937122158291733144} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6131381340082560778 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 157550179993284496} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f1c7f8f7ea5f24489652e06a3e710b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_conditionToEnable: + luaConditions: [] + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + m_conditionToDisable: + luaConditions: [] + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + m_gameObjectsToEnable: [] + m_gameObjectsToDisable: [] +--- !u!1 &435333317487668761 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1118754938086418893} + - component: {fileID: 137463844809275105} + - component: {fileID: 5512562788726211194} + m_Layer: 0 + m_Name: MusicManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1118754938086418893 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 435333317487668761} + 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: 1937122158291733144} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &137463844809275105 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 435333317487668761} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 0.346 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &5512562788726211194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 435333317487668761} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3cfce3ac822ec8449b87df4ac40228a8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_key: + m_appendSaverTypeToKey: 0 + m_saveAcrossSceneChanges: 1 + m_restoreStateOnStart: 0 + m_audioMixer: {fileID: 24100000, guid: 5dd761199ee4b7045a10fd9b79e36026, type: 2} + m_targetVolume: 0.569 + m_blendTime: 1 + m_restTime: 11 + m_state: 1 + m_ExploreClips: + - {fileID: 8300000, guid: 6743626d71f06d4479bddfef95163407, type: 3} + - {fileID: 8300000, guid: 5a86cf327bfb54f448bd0e31776b589b, type: 3} + m_CombatClips: + - {fileID: 8300000, guid: 12231da287767674e8088a5478b3bdee, type: 3} + - {fileID: 8300000, guid: bdaa8dda3c19bad4794e96556e8c8eef, type: 3} + m_DialogueClips: [] + m_musicSource: {fileID: 137463844809275105} + m_MusicIndex: 0 + shouldPlayRandomClipsFrolList: 0 + isLocked: 0 +--- !u!1 &913139497171192235 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1937122158291733144} + m_Layer: 0 + m_Name: 2= HELPERS Coliders Video Managers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1937122158291733144 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 913139497171192235} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -153.37653, y: 30.114182, z: 275.0286} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5998838893018355781} + - {fileID: 393995121786215089} + - {fileID: 2848557958221806232} + - {fileID: 295759052896858449} + - {fileID: 2096375322502304386} + - {fileID: 1118754938086418893} + - {fileID: 8616573388425634020} + - {fileID: 8817618723910843386} + - {fileID: 3650695927844256586} + - {fileID: 3206067247117620162} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1980770454828406679 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2096375322502304386} + - component: {fileID: 6830377104525174248} + m_Layer: 0 + m_Name: LevelLoader + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2096375322502304386 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1980770454828406679} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 231.89671, y: 2.1289215, z: -401.39566} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1937122158291733144} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6830377104525174248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1980770454828406679} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f994cc1e6b8c0be4aa9cb499516ef312, type: 3} + m_Name: + m_EditorClassIdentifier: + loadSceneMode: 0 +--- !u!1001 &2534792303446155755 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1937122158291733144} + m_Modifications: + - target: {fileID: 711810939, guid: 5b032ea3d671549499706ad50cd78cef, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 334806193088322423, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: m_Name + value: SkipCanvas + objectReference: {fileID: 0} + - target: {fileID: 4592260348699753805, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 4630549558631464232, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5b032ea3d671549499706ad50cd78cef, type: 3} +--- !u!224 &2848557958221806232 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, + type: 3} + m_PrefabInstance: {fileID: 2534792303446155755} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4062533193734992125 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1937122158291733144} + m_Modifications: + - target: {fileID: 7719500004114383209, guid: eb3e677ca35ad7c40a176827a2c6102d, + type: 3} + propertyPath: m_key + value: CanvasFade_708148 + objectReference: {fileID: 0} + - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7719500005641726139, guid: eb3e677ca35ad7c40a176827a2c6102d, + type: 3} + propertyPath: m_Name + value: CANVAS OVERLAY + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eb3e677ca35ad7c40a176827a2c6102d, type: 3} +--- !u!4 &5998838893018355781 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, + type: 3} + m_PrefabInstance: {fileID: 4062533193734992125} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4357650197058887935 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1937122158291733144} + m_Modifications: + - target: {fileID: 1154969794063037242, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + propertyPath: m_Name + value: GameStateManager + objectReference: {fileID: 0} + - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1154969794063037242, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6244660239742458050} + m_SourcePrefab: {fileID: 100100000, guid: ca5617ade2be349c3826daac1e6fdcf2, type: 3} +--- !u!4 &3206067247117620162 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + m_PrefabInstance: {fileID: 4357650197058887935} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3206067247117620165 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1154969794063037242, guid: ca5617ade2be349c3826daac1e6fdcf2, + type: 3} + m_PrefabInstance: {fileID: 4357650197058887935} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6244660239742458050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3206067247117620165} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5547fefaea58c4174adccc95d48c54ae, type: 3} + m_Name: + m_EditorClassIdentifier: + m_OnTimeScaleChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1001 &4724764495394594942 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1937122158291733144} + m_Modifications: + - target: {fileID: 4964792250825620171, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_Name + value: VideoCutsceneCanvas + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620171, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, type: 3} +--- !u!224 &393995121786215089 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, + type: 3} + m_PrefabInstance: {fileID: 4724764495394594942} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5112306204643052376 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1937122158291733144} + m_Modifications: + - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, + type: 3} + propertyPath: m_LocalPosition.x + value: 5.747247 + objectReference: {fileID: 0} + - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, + type: 3} + propertyPath: m_LocalPosition.y + value: -5.0716085 + objectReference: {fileID: 0} + - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, + type: 3} + propertyPath: m_LocalPosition.z + value: 4.4606323 + objectReference: {fileID: 0} + - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4821156325998443022, guid: ae4b0695317d14919ac647ff1705692a, + type: 3} + propertyPath: m_Name + value: SaveSystem + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ae4b0695317d14919ac647ff1705692a, type: 3} +--- !u!4 &295759052896858449 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, + type: 3} + m_PrefabInstance: {fileID: 5112306204643052376} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6195369613509415610 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1937122158291733144} + m_Modifications: + - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_LocalScale.x + value: 249 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_LocalScale.y + value: 249 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_LocalScale.z + value: 249 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_LocalPosition.x + value: 266.6247 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.93481827 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_LocalPosition.z + value: -398.02856 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098306, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098306, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098332, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_Name + value: Height Fog Global + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098332, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: noiseMode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: mainCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: fogColorDuo + value: 0.519 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: fogIntensity + value: 0.54 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: fogColorEnd.b + value: 1.7839235 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: fogColorEnd.g + value: 1.3352922 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: fogColorEnd.r + value: 1.2706248 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: skyboxFogFill + value: 0.228 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: fogDistanceEnd + value: 59.4 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: noiseIntensity + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: renderPriority + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: fogColorStart.b + value: 0.36311856 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: fogColorStart.g + value: 0.45629874 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: fogColorStart.r + value: 0.9056604 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: skyboxFogHeight + value: 0.309 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: fogDistanceStart + value: -21.15 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: fogHeightFalloff + value: 2.7 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: skyboxFogFalloff + value: 3.02 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: directionalColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: directionalColor.g + value: 0.7304519 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: directionalColor.r + value: 1.3627833 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: directionalFalloff + value: 2.48 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: fogDistanceFalloff + value: 1.61 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: skyboxFogIntensity + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: directionalIntensity + value: 0.652 + objectReference: {fileID: 0} + - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + propertyPath: manualPositionAndScale + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a8a6d6581670a5948b357f0ceb83318a, type: 3} +--- !u!4 &8817618723910843386 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, + type: 3} + m_PrefabInstance: {fileID: 6195369613509415610} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7350576728955230597 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1937122158291733144} + m_Modifications: + - target: {fileID: 1267280949225758405, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: displaySettings.localizationSettings.language + value: pl + objectReference: {fileID: 0} + - target: {fileID: 1267280949225758409, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: m_BlockingMask.m_Bits + value: 4294967287 + objectReference: {fileID: 0} + - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1267280949231955009, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: m_Name + value: Dialogue Manager + objectReference: {fileID: 0} + - target: {fileID: 1267280949231955009, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1267280949231955015, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dc99ca8ee3c2b0143a009d17e13de983, type: 3} +--- !u!4 &8616573388425634020 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + m_PrefabInstance: {fileID: 7350576728955230597} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/2= HELPERS Coliders Video Managers.prefab.meta b/Assets/Prefabs/2= HELPERS Coliders Video Managers.prefab.meta new file mode 100644 index 000000000..f5289ba3a --- /dev/null +++ b/Assets/Prefabs/2= HELPERS Coliders Video Managers.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cfbc6a970e156444390379ba06b74bde +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab b/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab index 5d0b7baa4..58ff97f9c 100644 --- a/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab +++ b/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab @@ -60733,13 +60733,7 @@ MonoBehaviour: m_ignoreTriggers: 1 healthRecoveryCap: 1 useAnimationBasedRotation: 0 - strafeRollForwardAnim: Roll_Forward - strafeRollBackwardAnim: Roll_Backward - strafeRollLeftAnim: Roll_Left - strafeRollRightAnim: Roll_Right - strafeRollLeftCorrectionAngle: -20 - strafeRollRightCorrectionAngle: -10 - strafeRollBackwardCorrectionAngle: 180 + dashBlendTreeState: Dash_Directional --- !u!114 &9202663235077955828 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller b/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller index 8bbde01a4..60fff03af 100644 --- a/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller +++ b/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller @@ -949,6 +949,28 @@ AnimatorTransition: m_Mute: 0 m_IsExit: 1 serializedVersion: 1 +--- !u!1101 &-7459024323335296994 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6394231 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-7444852651264506119 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -40885,7 +40907,10 @@ AnimatorStateMachine: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Actions - m_ChildStates: [] + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 7107860863601028181} + m_Position: {x: 529.07166, y: -184.21014, z: 0} m_ChildStateMachines: - serializedVersion: 1 m_StateMachine: {fileID: 1107386280914322628} @@ -44748,7 +44773,7 @@ AnimatorState: m_TimeParameterActive: 0 m_Motion: {fileID: 7400024, guid: c5937c944a220444aa33be3fe1480174, type: 3} m_Tag: - m_SpeedParameter: Direction + m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: @@ -46808,6 +46833,66 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!206 &4160547945503330080 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 1827226128182048838, guid: 10c005d4a1cfe8648af9ff7bfc4f7275, + type: 3} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: InputHorizontal + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 1827226128182048838, guid: 10c005d4a1cfe8648af9ff7bfc4f7275, + type: 3} + m_Threshold: 0.25 + m_Position: {x: 0, y: -1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: InputHorizontal + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 1827226128182048838, guid: 0e637c252c2643d4d9770ad55b6e71c1, + type: 3} + m_Threshold: 0.5 + m_Position: {x: 0, y: 1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: InputHorizontal + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 1827226128182048838, guid: 91b0987685baf44bb853583ed38ef4ed, + type: 3} + m_Threshold: 0.75 + m_Position: {x: -1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: InputHorizontal + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 1827226128182048838, guid: 1c9f48ddca32d45479d6aeb95df77d7f, + type: 3} + m_Threshold: 1 + m_Position: {x: 1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: InputHorizontal + m_Mirror: 0 + m_BlendParameter: InputHorizontal + m_BlendParameterY: InputVertical + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 3 --- !u!114 &4236067981039347910 MonoBehaviour: m_ObjectHideFlags: 1 @@ -48639,6 +48724,33 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &7107860863601028181 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Dash_Directional + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -7459024323335296994} + 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: 4160547945503330080} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &7110115907626490810 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/Resources/Build.asset b/Assets/Resources/Build.asset index dd7051420..263fca4ce 100644 --- a/Assets/Resources/Build.asset +++ b/Assets/Resources/Build.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e7af411c873524f6ba73fa8f5aa07217, type: 3} m_Name: Build m_EditorClassIdentifier: - version: 2906 + version: path: '/Users/marcin/projects/beYond ' diff --git a/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity b/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity index c08b073d1..8f268f80f 100644 --- a/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity +++ b/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity @@ -77133,6 +77133,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 517006275} m_PrefabAsset: {fileID: 0} +--- !u!43 &517545629 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 9.72, z: 13.65} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 000020c11f851bc166665a41000000800000803f000000800000803f0000803f000020411f851bc166665a41000000800000803f00000080000000000000803f000020411f851bc166665ac1000000800000803f000000800000000000000000000020c11f851bc166665ac1000000800000803f000000800000803f00000000000020c11f851b4166665ac10000803f00000080000000800000803f0000803f000020c11f851b4166665a410000803f0000008000000080000000000000803f000020c11f851bc166665a410000803f00000080000000800000000000000000000020c11f851bc166665ac10000803f00000080000000800000803f00000000000020c11f851b4166665a410000008000000080000080bf0000803f0000803f000020411f851b4166665a410000008000000080000080bf000000000000803f000020411f851bc166665a410000008000000080000080bf0000000000000000000020c11f851bc166665a410000008000000080000080bf0000803f00000000000020411f851b4166665ac100000080000000800000803f0000803f0000803f000020c11f851b4166665ac100000080000000800000803f000000000000803f000020c11f851bc166665ac100000080000000800000803f0000000000000000000020411f851bc166665ac100000080000000800000803f0000803f00000000000020411f851b4166665a41000080bf00000080000000800000803f0000803f000020411f851b4166665ac1000080bf0000008000000080000000000000803f000020411f851bc166665ac1000080bf00000080000000800000000000000000000020411f851bc166665a41000080bf00000080000000800000803f00000000000020c11f851b4166665ac100000080000080bf000000800000803f0000803f000020411f851b4166665ac100000080000080bf00000080000000000000803f000020411f851b4166665a4100000080000080bf000000800000000000000000000020c11f851b4166665a4100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 9.72, z: 13.65} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &518049454 PrefabInstance: m_ObjectHideFlags: 0 @@ -88262,7 +88427,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.22641507, g: 0.22641507, b: 0.22641507, a: 0} - - _Color: {r: 0.22641507, g: 0.22641507, b: 0.22641507, a: 0.7176471} + - _Color: {r: 0.22641504, g: 0.22641504, b: 0.22641504, a: 0} - _EmisColor: {r: 0.29411763, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0.00489498, g: 0.026072003, b: 0.20754719, a: 1} - _SpecColor: {r: 0.4852941, g: 0.19625866, b: 0.19625866, a: 1} @@ -121346,6 +121511,70 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 716397676} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!21 &717092632 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Override + m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} + m_Parent: {fileID: 0} + 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: + - _DIRECTIONALL: 1 + - _DirectionalFalloff: 2 + - _DirectionalIntensity: 1 + - _DirectionalMode: 1 + - _FOGG: 1 + - _FogAxisMode: 1 + - _FogColorDuo: 1 + - _FogDistanceEnd: 200 + - _FogDistanceFalloff: 2 + - _FogDistanceStart: -200 + - _FogHeightEnd: 200 + - _FogHeightFalloff: 2 + - _FogHeightStart: 0 + - _FogIntensity: 1 + - _FogLayersMode: 0 + - _IsHeightFogPreset: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _NOISEE: 1 + - _NoiseDistanceEnd: 50 + - _NoiseIntensity: 1 + - _NoiseMode: 2 + - _NoiseModeBlend: 1 + - _NoiseScale: 30 + - _SKYBOXX: 1 + - _SkyboxFogFalloff: 1 + - _SkyboxFogFill: 1 + - _SkyboxFogHeight: 1 + - _SkyboxFogIntensity: 1 + - _TITLE: 1 + m_Colors: + - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} + - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} + - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} + - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} + - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} + - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!4 &717101943 stripped Transform: m_CorrespondingSourceObject: {fileID: 713596519901218472, guid: 188eadf0b15b6fd4e8001d290fa29ed2, @@ -139209,6 +139438,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EffectThreshold: 0 - _EnvironmentReflections: 1 - _FadeDistance: 0 @@ -139228,6 +139458,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _Threshold: 0 - _USEDISTANCEFADE: 0 @@ -153071,7 +153302,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] @@ -159280,6 +159511,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EffectThreshold: 0 - _EnvironmentReflections: 1 - _FadeDistance: 0 @@ -159299,6 +159531,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _Threshold: 0 - _USEDISTANCEFADE: 0 @@ -162302,7 +162535,7 @@ PrefabInstance: - target: {fileID: 1979772587474207191, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1979772587506359731, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -163833,12 +164066,12 @@ PrefabInstance: - target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 2166802.5 + value: 2268227.5 objectReference: {fileID: 0} - target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -346688.5 + value: -362916.03 objectReference: {fileID: 0} - target: {fileID: 5265345828117443429, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -166442,7 +166675,9 @@ MonoBehaviour: m_sunLight: {fileID: 1976683114} m_moonLight: {fileID: 0} WeatherPresent: 0 + WeatherSystem: {fileID: 0} m_sunLightExists: 1 + m_moonLightExists: 0 --- !u!4 &1013064392 Transform: m_ObjectHideFlags: 10 @@ -174603,70 +174838,6 @@ Transform: m_Children: [] m_Father: {fileID: 2125615841} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &1089934604 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Override - m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} - m_Parent: {fileID: 0} - 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: - - _DIRECTIONALL: 1 - - _DirectionalFalloff: 2 - - _DirectionalIntensity: 1 - - _DirectionalMode: 1 - - _FOGG: 1 - - _FogAxisMode: 1 - - _FogColorDuo: 1 - - _FogDistanceEnd: 200 - - _FogDistanceFalloff: 2 - - _FogDistanceStart: -200 - - _FogHeightEnd: 200 - - _FogHeightFalloff: 2 - - _FogHeightStart: 0 - - _FogIntensity: 1 - - _FogLayersMode: 0 - - _IsHeightFogPreset: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _NOISEE: 1 - - _NoiseDistanceEnd: 50 - - _NoiseIntensity: 1 - - _NoiseMode: 2 - - _NoiseModeBlend: 1 - - _NoiseScale: 30 - - _SKYBOXX: 1 - - _SkyboxFogFalloff: 1 - - _SkyboxFogFill: 1 - - _SkyboxFogHeight: 1 - - _SkyboxFogIntensity: 1 - - _TITLE: 1 - m_Colors: - - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} - - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} - - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} - - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} - - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} - - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &1090224042 PrefabInstance: m_ObjectHideFlags: 0 @@ -177340,6 +177511,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EffectThreshold: 0 - _EnvironmentReflections: 1 - _FadeDistance: 0 @@ -177359,6 +177531,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _Threshold: 0 - _USEDISTANCEFADE: 0 @@ -188841,39 +189014,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 919f4c6c61ceb094fb62ea8a2b6e44ba, type: 3} ---- !u!21 &1187510137 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Height Fog Global - m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3002 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _HeightFogGlobal: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _TITLE: 1 - - _TransparentQueue: 3000 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!4 &1188314946 stripped Transform: m_CorrespondingSourceObject: {fileID: 2057344904668310066, guid: 5393e52587769024ca73a8ded8e9facc, @@ -197123,6 +197263,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 754367018} m_PrefabAsset: {fileID: 0} +--- !u!21 &1250246459 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Height Fog Global + m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3002 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _HeightFogGlobal: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _TITLE: 1 + - _TransparentQueue: 3000 + m_Colors: [] + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1001 &1250518958 PrefabInstance: m_ObjectHideFlags: 0 @@ -223706,171 +223879,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a3957879256924146bcdc4fa7a572ae9, type: 3} ---- !u!43 &1452171801 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 10, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 000020c1000020c100001041000000800000803f000000800000803f0000803f00002041000020c100001041000000800000803f00000080000000000000803f00002041000020c1000010c1000000800000803f000000800000000000000000000020c1000020c1000010c1000000800000803f000000800000803f00000000000020c100002041000010c10000803f00000080000000800000803f0000803f000020c100002041000010410000803f0000008000000080000000000000803f000020c1000020c1000010410000803f00000080000000800000000000000000000020c1000020c1000010c10000803f00000080000000800000803f00000000000020c100002041000010410000008000000080000080bf0000803f0000803f0000204100002041000010410000008000000080000080bf000000000000803f00002041000020c1000010410000008000000080000080bf0000000000000000000020c1000020c1000010410000008000000080000080bf0000803f000000000000204100002041000010c100000080000000800000803f0000803f0000803f000020c100002041000010c100000080000000800000803f000000000000803f000020c1000020c1000010c100000080000000800000803f000000000000000000002041000020c1000010c100000080000000800000803f0000803f00000000000020410000204100001041000080bf00000080000000800000803f0000803f0000204100002041000010c1000080bf0000008000000080000000000000803f00002041000020c1000010c1000080bf0000008000000080000000000000000000002041000020c100001041000080bf00000080000000800000803f00000000000020c100002041000010c100000080000080bf000000800000803f0000803f0000204100002041000010c100000080000080bf00000080000000000000803f00002041000020410000104100000080000080bf000000800000000000000000000020c1000020410000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 10, z: 9} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!4 &1452274249 stripped Transform: m_CorrespondingSourceObject: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, @@ -235600,171 +235608,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1538392951} m_PrefabAsset: {fileID: 0} ---- !u!43 &1538491479 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 9.72, z: 13.65} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 000020c11f851bc166665a41000000800000803f000000800000803f0000803f000020411f851bc166665a41000000800000803f00000080000000000000803f000020411f851bc166665ac1000000800000803f000000800000000000000000000020c11f851bc166665ac1000000800000803f000000800000803f00000000000020c11f851b4166665ac10000803f00000080000000800000803f0000803f000020c11f851b4166665a410000803f0000008000000080000000000000803f000020c11f851bc166665a410000803f00000080000000800000000000000000000020c11f851bc166665ac10000803f00000080000000800000803f00000000000020c11f851b4166665a410000008000000080000080bf0000803f0000803f000020411f851b4166665a410000008000000080000080bf000000000000803f000020411f851bc166665a410000008000000080000080bf0000000000000000000020c11f851bc166665a410000008000000080000080bf0000803f00000000000020411f851b4166665ac100000080000000800000803f0000803f0000803f000020c11f851b4166665ac100000080000000800000803f000000000000803f000020c11f851bc166665ac100000080000000800000803f0000000000000000000020411f851bc166665ac100000080000000800000803f0000803f00000000000020411f851b4166665a41000080bf00000080000000800000803f0000803f000020411f851b4166665ac1000080bf0000008000000080000000000000803f000020411f851bc166665ac1000080bf00000080000000800000000000000000000020411f851bc166665a41000080bf00000080000000800000803f00000000000020c11f851b4166665ac100000080000080bf000000800000803f0000803f000020411f851b4166665ac100000080000080bf00000080000000000000803f000020411f851b4166665a4100000080000080bf000000800000000000000000000020c11f851b4166665a4100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 9.72, z: 13.65} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &1538498408 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1433047083084476401, guid: c9e27421d89b7b74d9d9be5e2845122b, @@ -239045,6 +238888,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EffectThreshold: 0 - _EnvironmentReflections: 1 - _FadeDistance: 0 @@ -239064,6 +238908,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _Threshold: 0 - _USEDISTANCEFADE: 0 @@ -245581,7 +245426,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] @@ -249564,6 +249409,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1629249421} m_PrefabAsset: {fileID: 0} +--- !u!43 &1629375536 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 10, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 000020c1000020c100001041000000800000803f000000800000803f0000803f00002041000020c100001041000000800000803f00000080000000000000803f00002041000020c1000010c1000000800000803f000000800000000000000000000020c1000020c1000010c1000000800000803f000000800000803f00000000000020c100002041000010c10000803f00000080000000800000803f0000803f000020c100002041000010410000803f0000008000000080000000000000803f000020c1000020c1000010410000803f00000080000000800000000000000000000020c1000020c1000010c10000803f00000080000000800000803f00000000000020c100002041000010410000008000000080000080bf0000803f0000803f0000204100002041000010410000008000000080000080bf000000000000803f00002041000020c1000010410000008000000080000080bf0000000000000000000020c1000020c1000010410000008000000080000080bf0000803f000000000000204100002041000010c100000080000000800000803f0000803f0000803f000020c100002041000010c100000080000000800000803f000000000000803f000020c1000020c1000010c100000080000000800000803f000000000000000000002041000020c1000010c100000080000000800000803f0000803f00000000000020410000204100001041000080bf00000080000000800000803f0000803f0000204100002041000010c1000080bf0000008000000080000000000000803f00002041000020c1000010c1000080bf0000008000000080000000000000000000002041000020c100001041000080bf00000080000000800000803f00000000000020c100002041000010c100000080000080bf000000800000803f0000803f0000204100002041000010c100000080000080bf00000080000000000000803f00002041000020410000104100000080000080bf000000800000000000000000000020c1000020410000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 10, z: 9} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &1630808755 PrefabInstance: m_ObjectHideFlags: 0 @@ -256788,7 +256798,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] @@ -258638,6 +258648,8 @@ MonoBehaviour: x: 250 y: 250 z: 250 + m_allFloatingPointFixMembers: [] + m_allWorldSpaceParticleSystems: [] m_originTargetTileX: 0 m_originTargetTileZ: 0 m_terrainUnloadMemoryTreshold: 4294967296 @@ -356423,6 +356435,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EffectThreshold: 0 - _EnvironmentReflections: 1 - _FadeDistance: 0 @@ -356442,6 +356455,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _Threshold: 0 - _USEDISTANCEFADE: 0 @@ -358874,7 +358888,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] @@ -377313,6 +377327,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EffectThreshold: 0 - _EnvironmentReflections: 1 - _FadeDistance: 0 @@ -377332,6 +377347,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _Threshold: 0 - _USEDISTANCEFADE: 0 @@ -460296,7 +460312,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1187510137} + - {fileID: 1250246459} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -460389,7 +460405,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 1089934604} + overrideMaterial: {fileID: 717092632} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 diff --git a/Assets/Scenes/Old_Levels!/TestHub.unity b/Assets/Scenes/Old_Levels!/TestHub.unity index aa6acae19..fd65d7c8b 100644 --- a/Assets/Scenes/Old_Levels!/TestHub.unity +++ b/Assets/Scenes/Old_Levels!/TestHub.unity @@ -359,227 +359,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, type: 3} ---- !u!114 &64659511 -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: 61587e20dbbff7b4f8b950ee8040aea4, type: 3} - m_Name: - m_EditorClassIdentifier: - ProfileVersion: 2.2.1 - m_reimportHDRPShader: 0 - m_savedFromScene: - m_gaiaTimeOfDay: - m_todStartingType: 0 - m_todEnabled: 0 - m_todDayTimeScale: 0 - m_todHour: 0 - m_todMinutes: 0 - m_gaiaWeather: - m_season: 0 - m_windDirection: 0 - m_lodBias: 2 - m_kelvinTexture: {fileID: 0} - m_lightSystemMode: 0 - m_thirdPartyLightObject: {fileID: 0} - DefaultLightingSet: 0 - m_lightingMultiSceneLightingSupport: 1 - m_lightingUpdateInRealtime: 0 - m_selectedLightingProfileValuesIndex: 1 - m_profileType: 1 - m_renamingProfile: 0 - m_lightingEditSettings: 0 - m_lightingBakeMode: 1 - m_lightmappingMode: 2 - m_masterSkyboxMaterial: {fileID: 0} - m_lightingProfiles: [] - m_parentObjects: 1 - m_hideProcessVolume: 1 - m_enablePostProcessing: 1 - m_enableAmbientAudio: 1 - m_enableFog: 1 - m_antiAliasingMode: 4 - m_antiAliasingTAAStrength: 0.7 - m_cameraDithering: 1 - m_cameraAperture: 16 - m_usePhysicalCamera: 0 - m_cameraSensorSize: {x: 70.41, y: 52.63} - m_cameraFocalLength: 50 - m_globalReflectionProbe: 1 - m_isUserProfileSet: 0 - m_enableAutoDOF: 1 - m_dofLayerDetection: - serializedVersion: 2 - m_Bits: 1 - m_depthOfFieldFocusDistance: 50 - m_reflectionProbeData: - reflectionProbeMode: 1 - reflectionProbeRefresh: 0 - reflectionCubemapCompression: 2 - reflectionProbeTimeSlicingMode: 1 - reflectionProbesPerRow: 5 - reflectionProbeOffset: 1.8 - reflectionProbeClipPlaneDistance: 1000 - reflectionProbeBlendDistance: 5 - reflectionprobeCullingMask: - serializedVersion: 2 - m_Bits: 1 - reflectionProbeShadowDistance: 100 - reflectionProbeResolution: 2 - lightProbesPerRow: 50 - lightProbeSpawnRadius: 25 - seaLevel: 50 - filterMode: 1 - m_universalPostFXProfile: {fileID: 0} - m_waterSystemMode: 0 - m_thirdPartyWaterObject: {fileID: 0} - DefaultWaterSet: 0 - m_waterMultiSceneLightingSupport: 1 - m_waterRenamingProfile: 0 - m_waterUpdateInRealtime: 0 - m_allowMSAA: 0 - m_useHDR: 0 - m_enableDisabeHeightFeature: 1 - m_disableHeight: 100 - m_selectedProfile: Deep Blue Ocean - m_interval: 0.25 - m_useCustomRenderDistance: 0 - m_enableLayerDistances: 0 - m_customRenderDistance: 500 - m_customRenderDistances: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - m_reflectionSettingsData: - m_enableReflections: 1 - m_ResolutionMultiplier: 1 - m_ClipPlaneOffset: 0 - m_ReflectLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_Shadows: 0 - m_enableRenderDistance: 0 - m_enableRenderDistances: 0 - m_customRenderDistance: 500 - m_customRenderDistances: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - m_textureResolution: 512 - m_waterEditSettings: 0 - m_selectedWaterProfileValuesIndex: 1 - m_autoRefresh: 1 - m_ignoreSceneConditions: 1 - m_refreshRate: 0.5 - m_autoUpdateMode: 0 - m_useCastics: 1 - m_mainCausticLight: {fileID: 0} - m_causticFramePerSecond: 24 - m_causticSize: 15 - InfiniteMode: 1 - m_waterPrefab: {fileID: 0} - m_underwaterParticles: {fileID: 0} - m_underwaterHorizonPrefab: {fileID: 0} - m_hdPlanarReflections: {fileID: 0} - m_transitionFXPrefab: {fileID: 0} - m_waterProfiles: [] - m_activeWaterMaterial: {fileID: 0} - m_enableWaterMeshQuality: 0 - m_waterMeshQuality: 2 - m_meshType: 0 - m_zSize: 1000 - m_xSize: 1000 - m_customMeshQuality: 100 - m_enableReflections: 1 - m_disablePixelLights: 1 - m_reflectionResolution: 6 - m_verifiedHDRPReflections: 0 - m_textureResolution: 512 - m_clipPlaneOffset: 40 - m_reflectedLayers: - serializedVersion: 2 - m_Bits: 1 - m_hdrpReflectionIntensity: 1 - m_enableOceanFoam: 1 - m_enableBeachFoam: 1 - m_enableGPUInstancing: 1 - m_autoWindControlOnWater: 1 - m_supportUnderwaterEffects: 1 - m_supportUnderwaterPostProcessing: 1 - m_supportUnderwaterFog: 1 - m_supportUnderwaterParticles: 1 - m_controllerType: 1 - m_setupPostFX: 1 - m_spawnPlayerAtCurrentLocation: 1 - m_customPlayer: {fileID: 0} - m_customCamera: {fileID: 0} - m_enableLayerCulling: 1 - m_cullingProfile: {fileID: 0} - m_sunLight: {fileID: 0} - m_terrainCullingEnabled: 1 --- !u!4 &99479629 stripped Transform: m_CorrespondingSourceObject: {fileID: 8361884480791188460, guid: 851e8e61247888340bdec90fc8aa37f5, @@ -716,6 +495,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EffectThreshold: 0 - _EnvironmentReflections: 1 - _FadeDistance: 0 @@ -735,6 +515,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _Threshold: 0 - _USEDISTANCEFADE: 0 @@ -763,168 +544,6 @@ ParticleSystem: type: 3} m_PrefabInstance: {fileID: 2659397539900052569} m_PrefabAsset: {fileID: 0} ---- !u!1 &116897652 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 116897653} - - component: {fileID: 116897655} - - component: {fileID: 116897654} - m_Layer: 0 - m_Name: MusicManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &116897653 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 116897652} - 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: 878574876} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &116897654 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 116897652} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3cfce3ac822ec8449b87df4ac40228a8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_key: - m_appendSaverTypeToKey: 0 - m_saveAcrossSceneChanges: 1 - m_restoreStateOnStart: 0 - m_audioMixer: {fileID: 24100000, guid: 5dd761199ee4b7045a10fd9b79e36026, type: 2} - m_targetVolume: 0.569 - m_blendTime: 1 - m_restTime: 11 - m_state: 1 - m_ExploreClips: - - {fileID: 8300000, guid: 6743626d71f06d4479bddfef95163407, type: 3} - - {fileID: 8300000, guid: 5a86cf327bfb54f448bd0e31776b589b, type: 3} - m_CombatClips: - - {fileID: 8300000, guid: 12231da287767674e8088a5478b3bdee, type: 3} - - {fileID: 8300000, guid: bdaa8dda3c19bad4794e96556e8c8eef, type: 3} - m_DialogueClips: [] - m_musicSource: {fileID: 116897655} - m_MusicIndex: 0 - shouldPlayRandomClipsFrolList: 0 - isLocked: 0 ---- !u!82 &116897655 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 116897652} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 0} - m_PlayOnAwake: 1 - m_Volume: 0.346 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 --- !u!21 &122776482 Material: serializedVersion: 8 @@ -1460,6 +1079,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EffectThreshold: 0 - _EnvironmentReflections: 1 - _FadeDistance: 0 @@ -1479,6 +1099,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _Threshold: 0 - _USEDISTANCEFADE: 0 @@ -1735,110 +1356,6 @@ Transform: m_Children: [] m_Father: {fileID: 99479629} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &301313355 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 301313356} - - component: {fileID: 301313357} - m_Layer: 0 - m_Name: Conditional stuff - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &301313356 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 301313355} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 153.37653, y: -30.114182, z: -275.0286} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 878574876} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &301313357 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 301313355} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f1c7f8f7ea5f24489652e06a3e710b4, type: 3} - m_Name: - m_EditorClassIdentifier: - m_conditionToEnable: - luaConditions: [] - questConditions: [] - acceptedTags: [] - acceptedGameObjects: [] - luaWizardIndex: -1 - lastEvaluationValue: 0 - m_conditionToDisable: - luaConditions: [] - questConditions: [] - acceptedTags: [] - acceptedGameObjects: [] - luaWizardIndex: -1 - lastEvaluationValue: 0 - m_gameObjectsToEnable: [] - m_gameObjectsToDisable: [] ---- !u!1 &305500958 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 305500959} - - component: {fileID: 305500960} - m_Layer: 0 - m_Name: DebugLogger - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &305500959 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 305500958} - 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: 878574876} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &305500960 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 305500958} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 088fd69a7d103414bb97e493265b390d, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &356892463 GameObject: m_ObjectHideFlags: 0 @@ -2962,97 +2479,6 @@ MonoBehaviour: m_CallState: 2 selectedDatabase: {fileID: 0} CheckInterval: 1 ---- !u!1 &437438685 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 437438687} - - component: {fileID: 437438686} - m_Layer: 0 - m_Name: LevelLoader - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &437438686 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 437438685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f994cc1e6b8c0be4aa9cb499516ef312, type: 3} - m_Name: - m_EditorClassIdentifier: - loadSceneMode: 0 ---- !u!4 &437438687 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 437438685} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 231.89671, y: 2.1289215, z: -401.39566} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 878574876} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &466846472 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 466846473} - - component: {fileID: 466846474} - m_Layer: 0 - m_Name: Wind Zone - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &466846473 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 466846472} - serializedVersion: 2 - m_LocalRotation: {x: -0.10482746, y: -0.9317023, z: 0.33107764, w: -0.106440656} - m_LocalPosition: {x: 25.9, y: 43.2, z: -72.4} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1013064392} - m_LocalEulerAnglesHint: {x: 39.736, y: -189.652, z: 9.344} ---- !u!182 &466846474 -WindZone: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 466846472} - m_Enabled: 1 - m_Mode: 0 - m_Radius: 10000 - m_WindMain: 10 - m_WindTurbulence: 14.08 - m_WindPulseMagnitude: 1 - m_WindPulseFrequency: 128.04 --- !u!1 &570707734 GameObject: m_ObjectHideFlags: 0 @@ -11040,12 +10466,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1004473948} m_PrefabAsset: {fileID: 0} ---- !u!4 &620939726 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - m_PrefabInstance: {fileID: 897562200} - m_PrefabAsset: {fileID: 0} --- !u!21 &649343978 Material: serializedVersion: 8 @@ -11175,6 +10595,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EffectThreshold: 0 - _EnvironmentReflections: 1 - _FadeDistance: 0 @@ -11194,6 +10615,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _Threshold: 0 - _USEDISTANCEFADE: 0 @@ -12394,90 +11816,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!1001 &822822378 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 878574876} - m_Modifications: - - target: {fileID: 7719500004114383209, guid: eb3e677ca35ad7c40a176827a2c6102d, - type: 3} - propertyPath: m_key - value: CanvasFade_708148 - objectReference: {fileID: 0} - - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7719500005641726139, guid: eb3e677ca35ad7c40a176827a2c6102d, - type: 3} - propertyPath: m_Name - value: CANVAS OVERLAY - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: eb3e677ca35ad7c40a176827a2c6102d, type: 3} ---- !u!4 &822822379 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7719500005641726136, guid: eb3e677ca35ad7c40a176827a2c6102d, - type: 3} - m_PrefabInstance: {fileID: 822822378} - m_PrefabAsset: {fileID: 0} --- !u!1 &825024595 GameObject: m_ObjectHideFlags: 0 @@ -12679,142 +12017,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 869089146} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &878574875 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 878574876} - m_Layer: 0 - m_Name: 2= HELPERS Coliders Video Managers - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &878574876 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 878574875} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -153.37653, y: 30.114182, z: 275.0286} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 822822379} - - {fileID: 1272320332} - - {fileID: 1819555270} - - {fileID: 1684492593} - - {fileID: 1013064392} - - {fileID: 437438687} - - {fileID: 305500959} - - {fileID: 116897653} - - {fileID: 620939726} - - {fileID: 1346070949} - - {fileID: 301313356} - - {fileID: 1993521575} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &897562200 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 878574876} - m_Modifications: - - target: {fileID: 1267280949225758405, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - propertyPath: displaySettings.localizationSettings.language - value: pl - objectReference: {fileID: 0} - - target: {fileID: 1267280949225758409, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - propertyPath: m_BlockingMask.m_Bits - value: 4294967287 - objectReference: {fileID: 0} - - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1267280949231532385, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1267280949231955009, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - propertyPath: m_Name - value: Dialogue Manager - objectReference: {fileID: 0} - - target: {fileID: 1267280949231955009, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1267280949231955015, guid: dc99ca8ee3c2b0143a009d17e13de983, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: dc99ca8ee3c2b0143a009d17e13de983, type: 3} --- !u!1 &898247662 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7577249534690070221, guid: 851e8e61247888340bdec90fc8aa37f5, @@ -14314,7 +13516,7 @@ PrefabInstance: - target: {fileID: 1979772587474207191, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1979772587506359731, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -15265,7 +14467,7 @@ PrefabInstance: - target: {fileID: 4460069056851369441, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4460112240072912095, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -15905,12 +15107,12 @@ PrefabInstance: - target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 2272933.2 + value: 2781164 objectReference: {fileID: 0} - target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -363668.97 + value: -444986.44 objectReference: {fileID: 0} - target: {fileID: 5265345828117443429, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -17224,218 +16426,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 586243596} m_SourcePrefab: {fileID: 100100000, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} ---- !u!1 &1013064390 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1013064392} - - component: {fileID: 1013064391} - m_Layer: 0 - m_Name: Gaia Runtime - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1013064391 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1013064390} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 223176b09fd283c4da4828330e326a50, type: 3} - m_Name: - m_EditorClassIdentifier: - m_sceneProfile: {fileID: 64659511} - m_mainCamera: {fileID: 1639919911} - WaterMaterial: {fileID: 0} - m_currentIsUserProfile: 0 - m_typeOfLighting: Morning - m_lightingProfileIndex: 0 - m_waterProfileIndex: 0 - m_postProcessingProfile: Ambient Sample Default Evening Post Processing - m_directToCamera: 1 - m_hDPostProcessingProfile: Ambient Sample Default Evening Post Processing - m_ambientAudio: {fileID: 0} - m_ambientVolume: 0.55 - m_sunRotation: 0 - m_sunPitch: 65 - m_sunColor: {r: 1, g: 1, b: 1, a: 1} - m_sunIntensity: 1 - m_lWSunColor: {r: 1, g: 1, b: 1, a: 1} - m_lWSunIntensity: 1 - m_hDSunColor: {r: 1, g: 1, b: 1, a: 1} - m_hDSunIntensity: 1 - m_shadowCastingMode: 2 - m_shadowStrength: 1 - m_sunShadowResolution: -1 - m_hDShadowDistance: 700 - m_hDShadowResolution: 2 - m_hDContactShadows: 1 - m_hDContactShadowQuality: 1 - m_hDContactShadowCustomQuality: 10 - m_hDContactShadowsDistance: 150 - m_hDContactShadowOpacity: 1 - m_hDMicroShadows: 1 - m_hDMicroShadowOpacity: 1 - m_skyboxHDRI: {fileID: 0} - m_skyboxTint: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_skyboxExposure: 1.6 - m_sunSize: 0.04 - m_sunConvergence: 10 - m_atmosphereThickness: 1 - m_groundColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_hDSkyType: 1 - m_hDSkyUpdateMode: 0 - m_hDHDRISkybox: {fileID: 0} - m_hDHDRIExposure: 0.75 - m_hDHDRIMultiplier: 1 - m_hDGradientTopColor: {r: 0, g: 0, b: 1, a: 1} - m_hDGradientMiddleColor: {r: 0, g: 1, b: 1, a: 1} - m_hDGradientBottomColor: {r: 1, g: 1, b: 1, a: 1} - m_hDGradientDiffusion: 1 - m_hDGradientExposure: 0 - m_hDGradientMultiplier: 1 - m_hDProceduralEnableSunDisk: 1 - m_hDProceduralIncludeSunInBaking: 1 - m_hDProceduralSunSize: 0.015 - m_hDProceduralSunSizeConvergence: 9.5 - m_hDProceduralAtmosphereThickness: 1 - m_hDProceduralSkyTint: - serializedVersion: 2 - rgba: 2155905152 - m_hDProceduralGroundColor: - serializedVersion: 2 - rgba: 4289765780 - m_hDProceduralExposure: 1 - m_hDProceduralMultiplier: 2.5 - m_hDPBSEarthPreset: 1 - m_hDPBSPlanetaryRadius: 6378.759 - m_hDPBSSphericalMode: 1 - m_hDPBSSeaLevel: 50 - m_hDPBSPlantetCenterPosition: {x: 0, y: -6378.759, z: 0} - m_hDPBSPlanetRotation: {x: 0, y: 0, z: 0} - m_hDPBSGroundAlbedoTexture: {fileID: 0} - m_hDPBSGroundTint: {r: 0.5803922, g: 0.6313726, b: 0.6901961, a: 1} - m_hDPBSGroundEmissionTexture: {fileID: 0} - m_hDPBSGroundEmissionMultiplier: 1 - m_hDPBSSpaceRotation: {x: 0, y: 0, z: 0} - m_hDPBSSpaceEmissionTexture: {fileID: 0} - m_hDPBSSpaceEmissionMultiplier: 1 - m_hDPBSAirMaximumAltitude: 70 - m_hDPBSAirOpacity: {r: 1, g: 1, b: 1, a: 1} - m_hDPBSAirAlbedo: {r: 1, g: 1, b: 1, a: 1} - m_hDPBSAirDensityBlue: 0.232 - m_hDPBSAirTint: {r: 0.172, g: 0.074, b: 0.03, a: 1} - m_hDPBSAerosolMaximumAltitude: 8.3 - m_hDPBSAerosolDensity: 0.5 - m_hDPBSAerosolAlbedo: {r: 1, g: 1, b: 1, a: 1} - m_hDPBSAerosolAnisotropy: 0 - m_hDPBSColorSaturation: 1 - m_hDPBSAlphaSaturation: 1 - m_hDPBSAlphaMultiplier: 1 - m_hDPBSHorizonTint: {r: 1, g: 1, b: 1, a: 1} - m_hDPBSHorizonZenithShift: 0 - m_hDPBSZenithTint: {r: 1, g: 1, b: 1, a: 1} - m_hDPBSNumberOfBounces: 8 - m_hDPBSIntensityMode: 0 - m_hDPBSMultiplier: 1 - m_hDPBSExposure: 1 - m_hDPBSIncludeSunInBaking: 1 - m_ambientMode: 1 - m_ambientIntensity: 1 - m_skyAmbient: {r: 1, g: 1, b: 1, a: 1} - m_equatorAmbient: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_groundAmbient: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_hDAmbientMode: 0 - m_hDAmbientDiffuseIntensity: 1 - m_hDAmbientSpecularIntensity: 1 - m_fogMode: 1 - m_fogColor: {r: 1, g: 1, b: 1, a: 1} - m_fogDensity: 0.01 - m_fogStartDistance: 15 - m_fogEndDistance: 800 - m_hDFogType: 3 - m_hDFogType2019_3: 1 - m_hDExponentialFogDensity: 1 - m_hDExponentialFogDistance: 200 - m_hDExponentialFogBaseHeight: 0 - m_hDExponentialFogHeightAttenuation: 0.2 - m_hDExponentialFogMaxDistance: 5000 - m_hDLinearFogDensity: 1 - m_hDLinearFogStart: 5 - m_hDLinearFogEnd: 1200 - m_hDLinearFogHeightStart: 100 - m_hDLinearFogHeightEnd: 800 - m_hDLinearFogMaxDistance: 5000 - m_hDVolumetricFogScatterColor: {r: 1, g: 1, b: 1, a: 1} - m_hDVolumetricFogDistance: 1000 - m_hDVolumetricFogBaseHeight: 100 - m_hDVolumetricFogMeanHeight: 200 - m_hDVolumetricFogAnisotropy: 0.75 - m_hDVolumetricFogProbeDimmer: 0.8 - m_hDVolumetricFogMaxDistance: 5000 - m_hDVolumetricFogDepthExtent: 50 - m_hDVolumetricFogSliceDistribution: 0 - m_lightmappingMode: 2 - m_lightingHasBeenSaved: 0 - m_lightingProfile: {fileID: 0} - m_waterProfile: {fileID: 0} - m_waterHasBeenSaved: 0 - m_masterSkyboxMaterial: {fileID: 0} - m_parentObjects: 1 - m_hideProcessVolume: 1 - m_enablePostProcessing: 1 - m_enableAmbientAudio: 1 - m_enableFog: 1 - m_antiAliasingMode: 4 - m_antiAliasingTAAStrength: 0.7 - m_cameraDithering: 1 - m_cameraAperture: 16 - m_usePhysicalCamera: 0 - m_cameraSensorSize: {x: 70.41, y: 52.63} - m_globalReflectionProbe: 1 - m_gaiaTimeOfDay: - m_todStartingType: 0 - m_todEnabled: 0 - m_todDayTimeScale: 0 - m_todHour: 0 - m_todMinutes: 0 - m_gaiaWeather: - m_season: 0 - m_windDirection: 0 - m_sunLight: {fileID: 1976683114} - m_moonLight: {fileID: 0} - WeatherPresent: 0 - WeatherSystem: {fileID: 0} - m_sunLightExists: 1 - m_moonLightExists: 0 ---- !u!4 &1013064392 -Transform: - m_ObjectHideFlags: 10 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1013064390} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 153.37653, y: -30.114182, z: -275.0286} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1681623027} - - {fileID: 466846473} - - {fileID: 2106284260} - - {fileID: 1734395329} - m_Father: {fileID: 878574876} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1049875510 GameObject: m_ObjectHideFlags: 0 @@ -17846,140 +16836,6 @@ Material: - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} m_BuildTextureStacks: [] m_AllowLocking: 1 ---- !u!1001 &1272320331 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 878574876} - m_Modifications: - - target: {fileID: 4964792250825620171, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_Name - value: VideoCutsceneCanvas - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620171, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, type: 3} ---- !u!224 &1272320332 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b, - type: 3} - m_PrefabInstance: {fileID: 1272320331} - m_PrefabAsset: {fileID: 0} --- !u!21 &1272979647 Material: serializedVersion: 8 @@ -18109,6 +16965,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EffectThreshold: 0 - _EnvironmentReflections: 1 - _FadeDistance: 0 @@ -18128,6 +16985,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _Threshold: 0 - _USEDISTANCEFADE: 0 @@ -18472,265 +17330,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1299217833} m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &1346070948 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 878574876} - m_Modifications: - - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_LocalScale.x - value: 249 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_LocalScale.y - value: 249 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_LocalScale.z - value: 249 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_LocalPosition.x - value: 266.6247 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.93481827 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_LocalPosition.z - value: -398.02856 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098306, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098306, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098306, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: 'm_Materials.Array.data[0]' - value: - objectReference: {fileID: 357896305} - - target: {fileID: 3432910959037098332, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_Name - value: Height Fog Global - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098332, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: noiseMode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: mainCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: fogColorDuo - value: 0.519 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: fogIntensity - value: 0.54 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: fogColorEnd.b - value: 1.7839235 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: fogColorEnd.g - value: 1.3352922 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: fogColorEnd.r - value: 1.2706248 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: skyboxFogFill - value: 0.228 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: fogDistanceEnd - value: 59.4 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: noiseIntensity - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: renderPriority - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: fogColorStart.b - value: 0.36311856 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: fogColorStart.g - value: 0.45629874 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: fogColorStart.r - value: 0.9056604 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: mainDirectional - value: - objectReference: {fileID: 1976683114} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: skyboxFogHeight - value: 0.309 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: fogDistanceStart - value: -21.15 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: fogHeightFalloff - value: 2.7 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: overrideMaterial - value: - objectReference: {fileID: 1386263663} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: skyboxFogFalloff - value: 3.02 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: directionalColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: directionalColor.g - value: 0.7304519 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: directionalColor.r - value: 1.3627833 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: directionalFalloff - value: 2.48 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: fogDistanceFalloff - value: 1.61 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: skyboxFogIntensity - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: directionalIntensity - value: 0.652 - objectReference: {fileID: 0} - - target: {fileID: 3432910959037098333, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - propertyPath: manualPositionAndScale - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a8a6d6581670a5948b357f0ceb83318a, type: 3} ---- !u!4 &1346070949 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, - type: 3} - m_PrefabInstance: {fileID: 1346070948} - m_PrefabAsset: {fileID: 0} --- !u!1 &1369590069 GameObject: m_ObjectHideFlags: 0 @@ -19158,6 +17757,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EffectThreshold: 0 - _EnvironmentReflections: 1 - _FadeDistance: 0 @@ -19177,6 +17777,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _Threshold: 0 - _USEDISTANCEFADE: 0 @@ -20447,280 +19048,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1681403707} m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1681623026 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1681623027} - - component: {fileID: 1681623028} - m_Layer: 0 - m_Name: Terrain Loader - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1681623027 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1681623026} - 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: 1013064392} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1681623028 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1681623026} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4b16076b8d3339d49b9620137d1144a5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_originLoadingBounds: - m_Center: - x: 0 - y: 0 - z: 0 - m_Extents: - x: 250 - y: 250 - z: 250 - m_allFloatingPointFixMembers: [] - m_allWorldSpaceParticleSystems: [] - m_originTargetTileX: 0 - m_originTargetTileZ: 0 - m_terrainUnloadMemoryTreshold: 4294967296 - m_terrainSceneStorage: {fileID: 11400000, guid: e77c9dc71e80603498fc769e93edc553, - type: 2} ---- !u!1001 &1684492592 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 878574876} - m_Modifications: - - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, - type: 3} - propertyPath: m_LocalPosition.x - value: 5.747247 - objectReference: {fileID: 0} - - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, - type: 3} - propertyPath: m_LocalPosition.y - value: -5.0716085 - objectReference: {fileID: 0} - - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, - type: 3} - propertyPath: m_LocalPosition.z - value: 4.4606323 - objectReference: {fileID: 0} - - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4821156325998443022, guid: ae4b0695317d14919ac647ff1705692a, - type: 3} - propertyPath: m_Name - value: SaveSystem - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ae4b0695317d14919ac647ff1705692a, type: 3} ---- !u!4 &1684492593 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, - type: 3} - m_PrefabInstance: {fileID: 1684492592} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1734395328 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1734395329} - - component: {fileID: 1734395330} - m_Layer: 0 - m_Name: Gaia Audio - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1734395329 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1734395328} - 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: 1013064392} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &1734395330 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1734395328} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 0} - m_PlayOnAwake: 1 - m_Volume: 0.55 - m_Pitch: 1 - Loop: 1 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 5000 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!1 &1776088664 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1154969794063037242, guid: ca5617ade2be349c3826daac1e6fdcf2, - type: 3} - m_PrefabInstance: {fileID: 1993521574} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1796977149 PrefabInstance: m_ObjectHideFlags: 0 @@ -20819,135 +19146,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} ---- !u!1001 &1819555269 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 878574876} - m_Modifications: - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 334806193088322423, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - propertyPath: m_Name - value: SkipCanvas - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5b032ea3d671549499706ad50cd78cef, type: 3} ---- !u!224 &1819555270 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 334806193088322419, guid: 5b032ea3d671549499706ad50cd78cef, - type: 3} - m_PrefabInstance: {fileID: 1819555269} - m_PrefabAsset: {fileID: 0} --- !u!1 &1834712248 GameObject: m_ObjectHideFlags: 0 @@ -21434,104 +19632,6 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 1 ---- !u!1001 &1993521574 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 878574876} - m_Modifications: - - target: {fileID: 1154969794063037242, guid: ca5617ade2be349c3826daac1e6fdcf2, - type: 3} - propertyPath: m_Name - value: GameStateManager - objectReference: {fileID: 0} - - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, - type: 3} - propertyPath: m_RootOrder - value: 13 - objectReference: {fileID: 0} - - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 1154969794063037242, guid: ca5617ade2be349c3826daac1e6fdcf2, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1993521576} - m_SourcePrefab: {fileID: 100100000, guid: ca5617ade2be349c3826daac1e6fdcf2, type: 3} ---- !u!4 &1993521575 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1154969794063037245, guid: ca5617ade2be349c3826daac1e6fdcf2, - type: 3} - m_PrefabInstance: {fileID: 1993521574} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1993521576 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1776088664} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5547fefaea58c4174adccc95d48c54ae, type: 3} - m_Name: - m_EditorClassIdentifier: - m_OnTimeScaleChanged: - m_PersistentCalls: - m_Calls: [] --- !u!21 &2050247494 Material: serializedVersion: 8 @@ -21662,6 +19762,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EffectThreshold: 0 - _EnvironmentReflections: 1 - _FadeDistance: 0 @@ -21681,6 +19782,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _Threshold: 0 - _USEDISTANCEFADE: 0 @@ -22123,50 +20225,6 @@ Material: - _SpecColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 ---- !u!1 &2106284259 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2106284260} - - component: {fileID: 2106284261} - m_Layer: 0 - m_Name: Gaia Lighting - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2106284260 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2106284259} - 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: 1013064392} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2106284261 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2106284259} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fb1f567dbec4e7745b9ee94c3cb29f66, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &13319305218930205 GameObject: m_ObjectHideFlags: 0 @@ -26978,6 +25036,89 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!1001 &2394942958327381086 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 913139497171192235, guid: cfbc6a970e156444390379ba06b74bde, + type: 3} + propertyPath: m_Name + value: 2= HELPERS Coliders Video Managers + objectReference: {fileID: 0} + - target: {fileID: 1937122158291733144, guid: cfbc6a970e156444390379ba06b74bde, + type: 3} + propertyPath: m_LocalPosition.x + value: -153.37653 + objectReference: {fileID: 0} + - target: {fileID: 1937122158291733144, guid: cfbc6a970e156444390379ba06b74bde, + type: 3} + propertyPath: m_LocalPosition.y + value: 30.114182 + objectReference: {fileID: 0} + - target: {fileID: 1937122158291733144, guid: cfbc6a970e156444390379ba06b74bde, + type: 3} + propertyPath: m_LocalPosition.z + value: 275.0286 + objectReference: {fileID: 0} + - target: {fileID: 1937122158291733144, guid: cfbc6a970e156444390379ba06b74bde, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1937122158291733144, guid: cfbc6a970e156444390379ba06b74bde, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1937122158291733144, guid: cfbc6a970e156444390379ba06b74bde, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1937122158291733144, guid: cfbc6a970e156444390379ba06b74bde, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1937122158291733144, guid: cfbc6a970e156444390379ba06b74bde, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1937122158291733144, guid: cfbc6a970e156444390379ba06b74bde, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1937122158291733144, guid: cfbc6a970e156444390379ba06b74bde, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8817618723910843367, guid: cfbc6a970e156444390379ba06b74bde, + type: 3} + propertyPath: mainDirectional + value: + objectReference: {fileID: 1976683114} + - target: {fileID: 8817618723910843367, guid: cfbc6a970e156444390379ba06b74bde, + type: 3} + propertyPath: overrideMaterial + value: + objectReference: {fileID: 1386263663} + - target: {fileID: 8817618723910843384, guid: cfbc6a970e156444390379ba06b74bde, + type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 357896305} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cfbc6a970e156444390379ba06b74bde, type: 3} --- !u!1001 &2447561146176030093 PrefabInstance: m_ObjectHideFlags: 0 @@ -37331,7 +35472,7 @@ SceneRoots: - {fileID: 733206742} - {fileID: 392174591} - {fileID: 1002931244} - - {fileID: 878574876} + - {fileID: 2394942958327381086} - {fileID: 1848253884} - {fileID: 1479116614} - {fileID: 782184311} diff --git a/Assets/ScriptableObjects/LevelsData/LevelLoaderData.asset b/Assets/ScriptableObjects/LevelsData/LevelLoaderData.asset index e8e4e7547..847ddc076 100644 --- a/Assets/ScriptableObjects/LevelsData/LevelLoaderData.asset +++ b/Assets/ScriptableObjects/LevelsData/LevelLoaderData.asset @@ -23,7 +23,7 @@ MonoBehaviour: LoadSceneMode: 0 - LevelName: Wasteland_Arenas LevelNameToDisplay: Wasteland - DialogueVariableName: + DialogueVariableName: WastelandTravelUnlocked LoadSceneMode: 0 - LevelName: Ruined_Town LevelNameToDisplay: Ruined Town diff --git a/Assets/Scripts/InvectorDerivatives/bThirdPersonController.cs b/Assets/Scripts/InvectorDerivatives/bThirdPersonController.cs index 7bff94227..d6e7df6db 100644 --- a/Assets/Scripts/InvectorDerivatives/bThirdPersonController.cs +++ b/Assets/Scripts/InvectorDerivatives/bThirdPersonController.cs @@ -14,36 +14,16 @@ namespace Beyond public bool m_ignoreTriggers = true; [Header("Beyond Health Logic")] - // Default cap is 1.0 (100% HP) public float healthRecoveryCap = 1f; + [Header("Beyond's Custom Settings")] - [Tooltip("When 'Use RootMotion' is checked, and this is true, the animation's root motion will control character rotation (for 8-way directional movement). If false, the script will rotate the character to face the input direction.")] public bool useAnimationBasedRotation = false; - [Header("Beyond's Strafe Combat Settings")] - [Tooltip("The name of the animation state to play when rolling forward while strafing. (This is now disabled)")] - public string strafeRollForwardAnim = "Roll_Forward"; // Kept for reference, but won't be used - [Tooltip("The name of the animation state to play when rolling backward while strafing.")] - public string strafeRollBackwardAnim = "Roll_Backward"; - [Tooltip("The name of the animation state to play when rolling left while strafing.")] - public string strafeRollLeftAnim = "Roll_Left"; - [Tooltip("The name of the animation state to play when rolling right while strafing.")] - public string strafeRollRightAnim = "Roll_Right"; + [Header("Beyond's Dash Settings")] + public string dashBlendTreeState = "Dash_Directional"; - // --- UPDATED FIELDS FOR FINER CONTROL --- - [Header("Beyond's Strafe Roll Correction")] - [Tooltip("An additional angle to apply for a LEFT strafe roll.")] - [Range(-90f, 90f)] - public float strafeRollLeftCorrectionAngle = -45f; - - [Tooltip("An additional angle to apply for a RIGHT strafe roll.")] - [Range(-90f, 90f)] - public float strafeRollRightCorrectionAngle = 45f; - - [Tooltip("An additional angle to apply for a BACKWARD strafe roll. Use 0 for a standard 180-degree roll.")] - [Range(-180f, 180f)] - public float strafeRollBackwardCorrectionAngle = 0f; - // --- END OF UPDATED FIELDS --- + // Internal flag to lock animator parameters during dash + private bool _lockAnimParamsForDash = false; public bool GodMode { @@ -59,10 +39,7 @@ namespace Beyond { get { - // Calculate the actual HP limit based on the cap float limitHP = maxHealth * healthRecoveryCap; - - // Add the check: currentHealth must be LESS than the Limit return base.canRecoverHealth && (_currentHealth < limitHP); } } @@ -79,124 +56,86 @@ namespace Beyond protected override void RollBehavior() { - if (!isStrafing) - { - base.RollBehavior(); - return; - } - if (!isRolling) - { - return; - } - Vector3 deltaPosition = new Vector3(animator.deltaPosition.x, 0f, animator.deltaPosition.z); - Vector3 v = (deltaPosition / Time.deltaTime) * (1f - stopMoveWeight); - if (rollUseGravity && animator.GetNormalizedTime(baseLayer) >= rollUseGravityTime) - { - v.y = _rigidbody.linearVelocity.y; - } - _rigidbody.linearVelocity = v; + base.RollBehavior(); } public override void Roll() { - if (isStrafing) - { - TriggerStrafeRoll(strafeRollForwardAnim, strafeRollBackwardAnim, strafeRollLeftAnim, strafeRollRightAnim); - } - else - { - OnRoll.Invoke(); - isRolling = true; - animator.CrossFadeInFixedTime("Roll", rollTransition, baseLayer); - ReduceStamina(rollStamina, false); - currentStaminaRecoveryDelay = 2f; - } + Dash(); } public virtual void Dash() - { - if (isStrafing) - { - TriggerStrafeRoll(strafeRollForwardAnim, strafeRollBackwardAnim, strafeRollLeftAnim, strafeRollRightAnim); - } - else - { - OnRoll.Invoke(); - isRolling = true; - animator.CrossFadeInFixedTime("Dash", rollTransition, baseLayer); - ReduceStamina(rollStamina, false); - currentStaminaRecoveryDelay = 2f; - } - } - - // --- FINAL ROBUST METHOD --- - // This logic now handles all specified cases: - // 1. Sets a base rotation facing the camera to ensure consistency. - // 2. Defaults to a backward roll if input is near-zero (fixing the lingering roll issue). - // 3. Never uses the forward roll; it triggers a backward roll instead. - // 4. Applies a unique correction angle for backward rolls as well as side rolls. - private void TriggerStrafeRoll(string forwardAnim, string backwardAnim, string leftAnim, string rightAnim) { OnRoll.Invoke(); isRolling = true; ReduceStamina(rollStamina, false); currentStaminaRecoveryDelay = 2f; - string animToPlay; - float correctionAngle = 0f; - - // Determine the base "forward" direction from the camera, ignoring vertical tilt. - Vector3 baseForward = Vector3.Scale(Camera.main.transform.forward, new Vector3(1, 0, 1)).normalized; - if (baseForward == Vector3.zero) baseForward = transform.forward; // Fallback - - // Set the character's rotation to this base direction. This provides a clean slate. - transform.rotation = Quaternion.LookRotation(baseForward); - - // Check if input is negligible (joystick is centered). - // input.sqrMagnitude is more efficient than input.magnitude. 0.1*0.1=0.01. - if (input.sqrMagnitude < 0.01f) + // 1. Handle Stationary (Backwards Dash) + if (input.sqrMagnitude < 0.05f) { - // If no input, always perform a backward roll. - animToPlay = backwardAnim; - correctionAngle = strafeRollBackwardCorrectionAngle; + ApplyDashParams(0f, -1f); } else { - // If there IS input, determine the dominant direction. - if (Mathf.Abs(verticalSpeed) >= Mathf.Abs(horizontalSpeed)) + // 2. Handle Directional Input (Camera Relative -> Character Relative) + + // A. Get the Input Direction relative to the Camera + Vector3 inputDir = Vector3.zero; + if (Camera.main != null) { - // Vertical input is dominant. - // ALWAYS use the backward roll, regardless of forward or backward input. - animToPlay = backwardAnim; - correctionAngle = strafeRollBackwardCorrectionAngle; + // Convert joystick input (X,Y) into World Space based on Camera facing + Vector3 camFwd = Vector3.Scale(Camera.main.transform.forward, new Vector3(1, 0, 1)).normalized; + Vector3 camRight = Vector3.Scale(Camera.main.transform.right, new Vector3(1, 0, 1)).normalized; + inputDir = (camFwd * input.y + camRight * input.x).normalized; } else { - // Horizontal input is dominant. - if (horizontalSpeed > 0) - { - animToPlay = rightAnim; - correctionAngle = strafeRollRightCorrectionAngle; - } - else - { - animToPlay = leftAnim; - correctionAngle = strafeRollLeftCorrectionAngle; - } + // Fallback if no camera found + inputDir = new Vector3(input.x, 0, input.y).normalized; } - } - - // Apply the chosen correction angle if it's not zero. - if (correctionAngle != 0f) - { - transform.Rotate(0, correctionAngle, 0); - } - - // Play the selected animation. - animator.CrossFadeInFixedTime(animToPlay, rollTransition, baseLayer); - } - // --- END OF FINAL METHOD --- + // B. Convert that World Direction into the Character's Local Space + // This tells us: "Is the input to the Left, Right, or Forward of ME?" + Vector3 localDir = transform.InverseTransformDirection(inputDir); + + // C. Send to Animator + ApplyDashParams(localDir.x, localDir.z); + } + + // 3. Play Animation + animator.CrossFadeInFixedTime(dashBlendTreeState, rollTransition, baseLayer); + + // 4. Lock parameters briefly so Invector doesn't overwrite them immediately + StartCoroutine(LockDashParamsRoutine()); + } + + // Helper to set params and lock the update loop + private void ApplyDashParams(float x, float y) + { + _lockAnimParamsForDash = true; + animator.SetFloat(vAnimatorParameters.InputHorizontal, x); + animator.SetFloat(vAnimatorParameters.InputVertical, y); + } + + // Release the lock after a short delay (once the blend has firmly started) + private IEnumerator LockDashParamsRoutine() + { + yield return new WaitForSeconds(0.2f); // Adjust this if the blend pops back too soon + _lockAnimParamsForDash = false; + } + + // --- CRITICAL FIX: Override Invector's Parameter Update --- + public override void UpdateAnimatorParameters() + { + // If we are locking parameters for the dash, DO NOT let the base class overwrite them. + if (_lockAnimParamsForDash) return; + + // Otherwise, run standard Invector logic + base.UpdateAnimatorParameters(); + } + + // Standard overrides below... public void OnEvadeStart() { if (!m_GodMode) isImmortal = true; } public void OnEvadeEnd() { if (!m_GodMode) isImmortal = false; } public override void ActionsControl() { base.ActionsControl(); m_isDashing = IsAnimatorTag("IsDashing"); } @@ -286,40 +225,5 @@ namespace Beyond if (isStrafing || !useAnimationBasedRotation) RotateToDirection(dir); } } - - public override void UpdateAnimatorParameters() - { - if (disableAnimations) return; - animator.SetBool(vAnimatorParameters.IsStrafing, isStrafing); - animator.SetBool(vAnimatorParameters.IsSprinting, isSprinting); - animator.SetBool(vAnimatorParameters.IsSliding, isSliding && !isRolling); - animator.SetBool(vAnimatorParameters.IsCrouching, isCrouching); - animator.SetBool(vAnimatorParameters.IsGrounded, isGrounded); - animator.SetBool(vAnimatorParameters.IsDead, isDead); - animator.SetFloat(vAnimatorParameters.GroundDistance, groundDistance); - animator.SetFloat(vAnimatorParameters.GroundAngle, GroundAngleFromDirection()); - if (!isGrounded) animator.SetFloat(vAnimatorParameters.VerticalVelocity, verticalVelocity); - { - if (isStrafing) - { - animator.SetFloat(vAnimatorParameters.InputHorizontal, horizontalSpeed, strafeSpeed.animationSmooth, Time.fixedDeltaTime); - animator.SetFloat(vAnimatorParameters.InputVertical, verticalSpeed, strafeSpeed.animationSmooth, Time.fixedDeltaTime); - } - else - { - animator.SetFloat(vAnimatorParameters.InputVertical, verticalSpeed, freeSpeed.animationSmooth, Time.fixedDeltaTime); - animator.SetFloat(vAnimatorParameters.InputHorizontal, useAnimationBasedRotation ? horizontalSpeed : 0, freeSpeed.animationSmooth, Time.fixedDeltaTime); - } - animator.SetFloat(vAnimatorParameters.InputMagnitude, Mathf.LerpUnclamped(inputMagnitude, 0f, stopMoveWeight), isStrafing ? strafeSpeed.animationSmooth : freeSpeed.animationSmooth, Time.fixedDeltaTime); - if (useLeanMovementAnim && inputMagnitude >= 0.1f) - { - animator.SetFloat(vAnimatorParameters.RotationMagnitude, rotationMagnitude, leanSmooth, Time.fixedDeltaTime); - } - else if (useTurnOnSpotAnim && inputMagnitude < 0.1f) - { - animator.SetFloat(vAnimatorParameters.RotationMagnitude, (float)System.Math.Round(rotationMagnitude, 2), rotationMagnitude == 0 ? 0.1f : 0.01f, Time.fixedDeltaTime); - } - } - } } } \ No newline at end of file diff --git a/Assets/ThirdParty/FluXY/Resources/Materials/FluidSimulation.mat b/Assets/ThirdParty/FluXY/Resources/Materials/FluidSimulation.mat index a5d700298..cda70a682 100644 --- a/Assets/ThirdParty/FluXY/Resources/Materials/FluidSimulation.mat +++ b/Assets/ThirdParty/FluXY/Resources/Materials/FluidSimulation.mat @@ -56,7 +56,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Normals: - m_Texture: {fileID: 2800000, guid: bde6cb2e213a1a84a9a579bfd2ac765e, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: diff --git a/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat b/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat index de8c88d3a..3375fde88 100644 --- a/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat +++ b/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat @@ -65,7 +65,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _BlendOp: 2 + - _BlendOp: 0 - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 @@ -79,7 +79,7 @@ Material: - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 1 m_Colors: diff --git a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog 2.mat b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog 2.mat index 8fa98d7db..851e3ccc2 100644 --- a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog 2.mat +++ b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog 2.mat @@ -117,6 +117,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -131,6 +132,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZTest: 8 diff --git a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog.mat b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog.mat index ca5b0fbfd..7c76df28c 100644 --- a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog.mat +++ b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog.mat @@ -117,6 +117,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -131,6 +132,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZTest: 8 diff --git a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFogORANGE.mat b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFogORANGE.mat index acb89f272..c91cdfaa2 100644 --- a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFogORANGE.mat +++ b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFogORANGE.mat @@ -118,6 +118,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -132,6 +133,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZTest: 8 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index cdf56798d..66da02f1e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -172,7 +172,7 @@ PlayerSettings: buildNumber: Standalone: 0 VisionOS: 0 - iPhone: 2906 + iPhone: tvOS: 0 overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1