diff --git a/Assets/Materials/UI/Map Gravity Lines.mat b/Assets/Materials/UI/Map Gravity Lines.mat index c1b832ab0..c4d87e4d0 100644 --- a/Assets/Materials/UI/Map Gravity Lines.mat +++ b/Assets/Materials/UI/Map Gravity Lines.mat @@ -86,7 +86,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Scale: 2.3115432 + - _Scale: 2.2925873 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Resources/Prefabs/Ships/Djinni.prefab b/Assets/Resources/Prefabs/Ships/Djinni.prefab index b314cdf60..d9f134213 100644 --- a/Assets/Resources/Prefabs/Ships/Djinni.prefab +++ b/Assets/Resources/Prefabs/Ships/Djinni.prefab @@ -25,10 +25,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 667648200} m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: -202, y: -48, z: 339} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: -2.02, y: -0.48, z: 3.3899999} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5496325214845933821} + m_Father: {fileID: 5690719626310477901} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!114 &7040092299176043698 @@ -69,10 +69,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 780806499} m_LocalRotation: {x: 0.14139767, y: -0.6928252, z: -0.14139767, w: 0.6928252} - m_LocalPosition: {x: -305, y: 89, z: -432.00003} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: -3.05, y: 0.89, z: -4.32} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5496325214845933821} + m_Father: {fileID: 5690719626310477901} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: -90, z: -23.07} --- !u!114 &6211233077126838561 @@ -113,10 +113,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 805915458} m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: 202, y: -48, z: 339} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 2.02, y: -0.48, z: 3.3899999} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5496325214845933821} + m_Father: {fileID: 5690719626310477901} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!114 &8114396311317785619 @@ -157,10 +157,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 899813959} m_LocalRotation: {x: 0.13371067, y: 0.6943497, z: 0.13371067, w: 0.6943497} - m_LocalPosition: {x: 305, y: 89, z: -432.00003} - m_LocalScale: {x: 100.000015, y: 100, z: 100} + m_LocalPosition: {x: 3.05, y: 0.89, z: -4.32} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5496325214845933821} + m_Father: {fileID: 5690719626310477901} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 21.8} --- !u!114 &5850886182444642920 @@ -231,10 +231,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1146951630} m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: 0, y: 430.00003, z: -856.00006} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0, y: 4.3, z: -8.56} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5496325214845933821} + m_Father: {fileID: 5690719626310477901} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!114 &5958530706230866031 @@ -275,10 +275,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1229289401} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -47, z: 598} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0, y: -0.47, z: 5.98} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5496325214845933821} + m_Father: {fileID: 5690719626310477901} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3048427942634017260 @@ -319,10 +319,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1438588954} m_LocalRotation: {x: -0.23534305, y: -0, z: -0, w: 0.9719124} - m_LocalPosition: {x: 139, y: 118, z: 266} + m_LocalPosition: {x: 1.39, y: 1.18, z: 2.6599998} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5496325214845933821} + m_Father: {fileID: 5690719626310477901} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: -27.224, y: 0, z: 0} --- !u!114 &7001151969794148753 @@ -364,10 +364,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1710933324} m_LocalRotation: {x: -0.23534305, y: -0, z: -0, w: 0.9719124} - m_LocalPosition: {x: -139, y: 118, z: 266} + m_LocalPosition: {x: -1.39, y: 1.18, z: 2.6599998} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5496325214845933821} + m_Father: {fileID: 5690719626310477901} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: -27.224, y: 0, z: 0} --- !u!114 &8005918189707334541 @@ -409,10 +409,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1988296487} m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: 0, y: 328, z: -856.00006} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0, y: 3.28, z: -8.56} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5496325214845933821} + m_Father: {fileID: 5690719626310477901} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!114 &7041307243998421949 @@ -453,10 +453,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2130472298} m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: 0, y: 229.99997, z: -856.00006} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0, y: 2.2999997, z: -8.56} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5496325214845933821} + m_Father: {fileID: 5690719626310477901} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!114 &3355398442661044852 @@ -586,12 +586,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 642950516275137862} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 290.6825, z: -174.14783} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0, y: 2.9068248, z: -1.7414782} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2543668232465730935} m_Father: {fileID: 9106854767781449910} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727083906958690281 GameObject: @@ -951,7 +951,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5496325214845933821} + m_Father: {fileID: 5690719626310477901} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8965953649643199830 @@ -968,6 +968,51 @@ MonoBehaviour: m_EditorClassIdentifier: FiringPoint: - {fileID: 6459301997989709498} +--- !u!1 &1173294418860293631 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5690719626310477901} + m_Layer: 0 + m_Name: Hardpoints + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5690719626310477901 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1173294418860293631} + 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_Children: + - {fileID: 1229289402} + - {fileID: 1146951631} + - {fileID: 1988296488} + - {fileID: 2130472299} + - {fileID: 899813960} + - {fileID: 805915459} + - {fileID: 780806500} + - {fileID: 667648201} + - {fileID: 1438588955} + - {fileID: 1710933325} + - {fileID: 3957237907279416794} + - {fileID: 253280912000941906} + - {fileID: 7393376835743981754} + - {fileID: 4372481120480406282} + - {fileID: 2469466822132512704} + m_Father: {fileID: 9106854767781449910} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1178163480366032748 GameObject: m_ObjectHideFlags: 0 @@ -1084,10 +1129,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1344956863040947990} m_LocalRotation: {x: -0.00000008501031, y: 0.6826131, z: 0.73078, w: 0.00000001959244} - m_LocalPosition: {x: 0.00014305115, y: 233.27966, z: -877.3} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0, y: 2.3327966, z: -8.773} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7199358476342105780} + m_Father: {fileID: 3541894819321442470} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &790195130430861690 @@ -1376,10 +1421,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1741851352965887119} m_LocalRotation: {x: -0.6301756, y: -0.036754545, z: -0.045158543, w: 0.7742664} - m_LocalPosition: {x: 352.3706, y: 102.94795, z: 595.6241} - m_LocalScale: {x: 99.999985, y: 100, z: 100} + m_LocalPosition: {x: 3.523706, y: 1.0294795, z: 5.9562407} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7984833443413823989} + m_Father: {fileID: 5920925750077467287} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2332467440651030306 @@ -1563,6 +1608,44 @@ Transform: m_Father: {fileID: 7393376835743981754} m_RootOrder: 20 m_LocalEulerAnglesHint: {x: -27.014, y: 0, z: 0} +--- !u!1 &2071788434853776747 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3541894819321442470} + m_Layer: 0 + m_Name: Thruster Emitters + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3541894819321442470 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2071788434853776747} + 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_Children: + - {fileID: 1666069252795945783} + - {fileID: 4683283048728632690} + - {fileID: 2975293833068553306} + - {fileID: 7698464057975513723} + - {fileID: 6142810525394430311} + - {fileID: 7840769843141738304} + - {fileID: 9178099562039280980} + - {fileID: 7960990829826523109} + m_Father: {fileID: 9106854767781449910} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2107913917744673539 GameObject: m_ObjectHideFlags: 0 @@ -1619,10 +1702,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2239312957729102090} m_LocalRotation: {x: -0.00000008501031, y: 0.6826131, z: 0.73078, w: 0.00000001959244} - m_LocalPosition: {x: 208, y: -40.663166, z: 336.9267} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 2.08, y: -0.40663165, z: 3.369267} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7199358476342105780} + m_Father: {fileID: 3541894819321442470} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4047586759133030098 @@ -1704,51 +1787,6 @@ Transform: m_Father: {fileID: 4372481120480406282} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: -27.014, y: 0, z: 0} ---- !u!1 &2431841319836274918 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5496325214845933821} - m_Layer: 0 - m_Name: Hardpoints - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5496325214845933821 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2431841319836274918} - 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_Children: - - {fileID: 1229289402} - - {fileID: 1146951631} - - {fileID: 1988296488} - - {fileID: 2130472299} - - {fileID: 899813960} - - {fileID: 805915459} - - {fileID: 780806500} - - {fileID: 667648201} - - {fileID: 1438588955} - - {fileID: 1710933325} - - {fileID: 3957237907279416794} - - {fileID: 253280912000941906} - - {fileID: 7393376835743981754} - - {fileID: 4372481120480406282} - - {fileID: 2469466822132512704} - m_Father: {fileID: 9106854767781449910} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2445140024482309400 GameObject: m_ObjectHideFlags: 0 @@ -1925,10 +1963,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2580815000568778909} m_LocalRotation: {x: -0.00000008501031, y: 0.6826131, z: 0.73078, w: 0.00000001959244} - m_LocalPosition: {x: 0.00014305112, y: 433.2796, z: -877.30005} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0, y: 4.332796, z: -8.773001} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7199358476342105780} + m_Father: {fileID: 3541894819321442470} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4738430658108135937 @@ -2188,7 +2226,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5496325214845933821} + m_Father: {fileID: 5690719626310477901} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7355681397843503945 @@ -2290,8 +2328,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2990708250333405725} m_LocalRotation: {x: -0.2335652, y: -0, z: -0, w: 0.9723412} - m_LocalPosition: {x: 288.2, y: 203.49998, z: -150.5} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 2.882, y: 2.0349998, z: -1.505} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} m_Children: - {fileID: 5640214163407842205} - {fileID: 4248240260788477186} @@ -2365,7 +2403,7 @@ Transform: - {fileID: 5303925571972989678} - {fileID: 2156331545606536636} - {fileID: 89782541640237176} - m_Father: {fileID: 5496325214845933821} + m_Father: {fileID: 5690719626310477901} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: -27.014, y: 0, z: 0} --- !u!114 &431753752050277399 @@ -2890,10 +2928,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3619097064416196529} m_LocalRotation: {x: -0.00000008501031, y: 0.6826131, z: 0.73078, w: 0.00000001959244} - m_LocalPosition: {x: 0.00014305115, y: 333.27963, z: -877.29987} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0, y: 3.3327963, z: -8.772999} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7199358476342105780} + m_Father: {fileID: 3541894819321442470} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3732670953902489893 @@ -3291,11 +3329,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4207676493251148750} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 45, z: 427} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.45, z: 4.27} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5496325214845933821} + m_Father: {fileID: 5690719626310477901} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4252398138544919482 @@ -3384,11 +3422,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4467169711691975612} m_LocalRotation: {x: -0.00000008501031, y: 0.6826131, z: 0.73078, w: 0.00000001959244} - m_LocalPosition: {x: 0, y: -414.7244, z: -28.299564} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0, y: -4.147244, z: -0.28299564} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 9106854767781449910} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &5972102297224030424 MeshCollider: @@ -3473,10 +3511,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4553351628973766712} m_LocalRotation: {x: -0.00000008501031, y: 0.6826131, z: 0.73078, w: 0.00000001959244} - m_LocalPosition: {x: 0, y: -414.7244, z: -28.299564} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0, y: -4.147244, z: -0.28299564} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7984833443413823989} + m_Father: {fileID: 5920925750077467287} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2732003696914504328 @@ -4138,10 +4176,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5266705856907821250} m_LocalRotation: {x: -0.00000008501031, y: 0.6826131, z: 0.73078, w: 0.00000001959244} - m_LocalPosition: {x: 315, y: 98.7605, z: -455.3561} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 3.1499999, y: 0.987605, z: -4.553561} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7199358476342105780} + m_Father: {fileID: 3541894819321442470} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4583908622456532633 @@ -4249,10 +4287,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5271791165042074561} m_LocalRotation: {x: -0.00000008501031, y: 0.6826131, z: 0.73078, w: 0.00000001959244} - m_LocalPosition: {x: -237.95108, y: -40.66316, z: 336.92664} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: -2.3795106, y: -0.4066316, z: 3.3692663} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7199358476342105780} + m_Father: {fileID: 3541894819321442470} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8970875249939636815 @@ -4390,10 +4428,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5464548216621744567} m_LocalRotation: {x: -0.00000008501031, y: 0.6826131, z: 0.73078, w: 0.00000001959244} - m_LocalPosition: {x: -0.0000834465, y: -45.571327, z: 554.7372} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0, y: -0.45571327, z: 5.547372} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7199358476342105780} + m_Father: {fileID: 3541894819321442470} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &436006766063488465 @@ -4865,44 +4903,6 @@ Transform: m_Father: {fileID: 7393376835743981754} m_RootOrder: 18 m_LocalEulerAnglesHint: {x: -27.014, y: 0, z: 0} ---- !u!1 &6152184653746035070 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7984833443413823989} - m_Layer: 0 - m_Name: Meshes - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7984833443413823989 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6152184653746035070} - 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_Children: - - {fileID: 6648017987509753602} - - {fileID: 6959970163171280326} - - {fileID: 373238189327005759} - - {fileID: 225284819656620592} - - {fileID: 3037576536437670490} - - {fileID: 5982170916787493278} - - {fileID: 8072591294915822744} - - {fileID: 1657475964761482609} - m_Father: {fileID: 9106854767781449910} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6220016645108945343 GameObject: m_ObjectHideFlags: 0 @@ -5323,6 +5323,44 @@ Transform: m_Father: {fileID: 7393376835743981754} m_RootOrder: 48 m_LocalEulerAnglesHint: {x: -27.014, y: 0, z: 0} +--- !u!1 &6946829252597216241 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5920925750077467287} + m_Layer: 0 + m_Name: Meshes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5920925750077467287 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6946829252597216241} + 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_Children: + - {fileID: 6648017987509753602} + - {fileID: 6959970163171280326} + - {fileID: 373238189327005759} + - {fileID: 225284819656620592} + - {fileID: 3037576536437670490} + - {fileID: 5982170916787493278} + - {fileID: 8072591294915822744} + - {fileID: 1657475964761482609} + m_Father: {fileID: 9106854767781449910} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6968646740625764887 GameObject: m_ObjectHideFlags: 0 @@ -5350,10 +5388,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6968646740625764887} m_LocalRotation: {x: -0.000000056503414, y: 0.22577026, z: 0.9741806, w: 0.00000009059377} - m_LocalPosition: {x: -288.23505, y: 145.99998, z: -136} - m_LocalScale: {x: 1000, y: 999.9999, z: 999.9999} + m_LocalPosition: {x: -2.8823504, y: 1.4599998, z: -1.36} + m_LocalScale: {x: 10, y: 10, z: 10} m_Children: [] - m_Father: {fileID: 7984833443413823989} + m_Father: {fileID: 5920925750077467287} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7601997898044220655 @@ -5566,10 +5604,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7253753735530809807} m_LocalRotation: {x: -0.00000008501031, y: 0.6826131, z: 0.73078, w: 0.00000001959244} - m_LocalPosition: {x: 0, y: -414.7244, z: -28.299564} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0, y: -4.147244, z: -0.28299564} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7984833443413823989} + m_Father: {fileID: 5920925750077467287} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6420375232892593331 @@ -5694,10 +5732,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7286026838022331306} m_LocalRotation: {x: 1.5888269e-15, y: 1, z: -0.000000021855698, w: 0.0000000754979} - m_LocalPosition: {x: 330.10846, y: 82.866776, z: 545.81384} - m_LocalScale: {x: 154.2139, y: 154.2139, z: 154.2139} + m_LocalPosition: {x: 3.3010845, y: 0.82866776, z: 5.4581385} + m_LocalScale: {x: 1.5421389, y: 1.5421389, z: 1.5421389} m_Children: [] - m_Father: {fileID: 7984833443413823989} + m_Father: {fileID: 5920925750077467287} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8396090283581331778 @@ -5967,8 +6005,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7563636455870097683} m_LocalRotation: {x: -0.2335652, y: -0, z: -0, w: 0.9723412} - m_LocalPosition: {x: -288.2, y: 203.49998, z: -150.5} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: -2.882, y: 2.0349998, z: -1.505} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} m_Children: - {fileID: 3037719261167481658} - {fileID: 7180532608872658938} @@ -6042,7 +6080,7 @@ Transform: - {fileID: 7161199028700834795} - {fileID: 7102109754264495672} - {fileID: 5586352108111474251} - m_Father: {fileID: 5496325214845933821} + m_Father: {fileID: 5690719626310477901} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: -27.014, y: 0, z: 0} --- !u!114 &775356082210135438 @@ -6247,10 +6285,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7731301006886985777} m_LocalRotation: {x: -0.00000008501031, y: 0.6826131, z: 0.73078, w: 0.00000001959244} - m_LocalPosition: {x: 4.3448925, y: -414.7244, z: -35.888237} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0.043448925, y: -4.147244, z: -0.35888237} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7984833443413823989} + m_Father: {fileID: 5920925750077467287} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &32648527837932663 @@ -6340,10 +6378,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7734916916328946021} m_LocalRotation: {x: -0.00000008501031, y: 0.6826131, z: 0.73078, w: 0.00000001959244} - m_LocalPosition: {x: -315.1107, y: 98.76051, z: -455.35632} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: -3.1511068, y: 0.9876051, z: -4.553563} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7199358476342105780} + m_Father: {fileID: 3541894819321442470} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5662738107550258893 @@ -6485,44 +6523,6 @@ Transform: m_Father: {fileID: 7393376835743981754} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -27.014, y: 0, z: 0} ---- !u!1 &7867086004750937319 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7199358476342105780} - m_Layer: 0 - m_Name: Thruster Emitters - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7199358476342105780 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7867086004750937319} - 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_Children: - - {fileID: 1666069252795945783} - - {fileID: 4683283048728632690} - - {fileID: 2975293833068553306} - - {fileID: 7698464057975513723} - - {fileID: 6142810525394430311} - - {fileID: 7840769843141738304} - - {fileID: 9178099562039280980} - - {fileID: 7960990829826523109} - m_Father: {fileID: 9106854767781449910} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7893099908137229113 GameObject: m_ObjectHideFlags: 0 @@ -6580,10 +6580,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7922225689561348092} m_LocalRotation: {x: -0.00000008501031, y: 0.6826131, z: 0.73078, w: 0.00000001959244} - m_LocalPosition: {x: 0, y: -414.7244, z: -28.299564} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0, y: -4.147244, z: -0.28299564} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7984833443413823989} + m_Father: {fileID: 5920925750077467287} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3554018075767873258 @@ -6677,12 +6677,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7930906210874266039} - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 723, z: 0} - m_LocalScale: {x: 10000, y: 10000, z: 10000} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 7.23, z: 0} + m_LocalScale: {x: 100, y: 100, z: 100} m_Children: [] m_Father: {fileID: 9106854767781449910} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &5323651519293148283 MeshFilter: @@ -6995,16 +6995,16 @@ Transform: m_GameObject: {fileID: 8442521443025013260} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 680201488166242961} - {fileID: 7793432974695605104} - {fileID: 4651778235258359919} - - {fileID: 7984833443413823989} - - {fileID: 7199358476342105780} + - {fileID: 5920925750077467287} + - {fileID: 3541894819321442470} - {fileID: 3659313866188730483} - - {fileID: 5496325214845933821} + - {fileID: 5690719626310477901} - {fileID: 5670809732538438839} - - {fileID: 680201488166242961} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7020,6 +7020,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1306f57022ae47ceba7441145a065cb1, type: 3} m_Name: m_EditorClassIdentifier: + MapIcon: {fileID: 6966798770617141827} InfluencePrefab: {fileID: 0} PingPrefab: {fileID: 3496685214803260728, guid: bfcaa66e173f6a44cb640aabbcb5e429, type: 3} @@ -7085,10 +7086,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8620289461215737213} m_LocalRotation: {x: -0.00000008501031, y: 0.6826131, z: 0.73078, w: 0.00000001959244} - m_LocalPosition: {x: 0, y: -414.7244, z: -28.299564} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0, y: -4.147244, z: -0.28299564} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7984833443413823989} + m_Father: {fileID: 5920925750077467287} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8732357745223299660 @@ -7370,22 +7371,22 @@ PrefabInstance: - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} propertyPath: m_LocalScale.x - value: 85793.17 + value: 857.9317 objectReference: {fileID: 0} - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} propertyPath: m_LocalScale.y - value: 42400 + value: 424.00012 objectReference: {fileID: 0} - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} propertyPath: m_LocalScale.z - value: 103625.6 + value: 1036.2562 objectReference: {fileID: 0} - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} @@ -7395,12 +7396,12 @@ PrefabInstance: - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} propertyPath: m_LocalPosition.y - value: 175 + value: 1.75 objectReference: {fileID: 0} - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} propertyPath: m_LocalPosition.z - value: -106 + value: -1.06 objectReference: {fileID: 0} - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} @@ -7415,12 +7416,12 @@ PrefabInstance: - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} @@ -7472,12 +7473,27 @@ PrefabInstance: - target: {fileID: 5695304557067713062, guid: 1df59848be1db8547bc662080d0d6000, type: 3} propertyPath: m_RootOrder - value: 7 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5695304557067713062, guid: 1df59848be1db8547bc662080d0d6000, + type: 3} + propertyPath: m_LocalScale.x + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 5695304557067713062, guid: 1df59848be1db8547bc662080d0d6000, + type: 3} + propertyPath: m_LocalScale.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 5695304557067713062, guid: 1df59848be1db8547bc662080d0d6000, + type: 3} + propertyPath: m_LocalScale.z + value: 0.01 objectReference: {fileID: 0} - target: {fileID: 5695304557067713062, guid: 1df59848be1db8547bc662080d0d6000, type: 3} propertyPath: m_LocalPosition.x - value: 0.2 + value: 0.002 objectReference: {fileID: 0} - target: {fileID: 5695304557067713062, guid: 1df59848be1db8547bc662080d0d6000, type: 3} @@ -7497,17 +7513,17 @@ PrefabInstance: - target: {fileID: 5695304557067713062, guid: 1df59848be1db8547bc662080d0d6000, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5695304557067713062, guid: 1df59848be1db8547bc662080d0d6000, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5695304557067713062, guid: 1df59848be1db8547bc662080d0d6000, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5695304557067713062, guid: 1df59848be1db8547bc662080d0d6000, type: 3} diff --git a/Assets/Resources/Prefabs/Ships/Longinus.prefab b/Assets/Resources/Prefabs/Ships/Longinus.prefab index 71268e8cc..7a7e0c796 100644 --- a/Assets/Resources/Prefabs/Ships/Longinus.prefab +++ b/Assets/Resources/Prefabs/Ships/Longinus.prefab @@ -58,6 +58,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1306f57022ae47ceba7441145a065cb1, type: 3} m_Name: m_EditorClassIdentifier: + MapIcon: {fileID: 1981845523498315582} InfluencePrefab: {fileID: 0} PingPrefab: {fileID: 3496685214803260728, guid: bfcaa66e173f6a44cb640aabbcb5e429, type: 3} diff --git a/Assets/Resources/Prefabs/Stations/Zenith.prefab b/Assets/Resources/Prefabs/Stations/Zenith.prefab index cdefe1660..bd2929fcf 100644 --- a/Assets/Resources/Prefabs/Stations/Zenith.prefab +++ b/Assets/Resources/Prefabs/Stations/Zenith.prefab @@ -154,6 +154,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 170aefb3b5cd0e444826f3561d38a962, type: 3} m_Name: m_EditorClassIdentifier: + MapIcon: {fileID: 1279711225872783832} InfluencePrefab: {fileID: 7850317761668179092, guid: f1bbcf6a20e34d9418b869c8d676cc94, type: 3} PingPrefab: {fileID: 0} diff --git a/Assets/Resources/Prefabs/Turrets/Turret.prefab b/Assets/Resources/Prefabs/Turrets/Turret.prefab index 8f83fc3ee..748ca8a29 100644 --- a/Assets/Resources/Prefabs/Turrets/Turret.prefab +++ b/Assets/Resources/Prefabs/Turrets/Turret.prefab @@ -27,11 +27,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 252092834766144829} - m_LocalRotation: {x: 1, y: -0, z: -0, w: -0.00000008940697} - m_LocalPosition: {x: 0, y: 0, z: 7.23} - m_LocalScale: {x: 50, y: 50.000034, z: 50.000034} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 6.0999994, z: -0} + m_LocalScale: {x: 50, y: 50.000027, z: 50.000027} m_Children: [] - m_Father: {fileID: 7279045006683137756} + m_Father: {fileID: 6148628377977073562} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &7612603927487076180 @@ -277,7 +277,7 @@ Transform: - {fileID: 1727314640956741321} - {fileID: 1727314642268200747} m_Father: {fileID: 6148628377977073562} - m_RootOrder: 6 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1727314640956741320 GameObject: @@ -408,13 +408,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727314641991746687} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -1.13, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1107077262217616032} - {fileID: 1400495860060317977} - m_Father: {fileID: 6148628377977073562} + m_Father: {fileID: 317156377178318182} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1727314641991746681 @@ -460,7 +460,7 @@ Transform: m_Children: - {fileID: 1727314640455870929} m_Father: {fileID: 7279045006683137756} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1727314642051522539 GameObject: @@ -486,12 +486,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727314642051522539} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -1.13, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7279045006683137756} - m_Father: {fileID: 6148628377977073562} + m_Father: {fileID: 317156377178318182} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1042551328614064086 @@ -588,7 +588,7 @@ Transform: m_LocalPosition: {x: 0, y: -1.13, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6148628377977073562} + m_Father: {fileID: 317156377178318182} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5495307182897004020 @@ -800,7 +800,7 @@ Transform: m_LocalPosition: {x: 0, y: -1.13, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6148628377977073562} + m_Father: {fileID: 317156377178318182} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8944161893655398130 @@ -967,7 +967,6 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8377448638104583804} - {fileID: 1727314642013213443} m_Father: {fileID: 1727314642051522548} m_RootOrder: 0 @@ -1048,14 +1047,10 @@ Transform: m_GameObject: {fileID: 6782280586133632288} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 5, y: 5, z: 5} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1073083876358738496} - - {fileID: 4055558357782281998} - - {fileID: 4698243474491765904} - - {fileID: 3103618512529724952} - - {fileID: 1727314642051522548} - - {fileID: 1727314641991746680} + - {fileID: 8377448638104583804} + - {fileID: 317156377178318182} - {fileID: 1727314640817046620} m_Father: {fileID: 0} m_RootOrder: 0 @@ -1072,6 +1067,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 170aefb3b5cd0e444826f3561d38a962, type: 3} m_Name: m_EditorClassIdentifier: + MapIcon: {fileID: 3483230693202533876} + InfluencePrefab: {fileID: 0} PingPrefab: {fileID: 0} InvisibleMaterial: {fileID: 2100000, guid: c94a225de88e5ce42af01c34df3521e6, type: 2} Shield: {fileID: 0} @@ -1116,11 +1113,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6946734302097032817} - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: 1.4210855e-14, y: -1.13, z: 0} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} + m_LocalPosition: {x: 0, y: -1.13, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6148628377977073562} + m_Father: {fileID: 317156377178318182} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &6946734302097032819 @@ -1149,6 +1146,42 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eff043e6f0a5f834ebfbc7f750260ae0, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &7484200752832815229 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 317156377178318182} + m_Layer: 0 + m_Name: Body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &317156377178318182 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7484200752832815229} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 5, y: 5, z: 5} + m_Children: + - {fileID: 1073083876358738496} + - {fileID: 4055558357782281998} + - {fileID: 4698243474491765904} + - {fileID: 3103618512529724952} + - {fileID: 1727314642051522548} + - {fileID: 1727314641991746680} + m_Father: {fileID: 6148628377977073562} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8304154918997209427 GameObject: m_ObjectHideFlags: 0 @@ -1181,7 +1214,7 @@ Transform: m_LocalPosition: {x: 0, y: -1.13, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6148628377977073562} + m_Father: {fileID: 317156377178318182} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &645052713255078889 diff --git a/Assets/Resources/Settings.asset b/Assets/Resources/Settings.asset index de3fa9946..32d21fa46 100644 --- a/Assets/Resources/Settings.asset +++ b/Assets/Resources/Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bbe9053d756092955e7ca044850717e4617ed595b3c93b4424af88b2266ed58 -size 12512 +oid sha256:a8954922777a82108e5049d797d9b93b144ab3bc05f6151513ef524d3cbd9521 +size 12537 diff --git a/Assets/Scenes/ARPG.unity b/Assets/Scenes/ARPG.unity index db1e09db9..3b97143d5 100644 --- a/Assets/Scenes/ARPG.unity +++ b/Assets/Scenes/ARPG.unity @@ -1015,10 +1015,10 @@ RectTransform: m_Father: {fileID: 1783772015} 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: 616.52, y: -40} - m_SizeDelta: {x: 329.91, y: 56} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &101395091 MonoBehaviour: @@ -2136,7 +2136,7 @@ RectTransform: - {fileID: 1868140981} - {fileID: 1080776604} m_Father: {fileID: 761574181} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2915,7 +2915,7 @@ GameObject: - component: {fileID: 225222201} - component: {fileID: 225222198} m_Layer: 0 - m_Name: Sector Camera + m_Name: Galaxy Camera m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3815,7 +3815,6 @@ GameObject: - component: {fileID: 259676747} - component: {fileID: 259676750} - component: {fileID: 259676749} - - component: {fileID: 259676748} m_Layer: 19 m_Name: Icon m_TagString: Untagged @@ -3837,20 +3836,6 @@ Transform: m_Father: {fileID: 393631323} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &259676748 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 259676746} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &259676749 MeshRenderer: m_ObjectHideFlags: 0 @@ -4528,7 +4513,7 @@ RectTransform: - {fileID: 1787772780} - {fileID: 332734006} m_Father: {fileID: 761574181} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5126,7 +5111,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 761574181} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -5194,10 +5179,10 @@ RectTransform: m_Father: {fileID: 1896923344} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 36, y: -10} - m_SizeDelta: {x: 64, y: 12} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &394213711 MonoBehaviour: @@ -5279,10 +5264,10 @@ RectTransform: m_Father: {fileID: 445770198} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 36, y: 0} - m_SizeDelta: {x: 64, y: 17.94} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &396382212 MonoBehaviour: @@ -6504,107 +6489,6 @@ MonoBehaviour: DoubleClickTime: 0.5 HitDamageThreshold: 1 EmptyCells: [] ---- !u!1 &411347518 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 411347519} - - component: {fileID: 411347523} - - component: {fileID: 411347522} - - component: {fileID: 411347521} - - component: {fileID: 411347520} - m_Layer: 5 - m_Name: Menu Background - m_TagString: UIBackground - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &411347519 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 411347518} - 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_Children: [] - m_Father: {fileID: 761574181} - 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 &411347520 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 411347518} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9643e74593988274bbed9adf40384e48, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &411347521 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 411347518} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3468b3db8d419c745b12124f6432696b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &411347522 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 411347518} - 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} - 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: 0 - 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 &411347523 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 411347518} - m_CullTransparentMesh: 0 --- !u!1 &415301830 GameObject: m_ObjectHideFlags: 0 @@ -6943,10 +6827,10 @@ RectTransform: m_Father: {fileID: 1005841432} 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: 44, y: -46.97} - m_SizeDelta: {x: 72, y: 77.94} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &445770199 MonoBehaviour: @@ -7324,7 +7208,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 761574181} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -8175,10 +8059,10 @@ RectTransform: m_Father: {fileID: 445770198} 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: 36, y: -25.94} - m_SizeDelta: {x: 64, y: 12} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &524354597 MonoBehaviour: @@ -8286,7 +8170,6 @@ GameObject: - component: {fileID: 542243546} - component: {fileID: 542243549} - component: {fileID: 542243548} - - component: {fileID: 542243547} m_Layer: 18 m_Name: Influence m_TagString: Untagged @@ -8308,20 +8191,6 @@ Transform: m_Father: {fileID: 1511875452} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &542243547 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542243545} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &542243548 MeshRenderer: m_ObjectHideFlags: 0 @@ -9447,7 +9316,7 @@ RectTransform: - {fileID: 738229276} - {fileID: 947321578} m_Father: {fileID: 761574181} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9545,6 +9414,203 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1001 &625292025 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2056162322} + m_Modifications: + - target: {fileID: 257019179550429270, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 257019179550429270, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 257019179596293679, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 257019179596293679, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 257019180101986795, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 257019180101986795, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 257019180101986795, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215474, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_Color.a + value: 0.9490196 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215474, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_Color.b + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215474, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_Color.g + value: 0.034999993 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215474, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_Color.r + value: 0.0050000013 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215475, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: Dropdown + value: + objectReference: {fileID: 178733681} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_SizeDelta.y + value: -300 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -150 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131821417165215485, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + propertyPath: m_Name + value: Properties + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 426f9dcb510530d4dbfa678c9f727ec1, type: 3} +--- !u!224 &625292026 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + m_PrefabInstance: {fileID: 625292025} + m_PrefabAsset: {fileID: 0} +--- !u!114 &625292027 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7131821417165215475, guid: 426f9dcb510530d4dbfa678c9f727ec1, + type: 3} + m_PrefabInstance: {fileID: 625292025} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c2bf4a7080061d42a87046c37bf0c60, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &630131158 GameObject: m_ObjectHideFlags: 0 @@ -9621,6 +9687,7 @@ MonoBehaviour: Position: x: 0 y: 0 + IconSize: 32 --- !u!1001 &642590526 PrefabInstance: m_ObjectHideFlags: 0 @@ -10593,10 +10660,10 @@ RectTransform: m_Father: {fileID: 445770198} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 36, y: -67.94} - m_SizeDelta: {x: 64, y: 12} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &693745765 MonoBehaviour: @@ -10814,6 +10881,7 @@ GameObject: - component: {fileID: 708399897} - component: {fileID: 708399896} - component: {fileID: 708399895} + - component: {fileID: 708399898} m_Layer: 19 m_Name: Primary m_TagString: Untagged @@ -10898,6 +10966,18 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 708399893} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &708399898 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708399893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52538a3309c36fc4583c964a1c0b705f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &708838805 GameObject: m_ObjectHideFlags: 0 @@ -11828,7 +11908,6 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1273980439} - - {fileID: 411347519} - {fileID: 346000247} - {fileID: 393961848} - {fileID: 1726632265} @@ -13652,7 +13731,6 @@ GameObject: - component: {fileID: 926083406} - component: {fileID: 926083405} - component: {fileID: 926083404} - - component: {fileID: 926083403} - component: {fileID: 926083402} m_Layer: 19 m_Name: IconBackground @@ -13673,20 +13751,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!64 &926083403 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 926083401} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &926083404 MeshRenderer: m_ObjectHideFlags: 0 @@ -13784,10 +13848,10 @@ RectTransform: m_Father: {fileID: 1783772015} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1049.145, y: -40} - m_SizeDelta: {x: 146.84, y: 56} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &931657852 MonoBehaviour: @@ -15449,11 +15513,11 @@ RectTransform: m_Father: {fileID: 2056162322} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -16, y: 16} - m_SizeDelta: {x: 164.01999, y: 93.94} - m_Pivot: {x: 1, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 16, y: 16} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!114 &1005841433 MonoBehaviour: m_ObjectHideFlags: 0 @@ -17982,7 +18046,7 @@ RectTransform: - {fileID: 1505831357} - {fileID: 1741914910} m_Father: {fileID: 761574181} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -18455,10 +18519,10 @@ RectTransform: m_Father: {fileID: 445770198} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 36, y: -53.940002} - m_SizeDelta: {x: 64, y: 12} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1174520929 MonoBehaviour: @@ -19808,6 +19872,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ba30ab714c5cf6943957d3e4ae549c84, type: 3} m_Name: m_EditorClassIdentifier: + Layers: + serializedVersion: 2 + m_Bits: 0 RayCamera: {fileID: 2115559089} --- !u!114 &1273980443 MonoBehaviour: @@ -20955,10 +21022,10 @@ RectTransform: m_Father: {fileID: 1783772015} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1234.5099, y: -40} - m_SizeDelta: {x: 223.89, y: 56} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1399108419 MonoBehaviour: @@ -21427,7 +21494,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 761574181} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -21907,10 +21974,10 @@ RectTransform: m_Father: {fileID: 1783772015} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 878.6, y: -40} - m_SizeDelta: {x: 194.25, y: 56} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1464157086 MonoBehaviour: @@ -22704,6 +22771,7 @@ MonoBehaviour: Influence: {fileID: 542243548} Label: {fileID: 2092739552} IconContainer: {fileID: 393631323} + Clickable: {fileID: 708399898} --- !u!114 &1511875454 MonoBehaviour: m_ObjectHideFlags: 0 @@ -23439,7 +23507,7 @@ PrefabInstance: - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 55.675 objectReference: {fileID: 0} - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} @@ -24412,10 +24480,10 @@ RectTransform: m_Father: {fileID: 445770198} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 36, y: -39.940002} - m_SizeDelta: {x: 64, y: 12} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1580369954 MonoBehaviour: @@ -24651,7 +24719,7 @@ PrefabInstance: - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 60.98 objectReference: {fileID: 0} - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} @@ -26240,7 +26308,7 @@ RectTransform: m_Children: - {fileID: 460484049} m_Father: {fileID: 761574181} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 1} @@ -26357,7 +26425,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1726632265 RectTransform: m_ObjectHideFlags: 0 @@ -26376,7 +26444,7 @@ RectTransform: - {fileID: 2056162322} - {fileID: 1783772015} m_Father: {fileID: 761574181} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -27195,7 +27263,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.0050000013, g: 0.034999993, b: 0.05, a: 0.9490196} + m_Color: {r: 0.0050980407, g: 0.03568629, b: 0.050980393, a: 0.9490196} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -27896,9 +27964,8 @@ GameObject: - component: {fileID: 1857285685} - component: {fileID: 1857285688} - component: {fileID: 1857285687} - - component: {fileID: 1857285686} m_Layer: 19 - m_Name: Secondary + m_Name: Glow m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -27918,20 +27985,6 @@ Transform: m_Father: {fileID: 1511875452} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &1857285686 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857285684} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1857285687 MeshRenderer: m_ObjectHideFlags: 0 @@ -28349,10 +28402,10 @@ RectTransform: m_Father: {fileID: 1005841432} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 120.02, y: -46.97} - m_SizeDelta: {x: 72, y: 77.94} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1896923345 MonoBehaviour: @@ -29154,8 +29207,6 @@ MonoBehaviour: GameManager: {fileID: 1009503729} DragParent: {fileID: 245842385} Dialog: {fileID: 620555924} - BackgroundEntered: {fileID: 411347521} - BackgroundExited: {fileID: 411347520} --- !u!1 &1998350928 GameObject: m_ObjectHideFlags: 0 @@ -29168,8 +29219,10 @@ GameObject: - component: {fileID: 1998350932} - component: {fileID: 1998350931} - component: {fileID: 1998350930} + - component: {fileID: 1998350934} + - component: {fileID: 1998350933} m_Layer: 5 - m_Name: Sector Contents + m_Name: Galaxy Contents m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -29236,10 +29289,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 59b26802254e34b4bb26f48d0d8b51bf, type: 3} m_Name: m_EditorClassIdentifier: + Raycaster: {fileID: 1998350933} + Properties: {fileID: 625292027} Canvas: {fileID: 761574180} Map: {fileID: 2132980328} GameManager: {fileID: 1009503729} - MainCamera: {fileID: 2115559089} SectorCamera: {fileID: 225222202} SectorBackgroundRenderer: {fileID: 1566772337} ZoomSpeed: 0.025 @@ -29256,6 +29310,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1998350928} m_CullTransparentMesh: 1 +--- !u!114 &1998350933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998350928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba30ab714c5cf6943957d3e4ae549c84, type: 3} + m_Name: + m_EditorClassIdentifier: + Layers: + serializedVersion: 2 + m_Bits: 524288 + RayCamera: {fileID: 225222202} +--- !u!114 &1998350934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998350928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 20fa7724865c6b04097615292a325dfe, type: 3} + m_Name: + m_EditorClassIdentifier: + DragDistance: 25 --- !u!1 &2030645737 GameObject: m_ObjectHideFlags: 0 @@ -29586,12 +29669,12 @@ GameObject: m_Component: - component: {fileID: 2056162322} m_Layer: 5 - m_Name: Sector Screen + m_Name: Galaxy Screen m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2056162322 RectTransform: m_ObjectHideFlags: 0 @@ -29605,6 +29688,7 @@ RectTransform: m_Children: - {fileID: 1998350929} - {fileID: 1005841432} + - {fileID: 625292026} m_Father: {fileID: 1726632265} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/Gameplay/EntityInstance.cs b/Assets/Scripts/Gameplay/EntityInstance.cs index d3cfb0dd9..bdd7eb1a5 100644 --- a/Assets/Scripts/Gameplay/EntityInstance.cs +++ b/Assets/Scripts/Gameplay/EntityInstance.cs @@ -11,6 +11,7 @@ using Random = UnityEngine.Random; public class EntityInstance : MonoBehaviour { + public MeshRenderer MapIcon; public Transform InfluencePrefab; public Transform PingPrefab; public Material InvisibleMaterial; diff --git a/Assets/Scripts/Gameplay/GameSettings.cs b/Assets/Scripts/Gameplay/GameSettings.cs index e79d992b3..c16b1e382 100644 --- a/Assets/Scripts/Gameplay/GameSettings.cs +++ b/Assets/Scripts/Gameplay/GameSettings.cs @@ -28,6 +28,7 @@ public class GameSettings : ScriptableObject public ExponentialCurve IconSize; public int AsteroidMeshCount = 5; public float MinimapAsteroidSize = 3; + public float MinimapIconSize = 1f / 32; public float PlanetRotationSpeed = 1; public NameGeneratorSettings NameGeneratorSettings; public TutorialGenerationSettings TutorialGenerationSettings; diff --git a/Assets/Scripts/ServerShared/Entity.cs b/Assets/Scripts/ServerShared/Entity.cs index 3fa84e004..87c15d448 100644 --- a/Assets/Scripts/ServerShared/Entity.cs +++ b/Assets/Scripts/ServerShared/Entity.cs @@ -291,7 +291,10 @@ public abstract class Entity public FactionRelationship GetFactionRelationship(Faction faction) => this is Ship {IsPlayerShip: true} ? Zone.Sector.FactionRelationships[faction] : faction==Faction ? FactionRelationship.Beloved : FactionRelationship.Neutral; - public static bool IsPresencePermitted(FactionRelationship relationship, SecurityLevel securityLevel) => (int) relationship - (int) securityLevel > 0; + public static bool IsPresencePermitted(FactionRelationship relationship, SecurityLevel securityLevel) => + (int) relationship - (int) securityLevel > 0; + public static bool IsDockingPermitted(FactionRelationship relationship, SecurityLevel securityLevel) => + (int) relationship - (int) securityLevel > 1; public void ActivateConsumable(ConsumableItem item) { @@ -700,6 +703,8 @@ public abstract class Entity public EquippedDockingBay TryDock(Ship ship) { + if (!IsDockingPermitted(ship.GetFactionRelationship(Faction), CurrentSecurityLevel.Value)) return null; + var bay = DockingBays.FirstOrDefault(x => x.DockedShip == null); if (bay != null) { @@ -872,18 +877,10 @@ public abstract class Entity var localSecurityLevel = Zone.GetSecurityLevel(Position.xz); if (CurrentSecurityLevel.Value != localSecurityLevel) CurrentSecurityLevel.Value = localSecurityLevel; - foreach (var entity in Zone.Entities) - { - var previousHostility = EntityHostility[entity]; - var newHostility = IsHostileTo(entity); - if (newHostility != previousHostility) - EntityHostility[entity] = newHostility; - } - foreach (var v in VisibilitySources.Keys.ToArray()) { VisibilitySources[v] = AetheriaMath.Decay(VisibilitySources[v], ItemManager.GameplaySettings.VisibilityDecay, delta); - + if (VisibilitySources[v] < 0.1f) VisibilitySources.Remove(v); } @@ -893,6 +890,14 @@ public abstract class Entity if (_active) { + foreach (var entity in Zone.Entities) + { + var previousHostility = EntityHostility[entity]; + var newHostility = IsHostileTo(entity); + if (newHostility != previousHostility) + EntityHostility[entity] = newHostility; + } + if(Cockpit != null) { var cockpitTemp = Cockpit.Temperature; diff --git a/Assets/Scripts/ServerShared/ZoneGenerator.cs b/Assets/Scripts/ServerShared/ZoneGenerator.cs index 8ae117da9..5c6547b89 100644 --- a/Assets/Scripts/ServerShared/ZoneGenerator.cs +++ b/Assets/Scripts/ServerShared/ZoneGenerator.cs @@ -46,7 +46,7 @@ public static class ZoneGenerator var random = new Random(unchecked((uint) sectorZone.Name.GetHashCode()) ^ hash(sectorZone.Position)); - var density = saturate(sector.Background.CloudDensity(sectorZone.Position)); + var density = saturate(sector.Background.CloudDensity(sectorZone.Position)/2); pack.Radius = zoneSettings.ZoneRadius.Evaluate(density); pack.Mass = zoneSettings.ZoneMass.Evaluate(density); var targetSubzoneCount = zoneSettings.SubZoneCount.Evaluate(density); diff --git a/Assets/Scripts/UI/ClickCatcher.cs b/Assets/Scripts/UI/ClickCatcher.cs index 2714c27ef..39fbbc919 100644 --- a/Assets/Scripts/UI/ClickCatcher.cs +++ b/Assets/Scripts/UI/ClickCatcher.cs @@ -5,6 +5,7 @@ using System; using System.Collections; using System.Collections.Generic; +using UniRx; using UnityEngine; using UnityEngine.Events; using UnityEngine.EventSystems; @@ -15,11 +16,11 @@ public class ClickCatcher : MonoBehaviour, IPointerEnterHandler, IPointerExitHan public bool PointerIsInside { get; private set; } public float DragDistance = 25f; - public event Action OnEnter; - public event Action OnExit; - public event Action OnClick; + public Subject OnEnter = new Subject(); + public Subject OnExit = new Subject(); + public Subject OnClick = new Subject(); - private float downTime; + // private float downTime; public static ClickCatcher Background { @@ -36,14 +37,14 @@ public class ClickCatcher : MonoBehaviour, IPointerEnterHandler, IPointerExitHan public void OnPointerEnter(PointerEventData eventData) { //Debug.Log("Pointer Entered"); - OnEnter?.Invoke(eventData); + OnEnter.OnNext(eventData); PointerIsInside = true; } public void OnPointerExit(PointerEventData eventData) { //Debug.Log("Pointer Exited"); - OnExit?.Invoke(eventData); + OnExit.OnNext(eventData); PointerIsInside = false; } @@ -61,6 +62,6 @@ public class ClickCatcher : MonoBehaviour, IPointerEnterHandler, IPointerExitHan public void OnPointerClick(PointerEventData eventData) { if((eventData.pressPosition - eventData.position).sqrMagnitude < DragDistance) - OnClick?.Invoke(eventData); + OnClick.OnNext(eventData); } } diff --git a/Assets/Scripts/UI/ClickRaycaster.cs b/Assets/Scripts/UI/ClickRaycaster.cs index 5175540c7..8cab80a41 100644 --- a/Assets/Scripts/UI/ClickRaycaster.cs +++ b/Assets/Scripts/UI/ClickRaycaster.cs @@ -5,11 +5,13 @@ using System; using System.Collections; using System.Collections.Generic; +using UniRx; using UnityEngine; using UnityEngine.EventSystems; public class ClickRaycaster : MonoBehaviour { + public LayerMask Layers; public event Action OnClickMiss; public Camera RayCamera; private ClickCatcher _clickCatcher; @@ -17,10 +19,10 @@ public class ClickRaycaster : MonoBehaviour void Start() { _clickCatcher = GetComponent(); - _clickCatcher.OnClick += pointer => + _clickCatcher.OnClick.Subscribe(pointer => { RaycastHit hit; - Physics.Raycast(RayCamera.ScreenPointToRay(pointer.position), out hit); + Physics.Raycast(RayCamera.ScreenPointToRay(pointer.position), out hit, 1000, Layers.value); if (hit.collider != null) { var clickable = hit.collider.GetComponent(); @@ -28,6 +30,6 @@ public class ClickRaycaster : MonoBehaviour clickable.Click(pointer); } else OnClickMiss?.Invoke(pointer); - }; + }); } } diff --git a/Assets/Scripts/UI/ConfirmationDialog.cs b/Assets/Scripts/UI/ConfirmationDialog.cs index dd09ab0c5..cb5b8044f 100644 --- a/Assets/Scripts/UI/ConfirmationDialog.cs +++ b/Assets/Scripts/UI/ConfirmationDialog.cs @@ -9,6 +9,7 @@ using TMPro; using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.UI; +using UniRx; public class ConfirmationDialog : PropertiesPanel { @@ -29,11 +30,10 @@ public class ConfirmationDialog : PropertiesPanel Cancel.onClick.AddListener(() => End()); Confirm.onClick.AddListener(() => End(true)); if (CancelClickCatcher != null) - CancelClickCatcher.OnClick += data => + CancelClickCatcher.OnClick.Subscribe(data => { - if (LockDialog) return; - End(); - }; + if (!LockDialog) End(); + }); OnPropertyAdded += go => { diff --git a/Assets/Scripts/UI/ContextMenu.cs b/Assets/Scripts/UI/ContextMenu.cs index 2c782ace4..8cef7329a 100644 --- a/Assets/Scripts/UI/ContextMenu.cs +++ b/Assets/Scripts/UI/ContextMenu.cs @@ -10,6 +10,7 @@ using TMPro; using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.UI; +using UniRx; public class ContextMenu : MonoBehaviour { @@ -32,14 +33,21 @@ public class ContextMenu : MonoBehaviour private bool _dropdownRight; private GameObject _dropdown; private ContextMenuOption _currentDropdown; + private IDisposable _backgroundClickSubscription; - private void Start() + private void OnEnable() { if (CancelClickCatcher != null) - CancelClickCatcher.OnClick += data => + _backgroundClickSubscription = CancelClickCatcher.OnClick.Subscribe(data => { End(); - }; + }); + } + + private void OnDisable() + { + _backgroundClickSubscription?.Dispose(); + _backgroundClickSubscription = null; } private void End() diff --git a/Assets/Scripts/UI/DropdownMenu.cs b/Assets/Scripts/UI/DropdownMenu.cs index a39ed216b..ed761a788 100644 --- a/Assets/Scripts/UI/DropdownMenu.cs +++ b/Assets/Scripts/UI/DropdownMenu.cs @@ -9,6 +9,7 @@ using System.Linq; using TMPro; using UnityEngine; using UnityEngine.UI; +using UniRx; public class DropdownMenu : MonoBehaviour { @@ -22,14 +23,21 @@ public class DropdownMenu : MonoBehaviour public float PaddingHeight; private List _options = new List(); + private IDisposable _backgroundClickSubscription; - private void Start() + private void OnEnable() { if (CancelClickCatcher != null) - CancelClickCatcher.OnClick += data => + _backgroundClickSubscription = CancelClickCatcher.OnClick.Subscribe(data => { End(); - }; + }); + } + + private void OnDisable() + { + _backgroundClickSubscription?.Dispose(); + _backgroundClickSubscription = null; } private void End() diff --git a/Assets/Scripts/UI/Menu/InventoryMenu.cs b/Assets/Scripts/UI/Menu/InventoryMenu.cs index 659cfcc34..669f1190f 100644 --- a/Assets/Scripts/UI/Menu/InventoryMenu.cs +++ b/Assets/Scripts/UI/Menu/InventoryMenu.cs @@ -20,8 +20,7 @@ public class InventoryMenu : MonoBehaviour public ActionGameManager GameManager; public RectTransform DragParent; public ConfirmationDialog Dialog; - public ObservablePointerEnterTrigger BackgroundEntered; - public ObservablePointerExitTrigger BackgroundExited; + // public ClickCatcher Background; private int _currentPanel = -1; @@ -29,36 +28,37 @@ public class InventoryMenu : MonoBehaviour private InventoryPanel _selectedPanel; private ItemInstance _selectedItem; private ItemData _selectedItemData; + // private List _backgroundSubscriptions; - private ItemInstance _dragItem; - private Transform[] _dragCells; - private Vector2[] _dragOffsets; - private int2 _dragCellOffset; - private ItemRotation _originalRotation; - //private Shape _previousFakeOccupancy; - private Shape _originalOccupancy; - private EquippedItem _originalEquippedItem; - private InventoryPanel _originalPanel; - - private InventoryPanel _dragTargetPanel; - private int2 _dragTargetPosition; - private int2 _lastDragPosition; - private bool _dragTargetValid; - private bool _destroyItem; + // private ItemInstance _dragItem; + // private Transform[] _dragCells; + // private Vector2[] _dragOffsets; + // private int2 _dragCellOffset; + // private ItemRotation _originalRotation; + // //private Shape _previousFakeOccupancy; + // private Shape _originalOccupancy; + // private EquippedItem _originalEquippedItem; + // private InventoryPanel _originalPanel; + // + // private InventoryPanel _dragTargetPanel; + // private int2 _dragTargetPosition; + // private int2 _lastDragPosition; + // private bool _dragTargetValid; + // private bool _destroyItem; private void OnEnable() { AkSoundEngine.RegisterGameObj(gameObject); - BackgroundEntered.gameObject.SetActive(true); + // Background.gameObject.SetActive(true); - BackgroundEntered.OnPointerEnterAsObservable().Subscribe(enter => - { - _destroyItem = true; - }); - BackgroundExited.OnPointerExitAsObservable().Subscribe(enter => - { - _destroyItem = false; - }); + // Background.OnEnter.Subscribe(enter => + // { + // _destroyItem = true; + // }); + // BackgroundExited.OnPointerExitAsObservable().Subscribe(enter => + // { + // _destroyItem = false; + // }); var cargo = GameManager.DockingBay ?? GameManager.CurrentEntity.CargoBays.FirstOrDefault(); if (cargo!=null) InventoryPanels[0].Display(cargo); @@ -71,7 +71,7 @@ public class InventoryMenu : MonoBehaviour private void OnDisable() { AkSoundEngine.UnregisterGameObj(gameObject); - BackgroundEntered.gameObject.SetActive(false); + // Background.gameObject.SetActive(false); } void Start() @@ -198,13 +198,13 @@ public class InventoryMenu : MonoBehaviour void Update() { - if (Keyboard.current.qKey.wasPressedThisFrame && _dragItem != null) - { - _dragItem.Rotation = (ItemRotation) (((int) _dragItem.Rotation + 1) % 4); - } - if (Keyboard.current.eKey.wasPressedThisFrame && _dragItem != null) - { - _dragItem.Rotation = (ItemRotation) (((int) _dragItem.Rotation + 3) % 4); - } + // if (Keyboard.current.qKey.wasPressedThisFrame && _dragItem != null) + // { + // _dragItem.Rotation = (ItemRotation) (((int) _dragItem.Rotation + 1) % 4); + // } + // if (Keyboard.current.eKey.wasPressedThisFrame && _dragItem != null) + // { + // _dragItem.Rotation = (ItemRotation) (((int) _dragItem.Rotation + 3) % 4); + // } } } diff --git a/Assets/Scripts/UI/Menu/MapRenderer.cs b/Assets/Scripts/UI/Menu/MapRenderer.cs index 735cca238..f10ea1462 100644 --- a/Assets/Scripts/UI/Menu/MapRenderer.cs +++ b/Assets/Scripts/UI/Menu/MapRenderer.cs @@ -26,6 +26,7 @@ public class MapRenderer : MonoBehaviour public Image InfluenceDisplay; public float Scale; public float2 Position; + public float IconSize = 1f/128; private RectTransform _rect; private RenderTexture _mapTexture; @@ -117,5 +118,7 @@ public class MapRenderer : MonoBehaviour InfluenceCamera.transform.position = pos; InfluenceCamera.orthographicSize = _size.y * Scale * .5f; + + GameManager.ZoneRenderer.SetIconSize(IconSize * Scale); } } diff --git a/Assets/Scripts/UI/Menu/MapViewDragHandler.cs b/Assets/Scripts/UI/Menu/MapViewDragHandler.cs deleted file mode 100644 index 00ff1ecb1..000000000 --- a/Assets/Scripts/UI/Menu/MapViewDragHandler.cs +++ /dev/null @@ -1,42 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using static Unity.Mathematics.math; - -public class MapViewDragHandler : MonoBehaviour -{ - public Camera Camera; - public float Scaling; - public ClickCatcher Background; - private Vector2 _previousPosition; - private bool _isDragging; - - void Update() - { - var newPosition = Camera.ScreenToWorldPoint(Input.mousePosition); - - if (!Input.GetMouseButton(0)) _isDragging = false; - - if (_isDragging) Camera.transform.position -= (Vector3) ((Vector2) newPosition - _previousPosition); - - if (Background.PointerIsInside) - { - if (Input.GetMouseButtonDown(0)) - { - _previousPosition = newPosition; - _isDragging = true; - } - - if (abs(Input.mouseScrollDelta.y) > .01f) - { - var previousPosition = Camera.ScreenToWorldPoint(Input.mousePosition); - Camera.orthographicSize *= 1 + Input.mouseScrollDelta.y * Scaling; - Camera.transform.position -= Camera.ScreenToWorldPoint(Input.mousePosition) - previousPosition; - } - } - } -} diff --git a/Assets/Scripts/UI/Menu/MapViewDragHandler.cs.meta b/Assets/Scripts/UI/Menu/MapViewDragHandler.cs.meta deleted file mode 100644 index b2513cf98..000000000 --- a/Assets/Scripts/UI/Menu/MapViewDragHandler.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d172604daaa352b4784c662883d40ec9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/UI/Menu/SectorMap.cs b/Assets/Scripts/UI/Menu/SectorMap.cs index aab3325c3..2239db6bd 100644 --- a/Assets/Scripts/UI/Menu/SectorMap.cs +++ b/Assets/Scripts/UI/Menu/SectorMap.cs @@ -5,6 +5,7 @@ using System.IO; using System.Linq; using MessagePack; using TMPro; +using UniRx; using UnityEngine; using Unity.Mathematics; using static Unity.Mathematics.math; @@ -41,6 +42,8 @@ public class SectorMap : MonoBehaviour public Color PlayerLocationLabelColor; public float PlayerLocationIconSize = 1.25f; + public Subject ZoneClicked = new Subject(); + private SectorZone _currentPlayerLocation; private HashSet _revealedZones = new HashSet(); private HashSet<(SectorZone, SectorZone)> _revealedLinks = new HashSet<(SectorZone, SectorZone)>(); @@ -98,6 +101,7 @@ public class SectorMap : MonoBehaviour if (!_revealedZones.Contains(zone)) { var zoneInstance = ZonePrototype.Instantiate(); + zoneInstance.Clickable.OnClick += (clickableCollider, data) => ZoneClicked.OnNext(zone); if(zone == _currentPlayerLocation) MarkPlayerLocation(zoneInstance); _zoneInstances[zone] = zoneInstance; diff --git a/Assets/Scripts/UI/Menu/SectorRenderer.cs b/Assets/Scripts/UI/Menu/SectorRenderer.cs index b7a38e93c..ccba5a498 100644 --- a/Assets/Scripts/UI/Menu/SectorRenderer.cs +++ b/Assets/Scripts/UI/Menu/SectorRenderer.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; +using UniRx; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; @@ -10,10 +11,11 @@ using float2 = Unity.Mathematics.float2; public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IScrollHandler { + public ClickRaycaster Raycaster; + public PropertiesPanel Properties; public Canvas Canvas; public SectorMap Map; public ActionGameManager GameManager; - public Camera MainCamera; public Camera SectorCamera; public MeshRenderer SectorBackgroundRenderer; public float ZoomSpeed; @@ -49,6 +51,61 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS _sectorBackgroundDepth = _sectorBackgroundTransform.position.z; _sectorCameraTransform = SectorCamera.transform; _sectorCameraDepth = _sectorCameraTransform.position.z; + Raycaster.OnClickMiss += data => + { + Properties.gameObject.SetActive(false); + }; + Map.ZoneClicked.Subscribe(zone => + { + Properties.gameObject.SetActive(true); + Properties.Clear(); + Properties.Title.text = zone.Name; + Properties.AddProperty("Owner", () => zone.Owner?.Name ?? "None"); + var otherFactions = zone.Factions + .Where(f => f.ID != zone.Owner?.ID) + .Select(f=>f.Name).ToArray(); + if (otherFactions.Length > 0) + Properties.AddProperty("Factions Present", () => string.Join(", ", otherFactions)); + var density = saturate(ActionGameManager.CurrentSector.Background.CloudDensity(zone.Position)/2); + var radius = GameManager.Settings.ZoneSettings.ZoneRadius.Evaluate(density); + var mass = GameManager.Settings.ZoneSettings.ZoneMass.Evaluate(density); + Properties.AddProperty("Mass", () => ActionGameManager.PlayerSettings.Format(mass)); + Properties.AddProperty("Radius", () => ActionGameManager.PlayerSettings.Format(radius)); + if (zone.PackedContents == null) + { + Properties.AddProperty(() => "Has not been visited"); + } + else + { + var planetCount = zone.PackedContents.Planets.Count(body => body is PlanetData).ToString(); + Properties.AddProperty("Planets", () => planetCount); + + var beltCount = zone.PackedContents.Planets.Count(body => body is AsteroidBeltData).ToString(); + Properties.AddProperty("Asteroid Belts", () => beltCount); + + var giantCount = zone.PackedContents.Planets.Count(body => body is GasGiantData && !(body is SunData)).ToString(); + Properties.AddProperty("Gas Giants", () => giantCount); + + var starCount = zone.PackedContents.Planets.Count(body => body is SunData).ToString(); + Properties.AddProperty("Stars", () => starCount); + + var stationCount = zone.PackedContents.Entities + .Count(entity => ((HullData) entity.Hull.Data.Value).HullType == HullType.Ship) + .ToString(); + Properties.AddProperty("Stations", () => stationCount); + + var turretCount = zone.PackedContents.Entities + .Count(entity => ((HullData) entity.Hull.Data.Value).HullType == HullType.Ship) + .ToString(); + Properties.AddProperty("Turrets", () => turretCount); + + var shipCount = zone.PackedContents.Entities + .Count(entity => ((HullData) entity.Hull.Data.Value).HullType == HullType.Ship) + .ToString(); + Properties.AddProperty("Ships", () => shipCount); + } + }); + // PathAnimationButton.onClick.AddListener(() => // { // Map.StartCoroutine(AnimatePath()); diff --git a/Assets/Scripts/UI/Menu/SectorZoneUI.cs b/Assets/Scripts/UI/Menu/SectorZoneUI.cs index aa568e018..5befa6be3 100644 --- a/Assets/Scripts/UI/Menu/SectorZoneUI.cs +++ b/Assets/Scripts/UI/Menu/SectorZoneUI.cs @@ -11,4 +11,5 @@ public class SectorZoneUI : MonoBehaviour public MeshRenderer Influence; public TextMeshPro Label; public Transform IconContainer; + public ClickableCollider Clickable; } diff --git a/Assets/Scripts/Zone Display/ZoneRenderer.cs b/Assets/Scripts/Zone Display/ZoneRenderer.cs index c8f5cb072..dd9364027 100644 --- a/Assets/Scripts/Zone Display/ZoneRenderer.cs +++ b/Assets/Scripts/Zone Display/ZoneRenderer.cs @@ -136,10 +136,17 @@ public class ZoneRenderer : MonoBehaviour { foreach (var camera in MinimapCameras) camera.orthographicSize = value; + SetIconSize(value * Settings.MinimapIconSize); // MinimapGravityQuad.transform.localScale = value * 2 * Vector3.one; } } + public void SetIconSize(float size) + { + foreach(var entityInstance in EntityInstances.Values) entityInstance.MapIcon.transform.localScale = Vector3.one * size; + foreach(var planet in Planets.Values) planet.Icon.transform.localScale = Vector3.one * size; + } + void Start() { ViewDistance = Settings.DefaultViewDistance; diff --git a/GameData/PlayerSettings.msgpack b/GameData/PlayerSettings.msgpack index 997fdc518..d28ebe819 100644 --- a/GameData/PlayerSettings.msgpack +++ b/GameData/PlayerSettings.msgpack @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0607b30584b6fc67563578054807082394a514b6449605ecca0f4e2fdff4b7e0 -size 51739 +oid sha256:2014d1c1c2b07e355c78b5d8699bdb7e0a15d4638522322d86744db6fd5018f5 +size 83737