Browse Source

Layers in UI Rendering

bolt_update
laurids 3 years ago
parent
commit
35e1424d42
20 changed files with 1440 additions and 234 deletions
  1. +0
    -84
      Assets/GWConquest/PlanetNames.mat
  2. +3
    -1
      Assets/GWConquest/Prefabs/Planet.prefab
  3. +1
    -1
      Assets/GWConquest/Prefabs/UI/DistrictIcon.prefab
  4. +32
    -0
      Assets/GWConquest/Prefabs/UI/MoneyDisplay.prefab
  5. +1056
    -0
      Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab
  6. +2
    -3
      Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab.meta
  7. +1
    -1
      Assets/GWConquest/Resources/PlanetConnection.prefab
  8. +180
    -127
      Assets/GWConquest/Scenes/GalaxyMap.unity
  9. +92
    -0
      Assets/GWConquest/Scripts/BattleLog.cs
  10. +11
    -0
      Assets/GWConquest/Scripts/BattleLog.cs.meta
  11. +14
    -8
      Assets/GWConquest/Scripts/GWCamera.cs
  12. +2
    -0
      Assets/GWConquest/Scripts/GameManager.cs
  13. +4
    -3
      Assets/GWConquest/Scripts/Planet.cs
  14. +19
    -0
      Assets/GWConquest/Scripts/TurnToCamera.cs
  15. +11
    -0
      Assets/GWConquest/Scripts/TurnToCamera.cs.meta
  16. +4
    -4
      Assets/GWConquest/Scripts/UI/GalaxyMapUI.cs
  17. +3
    -0
      Assets/GWConquest/Scripts/UI/IngameUI.cs
  18. +0
    -1
      Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs
  19. +4
    -0
      Assets/GWConquest/Scripts/Unit.cs
  20. +1
    -1
      ProjectSettings/TagManager.asset

+ 0
- 84
Assets/GWConquest/PlanetNames.mat View File

@ -1,84 +0,0 @@
%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: PlanetNames
m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 10
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: 0}
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: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _UseUIAlphaClip: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

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

@ -93,7 +93,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
textPrefab: {fileID: 0}
textPrefab: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3}
spaceZones: spaceZones:
- {fileID: 4678135252239284612} - {fileID: 4678135252239284612}
groundZones: groundZones:
@ -101,6 +102,7 @@ MonoBehaviour:
showPlanetName: 1 showPlanetName: 1
planetName: planetName:
planetCameraTransform: {fileID: 3266501631720423375} planetCameraTransform: {fileID: 3266501631720423375}
InTransitFormations: []
connections: [] connections: []
--- !u!1 &4678135251355824058 --- !u!1 &4678135251355824058
GameObject: GameObject:


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

@ -295,7 +295,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 4efcda70235ff1d4ca9ef256caac46ee, type: 2}
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0 m_RaycastTarget: 0
m_Maskable: 1 m_Maskable: 1


+ 32
- 0
Assets/GWConquest/Prefabs/UI/MoneyDisplay.prefab View File

@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 4096209424460686482} - component: {fileID: 4096209424460686482}
- component: {fileID: 4096209424460686484} - component: {fileID: 4096209424460686484}
- component: {fileID: 4096209424460686483} - component: {fileID: 4096209424460686483}
- component: {fileID: 6615438051788853644}
m_Layer: 5 m_Layer: 5
m_Name: Total m_Name: Total
m_TagString: Untagged m_TagString: Untagged
@ -78,6 +79,21 @@ MonoBehaviour:
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 1000 m_Text: 1000
--- !u!114 &6615438051788853644
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4096209424460686481}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.63529414}
m_EffectDistance: {x: 2, y: -2}
m_UseGraphicAlpha: 1
--- !u!1 &4096209424666407826 --- !u!1 &4096209424666407826
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -281,6 +297,7 @@ GameObject:
- component: {fileID: 4411086135142167815} - component: {fileID: 4411086135142167815}
- component: {fileID: 7939806406244802544} - component: {fileID: 7939806406244802544}
- component: {fileID: 773670987009055092} - component: {fileID: 773670987009055092}
- component: {fileID: 3928546618575188225}
m_Layer: 5 m_Layer: 5
m_Name: Balance m_Name: Balance
m_TagString: Untagged m_TagString: Untagged
@ -348,6 +365,21 @@ MonoBehaviour:
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: '[+200]' m_Text: '[+200]'
--- !u!114 &3928546618575188225
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4928236438828894843}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.63529414}
m_EffectDistance: {x: 2, y: -2}
m_UseGraphicAlpha: 1
--- !u!1 &5945601791339210574 --- !u!1 &5945601791339210574
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0


+ 1056
- 0
Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab
File diff suppressed because it is too large
View File


Assets/GWConquest/PlanetNames.mat.meta → Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab.meta View File

@ -1,8 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 4efcda70235ff1d4ca9ef256caac46ee
NativeFormatImporter:
guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264
PrefabImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

+ 1
- 1
Assets/GWConquest/Resources/PlanetConnection.prefab View File

@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 5208040857522702122} - component: {fileID: 5208040857522702122}
- component: {fileID: 5208040857522702121} - component: {fileID: 5208040857522702121}
- component: {fileID: 526244009083771565} - component: {fileID: 526244009083771565}
m_Layer: 0
m_Layer: 10
m_Name: PlanetConnection m_Name: PlanetConnection
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}


+ 180
- 127
Assets/GWConquest/Scenes/GalaxyMap.unity View File

@ -586,7 +586,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -1999,7 +1999,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -2386,7 +2386,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -2642,7 +2642,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -3869,7 +3869,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -4087,7 +4087,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -6835,7 +6835,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -7231,7 +7231,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -12770,7 +12770,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -13010,6 +13010,80 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 59300c3dd14d29d4895f5f18e85d7eb3, type: 3} m_Script: {fileID: 11500000, guid: 59300c3dd14d29d4895f5f18e85d7eb3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1 &197337106
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 197337107}
- component: {fileID: 197337108}
m_Layer: 0
m_Name: ConnectionsCam
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &197337107
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 197337106}
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: 663080993}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &197337108
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 197337106}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 1
far clip plane: 100000
field of view: 60
orthographic: 1
orthographic size: 774.82
m_Depth: -2
m_CullingMask:
serializedVersion: 2
m_Bits: 1024
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &200482310 --- !u!1 &200482310
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -15327,7 +15401,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -15991,7 +16065,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -16470,7 +16544,7 @@ Transform:
m_LocalScale: {x: 50, y: 50, z: 50} m_LocalScale: {x: 50, y: 50, z: 50}
m_Children: [] m_Children: []
m_Father: {fileID: 539048598} m_Father: {fileID: 539048598}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!135 &276098502 --- !u!135 &276098502
SphereCollider: SphereCollider:
@ -17156,7 +17230,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -18652,7 +18726,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -19934,7 +20008,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -20725,7 +20799,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -21002,7 +21076,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 6
value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
@ -22483,7 +22557,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -23282,7 +23356,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -23490,7 +23564,7 @@ PrefabInstance:
- target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 7
value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
type: 3} type: 3}
@ -24345,7 +24419,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -25246,7 +25320,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -25872,7 +25946,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -31572,7 +31646,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -31791,7 +31865,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -32835,7 +32909,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -33123,7 +33197,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -33153,7 +33227,7 @@ PrefabInstance:
- target: {fileID: 7191419555384860655, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 7191419555384860655, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 5
value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7191419555384860655, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 7191419555384860655, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -33304,7 +33378,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -34823,7 +34897,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -35997,7 +36071,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 6
value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
@ -38745,7 +38819,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -40182,6 +40256,7 @@ MonoBehaviour:
PlayerFleetPanel: {fileID: 1002982021} PlayerFleetPanel: {fileID: 1002982021}
EnemyFleetPanel: {fileID: 18126404} EnemyFleetPanel: {fileID: 18126404}
PlanetSelection: {fileID: 1798411514} PlanetSelection: {fileID: 1798411514}
NeutralSelectionColor: {r: 0.66, g: 0.66, b: 0.66, a: 1}
PlayerIndicator: {fileID: 1847976303} PlayerIndicator: {fileID: 1847976303}
EnemyIndicator: {fileID: 1983076281} EnemyIndicator: {fileID: 1983076281}
--- !u!1 &659889902 --- !u!1 &659889902
@ -40340,7 +40415,8 @@ Transform:
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: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 197337107}
m_Father: {fileID: 690503116} m_Father: {fileID: 690503116}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -40452,7 +40528,7 @@ Camera:
m_GameObject: {fileID: 663080992} m_GameObject: {fileID: 663080992}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_ClearFlags: 1
m_ClearFlags: 3
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1 m_projectionMatrixMode: 1
m_GateFitMode: 2 m_GateFitMode: 2
@ -40474,7 +40550,7 @@ Camera:
m_Depth: -1 m_Depth: -1
m_CullingMask: m_CullingMask:
serializedVersion: 2 serializedVersion: 2
m_Bits: 4294967295
m_Bits: 823
m_RenderingPath: -1 m_RenderingPath: -1
m_TargetTexture: {fileID: 0} m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0 m_TargetDisplay: 0
@ -40953,7 +41029,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -41335,7 +41411,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -42988,7 +43064,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -45123,7 +45199,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -45341,7 +45417,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -47175,7 +47251,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -48102,7 +48178,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -50823,7 +50899,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -52204,7 +52280,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -53358,7 +53434,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -54511,7 +54587,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -54998,7 +55074,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -55211,7 +55287,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -57424,7 +57500,7 @@ Transform:
m_LocalScale: {x: 50, y: 50, z: 50} m_LocalScale: {x: 50, y: 50, z: 50}
m_Children: [] m_Children: []
m_Father: {fileID: 509110626} m_Father: {fileID: 509110626}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!135 &952141930 --- !u!135 &952141930
SphereCollider: SphereCollider:
@ -58776,7 +58852,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -60338,7 +60414,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -60649,7 +60725,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -61882,7 +61958,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -62316,7 +62392,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -62798,7 +62874,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -64323,7 +64399,7 @@ Transform:
m_LocalScale: {x: 50, y: 50, z: 50} m_LocalScale: {x: 50, y: 50, z: 50}
m_Children: [] m_Children: []
m_Father: {fileID: 1969868143} m_Father: {fileID: 1969868143}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!135 &1059617906 --- !u!135 &1059617906
SphereCollider: SphereCollider:
@ -64755,7 +64831,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -64933,7 +65009,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -65833,7 +65909,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -67522,7 +67598,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -68141,7 +68217,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -68453,7 +68529,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -70091,7 +70167,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -71992,7 +72068,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -72942,7 +73018,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -75005,7 +75081,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4006107773484516, guid: 7311d170d172b8443ae175801f682aad, type: 3} - target: {fileID: 4006107773484516, guid: 7311d170d172b8443ae175801f682aad, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 5
value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4006107773484516, guid: 7311d170d172b8443ae175801f682aad, type: 3} - target: {fileID: 4006107773484516, guid: 7311d170d172b8443ae175801f682aad, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
@ -75991,7 +76067,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -77109,7 +77185,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -79107,7 +79183,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -89809,7 +89885,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -91394,7 +91470,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -93879,7 +93955,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -94324,7 +94400,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -94759,7 +94835,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -98535,7 +98611,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -100219,7 +100295,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -102434,7 +102510,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -103314,7 +103390,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -105211,7 +105287,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -106612,7 +106688,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -106928,7 +107004,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -107614,7 +107690,7 @@ PrefabInstance:
- target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 8
value: 5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
type: 3} type: 3}
@ -113954,7 +114030,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -114162,7 +114238,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -114370,7 +114446,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -114801,7 +114877,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -115258,7 +115334,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -116443,7 +116519,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -118861,7 +118937,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -120955,7 +121031,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -122052,7 +122128,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -122430,7 +122506,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -122808,7 +122884,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -122838,7 +122914,7 @@ PrefabInstance:
- target: {fileID: 7191419555384860655, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 7191419555384860655, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 5
value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7191419555384860655, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 7191419555384860655, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -124755,7 +124831,6 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 1992706994} - component: {fileID: 1992706994}
- component: {fileID: 1992706995}
- component: {fileID: 1992706993} - component: {fileID: 1992706993}
m_Layer: 0 m_Layer: 0
m_Name: Camera Rotator m_Name: Camera Rotator
@ -124777,6 +124852,9 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
cameraTransform: {fileID: 690503116} cameraTransform: {fileID: 690503116}
mainCam: {fileID: 663080998}
additionalCameras:
- {fileID: 197337108}
cameraTranslationSpeedMinZoom: 1000 cameraTranslationSpeedMinZoom: 1000
cameraTranslationSpeedMaxZoom: 3500 cameraTranslationSpeedMaxZoom: 3500
scrollRegionSize: 10 scrollRegionSize: 10
@ -124804,31 +124882,6 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 54.33, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 54.33, y: 0, z: 0}
--- !u!114 &1992706995
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1992706992}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 70d295fa3522a4f4a84d1c92a0a98a94, type: 3}
m_Name:
m_EditorClassIdentifier:
cameraTransform: {fileID: 690503116}
cameraTranslationSpeedMinZoom: 1000
cameraTranslationSpeedMaxZoom: 3500
scrollRegionSize: 10
cameraRotationSpeed: 300
cameraZoomSpeed: 300000
cameraZoomTranslationSpeed: 1
cameraZoomSmooth: 0.03
cameraTranslationSmooth: 0.03
minCameraAngle: 35
maxCameraAngle: 90
minCameraZoom: -5000
maxCameraZoom: -300
--- !u!1001 &1993069155 --- !u!1001 &1993069155
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -125854,7 +125907,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -127163,7 +127216,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -128979,7 +129032,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -129806,7 +129859,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -130605,7 +130658,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -131045,7 +131098,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}
@ -131679,7 +131732,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: textPrefab propertyPath: textPrefab
value: value:
objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52,
objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264,
type: 3} type: 3}
- target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3} type: 3}


+ 92
- 0
Assets/GWConquest/Scripts/BattleLog.cs View File

@ -0,0 +1,92 @@
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using Bolt;
using System;
namespace GWConquest
{
public class BattleLog
{
public static BattleLog Instance;
public struct BattleLogUnitEntry
{
public NetworkId Id;
public string ClassName;
public int PlayerID;
public UnitClass UnitClass {
get => UnitClass.FromName(ClassName);
}
public Unit Unit {
get => BoltNetwork.FindEntity(Id)?.GetComponent<Unit>();
}
}
public struct BattleLogBattleEntry
{
public NetworkId Id;
public string BattleName;
public string PlanetName;
public Battle Battle {
get => BoltNetwork.FindEntity(Id)?.GetComponent<Battle>();
}
}
public enum BattleLogAction {
Attacked, Killed
}
public struct BattleLogEntry
{
public BattleLogUnitEntry Unit;
public BattleLogUnitEntry Target;
public BattleLogBattleEntry Battle;
public BattleLogAction Action;
public DateTime Timestamp;
public BattleLogEntry(Unit unit, BattleLogAction action, Unit target = null, Battle battle = null)
{
Unit = new BattleLogUnitEntry() {
Id = unit.entity.NetworkId,
ClassName = unit.state.UnitClass,
PlayerID = unit.Player.PlayerId
};
Action = action;
if(target != null)
{
Target = new BattleLogUnitEntry() {
Id = target.entity.NetworkId,
ClassName = target.state.UnitClass,
PlayerID = target.Player.PlayerId
};
}
else {
Target = new BattleLogUnitEntry();
}
if(battle != null)
{
Battle = new BattleLogBattleEntry() {
Id = battle.entity.NetworkId,
BattleName = battle.name,
PlanetName = battle.Zone.planet.name
};
}
else {
Battle = new BattleLogBattleEntry();
}
Timestamp = DateTime.Now;
}
}
public List<BattleLogEntry> Entries = new List<BattleLogEntry>();
public void AddEntry(Unit unit, BattleLogAction action, Unit target = null, Battle battle = null)
{
Entries.Add(new BattleLogEntry(unit, action, target, battle));
}
}
}

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

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

+ 14
- 8
Assets/GWConquest/Scripts/GWCamera.cs View File

@ -8,6 +8,9 @@ namespace GWConquest
{ {
public Transform cameraTransform; public Transform cameraTransform;
public Camera mainCam;
public Camera[] additionalCameras;
public float cameraTranslationSpeedMinZoom = 1f; public float cameraTranslationSpeedMinZoom = 1f;
public float cameraTranslationSpeedMaxZoom = 1f; public float cameraTranslationSpeedMaxZoom = 1f;
@ -37,10 +40,9 @@ namespace GWConquest
private void Start() private void Start()
{ {
Camera cam = cameraTransform.GetComponentInChildren<Camera>();
if(cam.orthographic)
if(mainCam.orthographic)
{ {
cameraZoomTarget = cam.orthographicSize;
cameraZoomTarget = mainCam.orthographicSize;
} }
else else
{ {
@ -133,10 +135,9 @@ namespace GWConquest
float middle = Input.GetAxis("Mouse ScrollWheel"); float middle = Input.GetAxis("Mouse ScrollWheel");
Camera cam = cameraTransform.GetComponentInChildren<Camera>();
if (cam != null)
if (mainCam != null)
{ {
if (cam.orthographic)
if (mainCam.orthographic)
{ {
if (middle != 0) if (middle != 0)
{ {
@ -145,8 +146,13 @@ namespace GWConquest
} }
cam.orthographicSize = Mathf.SmoothDamp(cam.orthographicSize, cameraZoomTarget, ref cameraZoomVelocity, cameraZoomSmooth);
var orthSize = Mathf.SmoothDamp(mainCam.orthographicSize, cameraZoomTarget, ref cameraZoomVelocity, cameraZoomSmooth);
mainCam.orthographicSize = orthSize;
foreach(Camera cam in additionalCameras)
{
cam.orthographicSize = orthSize;
}
} }
else else
{ {
@ -190,7 +196,7 @@ namespace GWConquest
public void ResetCameraTransform() public void ResetCameraTransform()
{ {
Camera.main.transform.SetParent(cameraTransform, true);
mainCam.transform.SetParent(cameraTransform, true);
} }
} }
} }


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

@ -54,6 +54,8 @@ namespace GWConquest
UnitClass.LoadClassMap(); UnitClass.LoadClassMap();
PlanetRegistry.Load(); PlanetRegistry.Load();
BattleLog.Instance = new BattleLog();
} }
public void OnSceneLoadLocalDone() public void OnSceneLoadLocalDone()


+ 4
- 3
Assets/GWConquest/Scripts/Planet.cs View File

@ -36,7 +36,7 @@ namespace GWConquest
get => PlanetRegistry.GetPlanetData(gameObject.name); get => PlanetRegistry.GetPlanetData(gameObject.name);
} }
private PlanetIndicatorUI indicatorUI;
public PlanetIndicatorUI indicatorUI {get; private set;}
public List<Formation> InTransitFormations = new List<Formation>(); public List<Formation> InTransitFormations = new List<Formation>();
@ -116,10 +116,11 @@ namespace GWConquest
if (showPlanetName) if (showPlanetName)
{ {
IngameUI ui = FindObjectOfType<IngameUI>();
GameObject text = Instantiate(textPrefab); GameObject text = Instantiate(textPrefab);
text.transform.SetParent(ui.PlanetNames.transform, false);
text.transform.SetParent(transform);
text.transform.localPosition = Vector3.zero;
text.transform.localRotation = Quaternion.identity; text.transform.localRotation = Quaternion.identity;
text.transform.localScale = Vector3.one;
indicatorUI = text.GetComponent<PlanetIndicatorUI>(); indicatorUI = text.GetComponent<PlanetIndicatorUI>();
indicatorUI.SetPlanet(this); indicatorUI.SetPlanet(this);
} }


+ 19
- 0
Assets/GWConquest/Scripts/TurnToCamera.cs View File

@ -0,0 +1,19 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace GWConquest
{
public class TurnToCamera : MonoBehaviour
{
private Camera mainCam;
private void Start() {
mainCam = Camera.main;
}
private void Update() {
transform.rotation = mainCam.transform.rotation;
}
}
}

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

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

+ 4
- 4
Assets/GWConquest/Scripts/UI/GalaxyMapUI.cs View File

@ -13,6 +13,7 @@ namespace GWConquest
public GameObject EnemyFleetPanel; public GameObject EnemyFleetPanel;
public GameObject PlanetSelection; public GameObject PlanetSelection;
public Color NeutralSelectionColor;
private Planet SelectedPlanet; private Planet SelectedPlanet;
@ -37,10 +38,9 @@ namespace GWConquest
PlanetSelection.SetActive(true); PlanetSelection.SetActive(true);
PlanetSelection.transform.SetParent(planet.transform, false); PlanetSelection.transform.SetParent(planet.transform, false);
Renderer r = PlanetSelection.GetComponentInChildren<Renderer>(); Renderer r = PlanetSelection.GetComponentInChildren<Renderer>();
if(Player.CurrentPlayer != null)
{
r.material.color = r.material.color.UpdateColorRGB(Player.CurrentPlayer.Color);
}
var player = SelectedPlanet.ControllingPlayer;
var playerColor = player == null ? NeutralSelectionColor : player.Color;
r.material.color = r.material.color.UpdateColorRGB(playerColor);
PlanetNameText.text = SelectedPlanet.planetName; PlanetNameText.text = SelectedPlanet.planetName;
UpdateIndicator(); UpdateIndicator();


+ 3
- 0
Assets/GWConquest/Scripts/UI/IngameUI.cs View File

@ -251,6 +251,8 @@ namespace GWConquest
r.enabled = false; r.enabled = false;
} }
} }
p.indicatorUI.gameObject.SetActive(false);
} }
PlanetViewEnabled = true; PlanetViewEnabled = true;
@ -269,6 +271,7 @@ namespace GWConquest
{ {
r.enabled = true; r.enabled = true;
} }
p.indicatorUI.gameObject.SetActive(true);
} }
GWCamera camera = FindObjectOfType<GWCamera>(); GWCamera camera = FindObjectOfType<GWCamera>();


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

@ -34,7 +34,6 @@ namespace GWConquest
Planet = planet; Planet = planet;
PlanetNameText.text = planet.planetName.ToUpper(); PlanetNameText.text = planet.planetName.ToUpper();
PlanetNameText.gameObject.SetActive(planet.showPlanetName); PlanetNameText.gameObject.SetActive(planet.showPlanetName);
GetComponent<StickUIToPlanet>().target = planet.transform;
} }
public void UpdateIndicator() public void UpdateIndicator()


+ 4
- 0
Assets/GWConquest/Scripts/Unit.cs View File

@ -174,8 +174,12 @@ namespace GWConquest
if(Hitpoints <= 0) if(Hitpoints <= 0)
{ {
BattleLog.Instance.AddEntry(attacker, BattleLog.BattleLogAction.Killed, this, CurrentBattle);
CurrentBattle.OnUnitDead(this); CurrentBattle.OnUnitDead(this);
} }
else {
BattleLog.Instance.AddEntry(attacker, BattleLog.BattleLogAction.Attacked, this, CurrentBattle);
}
} }
public override void OnEvent(UnitDamageAnimEvent evnt) public override void OnEvent(UnitDamageAnimEvent evnt)


+ 1
- 1
ProjectSettings/TagManager.asset View File

@ -15,7 +15,7 @@ TagManager:
- -
- PostProcessing - PostProcessing
- Illuminated - Illuminated
-
- Connections
- -
- -
- -


Loading…
Cancel
Save