diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index 604cbe8..d73a445 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -1204,6 +1204,21 @@ PrefabInstance: propertyPath: zoneId value: 340 objectReference: {fileID: 0} + - target: {fileID: 4678135252407299477, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.67 + objectReference: {fileID: 0} + - target: {fileID: 4678135252407299477, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: m_LocalPosition.y + value: 23.4 + objectReference: {fileID: 0} + - target: {fileID: 4678135252407299477, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: m_LocalPosition.z + value: -10.34 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &30126766 stripped @@ -3646,6 +3661,152 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 140575598} m_PrefabAsset: {fileID: 0} +--- !u!1 &140950775 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 140950776} + - component: {fileID: 140950778} + - component: {fileID: 140950777} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &140950776 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 140950775} + 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: 1367539068} + 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 &140950777 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 140950775} + 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: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3b81d9ff9816c8240b02293797c69234, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &140950778 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 140950775} + m_CullTransparentMesh: 0 +--- !u!1 &145240817 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 145240818} + - component: {fileID: 145240820} + - component: {fileID: 145240819} + m_Layer: 5 + m_Name: Image (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &145240818 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 145240817} + 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: 570091126} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 115.94, y: 115.94} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &145240819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 145240817} + 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: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 56cff57f239e75841b8fd76f339a712d, type: 3} + 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 &145240820 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 145240817} + m_CullTransparentMesh: 0 --- !u!1 &153502806 GameObject: m_ObjectHideFlags: 0 @@ -5223,6 +5384,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 243470604} m_CullTransparentMesh: 0 +--- !u!1 &244030530 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 244030531} + m_Layer: 5 + m_Name: DistrictIcons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &244030531 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 244030530} + 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: 593026048} + m_Father: {fileID: 765894939} + m_RootOrder: 0 + 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!1 &252441371 GameObject: m_ObjectHideFlags: 0 @@ -11181,6 +11378,7 @@ RectTransform: - {fileID: 1642390277} - {fileID: 1798411515} - {fileID: 657809897} + - {fileID: 765894939} m_Father: {fileID: 1986334066} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -11417,6 +11615,79 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 496607024} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &496804110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 496804111} + - component: {fileID: 496804113} + - component: {fileID: 496804112} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &496804111 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 496804110} + 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: 861005773} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 115.94, y: 115.94} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &496804112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 496804110} + 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: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 56cff57f239e75841b8fd76f339a712d, type: 3} + 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 &496804113 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 496804110} + m_CullTransparentMesh: 0 --- !u!1 &498947895 GameObject: m_ObjectHideFlags: 0 @@ -12911,6 +13182,43 @@ Transform: type: 3} m_PrefabInstance: {fileID: 564464089} m_PrefabAsset: {fileID: 0} +--- !u!1 &570091125 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 570091126} + m_Layer: 5 + m_Name: EnemyIndicator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &570091126 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 570091125} + 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: 1368323789} + - {fileID: 145240818} + m_Father: {fileID: 961268228} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &571827649 GameObject: m_ObjectHideFlags: 0 @@ -13511,6 +13819,43 @@ Transform: type: 3} m_PrefabInstance: {fileID: 589985524} m_PrefabAsset: {fileID: 0} +--- !u!1 &593026047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 593026048} + m_Layer: 5 + m_Name: DistrictIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &593026048 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 593026047} + 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: 961268228} + - {fileID: 1367539068} + m_Father: {fileID: 244030531} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -429, y: 170} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &603259465 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4678135251219452000, guid: 9ae35d7f911b63f4f95f432141dd5746, @@ -14694,11 +15039,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 663080992} - 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: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.5, y: 0.49999994, z: 0.5} m_Children: [] - m_Father: {fileID: 690503116} + m_Father: {fileID: 1647585765} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &663080994 @@ -15453,8 +15798,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -2000} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 663080993} + m_Children: [] m_Father: {fileID: 1992706994} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -17663,6 +18007,42 @@ Transform: type: 3} m_PrefabInstance: {fileID: 762952354} m_PrefabAsset: {fileID: 0} +--- !u!1 &765894938 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 765894939} + m_Layer: 5 + m_Name: PlanetViewUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &765894939 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 765894938} + 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: 244030531} + m_Father: {fileID: 494226835} + m_RootOrder: 9 + 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!1001 &766573527 PrefabInstance: m_ObjectHideFlags: 0 @@ -19033,6 +19413,43 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 850500813} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &861005772 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 861005773} + m_Layer: 5 + m_Name: PlayerIndicator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &861005773 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 861005772} + 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: 1616235763} + - {fileID: 496804111} + m_Father: {fileID: 961268228} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &868134839 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4678135251219452000, guid: 9ae35d7f911b63f4f95f432141dd5746, @@ -20882,6 +21299,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 958326568} m_CullTransparentMesh: 0 +--- !u!1 &961268227 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 961268228} + m_Layer: 5 + m_Name: Indicators + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &961268228 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 961268227} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6711536, y: 0.67115295, z: 0.67115295} + m_Children: + - {fileID: 861005773} + - {fileID: 570091126} + m_Father: {fileID: 593026048} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &961958858 GameObject: m_ObjectHideFlags: 0 @@ -25707,6 +26161,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 494226835} m_Modifications: + - target: {fileID: 2956280660929543382, guid: db87c6b873833724cafe2f8940f45b52, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8467716388278459800, guid: db87c6b873833724cafe2f8940f45b52, type: 3} propertyPath: m_Text @@ -28097,6 +28556,26 @@ MonoBehaviour: sign: -1 drawCircle: 0 circle: {fileID: 2800000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3} +--- !u!1 &1272010364 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4678135252407299479, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + m_PrefabInstance: {fileID: 30126765} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1272010365 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272010364} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} + m_Name: + m_EditorClassIdentifier: + DefaultSprite: {fileID: 21300000, guid: b342f32a755f5ce4ba984c1fdb44394c, type: 3} + DistrictName: Arnough Primus --- !u!1 &1272903228 GameObject: m_ObjectHideFlags: 0 @@ -28696,6 +29175,79 @@ MonoBehaviour: sign: -1 drawCircle: 0 circle: {fileID: 2800000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3} +--- !u!1 &1298132658 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1298132659} + - component: {fileID: 1298132661} + - component: {fileID: 1298132660} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1298132659 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1298132658} + 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: 1367539068} + m_RootOrder: 0 + 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 &1298132660 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1298132658} + 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: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3} + 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 &1298132661 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1298132658} + m_CullTransparentMesh: 0 --- !u!1001 &1301173016 PrefabInstance: m_ObjectHideFlags: 0 @@ -29235,6 +29787,154 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1367539067 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1367539068} + - component: {fileID: 1367539070} + - component: {fileID: 1367539069} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1367539068 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1367539067} + 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: 1298132659} + - {fileID: 140950776} + m_Father: {fileID: 593026048} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1367539069 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1367539067} + 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: 0.084, g: 0.084, b: 0.084, a: 0.6509804} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c5c5d1f6b8fa0404ca44f3ea7c937909, type: 3} + 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 &1367539070 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1367539067} + m_CullTransparentMesh: 0 +--- !u!1 &1368323788 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1368323789} + - component: {fileID: 1368323791} + - component: {fileID: 1368323790} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1368323789 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368323788} + m_LocalRotation: {x: -0, y: -0, z: 0.23252034, w: 0.9725916} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: -1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 570091126} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 26.891} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1368323790 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368323788} + 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: 0.8, g: 0.25490198, b: 0.14509805, a: 0.62352943} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b9cbeaf1157e7bc4caaefe06915891b0, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0.355 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1368323791 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368323788} + m_CullTransparentMesh: 0 --- !u!1 &1384416288 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4678135251219452000, guid: 9ae35d7f911b63f4f95f432141dd5746, @@ -32691,6 +33391,79 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1613302958} m_PrefabAsset: {fileID: 0} +--- !u!1 &1616235762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1616235763} + - component: {fileID: 1616235765} + - component: {fileID: 1616235764} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1616235763 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1616235762} + m_LocalRotation: {x: -0, y: -0, z: -0.23251688, w: 0.97259235} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 861005773} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -26.891} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1616235764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1616235762} + 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: 0.8901961, b: 0.5686275, a: 0.62352943} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b9cbeaf1157e7bc4caaefe06915891b0, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0.221 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1616235765 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1616235762} + m_CullTransparentMesh: 0 --- !u!1001 &1617289542 PrefabInstance: m_ObjectHideFlags: 0 @@ -33327,7 +34100,8 @@ Transform: m_LocalRotation: {x: 0.35157326, y: 0.2294723, z: -0.0893232, w: 0.90319437} m_LocalPosition: {x: 7.07, y: 37.71, z: -37.04} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 663080993} m_Father: {fileID: 690382256} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 42.538002, y: 28.511002, z: 0} @@ -40349,7 +41123,9 @@ MonoBehaviour: scrollRegionSize: 100 cameraRotationSpeed: 200 cameraZoomSpeed: -40000 + cameraZoomTranslationSpeed: 1 cameraZoomSmooth: 1 + cameraTranslationSmooth: 1 minCameraAngle: 10 maxCameraAngle: 80 minCameraZoom: 500 @@ -40386,8 +41162,10 @@ MonoBehaviour: cameraTranslationSpeedMaxZoom: 3500 scrollRegionSize: 10 cameraRotationSpeed: 300 - cameraZoomSpeed: 200000 + cameraZoomSpeed: 300000 + cameraZoomTranslationSpeed: 1 cameraZoomSmooth: 0.03 + cameraTranslationSmooth: 0.03 minCameraAngle: 35 maxCameraAngle: 90 minCameraZoom: -5000 diff --git a/Assets/GWConquest/Scripts/District.cs b/Assets/GWConquest/Scripts/District.cs new file mode 100644 index 0000000..1ccd13d --- /dev/null +++ b/Assets/GWConquest/Scripts/District.cs @@ -0,0 +1,32 @@ +using UnityEngine; + +namespace GWConquest +{ + public class District : MonoBehaviour + { + public Sprite DefaultSprite; + public string DistrictName; + + private Zone zone; + private Planet planet; + + public void Initialize(Planet _planet) + { + planet = _planet; + zone = GetComponent(); + + } + + + public virtual Sprite GetCurrentSprite() + { + return DefaultSprite; + } + + public virtual string GetDistrictName() + { + return DistrictName; + } + + } +} \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/District.cs.meta b/Assets/GWConquest/Scripts/District.cs.meta new file mode 100644 index 0000000..b246a49 --- /dev/null +++ b/Assets/GWConquest/Scripts/District.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a89484993d239124eb667c8c33c633d3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/GWCamera.cs b/Assets/GWConquest/Scripts/GWCamera.cs index 8a8e692..467752f 100644 --- a/Assets/GWConquest/Scripts/GWCamera.cs +++ b/Assets/GWConquest/Scripts/GWCamera.cs @@ -16,7 +16,10 @@ namespace GWConquest public float cameraRotationSpeed = 1f; public float cameraZoomSpeed = 1f; + public float cameraZoomTranslationSpeed = 1f; + public float cameraZoomSmooth = 1f; + public float cameraTranslationSmooth = 1f; public float minCameraAngle; public float maxCameraAngle; @@ -27,9 +30,16 @@ namespace GWConquest private float cameraZoomTarget; private float cameraZoomVelocity = 0f; + private Vector3 transformPositionTarget; + private Vector3 transformPositionVelocity = Vector3.zero; + + private Plane cameraPlane; + private void Start() { cameraZoomTarget = cameraTransform.localPosition.z; + transformPositionTarget = transform.position; + cameraPlane = new Plane(Vector3.up, transform.position); } public Vector2 GetEdgeScroll() @@ -61,6 +71,21 @@ namespace GWConquest return new Vector2(horizontal, vertical); } + private Vector3 GetMousePositionTarget() + { + Vector3 mousePos = Input.mousePosition; + Ray mouseRay = Camera.main.ScreenPointToRay(mousePos); +#if UNITY_EDITOR + Debug.DrawRay(mouseRay.origin, mouseRay.direction); +#endif + if (cameraPlane.Raycast(mouseRay, out float enter)) + { + return mouseRay.GetPoint(enter); + } + else return cameraTransform.position; + + } + private void Update() { float horizontalButtons = Input.GetAxis("Horizontal"); @@ -79,8 +104,8 @@ namespace GWConquest float zoomPercent = Mathf.InverseLerp(minCameraZoom, maxCameraZoom, cameraZoomTarget); float cameraTranslationSpeed = Mathf.Lerp(cameraTranslationSpeedMaxZoom, cameraTranslationSpeedMinZoom, zoomPercent); - transform.localPosition += vertical * cameraTranslationSpeed * Time.deltaTime * forward; - transform.localPosition += horizontal * cameraTranslationSpeed * Time.deltaTime * right; + transformPositionTarget += vertical * cameraTranslationSpeed * Time.deltaTime * forward; + transformPositionTarget += horizontal * cameraTranslationSpeed * Time.deltaTime * right; if (Input.GetButton("Middle Click")) { @@ -109,6 +134,9 @@ namespace GWConquest } else { + /* + Vector3 pointedAtBegin = GetMousePositionTarget(); + cameraZoomTarget += middle * cameraZoomSpeed * Time.deltaTime; cameraZoomTarget = Mathf.Clamp(cameraZoomTarget, minCameraZoom, maxCameraZoom); @@ -117,6 +145,46 @@ namespace GWConquest cameraPos.z = Mathf.SmoothDamp(cameraPos.z, cameraZoomTarget, ref cameraZoomVelocity, cameraZoomSmooth); cameraTransform.localPosition = cameraPos; + + Vector3 pointedAtEnd = GetMousePositionTarget(); + + transform.position -= (pointedAtEnd - pointedAtBegin) * cameraZoomTranslationSpeed; + + Debug.LogFormat("Begin: {0}; End: {1}; Difference: {2}; Afterwards: {3}", pointedAtBegin, pointedAtEnd, pointedAtEnd - pointedAtBegin, GetMousePositionTarget()); + Debug.DrawLine(pointedAtBegin, pointedAtEnd, Color.magenta); + */ + + if(middle != 0) + { + Vector3 pointedAt = GetMousePositionTarget(); + float zoomDelta = cameraZoomSpeed * middle * Time.deltaTime; + Vector3 newCameraPosition = Vector3.MoveTowards(cameraTransform.position, pointedAt, zoomDelta); + + Ray newCameraRay = new Ray(newCameraPosition, cameraTransform.forward); + if (cameraPlane.Raycast(newCameraRay, out float enter)) + { + Vector3 newTransformPos = newCameraRay.GetPoint(enter); + //transformPositionTarget += newTransformPos - transform.position; + transformPositionTarget = newTransformPos; + + Vector3 newCameraPosLocal = transform.InverseTransformPoint(newCameraPosition); + + Debug.LogFormat("New Camera Pos {0}, New Camera Pos Local {1}; New Transform Pos {2}", newCameraPosition, newCameraPosLocal, newTransformPos); + + cameraZoomTarget = newCameraPosLocal.z; + cameraZoomTarget = Mathf.Clamp(cameraZoomTarget, minCameraZoom, maxCameraZoom); + + } + } + + + Vector3 cameraPos = cameraTransform.localPosition; + + cameraPos.z = Mathf.SmoothDamp(cameraPos.z, cameraZoomTarget, ref cameraZoomVelocity, cameraZoomSmooth); + + cameraTransform.localPosition = cameraPos; + + transform.position = Vector3.SmoothDamp(transform.position, transformPositionTarget, ref transformPositionVelocity, cameraTranslationSmooth); } } diff --git a/Assets/GWConquest/Scripts/Planet.cs b/Assets/GWConquest/Scripts/Planet.cs index 58f8884..fbe2651 100644 --- a/Assets/GWConquest/Scripts/Planet.cs +++ b/Assets/GWConquest/Scripts/Planet.cs @@ -68,6 +68,7 @@ namespace GWConquest foreach (Zone zone in groundZones) { zone.planet = this; + zone.GetComponent()?.Initialize(this); } foreach (Zone zone in spaceZones) { diff --git a/Assets/GWConquest/Textures/Icons/ICON_Build_2.PNG b/Assets/GWConquest/Textures/Icons/ICON_Build_2.PNG index 3c4d60b..f1fdd48 100644 Binary files a/Assets/GWConquest/Textures/Icons/ICON_Build_2.PNG and b/Assets/GWConquest/Textures/Icons/ICON_Build_2.PNG differ