Mirror/EpinelPS
1
0
Fork 0
mirror of https://github.com/EpinelPS/EpinelPS.git synced 2025-12-13 23:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

misc changes

Browse Source
This commit is contained in:
Mikhail
2024-07-16 20:27:56 -04:00
parent 7a1f361d25
commit 9cf99754d6
22 changed files with 80 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nksrv/IntlServer/IntlHandler.cs
View File

@@ -60,7 +60,8 @@ namespace nksrv.IntlServer
public static AccessToken CreateLauncherTokenForUser(User user) public static AccessToken CreateLauncherTokenForUser(User user)
{ {
AccessToken token = new() { ExpirationTime = DateTimeOffset.UtcNow.AddDays(1).ToUnixTimeSeconds() }; // TODO: implement access token expiration
AccessToken token = new() { ExpirationTime = DateTimeOffset.UtcNow.AddYears(1).ToUnixTimeSeconds() };
token.Token = Rng.RandomString(64); token.Token = Rng.RandomString(64);
token.UserID = user.ID; token.UserID = user.ID;
JsonDb.Instance.LauncherAccessTokens.Add(token); JsonDb.Instance.LauncherAccessTokens.Add(token);

2
nksrv/LobbyServer/Msgs/Campaign/ObtainItem.cs
View File

@@ -25,7 +25,7 @@ namespace nksrv.LobbyServer.Msgs.Campaign
// TODO // TODO
response.Reward = new(); response.Reward = new();
await WriteDataAsync(response); await WriteDataAsync(response);

15
nksrv/LobbyServer/Msgs/Character/GetSynchrodevice.cs
View File

@@ -24,18 +24,25 @@ namespace nksrv.LobbyServer.Msgs.Character
{ {
response.Synchro.StandardCharacters.Add(new NetUserCharacterData() { Default = new() { Csn = item.Csn, Skill1Lv = item.Skill1Lvl, Skill2Lv = item.Skill2Lvl, CostumeId = item.CostumeId, Lv = item.Level, Grade = item.Grade, Tid = item.Tid, UltiSkillLv = item.UltimateLevel } }); response.Synchro.StandardCharacters.Add(new NetUserCharacterData() { Default = new() { Csn = item.Csn, Skill1Lv = item.Skill1Lvl, Skill2Lv = item.Skill2Lvl, CostumeId = item.CostumeId, Lv = item.Level, Grade = item.Grade, Tid = item.Tid, UltiSkillLv = item.UltimateLevel } });
} }
response.Synchro.Slots.Add(new NetSynchroSlot() { Slot = 1 }); response.Synchro.Slots.Add(new NetSynchroSlot() { Slot = 1 });
response.Synchro.Slots.Add(new NetSynchroSlot() { Slot = 2 }); response.Synchro.Slots.Add(new NetSynchroSlot() { Slot = 2 });
response.Synchro.Slots.Add(new NetSynchroSlot() { Slot = 3 }); response.Synchro.Slots.Add(new NetSynchroSlot() { Slot = 3 });
response.Synchro.Slots.Add(new NetSynchroSlot() { Slot = 4 }); response.Synchro.Slots.Add(new NetSynchroSlot() { Slot = 4 });
response.Synchro.Slots.Add(new NetSynchroSlot() { Slot = 5 }); response.Synchro.Slots.Add(new NetSynchroSlot() { Slot = 5 });
response.Synchro.SynchroMaxLv = highestLevelCharacters.First().Level; if (highestLevelCharacters.Count > 0)
response.Synchro.SynchroLv = highestLevelCharacters.Last().Level; {
response.Synchro.SynchroMaxLv = highestLevelCharacters.First().Level;
response.Synchro.SynchroLv = highestLevelCharacters.Last().Level;
}
else
{
response.Synchro.SynchroLv = 1;
}
// TODO: Validate response from real server and pull info from user info // TODO: Validate response from real server and pull info from user info
await WriteDataAsync(response); await WriteDataAsync(response);
} }
} }
} }

11
nksrv/LobbyServer/Msgs/Character/LevelUp.cs
View File

@@ -23,8 +23,6 @@ namespace nksrv.LobbyServer.Msgs.Character
{ {
if (item.Csn == req.Csn) if (item.Csn == req.Csn)
{ {
// item.Level = req.Level;
int requiredCredit = 0; int requiredCredit = 0;
int requiredBattleData = 0; int requiredBattleData = 0;
int requiredCoreDust = 0; int requiredCoreDust = 0;
@@ -52,8 +50,9 @@ namespace nksrv.LobbyServer.Msgs.Character
return; return;
} }
response.Character = new() { response.Character = new()
CostumeId = item.CostumeId, {
CostumeId = item.CostumeId,
Csn = item.Csn, Csn = item.Csn,
Lv = item.Level, Lv = item.Level,
Skill1Lv = item.Skill1Lvl, Skill1Lv = item.Skill1Lvl,
@@ -81,9 +80,7 @@ namespace nksrv.LobbyServer.Msgs.Character
} }
JsonDb.Save(); JsonDb.Save();
await WriteDataAsync(response);
await WriteDataAsync(response);
} }
} }
} }

4
nksrv/LobbyServer/Msgs/Character/SetCharacterCostume.cs
View File

@@ -17,7 +17,7 @@ namespace nksrv.LobbyServer.Msgs.Character
foreach (var item in user.Characters) foreach (var item in user.Characters)
{ {
if(item.Csn == req.Csn) if (item.Csn == req.Csn)
{ {
item.CostumeId = req.CostumeId; item.CostumeId = req.CostumeId;
break; break;
@@ -27,7 +27,7 @@ namespace nksrv.LobbyServer.Msgs.Character
var response = new ResSetCharacterCostume(); var response = new ResSetCharacterCostume();
await WriteDataAsync(response); await WriteDataAsync(response);
} }
} }
} }

2
nksrv/LobbyServer/Msgs/Gacha/CheckGachaDailyEvent.cs
View File

@@ -20,7 +20,7 @@ namespace nksrv.LobbyServer.Msgs.Gacha
response.FreeCount = 0; response.FreeCount = 0;
response.EventData = new NetEventData() { Id = 1 }; response.EventData = new NetEventData() { Id = 1 };
await WriteDataAsync(response); await WriteDataAsync(response);
} }
} }
} }

9
nksrv/LobbyServer/Msgs/Gacha/ExecGacha.cs
View File

@@ -27,14 +27,15 @@ namespace nksrv.LobbyServer.Msgs.Gacha
{ {
foreach (var c in StaticDataParser.Instance.GetAllCharacterTids()) foreach (var c in StaticDataParser.Instance.GetAllCharacterTids())
{ {
response.Gacha.Add(new NetGachaEntityData() { Corporation = 0, PieceCount = 1, CurrencyValue = 5, Sn = 130201, Tid = c, Type = 1 }); response.Gacha.Add(new NetGachaEntityData() { Corporation = 0, PieceCount = 1, CurrencyValue = 5, Sn = c, Tid = c, Type = 1 });
user.Characters.Add(new Utils.Character() { CostumeId = 0, Csn = c, Grade = 0, Level = 1, Skill1Lvl = 1, Skill2Lvl = 1, Tid = c, UltimateLevel = 1 }); // response.Characters.Add(new NetUserCharacterDefaultData() { CostumeId = 0, Csn = c, Grade = 0, Lv = 1, Skill1Lv = 1, Skill2Lv = 1, Tid = c, UltiSkillLv = 1 });
// user.Characters.Add(new Utils.Character() { CostumeId = 0, Csn = c, Grade = 0, Level = 1, Skill1Lvl = 1, Skill2Lvl = 1, Tid = c, UltimateLevel = 1 });
// response.Characters.Add(new NetUserCharacterDefaultData() { Lv = 1, Skill1Lv = 1, Grade = 0, Csn = 1, Tid = 130201 }); // response.Characters.Add(new NetUserCharacterDefaultData() { Lv = 1, Skill1Lv = 1, Grade = 0, Csn = 1, Tid = 130201 });
} }
user.GachaTutorialPlayCount++; // user.GachaTutorialPlayCount++;
} }
JsonDb.Save(); JsonDb.Save();

3
nksrv/LobbyServer/Msgs/Inventory/ClearAllEquipment.cs
View File

@@ -28,9 +28,10 @@ namespace nksrv.LobbyServer.Msgs.Inventory
response.Items.Add(NetUtils.ToNet(item)); response.Items.Add(NetUtils.ToNet(item));
} }
} }
JsonDb.Save(); JsonDb.Save();
await WriteDataAsync(response); await WriteDataAsync(response);
} }
} }
} }

3
nksrv/LobbyServer/Msgs/Inventory/ClearEquipment.cs
View File

@@ -26,12 +26,13 @@ namespace nksrv.LobbyServer.Msgs.Inventory
item.Csn = 0; item.Csn = 0;
response.Item = NetUtils.ToNet(item); response.Item = NetUtils.ToNet(item);
break;
} }
} }
JsonDb.Save(); JsonDb.Save();
await WriteDataAsync(response); await WriteDataAsync(response);
} }
} }
} }

5
nksrv/LobbyServer/Msgs/Inventory/GetInventoryData.cs
View File

@@ -20,10 +20,9 @@ namespace nksrv.LobbyServer.Msgs.Inventory
{ {
response.Items.Add(new NetUserItemData() { Count = item.Count, Tid = item.ItemType, Csn = item.Csn, Lv = item.Level, Exp = item.Exp, Corporation = item.Corp, Isn = item.Isn, Position = item.Position }); response.Items.Add(new NetUserItemData() { Count = item.Count, Tid = item.ItemType, Csn = item.Csn, Lv = item.Level, Exp = item.Exp, Corporation = item.Corp, Isn = item.Isn, Position = item.Position });
} }
// TODO: HarmonyCubes, RunAwakeningIsnList, UserRedeems
// TODO implement await WriteDataAsync(response);
await WriteDataAsync(response);
} }
} }
} }

2
nksrv/LobbyServer/Msgs/Inventory/WearEquipment.cs
View File

@@ -24,6 +24,7 @@ namespace nksrv.LobbyServer.Msgs.Inventory
// update character id // update character id
item.Csn = req.Csn; item.Csn = req.Csn;
item.Position = NetUtils.GetItemPos(user, item.Isn); item.Position = NetUtils.GetItemPos(user, item.Isn);
break;
} }
} }
@@ -33,6 +34,7 @@ namespace nksrv.LobbyServer.Msgs.Inventory
if (item.Csn == req.Csn) if (item.Csn == req.Csn)
{ {
response.Items.Add(NetUtils.ToNet(item)); response.Items.Add(NetUtils.ToNet(item));
break;
} }
} }
JsonDb.Save(); JsonDb.Save();

4
nksrv/LobbyServer/Msgs/Inventory/WearEquipmentList.cs
View File

@@ -17,9 +17,9 @@ namespace nksrv.LobbyServer.Msgs.Inventory
var response = new ResWearEquipmentList(); var response = new ResWearEquipmentList();
foreach (var item in user.Items.ToArray()) foreach (var item2 in req.IsnList)
{ {
foreach (var item2 in req.IsnList) foreach (var item in user.Items.ToArray())
{ {
if (item2 == item.Isn) if (item2 == item.Isn)
{ {

2
nksrv/LobbyServer/Msgs/Mission/GetAchievementRewardedData.cs
View File

@@ -17,7 +17,7 @@ namespace nksrv.LobbyServer.Msgs.Mission
var response = new ResGetAchievementRewardedData(); var response = new ResGetAchievementRewardedData();
// TODO // TODO
await WriteDataAsync(response); await WriteDataAsync(response);
} }
} }
} }

2
nksrv/LobbyServer/Msgs/Mission/Rewards/GetDailyRewards.cs
View File

@@ -17,7 +17,7 @@ namespace nksrv.LobbyServer.Msgs.Mission.Rewards
// TODO: implement // TODO: implement
var response = new ResGetDailyRewardedData(); var response = new ResGetDailyRewardedData();
await WriteDataAsync(response); await WriteDataAsync(response);
} }
} }
} }

2
nksrv/LobbyServer/Msgs/Outpost/CheckInfracore.cs
View File

@@ -17,7 +17,7 @@ namespace nksrv.LobbyServer.Msgs.Outpost
// TODO // TODO
await WriteDataAsync(response); await WriteDataAsync(response);
} }
} }
} }

24
nksrv/LobbyServer/Msgs/Outpost/DoWipeout.cs Normal file
View File

@@ -0,0 +1,24 @@
using nksrv.Net;
using nksrv.Utils;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace nksrv.LobbyServer.Msgs.Outpost
{
[PacketPath("/outpost/obtainfastbattlereward")]
public class DoWipeout : LobbyMsgHandler
{
protected override async Task HandleAsync()
{
var req = await ReadData<DoWipeOutRequest>();
var response = new DoWipeOutResponse();
// TODO
await WriteDataAsync(response);
}
}
}

3
nksrv/LobbyServer/Msgs/Team/GetTeamData.cs
View File

@@ -24,10 +24,9 @@ namespace nksrv.LobbyServer.Msgs.Team
foreach (var item in user.UserTeams) foreach (var item in user.UserTeams)
{ {
response.TypeTeams.Add(item.Value); response.TypeTeams.Add(item.Value);
} }
} }
await WriteDataAsync(response); await WriteDataAsync(response);
} }
} }
} }

2
nksrv/LobbyServer/Msgs/User/GetProfileDecoration.cs
View File

@@ -17,7 +17,7 @@ namespace nksrv.LobbyServer.Msgs.User
var r = new ResProfileCardDecorationLayout(); var r = new ResProfileCardDecorationLayout();
r.Layout = new ProfileCardDecorationLayout(); r.Layout = new ProfileCardDecorationLayout();
r.Layout.BackgroundId = 101002; r.Layout.BackgroundId = 101002;
await WriteDataAsync(r); await WriteDataAsync(r);
} }
} }
} }

3
nksrv/LobbyServer/Msgs/User/GetUserTitle.cs
View File

@@ -15,8 +15,9 @@ namespace nksrv.LobbyServer.Msgs.User
var req = await ReadData<ReqGetUserTitleList>(); var req = await ReadData<ReqGetUserTitleList>();
var r = new ResGetUserTitleList(); var r = new ResGetUserTitleList();
r.UserTitleList.Add(new NetUserTitle() { UserTitleId = 1 });
await WriteDataAsync(r); await WriteDataAsync(r);
} }
} }
} }

2
nksrv/Protos/allmsgs.proto
View File

@@ -1052,7 +1052,7 @@ message ResGetWeeklyRewardedData {
message ReqGetDailyRewardedData {} message ReqGetDailyRewardedData {}
message ResGetDailyRewardedData { message ResGetDailyRewardedData {
repeated NetEventWithJoinData eventWithJoinData = 3; repeated int32 ids = 3;
} }
message NetPassRankData { message NetPassRankData {

10
nksrv/Protos/outpost.proto
View File

@@ -19,4 +19,14 @@ message TacticAcademyClearLessonRequest {
message TacticAcademyClearLessonResponse { message TacticAcademyClearLessonResponse {
int32 LessonId = 2; int32 LessonId = 2;
repeated NetUserCurrencyData RemainingCurrency = 4; repeated NetUserCurrencyData RemainingCurrency = 4;
}
// Battle reward / wipeout
message DoWipeOutRequest {
}
message DoWipeOutResponse {
int32 WipeoutCount = 2;
NetRewardData Reward = 3;
repeated NetUserCurrencyData Currency = 4;
} }

2
nksrv/StaticInfo/StaticDataParser.cs
View File

@@ -56,6 +56,7 @@ namespace nksrv.StaticInfo
private JArray characterTable; private JArray characterTable;
private JArray tutorialTable; private JArray tutorialTable;
private JArray itemEquipTable; private JArray itemEquipTable;
private Dictionary<string, JArray> FieldMapData = [];
private Dictionary<int, CharacterLevelData> LevelData = []; private Dictionary<int, CharacterLevelData> LevelData = [];
private Dictionary<int, TacticAcademyLessonRecord> TacticAcademyLessons = []; private Dictionary<int, TacticAcademyLessonRecord> TacticAcademyLessons = [];
@@ -281,6 +282,7 @@ namespace nksrv.StaticInfo
var fullId = int.Parse(groupid.ToString() + id.ToString()); var fullId = int.Parse(groupid.ToString() + id.ToString());
TacticAcademyLessons.Add(id, new TacticAcademyLessonRecord() { CurrencyId = (CurrencyType)currencyId, CurrencyValue = currencyValue, GroupId = groupid, Id = id }); TacticAcademyLessons.Add(id, new TacticAcademyLessonRecord() { CurrencyId = (CurrencyType)currencyId, CurrencyValue = currencyValue, GroupId = groupid, Id = id });
} }
} }
public MainQuestCompletionData? GetMainQuestForStageClearCondition(int stage) public MainQuestCompletionData? GetMainQuestForStageClearCondition(int stage)