Merge systems #5

Closed
JanGross wants to merge 13 commits from managers into master
9 changed files with 833 additions and 407 deletions
Showing only changes of commit afe6a6592a - Show all commits

View File

@@ -17,13 +17,15 @@ MonoBehaviour:
m_strength: 5 m_strength: 5
m_dexterity: 3 m_dexterity: 3
m_intelligence: 5 m_intelligence: 5
m_money: 5
m_dialogueOptions: m_dialogueOptions:
- text: "Name\u2019s Derk" - text: "Name\u2019s Derk"
bulletizedText: Derk.
- text: "Man, I just want to work, y\u2019know? Give me a task and I\u2019ll do - text: "Man, I just want to work, y\u2019know? Give me a task and I\u2019ll do
it, no problem for old Derk." 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 - 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 trains. They always say Derk the jerk, but no one ever says \u201CWow, what
a nice guy\u201D. " a nice guy\u201D. "
bulletizedText: Helped a lady get onto a high speed train.
- text: "\u2026 (drools)" - text: "\u2026 (drools)"
- text: I just want money, whatevs bulletizedText: ...

View File

@@ -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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4c5924b3c54ec124da260e5cf3460969
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -217,141 +217,6 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} 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 --- !u!1 &300687582
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -444,127 +309,22 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &334093780 --- !u!224 &334093782 stripped
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
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6878822692408269584, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3}
m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 8918945883791158082}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 334093780} --- !u!114 &334093786 stripped
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
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6559301228595398145, guid: 4c5924b3c54ec124da260e5cf3460969, type: 3}
m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 8918945883791158082}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 334093780} m_GameObject: {fileID: 0}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} m_Script: {fileID: 11500000, guid: c8b9f2f1f2da7474e964926017ec32b4, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: 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 --- !u!1 &479886791
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -886,7 +646,7 @@ MonoBehaviour:
m_ChildScaleWidth: 0 m_ChildScaleWidth: 0
m_ChildScaleHeight: 1 m_ChildScaleHeight: 1
m_ReverseArrangement: 0 m_ReverseArrangement: 0
--- !u!1 &917377166 --- !u!1 &1142350647
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@@ -894,133 +654,44 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 917377167} - component: {fileID: 1142350649}
- component: {fileID: 917377168} - component: {fileID: 1142350648}
- component: {fileID: 917377169} m_Layer: 0
m_Layer: 5 m_Name: CharacterSheetController
m_Name: Line
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &917377167 --- !u!114 &1142350648
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
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 917377166} m_GameObject: {fileID: 1142350647}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Script: {fileID: 11500000, guid: 113c9cdbaeba15f47a35e92d7d13c848, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_characterSheet: {fileID: 334093786}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_characterSheetTransform: {fileID: 1597852158}
m_RaycastTarget: 1 --- !u!4 &1142350649
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} Transform:
m_Maskable: 1 m_ObjectHideFlags: 0
m_OnCullStateChanged: m_CorrespondingSourceObject: {fileID: 0}
m_PersistentCalls: m_PrefabInstance: {fileID: 0}
m_Calls: [] m_PrefabAsset: {fileID: 0}
m_text: LINE_X m_GameObject: {fileID: 1142350647}
m_isRightToLeft: 0 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_LocalPosition: {x: 365.75354, y: 364.61804, z: -637.4724}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_LocalScale: {x: 1, y: 1, z: 1}
m_fontSharedMaterials: [] m_ConstrainProportionsScale: 0
m_fontMaterial: {fileID: 0} m_Children: []
m_fontMaterials: [] m_Father: {fileID: 0}
m_fontColor32: m_RootOrder: 5
serializedVersion: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
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}
--- !u!1 &1324808325 --- !u!1 &1324808325
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1186,8 +857,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_dialoguePanel: {fileID: 1657983510} m_dialoguePanel: {fileID: 1657983510}
m_characterDatas:
- {fileID: 11400000, guid: fe5c0edf44ede8146ac344d9538dafc6, type: 2}
--- !u!4 &1439746449 --- !u!4 &1439746449
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1300,7 +969,7 @@ RectTransform:
- {fileID: 1657983509} - {fileID: 1657983509}
- {fileID: 334093782} - {fileID: 334093782}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
@@ -1366,7 +1035,7 @@ MonoBehaviour:
m_questionButton: {fileID: 527634155} m_questionButton: {fileID: 527634155}
m_characterNameText: {fileID: 479886793} m_characterNameText: {fileID: 479886793}
m_characterText: {fileID: 1739596218} m_characterText: {fileID: 1739596218}
m_characterSheetController: {fileID: 334093781} m_characterSheetController: {fileID: 1142350648}
--- !u!114 &1657983511 --- !u!114 &1657983511
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1743,3 +1412,231 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 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}

View File

@@ -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<string, GameObject> m_lines = new Dictionary<string, GameObject>();
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);
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c8b9f2f1f2da7474e964926017ec32b4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,48 +1,38 @@
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using TMPro;
using UnityEngine; using UnityEngine;
public class CharacterSheetController : MonoBehaviour public class CharacterSheetController : MonoBehaviour
{ {
[SerializeField] private TMP_Text m_characterNameText; public CharacterSheet m_characterSheet;
[SerializeField] private TMP_Text m_line; public Transform m_characterSheetTransform;
[SerializeField] private Transform m_lineHolder;
private Dictionary<string, GameObject> m_lines = new Dictionary<string, GameObject>(); private Dictionary<string, CharacterSheet> m_characterSheets = new Dictionary<string, CharacterSheet>();
public void Cleanup() // Returns if a character sheet exists for the character.
public bool SheetExists(string characterName)
{ {
foreach(var line in m_lines) return m_characterSheets.ContainsKey(characterName);
}
// Get the character sheet for the passed in character.
public CharacterSheet GetSheet(string name)
{ {
Destroy(line.Value); if (!m_characterSheets.ContainsKey(name))
return null;
CharacterSheet sheet = null;
m_characterSheets.TryGetValue(name, out sheet);
return sheet;
} }
m_lines.Clear(); // Creates a new character sheet.
} public CharacterSheet CreateSheet(string characterName)
public void SetName(string name)
{ {
m_characterNameText.text = name; var sheet = Instantiate(m_characterSheet, m_characterSheetTransform);
}
// Adds a line to the character sheet. m_characterSheets.Add(characterName, sheet);
public void AddLine(string lineText)
{
if (LineExists(lineText))
return;
var line = Instantiate(m_line, m_lineHolder); return sheet;
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);
} }
} }

View File

@@ -13,7 +13,6 @@ public class QuestionData
"Who are you?", "Who are you?",
"Tell me something about yourself.", "Tell me something about yourself.",
"What is your greatest accomplishment?", "What is your greatest accomplishment?",
"Where do you see yourself in five years?", "Where do you see yourself in five years?"
"What are your salary requirements?"
}; };
} }

View File

@@ -1,5 +1,7 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic;
using System.Reflection;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
@@ -17,12 +19,16 @@ public class DialoguePanel : MonoBehaviour
private const float TypingSpeed = 0.03f; private const float TypingSpeed = 0.03f;
private List<int> m_questionIndexAsked = new List<int>();
private CharacterData m_currentCharacter; private CharacterData m_currentCharacter;
private bool m_skipped = false; private bool m_skipped = false;
private int m_questionCount = QuestionData.Questions.Length; private int m_questionCount = QuestionData.Questions.Length;
private int m_questionsAsked = 0; private int m_questionsAsked = 0;
private CharacterSheet m_characterSheet;
private string m_lineToAdd = "";
private bool QuestionsFinished => m_questionsAsked >= m_questionCount; private bool QuestionsFinished => m_questionsAsked >= m_questionCount;
private void Awake() private void Awake()
@@ -36,18 +42,33 @@ public class DialoguePanel : MonoBehaviour
{ {
Cleanup(); Cleanup();
m_characterSheetController.Cleanup(); m_questionsAsked = 0;
m_characterSheetController.SetName(characterData.name);
m_currentCharacter = characterData; m_currentCharacter = characterData;
m_characterNameText.text = characterData.name; m_characterNameText.text = characterData.name;
// TODO: will this be changed with an introductory text?
m_characterText.text = "Select an option..."; m_characterText.text = "Select an option...";
SetupCharacterSheet();
m_characterSheet.SetName(characterData.name);
m_characterSheet.gameObject.SetActive(true);
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. // Handles cleaing up for the next text.
private void Cleanup() private void Cleanup()
{ {
@@ -96,6 +117,9 @@ public class DialoguePanel : MonoBehaviour
m_skipped = true; m_skipped = true;
m_characterText.text = text; 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 we've asked all the questions we should mark this character as interviewed and continue.
if (QuestionsFinished) if (QuestionsFinished)
{ {
@@ -115,11 +139,27 @@ public class DialoguePanel : MonoBehaviour
var dialogueOption = m_currentCharacter.m_dialogueOptions[index]; var dialogueOption = m_currentCharacter.m_dialogueOptions[index];
StartCoroutine(DisplayText(dialogueOption.text)); StartCoroutine(DisplayText(dialogueOption.text));
// TODO: we should update the sheet with this information. // Setup the line to add to the character sheet once the dialogue has finished.
m_characterSheetController.AddLine(dialogueOption.text); m_lineToAdd = $"<b>Q.) {QuestionData.Questions[index]}\n</b>A.) {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. // Increment questions asked.
m_questionsAsked++; m_questionsAsked++;
m_questionIndexAsked.Add(index);
}
private void PopulateCharacterSheet()
{
m_characterSheet.AddLine(m_lineToAdd);
m_lineToAdd = "";
} }
// Callback from Unity on the skip button. // Callback from Unity on the skip button.