Browse Source

Galaxy Map, UI

bolt_update
laurids 4 years ago
parent
commit
0106e09364
34 changed files with 4564 additions and 156 deletions
  1. +1
    -1
      Assets/Exo planets/Materials/Atmospheres/Atmosphere orange.mat
  2. +72
    -0
      Assets/GWConquest/Animations/PlanetSelection.controller
  3. +8
    -0
      Assets/GWConquest/Animations/PlanetSelection.controller.meta
  4. +199
    -0
      Assets/GWConquest/Animations/PlanetSelectionRotate.anim
  5. +8
    -0
      Assets/GWConquest/Animations/PlanetSelectionRotate.anim.meta
  6. +269
    -2
      Assets/GWConquest/Prefabs/PlanetName.prefab
  7. +96
    -0
      Assets/GWConquest/Prefabs/PlanetSelection.prefab
  8. +7
    -0
      Assets/GWConquest/Prefabs/PlanetSelection.prefab.meta
  9. +2964
    -92
      Assets/GWConquest/Scenes/GalaxyMap.unity
  10. +64
    -0
      Assets/GWConquest/Scripts/GalaxyMapUI.cs
  11. +11
    -0
      Assets/GWConquest/Scripts/GalaxyMapUI.cs.meta
  12. +10
    -24
      Assets/GWConquest/Scripts/IngameUI.cs
  13. +1
    -1
      Assets/GWConquest/Scripts/Planet.cs
  14. +2
    -0
      Assets/GWConquest/Scripts/PlanetScaling.cs
  15. +3
    -16
      Assets/GWConquest/Scripts/PlanetScaling2.cs
  16. +117
    -18
      Assets/GWConquest/Scripts/PlanetScaling3.cs
  17. +54
    -0
      Assets/GWConquest/Scripts/PlanetScaling4.cs
  18. +11
    -0
      Assets/GWConquest/Scripts/PlanetScaling4.cs.meta
  19. +30
    -0
      Assets/GWConquest/Scripts/ScaleRelativeToText.cs
  20. +11
    -0
      Assets/GWConquest/Scripts/ScaleRelativeToText.cs.meta
  21. +16
    -0
      Assets/GWConquest/Scripts/Util.cs
  22. +8
    -0
      Assets/GWConquest/Textures/UI/Materials.meta
  23. +84
    -0
      Assets/GWConquest/Textures/UI/Materials/kreiswichs3.mat
  24. +8
    -0
      Assets/GWConquest/Textures/UI/Materials/kreiswichs3.mat.meta
  25. +1
    -1
      Assets/GWConquest/Textures/UI/ausklapp dings.png.meta
  26. BIN
      Assets/GWConquest/Textures/UI/indikator1.png
  27. +127
    -0
      Assets/GWConquest/Textures/UI/indikator1.png.meta
  28. BIN
      Assets/GWConquest/Textures/UI/indikator2.png
  29. +127
    -0
      Assets/GWConquest/Textures/UI/indikator2.png.meta
  30. +1
    -1
      Assets/GWConquest/Textures/UI/kreiswichs3.png.meta
  31. BIN
      Assets/GWConquest/Textures/UI/planetenring.png
  32. +127
    -0
      Assets/GWConquest/Textures/UI/planetenring.png.meta
  33. BIN
      Assets/GWConquest/Textures/UI/strichliste.png
  34. +127
    -0
      Assets/GWConquest/Textures/UI/strichliste.png.meta

+ 1
- 1
Assets/Exo planets/Materials/Atmospheres/Atmosphere orange.mat View File

@ -62,7 +62,7 @@ Material:
- _Atmospherecircle: 0.164 - _Atmospherecircle: 0.164
- _Atmosphereintensity: 1.5 - _Atmosphereintensity: 1.5
- _Atmospherepower: 6.94 - _Atmospherepower: 6.94
- _Atmospheresize: 3.55
- _Atmospheresize: 1.19
- _BumpScale: 1 - _BumpScale: 1
- _Cutoff: 0.5 - _Cutoff: 0.5
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1


+ 72
- 0
Assets/GWConquest/Animations/PlanetSelection.controller View File

@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-8413244362276561945
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PlanetSelectionRotate
m_Speed: 0.05
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 039cc9ffe9ddf3e49852f4689e1dbebb, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PlanetSelection
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 6359094240829584682}
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!1107 &6359094240829584682
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: -8413244362276561945}
m_Position: {x: 324.08405, y: 97.91327, 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: -8413244362276561945}

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

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

+ 199
- 0
Assets/GWConquest/Animations/PlanetSelectionRotate.anim View File

@ -0,0 +1,199 @@
%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: PlanetSelectionRotate
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 90.00001, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: -360}
outSlope: {x: 0, y: 0, z: -360}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: 90.00001, y: 0, z: -360}
inSlope: {x: 0, y: 0, z: -360}
outSlope: {x: 0, y: 0, z: -360}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Quad
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 922149575
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 90.00001
inSlope: 0
outSlope: 0
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 90.00001
inSlope: 0
outSlope: 0
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path: Quad
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.y
path: Quad
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: -360
outSlope: -360
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: -360
inSlope: -360
outSlope: -360
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path: Quad
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Quad
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Quad
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Quad
classID: 4
script: {fileID: 0}
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

+ 8
- 0
Assets/GWConquest/Animations/PlanetSelectionRotate.anim.meta View File

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

+ 269
- 2
Assets/GWConquest/Prefabs/PlanetName.prefab View File

@ -1,5 +1,125 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &6833435354039962719
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3367542114670873916}
- component: {fileID: 6947917478586190148}
- component: {fileID: 7411856606851406938}
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 &3367542114670873916
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6833435354039962719}
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: 5403683981745849854}
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: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6947917478586190148
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6833435354039962719}
m_CullTransparentMesh: 0
--- !u!114 &7411856606851406938
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6833435354039962719}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.627451}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: a3d43ea2287c0e442b8bfcf6a68fdf2d, 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 &8334873843302281854
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5403683981745849854}
- component: {fileID: 4229235784508292963}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &5403683981745849854
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8334873843302281854}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.013481, y: 2.0134609, z: 2.0134609}
m_Children:
- {fileID: 3132145477584889885}
- {fileID: 1139510059905101577}
- {fileID: 3367542114670873916}
m_Father: {fileID: 8467716388278459802}
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: 93}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4229235784508292963
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8334873843302281854}
m_CullTransparentMesh: 0
--- !u!1 &8467716388278459805 --- !u!1 &8467716388278459805
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -29,7 +149,8 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.33333, y: 0.333333, z: 0.333333} m_LocalScale: {x: 0.33333, y: 0.333333, z: 0.333333}
m_Children: []
m_Children:
- {fileID: 5403683981745849854}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -60,7 +181,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 4efcda70235ff1d4ca9ef256caac46ee, type: 2} m_Material: {fileID: 2100000, guid: 4efcda70235ff1d4ca9ef256caac46ee, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 0.36078432} m_Color: {r: 1, g: 1, b: 1, a: 0.36078432}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
@ -93,3 +214,149 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
target: {fileID: 0} target: {fileID: 0}
--- !u!1 &8481595143308913657
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1139510059905101577}
- component: {fileID: 7109511354957571495}
- component: {fileID: 6581315529929831198}
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 &1139510059905101577
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8481595143308913657}
m_LocalRotation: {x: -0, y: -0, z: 0.2514712, w: 0.9678648}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: -1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5403683981745849854}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 29.129002}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7109511354957571495
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8481595143308913657}
m_CullTransparentMesh: 0
--- !u!114 &6581315529929831198
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8481595143308913657}
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.8396226, g: 0, b: 0.114461854, a: 0.62352943}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b9cbeaf1157e7bc4caaefe06915891b0, type: 3}
m_Type: 3
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 0.273
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &8739678637980788808
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3132145477584889885}
- component: {fileID: 2714592768022216488}
- component: {fileID: 8665855061127170454}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3132145477584889885
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8739678637980788808}
m_LocalRotation: {x: -0, y: -0, z: -0.2825745, w: 0.9592454}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5403683981745849854}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -32.828003}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2714592768022216488
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8739678637980788808}
m_CullTransparentMesh: 0
--- !u!114 &8665855061127170454
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8739678637980788808}
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.7050119, b: 0, a: 0.62352943}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b9cbeaf1157e7bc4caaefe06915891b0, type: 3}
m_Type: 3
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 0.18
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1

+ 96
- 0
Assets/GWConquest/Prefabs/PlanetSelection.prefab View File

@ -0,0 +1,96 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8632634590678238360
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8632634590678238361}
- component: {fileID: 8632634590678238356}
- component: {fileID: 8632634590678238363}
- component: {fileID: 8632634590678238362}
m_Layer: 0
m_Name: PlanetSelection
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8632634590678238361
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8632634590678238360}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 105, y: 105, z: 105}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!33 &8632634590678238356
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8632634590678238360}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &8632634590678238363
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8632634590678238360}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: f5eaf696036152342a26f0237b196c1b, 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
--- !u!64 &8632634590678238362
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8632634590678238360}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 3
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}

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

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

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


+ 64
- 0
Assets/GWConquest/Scripts/GalaxyMapUI.cs View File

@ -0,0 +1,64 @@
using UnityEngine;
using UnityEngine.UI;
namespace GWConquest
{
public class GalaxyMapUI : MonoBehaviour
{
public Text PlanetNameText;
public GameObject PlayerFleetPanel;
public GameObject EnemyFleetPlanel;
public GameObject PlanetSelection;
private Planet SelectedPlanet;
public void SelectPlanet(Planet planet)
{
SelectedPlanet = planet;
if(SelectedPlanet != null)
{
gameObject.SetActive(true);
PlanetSelection.SetActive(true);
PlanetSelection.transform.SetParent(planet.transform, false);
PlanetNameText.text = SelectedPlanet.planetName;
}
else
{
gameObject.SetActive(false);
PlanetSelection.SetActive(false);
EnemyFleetPlanel.SetActive(false);
PlayerFleetPanel.SetActive(false);
}
}
public void BuildFleet()
{
if (SelectedPlanet != null)
{
BuildUnitEvent ev = BuildUnitEvent.Create(Bolt.GlobalTargets.OnlyServer);
ev.Player = Player.CurrentPlayer.entity;
ev.Zone = Zone.GetZoneId(SelectedPlanet.GetMainZone(ZoneType.Space));
ev.UnitClass = "Frigate";
ev.Send();
gameObject.SetActive(false);
SelectedPlanet = null;
}
}
public void ShowPlayerFleetPanel()
{
PlayerFleetPanel.SetActive(true);
}
public void ShowEnemyFleetPanel()
{
EnemyFleetPlanel.SetActive(true);
}
}
}

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

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

+ 10
- 24
Assets/GWConquest/Scripts/IngameUI.cs View File

@ -18,12 +18,13 @@ namespace GWConquest
public class IngameUI : MonoBehaviour public class IngameUI : MonoBehaviour
{ {
public GameObject PlanetHud;
public GalaxyMapUI PlanetHud;
public GameObject UnitIcons; public GameObject UnitIcons;
public GameObject PlanetNames;
private List<ISelectable> SelectedElements = new List<ISelectable>(); private List<ISelectable> SelectedElements = new List<ISelectable>();
private Planet selectedPlanet = null;
private void Update() private void Update()
{ {
@ -114,11 +115,11 @@ namespace GWConquest
Planet planet = result.gameObject.GetComponentInParent<Planet>(); Planet planet = result.gameObject.GetComponentInParent<Planet>();
if (planet != null) if (planet != null)
{ {
PlanetHud.SetActive(true);
StickUIToPlanet ui = PlanetHud.GetComponent<StickUIToPlanet>();
ui.target = planet.transform;
ui.Update();
selectedPlanet = planet;
//StickUIToPlanet ui = PlanetHud.GetComponent<StickUIToPlanet>();
//ui.target = planet.transform;
//ui.Update();
PlanetHud.SelectPlanet(planet);
BoltLog.Info("Selecting planet {0}", planet.gameObject); BoltLog.Info("Selecting planet {0}", planet.gameObject);
hasHit = true; hasHit = true;
@ -127,8 +128,7 @@ namespace GWConquest
} }
if(!hasHit) if(!hasHit)
{ {
PlanetHud.SetActive(false);
selectedPlanet = null;
PlanetHud.SelectPlanet(null);
} }
} }
@ -141,21 +141,7 @@ namespace GWConquest
SelectedElements.Clear(); SelectedElements.Clear();
} }
public void BuildFleet()
{
if(selectedPlanet != null)
{
BuildUnitEvent ev = BuildUnitEvent.Create(Bolt.GlobalTargets.OnlyServer);
ev.Player = Player.CurrentPlayer.entity;
ev.Zone = Zone.GetZoneId(selectedPlanet.GetMainZone(ZoneType.Space));
ev.UnitClass = "Frigate";
ev.Send();
PlanetHud.SetActive(false);
selectedPlanet = null;
}
}
} }
} }

+ 1
- 1
Assets/GWConquest/Scripts/Planet.cs View File

@ -73,7 +73,7 @@ namespace GWConquest
{ {
IngameUI ui = FindObjectOfType<IngameUI>(); IngameUI ui = FindObjectOfType<IngameUI>();
GameObject text = Instantiate(textPrefab); GameObject text = Instantiate(textPrefab);
text.transform.SetParent(ui.transform, false);
text.transform.SetParent(ui.PlanetNames.transform, false);
text.transform.localRotation = Quaternion.identity; text.transform.localRotation = Quaternion.identity;
text.GetComponent<StickUIToPlanet>().target = transform; text.GetComponent<StickUIToPlanet>().target = transform;
text.GetComponent<UnityEngine.UI.Text>().text = planetName.ToUpper(); text.GetComponent<UnityEngine.UI.Text>().text = planetName.ToUpper();


+ 2
- 0
Assets/GWConquest/Scripts/PlanetScaling.cs View File

@ -42,6 +42,8 @@ public class PlanetScaling : MonoBehaviour
scale = FixPlanetSize; scale = FixPlanetSize;
} }
scale *= (1000f / cam.pixelHeight);
transform.localScale = scale * Vector3.one; transform.localScale = scale * Vector3.one;
} }
} }

+ 3
- 16
Assets/GWConquest/Scripts/PlanetScaling2.cs View File

@ -15,7 +15,7 @@ namespace GWConquest
Vector3 planetCenter = cam.WorldToScreenPoint(transform.position); Vector3 planetCenter = cam.WorldToScreenPoint(transform.position);
Vector3 planetRadius = new Vector3(planetCenter.x - cam.pixelWidth / 2, planetCenter.y - cam.pixelHeight / 2, 0f);
Vector3 planetRadius = new Vector3(planetCenter.x - cam.pixelWidth / 2f, planetCenter.y - cam.pixelHeight / 2f, 0f);
planetRadius.Normalize(); planetRadius.Normalize();
Vector3 planetEdge = planetCenter + screenScale * planetRadius; Vector3 planetEdge = planetCenter + screenScale * planetRadius;
@ -32,7 +32,7 @@ namespace GWConquest
Vector3 planetCenter = cam.WorldToScreenPoint(transform.position); Vector3 planetCenter = cam.WorldToScreenPoint(transform.position);
Vector3 planetRadius = new Vector3(planetCenter.x - cam.pixelWidth / 2, planetCenter.y - cam.pixelHeight / 2, 0f);
Vector3 planetRadius = new Vector3(planetCenter.x - cam.pixelWidth / 2f, planetCenter.y - cam.pixelHeight / 2f, 0f);
planetRadius.Normalize(); planetRadius.Normalize();
Vector3 planetEdge = planetCenter + planetRadius; Vector3 planetEdge = planetCenter + planetRadius;
@ -85,19 +85,6 @@ namespace GWConquest
//Debug.LogFormat("Planet Center {0}; Planet Edge {1}; Planet Edge distance {2}; Scale {3}", planetCenter, planetRadius, (planetEdge-planetCenter).magnitude, scale); //Debug.LogFormat("Planet Center {0}; Planet Edge {1}; Planet Edge distance {2}; Scale {3}", planetCenter, planetRadius, (planetEdge-planetCenter).magnitude, scale);
} }
private void DrawCircle(Vector3 center, float radius, Vector3 axis, int edges=10)
{
Quaternion rot = Quaternion.FromToRotation(Vector3.forward, axis);
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);
float circPart = 2 * Mathf.PI * radius / edges;
Vector3 dir = new Vector3(circPart * -Mathf.Sin(angle), circPart * Mathf.Cos(angle), 0);
spherical = rot * spherical;
dir = rot * dir;
Debug.DrawRay(center + spherical, dir);
}
}
} }
} }

+ 117
- 18
Assets/GWConquest/Scripts/PlanetScaling3.cs View File

@ -1,35 +1,134 @@
using UnityEngine; using UnityEngine;
using System;
namespace GWConquest namespace GWConquest
{ {
public class PlanetScaling3 : MonoBehaviour public class PlanetScaling3 : MonoBehaviour
{ {
public static float GetMajorSemiAxis(float alpha, float beta, float s, float z)
public float r = 1f;
public float z = 1f;
public float screenRadius = 1f;
public float scaleFactor = 1f;
public float sign = 1f;
public bool drawCircle;
public Texture circle;
public static double GetMajorSemiAxis(double alpha, double beta, double s, double z)
{
double CosAlpha = Math.Cos(alpha);
double SinAlpha = Math.Sin(alpha);
double CosBeta = Math.Cos(beta);
double SinBeta = Math.Sin(beta);
double CosAlphaSq = CosAlpha * CosAlpha;
double CosBetaSq = CosBeta * CosBeta;
double SinBetaSq = SinBeta * SinBeta;
double Cos2Alpha = 2d * CosAlphaSq - 1d;
double Cos2Beta = 2d * CosBetaSq - 1d;
double CotAlpha = CosAlpha / SinAlpha;
double sSq = s * s;
double zSq = z * z;
double f1 = (-3d + Cos2Alpha + 2d * CosAlphaSq * Cos2Beta);
double f2 = (2d * CosAlpha * (1d + (1d + sSq) * Cos2Beta) * CotAlpha + sSq * (-3d + Cos2Alpha) / SinAlpha);
double f3 = (64d * sSq * zSq * (1d + CotAlpha * CotAlpha * SinBetaSq));
double aInvSq = -f1 * f2 * f2 / f3;
return 1d / Math.Sqrt(aInvSq);
}
public double GetSFromSemiAxis(double alpha, double beta, double z, double a, double sign)
{
double A = 1d / (a * a);
double AzSq = A * z * z;
double CosAlpha = Math.Cos(alpha);
double SinAlpha = Math.Sin(alpha);
double CosBeta = Math.Cos(beta);
double SinBeta = Math.Sin(beta);
double CosAlphaSq = CosAlpha * CosAlpha;
double CosBetaSq = CosBeta * CosBeta;
double SinBetaSq = SinBeta * SinBeta;
double Cos2Alpha = 2d * CosAlphaSq - 1d;
double Cos2Beta = 2d * CosBetaSq - 1d;
double CotAlpha = CosAlpha / SinAlpha;
double CotAlphaSq = CotAlpha * CotAlpha;
double f0 = (CotAlphaSq * SinBetaSq + 1d);
double f1 = 2d * CosAlphaSq * Cos2Beta + Cos2Alpha - 3d;
double f2 = CotAlphaSq * CosBetaSq * f1 * f1;
double f3 = 8d * AzSq * f0;
double f4 = sign * 2d * Math.Sqrt(AzSq * f0 * (4d * f2 + 16d * AzSq * f0));
return 2d * Math.Abs(SinAlpha) * Math.Sqrt(-1d / (f1*f1*f1) * (f2 + f3 + f4));
}
public void GetParameters(Camera cam, out float alpha, out float beta, out float d)
{
Vector3 ez = cam.transform.forward;
Vector3 v = transform.position - cam.transform.position;
Vector3 vp = Vector3.ProjectOnPlane(v, cam.transform.up);
alpha = Vector3.SignedAngle(vp, v, cam.transform.right);
beta = Vector3.SignedAngle(ez, vp, cam.transform.up);
d = v.magnitude;
}
private void OnGUI()
{
if(drawCircle)
{
Camera cam = Camera.main;
GetParameters(cam, out float alpha, out float beta, out float d);
float s = r / scaleFactor / d;
float a = (float) GetMajorSemiAxis(alpha * Mathf.Deg2Rad, beta * Mathf.Deg2Rad, s, z);
float sCheck = (float)GetSFromSemiAxis(alpha * Mathf.Deg2Rad, beta * Mathf.Deg2Rad, z, a, sign);
Vector3 screenCenter = cam.WorldToScreenPoint(transform.position);
Rect rect = new Rect(screenCenter.x - a / 2, Screen.height - screenCenter.y - a / 2, a, a);
Debug.LogFormat("alpha: {0}; beta: {1}; s: {2}; a: {3}, check s: {4}", alpha, beta, s, a, sCheck);
GUI.DrawTexture(rect, circle);
}
}
private void Update()
{ {
float CosAlpha = Mathf.Cos(alpha);
float SinAlpha = Mathf.Sin(alpha);
float CosBeta = Mathf.Cos(beta);
float SinBeta = Mathf.Sin(beta);
Camera cam = Camera.main;
float CosAlphaSq = CosAlpha * CosAlpha;
float CosBetaSq = CosBeta * CosBeta;
float SinBetaSq = SinBeta * SinBeta;
GetParameters(cam, out float alpha, out float beta, out float d);
float Cos2Alpha = 2f * CosAlphaSq - 1f;
float Cos2Beta = 2f * CosBetaSq - 1f;
float s = (float) GetSFromSemiAxis(alpha * Mathf.Deg2Rad, beta * Mathf.Deg2Rad, z, screenRadius, sign);
float CotAlpha = CosAlpha / SinAlpha;
float aCheck = (float) GetMajorSemiAxis(alpha * Mathf.Deg2Rad, beta * Mathf.Deg2Rad, s, z);
float sSq = s * s;
float zSq = z * z;
float worldRadius = s * d;
float f1 = (-3f + Cos2Alpha + 2f * CosAlphaSq * Cos2Beta);
float f2 = (2f * Cos2Alpha * (1f + (1f + sSq) * Cos2Beta) * CotAlpha + sSq * (-3f + Cos2Alpha) / SinAlpha);
float f3 = (64f * sSq * zSq * (1f + CotAlpha * CotAlpha * SinBetaSq));
transform.localScale = Vector3.one * worldRadius * scaleFactor;
float aInvSq = -f1 * f2 * f2 / f3;
Debug.LogFormat("alpha: {0}; beta: {1}; d: {2}, s: {3}; orig a: {4}; calc a: {5}", alpha, beta, d, s, screenRadius, aCheck);
return 1f / Mathf.Sqrt(aInvSq);
} }
} }
} }

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

@ -0,0 +1,54 @@
using UnityEngine;
namespace GWConquest
{
public class PlanetScaling4 : MonoBehaviour
{
public float ScreenSize = 1f;
public float ScaleFactor = 1f;
private float DefaultScale;
private void Start()
{
DefaultScale = transform.localScale.x;
}
private void Update()
{
Camera cam = Camera.main;
Vector3 c = cam.transform.position;
Vector3 p = transform.position;
Vector3 ps = cam.WorldToScreenPoint(p);
Vector3 e_ps = new Vector3(ps.x - cam.pixelWidth / 2f, ps.y - cam.pixelHeight / 2f, 0f);
Vector3 rs = ps + ScreenSize * e_ps;
Vector3 r = cam.ScreenToWorldPoint(rs);
Ray r_ray = new Ray(c, r - c);
Debug.DrawLine(c, r, Color.red);
Plane p_plane = new Plane((c - p).normalized, p);
Debug.DrawLine(c, p, Color.blue);
Debug.DrawRay(p_plane.ClosestPointOnPlane(p), p_plane.normal, Color.cyan);
p_plane.Raycast(r_ray, out float enter);
if(enter != 0)
{
Vector3 r_i = r_ray.GetPoint(enter);
float worldRadius = Vector3.Distance(p, r_i);
Debug.DrawLine(p, r_i, Color.green);
transform.localScale = Vector3.one * worldRadius * DefaultScale * ScaleFactor;
}
}
}
}

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

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

+ 30
- 0
Assets/GWConquest/Scripts/ScaleRelativeToText.cs View File

@ -0,0 +1,30 @@
using UnityEngine;
using UnityEngine.UI;
namespace GWConquest
{
[RequireComponent(typeof(RectTransform))]
public class ScaleRelativeToText : MonoBehaviour
{
public Text text;
public float factor;
public float offset;
private RectTransform rt;
private Vector2 origSizeDelta;
private void Start()
{
rt = GetComponent<RectTransform>();
origSizeDelta = rt.sizeDelta;
}
private void Update()
{
Vector2 delta = origSizeDelta;
delta.x = factor * text.preferredWidth + offset;
rt.sizeDelta = delta;
}
}
}

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

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

+ 16
- 0
Assets/GWConquest/Scripts/Util.cs View File

@ -88,6 +88,22 @@ namespace GWConquest
} }
public static void DrawCircle(Vector3 center, float radius, Vector3 axis, int edges = 10)
{
Quaternion rot = Quaternion.FromToRotation(Vector3.forward, axis);
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);
float circPart = 2 * Mathf.PI * radius / edges;
Vector3 dir = new Vector3(circPart * -Mathf.Sin(angle), circPart * Mathf.Cos(angle), 0);
spherical = rot * spherical;
dir = rot * dir;
Debug.DrawRay(center + spherical, dir);
}
}
} }
} }

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

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b0f131d6e9faf0741bec561eebe57338
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

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

@ -0,0 +1,84 @@
%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
m_Shader: {fileID: 10760, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHABLEND_ON
m_LightmapFlags: 4
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: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: bc823f3aaf4ac0944bda814d4ace2a44, 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}
m_Floats:
- _BumpScale: 1
- _ColorMask: 15
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 2
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 5
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _UseUIAlphaClip: 0
- _ZWrite: 0
m_Colors:
- _Color: {r: 1, g: 0.84313726, b: 0.3882353, a: 0.22745098}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

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

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

+ 1
- 1
Assets/GWConquest/Textures/UI/ausklapp dings.png.meta View File

@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1
filterMode: 2
aniso: 2 aniso: 2
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1


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

Before After
Width: 90  |  Height: 90  |  Size: 2.6 KiB

+ 127
- 0
Assets/GWConquest/Textures/UI/indikator1.png.meta View File

@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: a3d43ea2287c0e442b8bfcf6a68fdf2d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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: -1
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: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 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/indikator2.png View File

Before After
Width: 90  |  Height: 90  |  Size: 1.7 KiB

+ 127
- 0
Assets/GWConquest/Textures/UI/indikator2.png.meta View File

@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: b9cbeaf1157e7bc4caaefe06915891b0
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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: -1
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: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 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:

+ 1
- 1
Assets/GWConquest/Textures/UI/kreiswichs3.png.meta View File

@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1
filterMode: 2
aniso: 2 aniso: 2
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1


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

Before After
Width: 128  |  Height: 128  |  Size: 4.7 KiB

+ 127
- 0
Assets/GWConquest/Textures/UI/planetenring.png.meta View File

@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: bc823f3aaf4ac0944bda814d4ace2a44
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 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:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

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

Before After
Width: 149  |  Height: 20  |  Size: 257 B

+ 127
- 0
Assets/GWConquest/Textures/UI/strichliste.png.meta View File

@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: 4f60816dba9022e4e92cfd7cc0983e44
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 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:

Loading…
Cancel
Save