From 40142a6de0dc7e36aaacaee073f02984e0050e38 Mon Sep 17 00:00:00 2001 From: SheepYhangCN <13538773578@163.com> Date: Mon, 8 Jan 2024 17:30:02 +0800 Subject: [PATCH] 2024.1.8 --- AutoLoad.cs | 2 +- ChatRoom/ChatRoom.cs | 10 +++++----- ChatRoom/Text.cs | 2 +- WindowsInstaller_x86_32.iss | 2 +- WindowsInstaller_x86_64.iss | 2 +- export_presets.cfg | 12 ++++++------ 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/AutoLoad.cs b/AutoLoad.cs index f907c67..05aafe5 100644 --- a/AutoLoad.cs +++ b/AutoLoad.cs @@ -8,7 +8,7 @@ public partial class AutoLoad : Node internal int port=1145; internal int popup=0; internal bool is_connection_lost=false; - internal string version="v2023.12.26"; + internal string version="v2024.1.8"; public override void _Ready() { } diff --git a/ChatRoom/ChatRoom.cs b/ChatRoom/ChatRoom.cs index d0dc4b2..ac3b9b8 100644 --- a/ChatRoom/ChatRoom.cs +++ b/ChatRoom/ChatRoom.cs @@ -25,10 +25,10 @@ public override void _Ready() { Rpc("Joined",autoload.name,Multiplayer.MultiplayerPeer.GetUniqueId()); RpcId(MultiplayerPeer.TargetPeerServer,"SyncFromServer",Multiplayer.MultiplayerPeer.GetUniqueId()); - /*if (OS.GetName()=="Windows" ||OS.GetName()=="macOS"||OS.GetName()=="Linux") + if (OS.GetName()=="Windows" ||OS.GetName()=="macOS"||OS.GetName()=="Linux") { - RpcId(MultiplayerPeer.TargetPeerServer,"Sha256Check",Multiplayer.MultiplayerPeer.GetUniqueId(),FileAccess.GetSha256(OS.GetExecutablePath())); - }*/ + RpcId(MultiplayerPeer.TargetPeerServer,"Sha256Check",Multiplayer.MultiplayerPeer.GetUniqueId(),FileAccess.GetSha256(OS.GetExecutablePath()),OS.GetName()); + } RpcId(MultiplayerPeer.TargetPeerServer,"VersionCheck",Multiplayer.MultiplayerPeer.GetUniqueId(),autoload.version); } SendSystemMessage(autoload.name+TranslationServer.Translate("locJoined")); @@ -241,9 +241,9 @@ internal void SetMemberList(Dictionary member_lista) member_list=member_lista; } [Rpc(MultiplayerApi.RpcMode.AnyPeer)] - internal void Sha256Check(int peer,string sha256) + internal void Sha256Check(int peer,string sha256,string os) { - if (sha256 != FileAccess.GetSha256(OS.GetExecutablePath())) + if (os==OS.GetName() && sha256 != FileAccess.GetSha256(OS.GetExecutablePath())) { RpcId(peer,"Sha256DoesntMatch"); } diff --git a/ChatRoom/Text.cs b/ChatRoom/Text.cs index ab22a7c..d409660 100644 --- a/ChatRoom/Text.cs +++ b/ChatRoom/Text.cs @@ -43,7 +43,7 @@ public override void _Input(InputEvent @event) { if (enterable) { - Text=Text.TrimSuffix("\n"); + Backspace(); GetNode("../../../")._on_send_pressed(); } } diff --git a/WindowsInstaller_x86_32.iss b/WindowsInstaller_x86_32.iss index a52d1c1..7a352d6 100644 --- a/WindowsInstaller_x86_32.iss +++ b/WindowsInstaller_x86_32.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "LocalChat" -#define MyAppVersion "2023.12.26" +#define MyAppVersion "2024.1.8" #define MyAppPublisher "SheepYhangCN" #define MyAppURL "https://github.com/SheepYhangCN/LocalChat" #define MyAppExeName "LocalChat.exe" diff --git a/WindowsInstaller_x86_64.iss b/WindowsInstaller_x86_64.iss index 2225397..905492b 100644 --- a/WindowsInstaller_x86_64.iss +++ b/WindowsInstaller_x86_64.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "LocalChat" -#define MyAppVersion "2023.12.26" +#define MyAppVersion "2024.1.8" #define MyAppPublisher "SheepYhangCN" #define MyAppURL "https://github.com/SheepYhangCN/LocalChat" #define MyAppExeName "LocalChat.exe" diff --git a/export_presets.cfg b/export_presets.cfg index b90dc00..dae1b0c 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -35,8 +35,8 @@ application/modify_resources=true application/icon="" application/console_wrapper_icon="" application/icon_interpolation=4 -application/file_version="" -application/product_version="" +application/file_version="2024.1.8" +application/product_version="2024.1.8" application/company_name="SheepYhangCN" application/product_name="LocalChat" application/file_description="An application that allows you to chat with others in LAN." @@ -101,8 +101,8 @@ application/modify_resources=true application/icon="" application/console_wrapper_icon="" application/icon_interpolation=4 -application/file_version="" -application/product_version="" +application/file_version="2024.1.8" +application/product_version="2024.1.8" application/company_name="SheepYhangCN" application/product_name="LocalChat" application/file_description="An application that allows you to chat with others in LAN." @@ -159,7 +159,7 @@ architectures/arm64-v8a=false architectures/x86=false architectures/x86_64=true version/code=1 -version/name="2023.12.26" +version/name="2024.1.8" package/unique_name="com.sheepyuhang.localchat" package/name="LocalChat" package/signed=true @@ -364,7 +364,7 @@ architectures/arm64-v8a=true architectures/x86=false architectures/x86_64=false version/code=1 -version/name="2023.12.26" +version/name="2024.1.8" package/unique_name="com.sheepyuhang.localchat" package/name="LocalChat" package/signed=true