diff --git a/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset new file mode 100644 index 000000000..77e68a21d --- /dev/null +++ b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e3976da977cb49238499ea3b4c237ae, type: 3} + m_Name: ProfileDataSourceSettings + m_EditorClassIdentifier: + profileGroupTypes: + - m_GroupTypePrefix: Built-In + m_Variables: + - m_Suffix: BuildPath + m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]' + - m_Suffix: LoadPath + m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]' + environments: [] + currentEnvironment: + id: + projectId: + projectGenesisId: + name: + isDefault: 0 diff --git a/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta new file mode 100644 index 000000000..5c53909ec --- /dev/null +++ b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a3eccb4742d4b4f21b1ec182c1cea80e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/iOS.meta b/Assets/AddressableAssetsData/iOS.meta new file mode 100644 index 000000000..22b355f17 --- /dev/null +++ b/Assets/AddressableAssetsData/iOS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e9b9609bb0414b9fbd9a2ccd579c236 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/iOS/addressables_content_state.bin b/Assets/AddressableAssetsData/iOS/addressables_content_state.bin new file mode 100644 index 000000000..b2cc28167 Binary files /dev/null and b/Assets/AddressableAssetsData/iOS/addressables_content_state.bin differ diff --git a/Assets/AddressableAssetsData/iOS/addressables_content_state.bin.meta b/Assets/AddressableAssetsData/iOS/addressables_content_state.bin.meta new file mode 100644 index 000000000..b70d06fae --- /dev/null +++ b/Assets/AddressableAssetsData/iOS/addressables_content_state.bin.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ea1927ff4c4744e9a81232ca9d70faf4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset index 7382c7dfc..7fd015027 100644 --- a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset +++ b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset @@ -12519,6 +12519,200 @@ MonoBehaviour: height: 30 canvasScrollPosition: {x: 0, y: 0} canvasZoom: 1 + - id: 39 + fields: + - title: Title + value: CH01/WASTELAND/CH01_wasteland_vo_soil_wanderer_01 + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 1 + type: 5 + typeString: CustomFieldType_Actor + overrideSettings: + useOverrides: 0 + overrideSubtitleSettings: 0 + showNPCSubtitlesDuringLine: 1 + showNPCSubtitlesWithResponses: 1 + showPCSubtitlesDuringLine: 0 + skipPCSubtitleAfterResponseMenu: 0 + subtitleCharsPerSecond: 30 + minSubtitleSeconds: 2 + continueButton: 0 + overrideSequenceSettings: 0 + defaultSequence: + defaultPlayerSequence: + defaultResponseMenuSequence: + overrideInputSettings: 0 + alwaysForceResponseMenu: 1 + includeInvalidEntries: 0 + responseTimeout: 0 + cancelSubtitle: + key: 27 + buttonName: + cancelConversation: + key: 27 + buttonName: + nodeColor: + dialogueEntries: + - id: 0 + fields: + - title: Title + value: START + type: 0 + typeString: + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Parenthetical + value: + type: 0 + typeString: + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: + - title: Sequence + value: None() + type: 0 + typeString: + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 39 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: + conditionPriority: 2 + outgoingLinks: + - originConversationID: 39 + originDialogueID: 0 + destinationConversationID: 39 + destinationDialogueID: 1 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 30 + width: 160 + height: 30 + - id: 1 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: The soil seems good here. Strange. If only I had any seeds... + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/VO/CH01/CH01_wasteland_vo_soil_wanderer_01) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 39 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 80 + width: 160 + height: 30 + canvasScrollPosition: {x: 0, y: 0} + canvasZoom: 1 syncInfo: syncActors: 0 syncItems: 0 diff --git a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta index 113452e60..1b083d958 100644 --- a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta +++ b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1a607fb7c63245148a4b4c4861689c00 +guid: 110f2807d70944790b9658e96f82a90c NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Meshes/Terrain/Terrain_Land01.asset b/Assets/Meshes/Terrain/Terrain_Land01.asset index 398ab88d5..d179952e7 100644 Binary files a/Assets/Meshes/Terrain/Terrain_Land01.asset and b/Assets/Meshes/Terrain/Terrain_Land01.asset differ diff --git a/Assets/Meshes/scroll/scrollMat2D.mat b/Assets/Meshes/scroll/scrollMat2D.mat index ac07076e5..44a8bc934 100644 --- a/Assets/Meshes/scroll/scrollMat2D.mat +++ b/Assets/Meshes/scroll/scrollMat2D.mat @@ -138,7 +138,7 @@ Material: - _MaxBrightness: 1 - _Metallic: 0 - _MinBrightness: 0 - - _NoiseScale: 0.98355055 + - _NoiseScale: 0.71705186 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueControl: 0 diff --git a/Assets/PlayMaker/Editor/Resources/EditorStartupPrefs.asset b/Assets/PlayMaker/Editor/Resources/EditorStartupPrefs.asset index f3743574b..4e7a28b91 100644 --- a/Assets/PlayMaker/Editor/Resources/EditorStartupPrefs.asset +++ b/Assets/PlayMaker/Editor/Resources/EditorStartupPrefs.asset @@ -16,5 +16,5 @@ MonoBehaviour: playmakerVersion: showWelcomeScreen: 0 showUpgradeGuide: 0 - lastAutoUpdateSignature: 6000.0.37f1__G:/PROJEKTY/BEYOND/BeyonGit/Assets__0.0.0.0 + lastAutoUpdateSignature: 6000.0.39f1__/Users/marcin/projects/beyondGit/Assets__0.0.0.0 useLegacyNetworking: 0 diff --git a/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta b/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta index 31625e75b..7125741a2 100644 --- a/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta +++ b/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta @@ -1,12 +1,22 @@ fileFormatVersion: 2 guid: 5651992cdad94894a3af7dc3f1da9170 -timeCreated: 1488828285 -PluginImporter: +AssetOrigin: serializedVersion: 1 + productId: 89041 + packageName: Odin Inspector and Serializer + packageVersion: 3.3.1.11 + assetPath: Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll + uploadId: 712389 +PluginImporter: + externalObjects: {} + serializedVersion: 3 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: Any: enabled: 0 @@ -37,30 +47,12 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true - N3DS: - enabled: 1 - settings: {} PS4: enabled: 1 settings: {} - PSM: - enabled: 1 - settings: {} - PSP2: - enabled: 1 - settings: {} - SamsungTV: - enabled: 1 - settings: {} - Tizen: - enabled: 1 - settings: {} WebGL: enabled: 1 settings: {} - WiiU: - enabled: 1 - settings: {} WindowsStoreApps: enabled: 1 settings: @@ -69,7 +61,7 @@ PluginImporter: enabled: 1 settings: {} iOS: - enabled: 1 + enabled: 0 settings: {} tvOS: enabled: 1 @@ -77,10 +69,3 @@ PluginImporter: userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 89041 - packageName: Odin Inspector and Serializer - packageVersion: 3.3.1.11 - assetPath: Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll - uploadId: 712389 diff --git a/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta b/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta index 31dd35ff0..9abed630a 100644 --- a/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta +++ b/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta @@ -1,12 +1,22 @@ fileFormatVersion: 2 guid: 5978f8f3dd274e848fbb7a123bde1fb9 -timeCreated: 1488828285 -PluginImporter: +AssetOrigin: serializedVersion: 1 + productId: 89041 + packageName: Odin Inspector and Serializer + packageVersion: 3.3.1.11 + assetPath: Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll + uploadId: 712389 +PluginImporter: + externalObjects: {} + serializedVersion: 3 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: Any: enabled: 0 @@ -37,30 +47,12 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true - N3DS: - enabled: 1 - settings: {} PS4: enabled: 1 settings: {} - PSM: - enabled: 1 - settings: {} - PSP2: - enabled: 1 - settings: {} - SamsungTV: - enabled: 1 - settings: {} - Tizen: - enabled: 1 - settings: {} WebGL: enabled: 1 settings: {} - WiiU: - enabled: 1 - settings: {} WindowsStoreApps: enabled: 1 settings: @@ -69,7 +61,7 @@ PluginImporter: enabled: 1 settings: {} iOS: - enabled: 1 + enabled: 0 settings: {} tvOS: enabled: 1 @@ -77,10 +69,3 @@ PluginImporter: userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 89041 - packageName: Odin Inspector and Serializer - packageVersion: 3.3.1.11 - assetPath: Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll - uploadId: 712389 diff --git a/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta b/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta index bef999f30..c35cb9eaa 100644 --- a/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta +++ b/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta @@ -1,12 +1,22 @@ fileFormatVersion: 2 guid: d2a8f0021d6b47c5923d8972dfb81ef1 -timeCreated: 1488828285 -PluginImporter: +AssetOrigin: serializedVersion: 1 + productId: 89041 + packageName: Odin Inspector and Serializer + packageVersion: 3.3.1.11 + assetPath: Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll + uploadId: 712389 +PluginImporter: + externalObjects: {} + serializedVersion: 3 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: Android: enabled: 1 @@ -40,44 +50,29 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true - Linux: - enabled: 1 - settings: {} Linux64: enabled: 1 - settings: {} - LinuxUniversal: - enabled: 1 - settings: {} - OSXIntel: - enabled: 1 - settings: {} - OSXIntel64: - enabled: 1 - settings: {} + settings: + CPU: OSXUniversal: enabled: 1 - settings: {} - PSM: - enabled: 0 - settings: {} + settings: + CPU: Win: enabled: 1 - settings: {} + settings: + CPU: Win64: enabled: 1 - settings: {} + settings: + CPU: WindowsStoreApps: enabled: 0 settings: CPU: AnyCPU + iOS: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 89041 - packageName: Odin Inspector and Serializer - packageVersion: 3.3.1.11 - assetPath: Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll - uploadId: 712389 diff --git a/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta b/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta index 26f045c7f..2f62b1238 100644 --- a/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta +++ b/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta @@ -1,12 +1,22 @@ fileFormatVersion: 2 guid: 1e0a9643dc0d4b46bf2321f72c4e503e -timeCreated: 1488828285 -PluginImporter: +AssetOrigin: serializedVersion: 1 + productId: 89041 + packageName: Odin Inspector and Serializer + packageVersion: 3.3.1.11 + assetPath: Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll + uploadId: 712389 +PluginImporter: + externalObjects: {} + serializedVersion: 3 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: Android: enabled: 1 @@ -40,44 +50,29 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true - Linux: - enabled: 1 - settings: {} Linux64: enabled: 1 - settings: {} - LinuxUniversal: - enabled: 1 - settings: {} - OSXIntel: - enabled: 1 - settings: {} - OSXIntel64: - enabled: 1 - settings: {} + settings: + CPU: OSXUniversal: enabled: 1 - settings: {} - PSM: - enabled: 0 - settings: {} + settings: + CPU: Win: enabled: 1 - settings: {} + settings: + CPU: Win64: enabled: 1 - settings: {} + settings: + CPU: WindowsStoreApps: enabled: 0 settings: CPU: AnyCPU + iOS: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 89041 - packageName: Odin Inspector and Serializer - packageVersion: 3.3.1.11 - assetPath: Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll - uploadId: 712389 diff --git a/Assets/Prefabs/Gameplay/PlantableTrees/Healing TreePlantingSpotForQuest Variant.prefab b/Assets/Prefabs/Gameplay/PlantableTrees/Healing TreePlantingSpotForQuest Variant.prefab index 4c7ddbaab..fc5e2955a 100644 --- a/Assets/Prefabs/Gameplay/PlantableTrees/Healing TreePlantingSpotForQuest Variant.prefab +++ b/Assets/Prefabs/Gameplay/PlantableTrees/Healing TreePlantingSpotForQuest Variant.prefab @@ -25,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 139839968158507851} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} m_LocalPosition: {x: 0.08, y: 0.356, z: 0.315} m_LocalScale: {x: 0.35301396, y: 0.35301396, z: 1.1389878} @@ -32,7 +33,6 @@ Transform: m_Children: - {fileID: 6923594407329898355} m_Father: {fileID: 8965238848854875013} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 270, y: 180, z: 270} --- !u!198 &6990465497636818693 ParticleSystem: @@ -234,6 +234,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -263,6 +264,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -476,6 +478,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 0 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 80 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -1187,6 +1190,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -1216,6 +1220,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -3436,6 +3441,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3465,6 +3471,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -3854,6 +3861,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -3896,6 +3904,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3925,6 +3934,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -4012,6 +4022,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4041,6 +4052,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -4079,6 +4091,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4108,6 +4121,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -4361,6 +4375,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4390,6 +4405,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -4627,6 +4643,9 @@ ParticleSystemRenderer: m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4665,13 +4684,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -4706,13 +4727,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1998269985188858804} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} m_LocalPosition: {x: 0.088995606, y: 0.327, z: 0.32599562} m_LocalScale: {x: 0.5624641, y: 0.5624641, z: 0.31224492} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8965238848854875013} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 270, y: 180, z: 270} --- !u!198 &2900069582321860403 ParticleSystem: @@ -4914,6 +4935,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4943,6 +4965,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -5156,6 +5179,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 0 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 20 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -5867,6 +5891,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 5 m_NumAlphaKeys: 4 minGradient: @@ -5896,6 +5921,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -8116,6 +8142,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8145,6 +8172,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -8534,6 +8562,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -8576,6 +8605,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8605,6 +8635,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -8692,6 +8723,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8721,6 +8753,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -8759,6 +8792,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8788,6 +8822,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -9041,6 +9076,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9070,6 +9106,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -9307,6 +9344,9 @@ ParticleSystemRenderer: m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9345,13 +9385,15 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 1 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 1 m_VertexStreams: 0001030405050809 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 4300000, guid: 77e81466b7969ab43b54f0c4e3b7cd38, type: 3} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -9384,6 +9426,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5921227893326390203} + serializedVersion: 2 m_LocalRotation: {x: 0.000000007450581, y: 0.000000078231096, z: -1, w: -0.000000028871} m_LocalPosition: {x: 0.205, y: 0.471, z: -0.824} m_LocalScale: {x: 2.5, y: 0.8, z: 2.5} @@ -9392,7 +9435,6 @@ Transform: - {fileID: 6941538145654143318} - {fileID: 1493886893303690197} m_Father: {fileID: 53440439079976238} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6615839302969425619 GameObject: @@ -9417,13 +9459,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6615839302969425619} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6941538145654143318} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &7901797839666673240 GameObject: @@ -9448,6 +9490,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7901797839666673240} + 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} @@ -9463,13 +9506,13 @@ Transform: - {fileID: 774920350206791272} - {fileID: 5509008750826585328} m_Father: {fileID: 2906344595654306141} - m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &519992818672720581 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7437385053265250751} m_Modifications: - target: {fileID: -8679921383154817045, guid: 7db74e85ed564094aaa0d5ce85f65da5, @@ -9548,6 +9591,13 @@ PrefabInstance: value: Healing_Fruit objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 7db74e85ed564094aaa0d5ce85f65da5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8965238848854875013} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7db74e85ed564094aaa0d5ce85f65da5, type: 3} --- !u!4 &53440439079976238 stripped Transform: @@ -9560,6 +9610,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 201260444038072286, guid: 402d108d8c99c104c863eb0979032856, @@ -9584,7 +9635,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 908934803321971099, guid: 402d108d8c99c104c863eb0979032856, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 3a7c529ced511284b8eec58ce1a51c1a, type: 2} - target: {fileID: 1601786792544769760, guid: 402d108d8c99c104c863eb0979032856, @@ -9594,7 +9645,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2122439751128706189, guid: 402d108d8c99c104c863eb0979032856, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 94b434055fa6ec14c815ed6b755062c8, type: 2} - target: {fileID: 2141460759088993208, guid: 402d108d8c99c104c863eb0979032856, @@ -9619,7 +9670,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3162920679139064021, guid: 402d108d8c99c104c863eb0979032856, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: ac1d40e1744f7c04f8e725cc90824866, type: 2} - target: {fileID: 3187914432799523423, guid: 402d108d8c99c104c863eb0979032856, @@ -9644,27 +9695,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, type: 3} - propertyPath: fruits.Array.data[0] + propertyPath: 'fruits.Array.data[0]' value: objectReference: {fileID: 7437385053265014863} - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, type: 3} - propertyPath: fruits.Array.data[1] + propertyPath: 'fruits.Array.data[1]' value: objectReference: {fileID: 0} - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, type: 3} - propertyPath: fruits.Array.data[2] + propertyPath: 'fruits.Array.data[2]' value: objectReference: {fileID: 0} - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, type: 3} - propertyPath: fruits.Array.data[3] + propertyPath: 'fruits.Array.data[3]' value: objectReference: {fileID: 0} - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, type: 3} - propertyPath: fruits.Array.data[4] + propertyPath: 'fruits.Array.data[4]' value: objectReference: {fileID: 0} - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, @@ -9809,10 +9860,21 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8968724822431452495, guid: 402d108d8c99c104c863eb0979032856, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: ac1d40e1744f7c04f8e725cc90824866, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4112471969828150773, guid: 402d108d8c99c104c863eb0979032856, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5262550333875621384} + - targetCorrespondingSourceObject: {fileID: 8534849301328608535, guid: 402d108d8c99c104c863eb0979032856, + type: 3} + insertIndex: -1 + addedObject: {fileID: 53440439079976238} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 402d108d8c99c104c863eb0979032856, type: 3} --- !u!4 &2906344595654306141 stripped Transform: @@ -9837,6 +9899,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5262550333875621384} m_Modifications: - target: {fileID: 3319128898925174022, guid: ee5b1415613ee514fb832b7177573e15, @@ -9905,6 +9968,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ee5b1415613ee514fb832b7177573e15, type: 3} --- !u!4 &3492409794278360503 stripped Transform: @@ -9917,6 +9983,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5262550333875621384} m_Modifications: - target: {fileID: 3319128898925174022, guid: ee5b1415613ee514fb832b7177573e15, @@ -9985,6 +10052,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ee5b1415613ee514fb832b7177573e15, type: 3} --- !u!4 &774920350206791272 stripped Transform: @@ -9997,6 +10067,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5262550333875621384} m_Modifications: - target: {fileID: 3319128898925174022, guid: ee5b1415613ee514fb832b7177573e15, @@ -10065,6 +10136,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ee5b1415613ee514fb832b7177573e15, type: 3} --- !u!4 &19433462313429125 stripped Transform: @@ -10077,6 +10151,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5262550333875621384} m_Modifications: - target: {fileID: 3319128898925174022, guid: ee5b1415613ee514fb832b7177573e15, @@ -10145,6 +10220,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ee5b1415613ee514fb832b7177573e15, type: 3} --- !u!4 &1643393667154911763 stripped Transform: @@ -10157,6 +10235,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5262550333875621384} m_Modifications: - target: {fileID: 3319128898925174022, guid: ee5b1415613ee514fb832b7177573e15, @@ -10225,6 +10304,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ee5b1415613ee514fb832b7177573e15, type: 3} --- !u!4 &1335719900612002006 stripped Transform: @@ -10237,6 +10319,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5262550333875621384} m_Modifications: - target: {fileID: 3319128898925174022, guid: ee5b1415613ee514fb832b7177573e15, @@ -10305,6 +10388,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ee5b1415613ee514fb832b7177573e15, type: 3} --- !u!4 &8985379068156495249 stripped Transform: @@ -10317,6 +10403,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5262550333875621384} m_Modifications: - target: {fileID: 3319128898925174022, guid: ee5b1415613ee514fb832b7177573e15, @@ -10385,6 +10472,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ee5b1415613ee514fb832b7177573e15, type: 3} --- !u!4 &8916328003291671256 stripped Transform: @@ -10397,6 +10487,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5262550333875621384} m_Modifications: - target: {fileID: 3319128898925174022, guid: ee5b1415613ee514fb832b7177573e15, @@ -10465,6 +10556,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ee5b1415613ee514fb832b7177573e15, type: 3} --- !u!4 &5509008750826585328 stripped Transform: @@ -10477,6 +10571,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5262550333875621384} m_Modifications: - target: {fileID: 3319128898925174022, guid: ee5b1415613ee514fb832b7177573e15, @@ -10545,6 +10640,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ee5b1415613ee514fb832b7177573e15, type: 3} --- !u!4 &5797594893695196610 stripped Transform: diff --git a/Assets/Prefabs/Gameplay/PlantableTrees/Justice TreePlantingSpotForQuest.prefab b/Assets/Prefabs/Gameplay/PlantableTrees/Justice TreePlantingSpotForQuest.prefab index a22515763..bed6c2dfc 100644 --- a/Assets/Prefabs/Gameplay/PlantableTrees/Justice TreePlantingSpotForQuest.prefab +++ b/Assets/Prefabs/Gameplay/PlantableTrees/Justice TreePlantingSpotForQuest.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 446959077273890489} + 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: 4112471969828150773} - m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6998130222576508640 MeshFilter: @@ -50,9 +50,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 446959077273890489} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 1.5 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &98241534966855410 @@ -131,7 +139,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7816249412459869520} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -211,7 +218,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7816249412459869520} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -287,7 +293,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7816249412459869520} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -367,7 +372,6 @@ RectTransform: m_Children: - {fileID: 7816249412459869520} m_Father: {fileID: 4112471969828150773} - m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -391,7 +395,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -506,7 +512,6 @@ RectTransform: - {fileID: 8401215896120442273} - {fileID: 2149057315768146276} m_Father: {fileID: 6709144120059555826} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -625,6 +630,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4112471970013293016} m_Modifications: - target: {fileID: 2510702358515179209, guid: 36b5d62e893d0d444aac01939d500a82, @@ -688,12 +694,22 @@ PrefabInstance: value: Healing_Tree_FXBlue objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 36b5d62e893d0d444aac01939d500a82, type: 3} +--- !u!4 &132402383031713847 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2510702358515179209, guid: 36b5d62e893d0d444aac01939d500a82, + type: 3} + m_PrefabInstance: {fileID: 2522487731864280830} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5578979626250620257 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4112471969828150773} m_Modifications: - target: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, @@ -757,7 +773,16 @@ PrefabInstance: value: Compas_Mark objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 706ff2a2e06b91f44b298ec98aeb6040, type: 3} +--- !u!4 &7618407170746041473 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, + type: 3} + m_PrefabInstance: {fileID: 5578979626250620257} + m_PrefabAsset: {fileID: 0} --- !u!1 &7618407170746041475 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2654450439517637090, guid: 706ff2a2e06b91f44b298ec98aeb6040, @@ -769,6 +794,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 240327425419743248, guid: 17ff9563aca45b14e9a346222591778e, @@ -788,7 +814,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1853998213109394855, guid: 17ff9563aca45b14e9a346222591778e, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 5a6d538c2a0a3a740b413829eeeab211, type: 2} - target: {fileID: 3134124996542120427, guid: 17ff9563aca45b14e9a346222591778e, @@ -818,7 +844,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5632039002061887549, guid: 17ff9563aca45b14e9a346222591778e, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 5a6d538c2a0a3a740b413829eeeab211, type: 2} - target: {fileID: 6692236138095558036, guid: 17ff9563aca45b14e9a346222591778e, @@ -958,27 +984,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6692236139593661697, guid: 17ff9563aca45b14e9a346222591778e, type: 3} - propertyPath: fruits.Array.data[0] + propertyPath: 'fruits.Array.data[0]' value: objectReference: {fileID: 8534849301328381159} - target: {fileID: 6692236139593661697, guid: 17ff9563aca45b14e9a346222591778e, type: 3} - propertyPath: fruits.Array.data[1] + propertyPath: 'fruits.Array.data[1]' value: objectReference: {fileID: 4401076856757358727} - target: {fileID: 6692236139593661697, guid: 17ff9563aca45b14e9a346222591778e, type: 3} - propertyPath: fruits.Array.data[2] + propertyPath: 'fruits.Array.data[2]' value: objectReference: {fileID: 26001842405838743} - target: {fileID: 6692236139593661697, guid: 17ff9563aca45b14e9a346222591778e, type: 3} - propertyPath: fruits.Array.data[3] + propertyPath: 'fruits.Array.data[3]' value: objectReference: {fileID: 7643641981534622360} - target: {fileID: 6692236139593661697, guid: 17ff9563aca45b14e9a346222591778e, type: 3} - propertyPath: fruits.Array.data[4] + propertyPath: 'fruits.Array.data[4]' value: objectReference: {fileID: 0} - target: {fileID: 6692236139593661703, guid: 17ff9563aca45b14e9a346222591778e, @@ -1063,10 +1089,33 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7588804357658214771, guid: 17ff9563aca45b14e9a346222591778e, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 43046b076465b07498399e36b52becfd, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6692236139593661725, guid: 17ff9563aca45b14e9a346222591778e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5275100318401794827} + - targetCorrespondingSourceObject: {fileID: 6692236139593661725, guid: 17ff9563aca45b14e9a346222591778e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6709144120059555826} + - targetCorrespondingSourceObject: {fileID: 6692236139593661725, guid: 17ff9563aca45b14e9a346222591778e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7618407170746041473} + - targetCorrespondingSourceObject: {fileID: 6692236138741877040, guid: 17ff9563aca45b14e9a346222591778e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 132402383031713847} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6692236139593661703, guid: 17ff9563aca45b14e9a346222591778e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5786784648644637748} m_SourcePrefab: {fileID: 100100000, guid: 17ff9563aca45b14e9a346222591778e, type: 3} --- !u!1 &26001842405838743 stripped GameObject: diff --git a/Assets/Quests/CH01Quest.asset b/Assets/Quests/CH01Quest.asset new file mode 100644 index 000000000..dc8805fcb --- /dev/null +++ b/Assets/Quests/CH01Quest.asset @@ -0,0 +1,2022 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-9020301881323555090 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: f0ed0c4e68ee98946bb5016adda42373, type: 3} + m_Name: BodyTextQuestContent + m_EditorClassIdentifier: + m_contentID: -1 + m_bodyText: + m_text: Find hidden chest. + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 +--- !u!114 &-8714647905644244631 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: f0ed0c4e68ee98946bb5016adda42373, type: 3} + m_Name: + m_EditorClassIdentifier: + m_contentID: -1 + m_bodyText: + m_text: "Find Gate\u2019s Lock Mechanism." + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 +--- !u!114 &-8282701381122338540 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c94e8fb3b9b54114cbe8185003729c1b, type: 3} + m_Name: SceneEventQuestAction + m_EditorClassIdentifier: + m_guid: bc1dccc8-48bc-402d-9cd9-eacc9074ec83 +--- !u!114 &-8151542260930034530 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 5682394e55a192147a020b9edf624e51, type: 3} + m_Name: + m_EditorClassIdentifier: + m_alreadyTrue: 0 + m_senderSpecifier: 0 + m_senderID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_targetSpecifier: 0 + m_targetID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_message: + m_text: Mechanism + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_parameter: + m_text: Found2 + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_value: + m_valueType: 0 + m_intValue: 0 + m_stringValue: +--- !u!114 &-8039152840606679552 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 5682394e55a192147a020b9edf624e51, type: 3} + m_Name: MessageQuestCondition + m_EditorClassIdentifier: + m_alreadyTrue: 0 + m_senderSpecifier: 0 + m_senderID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_targetSpecifier: 0 + m_targetID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_message: + m_text: Spiders + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_parameter: + m_text: Killed + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_value: + m_valueType: 0 + m_intValue: 0 + m_stringValue: +--- !u!114 &-7916902592132626239 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 5682394e55a192147a020b9edf624e51, type: 3} + m_Name: MessageQuestCondition + m_EditorClassIdentifier: + m_alreadyTrue: 0 + m_senderSpecifier: 0 + m_senderID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_targetSpecifier: 0 + m_targetID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_message: + m_text: Puzzle + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_parameter: + m_text: Solved + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_value: + m_valueType: 0 + m_intValue: 0 + m_stringValue: +--- !u!114 &-7740959982868471990 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c94e8fb3b9b54114cbe8185003729c1b, type: 3} + m_Name: SceneEventQuestAction + m_EditorClassIdentifier: + m_guid: c58676d5-1677-4686-8090-6d76053cc2ce +--- !u!114 &-7526353389944505753 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: d8dd425597ce38647ade6025cfd66c5e, type: 3} + m_Name: ActivateGameObjectQuestAction + m_EditorClassIdentifier: + m_gameObjectName: + m_text: Compas_Mark_Water + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_state: 0 +--- !u!114 &-6723023004039463148 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 5682394e55a192147a020b9edf624e51, type: 3} + m_Name: MessageQuestCondition + m_EditorClassIdentifier: + m_alreadyTrue: 0 + m_senderSpecifier: 0 + m_senderID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_targetSpecifier: 0 + m_targetID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_message: + m_text: Run + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_parameter: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_value: + m_valueType: 0 + m_intValue: 0 + m_stringValue: +--- !u!114 &-5899254971968155588 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: f0ed0c4e68ee98946bb5016adda42373, type: 3} + m_Name: BodyTextQuestContent + m_EditorClassIdentifier: + m_contentID: -1 + m_bodyText: + m_text: Search hidden grotto. + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 +--- !u!114 &-5494248535777933898 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: a976671aaa12c2e428b2aac89a260302, type: 3} + m_Name: CounterQuestCondition + m_EditorClassIdentifier: + m_alreadyTrue: 0 + m_counterIndex: 2 + m_counterValueMode: 0 + m_requiredCounterValue: + m_valueType: 0 + m_literalValue: 2 + m_counterIndex: 0 +--- !u!114 &-5481774517848588486 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 5682394e55a192147a020b9edf624e51, type: 3} + m_Name: MessageQuestCondition + m_EditorClassIdentifier: + m_alreadyTrue: 0 + m_senderSpecifier: 0 + m_senderID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_targetSpecifier: 0 + m_targetID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_message: + m_text: Mechanism + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_parameter: + m_text: Found + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_value: + m_valueType: 0 + m_intValue: 0 + m_stringValue: +--- !u!114 &-5442638969398486724 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c94e8fb3b9b54114cbe8185003729c1b, type: 3} + m_Name: SceneEventQuestAction + m_EditorClassIdentifier: + m_guid: a7f865e7-6d60-43c4-ba32-2a4dabf24db2 +--- !u!114 &-5406664876437345107 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: f0ed0c4e68ee98946bb5016adda42373, type: 3} + m_Name: BodyTextQuestContent + m_EditorClassIdentifier: + m_contentID: -1 + m_bodyText: + m_text: Search camp for water. + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 +--- !u!114 &-5190078906094045055 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c94e8fb3b9b54114cbe8185003729c1b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_guid: d34d3d84-b9e0-46c5-8e23-f6a2864f2416 +--- !u!114 &-4771603523029466207 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 6b99cc2a156c22e46b4fb74b06a4d1e8, type: 3} + m_Name: AlertQuestAction + m_EditorClassIdentifier: + m_contentList: + - {fileID: 6014942729723845209} + m_contentListSerializationProxy: [] +--- !u!114 &-4223202286099066847 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c47e1bb9cdd9a474c8d3f5d555d7533a, type: 3} + m_Name: HeadingTextQuestContent + m_EditorClassIdentifier: + m_contentID: -1 + m_useQuestTitle: 0 + m_headingText: + m_text: Explore the Wasteland to find a way to open the gate + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_headingLevel: 1 +--- !u!114 &-4124190152912583226 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c94e8fb3b9b54114cbe8185003729c1b, type: 3} + m_Name: SceneEventQuestAction + m_EditorClassIdentifier: + m_guid: 3a621e45-dcb0-4530-8aa5-c87bdec64013 +--- !u!114 &-4008568600228408968 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c94e8fb3b9b54114cbe8185003729c1b, type: 3} + m_Name: SceneEventQuestAction + m_EditorClassIdentifier: + m_guid: 1855a182-5cdf-4e1b-a889-79c08bde0a75 +--- !u!114 &-3870507432524018738 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c47e1bb9cdd9a474c8d3f5d555d7533a, type: 3} + m_Name: HeadingTextQuestContent + m_EditorClassIdentifier: + m_contentID: -1 + m_useQuestTitle: 0 + m_headingText: + m_text: Follow the Ancient Path. + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_headingLevel: 1 +--- !u!114 &-3802807771849280064 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c94e8fb3b9b54114cbe8185003729c1b, type: 3} + m_Name: SceneEventQuestAction + m_EditorClassIdentifier: + m_guid: 0f2d0121-d076-4e29-8308-e1ce628448f4 +--- !u!114 &-2856438539077179385 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 5682394e55a192147a020b9edf624e51, type: 3} + m_Name: MessageQuestCondition + m_EditorClassIdentifier: + m_alreadyTrue: 0 + m_senderSpecifier: 0 + m_senderID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_targetSpecifier: 0 + m_targetID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_message: + m_text: Chest + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_parameter: + m_text: Found + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_value: + m_valueType: 0 + m_intValue: 0 + m_stringValue: +--- !u!114 &-2842319491797065277 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: f0ed0c4e68ee98946bb5016adda42373, type: 3} + m_Name: BodyTextQuestContent + m_EditorClassIdentifier: + m_contentID: -1 + m_bodyText: + m_text: Kill all spiders and flies + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 +--- !u!114 &-2154981843599162001 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c94e8fb3b9b54114cbe8185003729c1b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_guid: de0e9d37-f90c-4c26-8088-60d305c0111b +--- !u!114 &-1611768628708038484 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 5682394e55a192147a020b9edf624e51, type: 3} + m_Name: MessageQuestCondition + m_EditorClassIdentifier: + m_alreadyTrue: 0 + m_senderSpecifier: 0 + m_senderID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_targetSpecifier: 0 + m_targetID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_message: + m_text: Searched + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_parameter: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_value: + m_valueType: 0 + m_intValue: 0 + m_stringValue: +--- !u!114 &-1180951311363302183 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: f0ed0c4e68ee98946bb5016adda42373, type: 3} + m_Name: BodyTextQuestContent + m_EditorClassIdentifier: + m_contentID: -1 + m_bodyText: + m_text: 'Plant and grow Tree of peace ({#TreeOfPeace}/1) + + Plant and grow + Tree of justice ({#TreeOfJustice}/1)' + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 +--- !u!114 &-560062602025882877 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 5682394e55a192147a020b9edf624e51, type: 3} + m_Name: MessageQuestCondition + m_EditorClassIdentifier: + m_alreadyTrue: 0 + m_senderSpecifier: 0 + m_senderID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_targetSpecifier: 0 + m_targetID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_message: + m_text: Gate + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_parameter: + m_text: Reached + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_value: + m_valueType: 0 + m_intValue: 0 + m_stringValue: +--- !u!114 &-543855514932724076 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 5682394e55a192147a020b9edf624e51, type: 3} + m_Name: MessageQuestCondition + m_EditorClassIdentifier: + m_alreadyTrue: 0 + m_senderSpecifier: 0 + m_senderID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_targetSpecifier: 0 + m_targetID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_message: + m_text: Hellhounds + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_parameter: + m_text: Defeated + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_value: + m_valueType: 0 + m_intValue: 0 + m_stringValue: +--- !u!114 &-372959344455686724 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c94e8fb3b9b54114cbe8185003729c1b, type: 3} + m_Name: SceneEventQuestAction + m_EditorClassIdentifier: + m_guid: 3593f163-e0e9-45e7-93d6-a5c69b4b8a5d +--- !u!114 &-354742098804520941 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: a976671aaa12c2e428b2aac89a260302, type: 3} + m_Name: CounterQuestCondition + m_EditorClassIdentifier: + m_alreadyTrue: 0 + m_counterIndex: 0 + m_counterValueMode: 0 + m_requiredCounterValue: + m_valueType: 0 + m_literalValue: 1 + m_counterIndex: 0 +--- !u!114 &-97852066575752837 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: f0ed0c4e68ee98946bb5016adda42373, type: 3} + m_Name: BodyTextQuestContent + m_EditorClassIdentifier: + m_contentID: -1 + m_bodyText: + m_text: Defeat Hellhounds. + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 641a501636ec3644993211c008d9a8a4, type: 3} + m_Name: CH01Quest + m_EditorClassIdentifier: + m_isInstance: 0 + m_originalAsset: {fileID: 0} + m_fileVersion: 1 + m_id: + m_text: CH01Quest + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_title: + m_text: Follow the Ancient Path + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_icon: {fileID: 0} + m_group: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_labels: [] + m_questGiverID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_isTrackable: 1 + m_showInTrackHUD: 1 + m_isAbandonable: 0 + m_rememberIfAbandoned: 0 + m_deleteWhenComplete: 0 + m_autostartConditionSet: + m_conditionList: [] + m_conditionCountMode: 0 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_offerConditionSet: + m_conditionList: [] + m_conditionCountMode: 0 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_offerConditionsUnmetContentList: [] + m_offerContentList: [] + m_maxTimes: 1 + m_timesAccepted: 0 + m_cooldownSeconds: 3600 + m_cooldownSecondsRemaining: 0 + m_noRepeatIfSuccessful: 0 + m_saveAllIfWaitingToStart: 0 + m_state: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_counterList: + - m_name: + m_text: TreeOfJustice + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_currentValue: 0 + m_randomizeInitialValue: 0 + m_minValue: 0 + m_maxValue: 999 + m_updateMode: 1 + m_messageEventList: + - m_senderSpecifier: 0 + m_senderID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_targetSpecifier: 0 + m_targetID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_message: + m_text: TreeOfJustice + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_parameter: + m_text: Planted + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_operation: 2 + m_literalValue: 1 + - m_name: + m_text: TreeOfPeace + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_currentValue: 0 + m_randomizeInitialValue: 0 + m_minValue: 0 + m_maxValue: 999 + m_updateMode: 1 + m_messageEventList: + - m_senderSpecifier: 0 + m_senderID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_targetSpecifier: 0 + m_targetID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_message: + m_text: TreeOfPeace + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_parameter: + m_text: Planted + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_operation: 2 + m_literalValue: 1 + - m_name: + m_text: TreesHealed + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_currentValue: 0 + m_randomizeInitialValue: 0 + m_minValue: 0 + m_maxValue: 999 + m_updateMode: 1 + m_messageEventList: + - m_senderSpecifier: 0 + m_senderID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_targetSpecifier: 0 + m_targetID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_message: + m_text: Tree + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_parameter: + m_text: Healed + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_operation: 2 + m_literalValue: 1 + m_nodeList: + - m_id: + m_text: Quest-347208.start + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: Start + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 0 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_conditionSet: + m_conditionList: [] + m_conditionCountMode: 0 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: 01000000 + m_canvasRect: + serializedVersion: 2 + x: 340.3895 + y: 23.448273 + width: 120 + height: 48 + - m_id: + m_text: findTheGate + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 4 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: + - {fileID: -4771603523029466207} + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: + - {fileID: -3870507432524018738} + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_conditionSet: + m_conditionList: + - {fileID: -560062602025882877} + m_conditionCountMode: 1 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: 02000000 + m_canvasRect: + serializedVersion: 2 + x: 341 + y: 161.1183 + width: 120 + height: 48 + - m_id: + m_text: findLockMech + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 4 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: + - {fileID: -4124190152912583226} + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: + - {fileID: -4223202286099066847} + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_conditionSet: + m_conditionList: + - {fileID: -5481774517848588486} + m_conditionCountMode: 1 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: 0b000000 + m_canvasRect: + serializedVersion: 2 + x: 347 + y: 259 + width: 120 + height: 48 + - m_id: + m_text: pullLevers + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 4 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: + - {fileID: 7382125966846504000} + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_conditionSet: + m_conditionList: + - {fileID: -7916902592132626239} + m_conditionCountMode: 1 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: 04000000 + m_canvasRect: + serializedVersion: 2 + x: 356.337 + y: 615.1617 + width: 120 + height: 48 + - m_id: + m_text: searchGrotto + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 4 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: + - {fileID: -8282701381122338540} + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: + - {fileID: -5899254971968155588} + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_conditionSet: + m_conditionList: + - {fileID: 1171506370593650196} + m_conditionCountMode: 1 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: 0f000000 + m_canvasRect: + serializedVersion: 2 + x: 355.72208 + y: 675.0296 + width: 120 + height: 48 + - m_id: + m_text: goBackToGate + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 4 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: + - {fileID: -3802807771849280064} + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: + - {fileID: 144283012258030152} + - m_actionList: + - {fileID: -5442638969398486724} + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_conditionSet: + m_conditionList: + - {fileID: 1814095552216141163} + m_conditionCountMode: 1 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: 06000000 + m_canvasRect: + serializedVersion: 2 + x: 353.654 + y: 788.1569 + width: 120 + height: 48 + - m_id: + m_text: searchCamp + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 4 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: + - {fileID: 413119400279711413} + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: + - {fileID: -5406664876437345107} + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_conditionSet: + m_conditionList: + - {fileID: -1611768628708038484} + m_conditionCountMode: 1 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: 07000000 + m_canvasRect: + serializedVersion: 2 + x: 356.73093 + y: 848.49023 + width: 120 + height: 48 + - m_id: + m_text: defeatHellhouds + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 4 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: + - {fileID: -7526353389944505753} + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: + - {fileID: -97852066575752837} + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_conditionSet: + m_conditionList: + - {fileID: -543855514932724076} + m_conditionCountMode: 1 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: 08000000 + m_canvasRect: + serializedVersion: 2 + x: 355.6671 + y: 930.31995 + width: 120 + height: 48 + - m_id: + m_text: runAway + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 4 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: + - {fileID: 8814208672737422606} + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: + - {fileID: 3548959841742951032} + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_conditionSet: + m_conditionList: + - {fileID: -6723023004039463148} + m_conditionCountMode: 1 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: 09000000 + m_canvasRect: + serializedVersion: 2 + x: 355.73444 + y: 1003.40735 + width: 120 + height: 48 + - m_id: + m_text: approachTheAncientPortal + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 4 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: + - {fileID: 5019824549885845002} + - m_actionList: + - {fileID: 2880784524633413273} + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_conditionSet: + m_conditionList: + - {fileID: 3170730037706639940} + m_conditionCountMode: 1 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: 0a000000 + m_canvasRect: + serializedVersion: 2 + x: 359.18027 + y: 1077.3867 + width: 120 + height: 48 + - m_id: + m_text: Success + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 1 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: + - {fileID: 2167511981805215444} + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_conditionSet: + m_conditionList: [] + m_conditionCountMode: 1 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: + m_canvasRect: + serializedVersion: 2 + x: 357.86728 + y: 1162.7292 + width: 120 + height: 35 + - m_id: + m_text: KillSpiders + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 4 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: + - {fileID: 6025137215203678714} + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: + - {fileID: -2842319491797065277} + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_conditionSet: + m_conditionList: + - {fileID: -8039152840606679552} + m_conditionCountMode: 1 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: 0c000000 + m_canvasRect: + serializedVersion: 2 + x: 347 + y: 327 + width: 120 + height: 48 + - m_id: + m_text: PlantTwoTrees + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 4 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: + - {fileID: -7740959982868471990} + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: + - {fileID: -1180951311363302183} + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_conditionSet: + m_conditionList: + - {fileID: 3969824075430178034} + - {fileID: -354742098804520941} + m_conditionCountMode: 1 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: 0d000000 + m_canvasRect: + serializedVersion: 2 + x: 356.06522 + y: 408.59772 + width: 120 + height: 48 + - m_id: + m_text: HealTwoTrees + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 4 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: + - m_actionList: + - {fileID: -4008568600228408968} + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: + - {fileID: -372959344455686724} + - {fileID: 8098057326302520009} + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: + - {fileID: 3070882605192180540} + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_conditionSet: + m_conditionList: + - {fileID: -5494248535777933898} + m_conditionCountMode: 0 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: 0e000000 + m_canvasRect: + serializedVersion: 2 + x: 356.06522 + y: 476.59772 + width: 120 + height: 48 + - m_id: + m_text: findLockMech2 + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 4 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: + - {fileID: -2154981843599162001} + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: + - {fileID: -8714647905644244631} + - m_actionList: + - {fileID: -5190078906094045055} + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_conditionSet: + m_conditionList: + - {fileID: -8151542260930034530} + m_conditionCountMode: 1 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: 03000000 + m_canvasRect: + serializedVersion: 2 + x: 354.67435 + y: 545.73376 + width: 120 + height: 48 + - m_id: + m_text: findHiddenChest + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 4 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: + - {fileID: -9020301881323555090} + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_conditionSet: + m_conditionList: + - {fileID: -2856438539077179385} + m_conditionCountMode: 1 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: 05000000 + m_canvasRect: + serializedVersion: 2 + x: 355.53076 + y: 729.9203 + width: 120 + height: 48 + m_goalEntityTypeName: + m_nextContentID: 0 +--- !u!114 &144283012258030152 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: f0ed0c4e68ee98946bb5016adda42373, type: 3} + m_Name: BodyTextQuestContent + m_EditorClassIdentifier: + m_contentID: -1 + m_bodyText: + m_text: Go back to the gate. + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 +--- !u!114 &413119400279711413 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: d8dd425597ce38647ade6025cfd66c5e, type: 3} + m_Name: ActivateGameObjectQuestAction + m_EditorClassIdentifier: + m_gameObjectName: + m_text: Compas_Mark_Water + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_state: 1 +--- !u!114 &1171506370593650196 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 5682394e55a192147a020b9edf624e51, type: 3} + m_Name: MessageQuestCondition + m_EditorClassIdentifier: + m_alreadyTrue: 0 + m_senderSpecifier: 0 + m_senderID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_targetSpecifier: 0 + m_targetID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_message: + m_text: Grotto + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_parameter: + m_text: Searched + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_value: + m_valueType: 0 + m_intValue: 0 + m_stringValue: +--- !u!114 &1814095552216141163 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 5682394e55a192147a020b9edf624e51, type: 3} + m_Name: MessageQuestCondition + m_EditorClassIdentifier: + m_alreadyTrue: 0 + m_senderSpecifier: 0 + m_senderID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_targetSpecifier: 0 + m_targetID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_message: + m_text: Gate + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_parameter: + m_text: Opened + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_value: + m_valueType: 0 + m_intValue: 0 + m_stringValue: +--- !u!114 &2167511981805215444 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 722a17429c6ad18448893e6cfdb4de76, type: 3} + m_Name: LuaQuestAction + m_EditorClassIdentifier: + m_luaCode: SetMaturity(GetMaturity( ) + 1); +--- !u!114 &2880784524633413273 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c94e8fb3b9b54114cbe8185003729c1b, type: 3} + m_Name: SceneEventQuestAction + m_EditorClassIdentifier: + m_guid: ca872e31-8544-4598-b838-807857375727 +--- !u!114 &3070882605192180540 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: f0ed0c4e68ee98946bb5016adda42373, type: 3} + m_Name: BodyTextQuestContent + m_EditorClassIdentifier: + m_contentID: -1 + m_bodyText: + m_text: Heal trees ({#TreesHealed}/2) + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 +--- !u!114 &3170730037706639940 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 5682394e55a192147a020b9edf624e51, type: 3} + m_Name: MessageQuestCondition + m_EditorClassIdentifier: + m_alreadyTrue: 0 + m_senderSpecifier: 0 + m_senderID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_targetSpecifier: 0 + m_targetID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_message: + m_text: Portal + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_parameter: + m_text: Approached + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_value: + m_valueType: 0 + m_intValue: 0 + m_stringValue: +--- !u!114 &3548959841742951032 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: f0ed0c4e68ee98946bb5016adda42373, type: 3} + m_Name: BodyTextQuestContent + m_EditorClassIdentifier: + m_contentID: -1 + m_bodyText: + m_text: Run away! + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 +--- !u!114 &3969824075430178034 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: a976671aaa12c2e428b2aac89a260302, type: 3} + m_Name: CounterQuestCondition + m_EditorClassIdentifier: + m_alreadyTrue: 0 + m_counterIndex: 1 + m_counterValueMode: 0 + m_requiredCounterValue: + m_valueType: 0 + m_literalValue: 1 + m_counterIndex: 0 +--- !u!114 &5019824549885845002 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: f0ed0c4e68ee98946bb5016adda42373, type: 3} + m_Name: BodyTextQuestContent + m_EditorClassIdentifier: + m_contentID: -1 + m_bodyText: + m_text: Approach the ancient portal. + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 +--- !u!114 &6014942729723845209 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c47e1bb9cdd9a474c8d3f5d555d7533a, type: 3} + m_Name: HeadingTextQuestContent + m_EditorClassIdentifier: + m_contentID: -1 + m_useQuestTitle: 0 + m_headingText: + m_text: Follow the Ancient Path. + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_headingLevel: 1 +--- !u!114 &6025137215203678714 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c94e8fb3b9b54114cbe8185003729c1b, type: 3} + m_Name: SceneEventQuestAction + m_EditorClassIdentifier: + m_guid: 688d545f-b67b-428b-b3fa-628566d86ac7 +--- !u!114 &7382125966846504000 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: f0ed0c4e68ee98946bb5016adda42373, type: 3} + m_Name: BodyTextQuestContent + m_EditorClassIdentifier: + m_contentID: -1 + m_bodyText: + m_text: Pull levers in correct order. + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 +--- !u!114 &8098057326302520009 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c94e8fb3b9b54114cbe8185003729c1b, type: 3} + m_Name: SceneEventQuestAction + m_EditorClassIdentifier: + m_guid: 6d686073-0745-4cd5-9a1c-b61b986bf3f2 +--- !u!114 &8814208672737422606 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: c94e8fb3b9b54114cbe8185003729c1b, type: 3} + m_Name: SceneEventQuestAction + m_EditorClassIdentifier: + m_guid: 45fd9bc1-576a-46b3-90d0-d3e64bf998fb diff --git a/Assets/Quests/CH01Quest.asset.meta b/Assets/Quests/CH01Quest.asset.meta new file mode 100644 index 000000000..414a67938 --- /dev/null +++ b/Assets/Quests/CH01Quest.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b49ce185d03a643bf981155b0a84ef7f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity index 788d07f3c..c8480a778 100644 --- a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity +++ b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity @@ -229,6 +229,70 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 614486} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!21 &1081749 +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!1 &1350926 GameObject: m_ObjectHideFlags: 0 @@ -68201,171 +68265,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} ---- !u!43 &326011806 -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: 7.5, y: 7.5, 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: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - 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: 7.5, y: 7.5, 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 &326012669 PrefabInstance: m_ObjectHideFlags: 0 @@ -75842,6 +75741,171 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!43 &377356002 +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: 7.5, y: 7.5, 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: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 + 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: 7.5, y: 7.5, 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 &378273714 stripped Transform: m_CorrespondingSourceObject: {fileID: 7010295873574804791, guid: 04725a9f715fb81489cf487693f4505c, @@ -131410,70 +131474,6 @@ Transform: m_Children: [] m_Father: {fileID: 1140965745} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &676381364 -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!1 &676640034 GameObject: m_ObjectHideFlags: 0 @@ -217646,6 +217646,171 @@ LODGroup: - renderer: {fileID: 2138758310} - renderer: {fileID: 1209077010} m_Enabled: 1 +--- !u!43 &1112690162 +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: 7.5, y: 7.5, 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: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 + 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: 7.5, y: 7.5, 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 &1113069458 PrefabInstance: m_ObjectHideFlags: 0 @@ -255020,6 +255185,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1308136076} m_PrefabAsset: {fileID: 0} +--- !u!21 &1309227695 +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 &1310933569 stripped Transform: m_CorrespondingSourceObject: {fileID: 7509163777537260255, guid: 03df45e87d172b548848bb1ac9d750eb, @@ -273153,7 +273351,7 @@ MonoBehaviour: m_includeInSavedGameData: 1 m_addNewQuestsSinceSavedGame: 0 m_questList: - - {fileID: 11400000, guid: 7e0153aaa464845e2962daaf37be96b3, type: 2} + - {fileID: 11400000, guid: b49ce185d03a643bf981155b0a84ef7f, type: 2} m_deletedStaticQuests: [] m_id: m_text: @@ -324239,171 +324437,6 @@ MonoBehaviour: flickerSpeed: 1 movementRadius: 0.96 movementSpeed: 0.74 ---- !u!43 &1675279586 -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: 7.5, y: 7.5, 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: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - 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: 7.5, y: 7.5, 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!1 &1675709497 GameObject: m_ObjectHideFlags: 0 @@ -384884,39 +384917,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0a1644b3e0bc48d4c8855756a57d771b, type: 3} ---- !u!21 &1971956389 -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!1 &1972349427 GameObject: m_ObjectHideFlags: 0 @@ -473626,7 +473626,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1971956389} + - {fileID: 1309227695} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -473719,7 +473719,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 676381364} + overrideMaterial: {fileID: 1081749} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 diff --git a/Assets/Scenes/Marcin/DebugScene.unity b/Assets/Scenes/Marcin/DebugScene.unity index 566bd49cc..e67f1ac29 100644 --- a/Assets/Scenes/Marcin/DebugScene.unity +++ b/Assets/Scenes/Marcin/DebugScene.unity @@ -4519,6 +4519,43 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4c0287977ce906244bdc19e4e9fdba37, type: 3} +--- !u!84 &185365053 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_IsAlphaChannelOptional: 0 + serializedVersion: 6 + m_Width: 512 + m_Height: 512 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthStencilFormat: 90 + m_ColorFormat: 4 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 1 + m_UseDynamicScale: 0 + m_UseDynamicScaleExplicit: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 --- !u!1001 &209249256 PrefabInstance: m_ObjectHideFlags: 0 @@ -4610,131 +4647,6 @@ Animator: type: 3} m_PrefabInstance: {fileID: 44831531} m_PrefabAsset: {fileID: 0} ---- !u!21 &238644637 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: PortalMat (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) - m_Shader: {fileID: -6465566751694194690, guid: f90138ae641de784cb4b453bdc734b14, - 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: - - MOTIONVECTORS - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 1796853559} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskMap: - m_Texture: {fileID: 2800000, guid: 84487d73ca4b791498332d8f6858417f, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 2800000, guid: 9d67afb2ebc87cc43b5be99e1b689960, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _Texture2DAsset_EAC75755_Out_0: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlphaClip: 0 - - _Blend: 0 - - _BumpScale: 1 - - _Cull: 2 - - _Cutoff: 0.5 - - _DstBlend: 0 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _NormalSpeed: 0.36 - - _NormalStrength: 0.49 - - _NormalTiling: 0.41 - - _OcclusionStrength: 1 - - _OffsetStrength: 0.1 - - _PortalBrightness: 2 - - _QueueControl: 0 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _Speed: 0.5 - - _SrcBlend: 1 - - _Surface: 0 - - _TwirlPower: 8 - - _WorkflowMode: 1 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EffectColor: {r: 0, g: 0.7548079, b: 1, a: 0} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &267127504 GameObject: m_ObjectHideFlags: 0 @@ -6473,6 +6385,131 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 59165210a2e6bd04ca12087794c54b5e, type: 3} +--- !u!21 &528799933 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PortalMat (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) + m_Shader: {fileID: -6465566751694194690, guid: f90138ae641de784cb4b453bdc734b14, + 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: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 185365053} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskMap: + m_Texture: {fileID: 2800000, guid: 84487d73ca4b791498332d8f6858417f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 2800000, guid: 9d67afb2ebc87cc43b5be99e1b689960, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Texture2DAsset_EAC75755_Out_0: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _NormalSpeed: 0.36 + - _NormalStrength: 0.49 + - _NormalTiling: 0.41 + - _OcclusionStrength: 1 + - _OffsetStrength: 0.1 + - _PortalBrightness: 2 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _Speed: 0.5 + - _SrcBlend: 1 + - _Surface: 0 + - _TwirlPower: 8 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EffectColor: {r: 0, g: 0.7548079, b: 1, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &540906067 GameObject: m_ObjectHideFlags: 0 @@ -6785,178 +6822,6 @@ MonoBehaviour: m_EditorClassIdentifier: timeScale: 1 startFixedDeltaTime: 0 ---- !u!43 &737966874 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Quad Instance Instance Instance Instance Instance Instance Instance Instance - Instance Instance Instance Instance Instance Instance Instance Instance Instance - Instance Instance Instance Instance Instance Instance Instance Instance Instance - Instance Instance Instance Instance Instance Instance Instance Instance Instance - Instance Instance Instance Instance Instance Instance Instance Instance Instance - Instance Instance Instance Instance Instance Instance Instance Instance Instance - Instance Instance Instance Instance Instance Instance Instance Instance Instance - Instance - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 6 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 4 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.5, y: 0.5, z: 3.0616168e-17} - 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: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000003000100030000000200 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 4 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - 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: 192 - _typelessdata: 000000bf000000bf31310da40000000000000000000080bf0000803f0000000000000000000080bf00000000000000000000003f000000bf31310da40000000000000000000080bf0000803f0000000000000000000080bf0000803f00000000000000bf0000003f31310d240000000000000000000080bf0000803f0000000000000000000080bf000000000000803f0000003f0000003f31310d240000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f - 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: 0.5, y: 0.5, z: 3.0616168e-17} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 0 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &775315289 PrefabInstance: m_ObjectHideFlags: 0 @@ -7664,7 +7529,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1331962375} + - {fileID: 2030695058} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -7693,7 +7558,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 885468786} - m_Mesh: {fileID: 1400681635} + m_Mesh: {fileID: 2111569260} --- !u!4 &885468790 Transform: m_ObjectHideFlags: 0 @@ -7736,17 +7601,22 @@ PrefabInstance: m_Modifications: - target: {fileID: 1134572321, guid: e115436bfe06bd447a266ca75621bbdd, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1134572321, guid: e115436bfe06bd447a266ca75621bbdd, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 145182807891766407, guid: e115436bfe06bd447a266ca75621bbdd, type: 3} propertyPath: m_Name value: Spider_Base_Model_AI Variant RootMotion objectReference: {fileID: 0} + - target: {fileID: 145182807891766407, guid: e115436bfe06bd447a266ca75621bbdd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 668813484176291389, guid: e115436bfe06bd447a266ca75621bbdd, type: 3} propertyPath: m_LocalPosition.x @@ -7800,12 +7670,12 @@ PrefabInstance: - target: {fileID: 1131267071284757768, guid: e115436bfe06bd447a266ca75621bbdd, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1131267071284757768, guid: e115436bfe06bd447a266ca75621bbdd, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5732159520190161506, guid: e115436bfe06bd447a266ca75621bbdd, type: 3} @@ -11565,7 +11435,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 238644637} + - {fileID: 528799933} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -11594,7 +11464,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1272116024} - m_Mesh: {fileID: 737966874} + m_Mesh: {fileID: 2003950826} --- !u!1001 &1307530043 PrefabInstance: m_ObjectHideFlags: 0 @@ -13042,130 +12912,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} ---- !u!21 &1331962375 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: PortalMat (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) - m_Shader: {fileID: -6465566751694194690, guid: f90138ae641de784cb4b453bdc734b14, - 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: - - MOTIONVECTORS - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 1572866826} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskMap: - m_Texture: {fileID: 2800000, guid: 84487d73ca4b791498332d8f6858417f, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 2800000, guid: 9d67afb2ebc87cc43b5be99e1b689960, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _Texture2DAsset_EAC75755_Out_0: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlphaClip: 0 - - _Blend: 0 - - _BumpScale: 1 - - _Cull: 2 - - _Cutoff: 0.5 - - _DstBlend: 0 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _NormalSpeed: 0.36 - - _NormalStrength: 0.49 - - _NormalTiling: 0.41 - - _OcclusionStrength: 1 - - _OffsetStrength: 0.1 - - _PortalBrightness: 2 - - _QueueControl: 0 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _Speed: 0.5 - - _SrcBlend: 1 - - _Surface: 0 - - _TwirlPower: 8 - - _WorkflowMode: 1 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EffectColor: {r: 0, g: 0.7548079, b: 1, a: 0} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &1363773142 PrefabInstance: m_ObjectHideFlags: 0 @@ -13310,177 +13056,74 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1363773142} m_PrefabAsset: {fileID: 0} ---- !u!43 &1400681635 -Mesh: +--- !u!1001 &1384229523 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Quad Instance Instance Instance Instance Instance Instance Instance Instance - Instance Instance Instance Instance Instance Instance Instance Instance Instance - Instance Instance Instance Instance Instance Instance Instance Instance Instance - Instance Instance Instance Instance Instance Instance Instance Instance Instance - Instance Instance Instance Instance Instance Instance Instance Instance Instance - Instance Instance Instance Instance Instance Instance Instance Instance Instance - Instance Instance Instance Instance Instance Instance Instance Instance Instance - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 6 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 4 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.5, y: 0.5, z: 3.0616168e-17} - 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: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000003000100030000000200 - m_VertexData: + serializedVersion: 2 + m_Modification: serializedVersion: 3 - m_VertexCount: 4 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - 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: 192 - _typelessdata: 000000bf000000bf31310da40000000000000000000080bf0000803f0000000000000000000080bf00000000000000000000003f000000bf31310da40000000000000000000080bf0000803f0000000000000000000080bf0000803f00000000000000bf0000003f31310d240000000000000000000080bf0000803f0000000000000000000080bf000000000000803f0000003f0000003f31310d240000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f - 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: 0.5, y: 0.5, z: 3.0616168e-17} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 0 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2906344595654306119, guid: 67c92a2e989ad604e9871dba9a8fc1a8, + type: 3} + propertyPath: m_Name + value: Healing TreePlantingSpotForQuest Variant + objectReference: {fileID: 0} + - target: {fileID: 2906344595654306141, guid: 67c92a2e989ad604e9871dba9a8fc1a8, + type: 3} + propertyPath: m_LocalPosition.x + value: -28.190529 + objectReference: {fileID: 0} + - target: {fileID: 2906344595654306141, guid: 67c92a2e989ad604e9871dba9a8fc1a8, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.9 + objectReference: {fileID: 0} + - target: {fileID: 2906344595654306141, guid: 67c92a2e989ad604e9871dba9a8fc1a8, + type: 3} + propertyPath: m_LocalPosition.z + value: 11.18499 + objectReference: {fileID: 0} + - target: {fileID: 2906344595654306141, guid: 67c92a2e989ad604e9871dba9a8fc1a8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2906344595654306141, guid: 67c92a2e989ad604e9871dba9a8fc1a8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2906344595654306141, guid: 67c92a2e989ad604e9871dba9a8fc1a8, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2906344595654306141, guid: 67c92a2e989ad604e9871dba9a8fc1a8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2906344595654306141, guid: 67c92a2e989ad604e9871dba9a8fc1a8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2906344595654306141, guid: 67c92a2e989ad604e9871dba9a8fc1a8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2906344595654306141, guid: 67c92a2e989ad604e9871dba9a8fc1a8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 67c92a2e989ad604e9871dba9a8fc1a8, type: 3} --- !u!1001 &1415194265 PrefabInstance: m_ObjectHideFlags: 0 @@ -13667,6 +13310,43 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: -55.34, z: 0} +--- !u!84 &1439104893 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_IsAlphaChannelOptional: 0 + serializedVersion: 6 + m_Width: 512 + m_Height: 512 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthStencilFormat: 90 + m_ColorFormat: 4 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 1 + m_UseDynamicScale: 0 + m_UseDynamicScaleExplicit: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 --- !u!1 &1445433408 GameObject: m_ObjectHideFlags: 0 @@ -14546,43 +14226,6 @@ Transform: - {fileID: 1363773143} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!84 &1572866826 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_IsAlphaChannelOptional: 0 - serializedVersion: 6 - m_Width: 512 - m_Height: 512 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthStencilFormat: 90 - m_ColorFormat: 4 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 1 - m_UseDynamicScale: 0 - m_UseDynamicScaleExplicit: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_EnableRandomWrite: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 - m_ShadowSamplingMode: 2 --- !u!21 &1597338093 Material: serializedVersion: 8 @@ -14959,7 +14602,7 @@ Camera: serializedVersion: 2 m_Bits: 1410332535 m_RenderingPath: -1 - m_TargetTexture: {fileID: 1796853559} + m_TargetTexture: {fileID: 185365053} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 1 @@ -15748,43 +15391,6 @@ CapsuleCollider: m_Height: 3.93 m_Direction: 0 m_Center: {x: 0, y: 0, z: 0} ---- !u!84 &1796853559 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_IsAlphaChannelOptional: 0 - serializedVersion: 6 - m_Width: 512 - m_Height: 512 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthStencilFormat: 90 - m_ColorFormat: 4 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 1 - m_UseDynamicScale: 0 - m_UseDynamicScaleExplicit: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_EnableRandomWrite: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 - m_ShadowSamplingMode: 2 --- !u!21 &1804095114 Material: serializedVersion: 8 @@ -17282,6 +16888,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 32 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -18071,6 +17678,303 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 111f99aa5bba3d048b7db7e69c8d886d, type: 3} +--- !u!43 &2003950826 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Quad Instance Instance Instance Instance Instance Instance Instance Instance + Instance Instance Instance Instance Instance Instance Instance Instance Instance + Instance Instance Instance Instance Instance Instance Instance Instance Instance + Instance Instance Instance Instance Instance Instance Instance Instance Instance + Instance Instance Instance Instance Instance Instance Instance Instance Instance + Instance Instance Instance Instance Instance Instance Instance Instance Instance + Instance Instance Instance Instance Instance Instance Instance Instance Instance + Instance Instance Instance Instance + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.5, y: 0.5, z: 3.0616168e-17} + 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: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000003000100030000000200 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + 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: 192 + _typelessdata: 000000bf000000bf31310da40000000000000000000080bf0000803f0000000000000000000080bf00000000000000000000003f000000bf31310da40000000000000000000080bf0000803f0000000000000000000080bf0000803f00000000000000bf0000003f31310d240000000000000000000080bf0000803f0000000000000000000080bf000000000000803f0000003f0000003f31310d240000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f + 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: 0.5, y: 0.5, z: 3.0616168e-17} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 0 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!21 &2030695058 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PortalMat (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) (Instance) + (Instance) (Instance) (Instance) + m_Shader: {fileID: -6465566751694194690, guid: f90138ae641de784cb4b453bdc734b14, + 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: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 1439104893} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskMap: + m_Texture: {fileID: 2800000, guid: 84487d73ca4b791498332d8f6858417f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 2800000, guid: 9d67afb2ebc87cc43b5be99e1b689960, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Texture2DAsset_EAC75755_Out_0: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _NormalSpeed: 0.36 + - _NormalStrength: 0.49 + - _NormalTiling: 0.41 + - _OcclusionStrength: 1 + - _OffsetStrength: 0.1 + - _PortalBrightness: 2 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _Speed: 0.5 + - _SrcBlend: 1 + - _Surface: 0 + - _TwirlPower: 8 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EffectColor: {r: 0, g: 0.7548079, b: 1, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &2071722877 GameObject: m_ObjectHideFlags: 0 @@ -18206,7 +18110,7 @@ Camera: serializedVersion: 2 m_Bits: 1410332535 m_RenderingPath: -1 - m_TargetTexture: {fileID: 1572866826} + m_TargetTexture: {fileID: 1439104893} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 1 @@ -18397,6 +18301,178 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &2111569260 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Quad Instance Instance Instance Instance Instance Instance Instance Instance + Instance Instance Instance Instance Instance Instance Instance Instance Instance + Instance Instance Instance Instance Instance Instance Instance Instance Instance + Instance Instance Instance Instance Instance Instance Instance Instance Instance + Instance Instance Instance Instance Instance Instance Instance Instance Instance + Instance Instance Instance Instance Instance Instance Instance Instance Instance + Instance Instance Instance Instance Instance Instance Instance Instance Instance + Instance Instance Instance + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.5, y: 0.5, z: 3.0616168e-17} + 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: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000003000100030000000200 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + 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: 192 + _typelessdata: 000000bf000000bf31310da40000000000000000000080bf0000803f0000000000000000000080bf00000000000000000000003f000000bf31310da40000000000000000000080bf0000803f0000000000000000000080bf0000803f00000000000000bf0000003f31310d240000000000000000000080bf0000803f0000000000000000000080bf000000000000803f0000003f0000003f31310d240000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f + 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: 0.5, y: 0.5, z: 3.0616168e-17} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 0 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!4 &543450652227933697 stripped Transform: m_CorrespondingSourceObject: {fileID: 4745570059773410385, guid: 522b5cc88fa2e734b87247785b85c8fb, @@ -18694,3 +18770,4 @@ SceneRoots: - {fileID: 1812159859} - {fileID: 939335672} - {fileID: 890901947} + - {fileID: 1384229523} diff --git a/Assets/Scripts/Debug/DebugTests.cs b/Assets/Scripts/Debug/DebugTests.cs index 1ad0a63f7..16026aeec 100644 --- a/Assets/Scripts/Debug/DebugTests.cs +++ b/Assets/Scripts/Debug/DebugTests.cs @@ -1,10 +1,10 @@ using System; -using System.Collections; -using System.Collections.Generic; +//using System.Collections; +//using System.Collections.Generic; using System.Diagnostics; using Sirenix.OdinInspector; using UnityEditor; -using UnityEditor.Rendering; +//using UnityEditor.Rendering; using UnityEngine; namespace Beyond diff --git a/Assets/Settings/High_PipelineAsset.asset b/Assets/Settings/High_PipelineAsset.asset index 7b1f61cbd..64ba3c7e7 100644 --- a/Assets/Settings/High_PipelineAsset.asset +++ b/Assets/Settings/High_PipelineAsset.asset @@ -99,34 +99,34 @@ MonoBehaviour: obsoleteHasProbeVolumes: m_Keys: [] m_Values: - m_PrefilteringModeMainLightShadows: 1 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterAlphaOutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilteringModeMainLightShadows: 3 + m_PrefilteringModeAdditionalLight: 3 + m_PrefilteringModeAdditionalLightShadows: 2 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 2 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 + m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 0 m_PrefilterUseLegacyLightmaps: 0 m_ShaderVariantLogLevel: 0 diff --git a/Assets/Settings/Low_PipelineAsset.asset b/Assets/Settings/Low_PipelineAsset.asset index 2d92c9285..5d7c40b17 100644 --- a/Assets/Settings/Low_PipelineAsset.asset +++ b/Assets/Settings/Low_PipelineAsset.asset @@ -99,34 +99,34 @@ MonoBehaviour: obsoleteHasProbeVolumes: m_Keys: [] m_Values: - m_PrefilteringModeMainLightShadows: 1 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterAlphaOutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilteringModeMainLightShadows: 0 + m_PrefilteringModeAdditionalLight: 1 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 2 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 + m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 0 m_PrefilterUseLegacyLightmaps: 0 m_ShaderVariantLogLevel: 0 diff --git a/Assets/Settings/Medium_PipelineAsset.asset b/Assets/Settings/Medium_PipelineAsset.asset index 7d76dec14..a6197f824 100644 --- a/Assets/Settings/Medium_PipelineAsset.asset +++ b/Assets/Settings/Medium_PipelineAsset.asset @@ -99,34 +99,34 @@ MonoBehaviour: obsoleteHasProbeVolumes: m_Keys: [] m_Values: - m_PrefilteringModeMainLightShadows: 1 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterAlphaOutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilteringModeMainLightShadows: 3 + m_PrefilteringModeAdditionalLight: 3 + m_PrefilteringModeAdditionalLightShadows: 2 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 2 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 + m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 0 m_PrefilterUseLegacyLightmaps: 0 m_ShaderVariantLogLevel: 0 diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index fd90d080a..f40f62103 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 6119840311943364608 - - rid: 6119840311943364609 + - rid: 1525002040635556128 + - rid: 1525002040635556129 - rid: 6119840311943364610 - rid: 6119840311943364611 - rid: 6119840311943364612 - rid: 6119840311943364613 - - rid: 6119840311943364614 + - rid: 1525002040635556130 - rid: 6119840311943364615 - rid: 6119840311943364616 - rid: 6119840311943364617 - - rid: 6119840311943364618 - - rid: 6119840311943364619 + - rid: 1525002040635556131 + - rid: 1525002040635556132 - rid: 6119840311943364620 - - rid: 6119840311943364621 - - rid: 6119840311943364622 - - rid: 6119840311943364623 - - rid: 6119840311943364624 + - rid: 1525002040635556133 + - rid: 1525002040635556134 + - rid: 1525002040635556135 + - rid: 1525002040635556136 - rid: 6119840311943364625 - - rid: 6119840311943364626 - - rid: 6119840311943364627 + - rid: 1525002040635556137 + - rid: 1525002040635556138 - rid: 6119840311943364628 - - rid: 6657923981342146560 + - rid: 1525002040635556139 m_RuntimeSettings: m_List: [] m_AssetVersion: 8 @@ -87,7 +87,7 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 6119840311943364608 + - rid: 1525002040635556128 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -103,7 +103,7 @@ MonoBehaviour: type: 2} m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - - rid: 6119840311943364609 + - rid: 1525002040635556129 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -125,6 +125,132 @@ MonoBehaviour: type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} + - rid: 1525002040635556130 + type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, + asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_StripUnusedPostProcessingVariants: 1 + m_StripUnusedVariants: 1 + m_StripScreenCoordOverrideVariants: 1 + - rid: 1525002040635556131 + type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_LightShader: {fileID: 4800000, guid: 3f6c848ca3d7bca4bbe846546ac701a1, type: 3} + m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, + type: 3} + m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, + type: 3} + m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, + type: 3} + m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, + type: 3} + m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, + type: 3} + m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, + type: 3} + m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, + type: 2} + m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, + type: 2} + m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, + type: 2} + - rid: 1525002040635556132 + type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} + data: + m_Version: 0 + m_InstanceDataBufferCopyKernels: {fileID: 7200000, guid: f984aeb540ded8b4fbb8a2047ab5b2e2, + type: 3} + m_InstanceDataBufferUploadKernels: {fileID: 7200000, guid: 53864816eb00f2343b60e1a2c5a262ef, + type: 3} + m_TransformUpdaterKernels: {fileID: 7200000, guid: 2a567b9b2733f8d47a700c3c85bed75b, + type: 3} + m_WindDataUpdaterKernels: {fileID: 7200000, guid: fde76746e4fd0ed418c224f6b4084114, + type: 3} + m_OccluderDepthPyramidKernels: {fileID: 7200000, guid: 08b2b5fb307b0d249860612774a987da, + type: 3} + m_InstanceOcclusionCullingKernels: {fileID: 7200000, guid: f6d223acabc2f974795a5a7864b50e6c, + type: 3} + m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, + type: 3} + m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, + type: 3} + m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, + type: 3} + - rid: 1525002040635556133 + type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, + type: 3} + probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, + type: 3} + probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, + type: 3} + - rid: 1525002040635556134 + type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + m_IncludeReferencedInScenes: 0 + m_IncludeAssetsByLabel: 0 + m_LabelToInclude: + - rid: 1525002040635556135 + type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + dilationShader: {fileID: 7200000, guid: 6bb382f7de370af41b775f54182e491d, + type: 3} + subdivideSceneCS: {fileID: 7200000, guid: bb86f1f0af829fd45b2ebddda1245c22, + type: 3} + voxelizeSceneShader: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, + type: 3} + traceVirtualOffsetCS: {fileID: -6772857160820960102, guid: ff2cbab5da58bf04d82c5f34037ed123, + type: 3} + traceVirtualOffsetRT: {fileID: -5126288278712620388, guid: ff2cbab5da58bf04d82c5f34037ed123, + type: 3} + skyOcclusionCS: {fileID: -6772857160820960102, guid: 5a2a534753fbdb44e96c3c78b5a6999d, + type: 3} + skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, + type: 3} + renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, + type: 3} + renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, + type: 3} + - rid: 1525002040635556136 + type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} + m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} + m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} + - rid: 1525002040635556137 + type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + probeVolumeDebugShader: {fileID: 4800000, guid: 3b21275fd12d65f49babb5286f040f2d, + type: 3} + probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 3a80877c579b9144ebdcc6d923bca303, + type: 3} + probeVolumeSamplingDebugShader: {fileID: 4800000, guid: bf54e6528c79a224e96346799064c393, + type: 3} + probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, + type: 3} + probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, + type: 3} + numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, + type: 3} + - rid: 1525002040635556138 + type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + m_ProbeVolumeDisableStreamingAssets: 0 + - rid: 1525002040635556139 + type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, + asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, + type: 2} - rid: 6119840311943364610 type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} @@ -161,14 +287,6 @@ MonoBehaviour: type: 3} m_DebugFontTex: {fileID: 2800000, guid: 26a413214480ef144b2915d6ff4d0beb, type: 3} - - rid: 6119840311943364614 - type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, - asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_Version: 0 - m_StripUnusedPostProcessingVariants: 1 - m_StripUnusedVariants: 1 - m_StripScreenCoordOverrideVariants: 1 - rid: 6119840311943364615 type: {class: UniversalRenderPipelineRuntimeShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} @@ -182,6 +300,12 @@ MonoBehaviour: m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} + m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, + type: 3} + m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, + type: 3} + m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, + type: 3} - rid: 6119840311943364616 type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} @@ -201,130 +325,18 @@ MonoBehaviour: type: 3} m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} - - rid: 6119840311943364618 - type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_Version: 0 - m_LightShader: {fileID: 4800000, guid: 3f6c848ca3d7bca4bbe846546ac701a1, type: 3} - m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, - type: 3} - m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, - type: 3} - m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, - type: 3} - m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, - type: 3} - m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, - type: 3} - m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, - type: 3} - m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} - m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, - type: 2} - m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, - type: 2} - m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, - type: 2} - - rid: 6119840311943364619 - type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} - data: - m_Version: 0 - m_InstanceDataBufferCopyKernels: {fileID: 7200000, guid: f984aeb540ded8b4fbb8a2047ab5b2e2, - type: 3} - m_InstanceDataBufferUploadKernels: {fileID: 7200000, guid: 53864816eb00f2343b60e1a2c5a262ef, - type: 3} - m_TransformUpdaterKernels: {fileID: 7200000, guid: 2a567b9b2733f8d47a700c3c85bed75b, - type: 3} - m_WindDataUpdaterKernels: {fileID: 7200000, guid: fde76746e4fd0ed418c224f6b4084114, - type: 3} - m_OccluderDepthPyramidKernels: {fileID: 7200000, guid: 08b2b5fb307b0d249860612774a987da, - type: 3} - m_InstanceOcclusionCullingKernels: {fileID: 7200000, guid: f6d223acabc2f974795a5a7864b50e6c, - type: 3} - m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, - type: 3} - m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, - type: 3} - m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, - type: 3} - rid: 6119840311943364620 type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_EnableCompilationCaching: 1 m_EnableValidityChecks: 1 - - rid: 6119840311943364621 - type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 1 - probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, - type: 3} - probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, - type: 3} - probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, - type: 3} - - rid: 6119840311943364622 - type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_version: 0 - m_IncludeReferencedInScenes: 0 - m_IncludeAssetsByLabel: 0 - m_LabelToInclude: - - rid: 6119840311943364623 - type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 1 - dilationShader: {fileID: 7200000, guid: 6bb382f7de370af41b775f54182e491d, - type: 3} - subdivideSceneCS: {fileID: 7200000, guid: bb86f1f0af829fd45b2ebddda1245c22, - type: 3} - voxelizeSceneShader: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, - type: 3} - traceVirtualOffsetCS: {fileID: -6772857160820960102, guid: ff2cbab5da58bf04d82c5f34037ed123, - type: 3} - traceVirtualOffsetRT: {fileID: -5126288278712620388, guid: ff2cbab5da58bf04d82c5f34037ed123, - type: 3} - skyOcclusionCS: {fileID: -6772857160820960102, guid: 5a2a534753fbdb44e96c3c78b5a6999d, - type: 3} - skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, - type: 3} - renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, - type: 3} - renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, - type: 3} - - rid: 6119840311943364624 - type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} - m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} - m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} - rid: 6119840311943364625 type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 0 m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3} - - rid: 6119840311943364626 - type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 1 - probeVolumeDebugShader: {fileID: 4800000, guid: 3b21275fd12d65f49babb5286f040f2d, - type: 3} - probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 3a80877c579b9144ebdcc6d923bca303, - type: 3} - probeVolumeSamplingDebugShader: {fileID: 4800000, guid: bf54e6528c79a224e96346799064c393, - type: 3} - probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, - type: 3} - probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, - type: 3} - numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, - type: 3} - - rid: 6119840311943364627 - type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 1 - m_ProbeVolumeDisableStreamingAssets: 0 - rid: 6119840311943364628 type: {class: ShaderStrippingSetting, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: @@ -332,9 +344,3 @@ MonoBehaviour: m_ExportShaderVariants: 1 m_ShaderVariantLogLevel: 0 m_StripRuntimeDebugShaders: 0 - - rid: 6657923981342146560 - type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, - asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, - type: 2} diff --git a/Assets/Settings/Very Low_PipelineAsset.asset b/Assets/Settings/Very Low_PipelineAsset.asset index 86cee8e8d..f4bce9cd6 100644 --- a/Assets/Settings/Very Low_PipelineAsset.asset +++ b/Assets/Settings/Very Low_PipelineAsset.asset @@ -99,34 +99,34 @@ MonoBehaviour: obsoleteHasProbeVolumes: m_Keys: [] m_Values: - m_PrefilteringModeMainLightShadows: 1 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterAlphaOutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilteringModeMainLightShadows: 0 + m_PrefilteringModeAdditionalLight: 1 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 2 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 + m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 0 m_PrefilterUseLegacyLightmaps: 0 m_ShaderVariantLogLevel: 0 diff --git a/Assets/Shaders/InvisibleMat.shadergraph b/Assets/Shaders/InvisibleMat.shadergraph index 68fd15e16..43199bc5a 100644 --- a/Assets/Shaders/InvisibleMat.shadergraph +++ b/Assets/Shaders/InvisibleMat.shadergraph @@ -1150,8 +1150,8 @@ "m_ObjectId": "0ee583451d984067b9fc332bf09f761e", "m_Title": "Distortion", "m_Position": { - "x": -1924.0001220703125, - "y": -845.0 + "x": -1924.5001220703125, + "y": -844.9999389648438 } } diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index abda6b8ff..80002ef8f 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -159,7 +159,7 @@ "url": "https://packages.unity.com" }, "com.unity.searcher": { - "version": "4.9.2", + "version": "4.9.3", "depth": 2, "source": "registry", "dependencies": {}, @@ -171,11 +171,11 @@ "source": "builtin", "dependencies": { "com.unity.render-pipelines.core": "17.0.3", - "com.unity.searcher": "4.9.2" + "com.unity.searcher": "4.9.3" } }, "com.unity.test-framework": { - "version": "1.4.5", + "version": "1.4.6", "depth": 1, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c7b1e91e6..42ab8366a 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -225,6 +225,7 @@ PlayerSettings: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 11400000, guid: 7039fd3a9545544ffa35741a5b2a3aaa, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -473,51 +474,6 @@ PlayerSettings: m_SubKind: - m_BuildTarget: iPhone m_Icons: - - m_Textures: [] - m_Width: 180 - m_Height: 180 - m_Kind: 0 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 120 - m_Height: 120 - m_Kind: 0 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 167 - m_Height: 167 - m_Kind: 0 - m_SubKind: iPad - - m_Textures: [] - m_Width: 152 - m_Height: 152 - m_Kind: 0 - m_SubKind: iPad - - m_Textures: [] - m_Width: 76 - m_Height: 76 - m_Kind: 0 - m_SubKind: iPad - - m_Textures: [] - m_Width: 120 - m_Height: 120 - m_Kind: 3 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 80 - m_Height: 80 - m_Kind: 3 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 80 - m_Height: 80 - m_Kind: 3 - m_SubKind: iPad - - m_Textures: [] - m_Width: 40 - m_Height: 40 - m_Kind: 3 - m_SubKind: iPad - m_Textures: [] m_Width: 87 m_Height: 87 @@ -568,6 +524,55 @@ PlayerSettings: m_Height: 1024 m_Kind: 4 m_SubKind: App Store + - m_Textures: + - {fileID: 0} + m_Width: 120 + m_Height: 120 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: + - {fileID: 0} + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: + - {fileID: 2800000, guid: aeecefbb8e7862b499ff17e9eeabcbe9, type: 3} + m_Width: 180 + m_Height: 180 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: + - {fileID: 0} + m_Width: 120 + m_Height: 120 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 167 + m_Height: 167 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 152 + m_Height: 152 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 76 + m_Height: 76 + m_Kind: 0 + m_SubKind: iPad m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 1 @@ -651,7 +656,10 @@ PlayerSettings: m_BuildTargetGroupLightmapSettings: [] m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] - m_BuildTargetDefaultTextureCompressionFormat: [] + m_BuildTargetDefaultTextureCompressionFormat: + - serializedVersion: 3 + m_BuildTarget: iOS + m_Formats: 03000000 playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 6539c21f1..cd24fc227 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.37f1 -m_EditorVersionWithRevision: 6000.0.37f1 (090b7797214c) +m_EditorVersion: 6000.0.39f1 +m_EditorVersionWithRevision: 6000.0.39f1 (15ea7ed0b100) diff --git a/ProjectSettings/ScriptableBuildPipeline.json b/ProjectSettings/ScriptableBuildPipeline.json new file mode 100644 index 000000000..e6738dc22 --- /dev/null +++ b/ProjectSettings/ScriptableBuildPipeline.json @@ -0,0 +1,13 @@ +{ + "useBuildCacheServer": false, + "cacheServerHost": "", + "cacheServerPort": 8126, + "threadedArchiving": true, + "logCacheMiss": false, + "slimWriteResults": true, + "maximumCacheSize": 20, + "useDetailedBuildLog": false, + "useV2Hasher": true, + "fileIDHashSeed": 0, + "prefabPackedHeaderSize": 2 +} \ No newline at end of file