From c4b5d7dac3bc3d75e1de2adbb3873e433b0109bb Mon Sep 17 00:00:00 2001 From: Amaan Shawkath Date: Sat, 8 Jul 2023 18:06:06 +0100 Subject: [PATCH 1/6] Improved logic for character sheets added a way to retrieve sheets for characters --- Assets/Data/Derk.asset | 6 +- Assets/Prefabs/CharacterSheet.prefab | 432 ++++++++++++ Assets/Prefabs/CharacterSheet.prefab.meta | 7 + Assets/Scenes/amaan_scene.unity | 631 ++++++++---------- .../Scripts/DialogueSystem/CharacterSheet.cs | 48 ++ .../DialogueSystem/CharacterSheet.cs.meta | 11 + .../CharacterSheetController.cs | 50 +- Assets/Scripts/DialogueSystem/Dialogue.cs | 3 +- .../DialogueSystem/UI/DialoguePanel.cs | 52 +- 9 files changed, 833 insertions(+), 407 deletions(-) create mode 100644 Assets/Prefabs/CharacterSheet.prefab create mode 100644 Assets/Prefabs/CharacterSheet.prefab.meta create mode 100644 Assets/Scripts/DialogueSystem/CharacterSheet.cs create mode 100644 Assets/Scripts/DialogueSystem/CharacterSheet.cs.meta diff --git a/Assets/Data/Derk.asset b/Assets/Data/Derk.asset index 7ee457d..59e02c3 100644 --- a/Assets/Data/Derk.asset +++ b/Assets/Data/Derk.asset @@ -17,13 +17,15 @@ MonoBehaviour: m_strength: 5 m_dexterity: 3 m_intelligence: 5 - m_money: 5 m_dialogueOptions: - text: "Name\u2019s Derk" + bulletizedText: Derk. - text: "Man, I just want to work, y\u2019know? Give me a task and I\u2019ll do it, no problem for old Derk." + bulletizedText: Just wants to work - text: "This mornin\u2019 I helped an old lady get into one of those high speed trains. They always say Derk the jerk, but no one ever says \u201CWow, what a nice guy\u201D. " + bulletizedText: Helped a lady get onto a high speed train. - text: "\u2026 (drools)" - - text: I just want money, whatevs + bulletizedText: ... diff --git a/Assets/Prefabs/CharacterSheet.prefab b/Assets/Prefabs/CharacterSheet.prefab new file mode 100644 index 0000000..6a5d1a5 --- /dev/null +++ b/Assets/Prefabs/CharacterSheet.prefab @@ -0,0 +1,432 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3648372493333439738 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1347195527817132476} + - component: {fileID: 2073744972551899847} + - component: {fileID: 8516805613777976566} + m_Layer: 5 + m_Name: CharacterName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1347195527817132476 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3648372493333439738} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6878822692408269584} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140, y: 0} + m_SizeDelta: {x: 280, y: 40.33} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &2073744972551899847 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3648372493333439738} + m_CullTransparentMesh: 1 +--- !u!114 &8516805613777976566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3648372493333439738} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: CHARACTER_NAME + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4819624461391977750 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6878822692408269584} + - component: {fileID: 30206368602514045} + - component: {fileID: 8659224815697777441} + - component: {fileID: 6559301228595398145} + m_Layer: 5 + m_Name: CharacterSheet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6878822692408269584 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4819624461391977750} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1347195527817132476} + - {fileID: 1377112572425850770} + m_Father: {fileID: 0} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 377.5207, y: 414.1312} + m_Pivot: {x: 0, y: 1} +--- !u!222 &30206368602514045 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4819624461391977750} + m_CullTransparentMesh: 1 +--- !u!114 &8659224815697777441 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4819624461391977750} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.72156864} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6559301228595398145 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4819624461391977750} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8b9f2f1f2da7474e964926017ec32b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_characterNameText: {fileID: 8516805613777976566} + m_line: {fileID: 8356091297438698885} + m_lineHolder: {fileID: 1377112572425850770} +--- !u!1 &6850406712601294282 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2448838632044913563} + - component: {fileID: 515288784752628308} + - component: {fileID: 8356091297438698885} + m_Layer: 5 + m_Name: Line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2448838632044913563 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6850406712601294282} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1377112572425850770} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140, y: 0} + m_SizeDelta: {x: 280, y: 80} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &515288784752628308 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6850406712601294282} + m_CullTransparentMesh: 1 +--- !u!114 &8356091297438698885 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6850406712601294282} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'QUESTION + + ANSWER' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 12 + m_fontSizeMax: 18 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8872162762679651495 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1377112572425850770} + - component: {fileID: 7384642251273810012} + m_Layer: 5 + m_Name: LineHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1377112572425850770 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8872162762679651495} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2448838632044913563} + m_Father: {fileID: 6878822692408269584} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -20.165} + m_SizeDelta: {x: 0, y: -40.33} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7384642251273810012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8872162762679651495} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 1 + m_ReverseArrangement: 0 diff --git a/Assets/Prefabs/CharacterSheet.prefab.meta b/Assets/Prefabs/CharacterSheet.prefab.meta new file mode 100644 index 0000000..dd407b9 --- /dev/null +++ b/Assets/Prefabs/CharacterSheet.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4c5924b3c54ec124da260e5cf3460969 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/amaan_scene.unity b/Assets/Scenes/amaan_scene.unity index c27e586..09e032a 100644 --- a/Assets/Scenes/amaan_scene.unity +++ b/Assets/Scenes/amaan_scene.unity @@ -217,141 +217,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &212189016 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 212189017} - - component: {fileID: 212189019} - - component: {fileID: 212189018} - m_Layer: 5 - m_Name: CharacterName - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &212189017 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 212189016} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 334093782} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 50} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &212189018 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 212189016} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: CHARACTER_NAME - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 18 - m_fontSizeBase: 18 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &212189019 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 212189016} - m_CullTransparentMesh: 1 --- !u!1 &300687582 GameObject: m_ObjectHideFlags: 0 @@ -444,127 +309,22 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &334093780 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 334093782} - - component: {fileID: 334093785} - - component: {fileID: 334093784} - - component: {fileID: 334093783} - - component: {fileID: 334093781} - m_Layer: 5 - m_Name: CharacterSheet - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &334093781 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334093780} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 113c9cdbaeba15f47a35e92d7d13c848, type: 3} - m_Name: - m_EditorClassIdentifier: - m_characterNameText: {fileID: 212189018} - m_line: {fileID: 917377169} - m_lineHolder: {fileID: 334093782} ---- !u!224 &334093782 +--- !u!224 &334093782 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + m_PrefabInstance: {fileID: 8918945883791158082} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334093780} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 212189017} - - {fileID: 917377167} - m_Father: {fileID: 1597852158} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 377.5207, y: 414.1312} - m_Pivot: {x: 0, y: 1} ---- !u!114 &334093783 +--- !u!114 &334093786 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 6559301228595398145, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + m_PrefabInstance: {fileID: 8918945883791158082} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334093780} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Script: {fileID: 11500000, guid: c8b9f2f1f2da7474e964926017ec32b4, type: 3} m_Name: m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 1 - m_Spacing: 20 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 1 - m_ReverseArrangement: 0 ---- !u!114 &334093784 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334093780} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.72156864} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &334093785 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334093780} - m_CullTransparentMesh: 1 --- !u!1 &479886791 GameObject: m_ObjectHideFlags: 0 @@ -886,7 +646,7 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 1 m_ReverseArrangement: 0 ---- !u!1 &917377166 +--- !u!1 &1142350647 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -894,133 +654,44 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 917377167} - - component: {fileID: 917377168} - - component: {fileID: 917377169} - m_Layer: 5 - m_Name: Line + - component: {fileID: 1142350649} + - component: {fileID: 1142350648} + m_Layer: 0 + m_Name: CharacterSheetController m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &917377167 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 917377166} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 334093782} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 120.41516, y: -50} - m_SizeDelta: {x: 240.83032, y: 30} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &917377168 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 917377166} - m_CullTransparentMesh: 1 ---- !u!114 &917377169 + m_IsActive: 1 +--- !u!114 &1142350648 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 917377166} + m_GameObject: {fileID: 1142350647} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: 113c9cdbaeba15f47a35e92d7d13c848, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: LINE_X - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 18 - m_fontSizeBase: 18 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 12 - m_fontSizeMax: 18 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} + m_characterSheet: {fileID: 334093786} + m_characterSheetTransform: {fileID: 1597852158} +--- !u!4 &1142350649 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1142350647} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 365.75354, y: 364.61804, z: -637.4724} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1324808325 GameObject: m_ObjectHideFlags: 0 @@ -1186,8 +857,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_dialoguePanel: {fileID: 1657983510} - m_characterDatas: - - {fileID: 11400000, guid: fe5c0edf44ede8146ac344d9538dafc6, type: 2} --- !u!4 &1439746449 Transform: m_ObjectHideFlags: 0 @@ -1300,7 +969,7 @@ RectTransform: - {fileID: 1657983509} - {fileID: 334093782} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1366,7 +1035,7 @@ MonoBehaviour: m_questionButton: {fileID: 527634155} m_characterNameText: {fileID: 479886793} m_characterText: {fileID: 1739596218} - m_characterSheetController: {fileID: 334093781} + m_characterSheetController: {fileID: 1142350648} --- !u!114 &1657983511 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1743,3 +1412,231 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &3501384769038959433 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3948773691345320346, guid: cdba23405af5bfc41aae17526e8cb01e, type: 3} + propertyPath: m_Name + value: CharacterManager + objectReference: {fileID: 0} + - target: {fileID: 6462895877521634942, guid: cdba23405af5bfc41aae17526e8cb01e, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6462895877521634942, guid: cdba23405af5bfc41aae17526e8cb01e, type: 3} + propertyPath: m_LocalPosition.x + value: 365.75354 + objectReference: {fileID: 0} + - target: {fileID: 6462895877521634942, guid: cdba23405af5bfc41aae17526e8cb01e, type: 3} + propertyPath: m_LocalPosition.y + value: 364.61804 + objectReference: {fileID: 0} + - target: {fileID: 6462895877521634942, guid: cdba23405af5bfc41aae17526e8cb01e, type: 3} + propertyPath: m_LocalPosition.z + value: -637.4724 + objectReference: {fileID: 0} + - target: {fileID: 6462895877521634942, guid: cdba23405af5bfc41aae17526e8cb01e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6462895877521634942, guid: cdba23405af5bfc41aae17526e8cb01e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6462895877521634942, guid: cdba23405af5bfc41aae17526e8cb01e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6462895877521634942, guid: cdba23405af5bfc41aae17526e8cb01e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6462895877521634942, guid: cdba23405af5bfc41aae17526e8cb01e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6462895877521634942, guid: cdba23405af5bfc41aae17526e8cb01e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6462895877521634942, guid: cdba23405af5bfc41aae17526e8cb01e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cdba23405af5bfc41aae17526e8cb01e, type: 3} +--- !u!1001 &8918945883791158082 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1597852158} + m_Modifications: + - target: {fileID: 1347195527817132476, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1347195527817132476, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1347195527817132476, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1347195527817132476, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2448838632044913563, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2448838632044913563, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2448838632044913563, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_SizeDelta.x + value: 280 + objectReference: {fileID: 0} + - target: {fileID: 2448838632044913563, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 2448838632044913563, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_AnchoredPosition.x + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 2448838632044913563, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_AnchoredPosition.y + value: -60 + objectReference: {fileID: 0} + - target: {fileID: 4819624461391977750, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_Name + value: CharacterSheet + objectReference: {fileID: 0} + - target: {fileID: 4819624461391977750, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6850406712601294282, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_SizeDelta.x + value: 280 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_SizeDelta.y + value: 414.1312 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8356091297438698885, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_text + value: 'QUESTION + + ANSWER' + objectReference: {fileID: 0} + - target: {fileID: 8356091297438698885, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_fontSize + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 8356091297438698885, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_fontSizeBase + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 8356091297438698885, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} diff --git a/Assets/Scripts/DialogueSystem/CharacterSheet.cs b/Assets/Scripts/DialogueSystem/CharacterSheet.cs new file mode 100644 index 0000000..693cff6 --- /dev/null +++ b/Assets/Scripts/DialogueSystem/CharacterSheet.cs @@ -0,0 +1,48 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; + +public class CharacterSheet : MonoBehaviour +{ + [SerializeField] private TMP_Text m_characterNameText; + [SerializeField] private TMP_Text m_line; + [SerializeField] private Transform m_lineHolder; + + private Dictionary m_lines = new Dictionary(); + + public void Cleanup() + { + foreach (var line in m_lines) + { + Destroy(line.Value); + } + + m_lines.Clear(); + } + + public void SetName(string name) + { + m_characterNameText.text = name; + } + + // Adds a line to the character sheet. + public void AddLine(string lineText) + { + if (LineExists(lineText)) + return; + + var line = Instantiate(m_line, m_lineHolder); + line.text = lineText; + + line.gameObject.SetActive(true); + + m_lines.Add(lineText, line.gameObject); + } + + // Returns if the line has already been added. + private bool LineExists(string lineText) + { + return m_lines.ContainsKey(lineText); + } +} diff --git a/Assets/Scripts/DialogueSystem/CharacterSheet.cs.meta b/Assets/Scripts/DialogueSystem/CharacterSheet.cs.meta new file mode 100644 index 0000000..6ce4d07 --- /dev/null +++ b/Assets/Scripts/DialogueSystem/CharacterSheet.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c8b9f2f1f2da7474e964926017ec32b4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/DialogueSystem/CharacterSheetController.cs b/Assets/Scripts/DialogueSystem/CharacterSheetController.cs index 90f3649..3d68f2c 100644 --- a/Assets/Scripts/DialogueSystem/CharacterSheetController.cs +++ b/Assets/Scripts/DialogueSystem/CharacterSheetController.cs @@ -1,48 +1,38 @@ -using System.Collections; using System.Collections.Generic; -using TMPro; using UnityEngine; public class CharacterSheetController : MonoBehaviour { - [SerializeField] private TMP_Text m_characterNameText; - [SerializeField] private TMP_Text m_line; - [SerializeField] private Transform m_lineHolder; + public CharacterSheet m_characterSheet; + public Transform m_characterSheetTransform; - private Dictionary m_lines = new Dictionary(); + private Dictionary m_characterSheets = new Dictionary(); - public void Cleanup() + // Returns if a character sheet exists for the character. + public bool SheetExists(string characterName) { - foreach(var line in m_lines) - { - Destroy(line.Value); - } - - m_lines.Clear(); + return m_characterSheets.ContainsKey(characterName); } - public void SetName(string name) + // Get the character sheet for the passed in character. + public CharacterSheet GetSheet(string name) { - m_characterNameText.text = name; + if (!m_characterSheets.ContainsKey(name)) + return null; + + CharacterSheet sheet = null; + m_characterSheets.TryGetValue(name, out sheet); + + return sheet; } - // Adds a line to the character sheet. - public void AddLine(string lineText) + // Creates a new character sheet. + public CharacterSheet CreateSheet(string characterName) { - if (LineExists(lineText)) - return; + var sheet = Instantiate(m_characterSheet, m_characterSheetTransform); - var line = Instantiate(m_line, m_lineHolder); - line.text = lineText; + m_characterSheets.Add(characterName, sheet); - line.gameObject.SetActive(true); - - m_lines.Add(lineText, line.gameObject); - } - - // Returns if the line has already been added. - private bool LineExists(string lineText) - { - return m_lines.ContainsKey(lineText); + return sheet; } } diff --git a/Assets/Scripts/DialogueSystem/Dialogue.cs b/Assets/Scripts/DialogueSystem/Dialogue.cs index cd64581..6a0cae8 100644 --- a/Assets/Scripts/DialogueSystem/Dialogue.cs +++ b/Assets/Scripts/DialogueSystem/Dialogue.cs @@ -13,7 +13,6 @@ public class QuestionData "Who are you?", "Tell me something about yourself.", "What is your greatest accomplishment?", - "Where do you see yourself in five years?", - "What are your salary requirements?" + "Where do you see yourself in five years?" }; } diff --git a/Assets/Scripts/DialogueSystem/UI/DialoguePanel.cs b/Assets/Scripts/DialogueSystem/UI/DialoguePanel.cs index 9c92f48..8b1d19f 100644 --- a/Assets/Scripts/DialogueSystem/UI/DialoguePanel.cs +++ b/Assets/Scripts/DialogueSystem/UI/DialoguePanel.cs @@ -1,5 +1,7 @@ using System; using System.Collections; +using System.Collections.Generic; +using System.Reflection; using TMPro; using UnityEngine; using UnityEngine.UI; @@ -17,12 +19,16 @@ public class DialoguePanel : MonoBehaviour private const float TypingSpeed = 0.03f; + private List m_questionIndexAsked = new List(); private CharacterData m_currentCharacter; private bool m_skipped = false; private int m_questionCount = QuestionData.Questions.Length; private int m_questionsAsked = 0; + private CharacterSheet m_characterSheet; + private string m_lineToAdd = ""; + private bool QuestionsFinished => m_questionsAsked >= m_questionCount; private void Awake() @@ -36,18 +42,33 @@ public class DialoguePanel : MonoBehaviour { Cleanup(); - m_characterSheetController.Cleanup(); - m_characterSheetController.SetName(characterData.name); - + m_questionsAsked = 0; m_currentCharacter = characterData; m_characterNameText.text = characterData.name; - // TODO: will this be changed with an introductory text? m_characterText.text = "Select an option..."; + SetupCharacterSheet(); + m_characterSheet.SetName(characterData.name); + m_characterSheet.gameObject.SetActive(true); + gameObject.SetActive(true); } + private void SetupCharacterSheet() + { + var sheetExists = m_characterSheetController.SheetExists(m_currentCharacter.name); + + if (sheetExists) + { + m_characterSheet = m_characterSheetController.GetSheet(m_currentCharacter.name); + return; + } + + // Create a new character sheet + m_characterSheet = m_characterSheetController.CreateSheet(m_currentCharacter.name); + } + // Handles cleaing up for the next text. private void Cleanup() { @@ -96,6 +117,9 @@ public class DialoguePanel : MonoBehaviour m_skipped = true; m_characterText.text = text; + // Add the current line to the character sheet. + PopulateCharacterSheet(); + // If we've asked all the questions we should mark this character as interviewed and continue. if (QuestionsFinished) { @@ -115,11 +139,27 @@ public class DialoguePanel : MonoBehaviour var dialogueOption = m_currentCharacter.m_dialogueOptions[index]; StartCoroutine(DisplayText(dialogueOption.text)); - // TODO: we should update the sheet with this information. - m_characterSheetController.AddLine(dialogueOption.text); + // Setup the line to add to the character sheet once the dialogue has finished. + m_lineToAdd = $"Q.) {QuestionData.Questions[index]}\nA.) {dialogueOption.bulletizedText}"; + + MarkQuestionAsked(index); + } + + // Marks the question as asked if it hasn't been asked already. + private void MarkQuestionAsked(int index) + { + if (m_questionIndexAsked.Contains(index)) + return; // Increment questions asked. m_questionsAsked++; + m_questionIndexAsked.Add(index); + } + + private void PopulateCharacterSheet() + { + m_characterSheet.AddLine(m_lineToAdd); + m_lineToAdd = ""; } // Callback from Unity on the skip button. -- 2.49.1 From 4d086fd5b9cbe674d2d78e3e8aae95b37cd7ceba Mon Sep 17 00:00:00 2001 From: Amaan Shawkath Date: Sat, 8 Jul 2023 18:16:13 +0100 Subject: [PATCH 2/6] Added public getter for character sheets --- Assets/Scripts/DialogueSystem/CharacterSheetController.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/DialogueSystem/CharacterSheetController.cs b/Assets/Scripts/DialogueSystem/CharacterSheetController.cs index 3d68f2c..9838f0e 100644 --- a/Assets/Scripts/DialogueSystem/CharacterSheetController.cs +++ b/Assets/Scripts/DialogueSystem/CharacterSheetController.cs @@ -1,10 +1,14 @@ using System.Collections.Generic; +using System.Collections.ObjectModel; +using Unity.VisualScripting; using UnityEngine; public class CharacterSheetController : MonoBehaviour { - public CharacterSheet m_characterSheet; - public Transform m_characterSheetTransform; + [SerializeField] private CharacterSheet m_characterSheet; + [SerializeField] private Transform m_characterSheetTransform; + + public IReadOnlyCollection CharacterSheets => m_characterSheets.Values; private Dictionary m_characterSheets = new Dictionary(); -- 2.49.1 From ae768baaaa2571714ed591db5147550035e75387 Mon Sep 17 00:00:00 2001 From: Amaan Shawkath Date: Sat, 8 Jul 2023 18:16:28 +0100 Subject: [PATCH 3/6] Added image attribute to character data --- Assets/Scripts/DialogueSystem/CharacterData.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/Scripts/DialogueSystem/CharacterData.cs b/Assets/Scripts/DialogueSystem/CharacterData.cs index d5df629..a26d6a4 100644 --- a/Assets/Scripts/DialogueSystem/CharacterData.cs +++ b/Assets/Scripts/DialogueSystem/CharacterData.cs @@ -4,6 +4,7 @@ using UnityEngine; [CreateAssetMenu(fileName = "CharacterData", menuName = "Characters/Generate Character Data", order = 1)] public class CharacterData : ScriptableObject { + public Sprite m_image; public string m_name; public int m_charisma; -- 2.49.1 From 7ab1e2cf4c88ccd535cf1abfb9fad354e38f0120 Mon Sep 17 00:00:00 2001 From: Amaan Shawkath Date: Sat, 8 Jul 2023 18:17:07 +0100 Subject: [PATCH 4/6] Cleaning up using statements --- Assets/Scripts/DialogueSystem/CharacterSheetController.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Assets/Scripts/DialogueSystem/CharacterSheetController.cs b/Assets/Scripts/DialogueSystem/CharacterSheetController.cs index 9838f0e..842f2fb 100644 --- a/Assets/Scripts/DialogueSystem/CharacterSheetController.cs +++ b/Assets/Scripts/DialogueSystem/CharacterSheetController.cs @@ -1,6 +1,4 @@ using System.Collections.Generic; -using System.Collections.ObjectModel; -using Unity.VisualScripting; using UnityEngine; public class CharacterSheetController : MonoBehaviour -- 2.49.1 From 4697a647ef92ff5b08a6ef6ce0af466a80000575 Mon Sep 17 00:00:00 2001 From: Amaan Shawkath Date: Sat, 8 Jul 2023 18:50:49 +0100 Subject: [PATCH 5/6] Adding in the characters Added debug buttons to cycle through the characters Bug fixes --- Assets/Data/Adena.asset | 37 ++ Assets/Data/Adena.asset.meta | 8 + Assets/Data/Adventure Cat.asset | 33 + Assets/Data/Adventure Cat.asset.meta | 8 + Assets/Data/Amadeus.asset | 33 + Assets/Data/Amadeus.asset.meta | 8 + Assets/Data/Derk.asset | 3 +- Assets/Data/Rufus.asset | 33 + Assets/Data/Rufus.asset.meta | 8 + Assets/Gameobjects/CharacterManager.prefab | 6 +- Assets/Scenes/amaan_scene.unity | 588 ++++++++++++++++-- .../DialogueSystem/DialogueController.cs | 22 +- .../DialogueSystem/UI/DialoguePanel.cs | 7 + 13 files changed, 752 insertions(+), 42 deletions(-) create mode 100644 Assets/Data/Adena.asset create mode 100644 Assets/Data/Adena.asset.meta create mode 100644 Assets/Data/Adventure Cat.asset create mode 100644 Assets/Data/Adventure Cat.asset.meta create mode 100644 Assets/Data/Amadeus.asset create mode 100644 Assets/Data/Amadeus.asset.meta create mode 100644 Assets/Data/Rufus.asset create mode 100644 Assets/Data/Rufus.asset.meta diff --git a/Assets/Data/Adena.asset b/Assets/Data/Adena.asset new file mode 100644 index 0000000..c727c20 --- /dev/null +++ b/Assets/Data/Adena.asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ddda90cbbcf3ea54e9105c3a5f0ac9a5, type: 3} + m_Name: Adena + m_EditorClassIdentifier: + m_image: {fileID: 0} + m_name: Adena + m_charisma: 3 + m_strength: 10 + m_dexterity: 10 + m_intelligence: 10 + m_dialogueOptions: + - text: "G\u2019day Sir, I am the fair Adena, princess of the faraway planet of + Velarius." + bulletizedText: Adena. Princess. + - text: "Working? A princess doesn\u2019t work, what do you have your robotic servants + for, after all? Well, that was before I left, now times are different\u2026" + bulletizedText: Stuck up princess doesn't work... + - text: "Once, when I was still a wee little child, a bird landed on my finger + while I was staring at the moon. My parents loved it. \u201CWhat a cute, little + princess,\u201D they said. Well, my favourite moment was when I smashed their + palace into pieces after they tried to marry me to Sir Reginald the Lizardman. + Me and a lizard! Can you imagine?" + bulletizedText: Destroying her parents palace for making her getting married + to a lizard... + - text: Away from this place and being worshipped as the goddess that I am, of + course. + bulletizedText: Being worshipped as a "goddess"... diff --git a/Assets/Data/Adena.asset.meta b/Assets/Data/Adena.asset.meta new file mode 100644 index 0000000..7de07e8 --- /dev/null +++ b/Assets/Data/Adena.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d92c258ff1f60e0468c12806ba88217d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Adventure Cat.asset b/Assets/Data/Adventure Cat.asset new file mode 100644 index 0000000..f5f88d4 --- /dev/null +++ b/Assets/Data/Adventure Cat.asset @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ddda90cbbcf3ea54e9105c3a5f0ac9a5, type: 3} + m_Name: Adventure Cat + m_EditorClassIdentifier: + m_image: {fileID: 0} + m_name: Adventure Cat + m_charisma: 5 + m_strength: 10 + m_dexterity: 5 + m_intelligence: 5 + m_dialogueOptions: + - text: "\u2026 (the cat looks at you, on her name collar you read: Adventure + Cat)" + bulletizedText: Adventure Cat. + - text: "\u2026 (the cat starts to purr)" + bulletizedText: ... + - text: "\u2026 (looking at the cat\u2019s claws you notice that they are drenched + in blood \u2026 and her Photon-pistol, it seems like this cat can handle almost + anything)" + bulletizedText: Badass killer. + - text: "\u2026 (Although cats are far from stupid, you don\u2019t think that + an adventure cat would necessarily think about this)" + bulletizedText: N/A diff --git a/Assets/Data/Adventure Cat.asset.meta b/Assets/Data/Adventure Cat.asset.meta new file mode 100644 index 0000000..9aa4928 --- /dev/null +++ b/Assets/Data/Adventure Cat.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: da95af98c6305e743a515b1258bd9b40 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Amadeus.asset b/Assets/Data/Amadeus.asset new file mode 100644 index 0000000..08c8aaa --- /dev/null +++ b/Assets/Data/Amadeus.asset @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ddda90cbbcf3ea54e9105c3a5f0ac9a5, type: 3} + m_Name: Amadeus + m_EditorClassIdentifier: + m_image: {fileID: 0} + m_name: Amadeus + m_charisma: 2 + m_strength: 7 + m_dexterity: 7 + m_intelligence: 7 + m_dialogueOptions: + - text: "Amadeus the robot, that\u2019s my name. How can I be of service? " + bulletizedText: Amadeus. + - text: "Well, I\u2019m used to working for my old master. A crazy old scholar. + Always wanted me to climb up mountains and pick flowers." + bulletizedText: Used to working with his old master. Climbed mountains and picked + flowers. + - text: "Even though I\u2019ve seen many things in my life, my master used to do + the fighting. However, once I was told to try my hands at playing an instrument. + I liked it, but my master shut his ears and a nearby cave bear died instantly." + bulletizedText: Playing instruments... Really badly... + - text: "As a free robot on an exciting adventure. No people tho, I hate people\u2026" + bulletizedText: As a free robot with no people... diff --git a/Assets/Data/Amadeus.asset.meta b/Assets/Data/Amadeus.asset.meta new file mode 100644 index 0000000..a46a8e9 --- /dev/null +++ b/Assets/Data/Amadeus.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2509abe8f1152ad45a6c61cc16d1106b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Derk.asset b/Assets/Data/Derk.asset index 59e02c3..2f0f537 100644 --- a/Assets/Data/Derk.asset +++ b/Assets/Data/Derk.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ddda90cbbcf3ea54e9105c3a5f0ac9a5, type: 3} m_Name: Derk m_EditorClassIdentifier: + m_image: {fileID: 0} m_name: Derk m_charisma: 5 m_strength: 5 @@ -22,7 +23,7 @@ MonoBehaviour: bulletizedText: Derk. - text: "Man, I just want to work, y\u2019know? Give me a task and I\u2019ll do it, no problem for old Derk." - bulletizedText: Just wants to work + bulletizedText: Just wants to work. - text: "This mornin\u2019 I helped an old lady get into one of those high speed trains. They always say Derk the jerk, but no one ever says \u201CWow, what a nice guy\u201D. " diff --git a/Assets/Data/Rufus.asset b/Assets/Data/Rufus.asset new file mode 100644 index 0000000..aea5089 --- /dev/null +++ b/Assets/Data/Rufus.asset @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ddda90cbbcf3ea54e9105c3a5f0ac9a5, type: 3} + m_Name: Rufus + m_EditorClassIdentifier: + m_image: {fileID: 0} + m_name: Rufus + m_charisma: 0 + m_strength: 0 + m_dexterity: 0 + m_intelligence: 0 + m_dialogueOptions: + - text: I am Rufus, here to help you. + bulletizedText: Rufus. + - text: "I am a nature kinda guy, hunt, fetch, you know how it goes. Also, I\u2019m + a natural with people, as you can imagine. Everybody always wants to pet me, + it can be quite annoying." + bulletizedText: Anywhere with nature and people. + - text: Once, there was this guy that tried to steal my bone. I found him by following + his scent and then I stabbed him with my lightsword. Just kidding, I ratted + him out to the authorities of course. + bulletizedText: Told the authorities about the guy who stole his bone. + - text: Hmm, probably going on adventures with my 5 kids. + bulletizedText: Going on adventures with his kids. diff --git a/Assets/Data/Rufus.asset.meta b/Assets/Data/Rufus.asset.meta new file mode 100644 index 0000000..dca30bf --- /dev/null +++ b/Assets/Data/Rufus.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa6b95f25b9cafa428487022a1a864aa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Gameobjects/CharacterManager.prefab b/Assets/Gameobjects/CharacterManager.prefab index b98c1cf..711a09a 100644 --- a/Assets/Gameobjects/CharacterManager.prefab +++ b/Assets/Gameobjects/CharacterManager.prefab @@ -30,7 +30,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1767811258655682326 MonoBehaviour: @@ -46,3 +46,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_characterDatas: - {fileID: 11400000, guid: fe5c0edf44ede8146ac344d9538dafc6, type: 2} + - {fileID: 11400000, guid: d92c258ff1f60e0468c12806ba88217d, type: 2} + - {fileID: 11400000, guid: da95af98c6305e743a515b1258bd9b40, type: 2} + - {fileID: 11400000, guid: 2509abe8f1152ad45a6c61cc16d1106b, type: 2} + - {fileID: 11400000, guid: aa6b95f25b9cafa428487022a1a864aa, type: 2} diff --git a/Assets/Scenes/amaan_scene.unity b/Assets/Scenes/amaan_scene.unity index 09e032a..fa45d5f 100644 --- a/Assets/Scenes/amaan_scene.unity +++ b/Assets/Scenes/amaan_scene.unity @@ -217,6 +217,141 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &135693121 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 135693122} + - component: {fileID: 135693124} + - component: {fileID: 135693123} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &135693122 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 135693121} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 920543731} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &135693123 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 135693121} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Next Character + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &135693124 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 135693121} + m_CullTransparentMesh: 1 --- !u!1 &300687582 GameObject: m_ObjectHideFlags: 0 @@ -646,6 +781,140 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 1 m_ReverseArrangement: 0 +--- !u!1 &920543730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 920543731} + - component: {fileID: 920543734} + - component: {fileID: 920543733} + - component: {fileID: 920543732} + m_Layer: 5 + m_Name: NextCharacter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &920543731 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 920543730} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 135693122} + m_Father: {fileID: 1597852158} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 1, y: 1} +--- !u!114 &920543732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 920543730} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 920543733} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1439746448} + m_TargetAssemblyTypeName: DialogueController, Assembly-CSharp + m_MethodName: Debug_NextCharacter + 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 +--- !u!114 &920543733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 920543730} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &920543734 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 920543730} + m_CullTransparentMesh: 1 --- !u!1 &1142350647 GameObject: m_ObjectHideFlags: 0 @@ -692,6 +961,275 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1211683268 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1211683269} + - component: {fileID: 1211683272} + - component: {fileID: 1211683271} + - component: {fileID: 1211683270} + m_Layer: 5 + m_Name: PrevCharacter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1211683269 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211683268} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1269805857} + m_Father: {fileID: 1597852158} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -41} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1211683270 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211683268} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1211683271} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1439746448} + m_TargetAssemblyTypeName: DialogueController, Assembly-CSharp + m_MethodName: Debug_PreviousCharacter + 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 +--- !u!114 &1211683271 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211683268} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1211683272 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211683268} + m_CullTransparentMesh: 1 +--- !u!1 &1269805856 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1269805857} + - component: {fileID: 1269805859} + - component: {fileID: 1269805858} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1269805857 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1269805856} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1211683269} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1269805858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1269805856} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Prev. Character + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1269805859 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1269805856} + m_CullTransparentMesh: 1 --- !u!1 &1324808325 GameObject: m_ObjectHideFlags: 0 @@ -968,6 +1506,8 @@ RectTransform: m_Children: - {fileID: 1657983509} - {fileID: 334093782} + - {fileID: 920543731} + - {fileID: 1211683269} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1482,12 +2022,8 @@ PrefabInstance: m_TransformParent: {fileID: 1597852158} m_Modifications: - target: {fileID: 1347195527817132476, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1347195527817132476, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} - propertyPath: m_AnchorMin.y - value: 0 + propertyPath: m_AnchorMax.x + value: 1 objectReference: {fileID: 0} - target: {fileID: 1347195527817132476, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} propertyPath: m_SizeDelta.x @@ -1495,31 +2031,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1347195527817132476, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -0.000045776367 objectReference: {fileID: 0} - target: {fileID: 2448838632044913563, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2448838632044913563, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2448838632044913563, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} propertyPath: m_SizeDelta.x - value: 280 - objectReference: {fileID: 0} - - target: {fileID: 2448838632044913563, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} - propertyPath: m_SizeDelta.y - value: 50 + value: 379.949 objectReference: {fileID: 0} - target: {fileID: 2448838632044913563, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} propertyPath: m_AnchoredPosition.x - value: 140 - objectReference: {fileID: 0} - - target: {fileID: 2448838632044913563, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} - propertyPath: m_AnchoredPosition.y - value: -60 + value: 189.9745 objectReference: {fileID: 0} - target: {fileID: 4819624461391977750, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} propertyPath: m_Name @@ -1527,7 +2055,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4819624461391977750, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6850406712601294282, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} propertyPath: m_IsActive @@ -1563,7 +2091,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} propertyPath: m_SizeDelta.x - value: 280 + value: 379.949 objectReference: {fileID: 0} - target: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} propertyPath: m_SizeDelta.y @@ -1617,24 +2145,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356091297438698885, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} - propertyPath: m_text - value: 'QUESTION - - ANSWER' - objectReference: {fileID: 0} - - target: {fileID: 8356091297438698885, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} - propertyPath: m_fontSize - value: 22 - objectReference: {fileID: 0} - - target: {fileID: 8356091297438698885, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} - propertyPath: m_fontSizeBase - value: 22 - objectReference: {fileID: 0} - - target: {fileID: 8356091297438698885, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3} - propertyPath: m_enableAutoSizing - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scripts/DialogueSystem/DialogueController.cs b/Assets/Scripts/DialogueSystem/DialogueController.cs index 88a68b0..89c30cc 100644 --- a/Assets/Scripts/DialogueSystem/DialogueController.cs +++ b/Assets/Scripts/DialogueSystem/DialogueController.cs @@ -6,10 +6,12 @@ public class DialogueController : MonoBehaviour { [SerializeField] private DialoguePanel m_dialoguePanel; + private int m_currentIndex = 0; + // DEBUG - Will need replacing with the character you selected. private void Start() { - DisplayCharacterText(CharacterManager.Instance.CharacterDatas[0]); + DisplayCharacterText(CharacterManager.Instance.CharacterDatas[m_currentIndex]); m_dialoguePanel.OnQuestionsFinished += OnQuestionsFinished; } @@ -28,4 +30,22 @@ public class DialogueController : MonoBehaviour // TODO: stop the dialogue and return to gameplay... // TODO: we could probably show a "Quit" button highlighted. } + + public void Debug_NextCharacter() + { + if (m_currentIndex + 1 >= CharacterManager.Instance.CharacterDatas.Count) + return; + + m_currentIndex++; + DisplayCharacterText(CharacterManager.Instance.CharacterDatas[m_currentIndex]); + } + + public void Debug_PreviousCharacter() + { + if (m_currentIndex - 1 < 0) + return; + + m_currentIndex--; + DisplayCharacterText(CharacterManager.Instance.CharacterDatas[m_currentIndex]); + } } diff --git a/Assets/Scripts/DialogueSystem/UI/DialoguePanel.cs b/Assets/Scripts/DialogueSystem/UI/DialoguePanel.cs index 8b1d19f..2a0b0f9 100644 --- a/Assets/Scripts/DialogueSystem/UI/DialoguePanel.cs +++ b/Assets/Scripts/DialogueSystem/UI/DialoguePanel.cs @@ -42,6 +42,12 @@ public class DialoguePanel : MonoBehaviour { Cleanup(); + if (m_characterSheet != null) + { + // Clear the old sheet + m_characterSheet.gameObject.SetActive(false); + } + m_questionsAsked = 0; m_currentCharacter = characterData; m_characterNameText.text = characterData.name; @@ -52,6 +58,7 @@ public class DialoguePanel : MonoBehaviour m_characterSheet.SetName(characterData.name); m_characterSheet.gameObject.SetActive(true); + m_questionHolder.gameObject.SetActive(true); gameObject.SetActive(true); } -- 2.49.1 From ab1c3d1e26f915ffd8e61646029e7c7270b4954c Mon Sep 17 00:00:00 2001 From: Amaan Shawkath Date: Sat, 8 Jul 2023 18:54:36 +0100 Subject: [PATCH 6/6] removing gameobjects folder and moving character manager --- Assets/Gameobjects.meta | 8 -------- Assets/{Gameobjects => Prefabs}/CharacterManager.prefab | 0 .../{Gameobjects => Prefabs}/CharacterManager.prefab.meta | 0 3 files changed, 8 deletions(-) delete mode 100644 Assets/Gameobjects.meta rename Assets/{Gameobjects => Prefabs}/CharacterManager.prefab (100%) rename Assets/{Gameobjects => Prefabs}/CharacterManager.prefab.meta (100%) diff --git a/Assets/Gameobjects.meta b/Assets/Gameobjects.meta deleted file mode 100644 index 8a34b49..0000000 --- a/Assets/Gameobjects.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 43937033b1689e64e8504a87a50f6832 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Gameobjects/CharacterManager.prefab b/Assets/Prefabs/CharacterManager.prefab similarity index 100% rename from Assets/Gameobjects/CharacterManager.prefab rename to Assets/Prefabs/CharacterManager.prefab diff --git a/Assets/Gameobjects/CharacterManager.prefab.meta b/Assets/Prefabs/CharacterManager.prefab.meta similarity index 100% rename from Assets/Gameobjects/CharacterManager.prefab.meta rename to Assets/Prefabs/CharacterManager.prefab.meta -- 2.49.1