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

Title Screen

Browse source 
Polished UI for the title screen
Added login, registration and session management to CultClient
Connected title screen to CultClient login and registration
This commit is contained in:
hyperion51 2020-03-26 02:49:09 +00:00
commit 95947355c2
37 changed files with 4639 additions and 2433 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Assets/Scripts/ServerShared/Attributes.cs
View file

@ -10,6 +10,17 @@ public class NameAttribute : Attribute
}
}
[AttributeUsage(AttributeTargets.Class)]
public class RethinkTableAttribute : Attribute
{
public string TableName;
public RethinkTableAttribute(string tableName)
{
TableName = tableName;
}
}
public class UpdateOrderAttribute : Attribute
{
public int Order;

6
Assets/Scripts/ServerShared/DatabaseItems.cs
View file

@ -45,6 +45,7 @@ public abstract class DatabaseEntry
[IgnoreMember] public GameContext Context { get; set; }
}
[RethinkTable("Users")]
[MessagePackObject]
[JsonObject(MemberSerialization.OptIn)]
public class Player : DatabaseEntry, INamedEntry
@ -58,8 +59,8 @@ public class Player : DatabaseEntry, INamedEntry
[JsonProperty("username")] [Key(3)]
public string Username;
[JsonProperty("salt")] [Key(4)]
public string Salt;
[JsonProperty("corporation")] [Key(4)]
public Guid Corporation;
[IgnoreMember] public string EntryName
{
@ -68,6 +69,7 @@ public class Player : DatabaseEntry, INamedEntry
}
}
[RethinkTable("Galaxy")]
[MessagePackObject]
[JsonObject(MemberSerialization.OptIn)]
public class Corporation : DatabaseEntry, INamedEntry

6
Assets/Scripts/ServerShared/Messages.cs
View file

@ -28,8 +28,8 @@ public class PingMessage : Message
[MessagePackObject]
public class LoginMessage : Message
{
[Key(0)] public string Email;
[Key(1)] public string Password;
[Key(0)] public string Auth;
[Key(1)] public byte[] Password;
}
[MessagePackObject]
@ -37,7 +37,7 @@ public class RegisterMessage : Message
{
[Key(0)] public string Name;
[Key(1)] public string Email;
[Key(2)] public string Password;
[Key(2)] public byte[] Password;
}
[MessagePackObject]

13
Assets/Scripts/ServerShared/ZoneData.cs
View file

@ -5,6 +5,7 @@ using MessagePack;
using Newtonsoft.Json;
using Unity.Mathematics;
[RethinkTable("Galaxy")]
[MessagePackObject]
[JsonObject(MemberSerialization.OptIn)]
public class ZoneData : DatabaseEntry, INamedEntry
@ -34,6 +35,7 @@ public class ZoneData : DatabaseEntry, INamedEntry
}
}
[RethinkTable("Galaxy")]
[MessagePackObject]
[JsonObject(MemberSerialization.OptIn)]
public class Station : DatabaseEntry, INamedEntry
@ -57,6 +59,9 @@ public class Station : DatabaseEntry, INamedEntry
[JsonProperty("selling")] [Key(6)]
public Dictionary<Guid, float> SellPrices = new Dictionary<Guid, float>();
[JsonProperty("zone")] [Key(7)]
public Guid Zone;
[IgnoreMember] public string EntryName
{
get => Name;
@ -64,6 +69,7 @@ public class Station : DatabaseEntry, INamedEntry
}
}
[RethinkTable("Galaxy")]
[MessagePackObject]
[JsonObject(MemberSerialization.OptIn)]
public class PlanetData : DatabaseEntry, INamedEntry
@ -77,6 +83,9 @@ public class PlanetData : DatabaseEntry, INamedEntry
[JsonProperty("mass")] [Key(3)]
public float Mass;
[JsonProperty("zone")] [Key(4)]
public Guid Zone;
[IgnoreMember] public string EntryName
{
get => Name;
@ -84,6 +93,7 @@ public class PlanetData : DatabaseEntry, INamedEntry
}
}
[RethinkTable("Galaxy")]
[MessagePackObject]
[JsonObject(MemberSerialization.OptIn)]
public class OrbitData : DatabaseEntry
@ -99,4 +109,7 @@ public class OrbitData : DatabaseEntry
[JsonProperty("period")] [Key(4)]
public float Period;
[JsonProperty("zone")] [Key(5)]
public Guid Zone;
}