Game/Fishing2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交测试代码

Browse Source
This commit is contained in:
Bob.Song
2026-03-06 12:15:56 +08:00
parent 209049354c
commit 7127857199
37 changed files with 1269 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
.codelyignore Normal file
View File

@@ -0,0 +1,72 @@
# Codely ignore for Unity (git/Plastic style). Auto-generated by Codely/Continue.
# Library: only PackageCache is kept for indexing; rest is cache.
# Library – ignore all except PackageCache
Library/*
!Library/PackageCache/
!Library/PackageCache/**
# Temp, Obj, Logs, UserSettings (conventional Unity ignores)
Temp/
Obj/
Logs/
UserSettings/
Build/
Builds/
# Unity / IDE
.utmp/
.vs/
.consulo/
.gradle/
*.DotSettings.user
ExportedObj/
# MemoryCaptures / Recordings
MemoryCaptures/
Recordings/
# Blender
*.blend1
*.blend1.meta
# JetBrains Rider (optional)
# Assets/Plugins/Editor/JetBrains*
# Solution / project / IDE user files
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db
*.pidb.meta
*.pdb.meta
*.mdb.meta
sysinfo.txt
mono_crash.*
# Build artifacts
*.apk
*.aab
*.app
crashlytics-build.properties
InitTestScene*.unity*
# Addressables
ServerData
Assets/StreamingAssets/aa*
Assets/AddressableAssetsData/link.xml*
Assets/Addressables_Temp*
Assets/AddressableAssetsData/*/*.bin*
# Visual Scripting generated
Assets/Unity.VisualScripting.Generated/

BIN
Assets/New Terrain 12.asset
View File

Binary file not shown.

BIN
Assets/ResRaw/Fgui/Main/Main_fui.bytes
View File

Binary file not shown.

BIN
Assets/ResRaw/Maps/Map10/Map1.asset
View File

Binary file not shown.

39
Assets/Scenes/BobberTest.unity
View File

@@ -1116,7 +1116,7 @@ Transform:
m_GameObject: {fileID: 909052969} m_GameObject: {fileID: 909052969}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -53, y: -1.75, z: -55.52} m_LocalPosition: {x: -53, y: -0.75, z: -55.52}
m_LocalScale: {x: 100, y: 100, z: 100} m_LocalScale: {x: 100, y: 100, z: 100}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@@ -2143,8 +2143,9 @@ MonoBehaviour:
m_EditorClassIdentifier: Assembly-CSharp::Test.BobberTest m_EditorClassIdentifier: Assembly-CSharp::Test.BobberTest
rb: {fileID: 1518432885} rb: {fileID: 1518432885}
line: {fileID: 8144283643417267672} line: {fileID: 8144283643417267672}
lineLength: 2 lineLength: 3
floatLength: 1 floatLength: 1
Tension: 0
--- !u!1 &1529912227 --- !u!1 &1529912227
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2659,6 +2660,7 @@ GameObject:
- component: {fileID: 1876288043} - component: {fileID: 1876288043}
- component: {fileID: 1876288042} - component: {fileID: 1876288042}
- component: {fileID: 1876288041} - component: {fileID: 1876288041}
- component: {fileID: 1876288046}
m_Layer: 0 m_Layer: 0
m_Name: Capsule m_Name: Capsule
m_TagString: Untagged m_TagString: Untagged
@@ -2787,6 +2789,18 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1876288046
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1876288040}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5bfa3f53f894e7a87315e5cbc220e12, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Test.CollisionTest
--- !u!1 &1899034788 --- !u!1 &1899034788
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2884,25 +2898,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3481fc2889d14a00a9de205cc39d9c33, type: 3} m_Script: {fileID: 11500000, guid: 3481fc2889d14a00a9de205cc39d9c33, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CentimeterBuoyancy m_EditorClassIdentifier: Assembly-CSharp::CentimeterBuoyancy
waterDensity: 1000
buoyancyScale: 2
dragScale: 1
waterLevel: 0
waterLayer:
m_Bits: 16
showDebugInfo: 1
debugColor:
r: 0
g: 1
b: 1
a: 1
rb: {fileID: 0}
objCollider: {fileID: 0}
volumeInCm: 0
samplePoints: []
localBounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
--- !u!4 &1948332548 stripped --- !u!4 &1948332548 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} m_CorrespondingSourceObject: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3}
@@ -7339,7 +7334,7 @@ MonoBehaviour:
uprightAxis: 1 uprightAxis: 1
extraDragInWater: 0.8 extraDragInWater: 0.8
extraAngularDragInWater: 0.8 extraAngularDragInWater: 0.8
Water: {fileID: 2531380344179187550} Water: {fileID: 4652288250947343381}
_Layer: 1 _Layer: 1
_ObjectWidth: 0.2 _ObjectWidth: 0.2
drawDebug: 0 drawDebug: 0

3
Assets/Scripts/Common/Entity.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: b25d7e65501b49c18f57eec3b4209ad0
timeCreated: 1772695059

30
Assets/Scripts/Common/Entity/SerializerComponent.cs Normal file
View File

@@ -0,0 +1,30 @@
// using Fantasy.Entitas;
// using Fantasy.Network;
// using Fantasy.Serialize;
//
// namespace NBF
// {
// public class SerializerComponent : Entity
// {
// public ISerialize Serialize;
// public readonly MemoryStreamBufferPool BufferPool = new MemoryStreamBufferPool();
//
//
// public void Initialize()
// {
// Serialize = SerializerManager.ProtoBufHelper;
// }
//
// public byte[] Serialize<T>(T @object)
// {
// using var memoryStreamBuffer = BufferPool.RentMemoryStream(MemoryStreamBufferSource.None);
// Serialize.Serialize(typeof(T), @object, memoryStreamBuffer);
// return memoryStreamBuffer.ToArray();
// }
//
// public T Deserialize<T>(byte[] bytes)
// {
// return Serialize.Deserialize<T>(bytes);
// }
// }
// }

3
Assets/Scripts/Common/Entity/SerializerComponent.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 0a4cb7f8b3fe47e0852a2081f714dec4
timeCreated: 1772695064

56
Assets/Scripts/Common/Net/MessageHandler/Chat2C_MessageHandler.cs
View File

@@ -1,4 +1,5 @@
using Fantasy; using System.Text;
using Fantasy;
using Fantasy.Async; using Fantasy.Async;
using Fantasy.Network; using Fantasy.Network;
using Fantasy.Network.Interface; using Fantasy.Network.Interface;
@@ -7,17 +8,54 @@ using Log = NBC.Log;
namespace NBF namespace NBF
{ {
public class Chat2C_MessageHandler : Message<S2C_Message> // public class Chat2C_MessageHandler : Message<S2C_Message>
// {
// protected override async FTask Run(Session session, S2C_Message message)
// {
// Log.Info($"收到一条消息推送，message={message.Msg}");
// var chatTestPanel = UI.Inst.GetUI<ChatTestPanel>();
// if (chatTestPanel != null)
// {
// chatTestPanel.Message(message.Msg.Content);
// }
// await FTask.CompletedTask;
// }
// }
public sealed class Chat2C_MessageHandler : Message<Chat2C_Message>
{ {
protected override async FTask Run(Session session, S2C_Message message) protected override async FTask Run(Session session, Chat2C_Message message)
{ {
Log.Info($"收到一条消息推送，message={message.Msg}"); ChatTreeParser.Parse(session.Scene,message.ChatInfoTree);
var chatTestPanel = UI.Inst.GetUI<ChatTestPanel>(); Log.Info("收到聊天信息：");
if (chatTestPanel != null)
{
chatTestPanel.Message(message.Msg.Content);
}
await FTask.CompletedTask; await FTask.CompletedTask;
} }
} }
public static class ChatTreeParser
{
public static void Parse(Scene scene, ChatInfoTree tree)
{
// var entryComponent = scene.GetComponent<EntryComponent>();
var chatTestPanel = UI.Inst.GetUI<ChatTestPanel>();
if (chatTestPanel != null)
{
chatTestPanel.Message(tree);
}
// var sb = new StringBuilder();
// foreach (var chatInfoNode in tree.Node)
// {
// // 这里只是演示一下处理事件的效果，实际使用时，需要根据实际情况处理事件
// // 明显我现在这样做的方式不是对的，应该是自己拼接一个聊天信息，然后调用这个接口来处理事件
// entryComponent.Entry.ChatNodeEventButton.onClick.RemoveAllListeners();
// entryComponent.Entry.ChatNodeEventButton.onClick.AddListener(() =>
// {
// ChatNodeEventHelper.Handler(scene, chatInfoNode);
// });
// sb.Append(chatInfoNode.Content);
// }
// entryComponent.Entry.MessageText.text = sb.ToString();
}
}
} }

22
Assets/Scripts/Fishing/LureController.cs
View File

@@ -1,4 +1,5 @@
using UnityEngine; using System;
using UnityEngine;
namespace NBF namespace NBF
{ {
@@ -10,11 +11,19 @@ namespace NBF
public ConfigurableJoint Joint => joint; public ConfigurableJoint Joint => joint;
private void Start()
{
RBody.detectCollisions = true;
RBody.collisionDetectionMode = CollisionDetectionMode.ContinuousDynamic;
RBody.interpolation = RigidbodyInterpolation.Interpolate;
}
public void SetJoint(Rigidbody rb) public void SetJoint(Rigidbody rb)
{ {
joint.connectedBody = rb; joint.connectedBody = rb;
} }
public void EnableCollision(bool enable) public void EnableCollision(bool enable)
{ {
if (rBody == null) if (rBody == null)
@@ -22,7 +31,7 @@ namespace NBF
rBody = GetComponent<Rigidbody>(); rBody = GetComponent<Rigidbody>();
} }
rBody.detectCollisions = enable; // rBody.detectCollisions = enable;
} }
public void SetKinematic(bool value) public void SetKinematic(bool value)
@@ -37,5 +46,14 @@ namespace NBF
limit = limit limit = limit
}; };
} }
private void OnCollisionEnter(Collision other)
{
Debug.Log($"OnCollisionEnter:{other.gameObject.name}");
}
private void OnCollisionExit(Collision other)
{
Debug.Log($"OnCollisionExit:{other.gameObject.name}");
}
} }
} }

15
Assets/Scripts/Fishing/Player/States/PlayerStateThrow.cs
View File

@@ -62,6 +62,21 @@ namespace NBF
return base.onUpdate(); return base.onUpdate();
} }
// IEnumerator ThrowCoroutine(float distance)
// {
// float startLength = 0.5f;
// Debug.Log($"REST LENGTH : {rope.restLength}");
// do
// {
// float a = Vector3.Distance(rodTipTarget.position, attachedBody.transform.position);
// attachedBody.RBody.AddForce(playerForward.Value, ForceMode.VelocityChange);
// startLength = Mathf.Max(a, startLength);
// UnwindLine(attachedBody.RBody.linearVelocity.magnitude * Time.deltaTime);
// yield return null;
// }
// while ((bool)isBailOpen);
// }
#region 动画回调 #region 动画回调
/// <summary> /// <summary>

24
Assets/Scripts/Generate/NetworkProtocol/NetworkProtocolHelper.cs
View File

@@ -472,6 +472,30 @@ namespace Fantasy
session.Send(S2C_MailState_message); session.Send(S2C_MailState_message);
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static async FTask<Chat2C_SendMessageResponse> C2Chat_SendMessageRequest(this Session session, C2Chat_SendMessageRequest C2Chat_SendMessageRequest_request)
{
return (Chat2C_SendMessageResponse)await session.Call(C2Chat_SendMessageRequest_request);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static async FTask<Chat2C_SendMessageResponse> C2Chat_SendMessageRequest(this Session session, ChatInfoTree chatInfoTree)
{
using var C2Chat_SendMessageRequest_request = Fantasy.C2Chat_SendMessageRequest.Create();
C2Chat_SendMessageRequest_request.ChatInfoTree = chatInfoTree;
return (Chat2C_SendMessageResponse)await session.Call(C2Chat_SendMessageRequest_request);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void Chat2C_Message(this Session session, Chat2C_Message Chat2C_Message_message)
{
session.Send(Chat2C_Message_message);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void Chat2C_Message(this Session session, ChatInfoTree chatInfoTree)
{
using var Chat2C_Message_message = Fantasy.Chat2C_Message.Create();
Chat2C_Message_message.ChatInfoTree = chatInfoTree;
session.Send(Chat2C_Message_message);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static async FTask<S2C_CreateChannelResponse> C2S_CreateChannelRequest(this Session session, C2S_CreateChannelRequest C2S_CreateChannelRequest_request) public static async FTask<S2C_CreateChannelResponse> C2S_CreateChannelRequest(this Session session, C2S_CreateChannelRequest C2S_CreateChannelRequest_request)
{ {
return (S2C_CreateChannelResponse)await session.Call(C2S_CreateChannelRequest_request); return (S2C_CreateChannelResponse)await session.Call(C2S_CreateChannelRequest_request);

397
Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs
View File

@@ -903,7 +903,7 @@ namespace Fantasy
public uint ErrorCode { get; set; } public uint ErrorCode { get; set; }
} }
/// <summary> /// <summary>
/// 奖励推送 /// 活动奖励推送
/// </summary> /// </summary>
[Serializable] [Serializable]
[ProtoContract] [ProtoContract]
@@ -2839,7 +2839,398 @@ namespace Fantasy
[ProtoMember(2)] [ProtoMember(2)]
public long MailId { get; set; } public long MailId { get; set; }
} }
/// <summary>
/// 发送一个聊天消息给Chat服务器，中间是经过Gate中转的
/// </summary>
////////// ******** 频道聊天 *******///////////// ////////// ******** 频道聊天 *******/////////////
[Serializable]
[ProtoContract]
public partial class C2Chat_SendMessageRequest : AMessage, ICustomRouteRequest
{
public static C2Chat_SendMessageRequest Create(bool autoReturn = true)
{
var c2Chat_SendMessageRequest = MessageObjectPool<C2Chat_SendMessageRequest>.Rent();
c2Chat_SendMessageRequest.AutoReturn = autoReturn;
if (!autoReturn)
{
c2Chat_SendMessageRequest.SetIsPool(false);
}
return c2Chat_SendMessageRequest;
}
public void Return()
{
if (!AutoReturn)
{
SetIsPool(true);
AutoReturn = true;
}
else if (!IsPool())
{
return;
}
Dispose();
}
public void Dispose()
{
if (!IsPool()) return;
if (ChatInfoTree != null)
{
ChatInfoTree.Dispose();
ChatInfoTree = null;
}
MessageObjectPool<C2Chat_SendMessageRequest>.Return(this);
}
public uint OpCode() { return OuterOpcode.C2Chat_SendMessageRequest; }
[ProtoIgnore]
public Chat2C_SendMessageResponse ResponseType { get; set; }
[ProtoIgnore]
public int RouteType => Fantasy.RouteType.SocialRoute;
[ProtoMember(1)]
public ChatInfoTree ChatInfoTree { get; set; }
}
[Serializable]
[ProtoContract]
public partial class Chat2C_SendMessageResponse : AMessage, ICustomRouteResponse
{
public static Chat2C_SendMessageResponse Create(bool autoReturn = true)
{
var chat2C_SendMessageResponse = MessageObjectPool<Chat2C_SendMessageResponse>.Rent();
chat2C_SendMessageResponse.AutoReturn = autoReturn;
if (!autoReturn)
{
chat2C_SendMessageResponse.SetIsPool(false);
}
return chat2C_SendMessageResponse;
}
public void Return()
{
if (!AutoReturn)
{
SetIsPool(true);
AutoReturn = true;
}
else if (!IsPool())
{
return;
}
Dispose();
}
public void Dispose()
{
if (!IsPool()) return;
ErrorCode = 0;
MessageObjectPool<Chat2C_SendMessageResponse>.Return(this);
}
public uint OpCode() { return OuterOpcode.Chat2C_SendMessageResponse; }
[ProtoMember(1)]
public uint ErrorCode { get; set; }
}
[Serializable]
[ProtoContract]
public partial class Chat2C_Message : AMessage, ICustomRouteMessage
{
public static Chat2C_Message Create(bool autoReturn = true)
{
var chat2C_Message = MessageObjectPool<Chat2C_Message>.Rent();
chat2C_Message.AutoReturn = autoReturn;
if (!autoReturn)
{
chat2C_Message.SetIsPool(false);
}
return chat2C_Message;
}
public void Return()
{
if (!AutoReturn)
{
SetIsPool(true);
AutoReturn = true;
}
else if (!IsPool())
{
return;
}
Dispose();
}
public void Dispose()
{
if (!IsPool()) return;
if (ChatInfoTree != null)
{
ChatInfoTree.Dispose();
ChatInfoTree = null;
}
MessageObjectPool<Chat2C_Message>.Return(this);
}
public uint OpCode() { return OuterOpcode.Chat2C_Message; }
[ProtoIgnore]
public int RouteType => Fantasy.RouteType.SocialRoute;
[ProtoMember(1)]
public ChatInfoTree ChatInfoTree { get; set; }
}
/// <summary>
/// 聊天消息树
/// </summary>
[Serializable]
[ProtoContract]
public partial class ChatInfoTree : AMessage, IDisposable
{
public static ChatInfoTree Create(bool autoReturn = true)
{
var chatInfoTree = MessageObjectPool<ChatInfoTree>.Rent();
chatInfoTree.AutoReturn = autoReturn;
if (!autoReturn)
{
chatInfoTree.SetIsPool(false);
}
return chatInfoTree;
}
public void Return()
{
if (!AutoReturn)
{
SetIsPool(true);
AutoReturn = true;
}
else if (!IsPool())
{
return;
}
Dispose();
}
public void Dispose()
{
if (!IsPool()) return;
ChatChannelType = default;
ChatChannelId = default;
UnitId = default;
UserName = default;
Target.Clear();
Node.Clear();
MessageObjectPool<ChatInfoTree>.Return(this);
}
[ProtoMember(1)]
public int ChatChannelType { get; set; }
[ProtoMember(2)]
public long ChatChannelId { get; set; }
[ProtoMember(3)]
public long UnitId { get; set; }
[ProtoMember(4)]
public string UserName { get; set; }
[ProtoMember(5)]
public List<long> Target { get; set; } = new List<long>();
[ProtoMember(6)]
public List<ChatInfoNode> Node { get; set; } = new List<ChatInfoNode>();
}
/// <summary>
/// 聊天信息节点
/// </summary>
[Serializable]
[ProtoContract]
public partial class ChatInfoNode : AMessage, IDisposable
{
public static ChatInfoNode Create(bool autoReturn = true)
{
var chatInfoNode = MessageObjectPool<ChatInfoNode>.Rent();
chatInfoNode.AutoReturn = autoReturn;
if (!autoReturn)
{
chatInfoNode.SetIsPool(false);
}
return chatInfoNode;
}
public void Return()
{
if (!AutoReturn)
{
SetIsPool(true);
AutoReturn = true;
}
else if (!IsPool())
{
return;
}
Dispose();
}
public void Dispose()
{
if (!IsPool()) return;
ChatNodeType = default;
ChatNodeEvent = default;
Content = default;
Color = default;
Data = null;
MessageObjectPool<ChatInfoNode>.Return(this);
}
[ProtoMember(1)]
public int ChatNodeType { get; set; }
[ProtoMember(2)]
public int ChatNodeEvent { get; set; }
[ProtoMember(3)]
public string Content { get; set; }
[ProtoMember(4)]
public string Color { get; set; }
[ProtoMember(5)]
public byte[] Data { get; set; }
}
/// <summary>
/// 聊天位置信息节点
/// </summary>
[Serializable]
[ProtoContract]
public partial class ChatPositionNode : AMessage, IDisposable
{
public static ChatPositionNode Create(bool autoReturn = true)
{
var chatPositionNode = MessageObjectPool<ChatPositionNode>.Rent();
chatPositionNode.AutoReturn = autoReturn;
if (!autoReturn)
{
chatPositionNode.SetIsPool(false);
}
return chatPositionNode;
}
public void Return()
{
if (!AutoReturn)
{
SetIsPool(true);
AutoReturn = true;
}
else if (!IsPool())
{
return;
}
Dispose();
}
public void Dispose()
{
if (!IsPool()) return;
MapName = default;
PosX = default;
PosY = default;
PosZ = default;
MessageObjectPool<ChatPositionNode>.Return(this);
}
[ProtoMember(1)]
public string MapName { get; set; }
[ProtoMember(2)]
public float PosX { get; set; }
[ProtoMember(3)]
public float PosY { get; set; }
[ProtoMember(4)]
public float PosZ { get; set; }
}
/// <summary>
/// 聊天位置信息节点
/// </summary>
[Serializable]
[ProtoContract]
public partial class ChatOpenUINode : AMessage, IDisposable
{
public static ChatOpenUINode Create(bool autoReturn = true)
{
var chatOpenUINode = MessageObjectPool<ChatOpenUINode>.Rent();
chatOpenUINode.AutoReturn = autoReturn;
if (!autoReturn)
{
chatOpenUINode.SetIsPool(false);
}
return chatOpenUINode;
}
public void Return()
{
if (!AutoReturn)
{
SetIsPool(true);
AutoReturn = true;
}
else if (!IsPool())
{
return;
}
Dispose();
}
public void Dispose()
{
if (!IsPool()) return;
UIName = default;
MessageObjectPool<ChatOpenUINode>.Return(this);
}
[ProtoMember(1)]
public string UIName { get; set; }
}
/// <summary>
/// 聊天连接信息节点
/// </summary>
[Serializable]
[ProtoContract]
public partial class ChatLinkNode : AMessage, IDisposable
{
public static ChatLinkNode Create(bool autoReturn = true)
{
var chatLinkNode = MessageObjectPool<ChatLinkNode>.Rent();
chatLinkNode.AutoReturn = autoReturn;
if (!autoReturn)
{
chatLinkNode.SetIsPool(false);
}
return chatLinkNode;
}
public void Return()
{
if (!AutoReturn)
{
SetIsPool(true);
AutoReturn = true;
}
else if (!IsPool())
{
return;
}
Dispose();
}
public void Dispose()
{
if (!IsPool()) return;
Link = default;
MessageObjectPool<ChatLinkNode>.Return(this);
}
[ProtoMember(1)]
public string Link { get; set; }
}
[Serializable] [Serializable]
[ProtoContract] [ProtoContract]
public partial class ChatUserInfo : AMessage, IDisposable public partial class ChatUserInfo : AMessage, IDisposable
@@ -4485,7 +4876,7 @@ namespace Fantasy
MessageObjectPool<AwardInfo>.Return(this); MessageObjectPool<AwardInfo>.Return(this);
} }
[ProtoMember(1)] [ProtoMember(1)]
public int ConfigId { get; set; } public long ConfigId { get; set; }
[ProtoMember(2)] [ProtoMember(2)]
public int Count { get; set; } public int Count { get; set; }
} }
@@ -4646,7 +5037,7 @@ namespace Fantasy
[ProtoMember(4)] [ProtoMember(4)]
public uint Sort { get; set; } public uint Sort { get; set; }
[ProtoMember(5)] [ProtoMember(5)]
public string Tag { get; set; } public uint Tag { get; set; }
} }
/// <summary> /// <summary>
/// fish信息 /// fish信息

51
Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs
View File

@@ -61,29 +61,32 @@ namespace Fantasy
public const uint S2C_DeleteMailResponse = 2415929119; public const uint S2C_DeleteMailResponse = 2415929119;
public const uint S2C_HaveMail = 2147493663; public const uint S2C_HaveMail = 2147493663;
public const uint S2C_MailState = 2147493664; public const uint S2C_MailState = 2147493664;
public const uint C2S_CreateChannelRequest = 2281711392; public const uint C2Chat_SendMessageRequest = 2281711392;
public const uint S2C_CreateChannelResponse = 2415929120; public const uint Chat2C_SendMessageResponse = 2415929120;
public const uint C2S_JoinChannelRequest = 2281711393; public const uint Chat2C_Message = 2147493665;
public const uint S2C_JoinChannelResponse = 2415929121; public const uint C2S_CreateChannelRequest = 2281711393;
public const uint C2S_SendMessageRequest = 2281711394; public const uint S2C_CreateChannelResponse = 2415929121;
public const uint S2C_SendMessageResponse = 2415929122; public const uint C2S_JoinChannelRequest = 2281711394;
public const uint S2C_Message = 2147493665; public const uint S2C_JoinChannelResponse = 2415929122;
public const uint C2S_CreateClubRequest = 2281711395; public const uint C2S_SendMessageRequest = 2281711395;
public const uint S2C_CreateClubResponse = 2415929123; public const uint S2C_SendMessageResponse = 2415929123;
public const uint C2S_GetClubInfoRequest = 2281711396; public const uint S2C_Message = 2147493666;
public const uint S2C_GetClubInfoResponse = 2415929124; public const uint C2S_CreateClubRequest = 2281711396;
public const uint C2S_GetMemberListRequest = 2281711397; public const uint S2C_CreateClubResponse = 2415929124;
public const uint S2C_GetMemberListResponse = 2415929125; public const uint C2S_GetClubInfoRequest = 2281711397;
public const uint C2S_GetClubListRequest = 2281711398; public const uint S2C_GetClubInfoResponse = 2415929125;
public const uint S2C_GetClubListResponse = 2415929126; public const uint C2S_GetMemberListRequest = 2281711398;
public const uint C2S_JoinClubRequest = 2281711399; public const uint S2C_GetMemberListResponse = 2415929126;
public const uint S2C_JoinClubResponse = 2415929127; public const uint C2S_GetClubListRequest = 2281711399;
public const uint C2S_LeaveClubRequest = 2281711400; public const uint S2C_GetClubListResponse = 2415929127;
public const uint S2C_LeaveClubResponse = 2415929128; public const uint C2S_JoinClubRequest = 2281711400;
public const uint C2S_DissolveClubRequest = 2281711401; public const uint S2C_JoinClubResponse = 2415929128;
public const uint S2C_DissolveClubResponse = 2415929129; public const uint C2S_LeaveClubRequest = 2281711401;
public const uint C2S_DisposeJoinRequest = 2281711402; public const uint S2C_LeaveClubResponse = 2415929129;
public const uint S2C_DisposeJoinResponse = 2415929130; public const uint C2S_DissolveClubRequest = 2281711402;
public const uint S2C_ClubChange = 2147493666; public const uint S2C_DissolveClubResponse = 2415929130;
public const uint C2S_DisposeJoinRequest = 2281711403;
public const uint S2C_DisposeJoinResponse = 2415929131;
public const uint S2C_ClubChange = 2147493667;
} }
} }

45
Assets/Scripts/Test/BobberTest.cs
View File

@@ -12,6 +12,7 @@ namespace Test
public float lineLength = 1f; public float lineLength = 1f;
public float floatLength = 0.5f; public float floatLength = 0.5f;
public float Tension = 0;
public void Start() public void Start()
{ {
line.InitTest(rb); line.InitTest(rb);
@@ -20,5 +21,49 @@ namespace Test
line.Bobber.SetJointDistance(lineLength - floatLength); line.Bobber.SetJointDistance(lineLength - floatLength);
line.SetObiRopeStretch(lineLength - floatLength); line.SetObiRopeStretch(lineLength - floatLength);
} }
private void Update()
{
if (Input.GetKeyDown(KeyCode.Alpha0))
{
SetLineLength(lineLength);
}
else if (Input.GetKeyDown(KeyCode.Plus) || Input.GetKeyDown(KeyCode.Equals))
{
lineLength += 0.1f;
SetLineLength(lineLength);
}
else if (Input.GetKeyDown(KeyCode.Minus))
{
lineLength -= 0.1f;
SetLineLength(lineLength);
}
}
public void SetLineLength(float lineLength, bool stretchRope = true)
{
Debug.Log($"lineLength={lineLength}");
if (!line) return;
if (line.IsLure)
{
//没有浮漂类型
line.Lure.SetJointDistance(lineLength);
if (stretchRope)
{
line.SetObiRopeStretch(Tension > 0f ? 0f : lineLength);
}
}
else
{
//有浮漂
line.Lure.SetJointDistance(floatLength);
line.Bobber.SetJointDistance(lineLength - floatLength);
if (stretchRope)
{
line.SetObiRopeStretch(Tension > 0f ? 0f : lineLength - floatLength);
}
}
}
} }
} }

16
Assets/Scripts/Test/CollisionTest.cs Normal file
View File

@@ -0,0 +1,16 @@
using UnityEngine;
namespace Test
{
public class CollisionTest : MonoBehaviour
{
private void OnCollisionEnter(Collision other)
{
Debug.Log($"OnCollisionEnter:{other.gameObject.name}");
}
private void OnCollisionExit(Collision other)
{
Debug.Log($"OnCollisionExit:{other.gameObject.name}");
}
}
}

3
Assets/Scripts/Test/CollisionTest.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: d5bfa3f53f894e7a87315e5cbc220e12
timeCreated: 1772767361

3
Assets/Scripts/UI/Chat.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 6169cecd85b9472e989a7ef14fc83964
timeCreated: 1772694660

52
Assets/Scripts/UI/Chat/ChatChannelType.cs Normal file
View File

@@ -0,0 +1,52 @@
using System;
namespace NBF
{
/// <summary>
/// 聊天频道类型
/// </summary>
[Flags]
public enum ChatChannelType
{
None = 0,
World = 1 << 1, // 世界频道
Private = 1 << 2, // 私聊频道
System = 1 << 3, // 系统频道
Broadcast = 1 << 4, // 广播频道
Notice = 1 << 5, // 公告频道
Team = 1 << 6, // 队伍频道
Near = 1 << 7, // 附近频道
CurrentMap = 1 << 8, // 当前地图频道
// 所有频道
All = World | Private | System | Broadcast | Notice | Team | Near,
// 其他聊天栏显示的频道
Display = World | Private | System | Broadcast | Notice | Team | Near | CurrentMap
}
/// <summary>
/// 聊天节点类型
/// </summary>
public enum ChatNodeType
{
None = 0,
Position = 1, // 位置节点
OpenUI = 2, // 打开UI节点
Link = 3, // 链接节点
Item = 4, // 物品节点
Text = 5, // 文本节点
Image = 6, // 图片节点
}
/// <summary>
/// 聊天节点事件类型
/// </summary>
public enum ChatNodeEvent
{
None = 0,
OpenUI = 1, // 打开UI节点
ClickLink = 2, // 点击链接节点
UseItem = 3, // 使用物品节点
Position = 4, // 位置节点
}
}

3
Assets/Scripts/UI/Chat/ChatChannelType.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 4ec94d1a6ab744c4bdcff56d8da8e6ea
timeCreated: 1772694755

16
Assets/Scripts/UI/Chat/ChatInfoTree.cs Normal file
View File

@@ -0,0 +1,16 @@
using System.Runtime.Serialization;
using LightProto;
using MongoDB.Bson.Serialization.Attributes;
using Newtonsoft.Json;
namespace Fantasy
{
public partial class ChatInfoTree
{
[BsonIgnore]
[JsonIgnore]
[ProtoIgnore]
[IgnoreDataMember]
public Scene Scene { get; set; }
}
}

3
Assets/Scripts/UI/Chat/ChatInfoTree.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 73e6060aebcd46eca52cd4086e193fb3
timeCreated: 1772694724

82
Assets/Scripts/UI/Chat/ChatNodeEventHelper.cs Normal file
View File

@@ -0,0 +1,82 @@
using System.Collections.Generic;
using Fantasy;
using Fantasy.Serialize;
namespace NBF
{
public static class ChatNodeEventHelper
{
public static void Handler(Scene scene, ChatInfoNode node)
{
switch ((ChatNodeEvent)node.ChatNodeEvent)
{
case ChatNodeEvent.ClickLink:
{
ClickLinkHandler(scene, node);
return;
}
case ChatNodeEvent.OpenUI:
{
OpenUIHandler(scene, node);
return;
}
case ChatNodeEvent.Position:
{
PositionHandler(scene, node);
return;
}
case ChatNodeEvent.UseItem:
{
UseItemHandler(scene, node);
return;
}
}
}
private static void ClickLinkHandler(Scene scene, ChatInfoNode node)
{
if (node.Data == null || node.Data.Length == 0)
{
return;
}
var chatLinkNode = SerializerManager.ProtoBufHelper.Deserialize<ChatLinkNode>(node.Data);
// var chatLinkNode = scene.GetComponent<SerializerComponent>().Deserialize<ChatLinkNode>(node.Data);
// 拿到这个之后，就可以为所欲为了。
// 根据自己的逻辑和UI设计，做出相应的处理。
Log.Debug($"ClickLinkHandler Link:{chatLinkNode.Link}");
}
private static void OpenUIHandler(Scene scene, ChatInfoNode node)
{
if (node.Data == null || node.Data.Length == 0)
{
return;
}
var chatOpenUINode = SerializerManager.ProtoBufHelper.Deserialize<ChatOpenUINode>(node.Data);
// 拿到这个之后，就可以为所欲为了。
// 根据自己的逻辑和UI设计，做出相应的处理。
Log.Debug($"OpenUIHandler UIName:{chatOpenUINode.UIName}");
}
private static void PositionHandler(Scene scene, ChatInfoNode node)
{
if (node.Data == null || node.Data.Length == 0)
{
return;
}
var chatPositionNode = SerializerManager.ProtoBufHelper.Deserialize<ChatPositionNode>(node.Data);
// 拿到这个之后，就可以为所欲为了。
// 根据自己的逻辑和UI设计，做出相应的处理。
Log.Debug(
$"PositionHandler MapName:{chatPositionNode.MapName} X:{chatPositionNode.PosX} Y:{chatPositionNode.PosY} Z:{chatPositionNode.PosZ}");
}
private static void UseItemHandler(Scene scene, ChatInfoNode node)
{
// TODO: Implement UseItemHandler
}
}
}

3
Assets/Scripts/UI/Chat/ChatNodeEventHelper.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 7bcf5d11cea04d86a8a9c5c3fce31ed8
timeCreated: 1772694878

130
Assets/Scripts/UI/Chat/ChatNodeFactory.cs Normal file
View File

@@ -0,0 +1,130 @@
using Fantasy;
using Fantasy.Network;
using Fantasy.Serialize;
namespace NBF
{
/// <summary>
/// 聊天信息节点
/// </summary>
public static class ChatNodeFactory
{
/// <summary>
/// 添加文本节点
/// </summary>
/// <param name="chatInfoTree"></param>
/// <param name="content"></param>
/// <returns></returns>
public static ChatInfoTree AddendTextNode(this ChatInfoTree chatInfoTree, string content)
{
var chatInfoNode = new ChatInfoNode()
{
ChatNodeType = (int)ChatNodeType.Text,
Content = content
};
chatInfoTree.Node.Add(chatInfoNode);
return chatInfoTree;
}
/// <summary>
/// 添加链接节点
/// </summary>
/// <param name="chatInfoTree"></param>
/// <param name="content"></param>
/// <param name="link"></param>
/// <returns></returns>
public static ChatInfoTree AddendLinkNode(this ChatInfoTree chatInfoTree, string content,string link)
{
var chatLinkNode = new ChatLinkNode()
{
Link = link
};
// var serializerComponent = chatInfoTree.Scene.GetComponent<SerializerComponent>();
var chatInfoNode = new ChatInfoNode()
{
ChatNodeType = (int)ChatNodeType.Link,
ChatNodeEvent = (int)ChatNodeEvent.ClickLink,
Content = content,
Data = SerializerManager.ProtoBufHelper.Serialize(chatLinkNode)
};
chatInfoTree.Node.Add(chatInfoNode);
return chatInfoTree;
}
/// <summary>
/// 添加图片节点
/// </summary>
/// <param name="chatInfoTree"></param>
/// <param name="content"></param>
/// <returns></returns>
public static ChatInfoTree AddendImageNode(this ChatInfoTree chatInfoTree, string content)
{
var chatInfoNode = new ChatInfoNode()
{
ChatNodeType = (int)ChatNodeType.Image,
Content = content
};
chatInfoTree.Node.Add(chatInfoNode);
return chatInfoTree;
}
/// <summary>
/// 添加打开UI节点
/// </summary>
/// <param name="chatInfoTree"></param>
/// <param name="content"></param>
/// <param name="uiName"></param>
/// <returns></returns>
public static ChatInfoTree AddendOpenUINode(this ChatInfoTree chatInfoTree, string content,string uiName)
{
var chatOpenUINode = new ChatOpenUINode()
{
UIName = uiName
};
var chatInfoNode = new ChatInfoNode()
{
ChatNodeType = (int)ChatNodeType.OpenUI,
ChatNodeEvent = (int)ChatNodeEvent.OpenUI,
Content = content,
Data = SerializerManager.ProtoBufHelper.Serialize(chatOpenUINode)
};
chatInfoTree.Node.Add(chatInfoNode);
return chatInfoTree;
}
/// <summary>
/// 添加位置节点
/// </summary>
/// <param name="chatInfoTree"></param>
/// <param name="content"></param>
/// <param name="mapName"></param>
/// <param name="mapX"></param>
/// <param name="mapY"></param>
/// <param name="mapZ"></param>
/// <returns></returns>
public static ChatInfoTree AddendPositionNode(this ChatInfoTree chatInfoTree, string content, string mapName,
float mapX, float mapY, float mapZ)
{
var chatPositionNode = new ChatPositionNode()
{
MapName = mapName,
PosX = mapX,
PosY = mapY,
PosZ = mapZ,
};
// var serializerComponent = chatInfoTree.Scene.GetComponent<SerializerComponent>();
var chatInfoNode = new ChatInfoNode()
{
ChatNodeType = (int)ChatNodeType.Position,
ChatNodeEvent = (int)ChatNodeEvent.Position,
Content = content,
Data = SerializerManager.ProtoBufHelper.Serialize(chatPositionNode)
};
chatInfoTree.Node.Add(chatInfoNode);
return chatInfoTree;
}
}
}

3
Assets/Scripts/UI/Chat/ChatNodeFactory.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: bbf26a0aef9841f89db6182475f50e59
timeCreated: 1772694930

10
Assets/Scripts/UI/ChatTestPanel.Designer.cs → Assets/Scripts/UI/Chat/ChatTestPanel.Designer.cs generated
View File

@@ -16,14 +16,6 @@ namespace NBF
[AutoFind(Name = "back")] [AutoFind(Name = "back")]
public GImage back; public GImage back;
[AutoFind(Name = "TextLoginInfo")]
public GTextField TextLoginInfo;
[AutoFind(Name = "InputAccount")]
public GLabel InputAccount;
[AutoFind(Name = "BtnLogout")]
public GButton BtnLogout;
[AutoFind(Name = "BtnLogin")]
public GButton BtnLogin;
[AutoFind(Name = "InputMessage")] [AutoFind(Name = "InputMessage")]
public GLabel InputMessage; public GLabel InputMessage;
[AutoFind(Name = "BtnSendMessage")] [AutoFind(Name = "BtnSendMessage")]
@@ -34,6 +26,8 @@ namespace NBF
public GButton BtnSendWorld; public GButton BtnSendWorld;
[AutoFind(Name = "ChatList")] [AutoFind(Name = "ChatList")]
public GList ChatList; public GList ChatList;
[AutoFind(Name = "InputFriendId")]
public GLabel InputFriendId;
public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; } public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; }
public static void Show(object param = null){ UI.Inst.OpenUI<ChatTestPanel>(param); } public static void Show(object param = null){ UI.Inst.OpenUI<ChatTestPanel>(param); }

0
Assets/Scripts/UI/ChatTestPanel.Designer.cs.meta → Assets/Scripts/UI/Chat/ChatTestPanel.Designer.cs.meta
View File

115
Assets/Scripts/UI/Chat/ChatTestPanel.cs Normal file
View File

@@ -0,0 +1,115 @@
// 本脚本只在不存在时会生成一次。已存在不会再次生成覆盖
using System;
using System.Collections.Generic;
using System.Text;
using FairyGUI;
using Fantasy;
using Fantasy.Async;
using Fantasy.Network;
using NBC;
using UnityEngine;
using Log = NBC.Log;
using UIPanel = NBC.UIPanel;
namespace NBF
{
public partial class ChatTestPanel : UIPanel
{
private List<string> _messages = new List<string>();
protected override void OnInit()
{
this.AutoAddClick(OnClick);
}
protected override void OnShow()
{
}
private void RefreshList()
{
ChatList.RemoveChildrenToPool();
foreach (var item in _messages)
{
if (ChatList.AddItemFromPool() is ChatItem chatItem)
{
chatItem.InitData(item);
}
}
}
private void OnClick(GComponent btn)
{
if (btn == BtnSendWorld)
{
OnSendMessage(InputMessage.title).Coroutine();
}
else if (btn == BtnSendFriend)
{
OnSendFriendMessage().Coroutine();
}
}
#region 发生消息测试
private async FTask OnSendMessage(string message)
{
var tree = ChatTreeFactory.Broadcast(Game.Main);
tree = tree.AddendPositionNode(message, "勇者大陆", 121, 131, 111);
var response = (Chat2C_SendMessageResponse)await Net.Call(new C2Chat_SendMessageRequest()
{
ChatInfoTree = tree
});
if (response.ErrorCode != 0)
{
Log.Error($"发送聊天消息失败 ErrorCode:{response.ErrorCode}");
}
else
{
Log.Info("发送消息成功");
}
}
private async FTask OnSendFriendMessage()
{
var tree = ChatTreeFactory.Private();
tree.Target.Add(Convert.ToInt64(InputFriendId.text));
tree.AddendTextNode("你好，欢迎来到Fantasy Chat！")
.AddendLinkNode("点击这里http://www.fantasy.com.cn", "http://www.fantasy.com.cn");
var response = (Chat2C_SendMessageResponse)await Net.Call(new C2Chat_SendMessageRequest()
{
ChatInfoTree = tree
});
if (response.ErrorCode != 0)
{
Log.Error($"发送私聊消息失败 ErrorCode:{response.ErrorCode}");
}
}
public void Message(ChatInfoTree tree)
{
// _messages.Add(message);
var sb = new StringBuilder();
foreach (var chatInfoNode in tree.Node)
{
// 这里只是演示一下处理事件的效果，实际使用时，需要根据实际情况处理事件
// 明显我现在这样做的方式不是对的，应该是自己拼接一个聊天信息，然后调用这个接口来处理事件
// entryComponent.Entry.ChatNodeEventButton.onClick.RemoveAllListeners();
// entryComponent.Entry.ChatNodeEventButton.onClick.AddListener(() =>
// {
// ChatNodeEventHelper.Handler(scene, chatInfoNode);
// });
sb.Append(chatInfoNode.Content);
}
_messages.Add(sb.ToString());
RefreshList();
}
#endregion
}
}

0
Assets/Scripts/UI/ChatTestPanel.cs.meta → Assets/Scripts/UI/Chat/ChatTestPanel.cs.meta
View File

121
Assets/Scripts/UI/Chat/ChatTreeFactory.cs Normal file
View File

@@ -0,0 +1,121 @@
using Fantasy;
namespace NBF
{
/// <summary>
/// 创建聊天树的总入口
/// </summary>
public static class ChatTreeFactory
{
/// <summary>
/// 创建世界聊天树
/// </summary>
/// <param name="scene"></param>
/// <returns></returns>
public static ChatInfoTree World()
{
return new ChatInfoTree()
{
Scene = Game.Main,
ChatChannelType = (int)ChatChannelType.World,
};
}
/// <summary>
/// 创建私聊聊天树
/// </summary>
/// <returns></returns>
public static ChatInfoTree Private()
{
return new ChatInfoTree()
{
Scene = Game.Main,
ChatChannelType = (int)ChatChannelType.Private,
};
}
/// <summary>
/// 创建系统聊天树
/// </summary>
/// <param name="scene"></param>
/// <returns></returns>
public static ChatInfoTree System(Scene scene)
{
return new ChatInfoTree()
{
Scene = scene,
ChatChannelType = (int)ChatChannelType.System,
};
}
/// <summary>
/// 创建公广播聊天树
/// </summary>
/// <param name="scene"></param>
/// <returns></returns>
public static ChatInfoTree Broadcast(Scene scene)
{
return new ChatInfoTree()
{
Scene = scene,
ChatChannelType = (int)ChatChannelType.Broadcast,
};
}
/// <summary>
/// 创建公告聊天树
/// </summary>
/// <param name="scene"></param>
/// <returns></returns>
public static ChatInfoTree Notice(Scene scene)
{
return new ChatInfoTree()
{
Scene = scene,
ChatChannelType = (int)ChatChannelType.Notice,
};
}
/// <summary>
/// 创建队伍聊天树
/// </summary>
/// <param name="scene"></param>
/// <returns></returns>
public static ChatInfoTree Team(Scene scene)
{
return new ChatInfoTree()
{
Scene = scene,
ChatChannelType = (int)ChatChannelType.Team,
};
}
/// <summary>
/// 创建附近人聊天树
/// </summary>
/// <param name="scene"></param>
/// <returns></returns>
public static ChatInfoTree Near(Scene scene)
{
return new ChatInfoTree()
{
Scene = scene,
ChatChannelType = (int)ChatChannelType.Near,
};
}
/// <summary>
/// 创建当前地图聊天树
/// </summary>
/// <param name="scene"></param>
/// <returns></returns>
public static ChatInfoTree CurrentMap(Scene scene)
{
return new ChatInfoTree()
{
Scene = scene,
ChatChannelType = (int)ChatChannelType.CurrentMap,
};
}
}
}

3
Assets/Scripts/UI/Chat/ChatTreeFactory.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: f028a29029d74cbf8c264a7d4a245ecf
timeCreated: 1772694684

179
Assets/Scripts/UI/ChatTestPanel.cs
View File

@@ -1,179 +0,0 @@
// 本脚本只在不存在时会生成一次。已存在不会再次生成覆盖
using System.Collections.Generic;
using FairyGUI;
using Fantasy;
using Fantasy.Async;
using Fantasy.Network;
using NBC;
using UnityEngine;
using Log = NBC.Log;
using UIPanel = NBC.UIPanel;
namespace NBF
{
public partial class ChatTestPanel : UIPanel
{
private List<string> _messages = new List<string>();
protected override void OnInit()
{
this.AutoAddClick(OnClick);
}
protected override void OnShow()
{
SetLoginState(false);
}
private void RefreshList()
{
ChatList.RemoveChildrenToPool();
foreach (var item in _messages)
{
if(ChatList.AddItemFromPool() is ChatItem chatItem)
{
chatItem.InitData(item);
}
}
}
private void OnClick(GComponent btn)
{
if (btn == BtnLogin)
{
if (string.IsNullOrEmpty(InputAccount.text))
{
Notices.Info("没有输入账号密码");
return;
}
OnLoginButtonClick(InputAccount.text).Coroutine();
}
else if (btn == BtnSendWorld)
{
OnSendMessage(InputMessage.title).Coroutine();
}
}
private void SetLoginState(bool isLogin = false, string account = "")
{
if (isLogin)
{
BtnLogin.visible = false;
BtnLogout.visible = true;
TextLoginInfo.text = account;
}
else
{
BtnLogin.visible = true;
BtnLogout.visible = false;
}
}
#region 登录测试
private Session _session;
private async FTask OnLoginButtonClick(string account)
{
// NBC.Platform.Unity.Entry.Initialize(GetType().Assembly);
// 根据用户名来选择目标的鉴权服务器
// 根据鉴权服务器地址来创建一个新的网络会话
_session = SessionHelper.CreateSession(Game.Main, "127.0.0.1:20001", OnConnectComplete,
OnConnectFail,
OnConnectDisconnect);
var acc = account;
// 发送登录的请求给服务器
var response = (A2C_LoginResponse)await _session.Call(new C2A_LoginRequest()
{
Username = acc,
Password = acc,
LoginType = 1
});
if (response.ErrorCode != 0)
{
Log.Error($"登录发生错误{response.ErrorCode}");
return;
}
if (!Game.Main.GetComponent<JWTParseComponent>().Parse(response.ToKen, out var payload))
{
return;
}
// 根据ToKen返回的Address登录到Gate服务器
_session = SessionHelper.CreateSession(Game.Main, payload.Address, OnConnectComplete, OnConnectFail,
OnConnectDisconnect);
// 发送登录请求到Gate服务器
var loginResponse = (G2C_LoginResponse)await _session.Call(new C2G_LoginRequest()
{
ToKen = response.ToKen
});
if (loginResponse.ErrorCode != 0)
{
Log.Error($"登录发生错误{loginResponse.ErrorCode}");
return;
}
SetLoginState(true, InputAccount.text);
Log.Info(
$"登录到Gate服务器成功！ErrorCode:{loginResponse.ErrorCode}");
// Log.Debug(
// $"登录到Gate服务器成功！LoginTime:{loginResponse.GameAccountInfo.LoginTime} CreateTime:{loginResponse.GameAccountInfo.CreateTime}");
// var getResponse = (G2C_GetAccountInfoResponse)await _session.Call(new C2G_GetAccountInfoRequest());
// var gameAcc = getResponse.GameAccountInfo;
// Log.Info($"gameAcc LoginTime:{gameAcc.LoginTime} CreateTime:{gameAcc.CreateTime}");
// getResponse.GameAccountInfo.LoginTime.ToString()
}
private void OnConnectComplete()
{
Log.Info("连接成功");
// 添加心跳组件给Session。
// Start(2000)就是2000毫秒。
_session.AddComponent<SessionHeartbeatComponent>().Start(5000);
}
private void OnConnectFail()
{
Log.Info("连接失败");
SetLoginState(false);
}
private void OnConnectDisconnect()
{
Log.Info("连接断开");
SetLoginState(false);
}
#endregion
#region 发生消息测试
private async FTask OnSendMessage(string message)
{
var messageResponse = (S2C_SendMessageResponse)await _session.Call(new C2S_SendMessageRequest()
{
Message = message
});
if (messageResponse.ErrorCode != 0)
{
Notices.Info($"发送消息失败，code={messageResponse.ErrorCode}");
}
}
public void Message(string message)
{
_messages.Add(message);
RefreshList();
}
#endregion
}
}

4
Assets/Scripts/UI/Login/LoginPanel.cs
View File

@@ -32,7 +32,9 @@ namespace NBF
{ {
await LoginHelper.Login(InputAccount.text); await LoginHelper.Login(InputAccount.text);
await Fishing.Instance.Go(RoleModel.Instance.Info.MapId); // await Fishing.Instance.Go(RoleModel.Instance.Info.MapId);
ChatTestPanel.Show();
// FishingShopPanel.Show(); // FishingShopPanel.Show();

11
FGUIProject/assets/Main/Chat/ChatTestPanel.xml
View File

@@ -4,16 +4,6 @@
<image id="n0_n5ne" name="back" src="kryob" fileName="Images/Square.png" pkg="xo76q8wz" xy="0,0" size="1920,1080" color="#182128"> <image id="n0_n5ne" name="back" src="kryob" fileName="Images/Square.png" pkg="xo76q8wz" xy="0,0" size="1920,1080" color="#182128">
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</image> </image>
<text id="n5_n5ne" name="TextLoginInfo" xy="16,17" size="97,42" fontSize="30" color="#ffffff" text="Login:"/>
<component id="n1_n5ne" name="InputAccount" src="sqnke" fileName="Com/Inputs/InputDef.xml" pkg="6hgkvlau" xy="17,75">
<Label title="test003"/>
</component>
<component id="n4_n5ne" name="BtnLogout" src="sqnkf" fileName="Com/Buttons/ButtonDef.xml" pkg="6hgkvlau" xy="200,77" visible="false">
<Button title="退出"/>
</component>
<component id="n2_n5ne" name="BtnLogin" src="sqnkf" fileName="Com/Buttons/ButtonDef.xml" pkg="6hgkvlau" xy="200,77">
<Button title="登录"/>
</component>
<component id="n3_n5ne" name="InputMessage" src="sqnke" fileName="Com/Inputs/InputDef.xml" pkg="6hgkvlau" xy="347,791" size="1226,57"/> <component id="n3_n5ne" name="InputMessage" src="sqnke" fileName="Com/Inputs/InputDef.xml" pkg="6hgkvlau" xy="347,791" size="1226,57"/>
<component id="n6_n5ne" name="BtnSendMessage" src="sqnkf" fileName="Com/Buttons/ButtonDef.xml" pkg="6hgkvlau" xy="435,863" size="244,56"> <component id="n6_n5ne" name="BtnSendMessage" src="sqnkf" fileName="Com/Buttons/ButtonDef.xml" pkg="6hgkvlau" xy="435,863" size="244,56">
<Button title="发送普通聊天"/> <Button title="发送普通聊天"/>
@@ -43,5 +33,6 @@
<item/> <item/>
<item/> <item/>
</list> </list>
<component id="n12_f0dt" name="InputFriendId" src="sqnke" fileName="Com/Inputs/InputDef.xml" pkg="6hgkvlau" xy="865,943" size="196,57"/>
</displayList> </displayList>
</component> </component>

1
Fishing2.sln.DotSettings.user
View File

@@ -89,6 +89,7 @@
&lt;Assembly Path="D:\myself\Games\Fishing2\Assets\Scripts\NBC\Runtime\Plugins\Other\System.IO.Pipelines.dll" /&gt;&#xD; &lt;Assembly Path="D:\myself\Games\Fishing2\Assets\Scripts\NBC\Runtime\Plugins\Other\System.IO.Pipelines.dll" /&gt;&#xD;
&lt;Assembly Path="D:\work\Fishing2\Library\ScriptAssemblies\Fantasy.Unity.dll" /&gt;&#xD; &lt;Assembly Path="D:\work\Fishing2\Library\ScriptAssemblies\Fantasy.Unity.dll" /&gt;&#xD;
&lt;Assembly Path="D:\myself\Games\Fishing2\Library\ScriptAssemblies\Fantasy.Unity.dll" /&gt;&#xD; &lt;Assembly Path="D:\myself\Games\Fishing2\Library\ScriptAssemblies\Fantasy.Unity.dll" /&gt;&#xD;
&lt;Assembly Path="D:\myself\Fishing2\Library\ScriptAssemblies\Luban.Runtime.dll" /&gt;&#xD;
&lt;/AssemblyExplorer&gt;</s:String> &lt;/AssemblyExplorer&gt;</s:String>

24
UserSettings/EditorUserSettings.asset
View File

@@ -9,32 +9,32 @@ EditorUserSettings:
value: 18134705175a055722080a3115371d4a0d55006876786860616b0471b8b07a68ffab74f9ee2a3a30300cea1a11320d0beb1a0c25f7060f494b4cc80018eb09361fc211cb1f862d19c51d19dcc413d6ade0d8ddfcddf9f4d9d29195fcfde6ebeae6f0a9c9afa6f8c5b89ff7a1aacececac4eba4d7c9d28bda value: 18134705175a055722080a3115371d4a0d55006876786860616b0471b8b07a68ffab74f9ee2a3a30300cea1a11320d0beb1a0c25f7060f494b4cc80018eb09361fc211cb1f862d19c51d19dcc413d6ade0d8ddfcddf9f4d9d29195fcfde6ebeae6f0a9c9afa6f8c5b89ff7a1aacececac4eba4d7c9d28bda
flags: 0 flags: 0
RecentlyUsedSceneGuid-0: RecentlyUsedSceneGuid-0:
value: 01085257040c5f0e0c0d5f27457b0f444e4e192c7b2d7e6428794d67e3b36668
flags: 0
RecentlyUsedSceneGuid-1:
value: 52530c5601535f020f565a2043770d1612154d2f747975692c7b4e66b5e3303b
flags: 0
RecentlyUsedSceneGuid-2:
value: 5302035e5c530f0b5c0c557416270d44134e4d28787c76332f7e1f6bb1b76169 value: 5302035e5c530f0b5c0c557416270d44134e4d28787c76332f7e1f6bb1b76169
flags: 0 flags: 0
RecentlyUsedSceneGuid-3: RecentlyUsedSceneGuid-1:
value: 5050570401015d0a545d087047710e44154e1c2e7f787368782c4e60e1e1636b value: 5050570401015d0a545d087047710e44154e1c2e7f787368782c4e60e1e1636b
flags: 0 flags: 0
RecentlyUsedSceneGuid-4: RecentlyUsedSceneGuid-2:
value: 520004535d5751085c595a7047730e4440161e7d787022342f2d486bb4b6626a value: 520004535d5751085c595a7047730e4440161e7d787022342f2d486bb4b6626a
flags: 0 flags: 0
RecentlyUsedSceneGuid-5: RecentlyUsedSceneGuid-3:
value: 5a035755520650595b5b5f2345740e4447154a73742d70632b7d4b65e4e66d69 value: 5a035755520650595b5b5f2345740e4447154a73742d70632b7d4b65e4e66d69
flags: 0 flags: 0
RecentlyUsedSceneGuid-6: RecentlyUsedSceneGuid-4:
value: 0508070250545c58585e0924437b5d444f4e4b7f7d7a71627f794c64b2e5633a value: 0508070250545c58585e0924437b5d444f4e4b7f7d7a71627f794c64b2e5633a
flags: 0 flags: 0
RecentlyUsedSceneGuid-7: RecentlyUsedSceneGuid-5:
value: 5409030052070d0d095a5c7412745e444216417c2e7a23642b7e1832bab9363e value: 5409030052070d0d095a5c7412745e444216417c2e7a23642b7e1832bab9363e
flags: 0 flags: 0
RecentlyUsedSceneGuid-8: RecentlyUsedSceneGuid-6:
value: 5606515f5605500b0e5c5c2615760a444615487c2a2a2467297d1932b7e4673a value: 5606515f5605500b0e5c5c2615760a444615487c2a2a2467297d1932b7e4673a
flags: 0 flags: 0
RecentlyUsedSceneGuid-7:
value: 5505015f5c515a085f5b092149760f441716407a787d7564287b1b36e7e1366e
flags: 0
RecentlyUsedSceneGuid-8:
value: 5309035757065a0a54575f7216265c4444151d28792e72627d2f1935bbb8673a
flags: 0
RecentlyUsedSceneGuid-9: RecentlyUsedSceneGuid-9:
value: 0054045155060d5a5c575f7045270d44474f4e7c7f7924637e2a1832b1b5636d value: 0054045155060d5a5c575f7045270d44474f4e7c7f7924637e2a1832b1b5636d
flags: 0 flags: 0