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/Scenes/City.unity
+74 -4
View File
@@ -1685,9 +1685,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 349281313}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 250, y: -90}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 250, y: 0}
m_SizeDelta: {x: 480, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &249161732
@@ -1879,7 +1879,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
_timeSliderPrefab: {fileID: 5407876737168081677, guid: 15f8d2a34d602b04c9694f4eea8948d3,
type: 3}
_jobSelectorPrefab: {fileID: 0}
_DialogUIPrefab: {fileID: 4025874161359567020, guid: 2ad5edd099127044684eeca456ed3d00,
type: 3}
_blurOverlay: {fileID: 661798880}
_radialMenuItemPrefab: {fileID: 5424962769672562944, guid: 543443cf1b9e73b4193a13044eda04d2,
type: 3}
@@ -4240,6 +4241,74 @@ Camera:
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1001 &764085430
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 662032107352504808, guid: 7df4c91b7961f794da5a651e64cc8ac5,
type: 3}
propertyPath: m_LocalPosition.x
value: 144.52164
objectReference: {fileID: 0}
- target: {fileID: 662032107352504808, guid: 7df4c91b7961f794da5a651e64cc8ac5,
type: 3}
propertyPath: m_LocalPosition.y
value: 6.3500004
objectReference: {fileID: 0}
- target: {fileID: 662032107352504808, guid: 7df4c91b7961f794da5a651e64cc8ac5,
type: 3}
propertyPath: m_LocalPosition.z
value: 239.38367
objectReference: {fileID: 0}
- target: {fileID: 662032107352504808, guid: 7df4c91b7961f794da5a651e64cc8ac5,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 662032107352504808, guid: 7df4c91b7961f794da5a651e64cc8ac5,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 662032107352504808, guid: 7df4c91b7961f794da5a651e64cc8ac5,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 662032107352504808, guid: 7df4c91b7961f794da5a651e64cc8ac5,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 662032107352504808, guid: 7df4c91b7961f794da5a651e64cc8ac5,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 662032107352504808, guid: 7df4c91b7961f794da5a651e64cc8ac5,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 662032107352504808, guid: 7df4c91b7961f794da5a651e64cc8ac5,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8759329460999808753, guid: 7df4c91b7961f794da5a651e64cc8ac5,
type: 3}
propertyPath: m_Name
value: OfficeWorkerTable
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7df4c91b7961f794da5a651e64cc8ac5, type: 3}
--- !u!1 &780261547
GameObject:
m_ObjectHideFlags: 0
@@ -8688,3 +8757,4 @@ SceneRoots:
- {fileID: 1880854723}
- {fileID: 495189437}
- {fileID: 1291994925}
- {fileID: 764085430}
Assets/Scenes/School.unity
+92 -83
View File
@@ -469,6 +469,74 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 130749353}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &202296544
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalPosition.x
value: 3.37
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.84
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalPosition.z
value: -2.38
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.50008726
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.49991274
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.50008726
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.49991274
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -89.98
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_Name
value: desk (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9bd342097a69da64daea3e6f3814ad3e, type: 3}
--- !u!1001 &385599245
PrefabInstance:
m_ObjectHideFlags: 0
@@ -723,7 +791,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb,
type: 3}
propertyPath: m_LocalPosition.z
value: -1.620001
value: -2.19
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb,
type: 3}
@@ -1080,6 +1148,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
propertyPath: 'm_Materials.Array.data[2]'
value:
objectReference: {fileID: 2100000, guid: ba205028c7ac66643ad562673c41e358, type: 2}
- target: {fileID: 919132149155446097, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
propertyPath: m_Name
@@ -1233,11 +1306,27 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_CastShadows
value: 1
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: -206713309220777044, guid: f85c42ebe35945e4986cba3418681f3e,
type: 3}
- target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_Name
value: FlatWall (40)
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -1613,7 +1702,7 @@ Transform:
m_GameObject: {fileID: 904172955}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.19, y: 2.599, z: -1.93}
m_LocalPosition: {x: 3.19, y: 2.592, z: -1.93}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1908,7 +1997,6 @@ Transform:
- {fileID: 754702662}
- {fileID: 570611633}
- {fileID: 695816893}
- {fileID: 1287806106}
- {fileID: 1880886690}
- {fileID: 1779294544}
- {fileID: 904303565}
@@ -2467,86 +2555,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1285327579}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1287806105
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 966157588}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.46
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.3310469
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.059999943
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7072302
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.7069834
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -89.98
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: -206713309220777044, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
- target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_Name
value: FlatWall (41)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0c8bb8ae79767d54cb8f825f82322c06, type: 3}
--- !u!4 &1287806106 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
m_PrefabInstance: {fileID: 1287806105}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1318414708
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4778,3 +4786,4 @@ SceneRoots:
- {fileID: 456606824}
- {fileID: 1322861160939933662}
- {fileID: 2018736431}
- {fileID: 202296544}