diff --git a/l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat b/l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat index f26792a85..828fd28c4 100644 --- a/l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat +++ b/l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat @@ -50,8 +50,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SunMoon: - m_Texture: {fileID: 2800000, guid: b443728fc86061b4f8ecbe8a96c9d2ef, type: 3} - m_Scale: {x: 2.5, y: 2.5} + m_Texture: {fileID: 2800000, guid: 87bfdbc0202b0e440b4b25a3824f15db, type: 3} + m_Scale: {x: 1.5, y: 1.5} m_Offset: {x: 0.5, y: 0.5} - unity_Lightmaps: m_Texture: {fileID: 0} @@ -70,13 +70,13 @@ Material: - _Cloud_Cutoff: 4.01 - _Cloud_Distance: 0.8 - _Clouds_Far_Tiling: 0.352 - - _Clouds_Opacity: 0.12 + - _Clouds_Opacity: 2.54 - _Clouds_Tiling: 0.12 - _GradientColor1Influence: 0.6 - _GradientColor2Influence: 0.5 - _HorizonCloudsRotationSpeed: -0.1 - _Horizon_Clouds_Height: 1.44 - - _Horizon_Clouds_Opacity: 0.05 + - _Horizon_Clouds_Opacity: 1 - _Horizon_Clouds_X_Tile: 1 - _Horizon_Clouds_Y_Tile: 3.17 - _QueueControl: 0 @@ -92,12 +92,12 @@ Material: - _Stars_Y_Tile: 1 - _SunMoonSize: 0.13 m_Colors: - - _GradientColor1: {r: -0.003921569, g: -0.003921569, b: -0.007843138, a: -1} + - _GradientColor1: {r: 0, g: 0.3529412, b: 0.54901963, a: 1} - _GradientColor2: {r: 0, g: 0, b: 0, a: 1} - _GradientColor3: {r: 7.488819, g: 7.981503, b: 8.47419, a: 1} - - _MainLightForward: {r: 0.6710624, g: -0.31519955, b: 0.67106223, a: 0} - - _MainLightRight: {r: 0.7071067, g: 0.000000007450581, b: -0.7071069, a: 0} - - _MainLightUp: {r: 0.22287974, g: 0.94902545, b: 0.22287972, a: 0} + - _MainLightForward: {r: -0.23021153, g: -0.9455186, b: -0.23021153, a: 0} + - _MainLightRight: {r: 0.7071067, g: 0, b: -0.7071068, a: 0} + - _MainLightUp: {r: 0.6685827, g: -0.32556826, b: 0.66858256, a: 0} - _SunMoonColor: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/l2-unity/Assets/Scripts/Networking/ClientLibrary/Packet/Gameserver/GameServerPacketType.cs b/l2-unity/Assets/Scripts/Networking/ClientLibrary/Packet/Gameserver/GameServerPacketType.cs index ea7baa2b5..1c99892be 100644 --- a/l2-unity/Assets/Scripts/Networking/ClientLibrary/Packet/Gameserver/GameServerPacketType.cs +++ b/l2-unity/Assets/Scripts/Networking/ClientLibrary/Packet/Gameserver/GameServerPacketType.cs @@ -7,6 +7,8 @@ public enum GameServerPacketType : int CharSelected = 0x15, CharCreateOk = 0x19, CharCreateFail = 0x1a, + ShortcutRegister = 0x44, + ShortcutInit = 0x45, SystemMessage = 0x64, @@ -47,8 +49,6 @@ public enum GameServerPacketType : int InventoryUpdate = 0xFD9, LeaveWorld = 0xFDA, RestartReponse = 0xFDB, - ShortcutInit = 0xFDC, - ShortcutRegister = 0xFDD, SocialAction = 0xFDE, ChangeWaitType = 0xFDF, ChangeMoveType = 0xFE0, diff --git a/l2-unity/Assets/Scripts/Networking/ClientLibrary/Packet/Gameserver/ServerPackets/Shortcut/ShortcutInitPacket.cs b/l2-unity/Assets/Scripts/Networking/ClientLibrary/Packet/Gameserver/ServerPackets/Shortcut/ShortcutInitPacket.cs index 6eb81bdfc..cf6ee23ed 100644 --- a/l2-unity/Assets/Scripts/Networking/ClientLibrary/Packet/Gameserver/ServerPackets/Shortcut/ShortcutInitPacket.cs +++ b/l2-unity/Assets/Scripts/Networking/ClientLibrary/Packet/Gameserver/ServerPackets/Shortcut/ShortcutInitPacket.cs @@ -21,11 +21,27 @@ public override void Parse() int id = ReadI(); int level = -1; - if (type == Shortcut.TYPE_SKILL) + switch (type) { - level = ReadI(); + case Shortcut.TYPE_ITEM: + ReadI(); // CharacterType + ReadI(); // SharedReuseGroup + + ReadI(); // Remaining + ReadI(); // Reusedelay + ReadI(); //Augment Id + break; + case Shortcut.TYPE_SKILL: + level = ReadI(); + ReadB(); + ReadI(); // Character type + break; + default: + ReadI(); // Character type + break; } + Shortcut shortcut = new Shortcut(slot % 12, slot / 12, type, id, level); Shortcuts.Add(shortcut); } diff --git a/l2-unity/Assets/Scripts/Networking/ClientLibrary/Packet/Gameserver/ServerPackets/Shortcut/ShortcutRegisterPacket.cs b/l2-unity/Assets/Scripts/Networking/ClientLibrary/Packet/Gameserver/ServerPackets/Shortcut/ShortcutRegisterPacket.cs index f811fdbef..64fad4187 100644 --- a/l2-unity/Assets/Scripts/Networking/ClientLibrary/Packet/Gameserver/ServerPackets/Shortcut/ShortcutRegisterPacket.cs +++ b/l2-unity/Assets/Scripts/Networking/ClientLibrary/Packet/Gameserver/ServerPackets/Shortcut/ShortcutRegisterPacket.cs @@ -14,9 +14,24 @@ public override void Parse() int id = ReadI(); int level = -1; - if (type == Shortcut.TYPE_SKILL) + switch (type) { - level = ReadI(); + case Shortcut.TYPE_ITEM: + ReadI(); // CharacterType + ReadI(); // SharedReuseGroup + + ReadI(); // Remaining + ReadI(); // Reusedelay + ReadI(); //Augment Id + break; + case Shortcut.TYPE_SKILL: + level = ReadI(); + ReadB(); + ReadI(); // Character type + break; + default: + ReadI(); // Character type + break; } NewShortcut = new Shortcut(slot % 12, slot / 12, type, id, level);