feat:update multi

Author: limuy2022

gdrust/Cargo.lock

@@ -11,6 +11,10 @@ derive = { path = "./derive" }
 proto = { path = "proto" }
 tokio = "1"
 anyhow = "1"
+base = { path = "base" }
+prost = "0"
+prost-types = { version = "0", optional = true }
+
 
 [lib]
 crate-type = ["cdylib"]
@@ -21,4 +25,4 @@ codegen-units = 1
 strip = true
 
 [workspace]
-members = [".", "derive", "proto", "server"]
+members = [".", "base", "derive", "proto", "server"]

gdrust/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "base"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+shadow-rs = "0"
+
+[build-dependencies]
+shadow-rs = "0"

gdrust/base/Cargo.toml

@@ -0,0 +1 @@
+shadow_rs::shadow!(build);

gdrust/server/build.rs renamed to gdrust/base/build.rs

@@ -3,7 +3,8 @@ package connect;
 
 message Join {
   string player_name = 1;
-  int32 version = 2;
+  // Commit Hash as the version
+  string version = 2;
 }
 
 enum Status {
@@ -13,5 +14,5 @@ enum Status {
 
 message Response {
   Status status = 1;
-  string message = 2;  
+  string message = 2;
 }

gdrust/base/src/lib.rs

@@ -7,13 +7,10 @@ edition = "2021"
 tokio = { version = "1", features = ["full"] }
 bytes = "1"
 clap = { version = "4", features = ["derive"] }
-shadow-rs = "0"
 log = "0"
 env_logger = "0"
 anyhow = "1"
 prost = "0"
 prost-types = { version = "0", optional = true }
 proto = { path = "../proto" }
-
-[build-dependencies]
-shadow-rs = "0"
+base = { path = "../base" }

gdrust/proto/proto/connect.proto

@@ -58,7 +58,7 @@ impl Connection {
 #[derive(Debug, Parser)]
 #[command(
     author = "SkyUOI",
-    version = crate::build::VERSION,
+    version = base::build::VERSION,
     about = "The Server Of Zenith",
     long_about = "Multi-player Game Server Of Zenith"
 )]
@@ -70,8 +70,6 @@ struct ArgsParser {
     ip: String,
 }
 
-shadow_rs::shadow!(build);
-
 async fn process_request(mut connect: Connection) -> anyhow::Result<()> {
     // 首先获取连接请求
     let join_data = connect.read_join().await?;

gdrust/server/Cargo.toml

@@ -1,30 +1,38 @@
 use anyhow::Ok;
 use godot::engine::{INode, Node};
 use godot::prelude::*;
+use proto::connect::Join;
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 use tokio::net::TcpStream;
 use tokio::runtime::{Builder, Runtime};
 
 use crate::get_multi_single;
 
-pub struct MultiPlayer {}
+pub struct MultiPlayerConnection {}
+
+impl MultiPlayerConnection {}
 
 pub struct MultiManagerImpl {
-    clients: HashMap<usize, MultiPlayer>,
+    clients: HashMap<usize, MultiPlayerConnection>,
     socket: Option<TcpStream>,
     runtime: Runtime,
 }
 
 impl MultiManagerImpl {
-    fn set_connection(&mut self, socket: TcpStream) {
+    pub fn connect_to_server(&mut self, ip: String) -> anyhow::Result<()> {
         if self.socket.is_some() {
             godot_warn!("Socket has value,but reset")
         }
-        self.socket = Some(socket)
+        self.socket = Some(TcpStream::from_std(std::net::TcpStream::connect(&ip)?)?);
+        Ok(())
     }
 
-    pub fn connect_to_server(&mut self, ip: &str) -> anyhow::Result<()> {
+    pub fn join_to_server(&mut self, player_name: String) -> anyhow::Result<()> {
+        let mut data = Join {
+            player_name,
+            version: base::build::COMMIT_HASH.to_string(),
+        };
         Ok(())
     }
 }

gdrust/server/src/lib.rs

@@ -1,4 +1,4 @@
-use crate::debug_check;
+use crate::{debug_check, get_multi_single};
 use derive::gen_debug;
 use godot::engine::{AcceptDialog, Button, IButton};
 use godot::obj::WithBaseField;
@@ -28,16 +28,15 @@ impl IButton for MultiEnter {
 impl MultiEnter {
     #[func]
     fn connect_to_server(&mut self, ip: String) -> bool {
-        let global = self.base().get_node_as::<Node>("/root/Global");
-        let ret = true;
-        // (self.socket, ret) = match TcpStream::connect(&ip) {
-        //     Ok(socket) => (Some(socket), true),
-        //     Err(error) => {
-        //         self.show_dialog(format!("Connect failed:{}", error));
-        //         (None, false)
-        //     }
-        // };
-        ret
+        let mult_manager = get_multi_single();
+        let mut lock = mult_manager.lock().unwrap();
+        match lock.connect_to_server(ip) {
+            Ok(_) => true,
+            Err(err) => {
+                self.show_dialog(err.to_string());
+                false
+            }
+        }
     }
 
     #[debug]

gdrust/src/multi.rs

@@ -57,7 +57,6 @@ slow_down={
 
 [internationalization]
 
-locale/translations=PackedStringArray("res://locales/zh_cn.po")
 locale/translations_pot_files=PackedStringArray("res://scenes/multi_game.tscn")
 
 [layer_names]