Фиксики

+ Исправлены анимации отбрасывания
+ Исправлена анимация подбора денег и добавлен звук
+ Исправлены краши после последнего обновления клиента!
This commit is contained in:
Gitea 2022-08-20 14:52:55 +10:00
parent 2ed0f1c7bb
commit c7f754dafc
7 changed files with 75 additions and 12 deletions

View File

@ -62,7 +62,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
//Error 52 - Данная учетная запись была заблокирована в связи с многочисленными нарушениями условий использования службы Battle.net //Error 52 - Данная учетная запись была заблокирована в связи с многочисленными нарушениями условий использования службы Battle.net
//Error 53 - Действие данной учетной записи было приостановлено в связи с нарушениями условий использования службы Batle.net. //Error 53 - Действие данной учетной записи было приостановлено в связи с нарушениями условий использования службы Batle.net.
int VersionRetail = 82785; //74291 - 2.7.0, 76761 - 2.7.1, 79575 - 2.7.2; int VersionRetail = 81850; //74291 - 2.7.0, 76761 - 2.7.1, 79575 - 2.7.2;
int VersionPTR = 79151; int VersionPTR = 79151;
string version = ""; string version = "";
int a = request.ApplicationVersion; int a = request.ApplicationVersion;
@ -94,7 +94,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
{ {
Logger.Error("Подключение не правильной версии клиента!"); Logger.Error("Подключение не правильной версии клиента!");
var ercomplete = LogonResult.CreateBuilder().SetErrorCode(28); var ercomplete = LogonResult.CreateBuilder().SetErrorCode(28);
(controller as HandlerController).Client.MakeRPC((lid) => AuthenticationListener.CreateStub((controller as HandlerController).Client).OnLogonComplete(controller, ercomplete.Build(), callback => { })); //(controller as HandlerController).Client.MakeRPC((lid) => AuthenticationListener.CreateStub((controller as HandlerController).Client).OnLogonComplete(controller, ercomplete.Build(), callback => { }));
} }
switch (request.Locale) switch (request.Locale)
{ {

View File

@ -60,14 +60,14 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var GAS = D3.Client.GameAccountSettings.CreateBuilder() var GAS = D3.Client.GameAccountSettings.CreateBuilder()
.SetShowDifficultySelector(false) .SetShowDifficultySelector(false)
.SetUseGameHandicapDeprecated(true) .SetUseGameHandicapDeprecated(true)
//.SetSeasonJourneySeasonNumber(2) .SetSeasonJourneySeasonNumber(10)
//.SetViewedAnniversaryScreenYear(1) .SetViewedAnniversaryScreenYear(1)
.SetAccountFlags(0) .SetAccountFlags(0)
//.SetAccountFlags((uint)D3.Account.Digest.Types.Flags.MASTER_DIFFICULTY_UNLOCKED) .SetAccountFlags((uint)D3.Account.Digest.Types.Flags.MASTER_DIFFICULTY_UNLOCKED)
//.SetAchievementsTimeLastViewed(DateTimeExtensions.ToUnixTime(DateTime.UtcNow)) .SetAchievementsTimeLastViewed(DateTimeExtensions.ToUnixTime(DateTime.UtcNow))
//.SetViewedAnniversaryScreenYear(1) //.SetViewedAnniversaryScreenYear(1)
//.SetViewedWhatsNewVersion(Client.Account.GameAccount.DBGameAccount.ViewedNewVersion) .SetViewedWhatsNewVersion(20)
//.SetViewedWhatsNewSeason(Client.Account.GameAccount.DBGameAccount.ViewedNewSeason) .SetViewedWhatsNewSeason(20)
.SetRmtLastUsedCurrency("PLATINUM") .SetRmtLastUsedCurrency("PLATINUM")
.SetRmtPreferredCurrency("PLATINUM") .SetRmtPreferredCurrency("PLATINUM")
@ -101,9 +101,9 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
" OnlineService.Region.Id=5");*/ " OnlineService.Region.Id=5");*/
Init.SetSyncedVars( Init.SetSyncedVars(
" OnlineService.Season.Num=1" + //Номер сезона " OnlineService.Season.Num=1" + //Номер сезона
" OnlineService.Season.State=0" + //Статус сезона, 1 - Активирован, 0 - Деактивирован " OnlineService.Season.State=1" + //Статус сезона, 1 - Активирован, 0 - Деактивирован
" OnlineService.Leaderboard.Era=1" + " OnlineService.Leaderboard.Era=1" +
" OnlineService.AnniversaryEvent.Status=0" + //Событие юбилея, 1-Старый Тристам " OnlineService.AnniversaryEvent.Status=1" + //Событие юбилея, 1-Старый Тристам
" ChallengeRift.ChallengeNumber=1" + //Номер портала дерзаний. " ChallengeRift.ChallengeNumber=1" + //Номер портала дерзаний.
" OnlineService.FreeToPlay=true" + //Магазин за платину " OnlineService.FreeToPlay=true" + //Магазин за платину
" OnlineService.Store.Status=0" + //Статус Магазина, 0 - Включен, 1 - Отключен " OnlineService.Store.Status=0" + //Статус Магазина, 0 - Включен, 1 - Отключен

View File

@ -95,6 +95,8 @@ namespace DiIiS_NA.GameServer.ClientSystem
while ((end - _incomingBuffer.Position) >= 9 && this.Connection.IsOpen()) while ((end - _incomingBuffer.Position) >= 9 && this.Connection.IsOpen())
{ {
var message = _incomingBuffer.ParseMessage(); var message = _incomingBuffer.ParseMessage();
//217
//
if (message == null) continue; if (message == null) continue;
try try
{ {

View File

@ -254,6 +254,8 @@ namespace DiIiS_NA.GameServer.GSSystem.PlayerSystem
_owner.GrantCriteria(74987243308421); _owner.GrantCriteria(74987243308421);
if (item.ItemType.Name.Contains("ScoundrelSpecial")) if (item.ItemType.Name.Contains("ScoundrelSpecial"))
_owner.GrantCriteria(74987243308422); _owner.GrantCriteria(74987243308422);
_owner.PlayEffect(Effect.Sound, 196576);
return success; return success;
} }

View File

@ -470,6 +470,9 @@ namespace DiIiS_NA.GameServer.GSSystem.PlayerSystem
Attributes[GameAttribute.Currencies_Discovered] = 0x0011FFF8; Attributes[GameAttribute.Currencies_Discovered] = 0x0011FFF8;
Attributes[GameAttribute.Stash_Tabs_Purchased_With_Gold] = 5; Attributes[GameAttribute.Stash_Tabs_Purchased_With_Gold] = 5;
this.Attributes[GameAttribute.Skill, 30592] = 1;
this.Attributes[GameAttribute.Resource_Degeneration_Prevented] = false;
this.Attributes[GameAttribute.Resource_Degeneration_Stop_Point] = 0;
//scripted //this.Attributes[GameAttribute.Skill_Total, 0x7545] = 1; //Axe Operate Gizmo //scripted //this.Attributes[GameAttribute.Skill_Total, 0x7545] = 1; //Axe Operate Gizmo
//scripted //this.Attributes[GameAttribute.Skill_Total, 0x76B7] = 1; //Punch! //scripted //this.Attributes[GameAttribute.Skill_Total, 0x76B7] = 1; //Punch!
//scripted //this.Attributes[GameAttribute.Skill_Total, 0x6DF] = 1; //Use Item //scripted //this.Attributes[GameAttribute.Skill_Total, 0x6DF] = 1; //Use Item
@ -5299,7 +5302,13 @@ namespace DiIiS_NA.GameServer.GSSystem.PlayerSystem
Amount = item.Attributes[GameAttribute.Gold], Amount = item.Attributes[GameAttribute.Gold],
Type = FloatingAmountMessage.FloatType.Gold, Type = FloatingAmountMessage.FloatType.Gold,
}); });
this.InGameClient.SendMessage(new PlayEffectMessage()
{
ActorId = this.DynamicID(this),
Effect = Effect.GoldPickup,
PlayerId = 0
});
PlayEffect(Effect.Sound, 36726);
this.Inventory.PickUpGold(item); this.Inventory.PickUpGold(item);
this.GroundItems.Remove(item.GlobalID); this.GroundItems.Remove(item.GlobalID);
item.Destroy(); item.Destroy();
@ -5340,6 +5349,7 @@ namespace DiIiS_NA.GameServer.GSSystem.PlayerSystem
Amount = item.Attributes[GameAttribute.ItemStackQuantityLo], Amount = item.Attributes[GameAttribute.ItemStackQuantityLo],
Type = FloatingAmountMessage.FloatType.Platinum, Type = FloatingAmountMessage.FloatType.Platinum,
}); });
PlayEffect(Effect.Sound, 433266);
this.Inventory.PickUpPlatinum(item); this.Inventory.PickUpPlatinum(item);
this.GroundItems.Remove(item.GlobalID); this.GroundItems.Remove(item.GlobalID);

View File

@ -64,4 +64,53 @@ namespace DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Connection
} }
} }
[Message(Opcodes.SpingMessage)]
public class SPingMessage : GameMessage, ISelfHandler
{
public void Handle(GameClient client)
{
client.SendMessage(new SpongMessage()
{
});
}
public override void Parse(GameBitBuffer buffer)
{
}
public override void Encode(GameBitBuffer buffer)
{
}
public override void AsText(StringBuilder b, int pad)
{
}
}
[Message(Opcodes.SpongMessage)]
public class SpongMessage : GameMessage
{
public SpongMessage() : base(Opcodes.PongMessage) { }
public override void Parse(GameBitBuffer buffer)
{
}
public override void Encode(GameBitBuffer buffer)
{
}
public override void AsText(StringBuilder b, int pad)
{
}
}
} }

View File

@ -967,7 +967,7 @@ namespace DiIiS_NA.GameServer.MessageSystem
PingMessage = 390, // //SIZE12 PingMessage = 390, // //SIZE12
PongMessage = 391, // //SIZE12 PongMessage = 391, // //SIZE12
SpingMessage = 392, // //SIZE8SimpleMessage62 SpingMessage = 392, // //SIZE8SimpleMessage62
SpongMessagge = 393, // //SIZE8SimpleMessage63 SpongMessage = 393, // //SIZE8SimpleMessage63
ServerNotificationDataMessage = 394, // //SIZE16 ServerNotificationDataMessage = 394, // //SIZE16
BroadcastTextMessage = 395, // //SIZE1032 BroadcastTextMessage = 395, // //SIZE1032
LoadCompleteMessage = 396, // //SIZE8SimpleMessage63 LoadCompleteMessage = 396, // //SIZE8SimpleMessage63