Browse Source

Galaxy UI Rework

master
laurids 3 years ago
parent
commit
07d3a79e39
39 changed files with 4462 additions and 477 deletions
  1. +145
    -1
      Assets/GWConquest/Animations/DistrictIconBattle.anim
  2. +25
    -7
      Assets/GWConquest/Animations/PlanetBattleAura.anim
  3. +516
    -1
      Assets/GWConquest/Prefabs/Planet.prefab
  4. +136
    -6
      Assets/GWConquest/Prefabs/UI/DistrictIcon.prefab
  5. +841
    -213
      Assets/GWConquest/Prefabs/UI/FleetIcon.prefab
  6. +300
    -10
      Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab
  7. +2
    -0
      Assets/GWConquest/Resources/PlanetConnection.prefab
  8. BIN
      Assets/GWConquest/Resources/UnitIcons/CaerBannoqRealmHunters.png
  9. +132
    -0
      Assets/GWConquest/Resources/UnitIcons/CaerBannoqRealmHunters.png.meta
  10. +0
    -0
      Assets/GWConquest/Resources/UnitIcons/ElysiaReconInfantry.png
  11. +0
    -0
      Assets/GWConquest/Resources/UnitIcons/ElysiaReconInfantry.png.meta
  12. BIN
      Assets/GWConquest/Resources/UnitIcons/SartoriusHeavyInfantry.png
  13. +132
    -0
      Assets/GWConquest/Resources/UnitIcons/SartoriusHeavyInfantry.png.meta
  14. BIN
      Assets/GWConquest/Resources/UnitIcons/SartoriusInfantry.png
  15. +1347
    -158
      Assets/GWConquest/Scenes/GalaxyMap.unity
  16. +23
    -0
      Assets/GWConquest/Scripts/Editor/ContextMenuHooks.cs
  17. +36
    -0
      Assets/GWConquest/Scripts/GWCamera.cs
  18. +6
    -0
      Assets/GWConquest/Scripts/GameManager.cs
  19. +44
    -6
      Assets/GWConquest/Scripts/Planet.cs
  20. +53
    -16
      Assets/GWConquest/Scripts/PlanetConnection.cs
  21. +1
    -0
      Assets/GWConquest/Scripts/PlanetPlacement.cs
  22. +61
    -32
      Assets/GWConquest/Scripts/PlanetScaling.cs
  23. +2
    -2
      Assets/GWConquest/Scripts/UI/FormationIcon.cs
  24. +1
    -2
      Assets/GWConquest/Scripts/UI/IngameUI.cs
  25. +40
    -21
      Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs
  26. +54
    -0
      Assets/GWConquest/Scripts/UI/UIZoomScaling.cs
  27. +11
    -0
      Assets/GWConquest/Scripts/UI/UIZoomScaling.cs.meta
  28. +28
    -0
      Assets/GWConquest/Scripts/ZoomSkyboxEffect.cs
  29. +11
    -0
      Assets/GWConquest/Scripts/ZoomSkyboxEffect.cs.meta
  30. BIN
      Assets/GWConquest/Textures/UI/Blackest Whole.png
  31. +132
    -0
      Assets/GWConquest/Textures/UI/Blackest Whole.png.meta
  32. +109
    -0
      Assets/GWConquest/Textures/UI/Materials/kreiswichs3 2.mat
  33. +8
    -0
      Assets/GWConquest/Textures/UI/Materials/kreiswichs3 2.mat.meta
  34. BIN
      Assets/GWConquest/Textures/UI/RAUTE FETT.png
  35. +132
    -0
      Assets/GWConquest/Textures/UI/RAUTE FETT.png.meta
  36. BIN
      Assets/GWConquest/Textures/UI/RAUTE.png
  37. +132
    -0
      Assets/GWConquest/Textures/UI/RAUTE.png.meta
  38. BIN
      Assets/GWConquest/Textures/UI/kreis3.png
  39. +2
    -2
      Assets/Starfield Skybox/Skybox.mat

+ 145
- 1
Assets/GWConquest/Animations/DistrictIconBattle.anim View File

@ -73,6 +73,71 @@ AnimationClip:
path: PlayerIndicatorMask/EnemyIndicatorMask/CircleMask/BattleAura
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.3
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.25
value: 0.3
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/BattleAura
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: Background/BattleAura
classID: 1
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@ -95,13 +160,27 @@ AnimationClip:
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3922344059
attribute: 304273561
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3922344059
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: 1.5
m_StopTime: 2.25
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@ -173,6 +252,71 @@ AnimationClip:
path: PlayerIndicatorMask/EnemyIndicatorMask/CircleMask/BattleAura
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.3
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.25
value: 0.3
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/BattleAura
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: Background/BattleAura
classID: 1
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0


+ 25
- 7
Assets/GWConquest/Animations/PlanetBattleAura.anim View File

@ -41,7 +41,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1
value: 0.5
inSlope: 0
outSlope: 0
tangentMode: 136
@ -50,7 +50,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 0.3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
@ -59,7 +59,16 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.25
value: 0.5
inSlope: 0
outSlope: 0
tangentMode: 136
@ -127,7 +136,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1.5
m_StopTime: 2.25
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@ -167,7 +176,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1
value: 0.5
inSlope: 0
outSlope: 0
tangentMode: 136
@ -176,7 +185,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 0.3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
@ -185,7 +194,16 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.25
value: 0.5
inSlope: 0
outSlope: 0
tangentMode: 136


+ 516
- 1
Assets/GWConquest/Prefabs/Planet.prefab View File

@ -1,5 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &36703679271264929
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2523886465982048557}
m_Layer: 10
m_Name: PlanetCircle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2523886465982048557
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 36703679271264929}
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: 9127401858082693168}
m_Father: {fileID: 4678135251219451999}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &653090530281819911
GameObject:
m_ObjectHideFlags: 0
@ -31,6 +62,174 @@ Transform:
m_Father: {fileID: 4678135251219451999}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: -330, z: 0}
--- !u!1 &3268448675433890451
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1572027918287746877}
- component: {fileID: 9063450203288621825}
m_Layer: 10
m_Name: InnerCircleLine
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1572027918287746877
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3268448675433890451}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
m_Children: []
m_Father: {fileID: 9127401858082693168}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!120 &9063450203288621825
LineRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3268448675433890451}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: 0.5, y: 0, z: -0}
- {x: 0.49384418, y: -0.000000009324221, z: -0.078217246}
- {x: 0.47552827, y: -0.000000018418849, z: -0.15450852}
- {x: 0.44550326, y: -0.000000027059944, z: -0.22699529}
- {x: 0.4045085, y: -0.00000003503473, z: -0.29389265}
- {x: 0.35355338, y: -0.000000042146848, z: -0.3535534}
- {x: 0.29389262, y: -0.00000004822117, z: -0.40450856}
- {x: 0.22699526, y: -0.000000053108128, z: -0.44550332}
- {x: 0.15450849, y: -0.000000056687387, z: -0.47552833}
- {x: 0.078217186, y: -0.000000058870814, z: -0.49384424}
- {x: -0.000000021855694, y: -0.000000059604645, z: -0.50000006}
- {x: -0.07821722, y: -0.000000058870814, z: -0.49384424}
- {x: -0.15450852, y: -0.000000056687384, z: -0.4755283}
- {x: -0.2269953, y: -0.000000053108124, z: -0.4455033}
- {x: -0.2938926, y: -0.00000004822117, z: -0.40450856}
- {x: -0.35355338, y: -0.000000042146848, z: -0.3535534}
- {x: -0.40450853, y: -0.000000035034727, z: -0.29389262}
- {x: -0.4455033, y: -0.000000027059935, z: -0.22699521}
- {x: -0.4755283, y: -0.000000018418836, z: -0.15450841}
- {x: -0.49384418, y: -0.00000000932422, z: -0.07821723}
- {x: -0.5, y: 5.2108035e-15, z: 0.000000043711392}
- {x: -0.49384415, y: 0.000000009324229, z: 0.07821731}
- {x: -0.47552827, y: 0.000000018418847, z: 0.1545085}
- {x: -0.44550326, y: 0.000000027059945, z: 0.2269953}
- {x: -0.40450847, y: 0.000000035034738, z: 0.2938927}
- {x: -0.35355332, y: 0.000000042146855, z: 0.35355347}
- {x: -0.29389253, y: 0.000000048221178, z: 0.40450862}
- {x: -0.22699511, y: 0.000000053108135, z: 0.44550338}
- {x: -0.15450855, y: 0.000000056687384, z: 0.4755283}
- {x: -0.07821726, y: 0.00000005887081, z: 0.4938442}
- {x: 0.0000000059624403, y: 0.000000059604645, z: 0.50000006}
- {x: 0.07821727, y: 0.00000005887081, z: 0.4938442}
- {x: 0.15450856, y: 0.000000056687384, z: 0.4755283}
- {x: 0.22699533, y: 0.00000005310812, z: 0.44550326}
- {x: 0.29389274, y: 0.00000004822116, z: 0.40450847}
- {x: 0.3535535, y: 0.000000042146834, z: 0.3535533}
- {x: 0.40450862, y: 0.000000035034713, z: 0.2938925}
- {x: 0.44550326, y: 0.000000027059944, z: 0.22699529}
- {x: 0.47552827, y: 0.000000018418845, z: 0.15450849}
- {x: 0.49384418, y: 0.000000009324214, z: 0.078217186}
m_Parameters:
serializedVersion: 3
widthMultiplier: 3
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
key0: {r: 0.03, g: 0.03, b: 0.03, a: 0.972549}
key1: {r: 0.03, g: 0.03, b: 0.03, a: 0.972549}
key2: {r: 0, g: 0, b: 0, a: 1}
key3: {r: 0, g: 0, b: 0, a: 0.003921569}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 29876
atime3: 65535
atime4: 65535
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 0
numCapVertices: 0
alignment: 0
textureMode: 0
shadowBias: 0.5
generateLightingData: 0
m_UseWorldSpace: 0
m_Loop: 1
--- !u!1 &4678135251219452000
GameObject:
m_ObjectHideFlags: 0
@ -65,6 +264,7 @@ Transform:
- {fileID: 4678135251355824056}
- {fileID: 7191419555384860655}
- {fileID: 841831665631638574}
- {fileID: 2523886465982048557}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -80,9 +280,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d32a8fe07c5601c4aafeb8c69edeff7c, type: 3}
m_Name:
m_EditorClassIdentifier:
NearScalingDistance: 550
NearScalingDistance: 0
FarScalingDistance: 550
FixPlanetSize: 1.12
CircleWidth: 0.0025
InnerCircleWidth: 0.001
CircleRenderer: {fileID: 5980546624515681467}
InnerCircleRenderer: {fileID: 9063450203288621825}
--- !u!114 &4678135251219452001
MonoBehaviour:
m_ObjectHideFlags: 0
@ -109,6 +313,10 @@ MonoBehaviour:
CameraRotatorTransform: {fileID: 7191419555384860655}
planetCameraTransform: {fileID: 3266501631720423375}
AdditionalObjects: {fileID: 0}
RefuseConnections: 0
CircleTransform: {fileID: 9127401858082693168}
CircleTransformDamp: 0.1
MaxCircleScale: 400
InTransitFormations: []
VisibilityStatus: 0
OriginalDesaturation: 0
@ -310,3 +518,310 @@ Transform:
m_Father: {fileID: 7191419555384860655}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 42.538002, y: 28.511002, z: 0}
--- !u!1 &6717268396553122152
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9127401858082693168}
- component: {fileID: 5980546624515681467}
m_Layer: 10
m_Name: CircleLine
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &9127401858082693168
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6717268396553122152}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 8866216275828915038}
- {fileID: 1572027918287746877}
m_Father: {fileID: 2523886465982048557}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!120 &5980546624515681467
LineRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6717268396553122152}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: 0.5, y: 0, z: -0}
- {x: 0.49845865, y: -0.0000000046765267, z: -0.039229553}
- {x: 0.49384418, y: -0.000000009324221, z: -0.078217246}
- {x: 0.48618495, y: -0.000000013914429, z: -0.1167227}
- {x: 0.47552827, y: -0.000000018418849, z: -0.15450852}
- {x: 0.46193975, y: -0.000000022809711, z: -0.19134176}
- {x: 0.44550326, y: -0.000000027059944, z: -0.22699529}
- {x: 0.42632008, y: -0.00000003114334, z: -0.2612493}
- {x: 0.4045085, y: -0.00000003503473, z: -0.29389265}
- {x: 0.38020298, y: -0.000000038710123, z: -0.32472408}
- {x: 0.35355338, y: -0.000000042146848, z: -0.3535534}
- {x: 0.32472402, y: -0.000000045323727, z: -0.38020304}
- {x: 0.29389262, y: -0.00000004822117, z: -0.40450856}
- {x: 0.26124924, y: -0.000000050821317, z: -0.42632017}
- {x: 0.22699526, y: -0.000000053108128, z: -0.44550332}
- {x: 0.19134171, y: -0.00000005506751, z: -0.4619398}
- {x: 0.15450849, y: -0.000000056687387, z: -0.47552833}
- {x: 0.11672265, y: -0.000000057957763, z: -0.486185}
- {x: 0.078217186, y: -0.000000058870814, z: -0.49384424}
- {x: 0.039229542, y: -0.000000059420902, z: -0.4984587}
- {x: -0.000000021855694, y: -0.000000059604645, z: -0.50000006}
- {x: -0.039229587, y: -0.000000059420902, z: -0.4984587}
- {x: -0.07821722, y: -0.000000058870814, z: -0.49384424}
- {x: -0.116722696, y: -0.000000057957763, z: -0.486185}
- {x: -0.15450852, y: -0.000000056687384, z: -0.4755283}
- {x: -0.19134176, y: -0.00000005506751, z: -0.4619398}
- {x: -0.2269953, y: -0.000000053108124, z: -0.4455033}
- {x: -0.26124933, y: -0.00000005082131, z: -0.4263201}
- {x: -0.2938926, y: -0.00000004822117, z: -0.40450856}
- {x: -0.32472402, y: -0.000000045323727, z: -0.38020304}
- {x: -0.35355338, y: -0.000000042146848, z: -0.3535534}
- {x: -0.380203, y: -0.00000003871012, z: -0.32472405}
- {x: -0.40450853, y: -0.000000035034727, z: -0.29389262}
- {x: -0.4263201, y: -0.000000031143337, z: -0.26124927}
- {x: -0.4455033, y: -0.000000027059935, z: -0.22699521}
- {x: -0.4619398, y: -0.0000000228097, z: -0.19134167}
- {x: -0.4755283, y: -0.000000018418836, z: -0.15450841}
- {x: -0.48618495, y: -0.000000013914429, z: -0.1167227}
- {x: -0.49384418, y: -0.00000000932422, z: -0.07821723}
- {x: -0.49845868, y: -0.000000004676523, z: -0.039229523}
- {x: -0.5, y: 5.2108035e-15, z: 0.000000043711392}
- {x: -0.49845865, y: 0.000000004676534, z: 0.039229613}
- {x: -0.49384415, y: 0.000000009324229, z: 0.07821731}
- {x: -0.48618492, y: 0.0000000139144385, z: 0.116722785}
- {x: -0.47552827, y: 0.000000018418847, z: 0.1545085}
- {x: -0.46193975, y: 0.00000002280971, z: 0.19134174}
- {x: -0.44550326, y: 0.000000027059945, z: 0.2269953}
- {x: -0.42632008, y: 0.000000031143344, z: 0.26124933}
- {x: -0.40450847, y: 0.000000035034738, z: 0.2938927}
- {x: -0.38020295, y: 0.000000038710127, z: 0.3247241}
- {x: -0.35355332, y: 0.000000042146855, z: 0.35355347}
- {x: -0.32472396, y: 0.000000045323734, z: 0.3802031}
- {x: -0.29389253, y: 0.000000048221178, z: 0.40450862}
- {x: -0.26124915, y: 0.000000050821324, z: 0.42632023}
- {x: -0.22699511, y: 0.000000053108135, z: 0.44550338}
- {x: -0.19134156, y: 0.00000005506752, z: 0.4619399}
- {x: -0.15450855, y: 0.000000056687384, z: 0.4755283}
- {x: -0.116722725, y: 0.000000057957763, z: 0.486185}
- {x: -0.07821726, y: 0.00000005887081, z: 0.4938442}
- {x: -0.039229557, y: 0.000000059420902, z: 0.4984587}
- {x: 0.0000000059624403, y: 0.000000059604645, z: 0.50000006}
- {x: 0.039229568, y: 0.000000059420902, z: 0.4984587}
- {x: 0.07821727, y: 0.00000005887081, z: 0.4938442}
- {x: 0.11672273, y: 0.000000057957763, z: 0.486185}
- {x: 0.15450856, y: 0.000000056687384, z: 0.4755283}
- {x: 0.1913418, y: 0.000000055067506, z: 0.46193978}
- {x: 0.22699533, y: 0.00000005310812, z: 0.44550326}
- {x: 0.2612494, y: 0.000000050821306, z: 0.42632008}
- {x: 0.29389274, y: 0.00000004822116, z: 0.40450847}
- {x: 0.32472414, y: 0.000000045323716, z: 0.38020295}
- {x: 0.3535535, y: 0.000000042146834, z: 0.3535533}
- {x: 0.3802031, y: 0.000000038710105, z: 0.32472393}
- {x: 0.40450862, y: 0.000000035034713, z: 0.2938925}
- {x: 0.42632008, y: 0.000000031143344, z: 0.26124933}
- {x: 0.44550326, y: 0.000000027059944, z: 0.22699529}
- {x: 0.46193978, y: 0.00000002280971, z: 0.19134174}
- {x: 0.47552827, y: 0.000000018418845, z: 0.15450849}
- {x: 0.48618495, y: 0.000000013914423, z: 0.11672266}
- {x: 0.49384418, y: 0.000000009324214, z: 0.078217186}
- {x: 0.49845868, y: 0.000000004676518, z: 0.03922948}
m_Parameters:
serializedVersion: 3
widthMultiplier: 3
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
key0: {r: 0.11372549, g: 0.11372549, b: 0.11372549, a: 0.8}
key1: {r: 0.11372549, g: 0.11372549, b: 0.11372549, a: 0.8}
key2: {r: 0, g: 0, b: 0, a: 1}
key3: {r: 0, g: 0, b: 0, a: 0.003921569}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 29876
atime3: 65535
atime4: 65535
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 0
numCapVertices: 0
alignment: 0
textureMode: 0
shadowBias: 0.5
generateLightingData: 0
m_UseWorldSpace: 0
m_Loop: 1
--- !u!1 &8529789795141961521
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8866216275828915038}
- component: {fileID: 5724708215066058970}
- component: {fileID: 6046382291019176640}
- component: {fileID: 5096925138249974101}
m_Layer: 10
m_Name: Circle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8866216275828915038
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8529789795141961521}
m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.7071079}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.015, y: 1.015, z: 1.015}
m_Children: []
m_Father: {fileID: 9127401858082693168}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!33 &5724708215066058970
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8529789795141961521}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &6046382291019176640
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8529789795141961521}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 07d369c3f2a56e243bbc3de292c2b105, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &5096925138249974101
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8529789795141961521}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}

+ 136
- 6
Assets/GWConquest/Prefabs/UI/DistrictIcon.prefab View File

@ -60,6 +60,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -104,7 +105,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2621911208064913515}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -134,6 +135,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -211,6 +213,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -300,6 +303,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -388,6 +392,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -483,6 +488,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.8901961, b: 0.5686275, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -528,8 +534,9 @@ RectTransform:
m_LocalScale: {x: 1.24, y: 1.24, z: 1.24}
m_Children:
- {fileID: 6443802886500576743}
- {fileID: 2621911208135885732}
- {fileID: 3169879512136001048}
- {fileID: 2621911209262666223}
- {fileID: 2621911208135885732}
- {fileID: 6228127094338109271}
m_Father: {fileID: 2621911208907321623}
m_RootOrder: 2
@ -562,6 +569,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.08235294, g: 0.08235294, b: 0.08235294, a: 0.72156864}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -649,6 +657,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -693,7 +702,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2621911208064913515}
m_RootOrder: 1
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -723,6 +732,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -997,6 +1007,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 6530463141977457202}
m_TargetAssemblyTypeName:
m_MethodName: OnClicked
m_Mode: 1
m_Arguments:
@ -1012,6 +1023,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 6530463141977457202}
m_TargetAssemblyTypeName:
m_MethodName: OnPointerEnter
m_Mode: 1
m_Arguments:
@ -1027,6 +1039,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 6530463141977457202}
m_TargetAssemblyTypeName:
m_MethodName: OnPointerExit
m_Mode: 1
m_Arguments:
@ -1098,6 +1111,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1185,6 +1199,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1210,6 +1225,7 @@ GameObject:
- component: {fileID: 2621911209262666223}
- component: {fileID: 2621911209262666221}
- component: {fileID: 2621911209262666222}
- component: {fileID: 5508291047484427147}
m_Layer: 5
m_Name: Icon
m_TagString: Untagged
@ -1259,6 +1275,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1273,6 +1290,109 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &5508291047484427147
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2621911209262666208}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3}
m_Name:
m_EditorClassIdentifier:
size: 5.38
spread: 0.8
offsetAngle: 43.15237
offsetDistance: 0
offset: {x: 0, y: -0}
color: {r: 0, g: 0, b: 0, a: 0.5529412}
inset: 0
blendMode: 0
useCasterAlpha: 1
ignoreCasterColor: 0
colorBleedMode: 2
shadowAsSibling: 0
cutout: 0
baked: 0
modifiedFromInspector: 0
bakedShadows: []
--- !u!1 &3236815388754272088
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3169879512136001048}
- component: {fileID: 7667509430992582846}
- component: {fileID: 5519992837941038288}
m_Layer: 5
m_Name: BattleAura
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &3169879512136001048
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3236815388754272088}
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: 2621911208064913515}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7667509430992582846
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3236815388754272088}
m_CullTransparentMesh: 0
--- !u!114 &5519992837941038288
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3236815388754272088}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.54901963, b: 0.27058825, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: c5c5d1f6b8fa0404ca44f3ea7c937909, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &3272311115306710728
GameObject:
m_ObjectHideFlags: 0
@ -1333,6 +1453,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1407,6 +1528,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.72300005, g: 0.72300005, b: 0.72300005, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1481,6 +1603,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1555,6 +1678,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1621,7 +1745,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4942337363061449355}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
@ -1629,6 +1753,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.64446914, b: 0.2688679, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1706,6 +1831,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.08235294, g: 0.08235294, b: 0.08235294, a: 0.72156864}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1761,7 +1887,7 @@ RectTransform:
m_GameObject: {fileID: 5980683245453820297}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.79, y: 0.79, z: 0.79}
m_Children:
- {fileID: 7713023655582307560}
- {fileID: 662622465737993192}
@ -1770,7 +1896,7 @@ RectTransform:
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: 64.4}
m_AnchoredPosition: {x: 0, y: 60.499977}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3801364161784695816
@ -1795,6 +1921,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -1825,6 +1952,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 6530463141977457202}
m_TargetAssemblyTypeName:
m_MethodName: OpenBattleMenu
m_Mode: 1
m_Arguments:
@ -1914,6 +2042,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1990,6 +2119,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:


+ 841
- 213
Assets/GWConquest/Prefabs/UI/FleetIcon.prefab
File diff suppressed because it is too large
View File


+ 300
- 10
Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab View File

@ -282,7 +282,8 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -100}
m_LocalScale: {x: 1, y: 1, z: 0}
m_Children: []
m_Children:
- {fileID: 4694286665432162353}
m_Father: {fileID: 3206999086042524838}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -306,7 +307,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1504973411824923093}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
@ -633,6 +634,110 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2601710222791204670
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3597273204616103648}
- component: {fileID: 6649543984312342684}
- component: {fileID: 1071791650260473966}
- component: {fileID: 7779311651342929745}
m_Layer: 5
m_Name: SwordRight
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3597273204616103648
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2601710222791204670}
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: 4694286665432162353}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6649543984312342684
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2601710222791204670}
m_CullTransparentMesh: 0
--- !u!114 &1071791650260473966
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2601710222791204670}
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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 6fee5394bcf59dc49a420d82f8c59cc2, 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!114 &7779311651342929745
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2601710222791204670}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3}
m_Name:
m_EditorClassIdentifier:
size: 3.48
spread: 0.866
offsetAngle: 74.307144
offsetDistance: 0
offset: {x: 0, y: -0}
color: {r: 0, g: 0, b: 0, a: 1}
inset: 0
blendMode: 0
useCasterAlpha: 1
ignoreCasterColor: 0
colorBleedMode: 2
shadowAsSibling: 0
cutout: 0
baked: 0
modifiedFromInspector: 0
bakedShadows: []
--- !u!1 &2757051028987816225
GameObject:
m_ObjectHideFlags: 0
@ -708,6 +813,72 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2946785577647416901
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4694286665432162353}
- component: {fileID: 5630722018663237976}
- component: {fileID: 6927743059354002062}
m_Layer: 5
m_Name: BattleIcon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4694286665432162353
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2946785577647416901}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.8990498, y: 0.8990418, z: 0}
m_Children:
- {fileID: 2039808984436274979}
- {fileID: 3597273204616103648}
m_Father: {fileID: 5933915466098524944}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5630722018663237976
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2946785577647416901}
m_CullTransparentMesh: 0
--- !u!95 &6927743059354002062
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2946785577647416901}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 03da4631450b7c54188502294251bc63, 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 &3536075192841412823
GameObject:
m_ObjectHideFlags: 0
@ -720,6 +891,7 @@ GameObject:
- component: {fileID: 8817467615109816757}
- component: {fileID: 8517481495962601137}
- component: {fileID: 5092933628985013823}
- component: {fileID: 3848447959370661838}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
@ -802,20 +974,34 @@ MonoBehaviour:
m_EditorClassIdentifier:
size: 3.48
spread: 0.916
offsetAngle: 90
offsetDistance: 8
offset: {x: 0, y: 0}
offsetAngle: 74.307144
offsetDistance: 0
offset: {x: 0, y: -0}
color: {r: 0, g: 0, b: 0, a: 1}
inset: 0
blendMode: 0
useCasterAlpha: 1
ignoreCasterColor: 0
colorBleedMode: 0
colorBleedMode: 2
shadowAsSibling: 0
cutout: 0
baked: 0
modifiedFromInspector: 0
bakedShadows: []
--- !u!114 &3848447959370661838
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3536075192841412823}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 02e6f936b2dd0634b921848bc8ca4842, type: 3}
m_Name:
m_EditorClassIdentifier:
ZoomThreshold: 550
ConstantScale: 1
--- !u!1 &4082808148708746503
GameObject:
m_ObjectHideFlags: 0
@ -966,6 +1152,110 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &4882745342399101360
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2039808984436274979}
- component: {fileID: 1339691316115769468}
- component: {fileID: 558019578109838434}
- component: {fileID: 2973735675637770142}
m_Layer: 5
m_Name: SwordLeft
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2039808984436274979
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4882745342399101360}
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: 4694286665432162353}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1339691316115769468
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4882745342399101360}
m_CullTransparentMesh: 0
--- !u!114 &558019578109838434
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4882745342399101360}
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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 6fee5394bcf59dc49a420d82f8c59cc2, 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!114 &2973735675637770142
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4882745342399101360}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3}
m_Name:
m_EditorClassIdentifier:
size: 3.48
spread: 0.866
offsetAngle: 74.307144
offsetDistance: 0
offset: {x: 0, y: -0}
color: {r: 0, g: 0, b: 0, a: 1}
inset: 0
blendMode: 0
useCasterAlpha: 1
ignoreCasterColor: 0
colorBleedMode: 2
shadowAsSibling: 0
cutout: 0
baked: 0
modifiedFromInspector: 0
bakedShadows: []
--- !u!1 &5727137025483658638
GameObject:
m_ObjectHideFlags: 0
@ -1317,8 +1607,8 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7992197144211585402}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: 0, y: 0, z: -90}
m_LocalScale: {x: 0.45136, y: 0.45136, z: 0.45136}
m_Children: []
m_Father: {fileID: 3206999086042524838}
m_RootOrder: 0
@ -1349,14 +1639,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.64446914, b: 0.2688679, a: 1}
m_Color: {r: 1, g: 0.54901963, b: 0.27058825, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: c573113a2d867074eb8afdfc86ac4273, type: 3}
m_Sprite: {fileID: 21300000, guid: 589ce6136fc485849980aca7b4e282d3, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1


+ 2
- 0
Assets/GWConquest/Resources/PlanetConnection.prefab View File

@ -149,5 +149,7 @@ MonoBehaviour:
drawLine: 1
QuadPrefab: {fileID: 6069422642220358092, guid: 1d8cf03ddf5b714438fd0ecc04ac501c,
type: 3}
ConstantWidth: 0.0025
ConstantQuadScale: 0.012
QuadCount: 8
QuadSpeed: 200

BIN
Assets/GWConquest/Resources/UnitIcons/CaerBannoqRealmHunters.png View File

Before After
Width: 218  |  Height: 217  |  Size: 2.7 KiB

+ 132
- 0
Assets/GWConquest/Resources/UnitIcons/CaerBannoqRealmHunters.png.meta View File

@ -0,0 +1,132 @@
fileFormatVersion: 2
guid: 2c806ffd7b37b4144b486cc58dd64d92
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
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 2
mipBias: 0
wrapU: 1
wrapV: 1
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
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 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:

Assets/GWConquest/Resources/UnitIcons/ElysiaOathswornSquad.png → Assets/GWConquest/Resources/UnitIcons/ElysiaReconInfantry.png View File


Assets/GWConquest/Resources/UnitIcons/ElysiaOathswornSquad.png.meta → Assets/GWConquest/Resources/UnitIcons/ElysiaReconInfantry.png.meta View File


BIN
Assets/GWConquest/Resources/UnitIcons/SartoriusHeavyInfantry.png View File

Before After
Width: 218  |  Height: 217  |  Size: 2.6 KiB

+ 132
- 0
Assets/GWConquest/Resources/UnitIcons/SartoriusHeavyInfantry.png.meta View File

@ -0,0 +1,132 @@
fileFormatVersion: 2
guid: 5fa48d9a73b102a49bf2d3a4e2f43e79
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
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 2
mipBias: 0
wrapU: 1
wrapV: 1
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
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 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:

BIN
Assets/GWConquest/Resources/UnitIcons/SartoriusInfantry.png View File

Before After
Width: 218  |  Height: 217  |  Size: 2.8 KiB Width: 218  |  Height: 217  |  Size: 2.3 KiB

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


+ 23
- 0
Assets/GWConquest/Scripts/Editor/ContextMenuHooks.cs View File

@ -63,5 +63,28 @@ public class ContextMenuHooks
PrefabUtility.RecordPrefabInstancePropertyModifications(rt);
}
[MenuItem("CONTEXT/LineRenderer/Create Circle")]
static void CreateCircle(MenuCommand cmd)
{
LineRenderer lr = cmd.context as LineRenderer;
Undo.RecordObject(lr, "Creating Circle");
int edges = lr.positionCount;
float radius = lr.GetPosition(0).magnitude;
Quaternion rot = Quaternion.FromToRotation(Vector3.forward, Vector3.up);
for (int i = 0; i < edges; i++)
{
float angle = 2 * Mathf.PI * i / edges;
Vector3 spherical = new Vector3(radius * Mathf.Cos(angle), radius * Mathf.Sin(angle), 0);
spherical = rot * spherical;
lr.SetPosition(i, spherical);
}
PrefabUtility.RecordPrefabInstancePropertyModifications(lr);
}
}

+ 36
- 0
Assets/GWConquest/Scripts/GWCamera.cs View File

@ -6,6 +6,17 @@ namespace GWConquest
{
public class GWCamera : MonoBehaviour
{
public static GWCamera _instance;
public static GWCamera Instance {
get {
if(_instance == null)
{
_instance = FindObjectOfType<GWCamera>();
}
return _instance;
}
}
public Transform cameraTransform;
public Camera mainCam;
@ -38,6 +49,21 @@ namespace GWConquest
private Plane cameraPlane;
private List<IZoomScaling> zoomScalings = new List<IZoomScaling>();
public void AddZoomScaling(IZoomScaling scaling)
{
zoomScalings.Add(scaling);
}
public void RemoveZoomScaling(IZoomScaling scaling)
{
if(zoomScalings.Contains(scaling))
{
zoomScalings.Remove(scaling);
}
}
private void Start()
{
if(mainCam.orthographic)
@ -187,6 +213,11 @@ namespace GWConquest
cameraTransform.localPosition = cameraPos;
}
foreach(var scaling in zoomScalings)
{
scaling.UpdateScaling();
}
}
transform.position = Vector3.SmoothDamp(transform.position, transformPositionTarget, ref transformPositionVelocity, cameraTranslationSmooth);
@ -199,6 +230,11 @@ namespace GWConquest
mainCam.transform.SetParent(cameraTransform, true);
}
}
public interface IZoomScaling
{
void UpdateScaling();
}
}

+ 6
- 0
Assets/GWConquest/Scripts/GameManager.cs View File

@ -50,6 +50,8 @@ namespace GWConquest
public float ShieldsCooldown;
public float ZoomPlanetThreshold;
public bool SpawnAIPlayer;
public bool IsLoaded { get; private set; } = false;
@ -185,5 +187,9 @@ namespace GWConquest
SoundEffects.Instance = null;
}
public bool ShowCircles {
get => Camera.main.orthographicSize < ZoomPlanetThreshold;
}
}
}

+ 44
- 6
Assets/GWConquest/Scripts/Planet.cs View File

@ -51,9 +51,16 @@ namespace GWConquest
public Transform CameraRotatorTransform;
public Transform planetCameraTransform;
public GameObject PrefabObject;
public GameObject AdditionalObjects;
public bool RefuseConnections = false;
public Transform CircleTransform;
public float CircleTransformDamp;
public float MaxCircleScale;
private float CircleScaleVelocity;
public PlanetData PlanetData
{
get => PlanetRegistry.GetPlanetData(gameObject.name);
@ -334,10 +341,10 @@ namespace GWConquest
{
FormationsChanged?.Invoke();
if (indicatorUI != null)
{
indicatorUI.UpdateIndicator();
}
//if (indicatorUI != null)
//{
// indicatorUI.UpdateIndicator();
//}
formationsChangedSinceLastFrame = false;
}
@ -441,7 +448,7 @@ namespace GWConquest
if(IngameUI.Instance.PlanetView.selectedPlanet != this)
{
foreach(Renderer r in GetComponentsInChildren<Renderer>())
foreach(Renderer r in PrefabObject.GetComponentsInChildren<Renderer>())
{
r.enabled = false;
}
@ -455,7 +462,7 @@ namespace GWConquest
indicatorUI.gameObject.SetActive(false);
}
else {
foreach(Renderer r in GetComponentsInChildren<Renderer>())
foreach(Renderer r in PrefabObject.GetComponentsInChildren<Renderer>())
{
r.enabled = true;
@ -481,6 +488,27 @@ namespace GWConquest
}
}
public void Update()
{
if(Application.isPlaying)
{
float CircleSizeTarget = GameManager.Instance.ShowCircles ? MaxCircleScale : 0f;
float CircleSize = CircleTransform.localScale.x;
CircleSize = Mathf.SmoothDamp(CircleSize, CircleSizeTarget, ref CircleScaleVelocity, CircleTransformDamp);
CircleTransform.localScale = Vector3.one * CircleSize;
if(IngameUI.PlanetViewEnabled || (!DebugUI.ShowAllPlanets && VisibilityStatus == PlanetVisibilityStatus.Hidden) || CircleSize == 0f)
{
CircleTransform.gameObject.SetActive(false);
}
else {
CircleTransform.gameObject.SetActive(true);
}
}
}
#if UNITY_EDITOR
@ -735,6 +763,16 @@ namespace GWConquest
view.LookAt(camT.position + camT.forward, camT.rotation, 1f);
}
[ContextMenu("Fix Prefab Objects")]
public void FixPrefabObjects()
{
foreach (Planet p in AllPlanets)
{
p.PrefabObject = p.GetComponentInChildren<SphereCollider>().gameObject;
UnityEditor.PrefabUtility.RecordPrefabInstancePropertyModifications(p);
}
}
#endif
}


+ 53
- 16
Assets/GWConquest/Scripts/PlanetConnection.cs View File

@ -18,6 +18,9 @@ namespace GWConquest
public GameObject QuadPrefab;
public float ConstantWidth;
public float ConstantQuadScale;
public float QuadCount;
public float QuadSpeed;
@ -91,26 +94,45 @@ namespace GWConquest
private void Update()
{
#if UNITY_EDITOR
if(!Application.isPlaying)
{
//if(!Application.isPlaying)
//{
UpdatePositions();
if (IsPreConnection)
#if UNITY_EDITOR
if (!Application.isPlaying && IsPreConnection)
{
var lineRenderer = GetComponent<LineRenderer>();
lineRenderer.startColor = Util.UpdateColorRGB(lineRenderer.startColor, Color.green);
lineRenderer.endColor = Util.UpdateColorRGB(lineRenderer.endColor, Color.green);
}
}
//}
#endif
if(Application.isPlaying && !IsPreConnection)
{
Camera cam = Camera.main;
float distance;
if(cam.orthographic)
{
distance = cam.orthographicSize;
}
else
{
distance = Vector3.Distance(transform.position, cam.transform.position);
}
float scale = distance * 1000f / cam.pixelHeight;
lineRenderer.widthMultiplier = ConstantWidth * scale;
var delta = QuadSpeed * Time.deltaTime;
for(int i = Quads.Count-1; i >= 0; i--)
{
var quad = Quads[i];
quad.transform.position = Vector3.MoveTowards(quad.transform.position, quad.target, delta);
quad.transform.localScale = Vector3.one * ConstantQuadScale * scale;
if(Vector3.SqrMagnitude(quad.transform.position - quad.target) <= 0.1)
{
Destroy(quad.transform.gameObject);
@ -127,22 +149,37 @@ namespace GWConquest
{
if (planet1 != null && planet2 != null)
{
LineRenderer lineRenderer = GetComponent<LineRenderer>();
if (drawLine)
var lr = lineRenderer;
if(lr == null)
{
lineRenderer.enabled = true;
lineRenderer.SetPositions(new Vector3[] { planet1.transform.position, planet2.transform.position });
#if UNITY_EDITOR
UnityEditor.PrefabUtility.RecordPrefabInstancePropertyModifications(lineRenderer);
#endif
lr = GetComponent<LineRenderer>();
}
else
Vector3 pos1 = planet1.transform.position;
Vector3 pos2 = planet2.transform.position;
Vector3 diff = (pos2 - pos1).normalized;
if (Application.isPlaying)
{
lineRenderer.enabled = false;
pos1 += diff * planet1.CircleTransform.lossyScale.x / 2f;
pos2 -= diff * planet2.CircleTransform.lossyScale.x / 2f;
}
lr.SetPositions(new Vector3[] { pos1, pos2 });
#if UNITY_EDITOR
UnityEditor.PrefabUtility.RecordPrefabInstancePropertyModifications(lineRenderer);
#endif
if (!Application.isPlaying)
{
lr.enabled = drawLine;
}
UnityEditor.PrefabUtility.RecordPrefabInstancePropertyModifications(lr);
#endif
}


+ 1
- 0
Assets/GWConquest/Scripts/PlanetPlacement.cs View File

@ -114,6 +114,7 @@ namespace GWConquest
planet.OriginalDesaturation = rend.material.GetFloat("_Desaturation");
}
planet.PrefabObject = sphereGO;
}
public PlanetConnection SpawnPlanetConnection(Planet planet1, Planet planet2)


+ 61
- 32
Assets/GWConquest/Scripts/PlanetScaling.cs View File

@ -1,49 +1,78 @@
using UnityEngine;
public class PlanetScaling : MonoBehaviour
namespace GWConquest
{
public float NearScalingDistance = 1f;
public float FarScalingDistance = 1f;
public class PlanetScaling : MonoBehaviour, IZoomScaling
{
public float FixPlanetSize = 1f;
public float NearScalingDistance = 1f;
public float FarScalingDistance = 1f;
void Update()
{
Camera cam = Camera.main;
float distance;
if(cam.orthographic)
{
distance = cam.orthographicSize;
}
else
{
distance = Vector3.Distance(transform.position, cam.transform.position);
}
public float FixPlanetSize = 1f;
public float CircleWidth;
public float InnerCircleWidth;
float scale;
public LineRenderer CircleRenderer;
public LineRenderer InnerCircleRenderer;
if (distance < NearScalingDistance)
public void UpdateScaling()
{
// Linear slope through zero
float planetScaleNear = FixPlanetSize / NearScalingDistance;
scale = distance * planetScaleNear;
Camera cam = Camera.main;
float distance;
if(cam.orthographic)
{
distance = cam.orthographicSize;
}
else
{
distance = Vector3.Distance(transform.position, cam.transform.position);
}
float scale;
if (distance < NearScalingDistance)
{
// Linear slope through zero
float planetScaleNear = FixPlanetSize / NearScalingDistance;
scale = distance * planetScaleNear;
}
else if (distance > FarScalingDistance)
{
// Linear slope, also through zero
float planetScaleFar = FixPlanetSize / FarScalingDistance;
scale = distance * planetScaleFar;
}
else
{
// Constant value
scale = FixPlanetSize;
}
scale *= (1000f / cam.pixelHeight);
transform.localScale = scale * Vector3.one;
float circleScale = distance * CircleWidth * (1000f / cam.pixelHeight);
CircleRenderer.widthMultiplier = circleScale;
float innerCircleScale = distance * InnerCircleWidth * (1000f / cam.pixelHeight);
InnerCircleRenderer.widthMultiplier = innerCircleScale;
}
else if (distance > FarScalingDistance)
void OnEnable()
{
// Linear slope, also through zero
float planetScaleFar = FixPlanetSize / FarScalingDistance;
scale = distance * planetScaleFar;
GWCamera.Instance.AddZoomScaling(this);
}
else
void OnDisable()
{
// Constant value
scale = FixPlanetSize;
GWCamera.Instance.RemoveZoomScaling(this);
}
}
scale *= (1000f / cam.pixelHeight);
transform.localScale = scale * Vector3.one;
}
}

+ 2
- 2
Assets/GWConquest/Scripts/UI/FormationIcon.cs View File

@ -11,7 +11,7 @@ namespace GWConquest {
{
public Image FormationImage;
public Text FormationNumberText;
public Text FormationNumberEnding;
//public Text FormationNumberEnding;
public RectTransform Arrow;
@ -47,7 +47,7 @@ namespace GWConquest {
FormationImage.sprite = category.Icon;
FormationNumberText.gameObject.SetActive(true);
FormationNumberText.text = f.FormationNumber.ToString();
FormationNumberEnding.text = Util.GetOrdinalEnding(f.FormationNumber);
//FormationNumberEnding.text = Util.GetOrdinalEnding(f.FormationNumber);
for(int i = 0; i < StrengthGameObjects.Length; i++)
{


+ 1
- 2
Assets/GWConquest/Scripts/UI/IngameUI.cs View File

@ -215,8 +215,7 @@ namespace GWConquest
PlanetView.HideUI();
PlanetView.gameObject.SetActive(false);
GWCamera camera = FindObjectOfType<GWCamera>();
camera.ResetCameraTransform();
GWCamera.Instance.ResetCameraTransform();
Camera.main.orthographic = true;


+ 40
- 21
Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs View File

@ -68,7 +68,7 @@ namespace GWConquest
public void UpdateIndicator()
{
if (DebugUI.ShowAllPlanets || Planet.VisibilityStatus == PlanetVisibilityStatus.Visible)
if ((DebugUI.ShowAllPlanets || Planet.VisibilityStatus == PlanetVisibilityStatus.Visible) && !GameManager.Instance.ShowCircles)
{
IEnumerable<Formation> formations = Planet.GetAllFormations(ZoneType.Space);
float playerStrength = formations.Sum(f => f.Player == Player.CurrentPlayer ? f.GetFormationStrength() : 0f);
@ -124,57 +124,76 @@ namespace GWConquest
private void FixedUpdate() {
if(GameManager.EntitiesLoaded && Planet != null)
{
UpdateIndicator();
if (DebugUI.ShowAllPlanets || Planet.VisibilityStatus == PlanetVisibilityStatus.Visible)
{
var controllingPlayer = Planet.ControllingPlayer;
var circleRend = Planet.CircleTransform.GetComponent<LineRenderer>();
if (controllingPlayer != null)
{
FactionImage.gameObject.SetActive(true);
FactionImage.sprite = controllingPlayer.Faction.FactionLogo;
FactionImage.color = Util.UpdateColorRGB(FactionImage.color, controllingPlayer.Faction.FactionColor);
if(GameManager.Instance.ShowCircles)
{
FactionImage.gameObject.SetActive(false);
}
else {
FactionImage.gameObject.SetActive(true);
FactionImage.sprite = controllingPlayer.Faction.FactionLogo;
FactionImage.color = Util.UpdateColorRGB(FactionImage.color, controllingPlayer.Faction.FactionColor);
}
PlanetNameText.color = Util.UpdateColorRGB(PlanetNameText.color, controllingPlayer.Faction.FactionColor);
circleRend.startColor = Util.UpdateColorRGB(circleRend.startColor, controllingPlayer.Faction.FactionColor);
circleRend.endColor = circleRend.startColor;
}
else
{
FactionImage.gameObject.SetActive(false);
PlanetNameText.color = Util.UpdateColorRGB(PlanetNameText.color, NeutralColor);
circleRend.startColor = Util.UpdateColorRGB(circleRend.startColor, NeutralColor);
circleRend.endColor = circleRend.startColor;
}
DistrictSymbols.gameObject.SetActive(true);
var districts = Planet.GetComponentsInChildren<District>();
foreach (var type in DistrictSymbolDict.Keys)
if (!GameManager.Instance.ShowCircles)
{
var typeDistricts = districts.Where(d => d.GetFullType() == type);
DistrictSymbols.gameObject.SetActive(true);
var districts = Planet.GetComponentsInChildren<District>();
foreach (var type in DistrictSymbolDict.Keys)
{
var typeDistricts = districts.Where(d => d.GetFullType() == type);
Color color = NeutralColor;
Color color = NeutralColor;
if (typeDistricts.All(d => d.ControllingPlayer == Player.CurrentPlayer))
{
if (typeDistricts.All(d => d.GetComponent<DistrictFactory>() != null))
if (typeDistricts.All(d => d.ControllingPlayer == Player.CurrentPlayer))
{
if (typeDistricts.All(d => d.GetComponent<DistrictFactory>().IsProducing))
if (typeDistricts.All(d => d.GetComponent<DistrictFactory>() != null))
{
if (typeDistricts.All(d => d.GetComponent<DistrictFactory>().IsProducing))
{
color = controllingPlayer.Faction.FactionColor;
}
}
else
{
color = controllingPlayer.Faction.FactionColor;
}
}
else
foreach (Image img in DistrictSymbolDict[type].GetComponentsInChildren<Image>())
{
color = controllingPlayer.Faction.FactionColor;
img.color = Util.UpdateColorRGB(img.color, color);
}
}
foreach (Image img in DistrictSymbolDict[type].GetComponentsInChildren<Image>())
{
img.color = Util.UpdateColorRGB(img.color, color);
}
}
else {
DistrictSymbols.gameObject.SetActive(false);
}
GetComponent<Animator>().SetBool("Battle", Planet.HasBattle);


+ 54
- 0
Assets/GWConquest/Scripts/UI/UIZoomScaling.cs View File

@ -0,0 +1,54 @@
using UnityEngine;
namespace GWConquest {
public class UIZoomScaling : MonoBehaviour, IZoomScaling
{
public float ZoomThreshold;
public float ConstantScale;
public void UpdateScaling()
{
Camera cam = Camera.main;
float distance;
if(cam.orthographic)
{
distance = cam.orthographicSize;
}
else
{
distance = Vector3.Distance(transform.position, cam.transform.position);
}
float scale;
if (distance < ZoomThreshold)
{
// Linear slope through zero
float planetScaleNear = ConstantScale / ZoomThreshold;
scale = distance * planetScaleNear;
}
else
{
// Constant value
scale = ConstantScale;
}
//scale *= (1000f / cam.pixelHeight);
transform.localScale = scale * Vector3.one;
}
void OnEnable()
{
GWCamera.Instance.AddZoomScaling(this);
}
void OnDisable()
{
GWCamera.Instance.RemoveZoomScaling(this);
}
}
}

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

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

+ 28
- 0
Assets/GWConquest/Scripts/ZoomSkyboxEffect.cs View File

@ -0,0 +1,28 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace GWConquest
{
public class ZoomSkyboxEffect : MonoBehaviour
{
public float minExposure;
public float maxExposure;
public Color minColor;
public Color maxColor;
void Update()
{
float percent = Mathf.InverseLerp(GWCamera.Instance.minCameraZoom, GWCamera.Instance.maxCameraZoom, Camera.main.orthographicSize);
float exposure = Mathf.Lerp(minExposure, maxExposure, percent);
Color color = Color.Lerp(minColor, maxColor, percent);
var mat = RenderSettings.skybox;
mat.SetFloat("_Exposure", exposure);
mat.SetColor("_Tint", color);
}
}
}

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

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

BIN
Assets/GWConquest/Textures/UI/Blackest Whole.png View File

Before After
Width: 100  |  Height: 100  |  Size: 4.5 KiB

+ 132
- 0
Assets/GWConquest/Textures/UI/Blackest Whole.png.meta View File

@ -0,0 +1,132 @@
fileFormatVersion: 2
guid: 589ce6136fc485849980aca7b4e282d3
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
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 2
mipBias: 0
wrapU: 1
wrapV: 1
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
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 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:

+ 109
- 0
Assets/GWConquest/Textures/UI/Materials/kreiswichs3 2.mat View File

@ -0,0 +1,109 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: kreiswichs3 2
m_Shader: {fileID: 10760, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 0.01, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: c5c5d1f6b8fa0404ca44f3ea7c937909, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BlendOp: 0
- _BumpScale: 1
- _CameraFadingEnabled: 0
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- _ColorMask: 15
- _ColorMode: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- _DstBlend: 10
- _EmissionEnabled: 0
- _FlipbookMode: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _LightingEnabled: 0
- _Metallic: 0
- _Mode: 3
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SoftParticlesEnabled: 0
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _UseUIAlphaClip: 0
- _ZWrite: 0
m_Colors:
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 0, g: 0, b: 0, a: 0.3372549}
- _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []

+ 8
- 0
Assets/GWConquest/Textures/UI/Materials/kreiswichs3 2.mat.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 07d369c3f2a56e243bbc3de292c2b105
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/GWConquest/Textures/UI/RAUTE FETT.png View File

Before After
Width: 100  |  Height: 100  |  Size: 984 B

+ 132
- 0
Assets/GWConquest/Textures/UI/RAUTE FETT.png.meta View File

@ -0,0 +1,132 @@
fileFormatVersion: 2
guid: a43560515f2118344a10a45c5dda1764
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
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 2
mipBias: 0
wrapU: 1
wrapV: 1
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: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 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:

BIN
Assets/GWConquest/Textures/UI/RAUTE.png View File

Before After
Width: 100  |  Height: 100  |  Size: 1.3 KiB

+ 132
- 0
Assets/GWConquest/Textures/UI/RAUTE.png.meta View File

@ -0,0 +1,132 @@
fileFormatVersion: 2
guid: 2f346b30884e9424bbb8f1a1d98e2436
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
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 2
mipBias: 0
wrapU: 1
wrapV: 1
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: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 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:

BIN
Assets/GWConquest/Textures/UI/kreis3.png View File

Before After
Width: 256  |  Height: 256  |  Size: 3.9 KiB Width: 256  |  Height: 256  |  Size: 4.4 KiB

+ 2
- 2
Assets/Starfield Skybox/Skybox.mat View File

@ -85,7 +85,7 @@ Material:
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _Exposure: 0.72
- _Exposure: 0.4
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
@ -102,5 +102,5 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Tint: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- _Tint: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
m_BuildTextureStacks: []

Loading…
Cancel
Save