diff --git a/Assets/GWConquest/Animations/DistrictIcon.controller b/Assets/GWConquest/Animations/DistrictIcon.controller new file mode 100644 index 0000000..fd03175 --- /dev/null +++ b/Assets/GWConquest/Animations/DistrictIcon.controller @@ -0,0 +1,863 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-6771020040450316817 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Highlighted + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 5608144431746558282} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-3725002495861129689 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 7052444190363486090} + m_Position: {x: 100, y: 270, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6771020040450316817} + m_Position: {x: 235, y: 65, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2751878947128903844} + m_Position: {x: 270, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1017604588900411636} + m_Position: {x: 305, y: 195, z: 0} + - serializedVersion: 1 + m_State: {fileID: 81414940235101507} + m_Position: {x: 340, y: 260, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: 2316540140041611674} + - {fileID: 3385077814800701698} + - {fileID: 8453489062100436962} + - {fileID: 3793986767854351080} + - {fileID: 2439129749408971406} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 7052444190363486090} +--- !u!1102 &-2751878947128903844 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pressed + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 5608144431746558282} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!74 &-13246267757510984 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Normal + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DistrictIcon + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Normal + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Highlighted + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Pressed + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Selected + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Disabled + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -3725002495861129689} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &81414940235101507 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Disabled + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -13246267757510984} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!74 &180751215948831894 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pressed + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!1102 &1017604588900411636 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Selected + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 5608144431746558282} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &2316540140041611674 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Normal + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7052444190363486090} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!74 &2428138481164320195 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Disabled + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!1101 &2439129749408971406 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Disabled + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 81414940235101507} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &3385077814800701698 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Highlighted + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6771020040450316817} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &3793986767854351080 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Selected + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1017604588900411636} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!74 &4463935352298210102 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Selected + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!74 &5608144431746558282 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Highlighted + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1.07, y: 1.07, z: 1.07} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Background/Icon + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.4862745 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.319 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.319 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.319 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1294157189 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 2526845255 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 4215373228 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 2334886179 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.4862745 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.319 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.319 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.319 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.07 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: Background/Icon + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.07 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: Background/Icon + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.07 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: Background/Icon + classID: 224 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!1102 &7052444190363486090 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Normal + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -13246267757510984} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &8453489062100436962 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Pressed + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2751878947128903844} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/GWConquest/Animations/DistrictIcon.controller.meta b/Assets/GWConquest/Animations/DistrictIcon.controller.meta new file mode 100644 index 0000000..d76dfcc --- /dev/null +++ b/Assets/GWConquest/Animations/DistrictIcon.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 49f5beb50efef37489c1682f9831f74f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Prefabs/DistrictConnectionLine.prefab b/Assets/GWConquest/Prefabs/DistrictConnectionLine.prefab new file mode 100644 index 0000000..05974c0 --- /dev/null +++ b/Assets/GWConquest/Prefabs/DistrictConnectionLine.prefab @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &895776792660021375 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7372095165332806797} + - component: {fileID: 1376191342076806479} + - component: {fileID: 7358916830555785891} + - component: {fileID: 1881801967375900762} + m_Layer: 5 + m_Name: DistrictConnectionLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7372095165332806797 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 895776792660021375} + m_LocalRotation: {x: -0, y: -0, z: -0.14200705, w: 0.98986566} + m_LocalPosition: {x: 0, y: 0, z: 27.3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -16.328001} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 161.5, y: -51.3} + m_SizeDelta: {x: 302.68, y: 2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1376191342076806479 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 895776792660021375} + m_CullTransparentMesh: 0 +--- !u!114 &7358916830555785891 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 895776792660021375} + 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.78039217} + m_RaycastTarget: 1 + 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!114 &1881801967375900762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 895776792660021375} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4fdfc5555053df54c9d4ad680ed40c05, type: 3} + m_Name: + m_EditorClassIdentifier: + endDistance: 32.2 diff --git a/Assets/GWConquest/Prefabs/DistrictConnectionLine.prefab.meta b/Assets/GWConquest/Prefabs/DistrictConnectionLine.prefab.meta new file mode 100644 index 0000000..0dba172 --- /dev/null +++ b/Assets/GWConquest/Prefabs/DistrictConnectionLine.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cd22368e741b22041b986598d8114879 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Prefabs/DistrictIcon.prefab b/Assets/GWConquest/Prefabs/DistrictIcon.prefab index 5f5474c..2aadf13 100644 --- a/Assets/GWConquest/Prefabs/DistrictIcon.prefab +++ b/Assets/GWConquest/Prefabs/DistrictIcon.prefab @@ -230,7 +230,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.084, g: 0.084, b: 0.084, a: 0.6509804} + m_Color: {r: 0.08235294, g: 0.08235294, b: 0.08235294, a: 0.72156864} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -379,7 +379,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -516,6 +516,8 @@ GameObject: - component: {fileID: 2621911208907321623} - component: {fileID: 6530463141977457202} - component: {fileID: 1344012077935187005} + - component: {fileID: 2232505496370496088} + - component: {fileID: 2633643605963840149} m_Layer: 5 m_Name: DistrictIcon m_TagString: Untagged @@ -578,6 +580,79 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: target: {fileID: 0} +--- !u!114 &2232505496370496088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2621911208907323112} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 0.08235294, g: 0.08235294, b: 0.08235294, a: 0.72156864} + m_HighlightedColor: {r: 0.28100002, g: 0.28100002, b: 0.28100002, a: 0.5137255} + m_PressedColor: {r: 0.28235295, g: 0.28235295, b: 0.28235295, a: 0.5137255} + m_SelectedColor: {r: 0.28235295, g: 0.28235295, b: 0.28235295, a: 0.50980395} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2621911208064913514} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6530463141977457202} + m_MethodName: OnClicked + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!95 &2633643605963840149 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2621911208907323112} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 49f5beb50efef37489c1682f9831f74f, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &2621911208936950809 GameObject: m_ObjectHideFlags: 0 @@ -785,7 +860,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index 9f5a566..05da58f 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -1170,6 +1170,11 @@ PrefabInstance: propertyPath: m_Name value: Arnough objectReference: {fileID: 0} + - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: groundZones.Array.size + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: textPrefab @@ -1186,6 +1191,21 @@ PrefabInstance: propertyPath: planetCameraTransform value: objectReference: {fileID: 1647585765} + - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: groundZones.Array.data[2] + value: + objectReference: {fileID: 1414113708} + - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: groundZones.Array.data[3] + value: + objectReference: {fileID: 1810911858} + - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: groundZones.Array.data[4] + value: + objectReference: {fileID: 1968289578} - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId @@ -2289,6 +2309,136 @@ Transform: type: 3} m_PrefabInstance: {fileID: 59659792} m_PrefabAsset: {fileID: 0} +--- !u!1001 &59851045 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 244030531} + m_Modifications: + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 318 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -93 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2621911208907323112, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_Name + value: DistrictIcon (1) + objectReference: {fileID: 0} + - target: {fileID: 2621911208907323112, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c61da061c0f60b640b9e0373c07be48b, type: 3} +--- !u!224 &59851046 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2621911208907321623, guid: c61da061c0f60b640b9e0373c07be48b, + type: 3} + m_PrefabInstance: {fileID: 59851045} + m_PrefabAsset: {fileID: 0} --- !u!1 &63257405 GameObject: m_ObjectHideFlags: 0 @@ -5259,6 +5409,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 244030531} + - component: {fileID: 244030532} m_Layer: 5 m_Name: DistrictIcons m_TagString: Untagged @@ -5278,14 +5429,24 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 593026048} + - {fileID: 59851046} + - {fileID: 1546794982489047014} m_Father: {fileID: 765894939} - m_RootOrder: 0 + 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!222 &244030532 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 244030530} + m_CullTransparentMesh: 0 --- !u!1 &252441371 GameObject: m_ObjectHideFlags: 0 @@ -10015,6 +10176,51 @@ Transform: type: 3} m_PrefabInstance: {fileID: 422668724} m_PrefabAsset: {fileID: 0} +--- !u!1 &423372397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 423372398} + - component: {fileID: 423372399} + m_Layer: 0 + m_Name: Connection1 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &423372398 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 423372397} + 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: 30126766} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &423372399 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 423372397} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86cc84fa3c4888445a10b07e33132af1, type: 3} + m_Name: + m_EditorClassIdentifier: + district1: {fileID: 1968289577} + district2: {fileID: 1414113707} --- !u!1 &423864850 GameObject: m_ObjectHideFlags: 0 @@ -10873,6 +11079,131 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 464768632} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &474573957 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 756433304} + m_Modifications: + - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Name + value: GuiPanel + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 58.31 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_SizeDelta.x + value: 224 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_SizeDelta.y + value: 32.358215 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} +--- !u!224 &474573958 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + m_PrefabInstance: {fileID: 474573957} + m_PrefabAsset: {fileID: 0} --- !u!1001 &492395478 PrefabInstance: m_ObjectHideFlags: 0 @@ -11755,6 +12086,41 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &507041173 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 507041174} + m_Layer: 5 + m_Name: DistrictLines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &507041174 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 507041173} + 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: 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!1001 &509110625 PrefabInstance: m_ObjectHideFlags: 0 @@ -12778,6 +13144,80 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 542594601} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &547769827 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 547769828} + - component: {fileID: 547769830} + - component: {fileID: 547769829} + m_Layer: 5 + m_Name: StrengthBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &547769828 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 547769827} + 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: 1226057221} + 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: -9, y: -8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &547769829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 547769827} + 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.88911766, b: 0.565, a: 0.69803923} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4f60816dba9022e4e92cfd7cc0983e44, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 0.73333335 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2.8 +--- !u!222 &547769830 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 547769827} + m_CullTransparentMesh: 0 --- !u!1001 &558920018 PrefabInstance: m_ObjectHideFlags: 0 @@ -14747,11 +15187,9 @@ MonoBehaviour: PlanetNameText: {fileID: 817441368} PlayerFleetPanel: {fileID: 1002982021} EnemyFleetPanel: {fileID: 18126404} - PlayerStrengthBar: {fileID: 2088730627} - EnemyStrengthBar: {fileID: 337027206} - StrengthBarParts: 15 - MaxFormationStrength: 100 PlanetSelection: {fileID: 1798411514} + PlayerIndicator: {fileID: 1847976303} + EnemyIndicator: {fileID: 1983076281} --- !u!1 &663080992 GameObject: m_ObjectHideFlags: 0 @@ -16126,6 +16564,86 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &701605849 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 701605850} + - component: {fileID: 701605852} + - component: {fileID: 701605851} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &701605850 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 701605849} + 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: 474573958} + 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 &701605851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 701605849} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.936, g: 0.936, b: 0.936, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} + m_FontSize: 18 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Ground + +' +--- !u!222 &701605852 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 701605849} + m_CullTransparentMesh: 0 --- !u!1001 &701680359 PrefabInstance: m_ObjectHideFlags: 0 @@ -17648,6 +18166,44 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &756433303 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 756433304} + m_Layer: 5 + m_Name: GroundStrength + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &756433304 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 756433303} + 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: 474573958} + - {fileID: 1226057221} + - {fileID: 1673798272} + m_Father: {fileID: 765894939} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -320, y: 0} + m_SizeDelta: {x: 303.43262, y: 100} + m_Pivot: {x: 0.5, y: 0} --- !u!1001 &762952354 PrefabInstance: m_ObjectHideFlags: 0 @@ -17781,7 +18337,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 507041174} - {fileID: 244030531} + - {fileID: 1981011822} + - {fileID: 756433304} m_Father: {fileID: 494226835} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -17803,8 +18362,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: DistrictIcons: {fileID: 244030531} + DistrictLines: {fileID: 507041174} DistrictIconPrefab: {fileID: 2621911208907323112, guid: c61da061c0f60b640b9e0373c07be48b, type: 3} + DistrictConnectionPrefab: {fileID: 895776792660021375, guid: cd22368e741b22041b986598d8114879, + type: 3} + PlanetName: {fileID: 1981011823} + GroundPlayerIndicator: {fileID: 1226057225} + GroundEnemyIndicator: {fileID: 1673798277} + SpacePlayerIndicator: {fileID: 0} + SpaceEnemyIndicator: {fileID: 0} + GroundDistrictName: {fileID: 701605851} + SpaceDistrictName: {fileID: 0} --- !u!1001 &766573527 PrefabInstance: m_ObjectHideFlags: 0 @@ -27254,6 +27823,233 @@ MonoBehaviour: sign: -1 drawCircle: 0 circle: {fileID: 2800000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3} +--- !u!1001 &1226057220 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 756433304} + m_Modifications: + - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Name + value: PlayerStrengthBarPanel + objectReference: {fileID: 0} + - target: {fileID: 6066937026882375993, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6066937026882375993, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6066937026882375993, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -57 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_SizeDelta.x + value: 110 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} +--- !u!224 &1226057221 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + m_PrefabInstance: {fileID: 1226057220} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1226057222 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + m_PrefabInstance: {fileID: 1226057220} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1226057223 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6066937026882375993, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + m_PrefabInstance: {fileID: 1226057220} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1226057222} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1226057224 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1226057222} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0, g: 0, b: 0, a: 1} + m_HighlightedColor: {r: 0.07, g: 0.07, b: 0.07, a: 1} + m_PressedColor: {r: 0.07058824, g: 0.07058824, b: 0.07058824, a: 1} + m_SelectedColor: {r: 0.07058824, g: 0.07058824, b: 0.07058824, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1226057223} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 657809898} + m_MethodName: ShowPlayerFleetPanel + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1226057225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1226057222} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed8a41eef4e5235428560ec53be78423, type: 3} + m_Name: + m_EditorClassIdentifier: + StrengthBar: {fileID: 547769829} + MaxFillAmount: 15 + MaxFormationStrength: 100 --- !u!1001 &1226771019 PrefabInstance: m_ObjectHideFlags: 0 @@ -27997,6 +28793,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1255143426} m_CullTransparentMesh: 0 +--- !u!1 &1256852173 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1256852174} + - component: {fileID: 1256852176} + - component: {fileID: 1256852175} + m_Layer: 5 + m_Name: StrengthBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1256852174 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1256852173} + 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: 1673798272} + 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: -9, y: -8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1256852175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1256852173} + 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.69803923} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4f60816dba9022e4e92cfd7cc0983e44, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 0.4 + m_FillClockwise: 1 + m_FillOrigin: 1 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2.8 +--- !u!222 &1256852176 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1256852173} + m_CullTransparentMesh: 0 --- !u!1 &1266507291 GameObject: m_ObjectHideFlags: 0 @@ -29876,7 +30746,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1414113705} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -8.1, y: 13, z: -20.5} + m_LocalPosition: {x: -7.6, y: 15, z: -19.3} m_LocalScale: {x: 4, y: 4, z: 4} m_Children: [] m_Father: {fileID: 30126766} @@ -30549,6 +31419,51 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1470594799 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1470594800} + - component: {fileID: 1470594801} + m_Layer: 0 + m_Name: Connection1 (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1470594800 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1470594799} + 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: 30126766} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1470594801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1470594799} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86cc84fa3c4888445a10b07e33132af1, type: 3} + m_Name: + m_EditorClassIdentifier: + district1: {fileID: 1414113707} + district2: {fileID: 1810911857} --- !u!1001 &1477877796 PrefabInstance: m_ObjectHideFlags: 0 @@ -34050,6 +34965,229 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1673693761} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1673798271 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 756433304} + m_Modifications: + - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Name + value: EnemyStrengthBarPanel + objectReference: {fileID: 0} + - target: {fileID: 7264797158076383403, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_RaycastTarget + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 57 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_SizeDelta.x + value: 110 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} +--- !u!224 &1673798272 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + m_PrefabInstance: {fileID: 1673798271} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1673798273 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4108209800669813447, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + m_PrefabInstance: {fileID: 1673798271} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1673798274 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7264797158076383403, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + m_PrefabInstance: {fileID: 1673798271} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1673798273} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1673798275 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1673798273} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 0.7294118} + m_PressedColor: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1673798274} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 657809898} + m_MethodName: ShowEnemyFleetPanel + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &1673798276 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + m_PrefabInstance: {fileID: 1673798271} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1673798277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1673798276} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed8a41eef4e5235428560ec53be78423, type: 3} + m_Name: + m_EditorClassIdentifier: + StrengthBar: {fileID: 1256852175} + MaxFillAmount: 15 + MaxFormationStrength: 100 --- !u!1 &1679023902 GameObject: m_ObjectHideFlags: 0 @@ -37554,6 +38692,21 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &1847976303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1847976300} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed8a41eef4e5235428560ec53be78423, type: 3} + m_Name: + m_EditorClassIdentifier: + StrengthBar: {fileID: 2088730627} + MaxFillAmount: 15 + MaxFormationStrength: 100 --- !u!1 &1849002053 GameObject: m_ObjectHideFlags: 0 @@ -40490,6 +41643,152 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1978818102} m_CullTransparentMesh: 0 +--- !u!1 &1981011821 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1981011822} + - component: {fileID: 1981011824} + - component: {fileID: 1981011823} + m_Layer: 5 + m_Name: PlanetTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1981011822 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1981011821} + 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: 765894939} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -112} + m_SizeDelta: {x: 472.4707, y: 49.209793} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1981011823 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1981011821} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 92 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: ' + +' +--- !u!222 &1981011824 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1981011821} + m_CullTransparentMesh: 0 +--- !u!1 &1982393936 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1982393937} + - component: {fileID: 1982393938} + m_Layer: 0 + m_Name: Connection1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1982393937 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1982393936} + 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: 30126766} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1982393938 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1982393936} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86cc84fa3c4888445a10b07e33132af1, type: 3} + m_Name: + m_EditorClassIdentifier: + district1: {fileID: 1272010365} + district2: {fileID: 1968289577} +--- !u!1 &1983076280 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + m_PrefabInstance: {fileID: 3373509298190984195} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1983076281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1983076280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed8a41eef4e5235428560ec53be78423, type: 3} + m_Name: + m_EditorClassIdentifier: + StrengthBar: {fileID: 337027206} + MaxFillAmount: 15 + MaxFormationStrength: 100 --- !u!1001 &1985410691 PrefabInstance: m_ObjectHideFlags: 0 @@ -44106,6 +45405,141 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2140711667} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1546794982489047013 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 244030531} + m_Modifications: + - target: {fileID: 895776792660021375, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_Name + value: DistrictConnectionLine + objectReference: {fileID: 0} + - target: {fileID: 895776792660021375, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1881801967375900762, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: endDistance + value: 32.2 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_LocalPosition.z + value: 27.3 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.14200705 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.98986566 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -16.328001 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 161.5 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -51.3 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_SizeDelta.x + value: 302.68 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_SizeDelta.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cd22368e741b22041b986598d8114879, type: 3} +--- !u!224 &1546794982489047014 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7372095165332806797, guid: cd22368e741b22041b986598d8114879, + type: 3} + m_PrefabInstance: {fileID: 1546794982489047013} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2621911209398627607 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Scripts/District.cs b/Assets/GWConquest/Scripts/District.cs index 1ccd13d..cc3b4cc 100644 --- a/Assets/GWConquest/Scripts/District.cs +++ b/Assets/GWConquest/Scripts/District.cs @@ -7,13 +7,13 @@ namespace GWConquest public Sprite DefaultSprite; public string DistrictName; - private Zone zone; + public Zone Zone { get; private set; } private Planet planet; public void Initialize(Planet _planet) { planet = _planet; - zone = GetComponent(); + Zone = GetComponent(); } diff --git a/Assets/GWConquest/Scripts/DistrictConnection.cs b/Assets/GWConquest/Scripts/DistrictConnection.cs new file mode 100644 index 0000000..bd371dc --- /dev/null +++ b/Assets/GWConquest/Scripts/DistrictConnection.cs @@ -0,0 +1,10 @@ +using UnityEngine; + +namespace GWConquest +{ + public class DistrictConnection : MonoBehaviour + { + public District district1; + public District district2; + } +} \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/DistrictConnection.cs.meta b/Assets/GWConquest/Scripts/DistrictConnection.cs.meta new file mode 100644 index 0000000..7689bdb --- /dev/null +++ b/Assets/GWConquest/Scripts/DistrictConnection.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 86cc84fa3c4888445a10b07e33132af1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/DistrictConnectionLine.cs b/Assets/GWConquest/Scripts/DistrictConnectionLine.cs new file mode 100644 index 0000000..6a5e407 --- /dev/null +++ b/Assets/GWConquest/Scripts/DistrictConnectionLine.cs @@ -0,0 +1,41 @@ +using UnityEngine; + +namespace GWConquest +{ + public class DistrictConnectionLine : MonoBehaviour + { + [System.NonSerialized] + public DistrictConnection connection; + + public float endDistance; + + private RectTransform rt; + + private void Start() + { + rt = GetComponent(); + } + + private void Update() + { + if(connection != null) + { + Camera cam = Camera.main; + + Vector3 pos1 = RectTransformUtility.WorldToScreenPoint(cam, connection.district1.transform.position); + Vector3 pos2 = RectTransformUtility.WorldToScreenPoint(cam, connection.district2.transform.position); + + pos1 += (pos2 - pos1).normalized * endDistance; + pos2 += (pos1 - pos2).normalized * endDistance; + + Vector3 diff = pos2 - pos1; + + rt.position = (pos1 + pos2) / 2f; + rt.sizeDelta = new Vector2(diff.magnitude, rt.sizeDelta.y); + rt.rotation = Quaternion.FromToRotation(Vector3.right, diff); + + } + } + } + +} \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/DistrictConnectionLine.cs.meta b/Assets/GWConquest/Scripts/DistrictConnectionLine.cs.meta new file mode 100644 index 0000000..b9c735d --- /dev/null +++ b/Assets/GWConquest/Scripts/DistrictConnectionLine.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4fdfc5555053df54c9d4ad680ed40c05 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/DistrictIcon.cs b/Assets/GWConquest/Scripts/DistrictIcon.cs index 170df63..3cebe4b 100644 --- a/Assets/GWConquest/Scripts/DistrictIcon.cs +++ b/Assets/GWConquest/Scripts/DistrictIcon.cs @@ -25,5 +25,10 @@ namespace GWConquest iconImage.sprite = d.GetCurrentSprite(); nameText.text = d.GetDistrictName(); } + + public void OnClicked() + { + FindObjectOfType().SelectDistrict(district); + } } } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/GalaxyMapUI.cs b/Assets/GWConquest/Scripts/GalaxyMapUI.cs index 3668a18..d623c9a 100644 --- a/Assets/GWConquest/Scripts/GalaxyMapUI.cs +++ b/Assets/GWConquest/Scripts/GalaxyMapUI.cs @@ -12,16 +12,13 @@ namespace GWConquest public GameObject PlayerFleetPanel; public GameObject EnemyFleetPanel; - public Image PlayerStrengthBar; - public Image EnemyStrengthBar; - - public float StrengthBarParts; - public float MaxFormationStrength; - public GameObject PlanetSelection; private Planet SelectedPlanet; + public StrengthIndicator PlayerIndicator; + public StrengthIndicator EnemyIndicator; + public void SelectPlanet(Planet planet) { if(planet != SelectedPlanet) @@ -124,22 +121,11 @@ namespace GWConquest IEnumerable formations = SelectedPlanet.GetAllFormations(ZoneType.Space); float playerStrength = formations.Sum(f => f.Player == Player.CurrentPlayer ? f.GetFormationStrength() : 0f); float enemyStrength = formations.Sum(f => f.Player != Player.CurrentPlayer ? f.GetFormationStrength() : 0f); - - playerStrength *= Mathf.Clamp01(StrengthBarParts / MaxFormationStrength); - enemyStrength *= Mathf.Clamp01(StrengthBarParts / MaxFormationStrength); - - PlayerStrengthBar.fillAmount = Mathf.Ceil(playerStrength) / StrengthBarParts; - EnemyStrengthBar.fillAmount = Mathf.Ceil(enemyStrength) / StrengthBarParts; - - PlayerStrengthBar.color.UpdateColorRGB(Player.CurrentPlayer.Color); - Player EnemyPlayer = formations.FirstOrDefault(f => f.Player != Player.CurrentPlayer)?.Player; - if(EnemyPlayer != null) - { - EnemyStrengthBar.color.UpdateColorRGB(EnemyPlayer.Color); - } - + + PlayerIndicator.UpdateWithBars(playerStrength, Player.CurrentPlayer.Color); + EnemyIndicator.UpdateWithBars(enemyStrength, EnemyPlayer?.Color); } diff --git a/Assets/GWConquest/Scripts/PlanetViewUI.cs b/Assets/GWConquest/Scripts/PlanetViewUI.cs index 86697f8..148e566 100644 --- a/Assets/GWConquest/Scripts/PlanetViewUI.cs +++ b/Assets/GWConquest/Scripts/PlanetViewUI.cs @@ -1,20 +1,39 @@ using System.Collections.Generic; +using System.Linq; using UnityEngine; +using UnityEngine.UI; namespace GWConquest { public class PlanetViewUI : MonoBehaviour { public Transform DistrictIcons; + public Transform DistrictLines; public GameObject DistrictIconPrefab; + public GameObject DistrictConnectionPrefab; + + public Text PlanetName; + + public StrengthIndicator GroundPlayerIndicator; + public StrengthIndicator GroundEnemyIndicator; + public StrengthIndicator SpacePlayerIndicator; + public StrengthIndicator SpaceEnemyIndicator; + + public Text GroundDistrictName; + public Text SpaceDistrictName; private Planet selectedPlanet; private List districtIcons = new List(); + private List districtConnectionLines = new List(); + + private District selectedDistrict = null; public void SelectPlanet(Planet planet) { selectedPlanet = planet; + PlanetName.text = planet.planetName; + DestroyAllIcons(); District[] districts = planet.GetComponentsInChildren(); @@ -33,6 +52,20 @@ namespace GWConquest districtIcons.Add(iconComp); } + + DistrictConnection[] districtConnections = planet.GetComponentsInChildren(); + + foreach(DistrictConnection connection in districtConnections) + { + GameObject lineGO = Instantiate(DistrictConnectionPrefab); + lineGO.transform.SetParent(DistrictLines); + lineGO.transform.Reset(); + + DistrictConnectionLine lineComp = lineGO.GetComponent(); + lineComp.connection = connection; + + districtConnectionLines.Add(lineComp); + } } private void DestroyAllIcons() @@ -42,6 +75,45 @@ namespace GWConquest Destroy(icon.gameObject); } districtIcons.Clear(); + + foreach (DistrictConnectionLine line in districtConnectionLines) + { + Destroy(line.gameObject); + } + districtConnectionLines.Clear(); + } + + private void FixedUpdate() + { + UpdateIndicator(); + } + + private void UpdateIndicator() + { + IEnumerable formations; + if(selectedDistrict == null) + { + formations = selectedPlanet.GetAllFormations(ZoneType.Ground); + GroundDistrictName.text = "Ground"; + } + else + { + formations = selectedDistrict.Zone.Formations; + GroundDistrictName.text = selectedDistrict.GetDistrictName(); + } + + float playerStrength = formations.Sum(f => f.Player == Player.CurrentPlayer ? f.GetFormationStrength() : 0f); + float enemyStrength = formations.Sum(f => f.Player != Player.CurrentPlayer ? f.GetFormationStrength() : 0f); + + Player EnemyPlayer = formations.FirstOrDefault(f => f.Player != Player.CurrentPlayer)?.Player; + + GroundPlayerIndicator.UpdateWithBars(playerStrength, Player.CurrentPlayer.Color); + GroundEnemyIndicator.UpdateWithBars(enemyStrength, EnemyPlayer?.Color); + } + + public void SelectDistrict(District district) + { + selectedDistrict = district; } } } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/StrengthIndicator.cs b/Assets/GWConquest/Scripts/StrengthIndicator.cs new file mode 100644 index 0000000..04205aa --- /dev/null +++ b/Assets/GWConquest/Scripts/StrengthIndicator.cs @@ -0,0 +1,22 @@ +using UnityEngine; +using UnityEngine.UI; + +namespace GWConquest +{ + public class StrengthIndicator : MonoBehaviour + { + public Image StrengthBar; + public float MaxFillAmount; + public float MaxFormationStrength; + + public void UpdateWithBars(float strength, Color? color = null) + { + float s = strength * Mathf.Clamp01(MaxFillAmount / MaxFormationStrength); + StrengthBar.fillAmount = Mathf.Ceil(s) / MaxFillAmount; + if(color.HasValue) + { + StrengthBar.color.UpdateColorRGB(color.Value); + } + } + } +} \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/StrengthIndicator.cs.meta b/Assets/GWConquest/Scripts/StrengthIndicator.cs.meta new file mode 100644 index 0000000..432ba91 --- /dev/null +++ b/Assets/GWConquest/Scripts/StrengthIndicator.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ed8a41eef4e5235428560ec53be78423 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: