Browse Source

Anpassungen bei Distrikten

bolt_update
laurids 4 years ago
parent
commit
0fd4121706
26 changed files with 10775 additions and 130 deletions
  1. +1
    -1
      Assets/Exo planets/Materials/Atmospheres/Atmosphere Elysia.mat
  2. +3
    -3
      Assets/Exo planets/Materials/Manthra/Elysia.mat
  3. +0
    -0
      Assets/Exo planets/Materials/Manthra/Elysia.mat.meta
  4. +2
    -2
      Assets/Exo planets/Materials/Rayeon/Kies.mat
  5. +134
    -0
      Assets/GWConquest/Animations/ExplosionEffect.anim
  6. +8
    -0
      Assets/GWConquest/Animations/ExplosionEffect.anim.meta
  7. +72
    -0
      Assets/GWConquest/Animations/ExplosionEffect.controller
  8. +8
    -0
      Assets/GWConquest/Animations/ExplosionEffect.controller.meta
  9. +1
    -1
      Assets/GWConquest/Prefabs/DistrictConnectionLine.prefab
  10. +94
    -0
      Assets/GWConquest/Prefabs/ExplosionEffect.prefab
  11. +7
    -0
      Assets/GWConquest/Prefabs/ExplosionEffect.prefab.meta
  12. +75
    -0
      Assets/GWConquest/Prefabs/PlanetName.prefab
  13. +9900
    -123
      Assets/GWConquest/Scenes/GalaxyMap.unity
  14. +11
    -0
      Assets/GWConquest/Scripts/Editor/LoadEditorHooks.cs
  15. +35
    -0
      Assets/GWConquest/Scripts/ExplosionEffect.cs
  16. +11
    -0
      Assets/GWConquest/Scripts/ExplosionEffect.cs.meta
  17. +9
    -0
      Assets/GWConquest/Scripts/ExplosionEffectSpawner.cs
  18. +11
    -0
      Assets/GWConquest/Scripts/ExplosionEffectSpawner.cs.meta
  19. +9
    -0
      Assets/GWConquest/Scripts/Planet.cs
  20. BIN
      Assets/GWConquest/Textures/Icons/Crossed Swords.png
  21. +128
    -0
      Assets/GWConquest/Textures/Icons/Crossed Swords.png.meta
  22. BIN
      Assets/GWConquest/Textures/Icons/DistrictSpecial.png
  23. BIN
      Assets/GWConquest/Textures/Icons/ICON Food2.png
  24. +128
    -0
      Assets/GWConquest/Textures/Icons/ICON Food2.png.meta
  25. BIN
      Assets/Planet Textures/TexturesForPlanets-TerrestrialWorldsPack/Terrestrial6.png
  26. +128
    -0
      Assets/Planet Textures/TexturesForPlanets-TerrestrialWorldsPack/Terrestrial6.png.meta

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

@ -61,7 +61,7 @@ Material:
- _Atmospherecircle: 0.221 - _Atmospherecircle: 0.221
- _Atmosphereintensity: 2.69 - _Atmosphereintensity: 2.69
- _Atmospherepower: 5.4 - _Atmospherepower: 5.4
- _Atmospheresize: 1.82
- _Atmospheresize: 1.17
- _BumpScale: 1 - _BumpScale: 1
- _Cutoff: 0.5 - _Cutoff: 0.5
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1


Assets/Exo planets/Materials/Manthra/Voteine.mat → Assets/Exo planets/Materials/Manthra/Elysia.mat View File

@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Voteine
m_Name: Elysia
m_Shader: {fileID: 4800000, guid: 2b63a18536f01a84ea44b4a20e3d9950, type: 3} m_Shader: {fileID: 4800000, guid: 2b63a18536f01a84ea44b4a20e3d9950, type: 3}
m_ShaderKeywords: _ACTIVATECLOUDS_ON _ACTIVATESPECULAR_ON _DESACTIVATECLOUDS_ON m_ShaderKeywords: _ACTIVATECLOUDS_ON _ACTIVATESPECULAR_ON _DESACTIVATECLOUDS_ON
_DESACTIVATESPECULAR_ON _EMISSION _METALLICGLOSSMAP _NORMALMAP _SUBATMOSPHERE_ON _DESACTIVATESPECULAR_ON _EMISSION _METALLICGLOSSMAP _NORMALMAP _SUBATMOSPHERE_ON
@ -154,7 +154,7 @@ Material:
- _Citiesintensity: 0 - _Citiesintensity: 0
- _Citiesoffset: 55.2 - _Citiesoffset: 55.2
- _Clouds: 0 - _Clouds: 0
- _Cloudspeed: 0
- _Cloudspeed: 1.2
- _Cutoff: 0.5 - _Cutoff: 0.5
- _DesactivateSpecular: 1 - _DesactivateSpecular: 1
- _Desactivateclouds: 1 - _Desactivateclouds: 1
@ -219,7 +219,7 @@ Material:
- _Specularcolor: {r: 0.228, g: 0.228, b: 0.228, a: 1} - _Specularcolor: {r: 0.228, g: 0.228, b: 0.228, a: 1}
- _Subatmospherecolor: {r: 0.38188234, g: 0.541, b: 0.46080476, a: 1} - _Subatmospherecolor: {r: 0.38188234, g: 0.541, b: 0.46080476, a: 1}
- _Vector0: {r: 0, g: 0, b: 1, a: 0} - _Vector0: {r: 0, g: 0, b: 1, a: 0}
- _cloudscolor: {r: 1, g: 1, b: 1, a: 0.534}
- _cloudscolor: {r: 1, g: 1, b: 1, a: 0.5058824}
- _node_1666: {r: 0.078, g: 0.078, b: 0.078, a: 1} - _node_1666: {r: 0.078, g: 0.078, b: 0.078, a: 1}
- _node_2409: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _node_2409: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _node_3404: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _node_3404: {r: 0.5, g: 0.5, b: 0.5, a: 1}

Assets/Exo planets/Materials/Manthra/Voteine.mat.meta → Assets/Exo planets/Materials/Manthra/Elysia.mat.meta View File


+ 2
- 2
Assets/Exo planets/Materials/Rayeon/Kies.mat View File

@ -20,7 +20,7 @@ Material:
serializedVersion: 3 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
- _Albedo: - _Albedo:
m_Texture: {fileID: 2800000, guid: 94d031300ff3dea4b8d1f623e55ef789, type: 3}
m_Texture: {fileID: 2800000, guid: ec2b449f231e1da40b18a985cbbf961a, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _BumpMap: - _BumpMap:
@ -157,7 +157,7 @@ Material:
- _Metallic: 0 - _Metallic: 0
- _Mode: 0 - _Mode: 0
- _Nightemissivecities: 0 - _Nightemissivecities: 0
- _Normalintensity: 0.229
- _Normalintensity: 0.252
- _OcclusionStrength: 0.509 - _OcclusionStrength: 0.509
- _Parallax: 0.02 - _Parallax: 0.02
- _PlanetSize: 0 - _PlanetSize: 0


+ 134
- 0
Assets/GWConquest/Animations/ExplosionEffect.anim View File

@ -0,0 +1,134 @@
%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: ExplosionEffect
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.25
value: 20
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Intensity
path:
classID: 108
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 898800009
script: {fileID: 0}
typeID: 108
customType: 25
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: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.25
value: 20
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Intensity
path:
classID: 108
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

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

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

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

@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-6533499431841669166
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ExplosionEffect
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 8f70bd9d3caea034e81bf2db8faf6155, 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: ExplosionEffect
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 6711408286309912353}
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 &6711408286309912353
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: -6533499431841669166}
m_Position: {x: 200, y: 0, 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: -6533499431841669166}

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

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

+ 1
- 1
Assets/GWConquest/Prefabs/DistrictConnectionLine.prefab View File

@ -59,7 +59,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.25490198}
m_Color: {r: 0.764, g: 0.764, b: 0.764, a: 0.34117648}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:


+ 94
- 0
Assets/GWConquest/Prefabs/ExplosionEffect.prefab View File

@ -0,0 +1,94 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &697270919620692323
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 697270919620692324}
- component: {fileID: 697270919620692325}
m_Layer: 0
m_Name: ExplosionEffect
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &697270919620692324
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 697270919620692323}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.61, y: 16.57, z: -22.75}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!108 &697270919620692325
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 697270919620692323}
m_Enabled: 1
serializedVersion: 10
m_Type: 2
m_Shape: 0
m_Color: {r: 1, g: 0.97072124, b: 0.8392157, a: 1}
m_Intensity: 20
m_Range: 24
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.02
m_NormalBias: 0.1
m_NearPlane: 0.1
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_ShadowRadius: 0
m_ShadowAngle: 0

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

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

+ 75
- 0
Assets/GWConquest/Prefabs/PlanetName.prefab View File

@ -300,6 +300,80 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!1 &7750222351875905342
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4683751590912112855}
- component: {fileID: 4177847249845695254}
- component: {fileID: 404777252566447264}
m_Layer: 5
m_Name: Image (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &4683751590912112855
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7750222351875905342}
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: 73}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4177847249845695254
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7750222351875905342}
m_CullTransparentMesh: 0
--- !u!114 &404777252566447264
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7750222351875905342}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: bc2b1d353cc325444a4639e32670f558, 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 --- !u!1 &8334873843302281854
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -330,6 +404,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 6028510490724794839} - {fileID: 6028510490724794839}
- {fileID: 7734904490864791259} - {fileID: 7734904490864791259}
- {fileID: 4683751590912112855}
m_Father: {fileID: 8467716388278459802} m_Father: {fileID: 8467716388278459802}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}


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


+ 11
- 0
Assets/GWConquest/Scripts/Editor/LoadEditorHooks.cs View File

@ -10,10 +10,13 @@ namespace GWConquest
{ {
planetGuiStyle.normal.textColor = Color.white; planetGuiStyle.normal.textColor = Color.white;
planetGuiStyle.fontSize = 20; planetGuiStyle.fontSize = 20;
districtGuiStyle.normal.textColor = Color.white;
districtGuiStyle.fontSize = 16;
SceneView.duringSceneGui += SceneView_duringSceneGui; SceneView.duringSceneGui += SceneView_duringSceneGui;
} }
private static GUIStyle planetGuiStyle = new GUIStyle(); private static GUIStyle planetGuiStyle = new GUIStyle();
private static GUIStyle districtGuiStyle = new GUIStyle();
private static void SceneView_duringSceneGui(SceneView obj) private static void SceneView_duringSceneGui(SceneView obj)
{ {
@ -21,6 +24,14 @@ namespace GWConquest
{ {
Handles.Label(planet.transform.position, planet.planetName, planetGuiStyle); Handles.Label(planet.transform.position, planet.planetName, planetGuiStyle);
} }
foreach (District d in Object.FindObjectsOfType<District>())
{
if(Vector3.Distance(d.transform.position, obj.camera.transform.position) <= 200)
{
Handles.Label(d.transform.position, d.DistrictName, districtGuiStyle);
}
}
} }
} }
} }

+ 35
- 0
Assets/GWConquest/Scripts/ExplosionEffect.cs View File

@ -0,0 +1,35 @@
using UnityEngine;
namespace GWConquest
{
public class ExplosionEffect : MonoBehaviour
{
public float RangeMin;
public float RangeMax;
public float DurationMin;
public float DurationMax;
private float endTime;
private void Start()
{
Light l = GetComponent<Light>();
l.range = Random.Range(RangeMin, RangeMax);
Animator a = GetComponent<Animator>();
float duration = Random.Range(DurationMin, DurationMax);
a.speed = 1 / duration;
endTime = Time.time + duration;
}
private void Update()
{
if(Time.time >= endTime)
{
Destroy(gameObject);
}
}
}
}

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

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

+ 9
- 0
Assets/GWConquest/Scripts/ExplosionEffectSpawner.cs View File

@ -0,0 +1,9 @@
using UnityEngine;
namespace GWConquest
{
public class ExplosionEffectSpawner : MonoBehaviour
{
}
}

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

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

+ 9
- 0
Assets/GWConquest/Scripts/Planet.cs View File

@ -277,6 +277,15 @@ namespace GWConquest
} }
} }
[ContextMenu("EnterView")]
public void EnterView()
{
var view = UnityEditor.SceneView.lastActiveSceneView;
var camT = planetCameraTransform;
view.LookAt(camT.position + camT.forward, camT.rotation, 1f);
}
#endif #endif
} }
} }

BIN
Assets/GWConquest/Textures/Icons/Crossed Swords.png View File

Before After
Width: 860  |  Height: 885  |  Size: 29 KiB

+ 128
- 0
Assets/GWConquest/Textures/Icons/Crossed Swords.png.meta View File

@ -0,0 +1,128 @@
fileFormatVersion: 2
guid: bc2b1d353cc325444a4639e32670f558
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 2
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 2
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/GWConquest/Textures/Icons/DistrictSpecial.png View File

Before After
Width: 180  |  Height: 180  |  Size: 2.2 KiB Width: 260  |  Height: 260  |  Size: 2.8 KiB

BIN
Assets/GWConquest/Textures/Icons/ICON Food2.png View File

Before After
Width: 180  |  Height: 180  |  Size: 4.1 KiB

+ 128
- 0
Assets/GWConquest/Textures/Icons/ICON Food2.png.meta View File

@ -0,0 +1,128 @@
fileFormatVersion: 2
guid: 8cc0e0c4f06ba004fb7ba3358f07744f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 2
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 2
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Planet Textures/TexturesForPlanets-TerrestrialWorldsPack/Terrestrial6.png View File

Before After
Width: 2000  |  Height: 1000  |  Size: 2.6 MiB

+ 128
- 0
Assets/Planet Textures/TexturesForPlanets-TerrestrialWorldsPack/Terrestrial6.png.meta View File

@ -0,0 +1,128 @@
fileFormatVersion: 2
guid: ec2b449f231e1da40b18a985cbbf961a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
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
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:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Loading…
Cancel
Save