diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 6e7169d..3ce1ed4 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: d7f58d36cc4da874fa45d38c0070c2c2 m_currentHash: serializedVersion: 2 - Hash: 41c3275372ee23ae1595642e0bc286bf + Hash: a9de470e3ae86c2ab2d0ba2a6812fa41 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 diff --git a/Assets/Prefabs/Game/MapLocations.prefab b/Assets/Prefabs/Game/MapLocations.prefab index e77225d..698d0d7 100644 --- a/Assets/Prefabs/Game/MapLocations.prefab +++ b/Assets/Prefabs/Game/MapLocations.prefab @@ -27,7 +27,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 6.8, y: 0.036, z: 3.2} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 561419057474875478} diff --git a/Assets/Prefabs/Game/MapRef.prefab b/Assets/Prefabs/Game/MapRef.prefab index 3f89acf..2d17f64 100644 --- a/Assets/Prefabs/Game/MapRef.prefab +++ b/Assets/Prefabs/Game/MapRef.prefab @@ -27,7 +27,7 @@ Transform: serializedVersion: 2 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_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2570389272920721074} @@ -160,7 +160,7 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 10, y: 0.1, z: 10} m_Center: {x: 0, y: -0.05, z: 0} ---- !u!1 &6524685290382203959 +--- !u!1 &2956314392319795661 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -168,44 +168,44 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 150169694567605380} - - component: {fileID: 2034157458128204794} + - component: {fileID: 553836549156001377} + - component: {fileID: 2776493244321975856} m_Layer: 0 - m_Name: Wilderness + m_Name: South Road m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &150169694567605380 +--- !u!4 &553836549156001377 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6524685290382203959} + m_GameObject: {fileID: 2956314392319795661} serializedVersion: 2 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_LocalPosition: {x: 6.95, y: 0, z: 1.7} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 926535160506351424} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2034157458128204794 +--- !u!114 &2776493244321975856 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6524685290382203959} + m_GameObject: {fileID: 2956314392319795661} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 95af4f7ff0649854598833eabd84f131, type: 3} m_Name: - m_EditorClassIdentifier: Assembly-CSharp-firstpass::Jovian.ZoneSystem.ZoneInstance - data: {fileID: 11400000, guid: b90063b33444d214fb0dd99845d20da0, type: 2} ---- !u!1 &7700777388891455207 + m_EditorClassIdentifier: Jovian.ZoneSystem::Jovian.ZoneSystem.ZoneInstance + data: {fileID: 11400000, guid: 263de6ccb4b79c340883df4a1d555220, type: 2} +--- !u!1 &6249518700168291789 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -213,43 +213,133 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6771033229695015998} - - component: {fileID: 961106205653816651} + - component: {fileID: 1941104781230840099} + - component: {fileID: 2137196945385592953} m_Layer: 0 - m_Name: RedMist + m_Name: Codrii Vasluiului m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6771033229695015998 +--- !u!4 &1941104781230840099 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7700777388891455207} + m_GameObject: {fileID: 6249518700168291789} serializedVersion: 2 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_LocalPosition: {x: 2.46, y: 0, z: 0.06} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 926535160506351424} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &961106205653816651 +--- !u!114 &2137196945385592953 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7700777388891455207} + m_GameObject: {fileID: 6249518700168291789} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 95af4f7ff0649854598833eabd84f131, type: 3} m_Name: - m_EditorClassIdentifier: Assembly-CSharp-firstpass::Jovian.ZoneSystem.ZoneInstance - data: {fileID: 11400000, guid: 6ae6794d84d30a64393cdac41f6bd89c, type: 2} + m_EditorClassIdentifier: Jovian.ZoneSystem::Jovian.ZoneSystem.ZoneInstance + data: {fileID: 11400000, guid: 4eefe490fd756c947b300b6f3d697df4, type: 2} +--- !u!1 &6403256874069463078 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2399577652422057350} + - component: {fileID: 8103982541836116775} + m_Layer: 0 + m_Name: RedMystEast_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2399577652422057350 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6403256874069463078} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 7.289, y: 0, z: 3.48} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 926535160506351424} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8103982541836116775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6403256874069463078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95af4f7ff0649854598833eabd84f131, type: 3} + m_Name: + m_EditorClassIdentifier: Jovian.ZoneSystem::Jovian.ZoneSystem.ZoneInstance + data: {fileID: 11400000, guid: b8ae323df4686334d91ad4d9b22f4159, type: 2} +--- !u!1 &8299370824322124813 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2976819594879442214} + - component: {fileID: 5245688421302175395} + m_Layer: 0 + m_Name: Thievs Corener + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2976819594879442214 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8299370824322124813} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.31, y: 0, z: 6.1} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 926535160506351424} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5245688421302175395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8299370824322124813} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95af4f7ff0649854598833eabd84f131, type: 3} + m_Name: + m_EditorClassIdentifier: Jovian.ZoneSystem::Jovian.ZoneSystem.ZoneInstance + data: {fileID: 11400000, guid: 499c88e149852754ab0a9a5d551f7eea, type: 2} --- !u!1 &8990714869477060382 GameObject: m_ObjectHideFlags: 0 @@ -280,8 +370,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 150169694567605380} - - {fileID: 6771033229695015998} + - {fileID: 2399577652422057350} + - {fileID: 553836549156001377} + - {fileID: 1941104781230840099} + - {fileID: 2976819594879442214} m_Father: {fileID: 3836152601157972426} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2165519840843418706 diff --git a/Assets/Prefabs/Game/Party.prefab b/Assets/Prefabs/Game/Party.prefab index 46a5175..eea4724 100644 --- a/Assets/Prefabs/Game/Party.prefab +++ b/Assets/Prefabs/Game/Party.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 3883127191764828975} - component: {fileID: 5653379054112650511} - component: {fileID: 6148308834396474161} - m_Layer: 0 + m_Layer: 9 m_Name: Panel m_TagString: Untagged m_Icon: {fileID: 0} @@ -86,7 +86,7 @@ GameObject: - component: {fileID: 4012222738582012437} - component: {fileID: 3249071694086606283} - component: {fileID: 729116634618204491} - m_Layer: 0 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -222,7 +222,7 @@ GameObject: m_Component: - component: {fileID: 660494562578339291} - component: {fileID: 1480157237527998548} - m_Layer: 0 + m_Layer: 9 m_Name: Party m_TagString: Untagged m_Icon: {fileID: 0} @@ -239,7 +239,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.07, y: 0.036, z: 1.95} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4401955371165223074} @@ -268,7 +268,7 @@ GameObject: m_Component: - component: {fileID: 4401955371165223074} - component: {fileID: 3916039184069698551} - m_Layer: 0 + m_Layer: 9 m_Name: Square m_TagString: Untagged m_Icon: {fileID: 0} @@ -361,7 +361,7 @@ GameObject: - component: {fileID: 1438956083575921239} - component: {fileID: 846436570382128832} - component: {fileID: 3223447814727493591} - m_Layer: 0 + m_Layer: 9 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Prefabs/UI/InGameGui/GUI.prefab b/Assets/Prefabs/UI/InGameGui/GUI.prefab index 2416acd..fbb70fd 100644 --- a/Assets/Prefabs/UI/InGameGui/GUI.prefab +++ b/Assets/Prefabs/UI/InGameGui/GUI.prefab @@ -1124,14 +1124,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 + m_fontSize: 32.83 m_fontSizeBase: 36 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_enableAutoSizing: 1 + m_fontSizeMin: 4.7 + m_fontSizeMax: 32.83 m_fontStyle: 33 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1429,10 +1429,10 @@ RectTransform: - {fileID: 8599248206773371971} m_Father: {fileID: 8590246171855584120} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.10939136, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0.32239145, y: 0.5} - m_AnchoredPosition: {x: -23.35254, y: 0.80260015} - m_SizeDelta: {x: -48.2798, y: 86.361} + m_AnchoredPosition: {x: -24.620117, y: 2.125} + m_SizeDelta: {x: -45.73, y: 60.911} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &542021207025892353 CanvasRenderer: diff --git a/Assets/Scenes/Adventure.unity b/Assets/Scenes/Adventure.unity index f0c98d4..0d8237f 100644 --- a/Assets/Scenes/Adventure.unity +++ b/Assets/Scenes/Adventure.unity @@ -374,141 +374,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &899987077 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 899987078} - - component: {fileID: 899987079} - m_Layer: 0 - m_Name: RedMystEast_1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &899987078 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 899987077} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 7.289, y: 0, z: 3.48} - m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2065324670} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &899987079 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 899987077} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 95af4f7ff0649854598833eabd84f131, type: 3} - m_Name: - m_EditorClassIdentifier: Jovian.ZoneSystem::Jovian.ZoneSystem.ZoneInstance - data: {fileID: 11400000, guid: b8ae323df4686334d91ad4d9b22f4159, type: 2} ---- !u!1 &1037239273 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1037239274} - - component: {fileID: 1037239275} - m_Layer: 0 - m_Name: Codrii Vasluiului - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1037239274 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1037239273} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.46, y: 0, z: 0.06} - m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2065324670} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1037239275 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1037239273} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 95af4f7ff0649854598833eabd84f131, type: 3} - m_Name: - m_EditorClassIdentifier: Jovian.ZoneSystem::Jovian.ZoneSystem.ZoneInstance - data: {fileID: 11400000, guid: 4eefe490fd756c947b300b6f3d697df4, type: 2} ---- !u!1 &1056456186 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1056456187} - - component: {fileID: 1056456188} - m_Layer: 0 - m_Name: Thievs Corener - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1056456187 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1056456186} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.31, y: 0, z: 6.1} - m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2065324670} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1056456188 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1056456186} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 95af4f7ff0649854598833eabd84f131, type: 3} - m_Name: - m_EditorClassIdentifier: Jovian.ZoneSystem::Jovian.ZoneSystem.ZoneInstance - data: {fileID: 11400000, guid: 499c88e149852754ab0a9a5d551f7eea, type: 2} --- !u!1 &1342894008 GameObject: m_ObjectHideFlags: 0 @@ -555,51 +420,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1853369441 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1853369442} - - component: {fileID: 1853369443} - m_Layer: 0 - m_Name: South Road - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1853369442 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1853369441} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 6.95, y: 0, z: 1.7} - m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2065324670} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1853369443 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1853369441} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 95af4f7ff0649854598833eabd84f131, type: 3} - m_Name: - m_EditorClassIdentifier: Jovian.ZoneSystem::Jovian.ZoneSystem.ZoneInstance - data: {fileID: 11400000, guid: 263de6ccb4b79c340883df4a1d555220, type: 2} --- !u!1001 &2065324669 PrefabInstance: m_ObjectHideFlags: 0 @@ -608,34 +428,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 150169694567605380, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} - propertyPath: m_LocalPosition.x - value: 4.31 - objectReference: {fileID: 0} - - target: {fileID: 150169694567605380, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} - propertyPath: m_LocalPosition.z - value: -2.5 - objectReference: {fileID: 0} - target: {fileID: 701269181302450206, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} propertyPath: m_Name value: MapRef objectReference: {fileID: 0} - - target: {fileID: 2034157458128204794, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} - propertyPath: data - value: - objectReference: {fileID: 0} - - target: {fileID: 3836152601157972426, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} - propertyPath: m_LocalScale.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3836152601157972426, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} - propertyPath: m_LocalScale.y - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3836152601157972426, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} - propertyPath: m_LocalScale.z - value: 5 - objectReference: {fileID: 0} - target: {fileID: 3836152601157972426, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -676,42 +472,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6524685290382203959, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6771033229695015998, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} - propertyPath: m_LocalPosition.x - value: 4.91 - objectReference: {fileID: 0} - - target: {fileID: 6771033229695015998, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} - propertyPath: m_LocalPosition.z - value: -2.08 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: 7700777388891455207, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} - - {fileID: 6524685290382203959, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 926535160506351424, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} - insertIndex: -1 - addedObject: {fileID: 899987078} - - targetCorrespondingSourceObject: {fileID: 926535160506351424, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} - insertIndex: -1 - addedObject: {fileID: 1853369442} - - targetCorrespondingSourceObject: {fileID: 926535160506351424, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} - insertIndex: -1 - addedObject: {fileID: 1037239274} - - targetCorrespondingSourceObject: {fileID: 926535160506351424, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} - insertIndex: -1 - addedObject: {fileID: 1056456187} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} ---- !u!4 &2065324670 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 926535160506351424, guid: e152c7d154fb4da419d61245d532e8ca, type: 3} - m_PrefabInstance: {fileID: 2065324669} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2263217030056493631 PrefabInstance: m_ObjectHideFlags: 0 @@ -724,18 +489,6 @@ PrefabInstance: propertyPath: m_Name value: Map_POI objectReference: {fileID: 0} - - target: {fileID: 5146284940501144587, guid: a7f9155cd9331e542abcf7e18d5dc9ce, type: 3} - propertyPath: m_LocalScale.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5146284940501144587, guid: a7f9155cd9331e542abcf7e18d5dc9ce, type: 3} - propertyPath: m_LocalScale.y - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5146284940501144587, guid: a7f9155cd9331e542abcf7e18d5dc9ce, type: 3} - propertyPath: m_LocalScale.z - value: 5 - objectReference: {fileID: 0} - target: {fileID: 5146284940501144587, guid: a7f9155cd9331e542abcf7e18d5dc9ce, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -793,10 +546,6 @@ PrefabInstance: propertyPath: m_Name value: GUI objectReference: {fileID: 0} - - target: {fileID: 3496454433051527820, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5178544305442097730, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} propertyPath: m_Pivot.x value: 0 @@ -877,50 +626,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5547799966266031405, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_fontSize - value: 32.83 - objectReference: {fileID: 0} - - target: {fileID: 5547799966266031405, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_fontSizeMax - value: 32.83 - objectReference: {fileID: 0} - - target: {fileID: 5547799966266031405, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_fontSizeMin - value: 4.7 - objectReference: {fileID: 0} - - target: {fileID: 5547799966266031405, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_enableAutoSizing - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5547799966266031405, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7031164879444458698, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7031164879444458698, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7031164879444458698, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_SizeDelta.x - value: -45.73 - objectReference: {fileID: 0} - - target: {fileID: 7031164879444458698, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_SizeDelta.y - value: 60.911 - objectReference: {fileID: 0} - - target: {fileID: 7031164879444458698, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchoredPosition.x - value: -24.620117 - objectReference: {fileID: 0} - - target: {fileID: 7031164879444458698, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchoredPosition.y - value: 2.125 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -934,18 +639,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 660494562578339291, guid: 3a1b48d52adea3347acf44510bdb6fc3, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 660494562578339291, guid: 3a1b48d52adea3347acf44510bdb6fc3, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 660494562578339291, guid: 3a1b48d52adea3347acf44510bdb6fc3, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - target: {fileID: 660494562578339291, guid: 3a1b48d52adea3347acf44510bdb6fc3, type: 3} propertyPath: m_LocalPosition.x value: 36.49 @@ -986,30 +679,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1024083357468631475, guid: 3a1b48d52adea3347acf44510bdb6fc3, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 2537578862943088419, guid: 3a1b48d52adea3347acf44510bdb6fc3, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - target: {fileID: 4905655696927363011, guid: 3a1b48d52adea3347acf44510bdb6fc3, type: 3} propertyPath: m_Name value: Party objectReference: {fileID: 0} - - target: {fileID: 4905655696927363011, guid: 3a1b48d52adea3347acf44510bdb6fc3, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 4999717812512709540, guid: 3a1b48d52adea3347acf44510bdb6fc3, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5077922024062410584, guid: 3a1b48d52adea3347acf44510bdb6fc3, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Packages/manifest.json b/Packages/manifest.json index aa2ba78..d0ab70d 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,24 +1,24 @@ { "dependencies": { - "com.unity.2d.animation": "13.0.4", - "com.unity.2d.psdimporter": "12.0.1", - "com.unity.addressables": "2.8.0", - "com.unity.ai.navigation": "2.0.10", - "com.unity.collab-proxy": "2.11.3", + "com.unity.2d.animation": "13.0.5", + "com.unity.2d.psdimporter": "12.0.2", + "com.unity.addressables": "2.8.1", + "com.unity.ai.navigation": "2.0.12", + "com.unity.collab-proxy": "2.11.4", "com.unity.editorcoroutines": "1.0.1", - "com.unity.ide.rider": "3.0.39", - "com.unity.ide.visualstudio": "2.0.26", + "com.unity.ide.rider": "3.0.40", + "com.unity.ide.visualstudio": "2.0.27", "com.unity.inputsystem": "1.18.0", - "com.unity.localization": "1.5.9", - "com.unity.memoryprofiler": "1.1.9", + "com.unity.localization": "1.5.11", + "com.unity.memoryprofiler": "1.1.12", "com.unity.multiplayer.center": "1.0.1", "com.unity.render-pipelines.universal": "17.3.0", - "com.unity.terrain-tools": "5.3.1", + "com.unity.terrain-tools": "5.3.2", "com.unity.test-framework": "1.6.0", - "com.unity.timeline": "1.8.11", + "com.unity.timeline": "1.8.12", "com.unity.ugui": "2.0.0", "com.unity.ui.test-framework": "1.0.0", - "com.unity.visualscripting": "1.9.9", + "com.unity.visualscripting": "1.9.11", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.adaptiveperformance": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 0da9076..7a31193 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -99,11 +99,11 @@ "dependencies": {} }, "com.unity.2d.animation": { - "version": "13.0.4", + "version": "13.0.5", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "12.0.2", + "com.unity.2d.common": "12.0.3", "com.unity.2d.sprite": "1.0.0", "com.unity.collections": "2.4.3", "com.unity.modules.animation": "1.0.0", @@ -112,7 +112,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "12.0.2", + "version": "12.0.3", "depth": 1, "source": "registry", "dependencies": { @@ -127,11 +127,11 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "12.0.1", + "version": "12.0.2", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "12.0.1", + "com.unity.2d.common": "12.0.3", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0" }, @@ -153,7 +153,7 @@ } }, "com.unity.addressables": { - "version": "2.8.0", + "version": "2.8.1", "depth": 0, "source": "registry", "dependencies": { @@ -163,13 +163,13 @@ "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.scriptablebuildpipeline": "2.5.1", + "com.unity.scriptablebuildpipeline": "2.5.2", "com.unity.modules.unitywebrequestassetbundle": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.ai.navigation": { - "version": "2.0.10", + "version": "2.0.12", "depth": 0, "source": "registry", "dependencies": { @@ -188,7 +188,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.11.3", + "version": "2.11.4", "depth": 0, "source": "registry", "dependencies": {}, @@ -221,7 +221,7 @@ "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.39", + "version": "3.0.40", "depth": 0, "source": "registry", "dependencies": { @@ -230,7 +230,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.26", + "version": "2.0.27", "depth": 0, "source": "registry", "dependencies": { @@ -248,7 +248,7 @@ "url": "https://packages.unity.com" }, "com.unity.localization": { - "version": "1.5.9", + "version": "1.5.11", "depth": 0, "source": "registry", "dependencies": { @@ -265,7 +265,7 @@ "url": "https://packages.unity.com" }, "com.unity.memoryprofiler": { - "version": "1.1.9", + "version": "1.1.12", "depth": 0, "source": "registry", "dependencies": { @@ -339,7 +339,7 @@ } }, "com.unity.scriptablebuildpipeline": { - "version": "2.5.1", + "version": "2.5.2", "depth": 1, "source": "registry", "dependencies": { @@ -365,7 +365,7 @@ } }, "com.unity.terrain-tools": { - "version": "5.3.1", + "version": "5.3.2", "depth": 0, "source": "registry", "dependencies": { @@ -403,7 +403,7 @@ } }, "com.unity.timeline": { - "version": "1.8.11", + "version": "1.8.12", "depth": 0, "source": "registry", "dependencies": { @@ -434,7 +434,7 @@ } }, "com.unity.visualscripting": { - "version": "1.9.9", + "version": "1.9.11", "depth": 0, "source": "registry", "dependencies": {