GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgraded to Unity 2020.2

Browse source
This commit is contained in:
Reinier Vens 2021-01-06 16:00:24 +00:00
commit 1992428a14
24 changed files with 4871 additions and 4588 deletions
Download patch file Download diff file Expand all files Collapse all files

15
.idea/.idea.Aetheria-Economy/.idea/indexLayout.xml generated
View file

@ -6,21 +6,21 @@
</attachedFolders>
<explicitIncludes>
<Path>Library/PackageCache/com.unity.cinemachine@2.6.3</Path>
<Path>Library/PackageCache/com.unity.ext.nunit@1.0.0</Path>
<Path>Library/PackageCache/com.unity.ide.rider@1.2.1</Path>
<Path>Library/PackageCache/com.unity.ide.visualstudio@2.0.2</Path>
<Path>Library/PackageCache/com.unity.ide.vscode@1.2.1</Path>
<Path>Library/PackageCache/com.unity.inputsystem@1.0.0</Path>
<Path>Library/PackageCache/com.unity.ext.nunit@1.0.5</Path>
<Path>Library/PackageCache/com.unity.ide.rider@2.0.7</Path>
<Path>Library/PackageCache/com.unity.ide.visualstudio@2.0.5</Path>
<Path>Library/PackageCache/com.unity.ide.vscode@1.2.3</Path>
<Path>Library/PackageCache/com.unity.inputsystem@1.0.1</Path>
<Path>Library/PackageCache/com.unity.mathematics@1.1.0</Path>
<Path>Library/PackageCache/com.unity.mathematics@1.2.1</Path>
<Path>Library/PackageCache/com.unity.package-manager-ui@2.0.8</Path>
<Path>Library/PackageCache/com.unity.postprocessing@2.3.0</Path>
<Path>Library/PackageCache/com.unity.recorder@2.4.0-preview.1</Path>
<Path>Library/PackageCache/com.unity.test-framework@1.1.16</Path>
<Path>Library/PackageCache/com.unity.test-framework@1.1.19</Path>
<Path>Library/PackageCache/com.unity.textmeshpro@1.4.1</Path>
<Path>Library/PackageCache/com.unity.textmeshpro@3.0.1</Path>
<Path>Library/PackageCache/com.unity.timeline@1.2.6</Path>
<Path>Library/PackageCache/com.unity.xr.legacyinputhelpers@2.1.4</Path>
<Path>Library/PackageCache/com.unity.xr.legacyinputhelpers@2.1.6</Path>
<Path>Packages</Path>
<Path>ProjectSettings</Path>
</explicitIncludes>
@ -37,6 +37,7 @@
<Path>Logs</Path>
<Path>Recordings</Path>
<Path>Server</Path>
<Path>Temp</Path>
<Path>UserSettings</Path>
<Path>obj</Path>
</explicitExcludes>

12
Aetheria-Economy.sln
View file

@ -7,10 +7,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Economy.Shared.Unity", "Eco
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniRx", "UniRx.csproj", "{4d885cb7-1f9e-abb3-b070-7265b432ecda}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{a442877d-fc0d-6756-0a98-3ca4312f9253}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MessagePack", "MessagePack.csproj", "{c511ef21-dc27-883d-b027-9a4b6f36bae4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{a442877d-fc0d-6756-0a98-3ca4312f9253}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Substance.EditorHelper", "Substance.EditorHelper.csproj", "{dd909206-f54e-1c12-ed74-b4e22d464f6a}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Substance.Platform", "Substance.Platform.csproj", "{2ca9591a-f6e2-fafd-e598-0f0563c5ae57}"
@ -37,14 +37,14 @@ Global
{4d885cb7-1f9e-abb3-b070-7265b432ecda}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4d885cb7-1f9e-abb3-b070-7265b432ecda}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4d885cb7-1f9e-abb3-b070-7265b432ecda}.Release|Any CPU.Build.0 = Release|Any CPU
{a442877d-fc0d-6756-0a98-3ca4312f9253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{a442877d-fc0d-6756-0a98-3ca4312f9253}.Debug|Any CPU.Build.0 = Debug|Any CPU
{a442877d-fc0d-6756-0a98-3ca4312f9253}.Release|Any CPU.ActiveCfg = Release|Any CPU
{a442877d-fc0d-6756-0a98-3ca4312f9253}.Release|Any CPU.Build.0 = Release|Any CPU
{c511ef21-dc27-883d-b027-9a4b6f36bae4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{c511ef21-dc27-883d-b027-9a4b6f36bae4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{c511ef21-dc27-883d-b027-9a4b6f36bae4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{c511ef21-dc27-883d-b027-9a4b6f36bae4}.Release|Any CPU.Build.0 = Release|Any CPU
{a442877d-fc0d-6756-0a98-3ca4312f9253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{a442877d-fc0d-6756-0a98-3ca4312f9253}.Debug|Any CPU.Build.0 = Debug|Any CPU
{a442877d-fc0d-6756-0a98-3ca4312f9253}.Release|Any CPU.ActiveCfg = Release|Any CPU
{a442877d-fc0d-6756-0a98-3ca4312f9253}.Release|Any CPU.Build.0 = Release|Any CPU
{dd909206-f54e-1c12-ed74-b4e22d464f6a}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{dd909206-f54e-1c12-ed74-b4e22d464f6a}.Debug|Any CPU.Build.0 = Debug|Any CPU
{dd909206-f54e-1c12-ed74-b4e22d464f6a}.Release|Any CPU.ActiveCfg = Release|Any CPU

657
Assembly-CSharp-Editor-firstpass.csproj
View file

File diff suppressed because it is too large Load diff

765
Assembly-CSharp-Editor.csproj
View file

File diff suppressed because it is too large Load diff

691
Assembly-CSharp-firstpass.csproj
View file

File diff suppressed because it is too large Load diff

1895
Assembly-CSharp.csproj
View file

File diff suppressed because it is too large Load diff

BIN
Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll (Stored with Git LFS)
View file

Binary file not shown.

2
Assets/Materials/Substance/Metal/metal_car_paint 1.sbsar.meta
View file

@ -68,7 +68,7 @@ ScriptedImporter:
type=\"0\" value=\"0.14\" />\n <presetinput identifier=\"paint_color\" uid=\"105341618\"
type=\"2\" value=\"1,0.891509,0.946396\" />\n <presetinput identifier=\"paint_roughness\"
uid=\"22504606\" type=\"0\" value=\"0.15\" />\n <presetinput identifier=\"paint_metallic\"
uid=\"22503567\" type=\"0\" value=\"0.67\" />\n </sbspreset>\n"
uid=\"22503567\" type=\"0\" value=\"0\" />\n </sbspreset>\n"
shaderName: Standard
materialProperties:
shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}

2
Assets/Materials/UI/Map Gravity Lines.mat
View file

@ -86,7 +86,7 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Scale: 1.6680267
- _Scale: 2.7020054
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1

BIN
Assets/Plugins/Microsoft.SqlServer.Types.dll (Stored with Git LFS)
View file

Binary file not shown.

33
Assets/Plugins/Microsoft.SqlServer.Types.dll.meta
View file

@ -1,33 +0,0 @@
fileFormatVersion: 2
guid: 0c9892977144f954eaeb53285dbbb60e
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Any:
second:
enabled: 1
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:

92
Assets/Resources/Prefabs/Stations/Zenith.prefab
View file

@ -165,6 +165,26 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7719100217559641643}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_LocalScale.x
value: 3
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_LocalScale.y
value: 3
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_LocalScale.z
value: 3
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_LocalPosition.x
@ -180,6 +200,11 @@ PrefabInstance:
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_LocalRotation.x
@ -195,16 +220,6 @@ PrefabInstance:
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@ -220,26 +235,59 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7b7796ac88cf0724ca09bddf817828f1,
- target: {fileID: 70568184056594590, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_LocalScale.x
value: 3
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7b7796ac88cf0724ca09bddf817828f1,
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: -6026401407715332296, guid: e7758cad28ae98f478940e55222419a6,
type: 3}
propertyPath: m_LocalScale.y
value: 3
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7b7796ac88cf0724ca09bddf817828f1,
- target: {fileID: 70568184056594590, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_Materials.Array.data[1]
value:
objectReference: {fileID: 3720744386649352057, guid: 1c858fec5b74c7c46b1712494192b6b5,
type: 3}
- target: {fileID: 107625526037656489, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: -6026401407715332296, guid: e7758cad28ae98f478940e55222419a6,
type: 3}
- target: {fileID: 107625526037656489, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_Materials.Array.data[1]
value:
objectReference: {fileID: 3720744386649352057, guid: 1c858fec5b74c7c46b1712494192b6b5,
type: 3}
propertyPath: m_LocalScale.z
value: 3
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_Name
value: Zenith_Blender
objectReference: {fileID: 0}
- target: {fileID: 3689309066650553245, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: -6026401407715332296, guid: e7758cad28ae98f478940e55222419a6,
type: 3}
- target: {fileID: 3689309066650553245, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_Materials.Array.data[1]
value:
objectReference: {fileID: 3720744386649352057, guid: 1c858fec5b74c7c46b1712494192b6b5,
type: 3}
- target: {fileID: 7953148190234225185, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: -6026401407715332296, guid: e7758cad28ae98f478940e55222419a6,
type: 3}
- target: {fileID: 7953148190234225185, guid: 7b7796ac88cf0724ca09bddf817828f1,
type: 3}
propertyPath: m_Materials.Array.data[1]
value:
objectReference: {fileID: 3720744386649352057, guid: 1c858fec5b74c7c46b1712494192b6b5,
type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7b7796ac88cf0724ca09bddf817828f1, type: 3}
--- !u!4 &2353559640203777757 stripped

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

Binary file not shown.

2412
Assets/Scenes/ARPG.unity
View file

File diff suppressed because it is too large Load diff

28
Assets/Scripts/Editor/GalaxyEditor.cs
View file

@ -6,7 +6,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using MIConvexHull;
using Microsoft.SqlServer.Types;
using Newtonsoft.Json;
using RethinkDb.Driver;
using RethinkDb.Driver.Net;
@ -314,19 +313,20 @@ public class GalaxyEditor : Editor
private IEnumerable<Vector2> EvaluateHilbert(int order, bool normalized = true)
{
var points = new List<Vector2>();
uint x = 0, y = 1;
ulong i = 1;
uint max = 0;
while (x != 0 || y != 0)
{
SpaceFillingCurve.ReverseHilbert(order, i, out x, out y);
points.Add(new Vector2(x, y));
if (x > max)
max = x;
i++;
}
return normalized ? points.Select(p => p / (max + 1)) : points;
throw new NotImplementedException("GOTTA GET A NEW CURVE EVALUATOR");
// var points = new List<Vector2>();
// uint x = 0, y = 1;
// ulong i = 1;
// uint max = 0;
// while (x != 0 || y != 0)
// {
// SpaceFillingCurve.ReverseHilbert(order, i, out x, out y);
// points.Add(new Vector2(x, y));
// if (x > max)
// max = x;
// i++;
// }
// return normalized ? points.Select(p => p / (max + 1)) : points;
}
void Inspect(GalaxyMapLayerData layer)

1204
Economy.Shared.Unity.csproj
View file

File diff suppressed because it is too large Load diff

1384
MessagePack.csproj
View file

File diff suppressed because it is too large Load diff

12
Packages/manifest.json
View file

@ -3,18 +3,18 @@
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.cinemachine": "2.6.3",
"com.unity.ide.rider": "1.2.1",
"com.unity.ide.visualstudio": "2.0.2",
"com.unity.ide.vscode": "1.2.1",
"com.unity.inputsystem": "1.0.0",
"com.unity.ide.rider": "2.0.7",
"com.unity.ide.visualstudio": "2.0.5",
"com.unity.ide.vscode": "1.2.3",
"com.unity.inputsystem": "1.0.1",
"com.unity.mathematics": "1.2.1",
"com.unity.postprocessing": "2.3.0",
"com.unity.recorder": "2.4.0-preview.1",
"com.unity.test-framework": "1.1.16",
"com.unity.test-framework": "1.1.19",
"com.unity.textmeshpro": "3.0.1",
"com.unity.timeline": "1.2.6",
"com.unity.ugui": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.4",
"com.unity.xr.legacyinputhelpers": "2.1.6",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",

16
Packages/packages-lock.json
View file

@ -20,14 +20,14 @@
"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
"version": "1.0.0",
"version": "1.0.5",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "1.2.1",
"version": "2.0.7",
"depth": 0,
"source": "registry",
"dependencies": {
@ -36,21 +36,21 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.2",
"version": "2.0.5",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.ide.vscode": {
"version": "1.2.1",
"version": "1.2.3",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.inputsystem": {
"version": "1.0.0",
"version": "1.0.1",
"depth": 0,
"source": "registry",
"dependencies": {},
@ -80,11 +80,11 @@
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.16",
"version": "1.1.19",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ext.nunit": "1.0.0",
"com.unity.ext.nunit": "1.0.5",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},
@ -116,7 +116,7 @@
}
},
"com.unity.xr.legacyinputhelpers": {
"version": "2.1.4",
"version": "2.1.6",
"depth": 0,
"source": "registry",
"dependencies": {},

4
ProjectSettings/ProjectVersion.txt
View file

@ -1,2 +1,2 @@
m_EditorVersion: 2020.1.6f1
m_EditorVersionWithRevision: 2020.1.6f1 (fc477ca6df10)
m_EditorVersion: 2020.2.1f1
m_EditorVersionWithRevision: 2020.2.1f1 (270dd8c3da1c)

4
ProjectSettings/ProjectVersionPrevious.txt
View file

@ -1,2 +1,2 @@
m_EditorVersion: 2020.1.6f1
m_EditorVersionWithRevision: 2020.1.6f1 (fc477ca6df10)
m_EditorVersion: 2020.2.1f1
m_EditorVersionWithRevision: 2020.2.1f1 (270dd8c3da1c)

1206
Substance.EditorHelper.csproj
View file

File diff suppressed because it is too large Load diff

1206
Substance.Platform.csproj
View file

File diff suppressed because it is too large Load diff

1670
UniRx.csproj
View file

File diff suppressed because it is too large Load diff