fix kcp

TastSong · TastSong · commit 9cecc8529378 · 2022-07-02T22:05:22.000+08:00
diff --git a/CarzyCarSpringBootServer/src/main/java/com/tastsong/crazycar/controller/KCPRttController.java b/CarzyCarSpringBootServer/src/main/java/com/tastsong/crazycar/controller/KCPRttController.java
@@ -1,12 +1,8 @@
 package com.tastsong.crazycar.controller;
 
-import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.context.annotation.Scope;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -63,13 +59,6 @@ private void initKCP() {
         KcpServer kcpServer = new KcpServer();
         kcpServer.init(kcpRttServer,channelConfig,50001);     
 	}
-
-	/**
-	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
-	 */
-	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { 
-		doGet(request, response);
-	}
 	
 	@Override
     public void onConnected(Ukcp uKcp) {
diff --git a/CarzyCarSpringBootServer/src/main/java/com/tastsong/crazycar/mapper/TimeTrialMapper.java b/CarzyCarSpringBootServer/src/main/java/com/tastsong/crazycar/mapper/TimeTrialMapper.java
@@ -13,7 +13,7 @@ public interface TimeTrialMapper {
     public Integer addTimeTrialMapForUser(Integer uid, Integer cid);
     public Integer initTimeTrialRank(Integer uid, Integer cid);
     public Integer delTimeTrialRank(Integer uid, Integer cid);
-    public List<TimeTrialRankModel> getTimeTrialRank(Integer uid, Integer cid);
+    public List<TimeTrialRankModel> getTimeTrialRankList(Integer uid, Integer cid);
     public List<TimeTrialInfoModel> getTimeTrialInfos();
     public boolean isHasTimeTrialClass(Integer uid, Integer cid);
     public TimeTrialInfoModel getTimeTrialInfo(Integer cid);
diff --git a/CarzyCarSpringBootServer/src/main/java/com/tastsong/crazycar/service/TimeTrialService.java b/CarzyCarSpringBootServer/src/main/java/com/tastsong/crazycar/service/TimeTrialService.java
@@ -27,7 +27,7 @@ private void initRank(Integer uid, Integer cid){
 
     public List<TimeTrialRankModel> getRankList(Integer uid, Integer cid){
         initRank(uid, cid);
-        List<TimeTrialRankModel> timeTrialRankModels =  timeTrialMapper.getTimeTrialRank(uid, cid);
+        List<TimeTrialRankModel> timeTrialRankModels =  timeTrialMapper.getTimeTrialRankList(uid, cid);
         for (Integer i = 0; i< timeTrialRankModels.size(); i++){
             Integer userId = timeTrialRankModels.get(i).uid;
             timeTrialRankModels.get(i).aid = userMapper.getUserByUid(userId).aid;
diff --git a/CarzyCarSpringBootServer/src/main/resources/mapper/TimeTrialMapper.xml b/CarzyCarSpringBootServer/src/main/resources/mapper/TimeTrialMapper.xml
@@ -55,7 +55,7 @@
         drop table if exists time_trial_rank_${uid}_${cid};
     </update> 
 
-    <select id="getTimeTrialRank" resultType="TimeTrialRankModel">
+    <select id="getTimeTrialRankList" resultType="TimeTrialRankModel">
         select
         *
         from time_trial_rank_${uid}_${cid};
diff --git a/CrazyCar/Assets/Scenes/Login.unity b/CrazyCar/Assets/Scenes/Login.unity
@@ -2073,7 +2073,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da1b902846b36a245810a5b71322bcba, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  serverType: 1
+  serverType: 0
   netType: 0
 --- !u!1 &1019334752
 GameObject:
diff --git a/CrazyCar/Assets/Scripts/Command/MakeNewPlayerCommand.cs b/CrazyCar/Assets/Scripts/Command/MakeNewPlayerCommand.cs
@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using QFramework;
+
+public class MakeNewPlayerCommand : AbstractCommand {
+
+    private PlayerCreateMsg playerCreateMsg;
+
+    public MakeNewPlayerCommand(PlayerCreateMsg playerCreateMsg) {
+        this.playerCreateMsg = playerCreateMsg;
+    }
+
+    protected override void OnExecute() {
+        this.SendEvent(new MakeNewPlayerEvent(playerCreateMsg));
+    }
+}
diff --git a/CrazyCar/Assets/Scripts/Command/MakeNewPlayerCommand.cs.meta b/CrazyCar/Assets/Scripts/Command/MakeNewPlayerCommand.cs.meta
diff --git a/CrazyCar/Assets/Scripts/Command/UpdateMatchResultUICommand.cs b/CrazyCar/Assets/Scripts/Command/UpdateMatchResultUICommand.cs
@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using QFramework;
+
+public class UpdateMatchResultUICommand : AbstractCommand {
+    private PlayerCompleteMsg playerCompleteMsg;
+
+    public UpdateMatchResultUICommand(PlayerCompleteMsg playerCompleteMsg) {
+        this.playerCompleteMsg = playerCompleteMsg;
+    }
+
+    protected override void OnExecute() {
+        this.SendEvent(new UpdateMatchResultUIEvent(playerCompleteMsg));
+    }
+}
diff --git a/CrazyCar/Assets/Scripts/Command/UpdateMatchResultUICommand.cs.meta b/CrazyCar/Assets/Scripts/Command/UpdateMatchResultUICommand.cs.meta
diff --git a/CrazyCar/Assets/Scripts/Game/NetworkController.cs b/CrazyCar/Assets/Scripts/Game/NetworkController.cs
@@ -42,6 +42,13 @@ private void Awake() {
 
     private void Update() {
         // KCP 开了线程所以只能把 RespondAction放进主线程
+        if (this.GetSystem<INetworkSystem>().PlayerCreateMsgs.Count > 0) {
+            lock (this.GetSystem<INetworkSystem>().MsgLock) {
+                this.SendCommand(new MakeNewPlayerCommand(this.GetSystem<INetworkSystem>().PlayerCreateMsgs.Peek()));
+                this.GetSystem<INetworkSystem>().PlayerCreateMsgs.Dequeue();
+            }
+        }
+
         if (this.GetSystem<INetworkSystem>().PlayerStateMsgs.Count > 0) {
             lock (this.GetSystem<INetworkSystem>().MsgLock) {
                 this.GetSystem<IPlayerManagerSystem>().RespondStateAction(
@@ -57,6 +64,13 @@ private void Update() {
                 this.GetSystem<INetworkSystem>().PlayerOperatMsgs.Dequeue();
             }
         }
+
+        if (this.GetSystem<INetworkSystem>().PlayerCompleteMsgs.Count > 0) {
+            lock (this.GetSystem<INetworkSystem>().MsgLock) {
+                this.SendCommand(new UpdateMatchResultUICommand(this.GetSystem<INetworkSystem>().PlayerCompleteMsgs.Peek()));
+                this.GetSystem<INetworkSystem>().PlayerCompleteMsgs.Dequeue();
+            }
+        }
     }
 
     public IArchitecture GetArchitecture() {
diff --git a/CrazyCar/Assets/Scripts/System/NetworkSystem.cs b/CrazyCar/Assets/Scripts/System/NetworkSystem.cs
@@ -17,8 +17,10 @@ public interface INetworkSystem : ISystem {
     void RespondAction(JsonData recJD);
     void CloseConnect();
     IEnumerator POSTHTTP(string url, byte[] data = null, string token = null, Action<JsonData> succData = null, Action<int> code = null);
+    Queue<PlayerCreateMsg> PlayerCreateMsgs { get; set; }
     Queue<PlayerStateMsg> PlayerStateMsgs { get; set; }
     Queue<PlayerOperatMsg> PlayerOperatMsgs { get; set; }
+    Queue<PlayerCompleteMsg> PlayerCompleteMsgs { get; set; }
     System.Object MsgLock { get; set; }
     void EnterRoom(GameType gameType, int cid, Action succ = null);
     void GetUserInfo(int uid, Action<UserInfo> succ);
@@ -46,8 +48,10 @@ public NetType NetType {
         }
     }
     public string HttpBaseUrl { get; set; }
+    public Queue<PlayerCreateMsg> PlayerCreateMsgs { get; set; } = new Queue<PlayerCreateMsg>();
     public Queue<PlayerStateMsg> PlayerStateMsgs { get; set; } = new Queue<PlayerStateMsg>();
     public Queue<PlayerOperatMsg> PlayerOperatMsgs { get; set; } = new Queue<PlayerOperatMsg>();
+    public Queue<PlayerCompleteMsg> PlayerCompleteMsgs { get; set; } = new Queue<PlayerCompleteMsg>();
     public object MsgLock { get; set; } = new object();
     private  PlayerCreateMsg playerCreateMsg = new PlayerCreateMsg();
     private PlayerStateMsg playerStateMsg = new PlayerStateMsg();
@@ -109,12 +113,22 @@ public void RespondAction(JsonData recJD){
         MsgType msgType = (MsgType)(int)recJD["msg_type"];
         if (msgType == MsgType.CreatePlayer) {
             playerCreateMsg = this.GetSystem<IDataParseSystem>().ParsePlayerCreateMsg(recJD);
+            if (playerCreateMsg.userInfo.uid == this.GetModel<IUserModel>().Uid) {
+                return;
+            }
             MPlayer peer = null;
             if (!this.GetSystem<IPlayerManagerSystem>().peers.TryGetValue(playerStateMsg.uid, out peer)) {
-                this.SendEvent(new MakeNewPlayerEvent(playerCreateMsg));
+                if (netType == NetType.WebSocket) {
+                    this.SendEvent(new MakeNewPlayerEvent(playerCreateMsg));
+                } else {
+                    PlayerCreateMsgs.Enqueue(playerCreateMsg);
+                }
             }
         } else if(msgType == MsgType.PlayerState) {
             playerStateMsg = this.GetSystem<IDataParseSystem>().ParsePlayerStateMsg(recJD);
+            if (playerStateMsg.uid == this.GetModel<IUserModel>().Uid) {
+                return;
+            }
             if (netType == NetType.WebSocket) {               
                 this.GetSystem<IPlayerManagerSystem>().RespondStateAction(playerStateMsg);
             } else{
@@ -124,6 +138,9 @@ public void RespondAction(JsonData recJD){
             }
         } else if (msgType == MsgType.PlayerOperat){
             playerOperatMsg = this.GetSystem<IDataParseSystem>().ParsePlayerOperatMsg(recJD);
+            if (playerOperatMsg.uid == this.GetModel<IUserModel>().Uid) {
+                return;
+            }
             if (netType == NetType.WebSocket) {
                 this.GetSystem<IPlayerManagerSystem>().RespondOperatAction(playerOperatMsg);
             } else {
@@ -133,8 +150,15 @@ public void RespondAction(JsonData recJD){
             }
         } else if (msgType == MsgType.PlayerCompleteGame) {
             playerCompleteMsg = this.GetSystem<IDataParseSystem>().ParsePlayerCompleteMsg(recJD);
+            if (playerCompleteMsg.uid == this.GetModel<IUserModel>().Uid) {
+                return;
+            }
             if (this.GetModel<IGameModel>().CurGameType == GameType.Match) {
-                this.SendEvent(new UpdateMatchResultUIEvent(playerCompleteMsg));
+                if (netType == NetType.WebSocket) {
+                    this.SendEvent(new UpdateMatchResultUIEvent(playerCompleteMsg));
+                } else {
+                    PlayerCompleteMsgs.Enqueue(playerCompleteMsg);
+                }
             }
         } else if (msgType == MsgType.MatchRoomCreate) {
             this.GetSystem<IMatchRoomSystem>().OnCreateMsg(recJD);

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	`drop table if exists time_trial_rank_${uid}_${cid};`
`56`	`56`	`</update>`
`57`	`57`
`58`		`- <select id="getTimeTrialRank" resultType="TimeTrialRankModel">`
	`58`	`+ <select id="getTimeTrialRankList" resultType="TimeTrialRankModel">`
`59`	`59`	`select`
`60`	`60`	`*`
`61`	`61`	`from time_trial_rank_${uid}_${cid};`