diff --git a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset index 7a117ed64..a5a71e573 100644 --- a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset +++ b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset @@ -1114,11 +1114,11 @@ MonoBehaviour: - id: 11 fields: - title: Name - value: ValleyTravelUnlocked + value: RuinedTownTravelUnlocked type: 0 typeString: - title: Initial Value - value: False + value: True type: 2 typeString: CustomFieldType_Boolean - title: Description @@ -1128,11 +1128,11 @@ MonoBehaviour: - id: 12 fields: - title: Name - value: TempleTravelUnlocked + value: DarkForestTravelUnlocked type: 0 typeString: - title: Initial Value - value: False + value: True type: 2 typeString: CustomFieldType_Boolean - title: Description @@ -10663,12 +10663,6 @@ MonoBehaviour: falseConditionAction: Block conditionPriority: 2 outgoingLinks: - - originConversationID: 20 - originDialogueID: 1 - destinationConversationID: 20 - destinationDialogueID: 2 - isConnector: 0 - priority: 2 - originConversationID: 20 originDialogueID: 1 destinationConversationID: 20 @@ -10728,87 +10722,6 @@ MonoBehaviour: y: 77.97145 width: 160 height: 30 - - id: 2 - fields: - - title: Title - value: - type: 0 - typeString: CustomFieldType_Text - - title: Pictures - value: '[]' - type: 3 - typeString: CustomFieldType_Files - - title: Description - value: - type: 0 - typeString: CustomFieldType_Text - - title: Actor - value: 1 - type: 5 - typeString: CustomFieldType_Actor - - title: Conversant - value: 9 - type: 5 - typeString: CustomFieldType_Actor - - title: Menu Text - value: - type: 0 - typeString: CustomFieldType_Text - - title: Dialogue Text - value: Garden Oasis - 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: en - value: - type: 4 - typeString: CustomFieldType_Localization - - title: Menu Text en - value: - type: 4 - typeString: CustomFieldType_Localization - - title: pl - value: - type: 4 - typeString: CustomFieldType_Localization - - title: Menu Text pl - value: - type: 4 - typeString: CustomFieldType_Localization - conversationID: 20 - isRoot: 0 - isGroup: 0 - nodeColor: - delaySimStatus: 0 - falseConditionAction: Block - conditionPriority: 2 - outgoingLinks: [] - conditionsString: Variable["GardenTravelUnlocked"] == true - userScript: LoadLevel("Garden_Oasis"); - onExecute: - m_PersistentCalls: - m_Calls: [] - canvasRect: - serializedVersion: 2 - x: 18.812225 - y: 149.003 - width: 160 - height: 30 - id: 3 fields: - title: Title @@ -11458,7 +11371,7 @@ MonoBehaviour: width: 160 height: 30 canvasScrollPosition: {x: 0, y: 0} - canvasZoom: 0.72850007 + canvasZoom: 0.8397168 - id: 21 fields: - title: Title @@ -38419,6 +38332,200 @@ MonoBehaviour: height: 30 canvasScrollPosition: {x: 0, y: 0} canvasZoom: 1 + - id: 135 + fields: + - title: Title + value: CH02/RUINEDTOWN/CH02_ruinedtown_vo_Sidranna_wonderer_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: 135 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: + conditionPriority: 2 + outgoingLinks: + - originConversationID: 135 + originDialogueID: 0 + destinationConversationID: 135 + 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: Sidranna's tree! Choked by these cursed roots. I will free her! + 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: 135 + 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: 81 + 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 919b08cb1..d340ac786 100644 --- a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta +++ b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1be821ff9c6ccec4db23fc04f12527a2 +guid: 40aab082b1fb34570b879cac5d849f94 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Dialogue/TestDialogueBase.asset b/Assets/Dialogue/TestDialogueBase.asset index 34056d10b..d2cb85987 100644 --- a/Assets/Dialogue/TestDialogueBase.asset +++ b/Assets/Dialogue/TestDialogueBase.asset @@ -1114,11 +1114,11 @@ MonoBehaviour: - id: 11 fields: - title: Name - value: ValleyTravelUnlocked + value: RuinedTownTravelUnlocked type: 0 typeString: - title: Initial Value - value: False + value: True type: 2 typeString: CustomFieldType_Boolean - title: Description @@ -1128,11 +1128,11 @@ MonoBehaviour: - id: 12 fields: - title: Name - value: TempleTravelUnlocked + value: DarkForestTravelUnlocked type: 0 typeString: - title: Initial Value - value: False + value: True type: 2 typeString: CustomFieldType_Boolean - title: Description @@ -1174,7 +1174,7 @@ MonoBehaviour: type: 0 typeString: - title: Initial Value - value: False + value: True type: 2 typeString: CustomFieldType_Boolean - title: Description @@ -10663,42 +10663,12 @@ MonoBehaviour: falseConditionAction: Block conditionPriority: 2 outgoingLinks: - - originConversationID: 20 - originDialogueID: 1 - destinationConversationID: 20 - destinationDialogueID: 2 - isConnector: 0 - priority: 2 - originConversationID: 20 originDialogueID: 1 destinationConversationID: 20 destinationDialogueID: 3 isConnector: 0 priority: 2 - - originConversationID: 20 - originDialogueID: 1 - destinationConversationID: 20 - destinationDialogueID: 4 - isConnector: 0 - priority: 2 - - originConversationID: 20 - originDialogueID: 1 - destinationConversationID: 20 - destinationDialogueID: 5 - isConnector: 0 - priority: 2 - - originConversationID: 20 - originDialogueID: 1 - destinationConversationID: 20 - destinationDialogueID: 6 - isConnector: 0 - priority: 2 - - originConversationID: 20 - originDialogueID: 1 - destinationConversationID: 20 - destinationDialogueID: 7 - isConnector: 0 - priority: 2 - originConversationID: 20 originDialogueID: 1 destinationConversationID: 20 @@ -10717,6 +10687,18 @@ MonoBehaviour: destinationDialogueID: 10 isConnector: 0 priority: 2 + - originConversationID: 20 + originDialogueID: 1 + destinationConversationID: 20 + destinationDialogueID: 11 + isConnector: 0 + priority: 2 + - originConversationID: 20 + originDialogueID: 1 + destinationConversationID: 20 + destinationDialogueID: 12 + isConnector: 0 + priority: 2 conditionsString: userScript: onExecute: @@ -10728,87 +10710,6 @@ MonoBehaviour: y: 77.97145 width: 160 height: 30 - - id: 2 - fields: - - title: Title - value: - type: 0 - typeString: CustomFieldType_Text - - title: Pictures - value: '[]' - type: 3 - typeString: CustomFieldType_Files - - title: Description - value: - type: 0 - typeString: CustomFieldType_Text - - title: Actor - value: 1 - type: 5 - typeString: CustomFieldType_Actor - - title: Conversant - value: 9 - type: 5 - typeString: CustomFieldType_Actor - - title: Menu Text - value: - type: 0 - typeString: CustomFieldType_Text - - title: Dialogue Text - value: Garden Oasis - 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: en - value: - type: 4 - typeString: CustomFieldType_Localization - - title: Menu Text en - value: - type: 4 - typeString: CustomFieldType_Localization - - title: pl - value: - type: 4 - typeString: CustomFieldType_Localization - - title: Menu Text pl - value: - type: 4 - typeString: CustomFieldType_Localization - conversationID: 20 - isRoot: 0 - isGroup: 0 - nodeColor: - delaySimStatus: 0 - falseConditionAction: Block - conditionPriority: 2 - outgoingLinks: [] - conditionsString: Variable["GardenTravelUnlocked"] == true - userScript: LoadLevel("Garden_Oasis"); - onExecute: - m_PersistentCalls: - m_Calls: [] - canvasRect: - serializedVersion: 2 - x: 18.812225 - y: 149.003 - width: 160 - height: 30 - id: 3 fields: - title: Title @@ -10880,338 +10781,14 @@ MonoBehaviour: conditionPriority: 2 outgoingLinks: [] conditionsString: Variable["WastelandTravelUnlocked"] == true - userScript: LoadLevel("Land_of_Death_Wasteland"); + userScript: LoadLevel("Wasteland"); onExecute: m_PersistentCalls: m_Calls: [] canvasRect: serializedVersion: 2 - x: 210.0993 - y: 150.00447 - width: 160 - height: 30 - - id: 4 - fields: - - title: Title - value: - type: 0 - typeString: CustomFieldType_Text - - title: Pictures - value: '[]' - type: 3 - typeString: CustomFieldType_Files - - title: Description - value: - type: 0 - typeString: CustomFieldType_Text - - title: Actor - value: 1 - type: 5 - typeString: CustomFieldType_Actor - - title: Conversant - value: 9 - type: 5 - typeString: CustomFieldType_Actor - - title: Menu Text - value: - type: 0 - typeString: CustomFieldType_Text - - title: Dialogue Text - value: River Valley - 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: en - value: - type: 4 - typeString: CustomFieldType_Localization - - title: Menu Text en - value: - type: 4 - typeString: CustomFieldType_Localization - - title: pl - value: - type: 4 - typeString: CustomFieldType_Localization - - title: Menu Text pl - value: - type: 4 - typeString: CustomFieldType_Localization - conversationID: 20 - isRoot: 0 - isGroup: 0 - nodeColor: - delaySimStatus: 0 - falseConditionAction: Block - conditionPriority: 2 - outgoingLinks: [] - conditionsString: Variable["ValleyTravelUnlocked"] == true - userScript: LoadLevel("Land_of_Death_River1_Valley"); - onExecute: - m_PersistentCalls: - m_Calls: [] - canvasRect: - serializedVersion: 2 - x: 398.3817 - y: 151.006 - width: 160 - height: 30 - - id: 5 - fields: - - title: Title - value: - type: 0 - typeString: CustomFieldType_Text - - title: Pictures - value: '[]' - type: 3 - typeString: CustomFieldType_Files - - title: Description - value: - type: 0 - typeString: CustomFieldType_Text - - title: Actor - value: 1 - type: 5 - typeString: CustomFieldType_Actor - - title: Conversant - value: 9 - type: 5 - typeString: CustomFieldType_Actor - - title: Menu Text - value: - type: 0 - typeString: CustomFieldType_Text - - title: Dialogue Text - value: Court Of Justice - 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: en - value: - type: 4 - typeString: CustomFieldType_Localization - - title: Menu Text en - value: - type: 4 - typeString: CustomFieldType_Localization - - title: pl - value: - type: 4 - typeString: CustomFieldType_Localization - - title: Menu Text pl - value: - type: 4 - typeString: CustomFieldType_Localization - conversationID: 20 - isRoot: 0 - isGroup: 0 - nodeColor: - delaySimStatus: 0 - falseConditionAction: Block - conditionPriority: 2 - outgoingLinks: [] - conditionsString: Variable["CourtTravelUnlocked"] == true - userScript: LoadLevel("Court_of_Justice"); - onExecute: - m_PersistentCalls: - m_Calls: [] - canvasRect: - serializedVersion: 2 - x: 597.68066 - y: 148.00148 - width: 160 - height: 30 - - id: 6 - fields: - - title: Title - value: - type: 0 - typeString: CustomFieldType_Text - - title: Pictures - value: '[]' - type: 3 - typeString: CustomFieldType_Files - - title: Description - value: - type: 0 - typeString: CustomFieldType_Text - - title: Actor - value: 1 - type: 5 - typeString: CustomFieldType_Actor - - title: Conversant - value: 9 - type: 5 - typeString: CustomFieldType_Actor - - title: Menu Text - value: - type: 0 - typeString: CustomFieldType_Text - - title: Dialogue Text - value: Chamber Of Ancient Scrolls - 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: en - value: - type: 4 - typeString: CustomFieldType_Localization - - title: Menu Text en - value: - type: 4 - typeString: CustomFieldType_Localization - - title: pl - value: - type: 4 - typeString: CustomFieldType_Localization - - title: Menu Text pl - value: - type: 4 - typeString: CustomFieldType_Localization - conversationID: 20 - isRoot: 0 - isGroup: 0 - nodeColor: - delaySimStatus: 0 - falseConditionAction: Block - conditionPriority: 2 - outgoingLinks: [] - conditionsString: Variable["ChamberTravelUnlocked"] == true - userScript: LoadLevel("Chamber_of_Ancient_Scrolls"); - onExecute: - m_PersistentCalls: - m_Calls: [] - canvasRect: - serializedVersion: 2 - x: 788.96735 - y: 143.99542 - width: 160 - height: 30 - - id: 7 - fields: - - title: Title - value: - type: 0 - typeString: CustomFieldType_Text - - title: Pictures - value: '[]' - type: 3 - typeString: CustomFieldType_Files - - title: Description - value: - type: 0 - typeString: CustomFieldType_Text - - title: Actor - value: 1 - type: 5 - typeString: CustomFieldType_Actor - - title: Conversant - value: 9 - type: 5 - typeString: CustomFieldType_Actor - - title: Menu Text - value: - type: 0 - typeString: CustomFieldType_Text - - title: Dialogue Text - value: Temple - 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: en - value: - type: 4 - typeString: CustomFieldType_Localization - - title: Menu Text en - value: - type: 4 - typeString: CustomFieldType_Localization - - title: pl - value: - type: 4 - typeString: CustomFieldType_Localization - - title: Menu Text pl - value: - type: 4 - typeString: CustomFieldType_Localization - conversationID: 20 - isRoot: 0 - isGroup: 0 - nodeColor: - delaySimStatus: 0 - falseConditionAction: Block - conditionPriority: 2 - outgoingLinks: [] - conditionsString: Variable["TempleTravelUnlocked"] == true - userScript: LoadLevel("Temple"); - onExecute: - m_PersistentCalls: - m_Calls: [] - canvasRect: - serializedVersion: 2 - x: 984.2603 - y: 150.00447 + x: 410.1668 + y: 229.7934 width: 160 height: 30 - id: 8 @@ -11291,8 +10868,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 1183.5597 - y: 149.00302 + x: 1268.1119 + y: 241.89151 width: 160 height: 30 - id: 9 @@ -11457,8 +11034,146 @@ MonoBehaviour: y: 228.1773 width: 160 height: 30 + - id: 11 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 9 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: Ruined Town + 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: 20 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: Variable["RuinedTownTravelUnlocked"] == true + userScript: LoadLevel("Ruined Town"); + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 616.9717 + y: 230.387 + width: 160 + height: 30 + - id: 12 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 9 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: Dark Forest + 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: 20 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: Variable["DarkForestTravelUnlocked"] == true + userScript: LoadLevel("Dark Forest"); + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 858.71967 + y: 233.95949 + width: 160 + height: 30 canvasScrollPosition: {x: 0, y: 0} - canvasZoom: 0.72850007 + canvasZoom: 0.8397168 - id: 21 fields: - title: Title diff --git a/Assets/Fonts/Gaia User Data.meta b/Assets/Fonts/Gaia User Data.meta new file mode 100644 index 000000000..90edbd22e --- /dev/null +++ b/Assets/Fonts/Gaia User Data.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aac798572b5624e0aa258aa6452e2e11 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/scroll/scrollMat2D.mat b/Assets/Meshes/scroll/scrollMat2D.mat index 7fad8ae2c..663afd0fd 100644 --- a/Assets/Meshes/scroll/scrollMat2D.mat +++ b/Assets/Meshes/scroll/scrollMat2D.mat @@ -138,7 +138,7 @@ Material: - _MaxBrightness: 1 - _Metallic: 0 - _MinBrightness: 0 - - _NoiseScale: 1.013747 + - _NoiseScale: 1.6067502 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueControl: 0 diff --git a/Assets/Quests/TheMysticalSword.asset b/Assets/Quests/TheMysticalSword.asset index ee6653acb..370062690 100644 --- a/Assets/Quests/TheMysticalSword.asset +++ b/Assets/Quests/TheMysticalSword.asset @@ -1019,8 +1019,8 @@ MonoBehaviour: m_childIndexList: 02000000 m_canvasRect: serializedVersion: 2 - x: 341 - y: 163.06383 + x: 340.23053 + y: 165.37216 width: 120 height: 48 - m_id: diff --git a/Assets/Scenes/Old_Levels!/TestHub.unity b/Assets/Scenes/Old_Levels!/TestHub.unity index 3f2fce085..cf48ec0ee 100644 --- a/Assets/Scenes/Old_Levels!/TestHub.unity +++ b/Assets/Scenes/Old_Levels!/TestHub.unity @@ -1233,6 +1233,103 @@ Material: - _TintColor: {r: 0.47794116, g: 0, b: 0, a: 0.728} m_BuildTextureStacks: [] m_AllowLocking: 1 +--- !u!1001 &172766082 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2222871496612246922, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: useDirectLoad + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2222871496612246922, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: directLoadLevelName + value: Ruined Town + objectReference: {fileID: 0} + - target: {fileID: 2222871496612246922, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: excludedLevels.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2222871496612246922, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: 'excludedLevels.Array.data[0]' + value: Test Hub + objectReference: {fileID: 0} + - target: {fileID: 4356717714091686263, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_Name + value: PORTAL RuinedTown + objectReference: {fileID: 0} + - target: {fileID: 5236832152036474326, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_text + value: Ruined Town + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.36 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalPosition.y + value: 39.9 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalPosition.z + value: -88.55664 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7482406487495588409, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + m_SourcePrefab: {fileID: 100100000, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, type: 3} --- !u!21 &204792018 Material: serializedVersion: 8 @@ -20534,6 +20631,103 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1863237867 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2222871496612246922, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: useDirectLoad + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2222871496612246922, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: directLoadLevelName + value: Dark Forest + objectReference: {fileID: 0} + - target: {fileID: 2222871496612246922, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: excludedLevels.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2222871496612246922, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: 'excludedLevels.Array.data[0]' + value: Test Hub + objectReference: {fileID: 0} + - target: {fileID: 4356717714091686263, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_Name + value: PORTAL Dark Forest + objectReference: {fileID: 0} + - target: {fileID: 5236832152036474326, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_text + value: Dark Forest + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalPosition.x + value: 8.16 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalPosition.y + value: 39.9 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalPosition.z + value: -88.55664 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7482406487495588409, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + m_SourcePrefab: {fileID: 100100000, guid: cd8f9cb3aae974fbc9aedcaba4d732ef, type: 3} --- !u!4 &1886116475 stripped Transform: m_CorrespondingSourceObject: {fileID: 6858198192782613031, guid: 851e8e61247888340bdec90fc8aa37f5, @@ -36667,6 +36861,8 @@ SceneRoots: - {fileID: 1288550245} - {fileID: 1405663574} - {fileID: 34386179} + - {fileID: 172766082} + - {fileID: 1863237867} - {fileID: 1953481260} - {fileID: 392914050} - {fileID: 434772659} diff --git a/Assets/ScriptableObjects/LevelsData/LevelLoaderData.asset b/Assets/ScriptableObjects/LevelsData/LevelLoaderData.asset index b99cf65a2..52c2e4dda 100644 --- a/Assets/ScriptableObjects/LevelsData/LevelLoaderData.asset +++ b/Assets/ScriptableObjects/LevelsData/LevelLoaderData.asset @@ -25,3 +25,11 @@ MonoBehaviour: LevelNameToDisplay: Wasteland DialogueVariableName: LoadSceneMode: 0 + - LevelName: Ruined_Town + LevelNameToDisplay: Ruined Town + DialogueVariableName: RuinedTownTravelUnlocked + LoadSceneMode: 0 + - LevelName: DarkForest + LevelNameToDisplay: Dark Forest + DialogueVariableName: DarkForestTravelUnlocked + LoadSceneMode: 0 diff --git a/Assets/Scripts/Triggers/Editor.meta b/Assets/Scripts/Triggers/Editor.meta new file mode 100644 index 000000000..7f1258586 --- /dev/null +++ b/Assets/Scripts/Triggers/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 78e8a986bdc174b95b617ecded2d003f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/VanillaLoopStudio/MaleLocomotionSet.meta b/Assets/ThirdParty/VanillaLoopStudio/MaleLocomotionSet.meta new file mode 100644 index 000000000..ada85fb8d --- /dev/null +++ b/Assets/ThirdParty/VanillaLoopStudio/MaleLocomotionSet.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 836faff1b1b2392438dfdcbd015bb370 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/VanillaLoopStudio/MaleLocomotionSet/Art.meta b/Assets/ThirdParty/VanillaLoopStudio/MaleLocomotionSet/Art.meta new file mode 100644 index 000000000..60302e96e --- /dev/null +++ b/Assets/ThirdParty/VanillaLoopStudio/MaleLocomotionSet/Art.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a92b96a40e403eb47a550d95e811fd2f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 3cced95a0..622b5a1e3 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,15 +8,24 @@ EditorBuildSettings: - enabled: 0 path: Assets/Scenes/MainMenu/MainMenu.unity guid: f76c4914eb27147428d79b9f7a1c000a - - enabled: 0 - path: Assets/Scenes/00_Fight_Arena/Fight_Arena.unity - guid: c403a1db592cfb34988bc76714980ecf + - enabled: 1 + path: Assets/Scenes/Old_Levels!/TestHub.unity + guid: 236f59b04e57a4940aab8cfaeccb71b5 - enabled: 1 path: Assets/Scenes/01_Wasteland/Wasteland.unity guid: 397bf3b86d1ff9f408fe6b3d8662de22 - enabled: 1 path: Assets/Scenes/02_Ruined_Town/Ruined_Town.unity guid: ba0c7302a14a53241953c821d0f4a6c2 + - enabled: 1 + path: Assets/Scenes/03_DarkWoods/DarkForest.unity + guid: 0bd1aa6947572e746ad3c9dfe99c5e30 + - enabled: 1 + path: Assets/Scenes/00_Fight_Arena/Fight_Arena.unity + guid: c403a1db592cfb34988bc76714980ecf + - enabled: 1 + path: Assets/Scenes/Old_Levels!/Portal/Portal.unity + guid: cf1147d8227221747a9f5884efeaeab3 m_configObjects: com.unity.addressableassets: {fileID: 11400000, guid: 272caeb75b6504dcb987edb253f851b7, type: 2} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ce282075b..8b7be5468 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -850,7 +850,7 @@ PlayerSettings: webWasm2023: 0 scriptingDefineSymbols: : UNITY_POST_PROCESSING_STACK_V2 - Android: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;USE_TIMELINE;USE_NEW_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;TMP_PRESENT;ENEMIES_DISABLED + Android: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;USE_TIMELINE;USE_NEW_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;TMP_PRESENT;ENEMIES_DISABLED;MOBILE_INPUT CloudRendering: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER GameCoreScarlett: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER @@ -868,9 +868,9 @@ PlayerSettings: Standalone: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;INVECTOR_BASIC;INVECTOR_MELEE;TOUCH_REACT;GAIA_2_PRESENT;INVECTOR_AI_TEMPLATE;UPPipeline;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;URP_OUTLINE;ODIN_INSPECTOR;ODIN_INSPECTOR_3;TMP_PRESENT;USE_TIMELINE;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ENEMIES_DISABLED VisionOS: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER WebGL: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER - Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER + Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;MOBILE_INPUT XboxOne: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER - iPhone: CROSS_PLATFORM_INPUT;INVECTOR_BASIC;INVECTOR_MELEE;GAIA_2_PRESENT;GAIA_PRO_PRESENT;UPPipeline;UNITY_POST_PROCESSING_STACK_V2;TOUCH_REACT;INVECTOR_AI_TEMPLATE;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;URP_OUTLINE;ODIN_INSPECTOR;ODIN_INSPECTOR_3;TMP_PRESENT;USE_INVECTOR_INVENTORY;USE_TIMELINE;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ENEMIES_DISABLED + iPhone: CROSS_PLATFORM_INPUT;INVECTOR_BASIC;INVECTOR_MELEE;GAIA_2_PRESENT;GAIA_PRO_PRESENT;UPPipeline;UNITY_POST_PROCESSING_STACK_V2;TOUCH_REACT;INVECTOR_AI_TEMPLATE;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;URP_OUTLINE;ODIN_INSPECTOR;ODIN_INSPECTOR_3;TMP_PRESENT;USE_INVECTOR_INVENTORY;USE_TIMELINE;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ENEMIES_DISABLED;MOBILE_INPUT tvOS: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER additionalCompilerArguments: {} platformArchitecture: {}