diff --git a/Assets/GWConquest/Animations/FlankUI.controller b/Assets/GWConquest/Animations/FlankUI.controller new file mode 100644 index 0000000..c99dd15 --- /dev/null +++ b/Assets/GWConquest/Animations/FlankUI.controller @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-6316627635445349659 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FlankUIWarn + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 8632905833260215270} + 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: 7400000, guid: 14df00903f0646c4ca6ac61b421eaff2, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-762168046639925653 +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: -6316627635445349659} + m_Position: {x: 300, y: -10, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8483164342888772197} + m_Position: {x: 290, y: 140, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + 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: 8483164342888772197} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FlankUI + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Warn + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -762168046639925653} + 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!1101 &5108678012642016421 +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: Warn + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6316627635445349659} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &8483164342888772197 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5108678012642016421} + 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: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &8632905833260215270 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Warn + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8483164342888772197} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/GWConquest/Animations/FlankUI.controller.meta b/Assets/GWConquest/Animations/FlankUI.controller.meta new file mode 100644 index 0000000..5375dc5 --- /dev/null +++ b/Assets/GWConquest/Animations/FlankUI.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b88e85c482d981e428c02e4c99a9e789 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Animations/FlankUIWarn.anim b/Assets/GWConquest/Animations/FlankUIWarn.anim new file mode 100644 index 0000000..efc15d8 --- /dev/null +++ b/Assets/GWConquest/Animations/FlankUIWarn.anim @@ -0,0 +1,197 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FlankUIWarn + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.7 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.5 + value: 0 + 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: WarnImage + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: WarnImage + classID: 1 + script: {fileID: 0} + 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: 1739385690 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1739385690 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2.5 + 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 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.7 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.5 + value: 0 + 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: WarnImage + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: WarnImage + classID: 1 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/GWConquest/Animations/FlankUIWarn.anim.meta b/Assets/GWConquest/Animations/FlankUIWarn.anim.meta new file mode 100644 index 0000000..284848f --- /dev/null +++ b/Assets/GWConquest/Animations/FlankUIWarn.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 14df00903f0646c4ca6ac61b421eaff2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Prefabs/UI/BattleArmyGui.prefab b/Assets/GWConquest/Prefabs/UI/BattleArmyGui.prefab index 22f91ea..5c26777 100644 --- a/Assets/GWConquest/Prefabs/UI/BattleArmyGui.prefab +++ b/Assets/GWConquest/Prefabs/UI/BattleArmyGui.prefab @@ -208,7 +208,7 @@ MonoBehaviour: m_HandleRect: {fileID: 77748483005084366} m_Direction: 2 m_Value: 0 - m_Size: 0.744 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -463,7 +463,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 128} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 500} m_Pivot: {x: 0, y: 1} --- !u!114 &6722537226072243269 @@ -506,7 +506,7 @@ GameObject: - component: {fileID: 1573582120903919523} - component: {fileID: 7992423416263772881} m_Layer: 5 - m_Name: ArmyGui + m_Name: BattleArmyGui m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -553,6 +553,9 @@ MonoBehaviour: InfoPanel: {fileID: 3990196345620940346} Animator: {fileID: 7992423416263772881} BattleUI: {fileID: 0} + UnitOverviewTransform: {fileID: 0} + UnitOverviewPrefab: {fileID: 6815987390155653563, guid: cfeb7d67ef99a7a48950d76159c22b10, + type: 3} FormationUIList: [] --- !u!95 &7992423416263772881 Animator: diff --git a/Assets/GWConquest/Prefabs/UI/BattleFormationUI.prefab b/Assets/GWConquest/Prefabs/UI/BattleFormationUI.prefab index db33586..c4c0388 100644 --- a/Assets/GWConquest/Prefabs/UI/BattleFormationUI.prefab +++ b/Assets/GWConquest/Prefabs/UI/BattleFormationUI.prefab @@ -402,7 +402,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -12, y: -12} + m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1144358204157973416 CanvasRenderer: diff --git a/Assets/GWConquest/Prefabs/UI/BattleUnitIcon.prefab b/Assets/GWConquest/Prefabs/UI/BattleUnitIcon.prefab index bc93a20..c918016 100644 --- a/Assets/GWConquest/Prefabs/UI/BattleUnitIcon.prefab +++ b/Assets/GWConquest/Prefabs/UI/BattleUnitIcon.prefab @@ -537,7 +537,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1687732571317619598 RectTransform: m_ObjectHideFlags: 0 @@ -584,7 +584,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a13e4fd06023d8145befca57571b0a8a, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/GWConquest/Prefabs/UI/FlankUI.prefab b/Assets/GWConquest/Prefabs/UI/FlankUI.prefab index aecc289..cdfea59 100644 --- a/Assets/GWConquest/Prefabs/UI/FlankUI.prefab +++ b/Assets/GWConquest/Prefabs/UI/FlankUI.prefab @@ -10,6 +10,8 @@ GameObject: m_Component: - component: {fileID: 2893350996044003037} - component: {fileID: 3369366501850651800} + - component: {fileID: 8668185966868266328} + - component: {fileID: 3457511166033474778} m_Layer: 5 m_Name: FlankUI m_TagString: Untagged @@ -27,7 +29,10 @@ RectTransform: 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_Children: + - {fileID: 472968272626717507} + - {fileID: 3529282704362558771} + - {fileID: 335503723518179647} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -54,3 +59,260 @@ MonoBehaviour: Cols: 3 IconSize: 65 Icons: [] + LeftFrontline: {fileID: 6585815961174857102} + RightFrontline: {fileID: 7510832164935520711} + CanvasGroup: {fileID: 8668185966868266328} + DisabledAlpha: 0.25 +--- !u!225 &8668185966868266328 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4081925067141291286} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!95 &3457511166033474778 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4081925067141291286} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b88e85c482d981e428c02e4c99a9e789, 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 &6557863728900301975 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 335503723518179647} + - component: {fileID: 3451203698398677965} + - component: {fileID: 4727477161472114851} + m_Layer: 5 + m_Name: WarnImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &335503723518179647 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6557863728900301975} + 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: 2893350996044003037} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 150, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3451203698398677965 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6557863728900301975} + m_CullTransparentMesh: 0 +--- !u!114 &4727477161472114851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6557863728900301975} + 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.29803923, b: 0.29803923, a: 0.49019608} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 35b31f7b4112f8749b5f3f28093c7e3b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6585815961174857102 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 472968272626717507} + - component: {fileID: 2361316980752577659} + - component: {fileID: 8890018705248931018} + m_Layer: 5 + m_Name: LeftFrontline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &472968272626717507 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6585815961174857102} + 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: 0} + m_Children: [] + m_Father: {fileID: 2893350996044003037} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 12, y: -4} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &2361316980752577659 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6585815961174857102} + m_CullTransparentMesh: 0 +--- !u!114 &8890018705248931018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6585815961174857102} + 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.475, g: 0.475, b: 0.475, a: 0.9098039} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 14825355531a6db458fc1344cc89c33f, type: 3} + m_Type: 2 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2.32 +--- !u!1 &7510832164935520711 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3529282704362558771} + - component: {fileID: 560951851619819243} + - component: {fileID: 5711850360176843061} + m_Layer: 5 + m_Name: RightFrontline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3529282704362558771 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7510832164935520711} + 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: 2893350996044003037} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 12, y: -4} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &560951851619819243 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7510832164935520711} + m_CullTransparentMesh: 0 +--- !u!114 &5711850360176843061 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7510832164935520711} + 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.475, g: 0.475, b: 0.475, a: 0.9098039} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 14825355531a6db458fc1344cc89c33f, type: 3} + m_Type: 2 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2.32 diff --git a/Assets/GWConquest/Prefabs/UI/TransportUI/TransportUIElement.prefab b/Assets/GWConquest/Prefabs/UI/TransportUI/TransportUIElement.prefab index e00bf6c..83d734b 100644 --- a/Assets/GWConquest/Prefabs/UI/TransportUI/TransportUIElement.prefab +++ b/Assets/GWConquest/Prefabs/UI/TransportUI/TransportUIElement.prefab @@ -50,7 +50,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: padding: - m_Left: 47 + m_Left: 39 m_Right: 0 m_Top: 0 m_Bottom: 0 @@ -1111,7 +1111,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: padding: - m_Left: 47 + m_Left: 5 m_Right: 0 m_Top: 0 m_Bottom: 0 diff --git a/Assets/GWConquest/Prefabs/UI/UnitInfoPanel/InfoPanel.prefab b/Assets/GWConquest/Prefabs/UI/UnitInfoPanel/InfoPanel.prefab index f0a6204..1ca522d 100644 --- a/Assets/GWConquest/Prefabs/UI/UnitInfoPanel/InfoPanel.prefab +++ b/Assets/GWConquest/Prefabs/UI/UnitInfoPanel/InfoPanel.prefab @@ -97,6 +97,13 @@ MonoBehaviour: HealthBar: {fileID: 0} CooldownCircle: {fileID: 0} DeathCooldownCircle: {fileID: 0} + MovingImage: {fileID: 0} + StatusImage: {fileID: 0} + ArrivingSprite: {fileID: 0} + DepartingSprite: {fileID: 0} + HiddenSprite: {fileID: 0} + HiddenStatusSprite: {fileID: 0} + DemoralizedSprite: {fileID: 0} healthyColor: {r: 1, g: 1, b: 1, a: 0.8784314} mediumColor: {r: 1, g: 0.7411765, b: 0, a: 0.8784314} criticalColor: {r: 0.8980392, g: 0.15686275, b: 0.15686275, a: 0.8784314} @@ -285,6 +292,13 @@ MonoBehaviour: HealthBar: {fileID: 0} CooldownCircle: {fileID: 0} DeathCooldownCircle: {fileID: 0} + MovingImage: {fileID: 0} + StatusImage: {fileID: 0} + ArrivingSprite: {fileID: 0} + DepartingSprite: {fileID: 0} + HiddenSprite: {fileID: 0} + HiddenStatusSprite: {fileID: 0} + DemoralizedSprite: {fileID: 0} healthyColor: {r: 1, g: 1, b: 1, a: 0.8784314} mediumColor: {r: 1, g: 0.7411765, b: 0, a: 0.8784314} criticalColor: {r: 0.8980392, g: 0.15686275, b: 0.15686275, a: 0.8784314} @@ -907,6 +921,13 @@ MonoBehaviour: HealthBar: {fileID: 0} CooldownCircle: {fileID: 0} DeathCooldownCircle: {fileID: 0} + MovingImage: {fileID: 0} + StatusImage: {fileID: 0} + ArrivingSprite: {fileID: 0} + DepartingSprite: {fileID: 0} + HiddenSprite: {fileID: 0} + HiddenStatusSprite: {fileID: 0} + DemoralizedSprite: {fileID: 0} healthyColor: {r: 1, g: 1, b: 1, a: 0.8784314} mediumColor: {r: 1, g: 0.7411765, b: 0, a: 0.8784314} criticalColor: {r: 0.8980392, g: 0.15686275, b: 0.15686275, a: 0.8784314} @@ -3088,6 +3109,13 @@ MonoBehaviour: HealthBar: {fileID: 0} CooldownCircle: {fileID: 0} DeathCooldownCircle: {fileID: 0} + MovingImage: {fileID: 0} + StatusImage: {fileID: 0} + ArrivingSprite: {fileID: 0} + DepartingSprite: {fileID: 0} + HiddenSprite: {fileID: 0} + HiddenStatusSprite: {fileID: 0} + DemoralizedSprite: {fileID: 0} healthyColor: {r: 1, g: 1, b: 1, a: 0.8784314} mediumColor: {r: 1, g: 0.7411765, b: 0, a: 0.8784314} criticalColor: {r: 0.8980392, g: 0.15686275, b: 0.15686275, a: 0.8784314} @@ -6034,59 +6062,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2066680301 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7228160732243375218} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3a89474e48880e44f97abfc6ce7be3fe, type: 3} - m_Name: - m_EditorClassIdentifier: - UnitNameText: {fileID: 976787391} - HealthBar: {fileID: 487272288} - HealthBarText: {fileID: 645723849} - MoraleBar: {fileID: 674725064465506083} - MoraleBarText: {fileID: 7499795168198538339} - DescriptionText: {fileID: 135006939} - UnitObjects: {fileID: 4617211388595578265} - StatusIconsTransform: {fileID: 1815122357} - ValueIconsTransform: {fileID: 970845490} - ValueIconPrefab: {fileID: 7541130419680964748, guid: 12f3a6f1f9c4a274883c016ebe2c9065, - type: 3} - ArmourIcons: - - {fileID: 21300000, guid: 0b13dc47c66b6c047b03e6513329837e, type: 3} - - {fileID: 21300000, guid: 685672c57176a604a95274687c9ecfcc, type: 3} - - {fileID: 21300000, guid: 2bfef1999cd2b714fba492ffd49eb356, type: 3} - - {fileID: 21300000, guid: da1431e4cb9d6804b823138d89fde4aa, type: 3} - - {fileID: 21300000, guid: 297684482aee75f469757daac209c5ad, type: 3} - PenetrationIcons: - - {fileID: 21300000, guid: f62ed88bae1f639428ebfcddaca2c014, type: 3} - - {fileID: 21300000, guid: c91c72ec4cff3a64d9d1c49971beb264, type: 3} - - {fileID: 21300000, guid: 82bc7d230a0995f46999e2b660a8783b, type: 3} - - {fileID: 21300000, guid: dc0c84a296b0e314384831fe84f85b0e, type: 3} - - {fileID: 21300000, guid: b1c8856dce75f6247813e65f74deb16b, type: 3} - ButtonsTransform: {fileID: 1956104733} - ItemsGO: {fileID: 218688404} - EquipmentTransform: {fileID: 631756796} - EquipmentIconPrefab: {fileID: 8157905562050262843, guid: 9550621bc537afe458470cf7ec4e49d8, - type: 3} - InventoryTransform: {fileID: 2117193695} - ItemIconPrefab: {fileID: 6815987390155653563, guid: 06641392b6ebf5645b031c3f0700a917, - type: 3} - AbilitiesGO: {fileID: 1390411248} - AbilitiesTransform: {fileID: 2076331109} - AbilityIconPrefab: {fileID: 2472028539208066908, guid: 1a62b0361c965ac43bb89a11568fcfe4, - type: 3} - FormationObjects: {fileID: 135638608224023682} - FormationHeroImage: {fileID: 1231188988679905999} - FormationHeroName: {fileID: 3790361030781477297} - FormationUnitsTransform: {fileID: 1050217559578958967} - FormationUnitsPrefab: {fileID: 6815987390155653563, guid: a9ac5a15b3d5be741942da24cc7857c4, - type: 3} --- !u!1 &6391937544300042816 GameObject: m_ObjectHideFlags: 0 @@ -6274,6 +6249,59 @@ RectTransform: m_AnchoredPosition: {x: -0.36999512, y: -191} m_SizeDelta: {x: -20.73999, y: 20.299988} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2066680301 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7228160732243375218} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a89474e48880e44f97abfc6ce7be3fe, type: 3} + m_Name: + m_EditorClassIdentifier: + UnitNameText: {fileID: 976787391} + HealthBar: {fileID: 487272288} + HealthBarText: {fileID: 645723849} + MoraleBar: {fileID: 674725064465506083} + MoraleBarText: {fileID: 7499795168198538339} + DescriptionText: {fileID: 135006939} + UnitObjects: {fileID: 4617211388595578265} + StatusIconsTransform: {fileID: 1815122357} + ValueIconsTransform: {fileID: 970845490} + ValueIconPrefab: {fileID: 7541130419680964748, guid: 12f3a6f1f9c4a274883c016ebe2c9065, + type: 3} + ArmourIcons: + - {fileID: 21300000, guid: 0b13dc47c66b6c047b03e6513329837e, type: 3} + - {fileID: 21300000, guid: 685672c57176a604a95274687c9ecfcc, type: 3} + - {fileID: 21300000, guid: 2bfef1999cd2b714fba492ffd49eb356, type: 3} + - {fileID: 21300000, guid: da1431e4cb9d6804b823138d89fde4aa, type: 3} + - {fileID: 21300000, guid: 297684482aee75f469757daac209c5ad, type: 3} + PenetrationIcons: + - {fileID: 21300000, guid: f62ed88bae1f639428ebfcddaca2c014, type: 3} + - {fileID: 21300000, guid: c91c72ec4cff3a64d9d1c49971beb264, type: 3} + - {fileID: 21300000, guid: 82bc7d230a0995f46999e2b660a8783b, type: 3} + - {fileID: 21300000, guid: dc0c84a296b0e314384831fe84f85b0e, type: 3} + - {fileID: 21300000, guid: b1c8856dce75f6247813e65f74deb16b, type: 3} + ButtonsTransform: {fileID: 1956104733} + ItemsGO: {fileID: 218688404} + EquipmentTransform: {fileID: 631756796} + EquipmentIconPrefab: {fileID: 8157905562050262843, guid: 9550621bc537afe458470cf7ec4e49d8, + type: 3} + InventoryTransform: {fileID: 2117193695} + ItemIconPrefab: {fileID: 6815987390155653563, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + AbilitiesGO: {fileID: 1390411248} + AbilitiesTransform: {fileID: 2076331109} + AbilityIconPrefab: {fileID: 2472028539208066908, guid: 1a62b0361c965ac43bb89a11568fcfe4, + type: 3} + FormationObjects: {fileID: 135638608224023682} + FormationHeroImage: {fileID: 1231188988679905999} + FormationHeroName: {fileID: 3790361030781477297} + FormationUnitsTransform: {fileID: 1050217559578958967} + FormationUnitsPrefab: {fileID: 6815987390155653563, guid: cfeb7d67ef99a7a48950d76159c22b10, + type: 3} --- !u!1 &7442547893769427862 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Prefabs/UI/UnitInfoPanel/UnitTypeIcon.prefab b/Assets/GWConquest/Prefabs/UI/UnitInfoPanel/UnitTypeIcon.prefab new file mode 100644 index 0000000..bbd2710 --- /dev/null +++ b/Assets/GWConquest/Prefabs/UI/UnitInfoPanel/UnitTypeIcon.prefab @@ -0,0 +1,262 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6815987389502116021 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6815987389502116018} + - component: {fileID: 6815987389502116017} + - component: {fileID: 6815987389502116016} + - component: {fileID: 6815987389502116019} + m_Layer: 5 + m_Name: Count + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6815987389502116018 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987389502116021} + 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: 6815987390155653560} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 40, y: 0} + m_SizeDelta: {x: 0, y: 35} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &6815987389502116017 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987389502116021} + m_CullTransparentMesh: 0 +--- !u!114 &6815987389502116016 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987389502116021} + 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: 18 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: '0 + + +' +--- !u!114 &6815987389502116019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987389502116021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!1 &6815987390155653563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6815987390155653560} + - component: {fileID: 6815987390155653558} + - component: {fileID: 1138806303401438636} + - component: {fileID: 8959199155118246567} + m_Layer: 5 + m_Name: UnitTypeIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6815987390155653560 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987390155653563} + 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: 6815987390313110544} + - {fileID: 6815987389502116018} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6815987390155653558 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987390155653563} + m_CullTransparentMesh: 0 +--- !u!114 &1138806303401438636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987390155653563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68d57de996f29404f8d57bdeb85ab942, type: 3} + m_Name: + m_EditorClassIdentifier: + Padding: 0 + Horizontal: 1 + Vertical: 0 +--- !u!114 &8959199155118246567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987390155653563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bee0c27d9c15c144da3d2fc239016eb4, type: 3} + m_Name: + m_EditorClassIdentifier: + Icon: {fileID: 6815987390313110545} + Amount: {fileID: 6815987389502116016} + Sprites: + - unitType: 0 + sprite: {fileID: 21300000, guid: cc708d928febad94397bfe24811349f4, type: 3} + - unitType: 1 + sprite: {fileID: 21300000, guid: acca7ae6c6515984d8b560305530c3b4, type: 3} + - unitType: 2 + sprite: {fileID: 21300000, guid: 820fa8d48391bf446acdd95f448d145d, type: 3} + - unitType: 3 + sprite: {fileID: 21300000, guid: 81fb00a935363934d959d3a9d3dd397c, type: 3} + - unitType: 4 + sprite: {fileID: 21300000, guid: 5658653c78d96e84e9bb39f44e8c4dc8, type: 3} + - unitType: 8 + sprite: {fileID: 21300000, guid: 824f75208f545ec4c88df415d3cd2708, type: 3} +--- !u!1 &6815987390313110547 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6815987390313110544} + - component: {fileID: 6815987390313110542} + - component: {fileID: 6815987390313110545} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6815987390313110544 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987390313110547} + 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: 6815987390155653560} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &6815987390313110542 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987390313110547} + m_CullTransparentMesh: 0 +--- !u!114 &6815987390313110545 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987390313110547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_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 diff --git a/Assets/GWConquest/Prefabs/UI/UnitInfoPanel/UnitTypeIcon.prefab.meta b/Assets/GWConquest/Prefabs/UI/UnitInfoPanel/UnitTypeIcon.prefab.meta new file mode 100644 index 0000000..a1ceeed --- /dev/null +++ b/Assets/GWConquest/Prefabs/UI/UnitInfoPanel/UnitTypeIcon.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cfeb7d67ef99a7a48950d76159c22b10 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index cf2ea18..4f0ab04 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -8006,7 +8006,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &108234952 RectTransform: m_ObjectHideFlags: 0 @@ -8734,7 +8734,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -10555,7 +10555,7 @@ RectTransform: m_LocalScale: {x: -1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1996625630} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -16742,6 +16742,131 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 6773398751593558717} m_PrefabAsset: {fileID: 0} +--- !u!1001 &276424147 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1996625630} + m_Modifications: + - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Name + value: ConditionsPanel + 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} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_RootOrder + value: 6 + 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_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_SizeDelta.x + value: 600 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_SizeDelta.y + value: 90 + 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.w + value: 1 + 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_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 50 + 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} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} +--- !u!224 &276424148 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + m_PrefabInstance: {fileID: 276424147} + m_PrefabAsset: {fileID: 0} --- !u!1001 &276979825 PrefabInstance: m_ObjectHideFlags: 0 @@ -18938,8 +19063,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.8, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.75, y: 0} + m_SizeDelta: {x: -1.5, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &304071186 MonoBehaviour: @@ -26907,7 +27032,7 @@ MonoBehaviour: - {fileID: 1858919928} IsAI: 1 - FactionColor: {r: 0.5, g: 0.44076923, b: 0.2240566, a: 1} - FactionName: Zami + FactionName: Zami Technocracy ShortName: Zami FactionLogo: {fileID: 21300000, guid: 3c9efeaa1fe7b3b45bcf198c5dd559a9, type: 3} StartingPlanets: @@ -30219,6 +30344,80 @@ Transform: type: 3} m_PrefabInstance: {fileID: 461822466} m_PrefabAsset: {fileID: 0} +--- !u!1 &462812629 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 462812630} + - component: {fileID: 462812632} + - component: {fileID: 462812631} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &462812630 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 462812629} + 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: 276424148} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 54.5, y: -16.2} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &462812631 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 462812629} + 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.5294118, g: 0.5294118, b: 0.5294118, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 98e02aa62f7d55043af0d526377a6038, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &462812632 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 462812629} + m_CullTransparentMesh: 0 --- !u!1 &464768632 GameObject: m_ObjectHideFlags: 0 @@ -32301,7 +32500,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1996625630} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -35418,6 +35617,80 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} +--- !u!1 &558319356 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 558319357} + - component: {fileID: 558319359} + - component: {fileID: 558319358} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &558319357 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 558319356} + 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: 276424148} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 10.5, y: -16.2} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &558319358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 558319356} + 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.5294118, g: 0.5294118, b: 0.5294118, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 306404dbf0ebc104d904bc5e02a0a320, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &558319359 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 558319356} + m_CullTransparentMesh: 0 --- !u!1 &558733802 GameObject: m_ObjectHideFlags: 0 @@ -36289,11 +36562,11 @@ RectTransform: m_Father: {fileID: 111664030} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -10, y: -10.00116} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: -10} m_SizeDelta: {x: 93.125, y: 93.125} - m_Pivot: {x: 1, y: 1} + m_Pivot: {x: 0, y: 1} --- !u!114 &571739762 MonoBehaviour: m_ObjectHideFlags: 0 @@ -39415,8 +39688,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0.8, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.75, y: 0} + m_SizeDelta: {x: -1.5, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &644832079 MonoBehaviour: @@ -41264,6 +41537,80 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &669308400 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 669308401} + - component: {fileID: 669308403} + - component: {fileID: 669308402} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &669308401 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 669308400} + 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: 276424148} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -32.41, y: -16.2} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &669308402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 669308400} + 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.5283019, g: 0.5283019, b: 0.5283019, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e9baff83a6174f04db6e91a514cbdfed, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &669308403 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 669308400} + m_CullTransparentMesh: 0 --- !u!1 &669990211 GameObject: m_ObjectHideFlags: 0 @@ -45871,6 +46218,60 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &732541380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 732541381} + - component: {fileID: 732541382} + m_Layer: 5 + m_Name: UnitCategories + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &732541381 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 732541380} + 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: 111664030} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 10, y: 29.06} + m_SizeDelta: {x: -20.00769, y: 37.762558} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &732541382 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 732541380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 048208b8918c3c74c821e2e69e3d613d, type: 3} + m_Name: + m_EditorClassIdentifier: + padding: + m_Left: 10 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + Spacing: {x: 20, y: 0} --- !u!1001 &732721242 PrefabInstance: m_ObjectHideFlags: 0 @@ -53289,7 +53690,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_SizeDelta.y - value: -219.99994 + value: -314.99957 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -53334,7 +53735,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_AnchoredPosition.y - value: -59.99997 + value: -12.499756 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -59933,6 +60334,60 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 964397162} m_CullTransparentMesh: 0 +--- !u!1 &964435511 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 964435512} + - component: {fileID: 964435513} + m_Layer: 5 + m_Name: UnitCategories + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &964435512 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 964435511} + 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: 1984071956} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 10, y: 29.06} + m_SizeDelta: {x: -20.00769, y: 37.762558} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &964435513 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 964435511} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 048208b8918c3c74c821e2e69e3d613d, type: 3} + m_Name: + m_EditorClassIdentifier: + padding: + m_Left: 10 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + Spacing: {x: 20, y: 0} --- !u!1001 &967152677 PrefabInstance: m_ObjectHideFlags: 0 @@ -62966,6 +63421,11 @@ PrefabInstance: propertyPath: IsOwnPlayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 1573582120903919523, guid: f69b4b94559d7a14d99e0d870647c1f9, + type: 3} + propertyPath: UnitOverviewTransform + value: + objectReference: {fileID: 732541381} - target: {fileID: 1827644952844820914, guid: f69b4b94559d7a14d99e0d870647c1f9, type: 3} propertyPath: m_Pivot.x @@ -67380,6 +67840,84 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 44b11c855b2e28c4d97577d966e45236, type: 3} +--- !u!1 &1073837279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1073837280} + - component: {fileID: 1073837282} + - component: {fileID: 1073837281} + m_Layer: 5 + m_Name: OwnText (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1073837280 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1073837279} + 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: 276424148} + m_RootOrder: 1 + 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: -13.5} + m_SizeDelta: {x: 322.46326, y: 32.678925} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1073837281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1073837279} + 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: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 56 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Planetary Conditions +--- !u!222 &1073837282 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1073837279} + m_CullTransparentMesh: 0 --- !u!1001 &1076518780 PrefabInstance: m_ObjectHideFlags: 0 @@ -81048,6 +81586,84 @@ RectTransform: m_AnchoredPosition: {x: 68.7, y: -9.3} m_SizeDelta: {x: 455.79993, y: 39.15039} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1301264614 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1301264615} + - component: {fileID: 1301264617} + - component: {fileID: 1301264616} + m_Layer: 5 + m_Name: OwnText (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1301264615 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1301264614} + 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: 853420528} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.75, y: 0.5} + m_AnchorMax: {x: 0.75, y: 0.5} + m_AnchoredPosition: {x: 0, y: 368} + m_SizeDelta: {x: 322.46326, y: 48.029785} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1301264616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1301264614} + 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: 0.34901962} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 56 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Enemy Frontline +--- !u!222 &1301264617 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1301264614} + m_CullTransparentMesh: 0 --- !u!1 &1303392264 GameObject: m_ObjectHideFlags: 0 @@ -87430,8 +88046,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -58.031097} - m_SizeDelta: {x: -123.43201, y: 45.09503} + m_AnchoredPosition: {x: 112.94922, y: -58.03} + m_SizeDelta: {x: -122.95691, y: 45.09503} m_Pivot: {x: 0, y: 1} --- !u!114 &1347825781 MonoBehaviour: @@ -87459,7 +88075,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 56 - m_Alignment: 2 + m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -99915,7 +100531,7 @@ RectTransform: - {fileID: 1236526406} - {fileID: 1823284786} m_Father: {fileID: 1996625630} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -109051,8 +109667,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10.00116} - m_SizeDelta: {x: -123.43201, y: 48.02997} + m_AnchoredPosition: {x: 112.94922, y: -10} + m_SizeDelta: {x: -122.95691, y: 48.02997} m_Pivot: {x: 0, y: 1} --- !u!114 &1773549134 MonoBehaviour: @@ -109080,7 +109696,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 56 - m_Alignment: 2 + m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -126789,6 +127405,7 @@ RectTransform: - {fileID: 77748481770314008} - {fileID: 1003682759} - {fileID: 853420528} + - {fileID: 276424148} - {fileID: 120212469} - {fileID: 1606251655} - {fileID: 503773247} @@ -126882,7 +127499,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1996625630} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -128152,6 +128769,84 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} +--- !u!1 &2013485552 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2013485553} + - component: {fileID: 2013485555} + - component: {fileID: 2013485554} + m_Layer: 5 + m_Name: OwnText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2013485553 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013485552} + 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: 853420528} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.25, y: 0.5} + m_AnchorMax: {x: 0.25, y: 0.5} + m_AnchoredPosition: {x: 0, y: 368} + m_SizeDelta: {x: 322.46326, y: 48.029785} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &2013485554 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013485552} + 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: 0.34901962} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 56 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Allied Frontline +--- !u!222 &2013485555 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013485552} + m_CullTransparentMesh: 0 --- !u!1 &2013757098 GameObject: m_ObjectHideFlags: 0 @@ -135245,6 +135940,11 @@ PrefabInstance: propertyPath: BattleUI value: objectReference: {fileID: 1996625631} + - target: {fileID: 1573582120903919523, guid: f69b4b94559d7a14d99e0d870647c1f9, + type: 3} + propertyPath: UnitOverviewTransform + value: + objectReference: {fileID: 964435512} - target: {fileID: 1588243714770015000, guid: f69b4b94559d7a14d99e0d870647c1f9, type: 3} propertyPath: m_IsActive diff --git a/Assets/GWConquest/Scripts/Battle.cs b/Assets/GWConquest/Scripts/Battle.cs index 1966aa1..d48b761 100644 --- a/Assets/GWConquest/Scripts/Battle.cs +++ b/Assets/GWConquest/Scripts/Battle.cs @@ -613,6 +613,11 @@ namespace GWConquest flank.SetUnit(flankIndex, unit); unit.CurrentFlank = flank; + if(unit.RevealState == RevealState.FullHidden) + { + unit.RevealState = RevealState.ClassHidden; + } + //SetUIDirty(updatePositions: true); } } diff --git a/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs b/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs index 65fb3bd..401fd45 100644 --- a/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs +++ b/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs @@ -24,6 +24,12 @@ namespace GWConquest { get => BattleUI.Battle; } + public RectTransform UnitOverviewTransform; + public GameObject UnitOverviewPrefab; + + private List UnitTypeIconList = new List(); + + private float CurrentHeight = 0f; private Unit SelectedUnit; @@ -188,7 +194,20 @@ namespace GWConquest { foreach(var fui in FormationUIList) { fui.UpdateIcons(); - } + } + } + + void FixedUpdate() + { + var allUnits = GetBattleFormations().SelectMany(f => f.Units); + var unitTypeList = TransportUIUnitTypeIcon.SumUnitTypes(allUnits); + + GWLayout.UpdateGameObjects(UnitTypeIconList, unitTypeList, UnitOverviewPrefab, UnitOverviewTransform); + } + + void Update() + { + GWLayout.UpdateLayout(UnitOverviewTransform); } public void OnIconDragged(BattleUnitIcon icon, BattleUnitIcon target) diff --git a/Assets/GWConquest/Scripts/UI/BattleFlankUI.cs b/Assets/GWConquest/Scripts/UI/BattleFlankUI.cs index 067614f..9589bb8 100644 --- a/Assets/GWConquest/Scripts/UI/BattleFlankUI.cs +++ b/Assets/GWConquest/Scripts/UI/BattleFlankUI.cs @@ -1,5 +1,5 @@ using UnityEngine; -using UnityEngine.UI; +using System.Linq; namespace GWConquest { @@ -12,6 +12,11 @@ namespace GWConquest { public BattleUnitIcon[] Icons; + public GameObject LeftFrontline; + public GameObject RightFrontline; + public CanvasGroup CanvasGroup; + public float DisabledAlpha; + public RectTransform RectTransform { get => GetComponent(); } @@ -71,6 +76,14 @@ namespace GWConquest { } icon.UpdateIcon(); } + + bool hasUnits = BattleFlank.Units.Where(u => !u.IsDead).FirstOrDefault() != null; + var frontline = BattleFlank.Player == Player.CurrentPlayer ? RightFrontline : LeftFrontline; + frontline.SetActive(hasUnits); + CanvasGroup.alpha = hasUnits ? 1.0f : DisabledAlpha; + + bool shouldWarn = !hasUnits && BattleFlank.Player == Player.CurrentPlayer && BattleFlank.OpposingFlank.Units.Where(u => !u.IsDead).FirstOrDefault() != null; + GetComponent().SetBool("Warn", shouldWarn); } public void OnIconDraggedToPanel(BattleUnitIcon icon, BattleArmyPanel panel) diff --git a/Assets/GWConquest/Scripts/UI/BattleFormationUI.cs b/Assets/GWConquest/Scripts/UI/BattleFormationUI.cs index 26fb43b..d643335 100644 --- a/Assets/GWConquest/Scripts/UI/BattleFormationUI.cs +++ b/Assets/GWConquest/Scripts/UI/BattleFormationUI.cs @@ -96,6 +96,7 @@ namespace GWConquest { { LeaderIcon.Init(Formation.HeroUnit); FormationLeaderText.text = Formation.HeroUnit.Class.FullName; + FormationLeaderText.color = Util.UpdateColorRGB(FormationLeaderText.color, Formation.Player.Color); } else { LeaderIcon.Init(null); diff --git a/Assets/GWConquest/Scripts/UI/BattleUI.cs b/Assets/GWConquest/Scripts/UI/BattleUI.cs index 513a4aa..d19fbf8 100644 --- a/Assets/GWConquest/Scripts/UI/BattleUI.cs +++ b/Assets/GWConquest/Scripts/UI/BattleUI.cs @@ -244,10 +244,13 @@ namespace GWConquest { PlayerPanel.UpdateIcons(); EnemyPanel.UpdateIcons(); - foreach (var flankUI in FlankUIs) + if(!Battle.IsOver) { - flankUI.UpdateIcons(); - } + foreach (var flankUI in FlankUIs) + { + flankUI.UpdateIcons(); + } + } } private void Update() diff --git a/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs b/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs index da47de5..b3ab142 100644 --- a/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs +++ b/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs @@ -49,7 +49,20 @@ namespace GWConquest { public static int Compare(Unit a, Unit b) { - return System.Math.Sign((long)a.entity.NetworkId.PackedValue - (long)b.entity.NetworkId.PackedValue); + if(b.RevealState == RevealState.Visible && a.RevealState != RevealState.Visible) + { + return 1; + } + else if (b.RevealState != RevealState.Visible && a.RevealState == RevealState.Visible){ + return -1; + } + else if(a.Class != b.Class) + { + return string.Compare(a.Class.ShortName, b.Class.ShortName); + } + else { + return System.Math.Sign((long)a.entity.NetworkId.PackedValue - (long)b.entity.NetworkId.PackedValue); + } } private void Awake() { diff --git a/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs b/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs index 606c6fd..bfc2922 100644 --- a/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs +++ b/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs @@ -48,6 +48,12 @@ namespace GWConquest private Zone selectedZone = null; + void Start() + { + BattleUI.gameObject.SetActive(false); + TransportUI.gameObject.SetActive(false); + } + public void SelectPlanet(Planet planet) { selectedPlanet = planet; diff --git a/Assets/GWConquest/Scripts/UI/TransportUIUnitTypeIcon.cs b/Assets/GWConquest/Scripts/UI/TransportUIUnitTypeIcon.cs new file mode 100644 index 0000000..5974f02 --- /dev/null +++ b/Assets/GWConquest/Scripts/UI/TransportUIUnitTypeIcon.cs @@ -0,0 +1,76 @@ +using UnityEngine.UI; +using UnityEngine; +using System.Linq; +using System.Collections.Generic; + +namespace GWConquest { + + public class TransportUIUnitTypeIcon : MonoBehaviour, IUpdatable<(UnitType, int)> { + + public Image Icon; + public Text Amount; + + [System.Serializable] + public class UnitTypeIconEntry + { + public UnitType unitType; + public Sprite sprite; + } + + public UnitTypeIconEntry[] Sprites; + + + [System.NonSerialized] + private (UnitType, int) Stack; + + + public void UpdateDisplay((UnitType, int) stack) + { + Stack = stack; + + Icon.sprite = Sprites.Where(e => e.unitType == Stack.Item1).FirstOrDefault()?.sprite; + Amount.text = Stack.Item2.ToString(); + } + + public (UnitType, int) GetObject() + { + return Stack; + } + + public static List<(UnitType, int)> SumUnitTypes(IEnumerable units) + { + var formationUnits = new Dictionary(); + foreach(var u in units) + { + var cl = u.Class.UnitType; + if(!u.Class.IsHero && !u.IsDead) + { + if(u.Player != Player.CurrentPlayer) + { + if(u.RevealState == RevealState.FullHidden) + { + continue; + } + else if(u.RevealState == RevealState.ClassHidden) + { + cl = UnitType.Unknown; + } + } + if(formationUnits.ContainsKey(cl)) + { + formationUnits[cl]++; + } + else { + formationUnits[cl] = 1; + } + } + } + + var unitTypeList = formationUnits.Select(pair => (pair.Key, pair.Value)).ToList(); + unitTypeList.Sort((a,b) => a.Key.CompareTo(b.Key)); + + return unitTypeList; + } + + } +} \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/UI/TransportUIUnitTypeIcon.cs.meta b/Assets/GWConquest/Scripts/UI/TransportUIUnitTypeIcon.cs.meta new file mode 100644 index 0000000..15dcb31 --- /dev/null +++ b/Assets/GWConquest/Scripts/UI/TransportUIUnitTypeIcon.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bee0c27d9c15c144da3d2fc239016eb4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/UI/UnitInfoPanel.cs b/Assets/GWConquest/Scripts/UI/UnitInfoPanel.cs index 600f971..3c63c93 100644 --- a/Assets/GWConquest/Scripts/UI/UnitInfoPanel.cs +++ b/Assets/GWConquest/Scripts/UI/UnitInfoPanel.cs @@ -54,7 +54,7 @@ namespace GWConquest public RectTransform FormationUnitsTransform; public GameObject FormationUnitsPrefab; [System.NonSerialized] - public List FormationUnitsList = new List(); + public List FormationUnitsList = new List(); [System.NonSerialized] @@ -196,22 +196,7 @@ namespace GWConquest FormationHeroName.text = "No Leader"; } - var formationUnits = new Dictionary(); - foreach(var u in CurrentFormation.Units) - { - var cl = u.Class; - if(!cl.IsHero) - { - if(formationUnits.ContainsKey(cl)) - { - formationUnits[cl]++; - } - else { - formationUnits[cl] = 1; - } - } - } - var formationUnitList = formationUnits.Select(pair => (pair.Key, pair.Value)).ToList(); + var formationUnitList = TransportUIUnitTypeIcon.SumUnitTypes(CurrentFormation.Units); GWLayout.UpdateGameObjects(FormationUnitsList, formationUnitList, FormationUnitsPrefab, FormationUnitsTransform); } diff --git a/Assets/GWConquest/Scripts/UnitClass.cs b/Assets/GWConquest/Scripts/UnitClass.cs index 5672c3c..491d7ee 100644 --- a/Assets/GWConquest/Scripts/UnitClass.cs +++ b/Assets/GWConquest/Scripts/UnitClass.cs @@ -141,6 +141,9 @@ namespace GWConquest case "Squadron": unitClass.UnitType = UnitType.Squadron; break; + default: + unitClass.UnitType = UnitType.Unknown; + break; } @@ -382,7 +385,8 @@ namespace GWConquest Air, Hero, Ship, - Squadron + Squadron, + Unknown } public enum WeaponType diff --git a/Assets/GWConquest/Textures/Icons/AchtungPanza.png b/Assets/GWConquest/Textures/Icons/AchtungPanza.png new file mode 100644 index 0000000..27a7eb3 Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/AchtungPanza.png differ diff --git a/Assets/GWConquest/Textures/Icons/AchtungPanza.png.meta b/Assets/GWConquest/Textures/Icons/AchtungPanza.png.meta new file mode 100644 index 0000000..5dec31a --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/AchtungPanza.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 35b31f7b4112f8749b5f3f28093c7e3b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/x_warn.png b/Assets/GWConquest/Textures/Icons/x_warn.png new file mode 100644 index 0000000..de632b8 Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/x_warn.png differ diff --git a/Assets/GWConquest/Textures/Icons/x_warn.png.meta b/Assets/GWConquest/Textures/Icons/x_warn.png.meta new file mode 100644 index 0000000..f494f0e --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/x_warn.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: f62cef9ada630e64eb27addd8b552926 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/UI/frontline.png b/Assets/GWConquest/Textures/UI/frontline.png new file mode 100644 index 0000000..6516e02 Binary files /dev/null and b/Assets/GWConquest/Textures/UI/frontline.png differ diff --git a/Assets/GWConquest/Textures/UI/frontline.png.meta b/Assets/GWConquest/Textures/UI/frontline.png.meta new file mode 100644 index 0000000..fa4ef37 --- /dev/null +++ b/Assets/GWConquest/Textures/UI/frontline.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 14825355531a6db458fc1344cc89c33f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: