Compare commits
	
		
			8 Commits 
		
	
	
	| Author | SHA1 | Date | 
|---|---|---|
| 
							
							
								
								 | 
						7f3921b163 | |
| 
							
							
								
								 | 
						a885a394c0 | |
| 
							
							
								
								 | 
						40d8710f37 | |
| 
							
							
								
								 | 
						e4d89d821a | |
| 
							
							
								
								 | 
						82a635ffa2 | |
| 
							
							
								
								 | 
						da8167162a | |
| 
							
							
								 | 
						cd0c8ca54d | |
| 
							
							
								 | 
						cceee2b05a | 
| 
						 | 
					@ -2,7 +2,7 @@
 | 
				
			||||||
using System.Collections.Generic;
 | 
					using System.Collections.Generic;
 | 
				
			||||||
using UnityEngine;
 | 
					using UnityEngine;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace Guru
 | 
					namespace DofLibrary
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public class GameEventMgr
 | 
					    public class GameEventMgr
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -70,7 +70,7 @@ namespace DofLibrary
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        private void ProcessMessage(ServerMessage serverMessage)
 | 
					        private void ProcessMessage(ServerMessage serverMessage)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            Debug.Log("[ProcessMessage]");
 | 
					            //Debug.Log("[ProcessMessage]");
 | 
				
			||||||
            if (serverMessage.PlayerEntered != null)
 | 
					            if (serverMessage.PlayerEntered != null)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                //Debug.Log("[ProcessMessage]PlayerEntered");
 | 
					                //Debug.Log("[ProcessMessage]PlayerEntered");
 | 
				
			||||||
| 
						 | 
					@ -116,7 +116,7 @@ namespace DofLibrary
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if (OnConnected != null)
 | 
					            if (OnConnected != null)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                Loom.QueueOnMainThread(() =>
 | 
					                LoomUtil.QueueOnMainThread(() =>
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    OnConnected.Invoke();
 | 
					                    OnConnected.Invoke();
 | 
				
			||||||
                });
 | 
					                });
 | 
				
			||||||
| 
						 | 
					@ -139,7 +139,7 @@ namespace DofLibrary
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if (msg is ServerMessage server_msg)
 | 
					            if (msg is ServerMessage server_msg)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                Loom.QueueOnMainThread(() =>
 | 
					                LoomUtil.QueueOnMainThread(() =>
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    ProcessMessage(server_msg);
 | 
					                    ProcessMessage(server_msg);
 | 
				
			||||||
                });
 | 
					                });
 | 
				
			||||||
| 
						 | 
					@ -169,7 +169,7 @@ namespace DofLibrary
 | 
				
			||||||
            Debug.Log("[GameKcpClient]: Connection closed");
 | 
					            Debug.Log("[GameKcpClient]: Connection closed");
 | 
				
			||||||
            if (OnDisConnected != null)
 | 
					            if (OnDisConnected != null)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                Loom.QueueOnMainThread(() =>
 | 
					                LoomUtil.QueueOnMainThread(() =>
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    OnDisConnected.Invoke();
 | 
					                    OnDisConnected.Invoke();
 | 
				
			||||||
                });
 | 
					                });
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,17 +3,17 @@ using System.Collections.Generic;
 | 
				
			||||||
using System.Threading;
 | 
					using System.Threading;
 | 
				
			||||||
using UnityEngine;
 | 
					using UnityEngine;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace Guru
 | 
					namespace DofLibrary
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    // Loom lets you easily run code on another thread and have that other thread run code on the main game thread when it needs to.
 | 
					    // Loom lets you easily run code on another thread and have that other thread run code on the main game thread when it needs to.
 | 
				
			||||||
    public class Loom : MonoBehaviour
 | 
					    public class LoomUtil : MonoBehaviour
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        public static int maxThreads = 10;
 | 
					        public static int maxThreads = 10;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        private static int numThreads;
 | 
					        private static int numThreads;
 | 
				
			||||||
        private static Loom _instance;
 | 
					        private static LoomUtil _instance;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public static Loom Instance
 | 
					        public static LoomUtil Instance
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            get
 | 
					            get
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
| 
						 | 
					@ -39,7 +39,7 @@ namespace Guru
 | 
				
			||||||
                initialized = true;
 | 
					                initialized = true;
 | 
				
			||||||
                var g = new GameObject("Loom");
 | 
					                var g = new GameObject("Loom");
 | 
				
			||||||
                DontDestroyOnLoad(g);
 | 
					                DontDestroyOnLoad(g);
 | 
				
			||||||
                _instance = g.AddComponent<Loom>();
 | 
					                _instance = g.AddComponent<LoomUtil>();
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -49,7 +49,7 @@ namespace DofLibrary
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            };
 | 
					            };
 | 
				
			||||||
            Send(playerEnter);
 | 
					            Send(playerEnter);
 | 
				
			||||||
            Debug.Log("PlayerEnter message sent");
 | 
					            //Debug.Log("PlayerEnter message sent");
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public void LevelPrepared(string levelId)
 | 
					        public void LevelPrepared(string levelId)
 | 
				
			||||||
| 
						 | 
					@ -63,7 +63,7 @@ namespace DofLibrary
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            };
 | 
					            };
 | 
				
			||||||
            Send(message);
 | 
					            Send(message);
 | 
				
			||||||
            Debug.Log("LevelPrepared message sent");
 | 
					            //Debug.Log("LevelPrepared message sent");
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public void PointFound(string levelId, int pointId, float combo)
 | 
					        public void PointFound(string levelId, int pointId, float combo)
 | 
				
			||||||
| 
						 | 
					@ -79,7 +79,7 @@ namespace DofLibrary
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            };
 | 
					            };
 | 
				
			||||||
            Send(message);
 | 
					            Send(message);
 | 
				
			||||||
            Debug.Log("PointFound message sent");
 | 
					            //Debug.Log("PointFound message sent");
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public void LevelEnd(string levelId)
 | 
					        public void LevelEnd(string levelId)
 | 
				
			||||||
| 
						 | 
					@ -93,7 +93,7 @@ namespace DofLibrary
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            };
 | 
					            };
 | 
				
			||||||
            Send(message);
 | 
					            Send(message);
 | 
				
			||||||
            Debug.Log("LevelEnd message sent");
 | 
					            //Debug.Log("LevelEnd message sent");
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public void AllLevelEnd(float timeSpent)
 | 
					        public void AllLevelEnd(float timeSpent)
 | 
				
			||||||
| 
						 | 
					@ -107,7 +107,7 @@ namespace DofLibrary
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            };
 | 
					            };
 | 
				
			||||||
            Send(message);
 | 
					            Send(message);
 | 
				
			||||||
            Debug.Log("AllLevelEnd message sent");
 | 
					            //Debug.Log("AllLevelEnd message sent");
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public void PlayerLeave()
 | 
					        public void PlayerLeave()
 | 
				
			||||||
| 
						 | 
					@ -120,7 +120,7 @@ namespace DofLibrary
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            };
 | 
					            };
 | 
				
			||||||
            Send(message);
 | 
					            Send(message);
 | 
				
			||||||
            Debug.Log("PlayerLeave message sent");
 | 
					            //Debug.Log("PlayerLeave message sent");
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public void Heartbeat(long timestamp)
 | 
					        public void Heartbeat(long timestamp)
 | 
				
			||||||
| 
						 | 
					@ -133,7 +133,7 @@ namespace DofLibrary
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            };
 | 
					            };
 | 
				
			||||||
            Send(message);
 | 
					            Send(message);
 | 
				
			||||||
            Debug.Log("Heartbeat message sent");
 | 
					            //Debug.Log("Heartbeat message sent");
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        private void Send(ClientMessage message)
 | 
					        private void Send(ClientMessage message)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -328,6 +328,12 @@ namespace Dof
 | 
				
			||||||
        [global::ProtoBuf.ProtoMember(2, Name = @"score")]
 | 
					        [global::ProtoBuf.ProtoMember(2, Name = @"score")]
 | 
				
			||||||
        public int Score { get; set; }
 | 
					        public int Score { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        [global::ProtoBuf.ProtoMember(3, Name = @"rank")]
 | 
				
			||||||
 | 
					        public int Rank { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        [global::ProtoBuf.ProtoMember(4, Name = @"award")]
 | 
				
			||||||
 | 
					        public int Award { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    [global::ProtoBuf.ProtoContract()]
 | 
					    [global::ProtoBuf.ProtoContract()]
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,7 +2,7 @@
 | 
				
			||||||
using System.IO;
 | 
					using System.IO;
 | 
				
			||||||
using ProtoBuf.Meta;
 | 
					using ProtoBuf.Meta;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace Guru
 | 
					namespace DofLibrary
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    public interface ISupportInitialize
 | 
					    public interface ISupportInitialize
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -85,6 +85,8 @@ message AllLevelEnd {
 | 
				
			||||||
message GameScore {
 | 
					message GameScore {
 | 
				
			||||||
  string uid = 1;
 | 
					  string uid = 1;
 | 
				
			||||||
  int32 score = 2;
 | 
					  int32 score = 2;
 | 
				
			||||||
 | 
					  int32 rank = 3;
 | 
				
			||||||
 | 
					  int32 award = 4;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
message GameFinish {
 | 
					message GameFinish {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  "name": "com.guru.unity.gurudoflib",
 | 
					  "name": "com.guru.unity.gurudoflib",
 | 
				
			||||||
  "displayName": "GuruDofLib",
 | 
					  "displayName": "GuruDofLib",
 | 
				
			||||||
  "version": "0.0.9",
 | 
					  "version": "0.1.2",
 | 
				
			||||||
  "description": "\u57fa\u4e8eGuru kcp\u5e93\u5b9e\u73b0\u7684\u5ba2\u6237\u7aef\u63a5\u53e3\u5c01\u88c5",
 | 
					  "description": "\u57fa\u4e8eGuru kcp\u5e93\u5b9e\u73b0\u7684\u5ba2\u6237\u7aef\u63a5\u53e3\u5c01\u88c5",
 | 
				
			||||||
  "keywords": [
 | 
					  "keywords": [
 | 
				
			||||||
    "unity",
 | 
					    "unity",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue