diff --git a/Server/Git/ExcelManager.cs b/Server/Git/ExcelManager.cs index 13f3088..73b994e 100644 --- a/Server/Git/ExcelManager.cs +++ b/Server/Git/ExcelManager.cs @@ -87,14 +87,14 @@ namespace Server.Git bool isIndex = variable[0] == "index"; - for (int n = 3; n <= vertical; n++) + for (int n = 4; n <= vertical; n++) { Dictionary dataList = new Dictionary(); for (int m = 0; m <= horizontal; m++) { dataList.Add(variable[m], worksheet.Cells[n, m].Value); } - dicViewer.Add((int)(isIndex ? worksheet.Cells[n, 0].Value : n - 3), dataList); + dicViewer.Add((int)(isIndex ? worksheet.Cells[n, 0].Value : n - 4), dataList); } sheet sheet = new sheet(worksheet.Name, variable, dataEnum, type, dicViewer); _sheets.Add(sheet); diff --git a/Server/SQL/DeckUnitInfo.cs b/Server/SQL/DeckUnitInfo.cs index 50d48ca..efbac11 100644 --- a/Server/SQL/DeckUnitInfo.cs +++ b/Server/SQL/DeckUnitInfo.cs @@ -16,6 +16,5 @@ namespace Server.SQL public class DeckUnitInfoSQL : SQL { public override DbSet table { get; set; } - public override string tablename { get { return "deck_unit_info"; } } } } diff --git a/Server/SQL/DynamicData.cs b/Server/SQL/DynamicData.cs index bbcaa51..0012ab7 100644 --- a/Server/SQL/DynamicData.cs +++ b/Server/SQL/DynamicData.cs @@ -16,7 +16,6 @@ namespace Server.SQL public class DynamicDataSQL : SQL { public override DbSet table { get; set; } - public override string tablename { get { return "dynamic_data"; } } public DynamicData SelectName(string name) { diff --git a/Server/SQL/Equipment.cs b/Server/SQL/Equipment.cs new file mode 100644 index 0000000..bbe439e --- /dev/null +++ b/Server/SQL/Equipment.cs @@ -0,0 +1,27 @@ +using Microsoft.EntityFrameworkCore; +using Npgsql.EntityFrameworkCore.PostgreSQL; +using SkiaSharp; +using System.ComponentModel.DataAnnotations.Schema; +using static System.Runtime.InteropServices.JavaScript.JSType; + +namespace Server.SQL +{ + [Table("equipment", Schema = "gamedb")] + public class Equipment + { + public int id { get; set; } + public string user_id { get; set; } + public string equip_unit { get; set; } + public string rand_stats { get; set; } + } + + public class EquipmentrSQL : SQL + { + public override DbSet table { get; set; } + + public void Update(Equipment equipment) + { + table.Update(equipment); + } + } +} diff --git a/Server/SQL/LeaderInfo.cs b/Server/SQL/LeaderInfo.cs index f46d6ef..c102661 100644 --- a/Server/SQL/LeaderInfo.cs +++ b/Server/SQL/LeaderInfo.cs @@ -25,6 +25,5 @@ namespace Server.SQL public class LeaderInfoSQL : SQL { public override DbSet table { get; set; } - public override string tablename { get { return "leader_info"; } } } } diff --git a/Server/SQL/SQL.cs b/Server/SQL/SQL.cs index dddbea3..9e8023b 100644 --- a/Server/SQL/SQL.cs +++ b/Server/SQL/SQL.cs @@ -10,8 +10,6 @@ namespace Server.SQL public abstract DbSet table { get; set; } - public abstract string tablename { get; } - protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { if (!optionsBuilder.IsConfigured) diff --git a/Server/SQL/User.cs b/Server/SQL/User.cs index 4bdfffa..117e0d1 100644 --- a/Server/SQL/User.cs +++ b/Server/SQL/User.cs @@ -18,7 +18,6 @@ namespace Server.SQL public class UserSQL : SQL { public override DbSet table { get; set; } - public override string tablename { get { return "user"; } } public User SelectUuid(string uuid) { diff --git a/Server/Service/Login.cs b/Server/Service/Login.cs index d9b8f59..984e383 100644 --- a/Server/Service/Login.cs +++ b/Server/Service/Login.cs @@ -12,9 +12,11 @@ namespace Server.Service UserSQL userSql = new UserSQL(); DeckUnitInfoSQL deckUnitInfoSQL = new DeckUnitInfoSQL(); LeaderInfoSQL leaderInfoSQL = new LeaderInfoSQL(); + EquipmentrSQL equipmentrSQL = new EquipmentrSQL(); User user; List deckUnitInfoList = null; List leaderInfoList = null; + List equipmentList = null; Console.WriteLine(req.uuid); if (req.uuid == "") { @@ -40,6 +42,7 @@ namespace Server.Service deckUnitInfoList = deckUnitInfoSQL.Select(); leaderInfoList = leaderInfoSQL.Select(); + equipmentList = equipmentrSQL.Select(); } if(user == null) { @@ -117,7 +120,7 @@ namespace Server.Service - return makeResp(user, deckUnitInfoList, leaderInfoList); + return makeResp(user, deckUnitInfoList, leaderInfoList, equipmentList); } public override Protocol ProtocolValue() => Protocol.Login; @@ -128,13 +131,14 @@ namespace Server.Service return req; } - private string makeResp(User user, List deck_unit, List leader) + private string makeResp(User user, List deck_unit, List leader, List equipment) { LoginResp resp = new LoginResp(); resp.nickname = user.nickname; resp.uuid = user.uuid; resp.deck_unit = deck_unit; resp.leader = leader; + resp.equipment = equipment; resp.status = 200; return resp.ToJson(); } @@ -160,5 +164,6 @@ namespace Server.Service public string nickname; public List deck_unit; public List leader; + public List equipment; } }