Browse Source

Planet View cont

bolt_update
laurids 4 years ago
parent
commit
e1625d5d07
16 changed files with 2677 additions and 31 deletions
  1. +863
    -0
      Assets/GWConquest/Animations/DistrictIcon.controller
  2. +8
    -0
      Assets/GWConquest/Animations/DistrictIcon.controller.meta
  3. +90
    -0
      Assets/GWConquest/Prefabs/DistrictConnectionLine.prefab
  4. +7
    -0
      Assets/GWConquest/Prefabs/DistrictConnectionLine.prefab.meta
  5. +78
    -3
      Assets/GWConquest/Prefabs/DistrictIcon.prefab
  6. +1440
    -6
      Assets/GWConquest/Scenes/GalaxyMap.unity
  7. +2
    -2
      Assets/GWConquest/Scripts/District.cs
  8. +10
    -0
      Assets/GWConquest/Scripts/DistrictConnection.cs
  9. +11
    -0
      Assets/GWConquest/Scripts/DistrictConnection.cs.meta
  10. +41
    -0
      Assets/GWConquest/Scripts/DistrictConnectionLine.cs
  11. +11
    -0
      Assets/GWConquest/Scripts/DistrictConnectionLine.cs.meta
  12. +5
    -0
      Assets/GWConquest/Scripts/DistrictIcon.cs
  13. +6
    -20
      Assets/GWConquest/Scripts/GalaxyMapUI.cs
  14. +72
    -0
      Assets/GWConquest/Scripts/PlanetViewUI.cs
  15. +22
    -0
      Assets/GWConquest/Scripts/StrengthIndicator.cs
  16. +11
    -0
      Assets/GWConquest/Scripts/StrengthIndicator.cs.meta

+ 863
- 0
Assets/GWConquest/Animations/DistrictIcon.controller View File

@ -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

+ 8
- 0
Assets/GWConquest/Animations/DistrictIcon.controller.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 49f5beb50efef37489c1682f9831f74f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

+ 90
- 0
Assets/GWConquest/Prefabs/DistrictConnectionLine.prefab View File

@ -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

+ 7
- 0
Assets/GWConquest/Prefabs/DistrictConnectionLine.prefab.meta View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: cd22368e741b22041b986598d8114879
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 78
- 3
Assets/GWConquest/Prefabs/DistrictIcon.prefab View File

@ -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:


+ 1440
- 6
Assets/GWConquest/Scenes/GalaxyMap.unity
File diff suppressed because it is too large
View File


+ 2
- 2
Assets/GWConquest/Scripts/District.cs View File

@ -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>();
Zone = GetComponent<Zone>();
}


+ 10
- 0
Assets/GWConquest/Scripts/DistrictConnection.cs View File

@ -0,0 +1,10 @@
using UnityEngine;
namespace GWConquest
{
public class DistrictConnection : MonoBehaviour
{
public District district1;
public District district2;
}
}

+ 11
- 0
Assets/GWConquest/Scripts/DistrictConnection.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 86cc84fa3c4888445a10b07e33132af1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

+ 41
- 0
Assets/GWConquest/Scripts/DistrictConnectionLine.cs View File

@ -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<RectTransform>();
}
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);
}
}
}
}

+ 11
- 0
Assets/GWConquest/Scripts/DistrictConnectionLine.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 4fdfc5555053df54c9d4ad680ed40c05
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

+ 5
- 0
Assets/GWConquest/Scripts/DistrictIcon.cs View File

@ -25,5 +25,10 @@ namespace GWConquest
iconImage.sprite = d.GetCurrentSprite();
nameText.text = d.GetDistrictName();
}
public void OnClicked()
{
FindObjectOfType<PlanetViewUI>().SelectDistrict(district);
}
}
}

+ 6
- 20
Assets/GWConquest/Scripts/GalaxyMapUI.cs View File

@ -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<Formation> 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);
}


+ 72
- 0
Assets/GWConquest/Scripts/PlanetViewUI.cs View File

@ -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<DistrictIcon> districtIcons = new List<DistrictIcon>();
private List<DistrictConnectionLine> districtConnectionLines = new List<DistrictConnectionLine>();
private District selectedDistrict = null;
public void SelectPlanet(Planet planet)
{
selectedPlanet = planet;
PlanetName.text = planet.planetName;
DestroyAllIcons();
District[] districts = planet.GetComponentsInChildren<District>();
@ -33,6 +52,20 @@ namespace GWConquest
districtIcons.Add(iconComp);
}
DistrictConnection[] districtConnections = planet.GetComponentsInChildren<DistrictConnection>();
foreach(DistrictConnection connection in districtConnections)
{
GameObject lineGO = Instantiate(DistrictConnectionPrefab);
lineGO.transform.SetParent(DistrictLines);
lineGO.transform.Reset();
DistrictConnectionLine lineComp = lineGO.GetComponent<DistrictConnectionLine>();
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<Formation> 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;
}
}
}

+ 22
- 0
Assets/GWConquest/Scripts/StrengthIndicator.cs View File

@ -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);
}
}
}
}

+ 11
- 0
Assets/GWConquest/Scripts/StrengthIndicator.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: ed8a41eef4e5235428560ec53be78423
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

Loading…
Cancel
Save