Minimap + Input System

Minimap is back
Minimap zoom level button
Input System configured
This commit is contained in:
Reinier Vens 2020-12-02 16:42:09 +00:00
commit eef34a2de5
54 changed files with 6487 additions and 543 deletions

View file

@ -9,7 +9,6 @@
<e p="Assembly-CSharp-firstpass.csproj" t="IncludeRecursive" />
<e p="Assembly-CSharp.csproj" t="IncludeRecursive" />
<e p="Assets" t="Include">
<e p="Grid.cs" t="Include" />
<e p="Plugins" t="Include">
<e p="AsyncAwaitUtil" t="Include">
<e p="Source" t="Include">
@ -53,6 +52,7 @@
</e>
<e p="Scripts" t="Include">
<e p="ActionGameManager.cs" t="Include" />
<e p="AetheriaInput.cs" t="Include" />
<e p="CameraPerlinOrbit.cs" t="Include" />
<e p="CopyTransform.cs" t="Include" />
<e p="CultClient.cs" t="Include" />
@ -1807,6 +1807,7 @@
<e p="IncrementField.cs" t="Include" />
<e p="InputField.cs" t="Include" />
<e p="LoginScreen.cs" t="Include" />
<e p="MinimapCameraTrack.cs" t="Include" />
<e p="MouseHover.cs" t="Include" />
<e p="PropertiesList.cs" t="Include" />
<e p="PropertiesPanel.cs" t="Include" />

View file

@ -285,7 +285,6 @@
<Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Spline\Bundling\IMetroMapOrderingAlgorithm.cs" />
<Compile Include="Assets\Scripts\UI\ZoneShip.cs" />
<Compile Include="Assets\Scripts\NIH\MSAGL\Layout\Layered\LayerArrays.cs" />
<Compile Include="Assets\Grid.cs" />
<Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Spline\Bundling\CdtIntersections.cs" />
<Compile Include="Assets\Scripts\NIH\MSAGL\Core\GraphAlgorithms\TopologicalSort.cs" />
<Compile Include="Assets\Scripts\NIH\MSAGL\Core\Geometry\RTree\RTree.cs" />
@ -673,6 +672,8 @@
<Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Rectilinear\BasicReflectionEvent.cs" />
<Compile Include="Assets\Scripts\NIH\MSAGL\Layout\Layered\IntEdge.cs" />
<Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Spline\Bundling\PointPairOrder.cs" />
<Compile Include="Assets\Scripts\AetheriaInput.cs" />
<Compile Include="Assets\Scripts\UI\MinimapCameraTrack.cs" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMPro.cginc" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Mobile Overlay.shader" />
<None Include="Assets\Shaders\Clouds.shader" />

View file

@ -1,46 +0,0 @@
using UnityEngine;
[RequireComponent(typeof(MeshFilter), typeof(MeshRenderer))]
public class Grid : MonoBehaviour {
public int xSize, ySize;
private Mesh mesh;
private Vector3[] vertices;
private void Awake () {
Generate();
}
private void Generate () {
GetComponent<MeshFilter>().mesh = mesh = new Mesh();
mesh.name = "Procedural Grid";
vertices = new Vector3[(xSize + 1) * (ySize + 1)];
Vector2[] uv = new Vector2[vertices.Length];
Vector4[] tangents = new Vector4[vertices.Length];
Vector4 tangent = new Vector4(1f, 0f, 0f, -1f);
for (int i = 0, y = 0; y <= ySize; y++) {
for (int x = 0; x <= xSize; x++, i++) {
vertices[i] = new Vector3(x, y);
uv[i] = new Vector2((float)x / xSize, (float)y / ySize);
tangents[i] = tangent;
}
}
mesh.vertices = vertices;
mesh.uv = uv;
mesh.tangents = tangents;
int[] triangles = new int[xSize * ySize * 6];
for (int ti = 0, vi = 0, y = 0; y < ySize; y++, vi++) {
for (int x = 0; x < xSize; x++, ti += 6, vi++) {
triangles[ti] = vi;
triangles[ti + 3] = triangles[ti + 2] = vi + 1;
triangles[ti + 4] = triangles[ti + 1] = vi + xSize + 1;
triangles[ti + 5] = vi + xSize + 2;
}
}
mesh.triangles = triangles;
mesh.RecalculateNormals();
}
}

View file

@ -41,8 +41,8 @@ Material:
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaFloor: 0
- _DepthBlend: 256
- _DepthCeiling: 1792
- _DepthBlend: 512
- _DepthCeiling: 4096
- _Gamma: 0.3
- _GridCeilingBlend: -300
- _GridCeilingDensity: 0.01

View file

@ -76,5 +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}
- _TintColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

View file

@ -76,5 +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}
- _TintColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

View file

@ -76,5 +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}
- _TintColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

View file

@ -40,7 +40,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 8400000, guid: ed3d896ce7cb4a84aa4de8515a60f59c, type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@ -56,19 +56,20 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AngleFade: 30
- _AngleFade: 20
- _AngleWidth: 0.05
- _BumpScale: 1
- _ClipDistance: 10
- _ClipDistance: 1000
- _Cutoff: 0.5
- _DangerSteepness: 0.15
- _DangerSteepness: 5
- _DepthRange: 100
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HeightRange: 37.3
- _LineFade: 30
- _HeightRange: 50
- _LineFade: 20
- _LineWidth: 0.05
- _Metallic: 0
- _Mode: 0
@ -77,11 +78,13 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StartDepth: 0
- _StartHeight: 0
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _AngleColor: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 0.1507389, g: 0.4522169, b: 0.6, a: 1}
- _DangerColor: {r: 1, g: 0.3473333, b: 0.020999968, a: 1}
- _AngleColor: {r: 0, g: 0.058300022, b: 0.106000006, a: 1}
- _Color: {r: 0, g: 0.4, b: 0.6, a: 1}
- _DangerColor: {r: 2.9803922, g: 0.2509804, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View file

@ -276,7 +276,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 524c72939685743438cb17ce839664e7, type: 2}
- {fileID: 2100000, guid: 500a9213de99289478677535cace747e, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

View file

@ -0,0 +1,822 @@
{
"name": "Aetheria-Economy",
"maps": [
{
"name": "Player",
"id": "b00bd617-6995-42af-ac1f-90d4766f7933",
"actions": [
{
"name": "Move",
"type": "Value",
"id": "197ba05c-054a-44fc-8328-0d37e8ac00db",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
},
{
"name": "Look",
"type": "Value",
"id": "323b9ea0-f916-4609-b697-322fc0ef9420",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
},
{
"name": "Fire",
"type": "Button",
"id": "575943b0-4866-4be0-a289-3253973523b1",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
},
{
"name": "Minimap Zoom",
"type": "Button",
"id": "5708685d-78bd-4d2b-8796-712704f21bfb",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
}
],
"bindings": [
{
"name": "",
"id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403",
"path": "<Gamepad>/leftStick",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Move",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "WASD",
"id": "00ca640b-d935-4593-8157-c05846ea39b3",
"path": "Dpad",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9",
"path": "<Keyboard>/w",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "up",
"id": "8180e8bd-4097-4f4e-ab88-4523101a6ce9",
"path": "<Keyboard>/upArrow",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "320bffee-a40b-4347-ac70-c210eb8bc73a",
"path": "<Keyboard>/s",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "1c5327b5-f71c-4f60-99c7-4e737386f1d1",
"path": "<Keyboard>/downArrow",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc",
"path": "<Keyboard>/a",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "2e46982e-44cc-431b-9f0b-c11910bf467a",
"path": "<Keyboard>/leftArrow",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400",
"path": "<Keyboard>/d",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "77bff152-3580-4b21-b6de-dcd0c7e41164",
"path": "<Keyboard>/rightArrow",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "3ea4d645-4504-4529-b061-ab81934c3752",
"path": "<Joystick>/stick",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "Move",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "c1f7a91b-d0fd-4a62-997e-7fb9b69bf235",
"path": "<Gamepad>/rightStick",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Look",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "8c8e490b-c610-4785-884f-f04217b23ca4",
"path": "<Pointer>/delta",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse;Touch",
"action": "Look",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "3e5f5442-8668-4b27-a940-df99bad7e831",
"path": "<Joystick>/{Hatswitch}",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "Look",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "143bb1cd-cc10-4eca-a2f0-a3664166fe91",
"path": "<Gamepad>/rightTrigger",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Fire",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "05f6913d-c316-48b2-a6bb-e225f14c7960",
"path": "<Mouse>/leftButton",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Fire",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "886e731e-7071-4ae4-95c0-e61739dad6fd",
"path": "<Touchscreen>/primaryTouch/tap",
"interactions": "",
"processors": "",
"groups": ";Touch",
"action": "Fire",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "ee3d0cd2-254e-47a7-a8cb-bc94d9658c54",
"path": "<Joystick>/trigger",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "Fire",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "495c3ec6-3188-4309-9072-f958e89c87ec",
"path": "<Keyboard>/comma",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Minimap Zoom",
"isComposite": false,
"isPartOfComposite": false
}
]
},
{
"name": "UI",
"id": "9a15adda-ca0c-414c-891e-6407bfcd3661",
"actions": [
{
"name": "Navigate",
"type": "Value",
"id": "add1d35f-58cd-4789-8868-f0afb51d87bc",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
},
{
"name": "Submit",
"type": "Button",
"id": "766f9151-3f3d-4e12-8ade-ce5aacd3940f",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
},
{
"name": "Cancel",
"type": "Button",
"id": "9dc56d99-ed81-42c3-b38d-1a7e76688b34",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
},
{
"name": "Point",
"type": "PassThrough",
"id": "dfeef3e2-b0cc-4a9c-97ea-48ab693ac37f",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
},
{
"name": "Click",
"type": "PassThrough",
"id": "aae7decd-7584-44f4-87ad-09c14c406ead",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
},
{
"name": "ScrollWheel",
"type": "PassThrough",
"id": "25891af2-479b-4104-9a29-158aee22fa73",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
},
{
"name": "MiddleClick",
"type": "PassThrough",
"id": "dc9af334-4f90-46dc-9b77-f381faa04a79",
"expectedControlType": "",
"processors": "",
"interactions": ""
},
{
"name": "RightClick",
"type": "PassThrough",
"id": "27901940-469e-42cd-92b3-f5f787a8d1d6",
"expectedControlType": "",
"processors": "",
"interactions": ""
},
{
"name": "TrackedDevicePosition",
"type": "PassThrough",
"id": "b297afa0-f417-4a48-aaa1-36a6efd36190",
"expectedControlType": "Vector3",
"processors": "",
"interactions": ""
},
{
"name": "TrackedDeviceOrientation",
"type": "PassThrough",
"id": "1a877e6d-221e-4815-a289-aa93412c8d87",
"expectedControlType": "Quaternion",
"processors": "",
"interactions": ""
}
],
"bindings": [
{
"name": "Gamepad",
"id": "809f371f-c5e2-4e7a-83a1-d867598f40dd",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Navigate",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf",
"path": "<Gamepad>/leftStick/up",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "up",
"id": "9144cbe6-05e1-4687-a6d7-24f99d23dd81",
"path": "<Gamepad>/rightStick/up",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "2db08d65-c5fb-421b-983f-c71163608d67",
"path": "<Gamepad>/leftStick/down",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "58748904-2ea9-4a80-8579-b500e6a76df8",
"path": "<Gamepad>/rightStick/down",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "8ba04515-75aa-45de-966d-393d9bbd1c14",
"path": "<Gamepad>/leftStick/left",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "712e721c-bdfb-4b23-a86c-a0d9fcfea921",
"path": "<Gamepad>/rightStick/left",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "fcd248ae-a788-4676-a12e-f4d81205600b",
"path": "<Gamepad>/leftStick/right",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "1f04d9bc-c50b-41a1-bfcc-afb75475ec20",
"path": "<Gamepad>/rightStick/right",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "fb8277d4-c5cd-4663-9dc7-ee3f0b506d90",
"path": "<Gamepad>/dpad",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "Joystick",
"id": "e25d9774-381c-4a61-b47c-7b6b299ad9f9",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Navigate",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "3db53b26-6601-41be-9887-63ac74e79d19",
"path": "<Joystick>/stick/up",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "0cb3e13e-3d90-4178-8ae6-d9c5501d653f",
"path": "<Joystick>/stick/down",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "0392d399-f6dd-4c82-8062-c1e9c0d34835",
"path": "<Joystick>/stick/left",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "942a66d9-d42f-43d6-8d70-ecb4ba5363bc",
"path": "<Joystick>/stick/right",
"interactions": "",
"processors": "",
"groups": "Joystick",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "Keyboard",
"id": "ff527021-f211-4c02-933e-5976594c46ed",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Navigate",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "563fbfdd-0f09-408d-aa75-8642c4f08ef0",
"path": "<Keyboard>/w",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "up",
"id": "eb480147-c587-4a33-85ed-eb0ab9942c43",
"path": "<Keyboard>/upArrow",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "2bf42165-60bc-42ca-8072-8c13ab40239b",
"path": "<Keyboard>/s",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "85d264ad-e0a0-4565-b7ff-1a37edde51ac",
"path": "<Keyboard>/downArrow",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "74214943-c580-44e4-98eb-ad7eebe17902",
"path": "<Keyboard>/a",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "cea9b045-a000-445b-95b8-0c171af70a3b",
"path": "<Keyboard>/leftArrow",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "8607c725-d935-4808-84b1-8354e29bab63",
"path": "<Keyboard>/d",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "4cda81dc-9edd-4e03-9d7c-a71a14345d0b",
"path": "<Keyboard>/rightArrow",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Navigate",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc",
"path": "*/{Submit}",
"interactions": "",
"processors": "",
"groups": "",
"action": "Submit",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "82627dcc-3b13-4ba9-841d-e4b746d6553e",
"path": "*/{Cancel}",
"interactions": "",
"processors": "",
"groups": "",
"action": "Cancel",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "c52c8e0b-8179-41d3-b8a1-d149033bbe86",
"path": "<Mouse>/position",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Point",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "e1394cbc-336e-44ce-9ea8-6007ed6193f7",
"path": "<Pen>/position",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Point",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "5693e57a-238a-46ed-b5ae-e64e6e574302",
"path": "<Touchscreen>/touch*/position",
"interactions": "",
"processors": "",
"groups": "Touch",
"action": "Point",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "4faf7dc9-b979-4210-aa8c-e808e1ef89f5",
"path": "<Mouse>/leftButton",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Click",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "8d66d5ba-88d7-48e6-b1cd-198bbfef7ace",
"path": "<Pen>/tip",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Click",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "47c2a644-3ebc-4dae-a106-589b7ca75b59",
"path": "<Touchscreen>/touch*/press",
"interactions": "",
"processors": "",
"groups": "Touch",
"action": "Click",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "bb9e6b34-44bf-4381-ac63-5aa15d19f677",
"path": "<XRController>/trigger",
"interactions": "",
"processors": "",
"groups": "XR",
"action": "Click",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "38c99815-14ea-4617-8627-164d27641299",
"path": "<Mouse>/scroll",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "ScrollWheel",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "24066f69-da47-44f3-a07e-0015fb02eb2e",
"path": "<Mouse>/middleButton",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "MiddleClick",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "4c191405-5738-4d4b-a523-c6a301dbf754",
"path": "<Mouse>/rightButton",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "RightClick",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77",
"path": "<XRController>/devicePosition",
"interactions": "",
"processors": "",
"groups": "XR",
"action": "TrackedDevicePosition",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "23e01e3a-f935-4948-8d8b-9bcac77714fb",
"path": "<XRController>/deviceRotation",
"interactions": "",
"processors": "",
"groups": "XR",
"action": "TrackedDeviceOrientation",
"isComposite": false,
"isPartOfComposite": false
}
]
}
],
"controlSchemes": [
{
"name": "Keyboard&Mouse",
"bindingGroup": "Keyboard&Mouse",
"devices": [
{
"devicePath": "<Keyboard>",
"isOptional": false,
"isOR": false
},
{
"devicePath": "<Mouse>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "Gamepad",
"bindingGroup": "Gamepad",
"devices": [
{
"devicePath": "<Gamepad>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "Touch",
"bindingGroup": "Touch",
"devices": [
{
"devicePath": "<Touchscreen>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "Joystick",
"bindingGroup": "Joystick",
"devices": [
{
"devicePath": "<Joystick>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "XR",
"bindingGroup": "XR",
"devices": [
{
"devicePath": "<XRController>",
"isOptional": false,
"isOR": false
}
]
}
]
}

View file

@ -0,0 +1,14 @@
fileFormatVersion: 2
guid: aefbf90246423cf408d3520635b878eb
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3}
generateWrapperCode: 1
wrapperCodePath: Assets/Scripts/AetheriaInput.cs
wrapperClassName: AetheriaInput
wrapperCodeNamespace:

View file

@ -18,7 +18,7 @@ RenderTexture:
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 2
m_ColorFormat: 8
m_ColorFormat: 69
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0

View file

@ -18,7 +18,7 @@ RenderTexture:
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 0
m_ColorFormat: 8
m_ColorFormat: 49
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0

View file

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

File diff suppressed because it is too large Load diff

View file

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

BIN
Assets/Resources/Settings.asset (Stored with Git LFS)

Binary file not shown.

BIN
Assets/Resources/Sprites/MinimapBG.psd (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,94 @@
fileFormatVersion: 2
guid: 99dddb0ee93bf6c4190e1ebba8092356
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: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/Sprites/bubble2.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,118 @@
fileFormatVersion: 2
guid: 1780f2672fc13204bb8b6840bd6a5091
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: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
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: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/Sprites/circle.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,118 @@
fileFormatVersion: 2
guid: 77c8d571d6cb3204e9ac9cba5e40c9b5
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: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
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: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/Sprites/circle2.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,118 @@
fileFormatVersion: 2
guid: 04e6b5b3e37eaab44b44e8649b2754b4
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: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
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: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/Sprites/ringThick.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,118 @@
fileFormatVersion: 2
guid: 6637e57ef9fa8254a9ba89c991f9d62e
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: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
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: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/Sprites/ringThin.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,118 @@
fileFormatVersion: 2
guid: 957812ab678ac484791a49f1cc5efac4
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: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
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: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/Sprites/ringThinSmall.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,118 @@
fileFormatVersion: 2
guid: 4fc89fe4218c63f4c9238a8d49da8ef5
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: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
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: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View file

@ -373,6 +373,20 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 27001711}
m_CullTransparentMesh: 0
--- !u!114 &33146103
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Asset: {fileID: -944628639613478452, guid: aefbf90246423cf408d3520635b878eb, type: 3}
m_ActionId: add1d35f-58cd-4789-8868-f0afb51d87bc
--- !u!1 &39508927
GameObject:
m_ObjectHideFlags: 0
@ -431,7 +445,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 500
orthographic size: 1000
m_Depth: 0
m_CullingMask:
serializedVersion: 2
@ -444,7 +458,7 @@ Camera:
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &45636165
@ -1045,6 +1059,20 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100053898}
m_CullTransparentMesh: 0
--- !u!114 &104505232
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Asset: {fileID: -944628639613478452, guid: aefbf90246423cf408d3520635b878eb, type: 3}
m_ActionId: dc9af334-4f90-46dc-9b77-f381faa04a79
--- !u!1 &108120459
GameObject:
m_ObjectHideFlags: 0
@ -2504,7 +2532,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 199435031}
- component: {fileID: 199435032}
m_Layer: 0
m_Name: MinimapCameras
m_TagString: Untagged
@ -2528,25 +2555,6 @@ Transform:
m_Father: {fileID: 1665127616}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &199435032
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 199435030}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7ec4eea2d4fa2f64f80e17d11987e6f6, type: 3}
m_Name:
m_EditorClassIdentifier:
Target: {fileID: 2115559090}
CopyXPosition: 1
CopyYPosition: 0
CopyZPosition: 1
CopyRotation: 1
PixelSnapCamera: {fileID: 0}
PixelSnapIncrement: 1
--- !u!1 &204384462
GameObject:
m_ObjectHideFlags: 0
@ -5582,6 +5590,156 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 482476747}
m_CullTransparentMesh: 0
--- !u!1001 &488443578
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 761574181}
m_Modifications:
- target: {fileID: 2352149239973948581, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: Camera
value:
objectReference: {fileID: 2115559090}
- target: {fileID: 2352149240214713048, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: Camera
value:
objectReference: {fileID: 2115559090}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 10
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_SizeDelta.x
value: 150
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_SizeDelta.y
value: 150
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_LocalScale.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_LocalScale.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2352149240678857107, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: m_Name
value: MiniMap
objectReference: {fileID: 0}
- target: {fileID: 2352149240842547923, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
propertyPath: Camera
value:
objectReference: {fileID: 2115559090}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f032e3ceed591844e80327e865f2c582, type: 3}
--- !u!224 &488443579 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2352149240678857104, guid: f032e3ceed591844e80327e865f2c582,
type: 3}
m_PrefabInstance: {fileID: 488443578}
m_PrefabAsset: {fileID: 0}
--- !u!1 &488792360
GameObject:
m_ObjectHideFlags: 0
@ -5592,6 +5750,7 @@ GameObject:
m_Component:
- component: {fileID: 488792361}
- component: {fileID: 488792362}
- component: {fileID: 488792363}
m_Layer: 0
m_Name: GravityCamera
m_TagString: Untagged
@ -5637,10 +5796,10 @@ Camera:
width: 1
height: 1
near clip plane: 0.3
far clip plane: 500
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 500
orthographic size: 1000
m_Depth: 0
m_CullingMask:
serializedVersion: 2
@ -5653,9 +5812,28 @@ Camera:
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!114 &488792363
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 488792360}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7ec4eea2d4fa2f64f80e17d11987e6f6, type: 3}
m_Name:
m_EditorClassIdentifier:
Target: {fileID: 2115559090}
CopyXPosition: 1
CopyYPosition: 0
CopyZPosition: 1
CopyRotation: 0
PixelSnapCamera: {fileID: 0}
PixelSnapIncrement: 1
--- !u!1 &507065481
GameObject:
m_ObjectHideFlags: 0
@ -5714,7 +5892,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 500
orthographic size: 1000
m_Depth: 0
m_CullingMask:
serializedVersion: 2
@ -5727,9 +5905,124 @@ Camera:
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &509767787
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 509767791}
- component: {fileID: 509767790}
- component: {fileID: 509767789}
- component: {fileID: 509767788}
m_Layer: 14
m_Name: Minimap Gravity Lines
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &509767788
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 509767787}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7ec4eea2d4fa2f64f80e17d11987e6f6, type: 3}
m_Name:
m_EditorClassIdentifier:
Target: {fileID: 2115559090}
CopyXPosition: 1
CopyYPosition: 0
CopyZPosition: 1
CopyRotation: 0
PixelSnapCamera: {fileID: 0}
PixelSnapIncrement: 1
--- !u!23 &509767789
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 509767787}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 90cead50364300d47bb35194fb52c117, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &509767790
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 509767787}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &509767791
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 509767787}
m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2000, y: 2000, z: 2000}
m_Children: []
m_Father: {fileID: 2095699057}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!114 &523659427
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Asset: {fileID: -944628639613478452, guid: aefbf90246423cf408d3520635b878eb, type: 3}
m_ActionId: 9dc56d99-ed81-42c3-b38d-1a7e76688b34
--- !u!1 &531818201
GameObject:
m_ObjectHideFlags: 0
@ -6413,7 +6706,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 500
orthographic size: 1000
m_Depth: 0
m_CullingMask:
serializedVersion: 2
@ -6426,7 +6719,7 @@ Camera:
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &561872388
@ -9344,6 +9637,7 @@ RectTransform:
- {fileID: 53415401}
- {fileID: 721750121}
- {fileID: 1723136546}
- {fileID: 488443579}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -9366,27 +9660,19 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_MoveRepeatDelay: 0.5
m_MoveRepeatRate: 0.1
m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018,
m_ActionsAsset: {fileID: -944628639613478452, guid: aefbf90246423cf408d3520635b878eb,
type: 3}
m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018,
m_PointAction: {fileID: 797124793}
m_MoveAction: {fileID: 33146103}
m_SubmitAction: {fileID: 1972916819}
m_CancelAction: {fileID: 523659427}
m_LeftClickAction: {fileID: 1114885171}
m_MiddleClickAction: {fileID: 104505232}
m_RightClickAction: {fileID: 1798728975}
m_ScrollWheelAction: {fileID: 1250229237}
m_TrackedDevicePositionAction: {fileID: 8860902725583761198, guid: aefbf90246423cf408d3520635b878eb,
type: 3}
m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_SubmitAction: {fileID: 2064916234097673511, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_CancelAction: {fileID: -1967631576421560919, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_LeftClickAction: {fileID: 8056856818456041789, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_MiddleClickAction: {fileID: 3279352641294131588, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_RightClickAction: {fileID: 3837173908680883260, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_ScrollWheelAction: {fileID: 4502412055082496612, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_TrackedDevicePositionAction: {fileID: 4754684134866288074, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_TrackedDeviceOrientationAction: {fileID: 1025543830046995696, guid: ca9f5fa95ffab41fb9a615ab714db018,
m_TrackedDeviceOrientationAction: {fileID: 7496690464979690870, guid: aefbf90246423cf408d3520635b878eb,
type: 3}
m_DeselectOnBackgroundClick: 1
m_PointerBehavior: 1
@ -9677,6 +9963,20 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 765185707}
m_PrefabAsset: {fileID: 0}
--- !u!114 &797124793
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Asset: {fileID: -944628639613478452, guid: aefbf90246423cf408d3520635b878eb, type: 3}
m_ActionId: dfeef3e2-b0cc-4a9c-97ea-48ab693ac37f
--- !u!1 &825923019
GameObject:
m_ObjectHideFlags: 0
@ -11225,6 +11525,7 @@ GameObject:
m_Component:
- component: {fileID: 970624070}
- component: {fileID: 970624071}
- component: {fileID: 970624072}
m_Layer: 14
m_Name: Map Overlays
m_TagString: Untagged
@ -11270,25 +11571,44 @@ Camera:
width: 1
height: 1
near clip plane: 0.3
far clip plane: 500
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 500
orthographic size: 1000
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 16384
m_RenderingPath: 1
m_TargetTexture: {fileID: 8400000, guid: ed3d896ce7cb4a84aa4de8515a60f59c, type: 2}
m_TargetTexture: {fileID: 8400000, guid: 7f2cc6f8dbb93cd40b3a72c55d17c971, type: 2}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!114 &970624072
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 970624069}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7ec4eea2d4fa2f64f80e17d11987e6f6, type: 3}
m_Name:
m_EditorClassIdentifier:
Target: {fileID: 2115559090}
CopyXPosition: 1
CopyYPosition: 0
CopyZPosition: 1
CopyRotation: 1
PixelSnapCamera: {fileID: 0}
PixelSnapIncrement: 1
--- !u!1 &974967197
GameObject:
m_ObjectHideFlags: 0
@ -11553,6 +11873,7 @@ GameObject:
- component: {fileID: 1009503728}
- component: {fileID: 1009503731}
- component: {fileID: 1009503732}
- component: {fileID: 1009503733}
m_Layer: 0
m_Name: GameManager
m_TagString: Untagged
@ -11624,6 +11945,7 @@ MonoBehaviour:
SectorRoot: {fileID: 2095699057}
SectorBrushes: {fileID: 1037490739}
SectorBoundaryBrush: {fileID: 1476765550}
MinimapGravityQuad: {fileID: 509767789}
SceneCameras:
- {fileID: 887677622}
- {fileID: 1517471405}
@ -11699,7 +12021,6 @@ MonoBehaviour:
Material: {fileID: 2100000, guid: 63a8a57976371814689d7fb222e635e9, type: 2}
- Mesh: {fileID: 4300004, guid: d3c9f05eabff9e24ca9521e0b8dffd50, type: 3}
Material: {fileID: 2100000, guid: 9be65d82397829b46894243c2d91a06d, type: 2}
Belt: {fileID: 0}
Planet: {fileID: 8287217960984982033, guid: 88ace6073e3db1a46bd3aaf4f971acb9, type: 3}
GasGiant: {fileID: 3250623180916197132, guid: 85753b4a7c762274385af384abed7a04,
type: 3}
@ -11719,6 +12040,93 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
NoiseTexture: {fileID: 2800000, guid: 7c0a392de8821f345824a79dea0d0d41, type: 3}
--- !u!114 &1009503733
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1009503727}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: aefbf90246423cf408d3520635b878eb,
type: 3}
m_NotificationBehavior: 3
m_UIInputModule: {fileID: 761574182}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_ControlsChangedEvent:
m_PersistentCalls:
m_Calls: []
m_ActionEvents:
- m_PersistentCalls:
m_Calls: []
m_ActionId: 197ba05c-054a-44fc-8328-0d37e8ac00db
m_ActionName: Player/Move[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]
- m_PersistentCalls:
m_Calls: []
m_ActionId: 323b9ea0-f916-4609-b697-322fc0ef9420
m_ActionName: Player/Look[/Mouse/delta]
- m_PersistentCalls:
m_Calls: []
m_ActionId: 575943b0-4866-4be0-a289-3253973523b1
m_ActionName: Player/Fire[/Mouse/leftButton]
- m_PersistentCalls:
m_Calls: []
m_ActionId: 5708685d-78bd-4d2b-8796-712704f21bfb
m_ActionName: Player/Minimap Zoom[/Keyboard/m]
- m_PersistentCalls:
m_Calls: []
m_ActionId: add1d35f-58cd-4789-8868-f0afb51d87bc
m_ActionName: UI/Navigate[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]
- m_PersistentCalls:
m_Calls: []
m_ActionId: 766f9151-3f3d-4e12-8ade-ce5aacd3940f
m_ActionName: UI/Submit[/Keyboard/enter]
- m_PersistentCalls:
m_Calls: []
m_ActionId: 9dc56d99-ed81-42c3-b38d-1a7e76688b34
m_ActionName: UI/Cancel[/Keyboard/escape]
- m_PersistentCalls:
m_Calls: []
m_ActionId: dfeef3e2-b0cc-4a9c-97ea-48ab693ac37f
m_ActionName: UI/Point[/Mouse/position]
- m_PersistentCalls:
m_Calls: []
m_ActionId: aae7decd-7584-44f4-87ad-09c14c406ead
m_ActionName: UI/Click[/Mouse/leftButton]
- m_PersistentCalls:
m_Calls: []
m_ActionId: 25891af2-479b-4104-9a29-158aee22fa73
m_ActionName: UI/ScrollWheel[/Mouse/scroll]
- m_PersistentCalls:
m_Calls: []
m_ActionId: dc9af334-4f90-46dc-9b77-f381faa04a79
m_ActionName: UI/MiddleClick[/Mouse/middleButton]
- m_PersistentCalls:
m_Calls: []
m_ActionId: 27901940-469e-42cd-92b3-f5f787a8d1d6
m_ActionName: UI/RightClick[/Mouse/rightButton]
- m_PersistentCalls:
m_Calls: []
m_ActionId: b297afa0-f417-4a48-aaa1-36a6efd36190
m_ActionName: UI/TrackedDevicePosition
- m_PersistentCalls:
m_Calls: []
m_ActionId: 1a877e6d-221e-4815-a289-aa93412c8d87
m_ActionName: UI/TrackedDeviceOrientation
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme: Keyboard&Mouse
m_DefaultActionMap: Player
m_SplitScreenIndex: -1
m_Camera: {fileID: 2115559089}
--- !u!1 &1015214589
GameObject:
m_ObjectHideFlags: 0
@ -12474,6 +12882,20 @@ Transform:
m_Father: {fileID: 1037490739}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1114885171
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Asset: {fileID: -944628639613478452, guid: aefbf90246423cf408d3520635b878eb, type: 3}
m_ActionId: aae7decd-7584-44f4-87ad-09c14c406ead
--- !u!1 &1126306637
GameObject:
m_ObjectHideFlags: 0
@ -13268,6 +13690,20 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1250229237
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Asset: {fileID: -944628639613478452, guid: aefbf90246423cf408d3520635b878eb, type: 3}
m_ActionId: 25891af2-479b-4104-9a29-158aee22fa73
--- !u!1 &1273980438
GameObject:
m_ObjectHideFlags: 0
@ -16090,7 +16526,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 500
orthographic size: 1000
m_Depth: 0
m_CullingMask:
serializedVersion: 2
@ -16103,7 +16539,7 @@ Camera:
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &1547679114
@ -19900,6 +20336,20 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!114 &1798728975
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Asset: {fileID: -944628639613478452, guid: aefbf90246423cf408d3520635b878eb, type: 3}
m_ActionId: 27901940-469e-42cd-92b3-f5f787a8d1d6
--- !u!1 &1812411989
GameObject:
m_ObjectHideFlags: 0
@ -21583,6 +22033,20 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1972778354}
m_CullTransparentMesh: 0
--- !u!114 &1972916819
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Asset: {fileID: -944628639613478452, guid: aefbf90246423cf408d3520635b878eb, type: 3}
m_ActionId: 766f9151-3f3d-4e12-8ade-ce5aacd3940f
--- !u!1 &1973552680
GameObject:
m_ObjectHideFlags: 0
@ -22666,7 +23130,8 @@ Transform:
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_Children:
- {fileID: 509767791}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View file

@ -7,6 +7,7 @@ using MessagePack;
using UniRx;
using UnityEngine;
using Unity.Mathematics;
using UnityEngine.InputSystem;
using static Unity.Mathematics.math;
using float2 = Unity.Mathematics.float2;
@ -16,10 +17,13 @@ public class ActionGameManager : MonoBehaviour
public SectorRenderer SectorRenderer;
public CinemachineVirtualCamera TopDownCamera;
public CinemachineVirtualCamera FollowCamera;
//public PlayerInput Input;
private DirectoryInfo _filePath;
private bool _editMode;
private float _time;
private AetheriaInput _input;
private int _zoomLevelIndex;
public DatabaseCache Cache { get; private set; }
public GameContext Context { get; private set; }
@ -49,6 +53,16 @@ public class ActionGameManager : MonoBehaviour
Zone = new Zone(Settings.PlanetSettings, zonePack);
SectorRenderer.LoadZone(Zone);
_input = new AetheriaInput();
_input.Player.Enable();
_zoomLevelIndex = Settings.DefaultMinimapZoom;
_input.Player.MinimapZoom.performed += context =>
{
_zoomLevelIndex = (_zoomLevelIndex + 1) % Settings.MinimapZoomLevels.Length;
SectorRenderer.MinimapDistance = Settings.MinimapZoomLevels[_zoomLevelIndex];
};
ConsoleController.AddCommand("editmode", _ => ToggleEditMode());
ConsoleController.AddCommand("savezone", args =>
{

File diff suppressed because it is too large Load diff

View file

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 589fc3064d261406a97550f5fc2d62f2
timeCreated: 1432898976
licenseType: Pro
guid: e1492a755d3edcf4eb6147bc8612f92e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0

View file

@ -1,394 +1,394 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using UnityEditor;
using UnityEngine;
namespace NaughtyAttributes.Editor
{
[CanEditMultipleObjects]
[CustomEditor(typeof(UnityEngine.Object), true)]
public class InspectorEditor : UnityEditor.Editor
{
private SerializedProperty script;
private IEnumerable<FieldInfo> fields;
private HashSet<FieldInfo> groupedFields;
private Dictionary<string, List<FieldInfo>> groupedFieldsByGroupName;
private IEnumerable<FieldInfo> nonSerializedFields;
private IEnumerable<PropertyInfo> nativeProperties;
private IEnumerable<MethodInfo> methods;
private Dictionary<string, SerializedProperty> serializedPropertiesByFieldName;
private bool useDefaultInspector;
private void OnEnable()
{
this.script = this.serializedObject.FindProperty("m_Script");
// Cache serialized fields
this.fields = this.GetFields(f => this.serializedObject.FindProperty(f.Name) != null);
// If there are no NaughtyAttributes use default inspector
if (this.fields.All(f => f.GetCustomAttributes(typeof(NaughtyAttribute), true).Length == 0))
{
this.useDefaultInspector = true;
}
else
{
this.useDefaultInspector = false;
// Cache grouped fields
this.groupedFields = new HashSet<FieldInfo>(this.fields.Where(f => f.GetCustomAttributes(typeof(GroupAttribute), true).Length > 0));
// Cache grouped fields by group name
this.groupedFieldsByGroupName = new Dictionary<string, List<FieldInfo>>();
foreach (var groupedField in this.groupedFields)
{
string groupName = (groupedField.GetCustomAttributes(typeof(GroupAttribute), true)[0] as GroupAttribute).Name;
if (this.groupedFieldsByGroupName.ContainsKey(groupName))
{
this.groupedFieldsByGroupName[groupName].Add(groupedField);
}
else
{
this.groupedFieldsByGroupName[groupName] = new List<FieldInfo>()
{
groupedField
};
}
}
// Cache serialized properties by field name
this.serializedPropertiesByFieldName = new Dictionary<string, SerializedProperty>();
foreach (var field in this.fields)
{
this.serializedPropertiesByFieldName[field.Name] = this.serializedObject.FindProperty(field.Name);
}
}
// Cache non-serialized fields
this.nonSerializedFields = this.GetFields(
f => f.GetCustomAttributes(typeof(DrawerAttribute), true).Length > 0 && this.serializedObject.FindProperty(f.Name) == null);
// Cache the native properties
this.nativeProperties = this.GetProperties(
p => p.GetCustomAttributes(typeof(DrawerAttribute), true).Length > 0);
// Cache methods with DrawerAttribute
this.methods = this.GetMethods(m => m.GetCustomAttributes(typeof(DrawerAttribute), true).Length > 0);
}
private void OnDisable()
{
PropertyDrawerDatabase.ClearCache();
}
public override void OnInspectorGUI()
{
if (this.useDefaultInspector)
{
this.DrawDefaultInspector();
}
else
{
this.serializedObject.Update();
if (this.script != null)
{
GUI.enabled = false;
EditorGUILayout.PropertyField(this.script);
GUI.enabled = true;
}
// Draw fields
HashSet<string> drawnGroups = new HashSet<string>();
foreach (var field in this.fields)
{
if (this.groupedFields.Contains(field))
{
// Draw grouped fields
string groupName = (field.GetCustomAttributes(typeof(GroupAttribute), true)[0] as GroupAttribute).Name;
if (!drawnGroups.Contains(groupName))
{
drawnGroups.Add(groupName);
PropertyGrouper grouper = this.GetPropertyGrouperForField(field);
if (grouper != null)
{
grouper.BeginGroup(groupName);
this.ValidateAndDrawFields(this.groupedFieldsByGroupName[groupName]);
grouper.EndGroup();
}
else
{
this.ValidateAndDrawFields(this.groupedFieldsByGroupName[groupName]);
}
}
}
else
{
// Draw non-grouped field
this.ValidateAndDrawField(field);
}
}
this.serializedObject.ApplyModifiedProperties();
}
// Draw non-serialized fields
foreach (var field in this.nonSerializedFields)
{
DrawerAttribute drawerAttribute = (DrawerAttribute)field.GetCustomAttributes(typeof(DrawerAttribute), true)[0];
FieldDrawer drawer = FieldDrawerDatabase.GetDrawerForAttribute(drawerAttribute.GetType());
if (drawer != null)
{
drawer.DrawField(this.target, field);
}
}
// Draw native properties
foreach (var property in this.nativeProperties)
{
DrawerAttribute drawerAttribute = (DrawerAttribute)property.GetCustomAttributes(typeof(DrawerAttribute), true)[0];
NativePropertyDrawer drawer = NativePropertyDrawerDatabase.GetDrawerForAttribute(drawerAttribute.GetType());
if (drawer != null)
{
drawer.DrawNativeProperty(this.target, property);
}
}
// Draw methods
foreach (var method in this.methods)
{
DrawerAttribute drawerAttribute = (DrawerAttribute)method.GetCustomAttributes(typeof(DrawerAttribute), true)[0];
MethodDrawer methodDrawer = MethodDrawerDatabase.GetDrawerForAttribute(drawerAttribute.GetType());
if (methodDrawer != null)
{
methodDrawer.DrawMethod(this.target, method);
}
}
}
private void ValidateAndDrawFields(IEnumerable<FieldInfo> fields)
{
foreach (var field in fields)
{
this.ValidateAndDrawField(field);
}
}
private void ValidateAndDrawField(FieldInfo field)
{
this.ValidateField(field);
this.ApplyFieldMeta(field);
this.DrawField(field);
}
private void ValidateField(FieldInfo field)
{
ValidatorAttribute[] validatorAttributes = (ValidatorAttribute[])field.GetCustomAttributes(typeof(ValidatorAttribute), true);
foreach (var attribute in validatorAttributes)
{
PropertyValidator validator = PropertyValidatorDatabase.GetValidatorForAttribute(attribute.GetType());
if (validator != null)
{
validator.ValidateProperty(this.serializedPropertiesByFieldName[field.Name]);
}
}
}
private void DrawField(FieldInfo field)
{
// Check if the field has draw conditions
PropertyDrawCondition drawCondition = this.GetPropertyDrawConditionForField(field);
if (drawCondition != null)
{
bool canDrawProperty = drawCondition.CanDrawProperty(this.serializedPropertiesByFieldName[field.Name]);
if (!canDrawProperty)
{
return;
}
}
// Check if the field has HideInInspectorAttribute
HideInInspector[] hideInInspectorAttributes = (HideInInspector[])field.GetCustomAttributes(typeof(HideInInspector), true);
if (hideInInspectorAttributes.Length > 0)
{
return;
}
// Draw the field
EditorGUI.BeginChangeCheck();
PropertyDrawer drawer = this.GetPropertyDrawerForField(field);
if (drawer != null)
{
drawer.DrawProperty(this.serializedPropertiesByFieldName[field.Name]);
}
else
{
EditorGUILayout.PropertyField(this.serializedPropertiesByFieldName[field.Name], true);
}
if (EditorGUI.EndChangeCheck())
{
OnValueChangedAttribute[] onValueChangedAttributes = (OnValueChangedAttribute[])field.GetCustomAttributes(typeof(OnValueChangedAttribute), true);
foreach (var onValueChangedAttribute in onValueChangedAttributes)
{
PropertyMeta meta = PropertyMetaDatabase.GetMetaForAttribute(onValueChangedAttribute.GetType());
if (meta != null)
{
meta.ApplyPropertyMeta(this.serializedPropertiesByFieldName[field.Name], onValueChangedAttribute);
}
}
}
}
private void ApplyFieldMeta(FieldInfo field)
{
// Apply custom meta attributes
MetaAttribute[] metaAttributes = field
.GetCustomAttributes(typeof(MetaAttribute), true)
.Where(attr => attr.GetType() != typeof(OnValueChangedAttribute))
.Select(obj => obj as MetaAttribute)
.ToArray();
System.Array.Sort(metaAttributes, (x, y) =>
{
return x.Order - y.Order;
});
foreach (var metaAttribute in metaAttributes)
{
PropertyMeta meta = PropertyMetaDatabase.GetMetaForAttribute(metaAttribute.GetType());
if (meta != null)
{
meta.ApplyPropertyMeta(this.serializedPropertiesByFieldName[field.Name], metaAttribute);
}
}
}
private PropertyDrawer GetPropertyDrawerForField(FieldInfo field)
{
DrawerAttribute[] drawerAttributes = (DrawerAttribute[])field.GetCustomAttributes(typeof(DrawerAttribute), true);
if (drawerAttributes.Length > 0)
{
PropertyDrawer drawer = PropertyDrawerDatabase.GetDrawerForAttribute(drawerAttributes[0].GetType());
return drawer;
}
else
{
return null;
}
}
private PropertyGrouper GetPropertyGrouperForField(FieldInfo field)
{
GroupAttribute[] groupAttributes = (GroupAttribute[])field.GetCustomAttributes(typeof(GroupAttribute), true);
if (groupAttributes.Length > 0)
{
PropertyGrouper grouper = PropertyGrouperDatabase.GetGrouperForAttribute(groupAttributes[0].GetType());
return grouper;
}
else
{
return null;
}
}
private PropertyDrawCondition GetPropertyDrawConditionForField(FieldInfo field)
{
DrawConditionAttribute[] drawConditionAttributes = (DrawConditionAttribute[])field.GetCustomAttributes(typeof(DrawConditionAttribute), true);
if (drawConditionAttributes.Length > 0)
{
PropertyDrawCondition drawCondition = PropertyDrawConditionDatabase.GetDrawConditionForAttribute(drawConditionAttributes[0].GetType());
return drawCondition;
}
else
{
return null;
}
}
private List<FieldInfo> GetFields(Func<FieldInfo, bool> predicate)
{
List<Type> types = new List<Type>()
{
this.target.GetType()
};
while (types.Last().BaseType != null)
{
types.Add(types.Last().BaseType);
}
List<FieldInfo> fields = new List<FieldInfo>();
for (int i = types.Count - 1; i >= 0; i--)
{
IEnumerable<FieldInfo> fieldInfos = types[i]
.GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly)
.Where(predicate);
fields.AddRange(fieldInfos);
}
return fields;
}
private List<PropertyInfo> GetProperties(Func<PropertyInfo, bool> predicate)
{
List<Type> types = new List<Type>()
{
this.target.GetType()
};
while (types.Last().BaseType != null)
{
types.Add(types.Last().BaseType);
}
List<PropertyInfo> properties = new List<PropertyInfo>();
for (int i = types.Count - 1; i >= 0; i--)
{
IEnumerable<PropertyInfo> propertyInfos = types[i]
.GetProperties(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly)
.Where(predicate);
properties.AddRange(propertyInfos);
}
return properties;
}
private List<MethodInfo> GetMethods(Func<MethodInfo, bool> predicate)
{
List<Type> types = new List<Type>()
{
this.target.GetType()
};
while (types.Last().BaseType != null)
{
types.Add(types.Last().BaseType);
}
List<MethodInfo> methods = new List<MethodInfo>();
for (int i = types.Count - 1; i >= 0; i--)
{
IEnumerable<MethodInfo> methodInfos = types[i]
.GetMethods(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly)
.Where(predicate);
methods.AddRange(methodInfos);
}
return methods;
}
}
}
// using System;
// using System.Collections.Generic;
// using System.Linq;
// using System.Reflection;
// using UnityEditor;
// using UnityEngine;
//
// namespace NaughtyAttributes.Editor
// {
// [CanEditMultipleObjects]
// [CustomEditor(typeof(UnityEngine.Object), true)]
// public class InspectorEditor : UnityEditor.Editor
// {
// private SerializedProperty script;
//
// private IEnumerable<FieldInfo> fields;
// private HashSet<FieldInfo> groupedFields;
// private Dictionary<string, List<FieldInfo>> groupedFieldsByGroupName;
// private IEnumerable<FieldInfo> nonSerializedFields;
// private IEnumerable<PropertyInfo> nativeProperties;
// private IEnumerable<MethodInfo> methods;
//
// private Dictionary<string, SerializedProperty> serializedPropertiesByFieldName;
//
// private bool useDefaultInspector;
//
// private void OnEnable()
// {
// this.script = this.serializedObject.FindProperty("m_Script");
//
// // Cache serialized fields
// this.fields = this.GetFields(f => this.serializedObject.FindProperty(f.Name) != null);
//
// // If there are no NaughtyAttributes use default inspector
// if (this.fields.All(f => f.GetCustomAttributes(typeof(NaughtyAttribute), true).Length == 0))
// {
// this.useDefaultInspector = true;
// }
// else
// {
// this.useDefaultInspector = false;
//
// // Cache grouped fields
// this.groupedFields = new HashSet<FieldInfo>(this.fields.Where(f => f.GetCustomAttributes(typeof(GroupAttribute), true).Length > 0));
//
// // Cache grouped fields by group name
// this.groupedFieldsByGroupName = new Dictionary<string, List<FieldInfo>>();
// foreach (var groupedField in this.groupedFields)
// {
// string groupName = (groupedField.GetCustomAttributes(typeof(GroupAttribute), true)[0] as GroupAttribute).Name;
//
// if (this.groupedFieldsByGroupName.ContainsKey(groupName))
// {
// this.groupedFieldsByGroupName[groupName].Add(groupedField);
// }
// else
// {
// this.groupedFieldsByGroupName[groupName] = new List<FieldInfo>()
// {
// groupedField
// };
// }
// }
//
// // Cache serialized properties by field name
// this.serializedPropertiesByFieldName = new Dictionary<string, SerializedProperty>();
// foreach (var field in this.fields)
// {
// this.serializedPropertiesByFieldName[field.Name] = this.serializedObject.FindProperty(field.Name);
// }
// }
//
// // Cache non-serialized fields
// this.nonSerializedFields = this.GetFields(
// f => f.GetCustomAttributes(typeof(DrawerAttribute), true).Length > 0 && this.serializedObject.FindProperty(f.Name) == null);
//
// // Cache the native properties
// this.nativeProperties = this.GetProperties(
// p => p.GetCustomAttributes(typeof(DrawerAttribute), true).Length > 0);
//
// // Cache methods with DrawerAttribute
// this.methods = this.GetMethods(m => m.GetCustomAttributes(typeof(DrawerAttribute), true).Length > 0);
// }
//
// private void OnDisable()
// {
// PropertyDrawerDatabase.ClearCache();
// }
//
// public override void OnInspectorGUI()
// {
// if (this.useDefaultInspector)
// {
// this.DrawDefaultInspector();
// }
// else
// {
// this.serializedObject.Update();
//
// if (this.script != null)
// {
// GUI.enabled = false;
// EditorGUILayout.PropertyField(this.script);
// GUI.enabled = true;
// }
//
// // Draw fields
// HashSet<string> drawnGroups = new HashSet<string>();
// foreach (var field in this.fields)
// {
// if (this.groupedFields.Contains(field))
// {
// // Draw grouped fields
// string groupName = (field.GetCustomAttributes(typeof(GroupAttribute), true)[0] as GroupAttribute).Name;
// if (!drawnGroups.Contains(groupName))
// {
// drawnGroups.Add(groupName);
//
// PropertyGrouper grouper = this.GetPropertyGrouperForField(field);
// if (grouper != null)
// {
// grouper.BeginGroup(groupName);
//
// this.ValidateAndDrawFields(this.groupedFieldsByGroupName[groupName]);
//
// grouper.EndGroup();
// }
// else
// {
// this.ValidateAndDrawFields(this.groupedFieldsByGroupName[groupName]);
// }
// }
// }
// else
// {
// // Draw non-grouped field
// this.ValidateAndDrawField(field);
// }
// }
//
// this.serializedObject.ApplyModifiedProperties();
// }
//
// // Draw non-serialized fields
// foreach (var field in this.nonSerializedFields)
// {
// DrawerAttribute drawerAttribute = (DrawerAttribute)field.GetCustomAttributes(typeof(DrawerAttribute), true)[0];
// FieldDrawer drawer = FieldDrawerDatabase.GetDrawerForAttribute(drawerAttribute.GetType());
// if (drawer != null)
// {
// drawer.DrawField(this.target, field);
// }
// }
//
// // Draw native properties
// foreach (var property in this.nativeProperties)
// {
// DrawerAttribute drawerAttribute = (DrawerAttribute)property.GetCustomAttributes(typeof(DrawerAttribute), true)[0];
// NativePropertyDrawer drawer = NativePropertyDrawerDatabase.GetDrawerForAttribute(drawerAttribute.GetType());
// if (drawer != null)
// {
// drawer.DrawNativeProperty(this.target, property);
// }
// }
//
// // Draw methods
// foreach (var method in this.methods)
// {
// DrawerAttribute drawerAttribute = (DrawerAttribute)method.GetCustomAttributes(typeof(DrawerAttribute), true)[0];
// MethodDrawer methodDrawer = MethodDrawerDatabase.GetDrawerForAttribute(drawerAttribute.GetType());
// if (methodDrawer != null)
// {
// methodDrawer.DrawMethod(this.target, method);
// }
// }
// }
//
// private void ValidateAndDrawFields(IEnumerable<FieldInfo> fields)
// {
// foreach (var field in fields)
// {
// this.ValidateAndDrawField(field);
// }
// }
//
// private void ValidateAndDrawField(FieldInfo field)
// {
// this.ValidateField(field);
// this.ApplyFieldMeta(field);
// this.DrawField(field);
// }
//
// private void ValidateField(FieldInfo field)
// {
// ValidatorAttribute[] validatorAttributes = (ValidatorAttribute[])field.GetCustomAttributes(typeof(ValidatorAttribute), true);
//
// foreach (var attribute in validatorAttributes)
// {
// PropertyValidator validator = PropertyValidatorDatabase.GetValidatorForAttribute(attribute.GetType());
// if (validator != null)
// {
// validator.ValidateProperty(this.serializedPropertiesByFieldName[field.Name]);
// }
// }
// }
//
// private void DrawField(FieldInfo field)
// {
// // Check if the field has draw conditions
// PropertyDrawCondition drawCondition = this.GetPropertyDrawConditionForField(field);
// if (drawCondition != null)
// {
// bool canDrawProperty = drawCondition.CanDrawProperty(this.serializedPropertiesByFieldName[field.Name]);
// if (!canDrawProperty)
// {
// return;
// }
// }
//
// // Check if the field has HideInInspectorAttribute
// HideInInspector[] hideInInspectorAttributes = (HideInInspector[])field.GetCustomAttributes(typeof(HideInInspector), true);
// if (hideInInspectorAttributes.Length > 0)
// {
// return;
// }
//
// // Draw the field
// EditorGUI.BeginChangeCheck();
// PropertyDrawer drawer = this.GetPropertyDrawerForField(field);
// if (drawer != null)
// {
// drawer.DrawProperty(this.serializedPropertiesByFieldName[field.Name]);
// }
// else
// {
// EditorGUILayout.PropertyField(this.serializedPropertiesByFieldName[field.Name], true);
// }
//
// if (EditorGUI.EndChangeCheck())
// {
// OnValueChangedAttribute[] onValueChangedAttributes = (OnValueChangedAttribute[])field.GetCustomAttributes(typeof(OnValueChangedAttribute), true);
// foreach (var onValueChangedAttribute in onValueChangedAttributes)
// {
// PropertyMeta meta = PropertyMetaDatabase.GetMetaForAttribute(onValueChangedAttribute.GetType());
// if (meta != null)
// {
// meta.ApplyPropertyMeta(this.serializedPropertiesByFieldName[field.Name], onValueChangedAttribute);
// }
// }
// }
// }
//
// private void ApplyFieldMeta(FieldInfo field)
// {
// // Apply custom meta attributes
// MetaAttribute[] metaAttributes = field
// .GetCustomAttributes(typeof(MetaAttribute), true)
// .Where(attr => attr.GetType() != typeof(OnValueChangedAttribute))
// .Select(obj => obj as MetaAttribute)
// .ToArray();
//
// System.Array.Sort(metaAttributes, (x, y) =>
// {
// return x.Order - y.Order;
// });
//
// foreach (var metaAttribute in metaAttributes)
// {
// PropertyMeta meta = PropertyMetaDatabase.GetMetaForAttribute(metaAttribute.GetType());
// if (meta != null)
// {
// meta.ApplyPropertyMeta(this.serializedPropertiesByFieldName[field.Name], metaAttribute);
// }
// }
// }
//
// private PropertyDrawer GetPropertyDrawerForField(FieldInfo field)
// {
// DrawerAttribute[] drawerAttributes = (DrawerAttribute[])field.GetCustomAttributes(typeof(DrawerAttribute), true);
// if (drawerAttributes.Length > 0)
// {
// PropertyDrawer drawer = PropertyDrawerDatabase.GetDrawerForAttribute(drawerAttributes[0].GetType());
// return drawer;
// }
// else
// {
// return null;
// }
// }
//
// private PropertyGrouper GetPropertyGrouperForField(FieldInfo field)
// {
// GroupAttribute[] groupAttributes = (GroupAttribute[])field.GetCustomAttributes(typeof(GroupAttribute), true);
// if (groupAttributes.Length > 0)
// {
// PropertyGrouper grouper = PropertyGrouperDatabase.GetGrouperForAttribute(groupAttributes[0].GetType());
// return grouper;
// }
// else
// {
// return null;
// }
// }
//
// private PropertyDrawCondition GetPropertyDrawConditionForField(FieldInfo field)
// {
// DrawConditionAttribute[] drawConditionAttributes = (DrawConditionAttribute[])field.GetCustomAttributes(typeof(DrawConditionAttribute), true);
// if (drawConditionAttributes.Length > 0)
// {
// PropertyDrawCondition drawCondition = PropertyDrawConditionDatabase.GetDrawConditionForAttribute(drawConditionAttributes[0].GetType());
// return drawCondition;
// }
// else
// {
// return null;
// }
// }
//
// private List<FieldInfo> GetFields(Func<FieldInfo, bool> predicate)
// {
// List<Type> types = new List<Type>()
// {
// this.target.GetType()
// };
//
// while (types.Last().BaseType != null)
// {
// types.Add(types.Last().BaseType);
// }
//
// List<FieldInfo> fields = new List<FieldInfo>();
// for (int i = types.Count - 1; i >= 0; i--)
// {
// IEnumerable<FieldInfo> fieldInfos = types[i]
// .GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly)
// .Where(predicate);
//
// fields.AddRange(fieldInfos);
// }
//
// return fields;
// }
//
// private List<PropertyInfo> GetProperties(Func<PropertyInfo, bool> predicate)
// {
// List<Type> types = new List<Type>()
// {
// this.target.GetType()
// };
//
// while (types.Last().BaseType != null)
// {
// types.Add(types.Last().BaseType);
// }
//
// List<PropertyInfo> properties = new List<PropertyInfo>();
// for (int i = types.Count - 1; i >= 0; i--)
// {
// IEnumerable<PropertyInfo> propertyInfos = types[i]
// .GetProperties(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly)
// .Where(predicate);
//
// properties.AddRange(propertyInfos);
// }
//
// return properties;
// }
//
// private List<MethodInfo> GetMethods(Func<MethodInfo, bool> predicate)
// {
// List<Type> types = new List<Type>()
// {
// this.target.GetType()
// };
//
// while (types.Last().BaseType != null)
// {
// types.Add(types.Last().BaseType);
// }
//
// List<MethodInfo> methods = new List<MethodInfo>();
// for (int i = types.Count - 1; i >= 0; i--)
// {
// IEnumerable<MethodInfo> methodInfos = types[i]
// .GetMethods(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly)
// .Where(predicate);
//
// methods.AddRange(methodInfos);
// }
//
// return methods;
// }
// }
// }

View file

@ -9,7 +9,10 @@ public class GameSettings : ScriptableObject
public float DefaultZoneRadius;
public float DefaultZoneMass;
public float DefaultViewDistance;
public float DefaultMinimapDistance;
public float MinimapZoneGravityRange;
public float[] MinimapZoomLevels;
public int DefaultMinimapZoom;
public float IconSize;
public int AsteroidMeshCount = 5;
public PlanetSettings PlanetSettings;
public ZoneGenerationSettings ZoneSettings;

View file

@ -16,6 +16,7 @@ public class SectorRenderer : MonoBehaviour
public Transform SectorRoot;
public Transform SectorBrushes;
public MeshRenderer SectorBoundaryBrush;
public MeshRenderer MinimapGravityQuad;
public CinemachineVirtualCamera[] SceneCameras;
public Camera[] FogCameras;
public Camera[] MinimapCameras;
@ -28,7 +29,6 @@ public class SectorRenderer : MonoBehaviour
// public Material AsteroidMaterial;
[Header("Prefabs")]
public GameObject Belt;
public PlanetObject Planet;
public GasGiantObject GasGiant;
public SunObject Sun;
@ -41,6 +41,7 @@ public class SectorRenderer : MonoBehaviour
private Dictionary<Guid, InstancedMesh[]> _beltMeshes = new Dictionary<Guid, InstancedMesh[]>();
private Zone _zone;
private float _viewDistance;
private float _maxDepth;
public float Time { get; set; }
@ -53,7 +54,7 @@ public class SectorRenderer : MonoBehaviour
camera.orthographicSize = value;
foreach(var camera in SceneCameras)
camera.m_Lens.FarClipPlane = value * FarPlaneDistanceMultiplier;
FogMaterial.SetFloat("_DepthCeiling", value - FogFarFadeFraction * value);
FogMaterial.SetFloat("_DepthCeiling", value);
FogMaterial.SetFloat("_DepthBlend", FogFarFadeFraction * value);
}
}
@ -63,18 +64,22 @@ public class SectorRenderer : MonoBehaviour
set
{
foreach(var camera in MinimapCameras)
camera.orthographicSize = value * 2;
camera.orthographicSize = value;
MinimapGravityQuad.transform.localScale = value * 2 * Vector3.one;
foreach (var planet in _planets.Values)
planet.Icon.transform.localScale = Settings.IconSize / 256 * value * Vector3.one;
}
}
void Start()
{
ViewDistance = Settings.DefaultViewDistance;
MinimapDistance = Settings.DefaultMinimapDistance;
MinimapDistance = Settings.MinimapZoomLevels[Settings.DefaultMinimapZoom];
}
public void LoadZone(Zone zone)
{
_maxDepth = 0;
_zone = zone;
SectorBrushes.localScale = zone.Data.Radius * 2 * Vector3.one;
ClearZone();
@ -142,7 +147,11 @@ public class SectorRenderer : MonoBehaviour
var planetInstance = _zone.PlanetInstances[planetData.ID];
planetInstance.BodyRadius.Subscribe(f => planet.Body.transform.localScale = f * Vector3.one);
planetInstance.GravityWellRadius.Subscribe(f => planet.GravityWell.transform.localScale = f * Vector3.one);
planetInstance.GravityWellDepth.Subscribe(f => planet.GravityWell.material.SetFloat("_Depth", f));
planetInstance.GravityWellDepth.Subscribe(f =>
{
if (f > _maxDepth) _maxDepth = f;
planet.GravityWell.material.SetFloat("_Depth", f);
});
_planets.Add(planetData.ID, planet);
}
@ -186,8 +195,15 @@ public class SectorRenderer : MonoBehaviour
var fogPos = FogCameraParent.position;
SectorBoundaryBrush.material.SetFloat("_Power", Settings.PlanetSettings.ZoneDepthExponent);
SectorBoundaryBrush.material.SetFloat("_Depth", Settings.PlanetSettings.ZoneDepth + Settings.PlanetSettings.ZoneBoundaryFog);
var startDepth = Zone.PowerPulse(Settings.MinimapZoneGravityRange, Settings.PlanetSettings.ZoneDepthExponent) * Settings.PlanetSettings.ZoneDepth;
var depthRange = Settings.PlanetSettings.ZoneDepth - startDepth + _maxDepth;
MinimapGravityQuad.material.SetFloat("_StartDepth", startDepth);
MinimapGravityQuad.material.SetFloat("_DepthRange", depthRange);
FogMaterial.SetFloat("_GridOffset", Settings.PlanetSettings.ZoneBoundaryFog);
FogMaterial.SetVector("_GridTransform", new Vector4(fogPos.x,fogPos.z,_viewDistance*2));
var gravPos = MinimapGravityQuad.transform.position;
gravPos.y = -Settings.PlanetSettings.ZoneDepth - _maxDepth;
MinimapGravityQuad.transform.position = gravPos;
}
}

View file

@ -0,0 +1,25 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class MinimapCameraTrack : MonoBehaviour
{
public Transform Camera;
public bool Modulo;
public float Offset;
private RectTransform _rect;
void Start ()
{
_rect = GetComponent<RectTransform>();
}
void Update ()
{
var dir = Camera.forward.Flatland().normalized;
var deg = -Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg;
if (Modulo)
deg = Mathf.Repeat(deg + 15, 30) - 15;
_rect.rotation = Quaternion.Euler(0,0,deg+Offset);
}
}

View file

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

View file

@ -3,17 +3,17 @@
Properties
{
_MainTex ("Texture", 2D) = "white" {}
_Color ("Color", Color) = (.5,.5,.5,1)
_AngleColor ("Angle Color", Color) = (.5,.5,.5,1)
_DangerColor ("Danger Color", Color) = (.5,.5,.5,1)
_StartHeight("Start Height", Float) = 0
_HeightRange("Height Range", Float) = 100
[HDR] _Color ("Color", Color) = (.5,.5,.5,1)
[HDR] _AngleColor ("Angle Color", Color) = (.5,.5,.5,1)
[HDR] _DangerColor ("Danger Color", Color) = (.5,.5,.5,1)
_StartDepth("Start Depth", Float) = 0
_DepthRange("Height Range", Float) = 100
_LineWidth("Line Width", Float) = .1
_LineFade("Line Fade", Float) = .1
_AngleWidth("Angle Width", Float) = .1
_AngleFade("Angle Fade", Float) = .1
_DangerSteepness("Danger Steepness", Float) = .1
_ClipDistance("Clip Distance", Float) = 10
//_ClipDistance("Clip Distance", Float) = 10
}
SubShader
{
@ -51,14 +51,14 @@
float4 _Color;
float4 _AngleColor;
float4 _DangerColor;
float _StartHeight;
float _HeightRange;
float _StartDepth;
float _DepthRange;
float _LineWidth;
float _LineFade;
float _AngleWidth;
float _AngleFade;
float _DangerSteepness;
float _ClipDistance;
//float _ClipDistance;
v2f vert (appdata v)
{
@ -78,23 +78,23 @@
fixed4 frag (v2f IN) : SV_Target
{
clip(1-length(IN.uvw)/_ClipDistance);
//clip(1-length(IN.uvw)/_ClipDistance);
// sample the texture
half h = -tex2D(_MainTex, IN.uv).r;
float4 col = float4(0,0,0,0);
float blend = smoothstep(_StartHeight, _StartHeight + _HeightRange / 32, -h);
float blend = smoothstep(_StartDepth, _StartDepth + _DepthRange / 32, -h);
// Calculate the direction in which the surface is facing
float2 plan = calcGrad(IN.uv, h);
float planmag = length(plan);
float dangerblend = smoothstep(0,_DangerSteepness * 600, planmag * _ScreenParams.y / unity_OrthoParams.y);
float dangerblend = smoothstep(0,_DangerSteepness, planmag * _ScreenParams.y / unity_OrthoParams.y);
// Loop over isolines, computing a pseudo distance field for a number of height values
float spacing = _HeightRange / 20;
for (int ih = 0; ih < 20; ih++) {
float isoline = abs(h - _StartHeight + (ih*spacing));
float spacing = _DepthRange / 20;
for (int ih = 1; ih <= 21; ih++) {
float isoline = abs(h + _StartDepth + (ih*spacing));
//float2 isograd = float2(ddx(isoline), ddy(isoline));
//float isomag = length(isograd);
col += (1-smoothstep(_LineWidth, _LineWidth * _LineFade, isoline / planmag)) * lerp(_Color,_DangerColor,dangerblend) * blend; // Isoline

BIN
ProjectSettings/ProjectSettings.asset (Stored with Git LFS)

Binary file not shown.