Compare commits

..

No commits in common. "main" and "0.0.6" have entirely different histories.
main ... 0.0.6

12 changed files with 20 additions and 71 deletions

View File

@ -1,4 +1,4 @@
Version=0.1.2 Version=0.0.6
Branch=main Branch=main

View File

@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
namespace DofLibrary namespace Guru
{ {
public class GameEventMgr public class GameEventMgr

View File

@ -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");
@ -98,11 +98,6 @@ namespace DofLibrary
//Debug.Log("[ProcessMessage]GameFinish"); //Debug.Log("[ProcessMessage]GameFinish");
_receiver.OnGameFinish(serverMessage.GameFinish); _receiver.OnGameFinish(serverMessage.GameFinish);
} }
else if (serverMessage.Heartbeat != null)
{
//Debug.Log("[ProcessMessage]Heartbeat");
_receiver.OnHeartbeat(serverMessage.Heartbeat);
}
} }
/// <summary> /// <summary>
@ -116,7 +111,7 @@ namespace DofLibrary
if (OnConnected != null) if (OnConnected != null)
{ {
LoomUtil.QueueOnMainThread(() => Loom.QueueOnMainThread(() =>
{ {
OnConnected.Invoke(); OnConnected.Invoke();
}); });
@ -139,7 +134,7 @@ namespace DofLibrary
if (msg is ServerMessage server_msg) if (msg is ServerMessage server_msg)
{ {
LoomUtil.QueueOnMainThread(() => Loom.QueueOnMainThread(() =>
{ {
ProcessMessage(server_msg); ProcessMessage(server_msg);
}); });
@ -169,7 +164,7 @@ namespace DofLibrary
Debug.Log("[GameKcpClient]: Connection closed"); Debug.Log("[GameKcpClient]: Connection closed");
if (OnDisConnected != null) if (OnDisConnected != null)
{ {
LoomUtil.QueueOnMainThread(() => Loom.QueueOnMainThread(() =>
{ {
OnDisConnected.Invoke(); OnDisConnected.Invoke();
}); });

View File

@ -41,10 +41,5 @@ namespace DofLibrary
/// </summary> /// </summary>
/// <param name="gameFinish">两个玩家的得分</param> /// <param name="gameFinish">两个玩家的得分</param>
void OnGameFinish(GameFinish gameFinish); void OnGameFinish(GameFinish gameFinish);
/// <summary>
/// 心跳包
/// </summary>
void OnHeartbeat(Heartbeat heartbeat);
} }
} }

View File

@ -56,11 +56,6 @@ namespace DofLibrary
/// </summary> /// </summary>
void AllLevelEnd(float timeSpent); void AllLevelEnd(float timeSpent);
/// <summary>
/// 发送 玩家中途离开房间 消息
/// </summary>
void PlayerLeave();
/// <summary> /// <summary>
/// 发送心跳包 /// 发送心跳包
/// </summary> /// </summary>

View File

@ -3,17 +3,17 @@ using System.Collections.Generic;
using System.Threading; using System.Threading;
using UnityEngine; using UnityEngine;
namespace DofLibrary namespace Guru
{ {
// 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 LoomUtil : MonoBehaviour public class Loom : MonoBehaviour
{ {
public static int maxThreads = 10; public static int maxThreads = 10;
private static int numThreads; private static int numThreads;
private static LoomUtil _instance; private static Loom _instance;
public static LoomUtil Instance public static Loom Instance
{ {
get get
{ {
@ -39,7 +39,7 @@ namespace DofLibrary
initialized = true; initialized = true;
var g = new GameObject("Loom"); var g = new GameObject("Loom");
DontDestroyOnLoad(g); DontDestroyOnLoad(g);
_instance = g.AddComponent<LoomUtil>(); _instance = g.AddComponent<Loom>();
} }
} }

View File

@ -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,20 +107,7 @@ namespace DofLibrary
} }
}; };
Send(message); Send(message);
//Debug.Log("AllLevelEnd message sent"); Debug.Log("AllLevelEnd message sent");
}
public void PlayerLeave()
{
var message = new ClientMessage
{
PlayerLeave = new PlayerLeave
{
Cid = _cid
}
};
Send(message);
//Debug.Log("PlayerLeave message sent");
} }
public void Heartbeat(long timestamp) public void Heartbeat(long timestamp)
@ -133,7 +120,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)

View File

@ -137,15 +137,6 @@ namespace Dof
public bool ShouldSerializeGameFinish() => __pbn__actual.Is(5); public bool ShouldSerializeGameFinish() => __pbn__actual.Is(5);
public void ResetGameFinish() => global::ProtoBuf.DiscriminatedUnionObject.Reset(ref __pbn__actual, 5); public void ResetGameFinish() => global::ProtoBuf.DiscriminatedUnionObject.Reset(ref __pbn__actual, 5);
[global::ProtoBuf.ProtoMember(21, Name = @"heartbeat")]
public Heartbeat Heartbeat
{
get => __pbn__actual.Is(21) ? ((Heartbeat)__pbn__actual.Object) : default;
set => __pbn__actual = new global::ProtoBuf.DiscriminatedUnionObject(21, value);
}
public bool ShouldSerializeHeartbeat() => __pbn__actual.Is(21);
public void ResetHeartbeat() => global::ProtoBuf.DiscriminatedUnionObject.Reset(ref __pbn__actual, 21);
} }
[global::ProtoBuf.ProtoContract()] [global::ProtoBuf.ProtoContract()]
@ -200,9 +191,6 @@ namespace Dof
[global::System.ComponentModel.DefaultValue("")] [global::System.ComponentModel.DefaultValue("")]
public string IosGeneration { get; set; } = ""; public string IosGeneration { get; set; } = "";
[global::ProtoBuf.ProtoMember(4, Name = @"diff_count")]
public int DiffCount { get; set; }
} }
[global::ProtoBuf.ProtoContract()] [global::ProtoBuf.ProtoContract()]
@ -328,12 +316,6 @@ 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()]

View File

@ -2,7 +2,7 @@
using System.IO; using System.IO;
using ProtoBuf.Meta; using ProtoBuf.Meta;
namespace DofLibrary namespace Guru
{ {
public interface ISupportInitialize public interface ISupportInitialize
{ {

View File

@ -24,8 +24,6 @@ message ServerMessage {
LevelStart level_start = 3; LevelStart level_start = 3;
PointFound point_found = 4; PointFound point_found = 4;
GameFinish game_finish = 5; GameFinish game_finish = 5;
Heartbeat heartbeat = 21;
} }
} }
@ -43,7 +41,6 @@ message LevelResource {
string level_id = 1; string level_id = 1;
string android_generation = 2; string android_generation = 2;
string ios_generation = 3; string ios_generation = 3;
int32 diff_count = 4;
} }
// PlayerEntered PlayerEnter // PlayerEntered PlayerEnter
@ -85,8 +82,6 @@ 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 {

View File

@ -1,7 +1,7 @@
{ {
"name": "com.guru.unity.gurudoflib", "name": "com.guru.unity.gurudoflib",
"displayName": "GuruDofLib", "displayName": "GuruDofLib",
"version": "0.1.2", "version": "0.0.6",
"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",