diff --git a/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml b/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml
index dac127bd6..7941cfd63 100644
--- a/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml
+++ b/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml
@@ -1928,7 +1928,6 @@
-
@@ -1938,6 +1937,7 @@
+
@@ -1979,6 +1979,7 @@
+
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
index 30251ec65..424203d6e 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -576,7 +576,7 @@
-
+
@@ -702,6 +702,7 @@
+
diff --git a/Assets/Materials/Planet.mat b/Assets/Materials/Planet.mat
index 2ae518f0a..5efc2f40c 100644
--- a/Assets/Materials/Planet.mat
+++ b/Assets/Materials/Planet.mat
@@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Planet
- m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+ m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
@@ -63,6 +63,7 @@ Material:
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
+ - _InvFade: 1
- _Metallic: 1
- _Mode: 0
- _OcclusionStrength: 1
@@ -75,4 +76,5 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
m_BuildTextureStacks: []
diff --git a/Assets/Materials/Skybox.mat b/Assets/Materials/Skybox.mat
new file mode 100644
index 000000000..bceddb072
--- /dev/null
+++ b/Assets/Materials/Skybox.mat
@@ -0,0 +1,85 @@
+%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: Skybox
+ m_Shader: {fileID: 103, guid: 0000000000000000f000000000000000, type: 0}
+ m_ShaderKeywords:
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 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}
+ - _Tex:
+ m_Texture: {fileID: 8900000, guid: 6c0135b6b66262141b9c5c465f8cb018, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _Exposure: 1
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _Rotation: 180
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _Tint: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/Skybox.mat.meta b/Assets/Materials/Skybox.mat.meta
new file mode 100644
index 000000000..575e2e225
--- /dev/null
+++ b/Assets/Materials/Skybox.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 79db663d2fbb102459f8b1caf620f8c9
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/Thrusters.mat b/Assets/Materials/Thrusters.mat
index 540673470..cfa16759b 100644
--- a/Assets/Materials/Thrusters.mat
+++ b/Assets/Materials/Thrusters.mat
@@ -65,7 +65,7 @@ Material:
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _Emission: 15
- - _EmissionFresnel: 4
+ - _EmissionFresnel: 0
- _EmissionRoughnessFresnelPower: 0.5
- _GlossMapScale: 1
- _Glossiness: 1
diff --git a/Assets/Materials/UI/Panel Blur.mat b/Assets/Materials/UI/Panel Blur.mat
new file mode 100644
index 000000000..42cb5b606
--- /dev/null
+++ b/Assets/Materials/UI/Panel Blur.mat
@@ -0,0 +1,81 @@
+%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: Panel Blur
+ m_Shader: {fileID: 4800000, guid: 3951069d814b7174ca3bb4e8e302198b, type: 3}
+ m_ShaderKeywords:
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 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
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _Size: 3
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _AdditiveColor: {r: 0.01530794, g: 0.036446206, b: 0.0754717, a: 0}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _MultiplyColor: {r: 0.86774653, g: 0.89065343, b: 0.9433962, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/UI/Panel Blur.mat.meta b/Assets/Materials/UI/Panel Blur.mat.meta
new file mode 100644
index 000000000..9a7f4b2c2
--- /dev/null
+++ b/Assets/Materials/UI/Panel Blur.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0f1ddbd2b64ea724c81430875def275d
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/UI/Properties Panel.prefab b/Assets/Prefabs/UI/Properties Panel.prefab
index 1008ed77d..e82037b66 100644
--- a/Assets/Prefabs/UI/Properties Panel.prefab
+++ b/Assets/Prefabs/UI/Properties Panel.prefab
@@ -48,7 +48,7 @@ MonoBehaviour:
m_GameObject: {fileID: 2378632238049155249}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
@@ -62,6 +62,9 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 1
+ m_ChildScaleWidth: 0
+ m_ChildScaleHeight: 0
+ m_ReverseArrangement: 0
--- !u!114 &2378632238049155250
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -71,7 +74,7 @@ MonoBehaviour:
m_GameObject: {fileID: 2378632238049155249}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
@@ -172,12 +175,14 @@ MonoBehaviour:
m_GameObject: {fileID: 2378632238144827086}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.44583336, b: 0.050000012, a: 0.65882355}
m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -190,6 +195,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1 &2378632238683789173
GameObject:
m_ObjectHideFlags: 0
@@ -238,7 +244,7 @@ MonoBehaviour:
m_GameObject: {fileID: 2378632238683789173}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
@@ -259,12 +265,14 @@ MonoBehaviour:
m_GameObject: {fileID: 2378632238683789173}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -277,6 +285,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1 &2378632239203440072
GameObject:
m_ObjectHideFlags: 0
@@ -367,12 +376,14 @@ MonoBehaviour:
m_GameObject: {fileID: 2378632239835291314}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8, g: 0.9333333, b: 1, a: 1}
m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -385,6 +396,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1 &2378632240158519327
GameObject:
m_ObjectHideFlags: 0
@@ -434,7 +446,7 @@ MonoBehaviour:
m_GameObject: {fileID: 2378632240158519327}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Content: {fileID: 2378632238049155248}
@@ -472,12 +484,14 @@ MonoBehaviour:
m_GameObject: {fileID: 2378632240158519327}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0.064619616, b: 0.154, a: 1}
m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -490,6 +504,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1 &2378632240161980828
GameObject:
m_ObjectHideFlags: 0
@@ -546,12 +561,14 @@ MonoBehaviour:
m_GameObject: {fileID: 2378632240161980828}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8, g: 0.9333333, b: 1, a: 1}
m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -564,6 +581,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!114 &2378632240161980830
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -573,7 +591,7 @@ MonoBehaviour:
m_GameObject: {fileID: 2378632240161980828}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: -2061169968, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -587,17 +605,20 @@ MonoBehaviour:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
+ m_SelectedTrigger: Highlighted
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 2378632238144827080}
@@ -670,12 +691,14 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Kreacher's Comfort
m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: f353c922a07f02041bdb1694a3faf9b7, type: 2}
+ m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2}
m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417,
type: 2}
m_fontSharedMaterials: []
@@ -695,13 +718,12 @@ MonoBehaviour:
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: 0
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_outlineColor:
- serializedVersion: 2
- rgba: 4278190080
m_fontSize: 72
m_fontSizeBase: 72
m_fontWeight: 400
@@ -709,6 +731,8 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
+ m_HorizontalAlignment: 1
+ m_VerticalAlignment: 256
m_textAlignment: 513
m_characterSpacing: 0
m_wordSpacing: 0
@@ -719,10 +743,8 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
- m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
- m_isLinkedTextComponent: 0
- m_isTextTruncated: 0
+ parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
@@ -730,40 +752,18 @@ MonoBehaviour:
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
- m_ignoreRectMaskCulling: 0
- m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
- m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
- m_textInfo:
- textComponent: {fileID: 5116519198747529738}
- characterCount: 18
- spriteCount: 0
- spaceCount: 1
- wordCount: 2
- linkCount: 0
- lineCount: 2
- pageCount: 1
- materialCount: 1
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
- m_spriteAnimator: {fileID: 0}
m_hasFontAssetChanged: 0
- m_subTextObjects:
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &5116519198747529737
@@ -775,7 +775,7 @@ MonoBehaviour:
m_GameObject: {fileID: 5116519198747529743}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
diff --git a/Assets/Prefabs/UI/Tab Button Primary.prefab b/Assets/Prefabs/UI/Tab Button Primary.prefab
index c2041e155..98d8b38e0 100644
--- a/Assets/Prefabs/UI/Tab Button Primary.prefab
+++ b/Assets/Prefabs/UI/Tab Button Primary.prefab
@@ -56,12 +56,14 @@ MonoBehaviour:
m_GameObject: {fileID: 1623098955363046084}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8, g: 0.9333333, b: 1, a: 1}
m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -74,6 +76,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!114 &323497596060304149
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -83,7 +86,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1623098955363046084}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
@@ -97,6 +100,9 @@ MonoBehaviour:
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 1
m_ChildControlHeight: 1
+ m_ChildScaleWidth: 0
+ m_ChildScaleHeight: 0
+ m_ReverseArrangement: 0
--- !u!1 &3643147971825354321
GameObject:
m_ObjectHideFlags: 0
@@ -158,12 +164,14 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Corporation
m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: 54f472d4b2cd9b84b8d9917ec13a4e94, type: 2}
+ m_fontAsset: {fileID: 11400000, guid: 9dcd07b95faae7641a3ff6fccab43c32, type: 2}
m_sharedMaterial: {fileID: 21096540314249858, guid: 54f472d4b2cd9b84b8d9917ec13a4e94,
type: 2}
m_fontSharedMaterials: []
@@ -183,13 +191,12 @@ MonoBehaviour:
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: 0
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_outlineColor:
- serializedVersion: 2
- rgba: 4278190080
m_fontSize: 28
m_fontSizeBase: 28
m_fontWeight: 400
@@ -197,6 +204,8 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
+ m_HorizontalAlignment: 1
+ m_VerticalAlignment: 256
m_textAlignment: 514
m_characterSpacing: 0
m_wordSpacing: 0
@@ -207,10 +216,8 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
- m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
- m_isLinkedTextComponent: 0
- m_isTextTruncated: 0
+ parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
@@ -218,40 +225,18 @@ MonoBehaviour:
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
- m_ignoreRectMaskCulling: 0
- m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
- m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
- m_textInfo:
- textComponent: {fileID: 4750078953547169287}
- characterCount: 11
- spriteCount: 0
- spaceCount: 0
- wordCount: 1
- linkCount: 0
- lineCount: 1
- pageCount: 1
- materialCount: 1
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
- m_spriteAnimator: {fileID: 0}
m_hasFontAssetChanged: 0
- m_subTextObjects:
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &6150766591087508235
@@ -263,7 +248,7 @@ MonoBehaviour:
m_GameObject: {fileID: 3643147971825354321}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
@@ -316,7 +301,7 @@ MonoBehaviour:
m_GameObject: {fileID: 3856099931455214244}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
@@ -336,7 +321,7 @@ MonoBehaviour:
m_GameObject: {fileID: 3856099931455214244}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
@@ -350,6 +335,9 @@ MonoBehaviour:
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 1
m_ChildControlHeight: 1
+ m_ChildScaleWidth: 0
+ m_ChildScaleHeight: 0
+ m_ReverseArrangement: 0
--- !u!114 &6049092145546415630
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -445,12 +433,14 @@ MonoBehaviour:
m_GameObject: {fileID: 6976631978676041201}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0.4180913, b: 1, a: 0.15294118}
m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -463,6 +453,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!114 &4015983150623777738
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -472,7 +463,7 @@ MonoBehaviour:
m_GameObject: {fileID: 6976631978676041201}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
@@ -486,3 +477,6 @@ MonoBehaviour:
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 1
m_ChildControlHeight: 1
+ m_ChildScaleWidth: 0
+ m_ChildScaleHeight: 0
+ m_ReverseArrangement: 0
diff --git a/Assets/Resources/Prefabs.meta b/Assets/Resources/Prefabs.meta
new file mode 100644
index 000000000..88a1d7ee4
--- /dev/null
+++ b/Assets/Resources/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 84000e015b1ada84585d91d47f7d381b
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Prefabs/Djinni Variant.prefab b/Assets/Resources/Prefabs/Djinni Variant.prefab
new file mode 100644
index 000000000..491289461
--- /dev/null
+++ b/Assets/Resources/Prefabs/Djinni Variant.prefab
@@ -0,0 +1,498 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &25961229
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 25961230}
+ m_Layer: 0
+ m_Name: Barrel R
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &25961230
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 25961229}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 4.84, y: 2.92, z: -1.64}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 9106854767781449910}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &667648200
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 667648201}
+ m_Layer: 0
+ m_Name: Thruster Port Fore
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &667648201
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 667648200}
+ m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
+ m_LocalPosition: {x: -2.02, y: -0.48, z: 3.39}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 9106854767781449910}
+ m_RootOrder: 13
+ m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
+--- !u!1 &780806499
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 780806500}
+ m_Layer: 0
+ m_Name: Thruster Port Aft
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &780806500
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 780806499}
+ m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
+ m_LocalPosition: {x: -3.05, y: 0.89, z: -4.32}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 9106854767781449910}
+ m_RootOrder: 12
+ m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
+--- !u!1 &805915458
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 805915459}
+ m_Layer: 0
+ m_Name: Thruster Starboard Fore
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &805915459
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 805915458}
+ m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+ m_LocalPosition: {x: 2.02, y: -0.48, z: 3.39}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 9106854767781449910}
+ m_RootOrder: 11
+ m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+--- !u!1 &899813959
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 899813960}
+ m_Layer: 0
+ m_Name: Thruster Starboard Aft
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &899813960
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 899813959}
+ m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+ m_LocalPosition: {x: 3.05, y: 0.89, z: -4.32}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 9106854767781449910}
+ m_RootOrder: 10
+ m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+--- !u!1 &904728024
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 904728025}
+ m_Layer: 0
+ m_Name: Barrel L
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &904728025
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 904728024}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -4.84, y: 2.92, z: -1.64}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 9106854767781449910}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1146951630
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1146951631}
+ m_Layer: 0
+ m_Name: Thruster Stern 1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1146951631
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1146951630}
+ m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+ m_LocalPosition: {x: 0, y: 4.3, z: -8.56}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 9106854767781449910}
+ m_RootOrder: 7
+ m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!1 &1229289401
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1229289402}
+ m_Layer: 0
+ m_Name: Thruster Bow
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1229289402
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1229289401}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: -0.48, z: 5.57}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 9106854767781449910}
+ m_RootOrder: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1438588954
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1438588955}
+ m_Layer: 0
+ m_Name: Nostril L
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1438588955
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1438588954}
+ m_LocalRotation: {x: -0.23534305, y: -0, z: -0, w: 0.9719124}
+ m_LocalPosition: {x: -1.39, y: 1.16, z: 2.69}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 9106854767781449910}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: -27.224, y: 0, z: 0}
+--- !u!1 &1710933324
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1710933325}
+ m_Layer: 0
+ m_Name: Nostril R
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1710933325
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1710933324}
+ m_LocalRotation: {x: -0.23534305, y: -0, z: -0, w: 0.9719124}
+ m_LocalPosition: {x: 1.39, y: 1.16, z: 2.69}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 9106854767781449910}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: -27.224, y: 0, z: 0}
+--- !u!1 &1988296487
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1988296488}
+ m_Layer: 0
+ m_Name: Thruster Stern 2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1988296488
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1988296487}
+ m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+ m_LocalPosition: {x: 0, y: 3.28, z: -8.56}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 9106854767781449910}
+ m_RootOrder: 8
+ m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!1 &2130472298
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2130472299}
+ m_Layer: 0
+ m_Name: Thruster Stern 3
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2130472299
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2130472298}
+ m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+ m_LocalPosition: {x: 0, y: 2.3, z: -8.56}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 9106854767781449910}
+ m_RootOrder: 9
+ m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!1001 &8784470446643017565
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 1547.9908
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 799.0965
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -2571.4744
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_Name
+ value: Djinni
+ objectReference: {fileID: 0}
+ - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 7852708265981260911, guid: ea7457b9a4f0bcb43becaa33de541cbd,
+ type: 3}
+ - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_Materials.Array.data[1]
+ value:
+ objectReference: {fileID: 3720744386649352057, guid: b2bec4b400153d745b2915f1c43e5c96,
+ type: 3}
+ - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_Materials.Array.data[5]
+ value:
+ objectReference: {fileID: -905690159841262435, guid: a74970be876d3554ea0f279f39314c9c,
+ type: 3}
+ - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_Materials.Array.data[2]
+ value:
+ objectReference: {fileID: 7852708265981260911, guid: ea7457b9a4f0bcb43becaa33de541cbd,
+ type: 3}
+ - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_Materials.Array.data[4]
+ value:
+ objectReference: {fileID: 2100000, guid: a76a85450aa271448a72b7dfeec9ff53, type: 2}
+ - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_Materials.Array.data[3]
+ value:
+ objectReference: {fileID: 2100000, guid: 616adaf59c64a444f8249cc7cf13c527, type: 2}
+ - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_Materials.Array.data[6]
+ value:
+ objectReference: {fileID: 2100000, guid: 761295ee40506ed489244e2dd3b73158, type: 2}
+ - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_Materials.Array.data[7]
+ value:
+ objectReference: {fileID: -741235592913766832, guid: 885e680924fc12c439a842a2142d4b78,
+ type: 3}
+ - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_Materials.Array.data[8]
+ value:
+ objectReference: {fileID: 2100000, guid: b9036e605cc538943a8c7bec97257e87, type: 2}
+ - target: {fileID: 6947464325843983966, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: -741235592913766832, guid: 885e680924fc12c439a842a2142d4b78,
+ type: 3}
+ - target: {fileID: 6947464325843983966, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ propertyPath: m_Materials.Array.data[1]
+ value:
+ objectReference: {fileID: 2100000, guid: 616adaf59c64a444f8249cc7cf13c527, type: 2}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: caefaa8e0cbce524f97eb0db4be80a98, type: 3}
+--- !u!4 &9106854767781449910 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+ type: 3}
+ m_PrefabInstance: {fileID: 8784470446643017565}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Resources/Prefabs/Djinni Variant.prefab.meta b/Assets/Resources/Prefabs/Djinni Variant.prefab.meta
new file mode 100644
index 000000000..6d66dc96b
--- /dev/null
+++ b/Assets/Resources/Prefabs/Djinni Variant.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 79024f635e46f5546b670b58b07fa037
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Schematics.meta b/Assets/Resources/Schematics.meta
new file mode 100644
index 000000000..598dd4edb
--- /dev/null
+++ b/Assets/Resources/Schematics.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c608010d4ff1de14597b1789563b9bb0
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Schematics/djinni_schematic_transparent.png b/Assets/Resources/Schematics/djinni_schematic_transparent.png
new file mode 100644
index 000000000..c0180af90
--- /dev/null
+++ b/Assets/Resources/Schematics/djinni_schematic_transparent.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ab61e13e0913aebafd7b84891dcbfe9794b50e0ea5a97c5d7d3a287576797cd
+size 137958
diff --git a/Assets/Resources/Schematics/djinni_schematic_transparent.png.meta b/Assets/Resources/Schematics/djinni_schematic_transparent.png.meta
new file mode 100644
index 000000000..5879ba412
--- /dev/null
+++ b/Assets/Resources/Schematics/djinni_schematic_transparent.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: 66f3acdd44f2d1d4ba287c396b60a494
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 0
+ 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: 1
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ 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: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ 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:
diff --git a/Assets/Resources/Sprites/Flat UI/32px/Flat-Circle-Fill.png.meta b/Assets/Resources/Sprites/Flat UI/32px/Flat-Circle-Fill.png.meta
index c40cba135..4e49f95a8 100644
--- a/Assets/Resources/Sprites/Flat UI/32px/Flat-Circle-Fill.png.meta
+++ b/Assets/Resources/Sprites/Flat UI/32px/Flat-Circle-Fill.png.meta
@@ -1,9 +1,9 @@
fileFormatVersion: 2
guid: 84d126f984de5fd42ac66361c00f830c
TextureImporter:
- fileIDToRecycleName: {}
+ internalIDToNameTable: []
externalObjects: {}
- serializedVersion: 9
+ serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
@@ -23,6 +23,7 @@ TextureImporter:
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
+ vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@@ -57,8 +58,10 @@ TextureImporter:
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 1
platformSettings:
- - serializedVersion: 2
+ - serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
@@ -69,7 +72,8 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- - serializedVersion: 2
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
@@ -80,7 +84,8 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- - serializedVersion: 2
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
@@ -91,6 +96,7 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
@@ -98,10 +104,12 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: ecda74375f1d8d1419ad160d77545271
+ internalID: 0
vertices: []
indices:
edges: []
weights: []
+ secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
diff --git a/Assets/Resources/Sprites/Flat UI/32px/Flat-Rectangle-Outline.png.meta b/Assets/Resources/Sprites/Flat UI/32px/Flat-Rectangle-Outline.png.meta
index dce0fccbf..76c3b896f 100644
--- a/Assets/Resources/Sprites/Flat UI/32px/Flat-Rectangle-Outline.png.meta
+++ b/Assets/Resources/Sprites/Flat UI/32px/Flat-Rectangle-Outline.png.meta
@@ -1,12 +1,12 @@
fileFormatVersion: 2
guid: 61501af80fabaac44ace015a55851277
TextureImporter:
- fileIDToRecycleName: {}
+ internalIDToNameTable: []
externalObjects: {}
- serializedVersion: 9
+ serializedVersion: 11
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -23,6 +23,7 @@ TextureImporter:
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
+ vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@@ -57,8 +58,10 @@ TextureImporter:
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 1
platformSettings:
- - serializedVersion: 2
+ - serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
@@ -69,7 +72,8 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- - serializedVersion: 2
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
@@ -80,7 +84,8 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- - serializedVersion: 2
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
@@ -91,6 +96,7 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
@@ -98,10 +104,12 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: f10bcab2d2b57f840837990f151a3f9b
+ internalID: 0
vertices: []
indices:
edges: []
weights: []
+ secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
diff --git a/Assets/Resources/Sprites/Flat UI/Node.psd b/Assets/Resources/Sprites/Flat UI/Node.psd
new file mode 100644
index 000000000..818a6cfb0
--- /dev/null
+++ b/Assets/Resources/Sprites/Flat UI/Node.psd
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc268066a0ab49d6d79262b80b225b16a5759c64aa15e32f84b50a5e60eaa240
+size 20696
diff --git a/Assets/Resources/Sprites/Flat UI/Node.psd.meta b/Assets/Resources/Sprites/Flat UI/Node.psd.meta
new file mode 100644
index 000000000..286694b15
--- /dev/null
+++ b/Assets/Resources/Sprites/Flat UI/Node.psd.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: 31f38e71d656fb141b1a8242a15e308c
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ 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: 6, y: 6, z: 6, w: 6}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ 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: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ 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: 1
+ pSDShowRemoveMatteOption: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/ARPG.unity b/Assets/Scenes/ARPG.unity
index b896df24e..2334183c7 100644
--- a/Assets/Scenes/ARPG.unity
+++ b/Assets/Scenes/ARPG.unity
@@ -24,15 +24,15 @@ RenderSettings:
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
- m_AmbientMode: 3
+ m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
- m_SkyboxMaterial: {fileID: 0}
+ m_SkyboxMaterial: {fileID: 2100000, guid: 79db663d2fbb102459f8b1caf620f8c9, type: 2}
m_HaloStrength: 0.47
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
- m_DefaultReflectionMode: 1
+ m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
@@ -373,6 +373,81 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 27001711}
m_CullTransparentMesh: 0
+--- !u!1 &30325822
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 30325823}
+ - component: {fileID: 30325825}
+ - component: {fileID: 30325824}
+ m_Layer: 5
+ m_Name: Background
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &30325823
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 30325822}
+ 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: 568539021}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &30325824
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 30325822}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 2100000, guid: 0f1ddbd2b64ea724c81430875def275d, type: 2}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 84d126f984de5fd42ac66361c00f830c, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &30325825
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 30325822}
+ m_CullTransparentMesh: 0
--- !u!114 &33146103
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -619,7 +694,7 @@ PrefabInstance:
- target: {fileID: 2378632238049155248, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.y
- value: -677.8058
+ value: -707.7656
objectReference: {fileID: 0}
- target: {fileID: 2378632238049155248, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
@@ -735,17 +810,17 @@ PrefabInstance:
- target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -458.32788
+ value: -458.2378
objectReference: {fileID: 0}
- target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.x
- value: 424.00003
+ value: 424
objectReference: {fileID: 0}
- target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.y
- value: 852.65576
+ value: 852.4756
objectReference: {fileID: 0}
- target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
@@ -805,22 +880,22 @@ PrefabInstance:
- target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 203.50002
+ value: 203.5
objectReference: {fileID: 0}
- target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -87.425
+ value: -72.354996
objectReference: {fileID: 0}
- target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.x
- value: 343.00003
+ value: 343
objectReference: {fileID: 0}
- target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.y
- value: 110.85
+ value: 80.71
objectReference: {fileID: 0}
- target: {fileID: 5116519198747529738, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
@@ -861,7 +936,7 @@ PrefabInstance:
type: 3}
propertyPath: m_sharedMaterial
value:
- objectReference: {fileID: 21423695648544140, guid: f353c922a07f02041bdb1694a3faf9b7,
+ objectReference: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417,
type: 2}
- target: {fileID: 5116519198747529738, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
@@ -873,6 +948,11 @@ PrefabInstance:
propertyPath: m_VerticalAlignment
value: 512
objectReference: {fileID: 0}
+ - target: {fileID: 5116519198747529738, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
+ type: 3}
+ propertyPath: m_TextStyleHashCode
+ value: -1183493901
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4fca44e21a27a6d48916d2cc4b6e2df0, type: 3}
--- !u!224 &77284610 stripped
@@ -881,18 +961,6 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 77284609}
m_PrefabAsset: {fileID: 0}
---- !u!114 &77284611 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 2378632238049155148, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
- type: 3}
- m_PrefabInstance: {fileID: 77284609}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 8c2bf4a7080061d42a87046c37bf0c60, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &77284612 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2378632240158519327, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
@@ -1154,14 +1222,14 @@ MonoBehaviour:
m_text: 'Name Your Corporation:'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f353c922a07f02041bdb1694a3faf9b7, type: 2}
- m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417,
+ m_sharedMaterial: {fileID: 21423695648544140, guid: f353c922a07f02041bdb1694a3faf9b7,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4294962636
+ rgba: 4294962892
m_fontColor: {r: 0.8, g: 0.9333333, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
@@ -1174,7 +1242,7 @@ MonoBehaviour:
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
- m_TextStyleHashCode: 0
+ m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
@@ -1186,9 +1254,9 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
- m_HorizontalAlignment: 1
- m_VerticalAlignment: 256
- m_textAlignment: 514
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
@@ -2284,7 +2352,7 @@ PrefabInstance:
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 120.755
+ value: 108.795
objectReference: {fileID: 0}
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -2294,7 +2362,7 @@ PrefabInstance:
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 241.51
+ value: 217.59
objectReference: {fileID: 0}
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -2326,6 +2394,17 @@ PrefabInstance:
propertyPath: m_textAlignment
value: 65535
objectReference: {fileID: 0}
+ - target: {fileID: 4750078953547169287, guid: b93e36d73a071274d8e9225e077ce92a,
+ type: 3}
+ propertyPath: m_sharedMaterial
+ value:
+ objectReference: {fileID: 21906973755630180, guid: 9dcd07b95faae7641a3ff6fccab43c32,
+ type: 2}
+ - target: {fileID: 4750078953547169287, guid: b93e36d73a071274d8e9225e077ce92a,
+ type: 3}
+ propertyPath: m_TextStyleHashCode
+ value: -1183493901
+ objectReference: {fileID: 0}
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_LocalPosition.x
@@ -2384,7 +2463,7 @@ PrefabInstance:
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 515.215
+ value: 555.43994
objectReference: {fileID: 0}
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -2394,7 +2473,7 @@ PrefabInstance:
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 241.51
+ value: 217.59
objectReference: {fileID: 0}
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -2439,7 +2518,7 @@ PrefabInstance:
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 120.755
+ value: 108.795
objectReference: {fileID: 0}
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -2459,7 +2538,7 @@ PrefabInstance:
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 177.51
+ value: 153.59
objectReference: {fileID: 0}
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -2479,7 +2558,7 @@ PrefabInstance:
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 120.755
+ value: 108.795
objectReference: {fileID: 0}
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -2489,7 +2568,7 @@ PrefabInstance:
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 241.51
+ value: 217.59
objectReference: {fileID: 0}
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -3026,8 +3105,8 @@ MonoBehaviour:
m_Calls: []
m_text: Haverford
m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: f353c922a07f02041bdb1694a3faf9b7, type: 2}
- m_sharedMaterial: {fileID: 21423695648544140, guid: f353c922a07f02041bdb1694a3faf9b7,
+ m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2}
+ m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
@@ -3052,7 +3131,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 64.95
+ m_fontSize: 72
m_fontSizeBase: 72
m_fontWeight: 400
m_enableAutoSizing: 1
@@ -3117,7 +3196,7 @@ PrefabInstance:
- target: {fileID: 2378632238049155248, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.y
- value: -677.8058
+ value: -707.7656
objectReference: {fileID: 0}
- target: {fileID: 2378632238049155248, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
@@ -3233,17 +3312,17 @@ PrefabInstance:
- target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -458.32788
+ value: -458.2378
objectReference: {fileID: 0}
- target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.x
- value: 424.00003
+ value: 424
objectReference: {fileID: 0}
- target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.y
- value: 852.65576
+ value: 852.4756
objectReference: {fileID: 0}
- target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
@@ -3298,22 +3377,22 @@ PrefabInstance:
- target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 203.50002
+ value: 203.5
objectReference: {fileID: 0}
- target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -87.425
+ value: -72.354996
objectReference: {fileID: 0}
- target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.x
- value: 343.00003
+ value: 343
objectReference: {fileID: 0}
- target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.y
- value: 110.85
+ value: 80.71
objectReference: {fileID: 0}
- target: {fileID: 5116519198747529738, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
@@ -3354,7 +3433,7 @@ PrefabInstance:
type: 3}
propertyPath: m_sharedMaterial
value:
- objectReference: {fileID: 21423695648544140, guid: f353c922a07f02041bdb1694a3faf9b7,
+ objectReference: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417,
type: 2}
- target: {fileID: 5116519198747529738, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
@@ -3374,18 +3453,6 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 217221140}
m_PrefabAsset: {fileID: 0}
---- !u!114 &217221142 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 2378632238049155148, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
- type: 3}
- m_PrefabInstance: {fileID: 217221140}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 8c2bf4a7080061d42a87046c37bf0c60, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &217221143 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2378632240158519327, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
@@ -4112,7 +4179,7 @@ PrefabInstance:
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 85.515
+ value: 74.115005
objectReference: {fileID: 0}
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -4122,7 +4189,7 @@ PrefabInstance:
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 171.03
+ value: 148.23001
objectReference: {fileID: 0}
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -4173,7 +4240,7 @@ PrefabInstance:
type: 3}
propertyPath: m_sharedMaterial
value:
- objectReference: {fileID: 21096540314249858, guid: 54f472d4b2cd9b84b8d9917ec13a4e94,
+ objectReference: {fileID: 21906973755630180, guid: 9dcd07b95faae7641a3ff6fccab43c32,
type: 2}
- target: {fileID: 4750078953547169287, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -4248,7 +4315,7 @@ PrefabInstance:
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 721.48505
+ value: 738.35
objectReference: {fileID: 0}
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -4258,7 +4325,7 @@ PrefabInstance:
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 171.03
+ value: 148.23001
objectReference: {fileID: 0}
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -4303,7 +4370,7 @@ PrefabInstance:
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 85.515
+ value: 74.115005
objectReference: {fileID: 0}
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -4323,7 +4390,7 @@ PrefabInstance:
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 107.03
+ value: 84.23
objectReference: {fileID: 0}
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -4343,7 +4410,7 @@ PrefabInstance:
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 85.515
+ value: 74.115005
objectReference: {fileID: 0}
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -4353,7 +4420,7 @@ PrefabInstance:
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 171.03
+ value: 148.23001
objectReference: {fileID: 0}
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -4715,6 +4782,81 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &349065300
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 349065301}
+ - component: {fileID: 349065303}
+ - component: {fileID: 349065302}
+ m_Layer: 5
+ m_Name: Outline
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &349065301
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 349065300}
+ 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: 1511218667}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: -0.000015258789}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &349065302
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 349065300}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.8, g: 0.9333333, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 61501af80fabaac44ace015a55851277, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &349065303
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 349065300}
+ m_CullTransparentMesh: 0
--- !u!1001 &355950000
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5096,6 +5238,167 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 366446303}
m_CullTransparentMesh: 0
+--- !u!1 &454123650
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 454123651}
+ - component: {fileID: 454123654}
+ - component: {fileID: 454123653}
+ - component: {fileID: 454123652}
+ m_Layer: 5
+ m_Name: Scrollbar Vertical
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &454123651
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 454123650}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 1574836809}
+ m_Father: {fileID: 1580606745}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 20, y: 0}
+ m_Pivot: {x: 1, y: 1}
+--- !u!114 &454123652
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 454123650}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Highlighted
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 1863852358}
+ m_HandleRect: {fileID: 1863852357}
+ m_Direction: 2
+ m_Value: 0
+ m_Size: 1
+ m_NumberOfSteps: 0
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &454123653
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 454123650}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.8, g: 0.9333333, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 61501af80fabaac44ace015a55851277, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &454123654
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 454123650}
+ m_CullTransparentMesh: 0
+--- !u!1 &456626301
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 456626302}
+ m_Layer: 5
+ m_Name: Inventory Cell
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &456626302
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 456626301}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 1077503104}
+ m_Father: {fileID: 710974995}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 220, y: -247}
+ m_SizeDelta: {x: 32, y: 32}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &459052957
GameObject:
m_ObjectHideFlags: 0
@@ -6674,6 +6977,44 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 561872388}
m_CullTransparentMesh: 0
+--- !u!1 &568539020
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 568539021}
+ m_Layer: 5
+ m_Name: Inventory
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &568539021
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 568539020}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 30325823}
+ - {fileID: 1736632659}
+ - {fileID: 1580606745}
+ m_Father: {fileID: 761574181}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 512, y: 512}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &569895571
GameObject:
m_ObjectHideFlags: 0
@@ -7885,14 +8226,14 @@ MonoBehaviour:
m_text: Select Parent Corporation
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f353c922a07f02041bdb1694a3faf9b7, type: 2}
- m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417,
+ m_sharedMaterial: {fileID: 21423695648544140, guid: f353c922a07f02041bdb1694a3faf9b7,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4294962636
+ rgba: 4294962892
m_fontColor: {r: 0.8, g: 0.9333333, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
@@ -7905,7 +8246,7 @@ MonoBehaviour:
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
- m_TextStyleHashCode: 0
+ m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
@@ -7917,9 +8258,9 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
- m_HorizontalAlignment: 1
- m_VerticalAlignment: 256
- m_textAlignment: 514
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
@@ -8116,137 +8457,68 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 690092968}
m_CullTransparentMesh: 0
---- !u!1001 &691453770
-PrefabInstance:
+--- !u!1 &710974994
+GameObject:
m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 1547.9908
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 799.0965
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: -2571.4744
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_RootOrder
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 919132149155446097, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_Name
- value: Djinni
- objectReference: {fileID: 0}
- - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 7852708265981260911, guid: ea7457b9a4f0bcb43becaa33de541cbd,
- type: 3}
- - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_Materials.Array.data[1]
- value:
- objectReference: {fileID: 3720744386649352057, guid: b2bec4b400153d745b2915f1c43e5c96,
- type: 3}
- - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_Materials.Array.data[5]
- value:
- objectReference: {fileID: -905690159841262435, guid: a74970be876d3554ea0f279f39314c9c,
- type: 3}
- - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_Materials.Array.data[2]
- value:
- objectReference: {fileID: 7852708265981260911, guid: ea7457b9a4f0bcb43becaa33de541cbd,
- type: 3}
- - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_Materials.Array.data[4]
- value:
- objectReference: {fileID: 2100000, guid: a76a85450aa271448a72b7dfeec9ff53, type: 2}
- - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_Materials.Array.data[3]
- value:
- objectReference: {fileID: 2100000, guid: 616adaf59c64a444f8249cc7cf13c527, type: 2}
- - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_Materials.Array.data[6]
- value:
- objectReference: {fileID: 2100000, guid: 761295ee40506ed489244e2dd3b73158, type: 2}
- - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_Materials.Array.data[7]
- value:
- objectReference: {fileID: -741235592913766832, guid: 885e680924fc12c439a842a2142d4b78,
- type: 3}
- - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_Materials.Array.data[8]
- value:
- objectReference: {fileID: 2100000, guid: b9036e605cc538943a8c7bec97257e87, type: 2}
- - target: {fileID: 6947464325843983966, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: -741235592913766832, guid: 885e680924fc12c439a842a2142d4b78,
- type: 3}
- - target: {fileID: 6947464325843983966, guid: caefaa8e0cbce524f97eb0db4be80a98,
- type: 3}
- propertyPath: m_Materials.Array.data[1]
- value:
- objectReference: {fileID: 3720744386649352057, guid: b2bec4b400153d745b2915f1c43e5c96,
- type: 3}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: caefaa8e0cbce524f97eb0db4be80a98, type: 3}
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 710974995}
+ - component: {fileID: 710974996}
+ m_Layer: 5
+ m_Name: Content
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &710974995
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 710974994}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 456626302}
+ - {fileID: 1387443815}
+ m_Father: {fileID: 1505156505}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0.000015258789, y: 0}
+ m_SizeDelta: {x: -4, y: -2}
+ m_Pivot: {x: 0, y: 1}
+--- !u!114 &710974996
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 710974994}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 4
+ m_StartCorner: 2
+ m_StartAxis: 0
+ m_CellSize: {x: 32, y: 32}
+ m_Spacing: {x: 0, y: 0}
+ m_Constraint: 1
+ m_ConstraintCount: 4
--- !u!1 &713373301
GameObject:
m_ObjectHideFlags: 0
@@ -9579,7 +9851,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
- m_ReferencePixelsPerUnit: 65
+ m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0
@@ -9625,6 +9897,7 @@ RectTransform:
- {fileID: 721750121}
- {fileID: 1723136546}
- {fileID: 346000247}
+ - {fileID: 568539021}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -11559,7 +11832,6 @@ GameObject:
- component: {fileID: 959733166}
- component: {fileID: 959733169}
- component: {fileID: 959733168}
- - component: {fileID: 959733167}
m_Layer: 5
m_Name: Colony Tab
m_TagString: Untagged
@@ -11591,25 +11863,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &959733167
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 959733165}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 69422316520cbd649ad89629be288c06, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- Title: {fileID: 216124849}
- General: {fileID: 77284611}
- Inventory: {fileID: 1697926331}
- ChildInventory: {fileID: 2098141214}
- Details: {fileID: 217221142}
- ContextMenu: {fileID: 1157981993}
- ConfirmationDialog: {fileID: 620555924}
--- !u!114 &959733168
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -12686,7 +12939,7 @@ PrefabInstance:
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 81.35
+ value: 77.195
objectReference: {fileID: 0}
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -12696,7 +12949,7 @@ PrefabInstance:
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 162.7
+ value: 154.39
objectReference: {fileID: 0}
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -12747,7 +13000,7 @@ PrefabInstance:
type: 3}
propertyPath: m_sharedMaterial
value:
- objectReference: {fileID: 21096540314249858, guid: 54f472d4b2cd9b84b8d9917ec13a4e94,
+ objectReference: {fileID: 21906973755630180, guid: 9dcd07b95faae7641a3ff6fccab43c32,
type: 2}
- target: {fileID: 4750078953547169287, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -12822,7 +13075,7 @@ PrefabInstance:
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 1215.2599
+ value: 1186.5798
objectReference: {fileID: 0}
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -12832,7 +13085,7 @@ PrefabInstance:
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 162.7
+ value: 154.39
objectReference: {fileID: 0}
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -12877,7 +13130,7 @@ PrefabInstance:
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 81.35
+ value: 77.195
objectReference: {fileID: 0}
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -12897,7 +13150,7 @@ PrefabInstance:
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 98.7
+ value: 90.39
objectReference: {fileID: 0}
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -12917,7 +13170,7 @@ PrefabInstance:
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 81.35
+ value: 77.195
objectReference: {fileID: 0}
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -12927,7 +13180,7 @@ PrefabInstance:
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 162.7
+ value: 154.39
objectReference: {fileID: 0}
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -12961,6 +13214,81 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 1046403180}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1077503103
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1077503104}
+ - component: {fileID: 1077503106}
+ - component: {fileID: 1077503105}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1077503104
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1077503103}
+ 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: 456626302}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1077503105
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1077503103}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 2100000, guid: 1cb3b89320b91bf4986d2333eebadbbd, type: 2}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 31f38e71d656fb141b1a8242a15e308c, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1077503106
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1077503103}
+ m_CullTransparentMesh: 0
--- !u!1 &1080776603
GameObject:
m_ObjectHideFlags: 0
@@ -13449,6 +13777,131 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
+--- !u!1 &1187465192
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1187465193}
+ - component: {fileID: 1187465196}
+ - component: {fileID: 1187465195}
+ - component: {fileID: 1187465194}
+ m_Layer: 5
+ m_Name: Scrollbar Horizontal
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1187465193
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1187465192}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 2099008585}
+ m_Father: {fileID: 1580606745}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: -20, y: 20}
+ m_Pivot: {x: 0, y: 0}
+--- !u!114 &1187465194
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1187465192}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Highlighted
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 1511218668}
+ m_HandleRect: {fileID: 1511218667}
+ m_Direction: 0
+ m_Value: 0
+ m_Size: 1
+ m_NumberOfSteps: 0
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &1187465195
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1187465192}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.8, g: 0.9333333, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 61501af80fabaac44ace015a55851277, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1187465196
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1187465192}
+ m_CullTransparentMesh: 0
--- !u!1001 &1221705624
PrefabInstance:
m_ObjectHideFlags: 0
@@ -14809,6 +15262,42 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1384745566}
m_CullTransparentMesh: 0
+--- !u!1 &1387443814
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1387443815}
+ m_Layer: 5
+ m_Name: Inventory Cell (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1387443815
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1387443814}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 1973463310}
+ m_Father: {fileID: 710974995}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 252, y: -247}
+ m_SizeDelta: {x: 32, y: 32}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1390575962
GameObject:
m_ObjectHideFlags: 0
@@ -16035,6 +16524,96 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1482819801}
m_CullTransparentMesh: 0
+--- !u!1 &1505156504
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1505156505}
+ - component: {fileID: 1505156508}
+ - component: {fileID: 1505156507}
+ - component: {fileID: 1505156506}
+ m_Layer: 5
+ m_Name: Viewport
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1505156505
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1505156504}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 710974995}
+ m_Father: {fileID: 1580606745}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: -20, y: 0}
+ m_Pivot: {x: 0, y: 1}
+--- !u!114 &1505156506
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1505156504}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1505156507
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1505156504}
+ m_CullTransparentMesh: 0
+--- !u!114 &1505156508
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1505156504}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_ShowMaskGraphic: 0
--- !u!1 &1505831356
GameObject:
m_ObjectHideFlags: 0
@@ -16131,6 +16710,82 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1505831356}
m_CullTransparentMesh: 0
+--- !u!1 &1511218666
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1511218667}
+ - component: {fileID: 1511218669}
+ - component: {fileID: 1511218668}
+ m_Layer: 5
+ m_Name: Handle
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1511218667
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1511218666}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 349065301}
+ m_Father: {fileID: 2099008585}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0.9999999, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 20, y: 20}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1511218668
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1511218666}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 0.44583336, b: 0.050000012, a: 0.65882355}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 84d126f984de5fd42ac66361c00f830c, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1511218669
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1511218666}
+ m_CullTransparentMesh: 0
--- !u!1001 &1527573892
PrefabInstance:
m_ObjectHideFlags: 0
@@ -16151,7 +16806,7 @@ PrefabInstance:
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 76.865005
+ value: 72.92
objectReference: {fileID: 0}
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -16161,7 +16816,7 @@ PrefabInstance:
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 153.73001
+ value: 145.84
objectReference: {fileID: 0}
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -16217,7 +16872,7 @@ PrefabInstance:
type: 3}
propertyPath: m_sharedMaterial
value:
- objectReference: {fileID: 21096540314249858, guid: 54f472d4b2cd9b84b8d9917ec13a4e94,
+ objectReference: {fileID: 21906973755630180, guid: 9dcd07b95faae7641a3ff6fccab43c32,
type: 2}
- target: {fileID: 4750078953547169287, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -16292,7 +16947,7 @@ PrefabInstance:
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 883.865
+ value: 885.38495
objectReference: {fileID: 0}
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -16302,7 +16957,7 @@ PrefabInstance:
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 153.73001
+ value: 145.84
objectReference: {fileID: 0}
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -16347,7 +17002,7 @@ PrefabInstance:
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 76.865005
+ value: 72.92
objectReference: {fileID: 0}
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -16367,7 +17022,7 @@ PrefabInstance:
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 89.73
+ value: 81.84
objectReference: {fileID: 0}
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -16387,7 +17042,7 @@ PrefabInstance:
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 76.865005
+ value: 72.92
objectReference: {fileID: 0}
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -16397,7 +17052,7 @@ PrefabInstance:
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 153.73001
+ value: 145.84
objectReference: {fileID: 0}
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -16810,7 +17465,7 @@ PrefabInstance:
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 86.59
+ value: 75.54
objectReference: {fileID: 0}
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -16820,7 +17475,7 @@ PrefabInstance:
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 173.18
+ value: 151.08
objectReference: {fileID: 0}
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -16876,7 +17531,7 @@ PrefabInstance:
type: 3}
propertyPath: m_sharedMaterial
value:
- objectReference: {fileID: 21096540314249858, guid: 54f472d4b2cd9b84b8d9917ec13a4e94,
+ objectReference: {fileID: 21906973755630180, guid: 9dcd07b95faae7641a3ff6fccab43c32,
type: 2}
- target: {fileID: 4750078953547169287, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -16951,7 +17606,7 @@ PrefabInstance:
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 1047.32
+ value: 1033.845
objectReference: {fileID: 0}
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -16961,7 +17616,7 @@ PrefabInstance:
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 173.18
+ value: 151.08
objectReference: {fileID: 0}
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -17006,7 +17661,7 @@ PrefabInstance:
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 86.59
+ value: 75.54
objectReference: {fileID: 0}
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -17026,7 +17681,7 @@ PrefabInstance:
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 109.17999
+ value: 87.08
objectReference: {fileID: 0}
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -17046,7 +17701,7 @@ PrefabInstance:
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 86.59
+ value: 75.54
objectReference: {fileID: 0}
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -17056,7 +17711,7 @@ PrefabInstance:
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 173.18
+ value: 151.08
objectReference: {fileID: 0}
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -17482,6 +18137,42 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
+--- !u!1 &1574836808
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1574836809}
+ m_Layer: 5
+ m_Name: Sliding Area
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1574836809
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1574836808}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 1863852357}
+ m_Father: {fileID: 454123651}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: -20, y: -20}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1576578396
GameObject:
m_ObjectHideFlags: 0
@@ -17617,6 +18308,75 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1576578396}
m_CullTransparentMesh: 0
+--- !u!1 &1580606744
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1580606745}
+ - component: {fileID: 1580606746}
+ m_Layer: 5
+ m_Name: Scroll View
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1580606745
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1580606744}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 1505156505}
+ - {fileID: 1187465193}
+ - {fileID: 454123651}
+ m_Father: {fileID: 568539021}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: -16.000006, y: -16}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1580606746
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1580606744}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Content: {fileID: 710974995}
+ m_Horizontal: 1
+ m_Vertical: 1
+ m_MovementType: 2
+ m_Elasticity: 0.1
+ m_Inertia: 1
+ m_DecelerationRate: 0.135
+ m_ScrollSensitivity: 10
+ m_Viewport: {fileID: 1505156505}
+ m_HorizontalScrollbar: {fileID: 1187465194}
+ m_VerticalScrollbar: {fileID: 454123652}
+ m_HorizontalScrollbarVisibility: 1
+ m_VerticalScrollbarVisibility: 2
+ m_HorizontalScrollbarSpacing: -3
+ m_VerticalScrollbarSpacing: 0
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1001 &1593845000
PrefabInstance:
m_ObjectHideFlags: 0
@@ -19044,7 +19804,7 @@ PrefabInstance:
- target: {fileID: 2378632238049155248, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.y
- value: -677.8058
+ value: -707.7656
objectReference: {fileID: 0}
- target: {fileID: 2378632238049155248, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
@@ -19160,17 +19920,17 @@ PrefabInstance:
- target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -458.32788
+ value: -458.2378
objectReference: {fileID: 0}
- target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.x
- value: 424.00003
+ value: 424
objectReference: {fileID: 0}
- target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.y
- value: 852.65576
+ value: 852.4756
objectReference: {fileID: 0}
- target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
@@ -19230,22 +19990,22 @@ PrefabInstance:
- target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 203.50002
+ value: 203.5
objectReference: {fileID: 0}
- target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -87.425
+ value: -72.354996
objectReference: {fileID: 0}
- target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.x
- value: 343.00003
+ value: 343
objectReference: {fileID: 0}
- target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.y
- value: 110.85
+ value: 80.71
objectReference: {fileID: 0}
- target: {fileID: 5116519198747529738, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
@@ -19286,7 +20046,7 @@ PrefabInstance:
type: 3}
propertyPath: m_sharedMaterial
value:
- objectReference: {fileID: 21423695648544140, guid: f353c922a07f02041bdb1694a3faf9b7,
+ objectReference: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417,
type: 2}
- target: {fileID: 5116519198747529738, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
@@ -19306,18 +20066,6 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 1697926329}
m_PrefabAsset: {fileID: 0}
---- !u!114 &1697926331 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 2378632238049155148, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
- type: 3}
- m_PrefabInstance: {fileID: 1697926329}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 8c2bf4a7080061d42a87046c37bf0c60, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &1697926332 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2378632240158519327, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
@@ -20020,6 +20768,81 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4ec4ae0999e1b814cbb86e167df3c039, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &1736632658
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1736632659}
+ - component: {fileID: 1736632661}
+ - component: {fileID: 1736632660}
+ m_Layer: 5
+ m_Name: Outline
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1736632659
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1736632658}
+ 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: 568539021}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1736632660
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1736632658}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: b412943088786454c9bf10b1f7e1e94b, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1736632661
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1736632658}
+ m_CullTransparentMesh: 0
--- !u!1 &1741914909
GameObject:
m_ObjectHideFlags: 0
@@ -20901,6 +21724,82 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1850578694}
m_CullTransparentMesh: 0
+--- !u!1 &1863852356
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1863852357}
+ - component: {fileID: 1863852359}
+ - component: {fileID: 1863852358}
+ m_Layer: 5
+ m_Name: Handle
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1863852357
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1863852356}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 2009894294}
+ m_Father: {fileID: 1574836809}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 20, y: 20}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1863852358
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1863852356}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 0.44583336, b: 0.050000012, a: 0.65882355}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 84d126f984de5fd42ac66361c00f830c, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1863852359
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1863852356}
+ m_CullTransparentMesh: 0
--- !u!1 &1868140980
GameObject:
m_ObjectHideFlags: 0
@@ -22105,6 +23004,81 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Asset: {fileID: -944628639613478452, guid: aefbf90246423cf408d3520635b878eb, type: 3}
m_ActionId: 766f9151-3f3d-4e12-8ade-ce5aacd3940f
+--- !u!1 &1973463309
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1973463310}
+ - component: {fileID: 1973463312}
+ - component: {fileID: 1973463311}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1973463310
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1973463309}
+ 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: 1387443815}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1973463311
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1973463309}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 2100000, guid: 1cb3b89320b91bf4986d2333eebadbbd, type: 2}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 31f38e71d656fb141b1a8242a15e308c, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1973463312
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1973463309}
+ m_CullTransparentMesh: 0
--- !u!1 &1973552680
GameObject:
m_ObjectHideFlags: 0
@@ -22469,6 +23443,81 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2004182171}
m_CullTransparentMesh: 0
+--- !u!1 &2009894293
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2009894294}
+ - component: {fileID: 2009894296}
+ - component: {fileID: 2009894295}
+ m_Layer: 5
+ m_Name: Outline
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2009894294
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2009894293}
+ 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: 1863852357}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2009894295
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2009894293}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.8, g: 0.9333333, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 61501af80fabaac44ace015a55851277, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &2009894296
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2009894293}
+ m_CullTransparentMesh: 0
--- !u!1 &2017065805
GameObject:
m_ObjectHideFlags: 0
@@ -22764,7 +23813,7 @@ PrefabInstance:
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 114.465
+ value: 104.79
objectReference: {fileID: 0}
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -22774,7 +23823,7 @@ PrefabInstance:
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 228.93
+ value: 209.58
objectReference: {fileID: 0}
- target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -22825,7 +23874,7 @@ PrefabInstance:
type: 3}
propertyPath: m_sharedMaterial
value:
- objectReference: {fileID: 21096540314249858, guid: 54f472d4b2cd9b84b8d9917ec13a4e94,
+ objectReference: {fileID: 21906973755630180, guid: 9dcd07b95faae7641a3ff6fccab43c32,
type: 2}
- target: {fileID: 4750078953547169287, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -22900,7 +23949,7 @@ PrefabInstance:
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 1411.0748
+ value: 1368.565
objectReference: {fileID: 0}
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -22910,7 +23959,7 @@ PrefabInstance:
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 228.93
+ value: 209.58
objectReference: {fileID: 0}
- target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -22955,7 +24004,7 @@ PrefabInstance:
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 114.465
+ value: 104.79
objectReference: {fileID: 0}
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -22975,7 +24024,7 @@ PrefabInstance:
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 164.93
+ value: 145.58
objectReference: {fileID: 0}
- target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -22995,7 +24044,7 @@ PrefabInstance:
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 114.465
+ value: 104.79
objectReference: {fileID: 0}
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -23005,7 +24054,7 @@ PrefabInstance:
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
propertyPath: m_SizeDelta.x
- value: 228.93
+ value: 209.58
objectReference: {fileID: 0}
- target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a,
type: 3}
@@ -23204,7 +24253,7 @@ PrefabInstance:
- target: {fileID: 2378632238049155248, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.y
- value: -677.8058
+ value: -707.7656
objectReference: {fileID: 0}
- target: {fileID: 2378632238049155248, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
@@ -23320,17 +24369,17 @@ PrefabInstance:
- target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -458.32788
+ value: -458.2378
objectReference: {fileID: 0}
- target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.x
- value: 424.00003
+ value: 424
objectReference: {fileID: 0}
- target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.y
- value: 852.65576
+ value: 852.4756
objectReference: {fileID: 0}
- target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
@@ -23395,22 +24444,22 @@ PrefabInstance:
- target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 203.50002
+ value: 203.5
objectReference: {fileID: 0}
- target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -87.425
+ value: -72.354996
objectReference: {fileID: 0}
- target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.x
- value: 343.00003
+ value: 343
objectReference: {fileID: 0}
- target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
propertyPath: m_SizeDelta.y
- value: 110.85
+ value: 80.71
objectReference: {fileID: 0}
- target: {fileID: 5116519198747529738, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
@@ -23451,7 +24500,7 @@ PrefabInstance:
type: 3}
propertyPath: m_sharedMaterial
value:
- objectReference: {fileID: 21423695648544140, guid: f353c922a07f02041bdb1694a3faf9b7,
+ objectReference: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417,
type: 2}
- target: {fileID: 5116519198747529738, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
type: 3}
@@ -23481,18 +24530,6 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 2098141212}
m_PrefabAsset: {fileID: 0}
---- !u!114 &2098141214 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 2378632238049155148, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
- type: 3}
- m_PrefabInstance: {fileID: 2098141212}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 8c2bf4a7080061d42a87046c37bf0c60, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &2098141215 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2378632240158519327, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
@@ -23519,6 +24556,42 @@ MonoBehaviour:
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
+--- !u!1 &2099008584
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2099008585}
+ m_Layer: 5
+ m_Name: Sliding Area
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2099008585
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2099008584}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 1511218667}
+ m_Father: {fileID: 1187465193}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: -20, y: -20}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2104427265
GameObject:
m_ObjectHideFlags: 0
@@ -23558,7 +24631,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: -31.999939}
+ m_AnchoredPosition: {x: 0, y: -31.999878}
m_SizeDelta: {x: 0, y: -64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2115559087
@@ -26578,3 +27651,72 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2352149241950064197}
m_CullTransparentMesh: 0
+--- !u!1001 &8784470447332018199
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 8442521443025013260, guid: 79024f635e46f5546b670b58b07fa037,
+ type: 3}
+ propertyPath: m_Name
+ value: Djinni
+ objectReference: {fileID: 0}
+ - target: {fileID: 9106854767781449910, guid: 79024f635e46f5546b670b58b07fa037,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 1547.9908
+ objectReference: {fileID: 0}
+ - target: {fileID: 9106854767781449910, guid: 79024f635e46f5546b670b58b07fa037,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 799.0965
+ objectReference: {fileID: 0}
+ - target: {fileID: 9106854767781449910, guid: 79024f635e46f5546b670b58b07fa037,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -2571.4744
+ objectReference: {fileID: 0}
+ - target: {fileID: 9106854767781449910, guid: 79024f635e46f5546b670b58b07fa037,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9106854767781449910, guid: 79024f635e46f5546b670b58b07fa037,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9106854767781449910, guid: 79024f635e46f5546b670b58b07fa037,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9106854767781449910, guid: 79024f635e46f5546b670b58b07fa037,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9106854767781449910, guid: 79024f635e46f5546b670b58b07fa037,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9106854767781449910, guid: 79024f635e46f5546b670b58b07fa037,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9106854767781449910, guid: 79024f635e46f5546b670b58b07fa037,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9106854767781449910, guid: 79024f635e46f5546b670b58b07fa037,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 79024f635e46f5546b670b58b07fa037, type: 3}
diff --git a/Assets/Scripts/Editor/DatabaseInspector.cs b/Assets/Scripts/Editor/DatabaseInspector.cs
index 3ba2ca059..addde57b0 100644
--- a/Assets/Scripts/Editor/DatabaseInspector.cs
+++ b/Assets/Scripts/Editor/DatabaseInspector.cs
@@ -10,6 +10,7 @@ using UnityEditor;
using UnityEngine;
using static Unity.Mathematics.math;
using static UnityEditor.EditorGUILayout;
+using int2 = Unity.Mathematics.int2;
using Object = UnityEngine.Object;
public class DatabaseInspector : EditorWindow
@@ -19,7 +20,7 @@ public class DatabaseInspector : EditorWindow
// Singleton to avoid multiple instances of window.
private static DatabaseInspector _instance;
- public static DatabaseInspector Instance => _instance ?? GetWindow();
+ public static DatabaseInspector Instance => _instance ? _instance : GetWindow();
private DatabaseListView _list;
private GUIStyle _labelStyle;
@@ -31,9 +32,13 @@ public class DatabaseInspector : EditorWindow
private string[] _hardpointTypes;
private const int width = 150;
private const int labelWidth = 20;
+ private const int toggleWidth = 18;
+ private const int arrowWidth = 22;
private Material _galaxyMat;
private Texture2D _white;
private GUIStyle _warning;
+ private HashSet _listItemFoldouts = new HashSet();
+ private Material _schematicMat;
public Color LabelColor => EditorGUIUtility.isProSkin ? Color.white : Color.black;
@@ -48,6 +53,7 @@ public class DatabaseInspector : EditorWindow
wantsMouseMove = true;
_hardpointTypes = Enum.GetNames(typeof(HardpointType));
_galaxyMat = new Material(Shader.Find("Unlit/GalaxyMap"));
+ _schematicMat = new Material(Shader.Find("Legacy Shaders/Particles/Additive"));
_white = Color.white.ToTexture();
_warning = new GUIStyle(EditorStyles.boldLabel);
_warning.normal.textColor = Color.red;
@@ -144,6 +150,10 @@ public class DatabaseInspector : EditorWindow
else
field.SetValue(obj, Inspect(field.Name.SplitCamelCase(), (int) value));
}
+ else if (type == typeof(int2))
+ {
+ field.SetValue(obj, Inspect(field.Name.SplitCamelCase(), (int2) field.GetValue(obj)));
+ }
else if (type.IsEnum)
{
var isflags = type.GetCustomAttributes().Any();
@@ -165,6 +175,7 @@ public class DatabaseInspector : EditorWindow
else if (type == typeof(Type) && inspectable is InspectableTypeAttribute typeAttribute) field.SetValue(obj, Inspect(field.Name.SplitCamelCase(), (Type) value, typeAttribute.Type));
else if (type == typeof(GameObject)) field.SetValue(obj, Inspect(field.Name.SplitCamelCase(), (GameObject) value));
else if (type == typeof(AnimationCurve)) field.SetValue(obj, Inspect(field.Name.SplitCamelCase(), (AnimationCurve) value));
+ else if (type == typeof(Shape)) field.SetValue(obj, Inspect(field.Name.SplitCamelCase(), (Shape) value, (obj is HullData hull) ? hull : null));
else if (type == typeof(PerformanceStat)) field.SetValue(obj, Inspect(field.Name.SplitCamelCase(), (PerformanceStat) value, field.GetCustomAttribute() != null));
else if (type == typeof(PerformanceStat[]))
{
@@ -177,7 +188,7 @@ public class DatabaseInspector : EditorWindow
stats = new PerformanceStat[damageTypes.Length];
for (var i = 0; i < stats.Length; i++)
{
- stats[i] = Inspect(damageTypes[i].SplitCamelCase(), stats[i]);
+ Inspect(damageTypes[i].SplitCamelCase(), stats[i]);
}
field.SetValue(obj, stats);
}
@@ -336,12 +347,40 @@ public class DatabaseInspector : EditorWindow
}
foreach (var o in list)
{
+ bool _tinted = false;
+ var originalColor = GUI.backgroundColor;
+ if (o is ITintInspector tint)
+ {
+ _tinted = true;
+ GUI.backgroundColor = tint.TintColor.ToColor();
+ }
+
using (new VerticalScope(_list.ListItemStyle))
{
using (new HorizontalScope())
{
//if (listType.IsInterface)
- GUILayout.Label(o.GetType().Name.SplitCamelCase(), EditorStyles.boldLabel, GUILayout.ExpandWidth(true));
+ if(Foldout(_listItemFoldouts.Contains(o.GetHashCode()), o.ToString(), true))
+ _listItemFoldouts.Add(o.GetHashCode());
+ else
+ _listItemFoldouts.Remove(o.GetHashCode());
+ // using (var h = new HorizontalScope())
+ // {
+ // if (GUI.Button(h.rect, GUIContent.none, GUIStyle.none))
+ // {
+ // if(_listItemFoldouts.Contains(o.GetHashCode()))
+ // _listItemFoldouts.Remove(o.GetHashCode());
+ // else
+ // _listItemFoldouts.Add(o.GetHashCode());
+ // }
+ // var foldoutRect = GetControlRect(false, GUILayout.Width(EditorGUIUtility.singleLineHeight));
+ // if (Event.current.type == EventType.Repaint)
+ // {
+ // var controlId = GUIUtility.GetControlID(1337, FocusType.Keyboard, position);
+ // EditorStyles.foldout.Draw(foldoutRect, GUIContent.none, controlId, !_listItemFoldouts.Contains(o.GetHashCode()));
+ // }
+ // GUILayout.Label(o.ToString(), EditorStyles.boldLabel, GUILayout.Height(EditorGUIUtility.singleLineHeight), GUILayout.ExpandWidth(true));
+ // }
var rect = GetControlRect(false,
GUILayout.Width(EditorGUIUtility.singleLineHeight));
@@ -353,11 +392,16 @@ public class DatabaseInspector : EditorWindow
break;
}
}
-
- Space();
+ if(_listItemFoldouts.Contains(o.GetHashCode()))
+ {
+ Space();
- Inspect(o, inspectablesOnly);
+ Inspect(o, inspectablesOnly);
+ }
}
+
+ if(_tinted)
+ GUI.backgroundColor = originalColor;
}
using (new HorizontalScope(_list.ListItemStyle))
{
@@ -540,6 +584,27 @@ public class DatabaseInspector : EditorWindow
}
}
+ public int2 Inspect(string label, int2 value)
+ {
+ using (var h = new HorizontalScope())
+ {
+ GUILayout.Label(label, GUILayout.Width(width));
+ GUILayout.Label("X", GUILayout.Width(labelWidth));
+ value.x = DelayedIntField(value.x);
+ GUILayout.Label("Y", GUILayout.Width(labelWidth));
+ value.y = DelayedIntField(value.y);
+ if (GUILayout.Button("\u2190", GUILayout.Width(arrowWidth)))
+ value.x--;
+ if (GUILayout.Button("\u2192", GUILayout.Width(arrowWidth)))
+ value.x++;
+ if (GUILayout.Button("\u2191", GUILayout.Width(arrowWidth)))
+ value.y++;
+ if (GUILayout.Button("\u2193", GUILayout.Width(arrowWidth)))
+ value.y--;
+ return value;
+ }
+ }
+
public int Inspect(string label, int value, int min, int max)
{
using (var h = new HorizontalScope())
@@ -951,9 +1016,83 @@ public class DatabaseInspector : EditorWindow
}
}
}
+
+ public Shape Inspect(string label, Shape value, HullData hull = null)
+ {
+ if(value == null)
+ {
+ value = new Shape(1, 1);
+ value[int2.zero] = true;
+ }
+ using (new VerticalScope())
+ {
+ Texture2D schematic = null;
+ if(hull != null && !string.IsNullOrEmpty(hull.Schematic))
+ schematic = AssetDatabase.LoadAssetAtPath(hull.Schematic);
+ using (new HorizontalScope())
+ {
+ GUILayout.Label(label, GUILayout.Width(width));
+ GUILayout.Label("Size", GUILayout.ExpandWidth(false));
+ if(schematic == null)
+ {
+ GUILayout.Label("X", GUILayout.Width(labelWidth));
+ value.Width = DelayedIntField(value.Width);
+ GUILayout.Label("Y", GUILayout.Width(labelWidth));
+ value.Height = DelayedIntField(value.Height);
+ }
+ else
+ {
+ GUILayout.Label("X", GUILayout.Width(labelWidth));
+ value.Width = DelayedIntField(value.Width);
+ value.Height = Mathf.RoundToInt(value.Width * ((float)schematic.height / schematic.width));
+ GUILayout.Label("Y", GUILayout.Width(labelWidth));
+ LabelField($"{value.Height}");
+ }
+ }
+
+ using (new HorizontalScope())
+ {
+ GUILayout.Label("", GUILayout.Width(width));
+ using (var a = new VerticalScope())
+ {
+ if(schematic != null)
+ {
+ EditorGUI.DrawPreviewTexture(a.rect, schematic, _schematicMat);
+ }
+ for (var y = value.Height - 1; y >= 0; y--)
+ {
+ using (new HorizontalScope())
+ {
+ for (var x = 0; x < value.Width; x++)
+ {
+ var oldColor = GUI.backgroundColor;
+ if(hull != null)
+ {
+ var hardpoint = hull.Hardpoints
+ .FirstOrDefault(hp =>
+ hp.Shape.Coordinates
+ .Select(v => v + hp.Position)
+ .Any(v => v.x == x && v.y == y));
+ if (hardpoint != null)
+ GUI.backgroundColor = hardpoint.TintColor.ToColor();
+ }
+ value[int2(x, y)] = Toggle(value[int2(x, y)], GUILayout.Width(toggleWidth));
+ GUI.backgroundColor = oldColor;
+ }
+ }
+ }
+ }
+ GUILayout.FlexibleSpace();
+ }
+ }
+
+ return value;
+ }
public PerformanceStat Inspect(string label, PerformanceStat value, bool isSimple = false)
{
+ if(value == null)
+ value = new PerformanceStat();
using (new VerticalScope())
{
using (new HorizontalScope())
@@ -1004,9 +1143,9 @@ public class DatabaseInspector : EditorWindow
// }
Space();
-
- return value;
}
+
+ return value;
}
public void OnGUI()
@@ -1036,6 +1175,10 @@ public class DatabaseInspector : EditorWindow
GUILayout.Width(EditorGUIUtility.currentViewWidth),
GUILayout.ExpandHeight(true));
+ // Serialize inspected object so we can check whether it has actually changed
+ RegisterResolver.Register();
+ var previousBytes = MessagePackSerializer.Serialize(entry);
+
EditorGUI.BeginChangeCheck();
var dataEntry = entry;
@@ -1164,7 +1307,8 @@ public class DatabaseInspector : EditorWindow
if (EditorGUI.EndChangeCheck())
{
- DatabaseCache.Add(entry);
+ if(!previousBytes.ByteEquals(MessagePackSerializer.Serialize(entry)))
+ DatabaseCache.Add(entry);
}
EndScrollView();
diff --git a/Assets/Scripts/Editor/DatabaseView.cs b/Assets/Scripts/Editor/DatabaseView.cs
index eb432fa7a..c0b6e1c72 100644
--- a/Assets/Scripts/Editor/DatabaseView.cs
+++ b/Assets/Scripts/Editor/DatabaseView.cs
@@ -14,7 +14,7 @@ public class DatabaseListView : EditorWindow
{
// Singleton to avoid multiple instances of window.
private static DatabaseListView _instance;
- public static DatabaseListView Instance => _instance ?? (DatabaseListView)GetWindow();
+ public static DatabaseListView Instance => _instance ? _instance : GetWindow();
[MenuItem("Window/Aetheria Database Tools")]
static void Init() => Instance.Show();
private void Awake()
diff --git a/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs b/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs
index adaa3b9a4..d7ea09e7e 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs
@@ -112,4 +112,11 @@ public abstract class BehaviorData
public int Group;
public abstract IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item);
+
+ public override string ToString()
+ {
+ var className = base.ToString();
+ var dataIndex = className.IndexOf("data", StringComparison.InvariantCultureIgnoreCase);
+ return dataIndex>0 ? className.Substring(0,dataIndex).SplitCamelCase() : className;
+ }
}
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Entity.cs b/Assets/Scripts/ServerShared/Entity.cs
index e389aab52..a80bfe98e 100644
--- a/Assets/Scripts/ServerShared/Entity.cs
+++ b/Assets/Scripts/ServerShared/Entity.cs
@@ -231,7 +231,8 @@ public abstract class Entity
if (!hardpoint.Shape[i]) return false;
// If there is any gear already occupying that space, it won't fit
- var itemCoord = hardpoint.Position + i;
+ // Items placed in hardpoints are automatically aligned to hardpoint rotation
+ var itemCoord = hardpoint.Position + itemData.Shape.Rotate(i, hardpoint.Rotation);
if (_gearOccupancy[itemCoord.x, itemCoord.y] != null) return false;
}
}
diff --git a/Assets/Scripts/ServerShared/Enums.cs b/Assets/Scripts/ServerShared/Enums.cs
index 84231b16f..d8c665fc2 100644
--- a/Assets/Scripts/ServerShared/Enums.cs
+++ b/Assets/Scripts/ServerShared/Enums.cs
@@ -1,5 +1,13 @@
using System;
+public enum ItemRotation
+{
+ None = 0,
+ Clockwise = 1,
+ Reversed = 2,
+ CounterClockwise = 3
+}
+
public enum LauncherCaliber
{
Micro,
diff --git a/Assets/Scripts/ServerShared/Extensions.cs b/Assets/Scripts/ServerShared/Extensions.cs
index 46974ee7b..79a5357b8 100644
--- a/Assets/Scripts/ServerShared/Extensions.cs
+++ b/Assets/Scripts/ServerShared/Extensions.cs
@@ -35,6 +35,31 @@ public static class Extensions
// (temperature - itemData.MinimumTemperature) /
// (itemData.MaximumTemperature - itemData.MinimumTemperature))));
// }
+
+ // Thanks, https://stackoverflow.com/a/48599119
+ public static bool ByteArrayCompare(ReadOnlySpan a1, ReadOnlySpan a2)
+ {
+ return a1.SequenceEqual(a2);
+ }
+
+ public static bool ByteEquals(this byte[] a, byte[] b) => ByteArrayCompare(a, b);
+
+ public static char Arrow(this ItemRotation rot)
+ {
+ switch (rot)
+ {
+ case ItemRotation.None:
+ return '\u2191';
+ case ItemRotation.Clockwise:
+ return '\u2192';
+ case ItemRotation.Reversed:
+ return '\u2193';
+ case ItemRotation.CounterClockwise:
+ return '\u2190';
+ default:
+ throw new ArgumentOutOfRangeException(nameof(rot), rot, null);
+ }
+ }
public static string SplitCamelCase( this string str )
{
diff --git a/Assets/Scripts/ServerShared/ItemData.cs b/Assets/Scripts/ServerShared/ItemData.cs
index ce7d7013a..d5880e137 100644
--- a/Assets/Scripts/ServerShared/ItemData.cs
+++ b/Assets/Scripts/ServerShared/ItemData.cs
@@ -9,35 +9,67 @@ using Unity.Mathematics;
using static Unity.Mathematics.math;
using int2 = Unity.Mathematics.int2;
+[InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class Shape
{
[JsonProperty("name"), Key(0)] public bool[,] Cells;
private bool _dirty = true;
+ public Shape()
+ {
+ Cells = new bool[1,1];
+ Cells[0, 0] = true;
+ }
+
public Shape(int width, int height)
{
Cells = new bool[width, height];
}
- public int Width => Cells.GetLength(0);
+ [IgnoreMember]
+ public int Width
+ {
+ get { return Cells.GetLength(0); }
+ set { Resize(value, Height); }
+ }
- public int Height => Cells.GetLength(1);
+ [IgnoreMember]
+ public int Height
+ {
+ get { return Cells.GetLength(1); }
+ set { Resize(Width, value); }
+ }
+
+ public void Resize(int width, int height)
+ {
+ var newCells = new bool[width, height];
+
+ for (int x = 0; x < width && x < Width; x++)
+ {
+ for (int y = 0; y < height && y < Height; y++)
+ {
+ newCells[x, y] = Cells[x, y];
+ }
+ }
+
+ Cells = newCells;
+ }
private static int mod(int x, int m) {
int r = x%m;
return r<0 ? r+m : r;
}
- public int2 Rotate(int2 position, int rotation)
+ public int2 Rotate(int2 position, ItemRotation rotation)
{
- switch (mod(rotation, 4))
+ switch (rotation)
{
- case 1:
+ case ItemRotation.Clockwise:
return int2(position.y, Width - 1 - position.x);
- case 2:
+ case ItemRotation.Reversed:
return int2(Width - 1 - position.x, Height - 1 - position.y);
- case 3:
+ case ItemRotation.CounterClockwise:
return int2(Height - 1 - position.y, position.x);
default:
return int2(position.x, position.y);
@@ -58,9 +90,9 @@ public class Shape
private IEnumerable EnumerateShapeCoordinates()
{
- for(int x = 0; x < Cells.GetLength(0); x++)
+ for(int x = 0; x < Width; x++)
{
- for (int y = 0; y < Cells.GetLength(0); y++)
+ for (int y = 0; y < Height; y++)
{
if(Cells[x,y]) yield return int2(x, y);
}
@@ -141,7 +173,7 @@ public class SimpleCommodityData : ItemData
// public float Floor = 5f;
[InspectableField, JsonProperty("maxStackSize"), Key(6)]
- public int MaxStack;
+ public int MaxStack = 10;
[InspectableField, JsonProperty("category"), Key(7)]
public SimpleCommodityCategory Category;
@@ -174,19 +206,22 @@ public class CompoundCommodityData : CraftedItemData
JsonObject(MemberSerialization.OptIn), JsonConverter(typeof(JsonKnownTypesConverter))]
public abstract class EquippableItemData : CraftedItemData
{
- [InspectableField, JsonProperty("behaviors"), Key(7)]
+ [InspectableTexture, JsonProperty("schematic"), Key(7)]
+ public string Schematic;
+
+ [InspectableField, JsonProperty("behaviors"), Key(8)]
public List Behaviors = new List();
- [InspectableField, JsonProperty("durability"), Key(8)]
+ [InspectableField, JsonProperty("durability"), Key(9)]
public float Durability;
- [TemperatureInspectable, JsonProperty("minTemp"), Key(9)]
+ [TemperatureInspectable, JsonProperty("minTemp"), Key(10)]
public float MinimumTemperature;
- [TemperatureInspectable, JsonProperty("maxTemp"), Key(10)]
+ [TemperatureInspectable, JsonProperty("maxTemp"), Key(11)]
public float MaximumTemperature;
- [InspectableField, JsonProperty("durabilityExponent"), Key(11), SimplePerformanceStat]
+ [InspectableField, JsonProperty("durabilityExponent"), Key(12), SimplePerformanceStat]
public PerformanceStat DurabilityExponent = new PerformanceStat();
[IgnoreMember]
@@ -200,7 +235,7 @@ public abstract class EquippableItemData : CraftedItemData
[RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class GearData : EquippableItemData
{
- [InspectableField, JsonProperty("hardpointType"), Key(12)]
+ [InspectableField, JsonProperty("hardpointType"), Key(13)]
public HardpointType Hardpoint;
[IgnoreMember] public override HardpointType HardpointType => Hardpoint;
@@ -209,7 +244,7 @@ public class GearData : EquippableItemData
[RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class CargoBayData : EquippableItemData
{
- [InspectableField, JsonProperty("interiorShape"), Key(12)]
+ [InspectableField, JsonProperty("interiorShape"), Key(13)]
public Shape InteriorShape;
[IgnoreMember] public override HardpointType HardpointType => HardpointType.Tool;
}
@@ -217,13 +252,13 @@ public class CargoBayData : EquippableItemData
[RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class HullData : EquippableItemData
{
- [InspectableField, JsonProperty("hardpoints"), Key(12)]
+ [InspectableField, JsonProperty("hardpoints"), Key(13)]
public List Hardpoints = new List();
- [InspectablePrefab, JsonProperty("prefab"), Key(13)]
+ [InspectablePrefab, JsonProperty("prefab"), Key(14)]
public string Prefab;
- [InspectableField, JsonProperty("hullType"), Key(14)]
+ [InspectableField, JsonProperty("hullType"), Key(15)]
public HullType HullType;
[IgnoreMember]
@@ -246,12 +281,35 @@ public class HullData : EquippableItemData
}
[InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
-public class HardpointData
+public class HardpointData : ITintInspector
{
[InspectableField, JsonProperty("type"), Key(0)] public HardpointType Type;
[InspectableField, JsonProperty("position"), Key(1)] public int2 Position;
- [InspectableField, JsonProperty("shape"), Key(2)] public Shape Shape;
+ [InspectableField, JsonProperty("shape"), Key(2)] public Shape Shape = new Shape();
[InspectableField, JsonProperty("transform"), Key(3)] public string Transform;
+ [InspectableField, JsonProperty("rotation"), Key(4)] public ItemRotation Rotation;
+
+ public override string ToString()
+ {
+ return $"{Enum.GetName(typeof(HardpointType), Type)} Hardpoint {Rotation.Arrow()}";
+ }
+
+ [IgnoreMember]
+ public float3 TintColor
+ {
+ get
+ {
+ if (_tintColors == null)
+ {
+ var hardpointTypes = ((HardpointType[]) Enum.GetValues(typeof(HardpointType)));
+ _tintColors = hardpointTypes.ToDictionary(x => x,
+ x => ColorMath.HsvToRgb(float3((float)(int)x/hardpointTypes.Length, 1, 1)));
+ }
+
+ return _tintColors[Type];
+ }
+ }
+ private static Dictionary _tintColors;
}
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
@@ -319,4 +377,9 @@ public class PersonalityAttribute : DatabaseEntry, INamedEntry
get => Name;
set => Name = value;
}
+}
+
+public interface ITintInspector
+{
+ float3 TintColor { get; }
}
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/ItemInstance.cs b/Assets/Scripts/ServerShared/ItemInstance.cs
index 15a9c1eb5..2f1f3aa43 100644
--- a/Assets/Scripts/ServerShared/ItemInstance.cs
+++ b/Assets/Scripts/ServerShared/ItemInstance.cs
@@ -19,7 +19,7 @@ using static Unity.Mathematics.math;
public abstract class ItemInstance
{
[JsonProperty("data"), Key(0)] public Guid Data;
- [JsonProperty("rotation"), Key(1)] public int Rotation;
+ [JsonProperty("rotation"), Key(1)] public ItemRotation Rotation;
}
[Union(0, typeof(CompoundCommodity)),
diff --git a/Assets/Scripts/ServerShared/JsonConverters.cs b/Assets/Scripts/ServerShared/JsonConverters.cs
index f28540de8..c76bcad2a 100644
--- a/Assets/Scripts/ServerShared/JsonConverters.cs
+++ b/Assets/Scripts/ServerShared/JsonConverters.cs
@@ -32,6 +32,17 @@ public class MathJsonConverter : JsonConverter
writer.WriteEndArray();
};
+ writers[typeof(int2)] = (writer, o) =>
+ {
+ if (!(o is int2 v))
+ throw new JsonReaderException();
+
+ writer.WriteStartArray();
+ writer.WriteValue(v.x);
+ writer.WriteValue(v.y);
+ writer.WriteEndArray();
+ };
+
writers[typeof(float3)] = (writer, o) =>
{
if (!(o is float3 v))
@@ -76,6 +87,19 @@ public class MathJsonConverter : JsonConverter
array[0].ToObject(),
array[1].ToObject());
};
+
+ readers[typeof(int2)] = array =>
+ {
+ if (array.Count < 2)
+ {
+ throw new JsonReaderException(
+ $"Could not read {typeof(float2)} from json, expected a json array with 2 elements");
+ }
+
+ return int2(
+ array[0].ToObject(),
+ array[1].ToObject());
+ };
readers[typeof(float3)] = array =>
{
diff --git a/Assets/Scripts/UI/DragHandler.cs b/Assets/Scripts/UI/MapViewDragHandler.cs
similarity index 96%
rename from Assets/Scripts/UI/DragHandler.cs
rename to Assets/Scripts/UI/MapViewDragHandler.cs
index 38507d0b5..eaa24bb7a 100644
--- a/Assets/Scripts/UI/DragHandler.cs
+++ b/Assets/Scripts/UI/MapViewDragHandler.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using UnityEngine;
using static Unity.Mathematics.math;
-public class DragHandler : MonoBehaviour
+public class MapViewDragHandler : MonoBehaviour
{
public Camera Camera;
public float Scaling;
diff --git a/Assets/Scripts/UI/DragHandler.cs.meta b/Assets/Scripts/UI/MapViewDragHandler.cs.meta
similarity index 100%
rename from Assets/Scripts/UI/DragHandler.cs.meta
rename to Assets/Scripts/UI/MapViewDragHandler.cs.meta
diff --git a/Assets/Shaders/MaskedUIBlur.shader b/Assets/Shaders/MaskedUIBlur.shader
new file mode 100644
index 000000000..3deb0d2f6
--- /dev/null
+++ b/Assets/Shaders/MaskedUIBlur.shader
@@ -0,0 +1,185 @@
+ // Based on cician's shader from https://forum.unity3d.com/threads/simple-optimized-blur-shader.185327/#post-1267642
+
+Shader "Custom/MaskedUIBlur" {
+ Properties {
+ _Size ("Blur", Range(0, 30)) = 1
+ [HideInInspector] _MainTex ("Masking Texture", 2D) = "white" {}
+ _AdditiveColor ("Additive Tint color", Color) = (0, 0, 0, 0)
+ _MultiplyColor ("Multiply Tint color", Color) = (1, 1, 1, 1)
+ }
+
+ Category {
+
+ // We must be transparent, so other objects are drawn before this one.
+ Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Opaque" }
+
+
+ SubShader
+ {
+ // Horizontal blur
+ GrabPass
+ {
+ "_HBlur"
+ }
+ /*
+ ZTest Off
+ Blend SrcAlpha OneMinusSrcAlpha
+ */
+
+ Cull Off
+ Lighting Off
+ ZWrite Off
+ ZTest [unity_GUIZTestMode]
+ Blend SrcAlpha OneMinusSrcAlpha
+
+ Pass
+ {
+ CGPROGRAM
+ #pragma vertex vert
+ #pragma fragment frag
+ #pragma fragmentoption ARB_precision_hint_fastest
+ #include "UnityCG.cginc"
+
+ struct appdata_t {
+ float4 vertex : POSITION;
+ float2 texcoord : TEXCOORD0;
+ };
+
+ struct v2f {
+ float4 vertex : POSITION;
+ float4 uvgrab : TEXCOORD0;
+ float2 uvmain : TEXCOORD1;
+ };
+
+ sampler2D _MainTex;
+ float4 _MainTex_ST;
+
+ v2f vert (appdata_t v)
+ {
+ v2f o;
+ o.vertex = UnityObjectToClipPos(v.vertex);
+
+ #if UNITY_UV_STARTS_AT_TOP
+ float scale = -1.0;
+ #else
+ float scale = 1.0;
+ #endif
+
+ o.uvgrab.xy = (float2(o.vertex.x, o.vertex.y * scale) + o.vertex.w) * 0.5;
+ o.uvgrab.zw = o.vertex.zw;
+
+ o.uvmain = TRANSFORM_TEX(v.texcoord, _MainTex);
+ return o;
+ }
+
+ sampler2D _HBlur;
+ float4 _HBlur_TexelSize;
+ float _Size;
+ float4 _AdditiveColor;
+ float4 _MultiplyColor;
+
+ half4 frag( v2f i ) : COLOR
+ {
+ half4 sum = half4(0,0,0,0);
+
+ #define GRABPIXEL(weight,kernelx) tex2Dproj( _HBlur, UNITY_PROJ_COORD(float4(i.uvgrab.x + _HBlur_TexelSize.x * kernelx * _Size, i.uvgrab.y, i.uvgrab.z, i.uvgrab.w))) * weight
+
+ sum += GRABPIXEL(0.05, -4.0);
+ sum += GRABPIXEL(0.09, -3.0);
+ sum += GRABPIXEL(0.12, -2.0);
+ sum += GRABPIXEL(0.15, -1.0);
+ sum += GRABPIXEL(0.18, 0.0);
+ sum += GRABPIXEL(0.15, +1.0);
+ sum += GRABPIXEL(0.12, +2.0);
+ sum += GRABPIXEL(0.09, +3.0);
+ sum += GRABPIXEL(0.05, +4.0);
+
+
+ half4 result = half4(sum.r * _MultiplyColor.r + _AdditiveColor.r,
+ sum.g * _MultiplyColor.g + _AdditiveColor.g,
+ sum.b * _MultiplyColor.b + _AdditiveColor.b,
+ tex2D(_MainTex, i.uvmain).a);
+ return result;
+ }
+ ENDCG
+ }
+
+ // Vertical blur
+ GrabPass
+ {
+ "_VBlur"
+ }
+
+ Pass
+ {
+ CGPROGRAM
+ #pragma vertex vert
+ #pragma fragment frag
+ #pragma fragmentoption ARB_precision_hint_fastest
+ #include "UnityCG.cginc"
+
+ struct appdata_t {
+ float4 vertex : POSITION;
+ float2 texcoord: TEXCOORD0;
+ };
+
+ struct v2f {
+ float4 vertex : POSITION;
+ float4 uvgrab : TEXCOORD0;
+ float2 uvmain : TEXCOORD1;
+ };
+
+ sampler2D _MainTex;
+ float4 _MainTex_ST;
+
+ v2f vert (appdata_t v) {
+ v2f o;
+ o.vertex = UnityObjectToClipPos(v.vertex);
+
+ #if UNITY_UV_STARTS_AT_TOP
+ float scale = -1.0;
+ #else
+ float scale = 1.0;
+ #endif
+
+ o.uvgrab.xy = (float2(o.vertex.x, o.vertex.y * scale) + o.vertex.w) * 0.5;
+ o.uvgrab.zw = o.vertex.zw;
+
+ o.uvmain = TRANSFORM_TEX(v.texcoord, _MainTex);
+
+ return o;
+ }
+
+ sampler2D _VBlur;
+ float4 _VBlur_TexelSize;
+ float _Size;
+ float4 _AdditiveColor;
+ float4 _MultiplyColor;
+
+ half4 frag( v2f i ) : COLOR
+ {
+ half4 sum = half4(0,0,0,0);
+
+ #define GRABPIXEL(weight,kernely) tex2Dproj( _VBlur, UNITY_PROJ_COORD(float4(i.uvgrab.x, i.uvgrab.y + _VBlur_TexelSize.y * kernely * _Size, i.uvgrab.z, i.uvgrab.w))) * weight
+
+ sum += GRABPIXEL(0.05, -4.0);
+ sum += GRABPIXEL(0.09, -3.0);
+ sum += GRABPIXEL(0.12, -2.0);
+ sum += GRABPIXEL(0.15, -1.0);
+ sum += GRABPIXEL(0.18, 0.0);
+ sum += GRABPIXEL(0.15, +1.0);
+ sum += GRABPIXEL(0.12, +2.0);
+ sum += GRABPIXEL(0.09, +3.0);
+ sum += GRABPIXEL(0.05, +4.0);
+
+ half4 result = half4(sum.r * _MultiplyColor.r + _AdditiveColor.r,
+ sum.g * _MultiplyColor.g + _AdditiveColor.g,
+ sum.b * _MultiplyColor.b + _AdditiveColor.b,
+ tex2D(_MainTex, i.uvmain).a);
+ return result;
+ }
+ ENDCG
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Shaders/MaskedUIBlur.shader.meta b/Assets/Shaders/MaskedUIBlur.shader.meta
new file mode 100644
index 000000000..6ecaebb8c
--- /dev/null
+++ b/Assets/Shaders/MaskedUIBlur.shader.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 3951069d814b7174ca3bb4e8e302198b
+ShaderImporter:
+ externalObjects: {}
+ defaultTextures: []
+ nonModifiableTextures: []
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Textures/HDRI_STUDIO_vol2_049.hdr.meta b/Assets/Textures/HDRI_STUDIO_vol2_049.hdr.meta
index 00d8887c2..edae42869 100644
--- a/Assets/Textures/HDRI_STUDIO_vol2_049.hdr.meta
+++ b/Assets/Textures/HDRI_STUDIO_vol2_049.hdr.meta
@@ -26,7 +26,7 @@ TextureImporter:
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
- cubemapConvolution: 1
+ cubemapConvolution: 0
seamlessCubemap: 1
textureFormat: 1
maxTextureSize: 2048