lionfish/SimUL
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Options Dialog refactor for more generic

Browse Source
This commit is contained in:
Vova
2023-12-18 21:22:43 +02:00
parent 554c147a69
commit 2399e99c68
42 changed files with 778 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Prefabs/Interior/OfficeWorkerTable.prefab
+16 -23
View File
@@ -55,7 +55,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7952466374899613004}
- component: {fileID: 3764780206137042927}
m_Layer: 0
m_Name: Selected
m_TagString: Untagged
@@ -79,21 +78,6 @@ Transform:
- {fileID: 8431406351439517098}
m_Father: {fileID: 662032107352504808}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3764780206137042927
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5280816860339018031}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 70ee3205d7b15b4449cdacc7a726e220, type: 3}
m_Name:
m_EditorClassIdentifier:
_selectedObject: {fileID: 5278860039823974021}
visualGameObjectArray:
- {fileID: 1167066362511717000}
--- !u!1 &5437460437420272161
GameObject:
m_ObjectHideFlags: 0
@@ -136,6 +120,7 @@ GameObject:
- component: {fileID: 662032107352504808}
- component: {fileID: 3329916335696048154}
- component: {fileID: 5278860039823974021}
- component: {fileID: 113071787670326870}
m_Layer: 6
m_Name: OfficeWorkerTable
m_TagString: Untagged
@@ -196,7 +181,21 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_interactionPoint: {fileID: 2849715539346458925}
_jobPositionsSO: {fileID: 11400000, guid: f0d3baaabf19f9a4a80e227316362d84, type: 2}
_dialogOptionsSO: {fileID: 0}
_dialogSO: {fileID: 11400000, guid: 8c330d22202c025408b0fcf250a57d15, type: 2}
--- !u!114 &113071787670326870
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8759329460999808753}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 58e5a6d4728f393419100a54758a4e62, type: 3}
m_Name:
m_EditorClassIdentifier:
color: {r: 1, g: 1, b: 1, a: 1}
--- !u!1001 &3187777146008072678
PrefabInstance:
m_ObjectHideFlags: 0
@@ -322,12 +321,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7699f5af06713974ba61777a8a830f6e, type: 3}
--- !u!1 &1167066362511717000 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4327680794412319598, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
m_PrefabInstance: {fileID: 3187777146008072678}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8431406351439517098 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6430890726198682700, guid: 7699f5af06713974ba61777a8a830f6e,
Assets/Prefabs/UI/JobSelectorUI.prefab → Assets/Prefabs/UI/DialogUI.prefab
+21 -11
View File
@@ -9,9 +9,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8958716429631575486}
- component: {fileID: 3776407727599883163}
- component: {fileID: 4025874161359567020}
m_Layer: 5
m_Name: JobSelectorUI
m_Name: DialogUI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -37,7 +37,7 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3776407727599883163
--- !u!114 &4025874161359567020
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -55,13 +55,9 @@ MonoBehaviour:
_btnOk: {fileID: 8583321522316129160}
_itemsContainer: {fileID: 3731607605728727607}
_tabsContainer: {fileID: 1207846913041912348}
_jobItemUItemplate: {fileID: 4899774397145829728, guid: 3fd1d54e5064a0841972b791abc6919f,
_jobItemUItemplate: {fileID: 0}
_dialogTabUI: {fileID: 5217370655548404981, guid: ea2a34492b0d3704cbec939efd66d26d,
type: 3}
_jobTabUItemplate: {fileID: 5217370655548404981, guid: ea2a34492b0d3704cbec939efd66d26d,
type: 3}
_jobs:
- {fileID: 11400000, guid: 137a0a77aa02f614ead909f23a670e95, type: 2}
- {fileID: 11400000, guid: f0d3baaabf19f9a4a80e227316362d84, type: 2}
--- !u!1 &2383697791284729918
GameObject:
m_ObjectHideFlags: 0
@@ -170,15 +166,17 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
@@ -349,15 +347,17 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
@@ -838,6 +838,11 @@ PrefabInstance:
propertyPath: m_fontSizeBase
value: 24
objectReference: {fileID: 0}
- target: {fileID: 3806516703089782040, guid: ea47665625ccfd4408f6411caf45f910,
type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3}
propertyPath: m_AnchorMax.y
@@ -1173,6 +1178,11 @@ PrefabInstance:
propertyPath: m_fontSizeBase
value: 24
objectReference: {fileID: 0}
- target: {fileID: 3806516703089782040, guid: ea47665625ccfd4408f6411caf45f910,
type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3}
propertyPath: m_AnchorMax.y
Assets/Prefabs/UI/JobSelectorUI.prefab.meta → Assets/Prefabs/UI/DialogUI.prefab.meta
View File