diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 3f01468aa..67d3ae8e3 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: bc074d00982114f0388e9c98de91d44f m_currentHash: serializedVersion: 2 - Hash: 00000000000000000000000000000000 + Hash: ef672e941747c2eb6b19db828d740a6a m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 diff --git a/Assets/AddressableAssetsData/iOS/addressables_content_state.bin b/Assets/AddressableAssetsData/iOS/addressables_content_state.bin index 348af4d47..044a0358c 100644 Binary files a/Assets/AddressableAssetsData/iOS/addressables_content_state.bin and b/Assets/AddressableAssetsData/iOS/addressables_content_state.bin differ diff --git a/Assets/Animations/PORTAL_CAM2Timeline.playable b/Assets/Animations/PORTAL_CAM2Timeline.playable index d55ecffdd..e361f1ab2 100644 --- a/Assets/Animations/PORTAL_CAM2Timeline.playable +++ b/Assets/Animations/PORTAL_CAM2Timeline.playable @@ -46,7 +46,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 7.066666666666666 + m_Start: 6.816603091731667 m_ClipIn: 0 m_Asset: {fileID: -7859653273535914359} m_Duration: 6.817959183673469 @@ -501,23 +501,6 @@ MonoBehaviour: m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_ApplyOffsets: 0 ---- !u!114 &-5188336439107519531 -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: 4f10dd60657c6004587f237a7e90f8e4, type: 3} - m_Name: AudioPlayableAsset - m_EditorClassIdentifier: - m_Clip: {fileID: 8300000, guid: dbc3cfa99ad6793469847deba0fc4fff, type: 3} - m_Loop: 0 - m_bufferingTime: 0.1 - m_ClipProperties: - volume: 1 --- !u!114 &-3785825942244921700 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2926,7 +2909,7 @@ MonoBehaviour: m_Start: 6.083333333333333 m_ClipIn: 0 m_Asset: {fileID: 3103248909133028377} - m_Duration: 6.582857142857143 + m_Duration: 0.7332697583983343 m_TimeScale: 0.5000000000000001 m_ParentTrack: {fileID: 3628387527204728522} m_EaseInDuration: 0 @@ -3305,76 +3288,7 @@ MonoBehaviour: m_Curves: {fileID: 0} m_Parent: {fileID: 11400000} m_Children: [] - m_Clips: - - m_Version: 1 - m_Start: 13.2 - m_ClipIn: 0 - m_Asset: {fileID: -5188336439107519531} - m_Duration: 1.0500000000000007 - m_TimeScale: 1 - m_ParentTrack: {fileID: 7379473357591769939} - m_EaseInDuration: 0 - m_EaseOutDuration: 0 - m_BlendInDuration: -1 - m_BlendOutDuration: -1 - m_MixInCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_MixOutCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_BlendInCurveMode: 0 - m_BlendOutCurveMode: 0 - m_ExposedParameterNames: [] - m_AnimationCurves: {fileID: 0} - m_Recordable: 0 - m_PostExtrapolationMode: 0 - m_PreExtrapolationMode: 0 - m_PostExtrapolationTime: 0 - m_PreExtrapolationTime: 0 - m_DisplayName: B_portal_2 + m_Clips: [] m_Markers: m_Objects: [] m_TrackProperties: diff --git a/Assets/Animations/PORTAL_END.playable b/Assets/Animations/PORTAL_END.playable index 2fe321945..5c29ccbbc 100644 --- a/Assets/Animations/PORTAL_END.playable +++ b/Assets/Animations/PORTAL_END.playable @@ -12,6 +12,102 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} m_Name: ActivationPlayableAsset m_EditorClassIdentifier: +--- !u!114 &-8318983027679362403 +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: 8b22792c3b570444eb18cb78c2af3a74, type: 3} + m_Name: Audio Track (4) + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: -77655760673786242} + m_Duration: 5.350181405895691 + m_TimeScale: 1 + m_ParentTrack: {fileID: -8318983027679362403} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + m_BlendOutDuration: -1 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: CH01_wasteland_cs_portal_wanderer_03 + m_Markers: + m_Objects: [] + m_TrackProperties: + volume: 1 + stereoPan: 0 + spatialBlend: 0 --- !u!114 &-7538689337261735107 MonoBehaviour: m_ObjectHideFlags: 1 @@ -493,6 +589,23 @@ MonoBehaviour: volume: 1 stereoPan: 0 spatialBlend: 0 +--- !u!114 &-77655760673786242 +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: 4f10dd60657c6004587f237a7e90f8e4, type: 3} + m_Name: AudioPlayableAsset + m_EditorClassIdentifier: + m_Clip: {fileID: 8300000, guid: 26ae6a82327f58c4286113c8a23efa8c, type: 3} + m_Loop: 0 + m_bufferingTime: 0.1 + m_ClipProperties: + volume: 1 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -516,6 +629,7 @@ MonoBehaviour: - {fileID: -7538689337261735107} - {fileID: 1693423410386421649} - {fileID: 8252898493388772838} + - {fileID: -8318983027679362403} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 diff --git a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset index ddf4cacbb..4c081d051 100644 --- a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset +++ b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset @@ -17740,6 +17740,1171 @@ MonoBehaviour: height: 30 canvasScrollPosition: {x: 0, y: 0} canvasZoom: 1 + - id: 65 + fields: + - title: Title + value: CH01/WASTELAND/CH01_wasteland_vo_prisoner_prisoner_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: 2 + 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: 2 + 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: 65 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: + conditionPriority: 2 + outgoingLinks: + - originConversationID: 65 + originDialogueID: 0 + destinationConversationID: 65 + 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: 2 + 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: Hey...! Hey, you! Over here! + 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: + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 65 + 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 + - id: 66 + fields: + - title: Title + value: CH01/WASTELAND/CH01_wasteland_vo_prisoner_prisoner_02 + 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: 2 + 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: 2 + 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: 66 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: + conditionPriority: 2 + outgoingLinks: + - originConversationID: 66 + originDialogueID: 0 + destinationConversationID: 66 + 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: 2 + 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: Here, a window in the cliff! + 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: + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 66 + 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 + - id: 67 + fields: + - title: Title + value: CH01/WASTELAND/CH01_wasteland_vo_prisoner_prisoner_03 + 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: 2 + 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: 2 + 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: 67 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 67 + originDialogueID: 0 + destinationConversationID: 67 + 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: 2 + 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: ' I was caught by the giants! You have to save me! Help me with these + bars!' + 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: + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 67 + 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 + - id: 68 + fields: + - title: Title + value: CH01/WASTELAND/CH01_wasteland_vo_prisoner_prisoner_04 + 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: 2 + 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: 2 + 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: 68 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 68 + originDialogueID: 0 + destinationConversationID: 68 + 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: 2 + 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: You can't just leave me here! + 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: + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 68 + 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 + - id: 69 + fields: + - title: Title + value: CH01/WASTELAND/CH01_wasteland_vo_prisoner_prisoner_04 + 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: 2 + 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: 2 + 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: 69 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 69 + originDialogueID: 0 + destinationConversationID: 69 + 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: 2 + 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: Help me, please! + 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: + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 69 + 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 + - id: 70 + fields: + - title: Title + value: CH01/WASTELAND/CH01_wasteland_vo_illusion_wanderer_03 + 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: 2 + 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: 2 + 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: 70 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 70 + originDialogueID: 0 + destinationConversationID: 70 + 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: 2 + 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: So much Kingsyarrow! Might need it in this god-forsaken land. + 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: + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 70 + 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 bae357f92..7041d5c33 100644 --- a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta +++ b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fe87509f96c792444a9877d717ae8afb +guid: 2ecb7e9297579d64f8966e514a1b755f NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Dialogue/TestDialogueBase.asset b/Assets/Dialogue/TestDialogueBase.asset index 0629accbd..c5ad95c73 100644 --- a/Assets/Dialogue/TestDialogueBase.asset +++ b/Assets/Dialogue/TestDialogueBase.asset @@ -18711,6 +18711,590 @@ MonoBehaviour: height: 30 canvasScrollPosition: {x: 0, y: 0} canvasZoom: 1 + - id: 70 + fields: + - title: Title + value: CH01/WASTELAND/CH01_wasteland_vo_illusion_wanderer_03 + 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: 2 + 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: 2 + 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: 70 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 70 + originDialogueID: 0 + destinationConversationID: 70 + 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: 2 + 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: So much Kingsyarrow! Might need it in this god-forsaken land. + 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: + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 70 + 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 + - id: 71 + fields: + - title: Title + value: CH01/WASTELAND/CH01_wasteland_vo_prisoner_prisoner_05 + 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: 2 + 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: 2 + 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: 71 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 71 + originDialogueID: 0 + destinationConversationID: 71 + 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: 2 + 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: Help me, please! + 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: + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 71 + 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 + - id: 72 + fields: + - title: Title + value: CH01/WASTELAND/CH01_wasteland_cs_portal_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: 2 + 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: 2 + 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: 72 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 72 + originDialogueID: 0 + destinationConversationID: 72 + 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: 2 + 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: I've such these portals before... It is said they once led to a beautiful + garden... A safe haven with fresh water and green trees... But they're + useless now... + 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: + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 72 + 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/Meshes/Terrain/Terrain_Land01.asset b/Assets/Meshes/Terrain/Terrain_Land01.asset index 4a9dfa82f..57b63e719 100644 Binary files a/Assets/Meshes/Terrain/Terrain_Land01.asset and b/Assets/Meshes/Terrain/Terrain_Land01.asset differ diff --git a/Assets/Prefabs/FXGate/FXGate.prefab b/Assets/Prefabs/FXGate/FXGate.prefab index 5e259e69c..68527fdb5 100644 --- a/Assets/Prefabs/FXGate/FXGate.prefab +++ b/Assets/Prefabs/FXGate/FXGate.prefab @@ -1,5 +1,134 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2122027403214457268 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5429545256579864045} + - component: {fileID: 6666695292649414017} + m_Layer: 0 + m_Name: Audio Source + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5429545256579864045 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2122027403214457268} + serializedVersion: 2 + m_LocalRotation: {x: 0.19467777, y: 0.5064001, z: 0.016618632, w: 0.83987105} + m_LocalPosition: {x: -149.22563, y: 1289.7175, z: -1412.576} + m_LocalScale: {x: 9.169916, y: 12.657202, z: 9.315596} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7509553594521516071} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &6666695292649414017 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2122027403214457268} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 1f4525386db74f14aa52098d96182e4a, type: 3} + m_Resource: {fileID: 8300000, guid: 1f4525386db74f14aa52098d96182e4a, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &2612324952258457761 GameObject: m_ObjectHideFlags: 0 @@ -34,6 +163,7 @@ Transform: m_LocalScale: {x: 0.110949144, y: 0.0735072, z: 0.110949166} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 5429545256579864045} - {fileID: 7194082453653635647} - {fileID: 5550223792797285672} - {fileID: 6811215787108507658} @@ -155,6 +285,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 6666695292649414017} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 _onReceiveDamage: m_PersistentCalls: m_Calls: [] @@ -428,6 +570,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 790871555818943031, guid: 00aeae83170fed746bfc95432e300854, + type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: e8787fef1d0c3334880457619e016641, type: 2} - target: {fileID: 1354468978859832645, guid: 00aeae83170fed746bfc95432e300854, type: 3} propertyPath: m_Name @@ -502,6 +649,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 790871555818943031, guid: 00aeae83170fed746bfc95432e300854, + type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: e8787fef1d0c3334880457619e016641, type: 2} - target: {fileID: 1354468978859832645, guid: 00aeae83170fed746bfc95432e300854, type: 3} propertyPath: m_Name diff --git a/Assets/Prefabs/FXGate/FXGate02.prefab b/Assets/Prefabs/FXGate/FXGate02.prefab index 82e6d6d40..91c9a360d 100644 --- a/Assets/Prefabs/FXGate/FXGate02.prefab +++ b/Assets/Prefabs/FXGate/FXGate02.prefab @@ -258,6 +258,135 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &4867118171603266871 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2918330062721172084} + - component: {fileID: 9012967313284665284} + m_Layer: 0 + m_Name: Audio Source + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2918330062721172084 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4867118171603266871} + serializedVersion: 2 + m_LocalRotation: {x: 0.019252837, y: -0.09319602, z: -0.0018024709, w: 0.99546003} + m_LocalPosition: {x: 210.72798, y: 40.851826, z: 3.4349034} + m_LocalScale: {x: 1.1891972, y: 1.1034797, z: 1.1890684} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 906511540409020994} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &9012967313284665284 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4867118171603266871} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 1f4525386db74f14aa52098d96182e4a, type: 3} + m_Resource: {fileID: 8300000, guid: 1f4525386db74f14aa52098d96182e4a, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &6710139976038078250 GameObject: m_ObjectHideFlags: 0 @@ -379,6 +508,7 @@ Transform: m_LocalScale: {x: 0.84090006, y: 0.90632206, z: 0.84090006} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2918330062721172084} - {fileID: 3813758309704290331} - {fileID: 5079521954125287025} - {fileID: 3809692899343566075} @@ -516,6 +646,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 9012967313284665284} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 _onReceiveDamage: m_PersistentCalls: m_Calls: [] @@ -993,7 +1135,7 @@ PrefabInstance: - target: {fileID: 1354468978859832645, guid: 00aeae83170fed746bfc95432e300854, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8546858093251189356, guid: 00aeae83170fed746bfc95432e300854, type: 3} diff --git a/Assets/Prefabs/FXGate/FX_GateStone.prefab b/Assets/Prefabs/FXGate/FX_GateStone.prefab index 8512ff687..df9f057ff 100644 --- a/Assets/Prefabs/FXGate/FX_GateStone.prefab +++ b/Assets/Prefabs/FXGate/FX_GateStone.prefab @@ -86,6 +86,135 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &2356993346495130723 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2079959135223488457} + - component: {fileID: 3975687152470648532} + m_Layer: 0 + m_Name: Audio Source + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2079959135223488457 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2356993346495130723} + serializedVersion: 2 + m_LocalRotation: {x: 0.005013738, y: 0.6860471, z: -0.0020221379, w: 0.7275371} + m_LocalPosition: {x: 1.7234418, y: 1.122203, z: -0.9876035} + m_LocalScale: {x: 0.8538303, y: 0.5377299, z: 4.020629} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 284053169411961568} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &3975687152470648532 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2356993346495130723} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 1f4525386db74f14aa52098d96182e4a, type: 3} + m_Resource: {fileID: 8300000, guid: 1f4525386db74f14aa52098d96182e4a, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &3005094229599176799 GameObject: m_ObjectHideFlags: 0 @@ -238,6 +367,7 @@ Transform: - {fileID: 2801545479805627839} - {fileID: 2696665772772584839} - {fileID: 2932481101431583337} + - {fileID: 2079959135223488457} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: -0.259, y: -86.639, z: 0.563} --- !u!205 &8284964722361535217 @@ -328,6 +458,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 3975687152470648532} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 _onReceiveDamage: m_PersistentCalls: m_Calls: [] @@ -1019,7 +1161,7 @@ PrefabInstance: type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 2100000, guid: 9cf1ba666acadd44b825401452f4dd6f, type: 2} + objectReference: {fileID: 2100000, guid: e8787fef1d0c3334880457619e016641, type: 2} - target: {fileID: 7380183472842411035, guid: 112819455eb0d23428b83df82e00491e, type: 3} propertyPath: looping @@ -1102,7 +1244,7 @@ PrefabInstance: - target: {fileID: 453044471998774799, guid: 00aeae83170fed746bfc95432e300854, type: 3} propertyPath: m_LocalPosition.y - value: 0.488 + value: 0.812 objectReference: {fileID: 0} - target: {fileID: 453044471998774799, guid: 00aeae83170fed746bfc95432e300854, type: 3} @@ -1184,6 +1326,11 @@ PrefabInstance: propertyPath: InitialModule.startSize.minScalar value: 0.1 objectReference: {fileID: 0} + - target: {fileID: 790871555818943031, guid: 00aeae83170fed746bfc95432e300854, + type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: e8787fef1d0c3334880457619e016641, type: 2} - target: {fileID: 1354468978859832645, guid: 00aeae83170fed746bfc95432e300854, type: 3} propertyPath: m_Name @@ -1194,6 +1341,16 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 8546858093251189356, guid: 00aeae83170fed746bfc95432e300854, + type: 3} + propertyPath: InitialModule.startSize.scalar + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 8546858093251189356, guid: 00aeae83170fed746bfc95432e300854, + type: 3} + propertyPath: InitialModule.startSpeed.scalar + value: 0.6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -1301,7 +1458,7 @@ PrefabInstance: type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 2100000, guid: 9cf1ba666acadd44b825401452f4dd6f, type: 2} + objectReference: {fileID: 2100000, guid: e8787fef1d0c3334880457619e016641, type: 2} - target: {fileID: 7380183472842411035, guid: 112819455eb0d23428b83df82e00491e, type: 3} propertyPath: looping diff --git a/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_cs_portal_wanderer_01.ogg b/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_cs_portal_wanderer_01.ogg index a47212616..aa5e0fe60 100644 Binary files a/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_cs_portal_wanderer_01.ogg and b/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_cs_portal_wanderer_01.ogg differ diff --git a/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_cs_portal_wanderer_03.ogg b/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_cs_portal_wanderer_03.ogg new file mode 100644 index 000000000..48fe2a99f Binary files /dev/null and b/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_cs_portal_wanderer_03.ogg differ diff --git a/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_cs_portal_wanderer_03.ogg.meta b/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_cs_portal_wanderer_03.ogg.meta new file mode 100644 index 000000000..1dffb4a41 --- /dev/null +++ b/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_cs_portal_wanderer_03.ogg.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: 26ae6a82327f58c4286113c8a23efa8c +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 0 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 0 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + 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 f198e09a2..cfa12def6 100644 --- a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity +++ b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity @@ -3203,6 +3203,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 609414703} m_PrefabAsset: {fileID: 0} +--- !u!43 &14188132 +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 &14426894 GameObject: m_ObjectHideFlags: 0 @@ -9655,7 +9820,7 @@ Transform: m_GameObject: {fileID: 23852027} serializedVersion: 2 m_LocalRotation: {x: -0.03628426, y: 0.0007640696, z: -0.017630449, w: 0.99918574} - m_LocalPosition: {x: 142.27, y: 31.76, z: -112.49} + m_LocalPosition: {x: 142.278, y: 31.764, z: -112.425} m_LocalScale: {x: 6.98367, y: 12.4434805, z: 13.562651} m_ConstrainProportionsScale: 0 m_Children: [] @@ -13018,6 +13183,150 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &40697939 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 40697940} + - component: {fileID: 40697943} + - component: {fileID: 40697942} + - component: {fileID: 40697941} + m_Layer: 11 + m_Name: CH01_wasteland_vo_illusion_wanderer_01 (1) + m_TagString: Untagged + m_Icon: {fileID: 2800000, guid: 4e3e077817b8a684ea3c1fd5132b2f3f, type: 3} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &40697940 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 40697939} + serializedVersion: 2 + m_LocalRotation: {x: -0.038979102, y: -0.6528939, z: 0.010392802, w: 0.7563744} + m_LocalPosition: {x: 147.99, y: 32.19, z: -103.71} + m_LocalScale: {x: 4.6992416, y: 10.133721, z: 16.604176} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 782247898} + m_LocalEulerAnglesHint: {x: -2.602, y: -81.688, z: 3.824} +--- !u!114 &40697941 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 40697939} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} + m_Name: + m_EditorClassIdentifier: + trigger: 8 + fireOnce: 1 + condition: + luaConditions: [] + questConditions: [] + acceptedTags: + - Player + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + setQuestState: 1 + questName: WastelandKillSpiders + questState: 2 + setQuestEntryState: 0 + questEntryNumber: 1 + questEntryState: 0 + luaCode: + sequence: + sequenceSpeaker: {fileID: 0} + sequenceListener: {fileID: 0} + waitOneFrameOnStartOrEnable: 1 + alertMessage: + textTable: {fileID: 0} + alertDuration: 0 + sendMessages: [] + barkSource: 0 + barkConversation: + barkText: + barkTextSequence: + barker: {fileID: 569166460} + barkTarget: {fileID: 0} + barkOrder: 1 + allowBarksDuringConversations: 0 + skipBarkIfNoValidEntries: 0 + cacheBarkLines: 0 + conversation: + conversationConversant: {fileID: 0} + conversationActor: {fileID: 0} + startConversationEntryID: -1 + exclusive: 0 + skipIfNoValidEntries: 0 + stopConversationOnTriggerExit: 0 + stopConversationIfTooFar: 0 + maxConversationDistance: 5 + monitorConversationDistanceFrequency: 1 + showCursorDuringConversation: 0 + pauseGameDuringConversation: 0 + setActiveActions: [] + setEnabledActions: [] + setAnimatorStateActions: [] + onExecute: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1141881517} + m_TargetAssemblyTypeName: Beyond.BarkManager, Assembly-CSharp + m_MethodName: PlayBark + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 71 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + useConversationTitlePicker: 1 + useBarkTitlePicker: 1 + useQuestNamePicker: 1 + selectedDatabase: {fileID: 11400000, guid: d6f6a47305abab144b7fc1a5e1f080ef, type: 2} +--- !u!65 &40697942 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 40697939} + 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: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &40697943 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 40697939} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &40811504 GameObject: m_ObjectHideFlags: 0 @@ -24521,6 +24830,163 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 71285071} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &72092793 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 72092794} + - component: {fileID: 72092797} + - component: {fileID: 72092796} + - component: {fileID: 72092795} + m_Layer: 11 + m_Name: CH01_wasteland_vo_prisoner_prisoner_05 + m_TagString: Untagged + m_Icon: {fileID: 2800000, guid: 4e3e077817b8a684ea3c1fd5132b2f3f, type: 3} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &72092794 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 72092793} + serializedVersion: 2 + m_LocalRotation: {x: -0.03611066, y: -0.46000266, z: -0.06362863, w: 0.88489825} + m_LocalPosition: {x: -27.249, y: 41.918, z: -98.32} + m_LocalScale: {x: 4.8775725, y: 8.179292, z: 4.706544} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 782247898} + m_LocalEulerAnglesHint: {x: -7.033, y: -54.652, z: -4.588} +--- !u!114 &72092795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 72092793} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} + m_Name: + m_EditorClassIdentifier: + trigger: 32 + fireOnce: 1 + condition: + luaConditions: [] + questConditions: [] + acceptedTags: + - Player + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + setQuestState: 1 + questName: WastelandKillSpiders + questState: 2 + setQuestEntryState: 0 + questEntryNumber: 1 + questEntryState: 0 + luaCode: + sequence: + sequenceSpeaker: {fileID: 0} + sequenceListener: {fileID: 0} + waitOneFrameOnStartOrEnable: 1 + alertMessage: + textTable: {fileID: 0} + alertDuration: 0 + sendMessages: [] + barkSource: 1 + barkConversation: + barkText: What land is this with spiders as big as dogs? + barkTextSequence: + barker: {fileID: 0} + barkTarget: {fileID: 0} + barkOrder: 1 + allowBarksDuringConversations: 0 + skipBarkIfNoValidEntries: 0 + cacheBarkLines: 0 + conversation: + conversationConversant: {fileID: 0} + conversationActor: {fileID: 0} + startConversationEntryID: -1 + exclusive: 0 + skipIfNoValidEntries: 0 + stopConversationOnTriggerExit: 0 + stopConversationIfTooFar: 0 + maxConversationDistance: 5 + monitorConversationDistanceFrequency: 1 + showCursorDuringConversation: 0 + pauseGameDuringConversation: 0 + setActiveActions: [] + setEnabledActions: [] + setAnimatorStateActions: [] + onExecute: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1141881517} + m_TargetAssemblyTypeName: Beyond.BarkManager, Assembly-CSharp + m_MethodName: PlayBark + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 73 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1974951813} + m_TargetAssemblyTypeName: PixelCrushers.DialogueSystem.DialogueSystemTrigger, + Assembly-CSharp-firstpass + m_MethodName: OnUse + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + useConversationTitlePicker: 1 + useBarkTitlePicker: 1 + useQuestNamePicker: 1 + selectedDatabase: {fileID: 11400000, guid: d6f6a47305abab144b7fc1a5e1f080ef, type: 2} +--- !u!65 &72092796 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 72092793} + 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: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &72092797 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 72092793} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &72293646 GameObject: m_ObjectHideFlags: 0 @@ -27183,70 +27649,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!21 &87423029 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Override - m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _DIRECTIONALL: 1 - - _DirectionalFalloff: 2 - - _DirectionalIntensity: 1 - - _DirectionalMode: 1 - - _FOGG: 1 - - _FogAxisMode: 1 - - _FogColorDuo: 1 - - _FogDistanceEnd: 200 - - _FogDistanceFalloff: 2 - - _FogDistanceStart: -200 - - _FogHeightEnd: 200 - - _FogHeightFalloff: 2 - - _FogHeightStart: 0 - - _FogIntensity: 1 - - _FogLayersMode: 0 - - _IsHeightFogPreset: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _NOISEE: 1 - - _NoiseDistanceEnd: 50 - - _NoiseIntensity: 1 - - _NoiseMode: 2 - - _NoiseModeBlend: 1 - - _NoiseScale: 30 - - _SKYBOXX: 1 - - _SkyboxFogFalloff: 1 - - _SkyboxFogFill: 1 - - _SkyboxFogHeight: 1 - - _SkyboxFogIntensity: 1 - - _TITLE: 1 - m_Colors: - - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} - - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} - - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} - - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} - - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} - - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &87993782 PrefabInstance: m_ObjectHideFlags: 0 @@ -41120,7 +41522,6 @@ Transform: - {fileID: 1882198780} - {fileID: 339154568323727960} - {fileID: 1054165732} - - {fileID: 1485264658} m_Father: {fileID: 1565036104} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &132977599 @@ -42000,96 +42401,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 136290916} m_PrefabAsset: {fileID: 0} ---- !u!1001 &137734420 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1643860996} - m_Modifications: - - target: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_key - value: PurpleconeflowersVariant_12790 - objectReference: {fileID: 0} - - target: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - - target: {fileID: 7215417275878312112, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_Name - value: Purple coneflowers Variant - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.x - value: -6.39 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.y - value: -4.78 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.z - value: -98.03 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} ---- !u!4 &137734421 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - m_PrefabInstance: {fileID: 137734420} - m_PrefabAsset: {fileID: 0} --- !u!1 &137803148 GameObject: m_ObjectHideFlags: 0 @@ -44382,7 +44693,6 @@ Transform: - {fileID: 1791967720} - {fileID: 209808589} - {fileID: 1036842569} - - {fileID: 560465833} - {fileID: 1345400662} - {fileID: 349129316} - {fileID: 1783695563} @@ -59356,7 +59666,7 @@ Transform: m_GameObject: {fileID: 208491262} serializedVersion: 2 m_LocalRotation: {x: 0.628919, y: 0.101688795, z: -0.13110885, w: 0.7595596} - m_LocalPosition: {x: 54.37, y: 40.18, z: -87.15} + m_LocalPosition: {x: 55.17, y: 40.9, z: -87.57} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -59456,7 +59766,7 @@ Light: m_Type: 0 m_Color: {r: 1, g: 0.3189946, b: 0.023584902, a: 1} m_Intensity: 18.74 - m_Range: 7.68 + m_Range: 14.08 m_SpotAngle: 179 m_InnerSpotAngle: 170.80208 m_CookieSize: 10 @@ -59937,52 +60247,52 @@ PrefabInstance: - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalPosition.x - value: 32.896 + value: 106.504 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalPosition.y - value: -6.855 + value: -8.393 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalPosition.z - value: 1.658 + value: 27.747 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.w - value: 0.9924033 + value: 0.98802674 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.x - value: 0.115802355 + value: -0.016687725 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.y - value: 0.0065157427 + value: 0.11495464 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.z - value: -0.041024666 + value: 0.10153898 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 13.319 + value: -3.229 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.202 + value: 12.951 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -4.711 + value: 11.369 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -70568,7 +70878,7 @@ GameObject: - component: {fileID: 266659583} - component: {fileID: 266659582} m_Layer: 11 - m_Name: CH01_wasteland_vo_prisoner_prisoner_03 + m_Name: CH01_wasteland_vo_prisoner_prisoner_04 m_TagString: Untagged m_Icon: {fileID: 2800000, guid: 4e3e077817b8a684ea3c1fd5132b2f3f, type: 3} m_NavMeshLayer: 0 @@ -70582,13 +70892,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 266659580} serializedVersion: 2 - m_LocalRotation: {x: 0.048762284, y: -0.49931034, z: -0.054539178, w: 0.86332905} - m_LocalPosition: {x: -23.24, y: 41.29, z: -97.38} + m_LocalRotation: {x: -0.03611066, y: -0.46000266, z: -0.06362863, w: 0.88489825} + m_LocalPosition: {x: -23.456, y: 41.36, z: -98.015} m_LocalScale: {x: 4.8775725, y: 8.179292, z: 4.706544} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 782247898} - m_LocalEulerAnglesHint: {x: 1.704, y: -60.209, z: -8.217} + m_LocalEulerAnglesHint: {x: -7.033, y: -54.652, z: -4.588} --- !u!114 &266659582 MonoBehaviour: m_ObjectHideFlags: 0 @@ -70666,6 +70976,19 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 637455468} + m_TargetAssemblyTypeName: PixelCrushers.DialogueSystem.DialogueSystemTrigger, + Assembly-CSharp-firstpass + m_MethodName: OnUse + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 useConversationTitlePicker: 1 useBarkTitlePicker: 1 useQuestNamePicker: 1 @@ -72499,12 +72822,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 274762852} m_Mesh: {fileID: -6726472112248689672, guid: bba66628cdff877468c659ca5a922780, type: 3} ---- !u!4 &274805731 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - m_PrefabInstance: {fileID: 1206450239} - m_PrefabAsset: {fileID: 0} --- !u!1001 &275627057 PrefabInstance: m_ObjectHideFlags: 0 @@ -86149,6 +86466,171 @@ Transform: m_Children: [] m_Father: {fileID: 1369590070} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &339388318 +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 &340814721 PrefabInstance: m_ObjectHideFlags: 0 @@ -87526,6 +88008,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1320259992} m_PrefabAsset: {fileID: 0} +--- !u!4 &349903661 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, + type: 3} + m_PrefabInstance: {fileID: 1357256813} + m_PrefabAsset: {fileID: 0} --- !u!1001 &350087501 PrefabInstance: m_ObjectHideFlags: 0 @@ -110388,7 +110876,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1047401959} + objectReference: {fileID: 2020449770} - target: {fileID: 2614899761469592907, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: 'm_Materials.Array.data[0]' @@ -130613,7 +131101,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1002757274} + objectReference: {fileID: 14188132} - target: {fileID: 2614899761469592907, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: 'm_Materials.Array.data[0]' @@ -136353,52 +136841,52 @@ PrefabInstance: - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalPosition.x - value: 58.01 + value: 58.75 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalPosition.y - value: 36.01 + value: 35.68 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalPosition.z - value: -83.25 + value: -82.13 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalRotation.w - value: -0.35962343 + value: 0.30053955 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalRotation.x - value: -0.08312847 + value: -0.058906473 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalRotation.y - value: -0.9215803 + value: -0.9518174 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalRotation.z - value: 0.12020972 + value: 0.015801044 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 16.341 + value: -0.305 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -222.061 + value: -144.971 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 3.989 + value: 6.987 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -159826,12 +160314,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 559782922} m_PrefabAsset: {fileID: 0} ---- !u!4 &560465833 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, - type: 3} - m_PrefabInstance: {fileID: 1603980568} - m_PrefabAsset: {fileID: 0} --- !u!1 &560814489 GameObject: m_ObjectHideFlags: 0 @@ -167562,12 +168044,6 @@ MonoBehaviour: blendDistance: 0 weight: 1 sharedProfile: {fileID: 11400000, guid: c54a7d4864fee3440ae0cf6d2a9de811, type: 2} ---- !u!4 &594710551 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - m_PrefabInstance: {fileID: 1192305069} - m_PrefabAsset: {fileID: 0} --- !u!1001 &595419447 PrefabInstance: m_ObjectHideFlags: 0 @@ -174652,6 +175128,163 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} +--- !u!1 &637455466 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 637455467} + - component: {fileID: 637455470} + - component: {fileID: 637455469} + - component: {fileID: 637455468} + m_Layer: 11 + m_Name: CH01_wasteland_vo_womnderer_prisoner_04 + m_TagString: Untagged + m_Icon: {fileID: 2800000, guid: 4e3e077817b8a684ea3c1fd5132b2f3f, type: 3} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &637455467 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 637455466} + serializedVersion: 2 + m_LocalRotation: {x: -0.03611066, y: -0.46000266, z: -0.06362863, w: 0.88489825} + m_LocalPosition: {x: -25.061, y: 41.592, z: -98.73} + m_LocalScale: {x: 4.8775725, y: 8.179292, z: 4.706544} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 782247898} + m_LocalEulerAnglesHint: {x: -7.033, y: -54.652, z: -4.588} +--- !u!114 &637455468 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 637455466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} + m_Name: + m_EditorClassIdentifier: + trigger: 32 + fireOnce: 1 + condition: + luaConditions: [] + questConditions: [] + acceptedTags: + - Player + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + setQuestState: 1 + questName: WastelandKillSpiders + questState: 2 + setQuestEntryState: 0 + questEntryNumber: 1 + questEntryState: 0 + luaCode: + sequence: + sequenceSpeaker: {fileID: 0} + sequenceListener: {fileID: 0} + waitOneFrameOnStartOrEnable: 1 + alertMessage: + textTable: {fileID: 0} + alertDuration: 0 + sendMessages: [] + barkSource: 1 + barkConversation: + barkText: What land is this with spiders as big as dogs? + barkTextSequence: + barker: {fileID: 0} + barkTarget: {fileID: 0} + barkOrder: 1 + allowBarksDuringConversations: 0 + skipBarkIfNoValidEntries: 0 + cacheBarkLines: 0 + conversation: + conversationConversant: {fileID: 0} + conversationActor: {fileID: 0} + startConversationEntryID: -1 + exclusive: 0 + skipIfNoValidEntries: 0 + stopConversationOnTriggerExit: 0 + stopConversationIfTooFar: 0 + maxConversationDistance: 5 + monitorConversationDistanceFrequency: 1 + showCursorDuringConversation: 0 + pauseGameDuringConversation: 0 + setActiveActions: [] + setEnabledActions: [] + setAnimatorStateActions: [] + onExecute: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1141881517} + m_TargetAssemblyTypeName: Beyond.BarkManager, Assembly-CSharp + m_MethodName: PlayBark + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 64 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 72092795} + m_TargetAssemblyTypeName: PixelCrushers.DialogueSystem.DialogueSystemTrigger, + Assembly-CSharp-firstpass + m_MethodName: OnUse + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + useConversationTitlePicker: 1 + useBarkTitlePicker: 1 + useQuestNamePicker: 1 + selectedDatabase: {fileID: 11400000, guid: d6f6a47305abab144b7fc1a5e1f080ef, type: 2} +--- !u!65 &637455469 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 637455466} + 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: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &637455470 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 637455466} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &637633207 PrefabInstance: m_ObjectHideFlags: 0 @@ -176010,6 +176643,70 @@ Transform: type: 3} m_PrefabInstance: {fileID: 644165946} m_PrefabAsset: {fileID: 0} +--- !u!21 &644596696 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Override + m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _DIRECTIONALL: 1 + - _DirectionalFalloff: 2 + - _DirectionalIntensity: 1 + - _DirectionalMode: 1 + - _FOGG: 1 + - _FogAxisMode: 1 + - _FogColorDuo: 1 + - _FogDistanceEnd: 200 + - _FogDistanceFalloff: 2 + - _FogDistanceStart: -200 + - _FogHeightEnd: 200 + - _FogHeightFalloff: 2 + - _FogHeightStart: 0 + - _FogIntensity: 1 + - _FogLayersMode: 0 + - _IsHeightFogPreset: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _NOISEE: 1 + - _NoiseDistanceEnd: 50 + - _NoiseIntensity: 1 + - _NoiseMode: 2 + - _NoiseModeBlend: 1 + - _NoiseScale: 30 + - _SKYBOXX: 1 + - _SkyboxFogFalloff: 1 + - _SkyboxFogFill: 1 + - _SkyboxFogHeight: 1 + - _SkyboxFogIntensity: 1 + - _TITLE: 1 + m_Colors: + - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} + - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} + - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} + - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} + - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} + - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1001 &644793568 PrefabInstance: m_ObjectHideFlags: 0 @@ -181468,37 +182165,37 @@ PrefabInstance: - target: {fileID: 1861859122261593409, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, type: 3} propertyPath: m_LocalPosition.x - value: 55.79 + value: 55.01 objectReference: {fileID: 0} - target: {fileID: 1861859122261593409, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, type: 3} propertyPath: m_LocalPosition.y - value: 36.24 + value: 36.17 objectReference: {fileID: 0} - target: {fileID: 1861859122261593409, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, type: 3} propertyPath: m_LocalPosition.z - value: -87.88 + value: -86.8 objectReference: {fileID: 0} - target: {fileID: 1861859122261593409, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, type: 3} propertyPath: m_LocalRotation.w - value: 0.961337 + value: 0.96213526 objectReference: {fileID: 0} - target: {fileID: 1861859122261593409, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, type: 3} propertyPath: m_LocalRotation.x - value: 0.0025829722 + value: -0.002785997 objectReference: {fileID: 0} - target: {fileID: 1861859122261593409, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, type: 3} propertyPath: m_LocalRotation.y - value: -0.27082214 + value: -0.27082014 objectReference: {fileID: 0} - target: {fileID: 1861859122261593409, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, type: 3} propertyPath: m_LocalRotation.z - value: -0.049797956 + value: -0.030731728 objectReference: {fileID: 0} - target: {fileID: 1861859122261593409, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, type: 3} @@ -181513,7 +182210,7 @@ PrefabInstance: - target: {fileID: 1861859122261593409, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -5.576 + value: -3.304 objectReference: {fileID: 0} - target: {fileID: 1861869461890951577, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, type: 3} @@ -202288,171 +202985,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &760683107 -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 &761361811 PrefabInstance: m_ObjectHideFlags: 0 @@ -205768,7 +206300,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0.003656476, y: -0.060859486, z: -0.012142402, w: 0.9980658} m_LocalPosition: {x: 23.78, y: 38.25, z: -95.6} - m_LocalScale: {x: 1, y: 1, z: 1.706} + m_LocalScale: {x: 1, y: 1, z: 2.6291165} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 830642059} @@ -208693,7 +209225,7 @@ GameObject: m_Component: - component: {fileID: 782247898} m_Layer: 0 - m_Name: 1= VO_Triggers + m_Name: 1= VO_Triggers / BARKS m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -208719,6 +209251,7 @@ Transform: - {fileID: 2067597957} - {fileID: 190451337} - {fileID: 23852031} + - {fileID: 40697940} - {fileID: 858576878} - {fileID: 528727090} - {fileID: 1037581379} @@ -208730,6 +209263,9 @@ Transform: - {fileID: 1194939450} - {fileID: 1514809572} - {fileID: 266659581} + - {fileID: 72092794} + - {fileID: 637455467} + - {fileID: 1974951812} - {fileID: 1945096824} - {fileID: 1327567302} - {fileID: 1686691367} @@ -216608,52 +217144,52 @@ PrefabInstance: - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalPosition.x - value: 3.045 + value: 105.46 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalPosition.y - value: -4.83 + value: -7.97 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalPosition.z - value: -37.762 + value: 31.93 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.w - value: 0.9924033 + value: -0.93268627 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.x - value: 0.115802355 + value: 0.15956184 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.y - value: 0.0065157427 + value: -0.31884626 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.z - value: -0.041024666 + value: -0.05452883 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 13.319 + value: -19.415 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.202 + value: 37.747 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -4.711 + value: -0.002 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -224582,125 +225118,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 25390236} m_PrefabAsset: {fileID: 0} ---- !u!1 &849064262 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 849064263} - - component: {fileID: 849064266} - - component: {fileID: 849064265} - - component: {fileID: 849064264} - m_Layer: 0 - m_Name: BarkTriggerTutorialChest - m_TagString: Untagged - m_Icon: {fileID: 2800000, guid: b1a615fdf6bd20940a59c9cf8671316d, type: 3} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &849064263 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 849064262} - serializedVersion: 2 - m_LocalRotation: {x: -0.47221985, y: 0.52631587, z: 0.52631605, w: 0.4722197} - m_LocalPosition: {x: 39.13, y: 0.34, z: 17.74} - m_LocalScale: {x: 3.6263003, y: 12.27, z: 3.217835} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1362974216} - m_LocalEulerAnglesHint: {x: -90, y: 0, z: -263.798} ---- !u!114 &849064264 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 849064262} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d79fd46029f2cfa428619d2c20b6b48a, type: 3} - m_Name: - m_EditorClassIdentifier: - m_key: BarkTriggerTutorialChest_49804 - m_appendSaverTypeToKey: 0 - m_saveAcrossSceneChanges: 0 - m_restoreStateOnStart: 0 - events: - onEnableDelay: 0 - onEnable: - m_PersistentCalls: - m_Calls: [] - onDisable: - m_PersistentCalls: - m_Calls: [] - onEnter: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1141881517} - m_TargetAssemblyTypeName: Beyond.BarkManager, Assembly-CSharp - m_MethodName: PlayBark - m_Mode: 3 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 25 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - onExit: - m_PersistentCalls: - m_Calls: [] - reEnable: 0 - reDisable: 0 - reEntry: 0 - reExit: 0 - collisionLayer: - serializedVersion: 2 - m_Bits: 256 - tagMask: - m_tags: - - Player - drawGizmos: 0 - drawWire: 0 - color: {r: 0.23843007, g: 0.3584906, b: 0.27344772, a: 0.22745098} - colorWire: {r: 1, g: 1, b: 1, a: 0.14901961} ---- !u!65 &849064265 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 849064262} - 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: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &849064266 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 849064262} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &849505968 GameObject: m_ObjectHideFlags: 0 @@ -224728,8 +225145,8 @@ Transform: m_GameObject: {fileID: 849505968} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.21631196, z: -0, w: 0.9763244} - m_LocalPosition: {x: 6.9900055, y: 42.3, z: -66.73999} - m_LocalScale: {x: 30.501348, y: 24.281208, z: 3.4748} + m_LocalPosition: {x: 1.39, y: 42.3, z: -63.17} + m_LocalScale: {x: 22.20498, y: 24.281208, z: 3.4748} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 190662092} @@ -255783,6 +256200,7 @@ Transform: - {fileID: 1692817883} - {fileID: 582851307} - {fileID: 486915039} + - {fileID: 349903661} - {fileID: 1534392083} - {fileID: 686675300} - {fileID: 1633015832} @@ -261959,171 +262377,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1001176545} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!43 &1002757274 -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 &1002924014 GameObject: m_ObjectHideFlags: 0 @@ -273542,8 +273795,8 @@ Transform: m_GameObject: {fileID: 1037581378} serializedVersion: 2 m_LocalRotation: {x: -0.06746069, y: 0.6295011, z: -0.029770203, w: 0.7734928} - m_LocalPosition: {x: 23.02, y: 37.61, z: -94.73} - m_LocalScale: {x: 8.012457, y: 8.179292, z: 15.083913} + m_LocalPosition: {x: 22.836, y: 38.633, z: -93.38} + m_LocalScale: {x: 9.287239, y: 9.480618, z: 17.483765} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 782247898} @@ -275204,171 +275457,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 085ba9a312c11a942ab1bbbdd90f610e, type: 3} ---- !u!43 &1047401959 -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 &1048023420 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2326605842400248350, guid: 43c06bb4a2fc7934ab89119e4d2da3e9, @@ -282462,52 +282550,52 @@ PrefabInstance: - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalPosition.x - value: 42.359 + value: 102.51 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalPosition.y - value: -6.916 + value: -8.486 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalPosition.z - value: 1.248 + value: 31.231 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.w - value: 0.9924033 + value: 0.9986122 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.x - value: 0.115802355 + value: -0.032375176 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.y - value: 0.0065157427 + value: 0.01251669 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.z - value: -0.041024666 + value: -0.039608218 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 13.319 + value: -3.65 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.202 + value: 1.583 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -4.711 + value: -4.593 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -289276,6 +289364,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1100385011} m_PrefabAsset: {fileID: 0} +--- !u!21 &1100669796 +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 &1100676091 stripped Transform: m_CorrespondingSourceObject: {fileID: 4114705420832722, guid: 577d605054895d7448b3b3e626e76f9e, @@ -289391,96 +289512,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1101752316} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1101846641 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1643860996} - m_Modifications: - - target: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_key - value: PurpleconeflowersVariant33_60014 - objectReference: {fileID: 0} - - target: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - - target: {fileID: 7215417275878312112, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_Name - value: Purple coneflowers Variant (33) - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_RootOrder - value: 16 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.124 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.y - value: -2.214 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.z - value: 4.778 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.9924033 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.115802355 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.0065157427 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.041024666 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 13.319 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0.202 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -4.711 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} ---- !u!4 &1101846642 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - m_PrefabInstance: {fileID: 1101846641} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1102715455 PrefabInstance: m_ObjectHideFlags: 0 @@ -290836,39 +290867,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9f9ac09b791910d4ea1350fdcb58ee35, type: 3} ---- !u!21 &1110188996 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Height Fog Global - m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3002 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _HeightFogGlobal: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _TITLE: 1 - - _TransparentQueue: 3000 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &1110800939 PrefabInstance: m_ObjectHideFlags: 0 @@ -304149,13 +304147,13 @@ MonoBehaviour: barkText: clip: {fileID: 8300000, guid: 6eb4bf25416c5b04d8c3c6bd8c169f3d, type: 3} - playOnce: 1 - delayToStart: 0 + delayToStart: 11 barks: - barkConversation: CH01/WASTELAND/CH01_wasteland_vo_prisoner_wanderer_03 barkText: clip: {fileID: 8300000, guid: 11c7c69f7186e824fac8a2c4a029f835, type: 3} - playOnce: 1 - delayToStart: 0 + delayToStart: 17 barks: - barkConversation: 'CH01/WASTELAND/CH01_wasteland_vo_prisoner_wanderer_04 ' barkText: @@ -304179,7 +304177,7 @@ MonoBehaviour: barkText: clip: {fileID: 8300000, guid: 74737e9c7848ae24783fa2a5ead26fe3, type: 3} - playOnce: 1 - delayToStart: 3 + delayToStart: 8 barks: - barkConversation: CH01/WASTELAND/CH01_wasteland_vo_prisoner_prisoner_04 barkText: @@ -304190,6 +304188,24 @@ MonoBehaviour: - barkConversation: CH01/WASTELAND/CH01_wasteland_vo_shortcut_wanderer_01 barkText: clip: {fileID: 8300000, guid: 666d8577ffdbd7d4187a78a5cccbfb04, type: 3} + - playOnce: 1 + delayToStart: 0 + barks: + - barkConversation: CH01/WASTELAND/CH01_wasteland_vo_illusion_wanderer_03 + barkText: + clip: {fileID: 8300000, guid: b83b82ecc997fb54886c861846eeea47, type: 3} + - playOnce: 1 + delayToStart: 2.1 + barks: + - barkConversation: 'CH01/WASTELAND/CH01_wasteland_vo_prisoner_wanderer_02 ' + barkText: + clip: {fileID: 8300000, guid: 828587b17c5a8db4c8e3556a593b7720, type: 3} + - playOnce: 1 + delayToStart: 15 + barks: + - barkConversation: CH01/WASTELAND/CH01_wasteland_vo_prisoner_prisoner_05 + barkText: + clip: {fileID: 8300000, guid: aad5a577029aefa4aa7a7319f2a20770, type: 3} m_saveData: wasPlayed: m_audioSource: {fileID: 1141881518} @@ -315145,52 +315161,57 @@ PrefabInstance: - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalPosition.x - value: 24.732 + value: 98.958 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalPosition.y - value: -6.301 + value: -8.334 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalPosition.z - value: -51.615 + value: 26.638 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.w - value: 0.9726284 + value: -0.99558514 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.x - value: -0.104434736 + value: -0.0821687 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.y - value: -0.14968355 + value: 0.043977994 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.z - value: 0.14381294 + value: 0.011152799 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -9.213 + value: 9.36 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -18.99 + value: -5.199 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 18.366 + value: -1.709 + objectReference: {fileID: 0} + - target: {fileID: 8930810447781783052, guid: cc4034fd6f56b6e4abf78a6c44c631ae, + type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -317457,90 +317478,6 @@ MonoBehaviour: blendDistance: 0 weight: 1 sharedProfile: {fileID: 11400000, guid: 6bf062dc6f348c944aa3e0f7573cdf91, type: 2} ---- !u!1001 &1192305069 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1643860996} - m_Modifications: - - target: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_key - value: PurpleconeflowersVariant64_67092 - objectReference: {fileID: 0} - - target: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - - target: {fileID: 7215417275878312112, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_Name - value: Purple coneflowers Variant (64) - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_RootOrder - value: 28 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.x - value: 41.639 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.y - value: -6.207 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.z - value: -50.17 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.9885961 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.13653487 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.012041641 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.06237873 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 15.751 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0.403 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -7.165 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} --- !u!4 &1192367134 stripped Transform: m_CorrespondingSourceObject: {fileID: 2448633745928515813, guid: 5f757d9f8ec3fd847b9425282b71d2a9, @@ -318509,14 +318446,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1194939449} serializedVersion: 2 - m_LocalRotation: {x: 0.048762284, y: -0.49931034, z: -0.054539178, w: 0.86332905} - m_LocalPosition: {x: -21.2, y: 39.21, z: -94.11} - m_LocalScale: {x: 4.8775725, y: 8.179292, z: 4.706544} + m_LocalRotation: {x: 0.010178009, y: -0.4963782, z: -0.07677211, w: 0.86464506} + m_LocalPosition: {x: -21.746, y: 39.261, z: -93.88} + m_LocalScale: {x: 3.7135398, y: 6.2273035, z: 3.583327} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 676726988} m_Father: {fileID: 782247898} - m_LocalEulerAnglesHint: {x: 1.704, y: -60.209, z: -8.217} + m_LocalEulerAnglesHint: {x: -3.36, y: -59.477, z: -8.228} --- !u!114 &1194939451 MonoBehaviour: m_ObjectHideFlags: 0 @@ -321319,90 +321256,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1206136062} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1206450239 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1643860996} - m_Modifications: - - target: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_key - value: PurpleconeflowersVariant68_68076 - objectReference: {fileID: 0} - - target: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - - target: {fileID: 7215417275878312112, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_Name - value: Purple coneflowers Variant (68) - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_RootOrder - value: 31 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.x - value: 33.325 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.y - value: -6.285 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.z - value: -62.339 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.98759705 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.06433568 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.09638569 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.10593824 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 8.482 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -10.294 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 11.48 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} --- !u!114 &1208118478 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4197548685982761983, guid: 851e8e61247888340bdec90fc8aa37f5, @@ -355197,6 +355050,94 @@ LODGroup: - renderer: {fileID: 255238699} - renderer: {fileID: 1280220484} m_Enabled: 1 +--- !u!1001 &1357256813 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 959742649} + m_Modifications: + - target: {fileID: 3729385275159174759, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, + type: 3} + propertyPath: m_Name + value: Rock5 (31) + objectReference: {fileID: 0} + - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, + type: 3} + propertyPath: m_RootOrder + value: 324 + objectReference: {fileID: 0} + - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, + type: 3} + propertyPath: m_LocalScale.x + value: 1.3252913 + objectReference: {fileID: 0} + - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, + type: 3} + propertyPath: m_LocalScale.y + value: 1.4358621 + objectReference: {fileID: 0} + - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, + type: 3} + propertyPath: m_LocalScale.z + value: 1.3785679 + objectReference: {fileID: 0} + - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, + type: 3} + propertyPath: m_LocalPosition.x + value: 55.78 + objectReference: {fileID: 0} + - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, + type: 3} + propertyPath: m_LocalPosition.y + value: 35.77 + objectReference: {fileID: 0} + - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, + type: 3} + propertyPath: m_LocalPosition.z + value: -76.88 + objectReference: {fileID: 0} + - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.30282003 + objectReference: {fileID: 0} + - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.00527757 + objectReference: {fileID: 0} + - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.9475931 + objectReference: {fileID: 0} + - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.10168368 + objectReference: {fileID: 0} + - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 10.924 + objectReference: {fileID: 0} + - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -144.156 + objectReference: {fileID: 0} + - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 4.181 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} --- !u!1 &1357854508 GameObject: m_ObjectHideFlags: 0 @@ -356188,7 +356129,6 @@ Transform: - {fileID: 625141273} - {fileID: 1332741235} - {fileID: 1652713903} - - {fileID: 849064263} - {fileID: 282992363} - {fileID: 1441188296} - {fileID: 1674667344} @@ -359034,89 +358974,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1387441850} m_Mesh: {fileID: -6799056753637144491, guid: e59a1818e0146d14980f3fc38bd02588, type: 3} ---- !u!1001 &1388076056 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1816159991} - m_Modifications: - - target: {fileID: 190266, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} - propertyPath: m_Name - value: Lamp_2b (1) - objectReference: {fileID: 0} - - target: {fileID: 493534, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 493534, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} - propertyPath: m_LocalScale.x - value: 1.671014 - objectReference: {fileID: 0} - - target: {fileID: 493534, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} - propertyPath: m_LocalScale.y - value: 1.671014 - objectReference: {fileID: 0} - - target: {fileID: 493534, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} - propertyPath: m_LocalScale.z - value: 1.671014 - objectReference: {fileID: 0} - - target: {fileID: 493534, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} - propertyPath: m_LocalPosition.x - value: 58.46115 - objectReference: {fileID: 0} - - target: {fileID: 493534, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} - propertyPath: m_LocalPosition.y - value: 37.05111 - objectReference: {fileID: 0} - - target: {fileID: 493534, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} - propertyPath: m_LocalPosition.z - value: -222.2147 - objectReference: {fileID: 0} - - target: {fileID: 493534, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} - propertyPath: m_LocalRotation.w - value: 0.9748242 - objectReference: {fileID: 0} - - target: {fileID: 493534, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} - propertyPath: m_LocalRotation.x - value: 0.05346097 - objectReference: {fileID: 0} - - target: {fileID: 493534, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} - propertyPath: m_LocalRotation.y - value: -0.19387251 - objectReference: {fileID: 0} - - target: {fileID: 493534, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} - propertyPath: m_LocalRotation.z - value: 0.0962979 - objectReference: {fileID: 0} - - target: {fileID: 493534, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 8.139 - objectReference: {fileID: 0} - - target: {fileID: 493534, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -21.804 - objectReference: {fileID: 0} - - target: {fileID: 493534, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 9.713 - objectReference: {fileID: 0} - - target: {fileID: 2351512, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} - propertyPath: m_CastShadows - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7453245261f7fe54f9b3ed7bfaf21f00, type: 3} ---- !u!4 &1388076057 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 493534, guid: 7453245261f7fe54f9b3ed7bfaf21f00, - type: 3} - m_PrefabInstance: {fileID: 1388076056} - m_PrefabAsset: {fileID: 0} --- !u!4 &1389254721 stripped Transform: m_CorrespondingSourceObject: {fileID: 1861859122261593409, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, @@ -360636,171 +360493,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 23a159559436b754a8829a1c7244eb31, type: 3} ---- !u!43 &1399899007 -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 &1399924859 GameObject: m_ObjectHideFlags: 0 @@ -385157,176 +384849,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1469515216} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1469609619 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1643860996} - m_Modifications: - - target: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_key - value: PurpleconeflowersVariant14_78560 - objectReference: {fileID: 0} - - target: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - - target: {fileID: 4411759167978242910, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.x - value: 1.45 - objectReference: {fileID: 0} - - target: {fileID: 4411759167978242910, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4411759167978242910, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.097 - objectReference: {fileID: 0} - - target: {fileID: 5997097253248375245, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalScale.x - value: 16.805298 - objectReference: {fileID: 0} - - target: {fileID: 5997097253248375245, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalScale.y - value: 2.0976784 - objectReference: {fileID: 0} - - target: {fileID: 5997097253248375245, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalScale.z - value: 16.805292 - objectReference: {fileID: 0} - - target: {fileID: 5997097253248375245, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.x - value: -1.62 - objectReference: {fileID: 0} - - target: {fileID: 5997097253248375245, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.y - value: -1.08 - objectReference: {fileID: 0} - - target: {fileID: 5997097253248375245, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.46 - objectReference: {fileID: 0} - - target: {fileID: 5997097253248375245, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.97378445 - objectReference: {fileID: 0} - - target: {fileID: 5997097253248375245, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.06300558 - objectReference: {fileID: 0} - - target: {fileID: 5997097253248375245, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.018865494 - objectReference: {fileID: 0} - - target: {fileID: 5997097253248375245, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.21775737 - objectReference: {fileID: 0} - - target: {fileID: 5997097253248375245, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 6.574 - objectReference: {fileID: 0} - - target: {fileID: 5997097253248375245, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -3.704 - objectReference: {fileID: 0} - - target: {fileID: 5997097253248375245, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -25.423 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878312112, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_Name - value: Purple coneflowers Variant (14) - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.x - value: 15.66 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.y - value: -6.076 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.z - value: -66.11 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.9924033 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.115802355 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.0065157427 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.041024666 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 13.319 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0.202 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -4.711 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} ---- !u!4 &1469609620 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - m_PrefabInstance: {fileID: 1469609619} - m_PrefabAsset: {fileID: 0} --- !u!1 &1469659281 GameObject: m_ObjectHideFlags: 0 @@ -387643,139 +387165,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1485209750} m_Mesh: {fileID: -6201437837848608256, guid: e59a1818e0146d14980f3fc38bd02588, type: 3} ---- !u!1 &1485264657 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1485264658} - - component: {fileID: 1485264662} - - component: {fileID: 1485264661} - - component: {fileID: 1485264660} - - component: {fileID: 1485264659} - m_Layer: 0 - m_Name: HiddenPassage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1485264658 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1485264657} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0.11597734, z: 0, w: 0.9932519} - m_LocalPosition: {x: -7.553, y: 0.099, z: 14.364} - m_LocalScale: {x: 0.1, y: 4.73, z: 5.09} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 132977598} - m_LocalEulerAnglesHint: {x: 0, y: 13.32, z: 0} ---- !u!114 &1485264659 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1485264657} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 73b9091c5c040480ab84b12a5e673d57, type: 3} - m_Name: - m_EditorClassIdentifier: - m_key: - m_appendSaverTypeToKey: 0 - m_saveAcrossSceneChanges: 1 - m_restoreStateOnStart: 0 - m_fresnelColor: {r: 0.5, g: 0.5, b: 2, a: 1} - m_addToCompass: 1 - m_removeFromCompassAfter: 15 - m_minCompassDistance: 0 - m_fresnelTime: 1 - m_fresnelPower: 2 - m_actionCollider: {fileID: 1485264660} - m_reverseAction: 1 ---- !u!65 &1485264660 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1485264657} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1485264661 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1485264657} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1485264662 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1485264657} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1485370175 stripped Transform: m_CorrespondingSourceObject: {fileID: 6092136001238120400, guid: 249f153543576874e84df57b8bb314cd, @@ -406483,7 +405872,7 @@ MonoBehaviour: m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 64 + m_IntArgument: 72 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -431409,6 +430798,109 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1001 &1593639541 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1816159991} + m_Modifications: + - target: {fileID: 3474742598227391281, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_Name + value: Dry_ivy02 (93) + objectReference: {fileID: 0} + - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_RootOrder + value: 101 + objectReference: {fileID: 0} + - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_LocalScale.x + value: 5.339022 + objectReference: {fileID: 0} + - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_LocalScale.y + value: 5.339021 + objectReference: {fileID: 0} + - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_LocalScale.z + value: 5.339021 + objectReference: {fileID: 0} + - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_LocalPosition.x + value: 40.726 + objectReference: {fileID: 0} + - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_LocalPosition.y + value: 33.349 + objectReference: {fileID: 0} + - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_LocalPosition.z + value: -186.512 + objectReference: {fileID: 0} + - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.2910766 + objectReference: {fileID: 0} + - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.74219626 + objectReference: {fileID: 0} + - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.58204424 + objectReference: {fileID: 0} + - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.16013654 + objectReference: {fileID: 0} + - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 38.206 + objectReference: {fileID: 0} + - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 172.605 + objectReference: {fileID: 0} + - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 101.227 + objectReference: {fileID: 0} + - target: {fileID: 6758275926610092775, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.2152 + objectReference: {fileID: 0} + - target: {fileID: 6758275926610092775, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.0124 + objectReference: {fileID: 0} + - target: {fileID: 6758275926610092775, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.2971 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} --- !u!1001 &1593882460 PrefabInstance: m_ObjectHideFlags: 0 @@ -432517,94 +432009,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1603335308} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1603980568 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 151733281} - m_Modifications: - - target: {fileID: 3474742598227391281, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, - type: 3} - propertyPath: m_Name - value: Dry_ivy02 (6) - objectReference: {fileID: 0} - - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, - type: 3} - propertyPath: m_RootOrder - value: 49 - objectReference: {fileID: 0} - - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, - type: 3} - propertyPath: m_LocalScale.x - value: 1.5537915 - objectReference: {fileID: 0} - - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, - type: 3} - propertyPath: m_LocalScale.y - value: 1.5537915 - objectReference: {fileID: 0} - - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, - type: 3} - propertyPath: m_LocalScale.z - value: 1.5537915 - objectReference: {fileID: 0} - - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, - type: 3} - propertyPath: m_LocalPosition.x - value: 27.835983 - objectReference: {fileID: 0} - - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, - type: 3} - propertyPath: m_LocalPosition.y - value: 39.438072 - objectReference: {fileID: 0} - - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, - type: 3} - propertyPath: m_LocalPosition.z - value: -147.44406 - objectReference: {fileID: 0} - - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, - type: 3} - propertyPath: m_LocalRotation.w - value: -0.7934019 - objectReference: {fileID: 0} - - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.5300311 - objectReference: {fileID: 0} - - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.23476517 - objectReference: {fileID: 0} - - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.18564962 - objectReference: {fileID: 0} - - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -68.16 - objectReference: {fileID: 0} - - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 28.187 - objectReference: {fileID: 0} - - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -352.94 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} --- !u!4 &1604064369 stripped Transform: m_CorrespondingSourceObject: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, @@ -442727,96 +442131,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 318217428} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1630353185 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1643860996} - m_Modifications: - - target: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_key - value: PurpleconeflowersVariant29_93648 - objectReference: {fileID: 0} - - target: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 71105098078770568, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - - target: {fileID: 7215417275878312112, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_Name - value: Purple coneflowers Variant (29) - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_RootOrder - value: 13 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.x - value: -11.181 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.y - value: -1.569 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalPosition.z - value: -8.689 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.9924033 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.115802355 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.0065157427 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.041024666 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 13.319 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0.202 - objectReference: {fileID: 0} - - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -4.711 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} ---- !u!4 &1630353186 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, - type: 3} - m_PrefabInstance: {fileID: 1630353185} - m_PrefabAsset: {fileID: 0} --- !u!4 &1630565462 stripped Transform: m_CorrespondingSourceObject: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, @@ -445036,17 +444350,11 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 137734421} - - {fileID: 1469609620} - {fileID: 802211052} - - {fileID: 1630353186} - - {fileID: 1101846642} - {fileID: 212960473} - {fileID: 1066780091} - {fileID: 1288887135} - {fileID: 867384682} - - {fileID: 594710551} - - {fileID: 274805731} m_Father: {fileID: 1093335739} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1644302209 stripped @@ -459223,11 +458531,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2134063086755373663, guid: 851e8e61247888340bdec90fc8aa37f5, - type: 3} - propertyPath: delayToStart - value: 0.05 - objectReference: {fileID: 0} - target: {fileID: 2134063086755373663, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: OnTutorialEnded.m_PersistentCalls.m_Calls.Array.data[1].m_Target @@ -497807,7 +497110,6 @@ Transform: - {fileID: 4740600} - {fileID: 2123394813} - {fileID: 719394442} - - {fileID: 1388076057} - {fileID: 1679769730} - {fileID: 2000017665} - {fileID: 1943486492} @@ -497907,6 +497209,7 @@ Transform: - {fileID: 1803616753} - {fileID: 1462677417} - {fileID: 1857516833} + - {fileID: 2040590583} - {fileID: 116770487} - {fileID: 1774522629} - {fileID: 984366764} @@ -537665,6 +536968,150 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1974211901} m_PrefabAsset: {fileID: 0} +--- !u!1 &1974951811 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1974951812} + - component: {fileID: 1974951815} + - component: {fileID: 1974951814} + - component: {fileID: 1974951813} + m_Layer: 11 + m_Name: CH01_wasteland_vo_womnderer_prisoner_05 + m_TagString: Untagged + m_Icon: {fileID: 2800000, guid: 4e3e077817b8a684ea3c1fd5132b2f3f, type: 3} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1974951812 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1974951811} + serializedVersion: 2 + m_LocalRotation: {x: -0.03611066, y: -0.46000266, z: -0.06362863, w: 0.88489825} + m_LocalPosition: {x: -29.611, y: 42.265, z: -98.354} + m_LocalScale: {x: 4.8775725, y: 8.179292, z: 4.706544} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 782247898} + m_LocalEulerAnglesHint: {x: -7.033, y: -54.652, z: -4.588} +--- !u!114 &1974951813 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1974951811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} + m_Name: + m_EditorClassIdentifier: + trigger: 32 + fireOnce: 1 + condition: + luaConditions: [] + questConditions: [] + acceptedTags: + - Player + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + setQuestState: 1 + questName: WastelandKillSpiders + questState: 2 + setQuestEntryState: 0 + questEntryNumber: 1 + questEntryState: 0 + luaCode: + sequence: + sequenceSpeaker: {fileID: 0} + sequenceListener: {fileID: 0} + waitOneFrameOnStartOrEnable: 1 + alertMessage: + textTable: {fileID: 0} + alertDuration: 0 + sendMessages: [] + barkSource: 1 + barkConversation: + barkText: What land is this with spiders as big as dogs? + barkTextSequence: + barker: {fileID: 0} + barkTarget: {fileID: 0} + barkOrder: 1 + allowBarksDuringConversations: 0 + skipBarkIfNoValidEntries: 0 + cacheBarkLines: 0 + conversation: + conversationConversant: {fileID: 0} + conversationActor: {fileID: 0} + startConversationEntryID: -1 + exclusive: 0 + skipIfNoValidEntries: 0 + stopConversationOnTriggerExit: 0 + stopConversationIfTooFar: 0 + maxConversationDistance: 5 + monitorConversationDistanceFrequency: 1 + showCursorDuringConversation: 0 + pauseGameDuringConversation: 0 + setActiveActions: [] + setEnabledActions: [] + setAnimatorStateActions: [] + onExecute: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1141881517} + m_TargetAssemblyTypeName: Beyond.BarkManager, Assembly-CSharp + m_MethodName: PlayBark + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 65 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + useConversationTitlePicker: 1 + useBarkTitlePicker: 1 + useQuestNamePicker: 1 + selectedDatabase: {fileID: 11400000, guid: d6f6a47305abab144b7fc1a5e1f080ef, type: 2} +--- !u!65 &1974951814 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1974951811} + 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: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &1974951815 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1974951811} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1975217437 PrefabInstance: m_ObjectHideFlags: 0 @@ -546167,6 +545614,171 @@ MonoBehaviour: subPoints: [] randomPatrolPoint: 0 rotateTo: 1 +--- !u!43 &2020449770 +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 &2020792536 PrefabInstance: m_ObjectHideFlags: 0 @@ -548916,6 +548528,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 369808461} m_PrefabAsset: {fileID: 0} +--- !u!4 &2040590583 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, + type: 3} + m_PrefabInstance: {fileID: 1593639541} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2040949541 PrefabInstance: m_ObjectHideFlags: 0 @@ -551187,52 +550805,52 @@ PrefabInstance: - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalPosition.x - value: 11.838 + value: 102.142 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalPosition.y - value: -5.995 + value: -8.368 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalPosition.z - value: -42.88 + value: 26.96 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.w - value: 0.95916826 + value: -0.934768 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.x - value: 0.023436574 + value: -0.017650867 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.y - value: -0.2794766 + value: -0.35477802 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalRotation.z - value: 0.03660514 + value: -0.005458441 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 3.751 + value: 1.669 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -32.382 + value: 41.586 objectReference: {fileID: 0} - target: {fileID: 7215417275878502720, guid: cc4034fd6f56b6e4abf78a6c44c631ae, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 3.282 + value: 1.303 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -566810,6 +566428,171 @@ PlayableDirector: type: 3} m_PrefabInstance: {fileID: 2125332353} m_PrefabAsset: {fileID: 0} +--- !u!43 &2125535211 +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 &2126520707 stripped Transform: m_CorrespondingSourceObject: {fileID: 3056393058199397780, guid: 003daaab58a32ca419f0a3ef3dbef864, @@ -629241,6 +629024,11 @@ PrefabInstance: propertyPath: _onDead.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 5333334514882816832, guid: c495bff86931ab44c9d4f5ca88081bc1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7509553594521516071, guid: c495bff86931ab44c9d4f5ca88081bc1, type: 3} propertyPath: m_LocalScale.y @@ -632889,7 +632677,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1110188996} + - {fileID: 1100669796} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -632982,7 +632770,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 87423029} + overrideMaterial: {fileID: 644596696} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 @@ -644848,13 +644636,79 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0.563 objectReference: {fileID: 0} + - target: {fileID: 3005094229599176799, guid: 746bcfd5566b2354480f84b8e46b35d6, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3207506407912878680, guid: 746bcfd5566b2354480f84b8e46b35d6, type: 3} propertyPath: m_Name value: FX_GateStone objectReference: {fileID: 0} + - target: {fileID: 3222708425022938236, guid: 746bcfd5566b2354480f84b8e46b35d6, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.87 + objectReference: {fileID: 0} + - target: {fileID: 3222708425022938236, guid: 746bcfd5566b2354480f84b8e46b35d6, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3222708425022938236, guid: 746bcfd5566b2354480f84b8e46b35d6, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.34 + objectReference: {fileID: 0} + - target: {fileID: 3222708425022938236, guid: 746bcfd5566b2354480f84b8e46b35d6, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9999047 + objectReference: {fileID: 0} + - target: {fileID: 3222708425022938236, guid: 746bcfd5566b2354480f84b8e46b35d6, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.00000008149072 + objectReference: {fileID: 0} + - target: {fileID: 3222708425022938236, guid: 746bcfd5566b2354480f84b8e46b35d6, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.013806282 + objectReference: {fileID: 0} + - target: {fileID: 3222708425022938236, guid: 746bcfd5566b2354480f84b8e46b35d6, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.0000000011641531 + objectReference: {fileID: 0} + - target: {fileID: 3222708425022938236, guid: 746bcfd5566b2354480f84b8e46b35d6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 1.582 + objectReference: {fileID: 0} + - target: {fileID: 4049175829509123184, guid: 746bcfd5566b2354480f84b8e46b35d6, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.97 + objectReference: {fileID: 0} + - target: {fileID: 4049175829509123184, guid: 746bcfd5566b2354480f84b8e46b35d6, + type: 3} + propertyPath: m_LocalPosition.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4049175829509123184, guid: 746bcfd5566b2354480f84b8e46b35d6, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.588 + objectReference: {fileID: 0} + - target: {fileID: 8284964722361535217, guid: 746bcfd5566b2354480f84b8e46b35d6, + type: 3} + propertyPath: m_LODs.Array.data[0].renderers.Array.data[0].renderer + value: + objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 3005094229599176799, guid: 746bcfd5566b2354480f84b8e46b35d6, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 746bcfd5566b2354480f84b8e46b35d6, type: 3} @@ -680329,6 +680183,21 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6134798641171500616, guid: 30d3c74e8577e4949aeaaf2ac2ceb479, + type: 3} + propertyPath: m_LocalPosition.x + value: -11.85 + objectReference: {fileID: 0} + - target: {fileID: 6134798641171500616, guid: 30d3c74e8577e4949aeaaf2ac2ceb479, + type: 3} + propertyPath: m_LocalPosition.y + value: 47.84 + objectReference: {fileID: 0} + - target: {fileID: 6134798641171500616, guid: 30d3c74e8577e4949aeaaf2ac2ceb479, + type: 3} + propertyPath: m_LocalPosition.z + value: -53.12 + objectReference: {fileID: 0} - target: {fileID: 6208423724741352500, guid: 30d3c74e8577e4949aeaaf2ac2ceb479, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat b/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat index fd9bcbb81..3375fde88 100644 --- a/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat +++ b/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat @@ -65,11 +65,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _BlendOp: 2 + - _BlendOp: 0 - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 10 + - _DstBlend: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 diff --git a/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v1/Materials/Effect30/AshesFire 1.mat b/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v1/Materials/Effect30/AshesFire 1.mat new file mode 100644 index 000000000..413001aff --- /dev/null +++ b/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v1/Materials/Effect30/AshesFire 1.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AshesFire 1 + m_Shader: {fileID: 4800000, guid: 4775e5a8f344d6348adf934e722da85d, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - BlendAlpha + - Clip_OFF + - FrameBlend_OFF + - FresnelFade_OFF + - VertLight_OFF + m_InvalidKeywords: + - SoftParticles_OFF + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 8eed4849b39fb834eb66082fe0e29f36, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpTex: + m_Texture: {fileID: 2800000, guid: 4fb80bc804baa8b4a84fca1b633c455a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CutoutMap: + m_Texture: {fileID: 2800000, guid: 3b8734daeb37a294a963f524ca46b98d, type: 3} + m_Scale: {x: 1.01, y: 0.43} + m_Offset: {x: 0.06, y: 0.04} + - _HeightMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 846201ad15c9fea44bd92700047902d5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - CullMode: 2 + - DstMode: 10 + - SrcMode: 5 + - _BumpAmt: 20 + - _Cutout: 0.15 + - _CutoutThreshold: 0 + - _FPOW: 1 + - _FresnelDistort: 200 + - _FresnelStr: 1 + - _Height: 0 + - _InvFade: 1 + - _R0: 0 + - _RefractiveStrength: 0.04 + - _SoftFresnel: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _CutoutColor: {r: 0.91176486, g: 4, b: 1.1886411, a: 1} + - _FresnelColor: {r: 0.06925258, g: 0.40499997, b: 0.041691188, a: 1} + - _FresnelDistort: {r: 8, g: 12, b: 1, a: 1500} + - _TintColor: {r: 0, g: 0.16578315, b: 1.4980391, a: 0.503} + - _UVScrollDistort: {r: 8, g: 12, b: 1, a: 1500} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v1/Materials/Effect30/AshesFire 1.mat.meta b/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v1/Materials/Effect30/AshesFire 1.mat.meta new file mode 100644 index 000000000..939705bca --- /dev/null +++ b/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v1/Materials/Effect30/AshesFire 1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e8787fef1d0c3334880457619e016641 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ScriptableBuildPipeline.json b/ProjectSettings/ScriptableBuildPipeline.json index e6738dc22..dfa4f083c 100644 --- a/ProjectSettings/ScriptableBuildPipeline.json +++ b/ProjectSettings/ScriptableBuildPipeline.json @@ -4,6 +4,7 @@ "cacheServerPort": 8126, "threadedArchiving": true, "logCacheMiss": false, + "logAssetWarnings": true, "slimWriteResults": true, "maximumCacheSize": 20, "useDetailedBuildLog": false,