diff --git a/Assets/JsonIOTools/Example.meta b/Assets/JsonIOTools/Example.meta new file mode 100644 index 0000000..4549cd5 --- /dev/null +++ b/Assets/JsonIOTools/Example.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 339b56716ac10a04d9b56a66e5f9d07d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JsonIOTools/Example/JsonIO.unity b/Assets/JsonIOTools/Example/JsonIO.unity new file mode 100644 index 0000000..17d59a4 --- /dev/null +++ b/Assets/JsonIOTools/Example/JsonIO.unity @@ -0,0 +1,341 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &383753681 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 383753684} + - component: {fileID: 383753683} + - component: {fileID: 383753682} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &383753682 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 383753681} + m_Enabled: 1 +--- !u!20 &383753683 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 383753681} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &383753684 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 383753681} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1249235166 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1249235168} + - component: {fileID: 1249235167} + m_Layer: 0 + m_Name: Script + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1249235167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1249235166} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36f4bcfff9c0718469bbef7584bf05f9, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1249235168 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1249235166} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2108835071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2108835073} + - component: {fileID: 2108835072} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &2108835072 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2108835071} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &2108835073 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2108835071} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} diff --git a/Assets/JsonIOTools/Example/JsonIO.unity.meta b/Assets/JsonIOTools/Example/JsonIO.unity.meta new file mode 100644 index 0000000..8121022 --- /dev/null +++ b/Assets/JsonIOTools/Example/JsonIO.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8277d3ecf8383be429b79b453937e818 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JsonIOTools/Example/Script.meta b/Assets/JsonIOTools/Example/Script.meta new file mode 100644 index 0000000..cc34fb4 --- /dev/null +++ b/Assets/JsonIOTools/Example/Script.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca6a524def5f09549b607ccfcb8a21ee +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JsonIOTools/Example/Script/JsonIOExample.cs b/Assets/JsonIOTools/Example/Script/JsonIOExample.cs new file mode 100644 index 0000000..128a7ca --- /dev/null +++ b/Assets/JsonIOTools/Example/Script/JsonIOExample.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using JXSoft; + +public class JsonIOExample : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + JsonIOUtility jsonData = new JsonIOUtility(); + jsonData.setData(new MyItemData(1,"破碎的宝剑")); + jsonData.SaveToJsonFile(); + } + + // Update is called once per frame + void Update() + { + + } +} + +public class MyItemData { + public int itemId; + public string itemName; + public MyItemData(int itemId,string itemName) { + this.itemId = itemId; + this.itemName = itemName; + } +} diff --git a/Assets/JsonIOTools/Example/Script/JsonIOExample.cs.meta b/Assets/JsonIOTools/Example/Script/JsonIOExample.cs.meta new file mode 100644 index 0000000..a2c1ab0 --- /dev/null +++ b/Assets/JsonIOTools/Example/Script/JsonIOExample.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 36f4bcfff9c0718469bbef7584bf05f9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JsonIOTools/JsonIOEditor.cs b/Assets/JsonIOTools/JsonIOEditor.cs new file mode 100644 index 0000000..93a582d --- /dev/null +++ b/Assets/JsonIOTools/JsonIOEditor.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; + +public class JsonIOEditor : EditorWindow +{ + public TextAsset JsonSaved; + + [MenuItem("JXSoft/JsonIOTools/JsonLoader")] + static void Init() + { + var window = GetWindow(); + window.Show(); + } + + void OnGUI() + { + JsonSaved = (TextAsset)EditorGUILayout.ObjectField("SaveData", JsonSaved,typeof(TextAsset), true); + } +} diff --git a/Assets/JsonIOTools/JsonIOEditor.cs.meta b/Assets/JsonIOTools/JsonIOEditor.cs.meta new file mode 100644 index 0000000..509c6dc --- /dev/null +++ b/Assets/JsonIOTools/JsonIOEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8f56669610d9adf45b3002e5db24ff7c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JsonIOTools/JsonIOUtility.cs b/Assets/JsonIOTools/JsonIOUtility.cs index 7a99d20..2425f66 100644 --- a/Assets/JsonIOTools/JsonIOUtility.cs +++ b/Assets/JsonIOTools/JsonIOUtility.cs @@ -8,6 +8,8 @@ using System.Linq; using LitJson; using System.Text; + + namespace JXSoft { public class JsonIOUtility { diff --git a/Assets/TCPClient/Script/Source/DataEventModel.cs b/Assets/TCPClient/Script/Source/DataEventModel.cs new file mode 100644 index 0000000..7de187c --- /dev/null +++ b/Assets/TCPClient/Script/Source/DataEventModel.cs @@ -0,0 +1,180 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using QFramework; +using UnityEngine; +using UnityEngine.Events; + +namespace TCPClientTools { + + //任何通讯类围绕DataEventModel进行 + public abstract class DataEventModel : AbstractModel, ICanSendCommand, ICanRegisterEvent + { + public IOCContainer mCommandContainer = new IOCContainer(); + public UnityStringEvent onDataRecived = new UnityStringEvent(); + + public void sendResponseCommand(string json) where T : IResponse, new() + { + if (mCommandContainer.Get>() == null) + { + mCommandContainer.Register(new ExcuteResponseCommand(new T())); + } + mCommandContainer.Get>().setJson(json); + this.SendCommand(mCommandContainer.Get>()); + } + /// + /// 开启接收指定数据 + /// + /// 数据格式类型 + public void onReceive() where T : IResponse, new() + { + onDataRecived.AddListener(sendResponseCommand); + } + /// + /// 关闭接收指定数据 + /// + /// 数据格式类型 + public void offReceive() where T : IResponse, new() + { + onDataRecived.RemoveListener(sendResponseCommand); + } + /// + /// 发送数据 + /// + /// 数据类型 + /// 请求数据 + public void sendRequestCommand(T request) where T : IRequest + { + if (mCommandContainer.Get>() == null) + { + mCommandContainer.Register(new SendRequestCommand(request)); + } + mCommandContainer.Get>().setRequest(request); + this.SendCommand(mCommandContainer.Get>()); + } + } + + #region Command + /// + /// 处理响应数据，添加对应的Command进行处理，需要提前生成命令池 + /// + /// 响应数据格式 + public class ExcuteResponseCommand : AbstractCommand where TResponse : IResponse + { + public string json; + private TResponse response; + public ExcuteResponseCommand(TResponse response) + { + if (this.response == null) + { + this.response = response; + } + } + protected override void OnExecute() + { + bool isSet = response.trySetData(json); + if (isSet) + { + Debug.Log("Received:" + response.toJson() + response.GetType()); + this.SendEvent(new ResponseMsgEvent(response)); + } + } + public void setJson(string json) + { + this.json = json; + } + } + + public class SendRequestCommand : AbstractCommand where TRequest : IRequest + { + public TRequest request; + public SendRequestCommand(TRequest request) + { + this.request = request; + } + protected override void OnExecute() + { + if (this.GetUtility().isOpenTCP) + { + this.GetUtility().sendData(request.toJson()); + } + else + { + Debug.LogWarning("请先开启TCP链接"); + } + //throw new NotImplementedException(); + } + public void setRequest(TRequest request) + { + this.request = request; + } + } + #endregion + + #region interface + public interface IResponse + { + string toJson(); + /// + /// 尝试填充数据，如果json不合法，则返回false，忽略该条数据响应 + /// + /// + /// + bool trySetData(string json); + string getException(); + } + + public interface IRequest + { + string toJson(); + } + #endregion + + #region AbstractClass + /// + /// 使用抽象类时，必须满足可序列化 + /// + [Serializable] + public abstract class AbstractResponse : IResponse + { + private string exceptionMsg; + public virtual string toJson() + { + return JsonUtility.ToJson(this, true); + } + public virtual bool trySetData(string json) + { + try + { + JsonUtility.FromJsonOverwrite(json, this); + return true; + } + catch (Exception e) + { + exceptionMsg = e.ToString(); + return false; + } + } + public string getException() + { + return exceptionMsg; + } + } + #endregion + + #region event + public struct ResponseMsgEvent + { + public IResponse res; + public ResponseMsgEvent(IResponse res_) + { + res = res_; + } + }; + #endregion + [Serializable] + public class UnityStringEvent : UnityEvent + { + + } +} diff --git a/Assets/TCPClient/Script/Source/DataEventModel.cs.meta b/Assets/TCPClient/Script/Source/DataEventModel.cs.meta new file mode 100644 index 0000000..5ecba10 --- /dev/null +++ b/Assets/TCPClient/Script/Source/DataEventModel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 62ce113bad8cc704dbefad76b9fb09ad +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TCPClient/Script/Source/Interface.meta b/Assets/TCPClient/Script/Source/Interface.meta new file mode 100644 index 0000000..9be28cd --- /dev/null +++ b/Assets/TCPClient/Script/Source/Interface.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 101c42156fd689742b9050456e2ab289 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TCPClient/Script/Source/TCPEventModel.cs b/Assets/TCPClient/Script/Source/TCPEventModel.cs index 49adb5c..09f6528 100644 --- a/Assets/TCPClient/Script/Source/TCPEventModel.cs +++ b/Assets/TCPClient/Script/Source/TCPEventModel.cs @@ -15,16 +15,14 @@ namespace TCPClientTools this.RegisterModel(new TCPEventModel()); } } + //统筹管理TCP的命令池以及相关链接信息 - public class TCPEventModel : AbstractModel, ICanSendCommand,ICanRegisterEvent + public class TCPEventModel : DataEventModel, ICanSendCommand,ICanRegisterEvent { - public IOCContainer mCommandContainer = new IOCContainer(); - public UnityStringEvent onTCPRecived = new UnityStringEvent(); private TCPLinkState tcpState = TCPLinkState.NoIp; private string tcpAddress = ""; private int tcpPort = 0; public string myAddress = ""; - protected override void OnInit() { myAddress = this.GetUtility().GetIP(); @@ -33,46 +31,6 @@ namespace TCPClientTools this.GetUtility().CloseTCPClient(); }); } - - public void sendResponseCommand(string json) where T : ITCPResponse,new() { - if (mCommandContainer.Get>()==null) { - mCommandContainer.Register(new ExcuteResponseCommand(new T())); - } - mCommandContainer.Get>().setJson(json); - this.SendCommand(mCommandContainer.Get>()); - } - /// - /// 开启接收指定数据 - /// - /// 数据格式类型 - public void onReceive() where T : ITCPResponse, new() - { - onTCPRecived.AddListener(sendResponseCommand); - } - /// - /// 关闭接收指定数据 - /// - /// 数据格式类型 - public void offReceive() where T : ITCPResponse, new() - { - onTCPRecived.RemoveListener(sendResponseCommand); - } - - /// - /// 发送数据 - /// - /// 数据类型 - /// 请求数据 - public void sendRequestCommand(T request)where T : ITCPRequest - { - if (mCommandContainer.Get>() == null) { - mCommandContainer.Register(new SendRequestCommand(request)); - } - mCommandContainer.Get>().setRequest(request); - this.SendCommand(mCommandContainer.Get>()); - } - - public void setTCPState(TCPLinkState state) { this.tcpState = state; this.SendEvent(new TCPStateChangedEvent(state)); @@ -80,7 +38,6 @@ namespace TCPClientTools public TCPLinkState getState() { return this.tcpState; } - /// /// 设置对应IP，设置完毕后，自动进入链接状态（此时需要用户手动监听是否要进行链接服务器） /// @@ -93,7 +50,6 @@ namespace TCPClientTools Debug.LogWarning("此处未进行ip以及端口号校验，日后有需求可以增加"); setTCPState(TCPLinkState.Linking); } - /// /// 与服务端建立链接 /// @@ -113,7 +69,6 @@ namespace TCPClientTools } } } - /// /// 与服务端断开链接 /// @@ -131,112 +86,6 @@ namespace TCPClientTools } } - #region Command - /// - /// 处理响应数据，添加对应的Command进行处理，需要提前生成命令池 - /// - /// 响应数据格式 - public class ExcuteResponseCommand : AbstractCommand where TResponse : ITCPResponse - { - public string json; - private TResponse response; - public ExcuteResponseCommand(TResponse response) - { - if (this.response == null) - { - this.response = response; - } - } - protected override void OnExecute() - { - bool isSet = response.trySetData(json); - if (isSet) - { - Debug.Log("Received:" + response.toJson() + response.GetType()); - this.SendEvent(new ResponseMsgEvent(response)); - } - } - public void setJson(string json) - { - this.json = json; - } - } - - public class SendRequestCommand : AbstractCommand where TRequest : ITCPRequest - { - public TRequest request; - public SendRequestCommand(TRequest request) - { - this.request = request; - } - protected override void OnExecute() - { - if (this.GetUtility().isOpenTCP) - { - this.GetUtility().sendData(request.toJson()); - } - else - { - Debug.LogWarning("请先开启TCP链接"); - } - //throw new NotImplementedException(); - } - public void setRequest(TRequest request) - { - this.request = request; - } - } - #endregion - - #region interface - public interface ITCPResponse - { - string toJson(); - /// - /// 尝试填充数据，如果json不合法，则返回false，忽略该条数据响应 - /// - /// - /// - bool trySetData(string json); - string getException(); - } - - public interface ITCPRequest - { - string toJson(); - } - #endregion - - #region AbstractClass - /// - /// 使用抽象类时，必须满足可序列化 - /// - [Serializable] - public abstract class AbstractTCPResponse:ITCPResponse - { - private string exceptionMsg; - public virtual string toJson() - { - return JsonUtility.ToJson(this,true); - } - public virtual bool trySetData(string json) - { - try { - JsonUtility.FromJsonOverwrite(json, this); - return true; - } - catch (Exception e) { - exceptionMsg = e.ToString(); - return false; - } - } - public string getException() - { - return exceptionMsg; - } - } - #endregion - #region enum public enum TCPLinkState { @@ -249,14 +98,6 @@ namespace TCPClientTools #endregion #region event - public struct ResponseMsgEvent - { - public ITCPResponse res; - public ResponseMsgEvent(ITCPResponse res_) - { - res = res_; - } - }; public struct TCPStateChangedEvent { public TCPLinkState state; @@ -274,10 +115,4 @@ namespace TCPClientTools } } #endregion - - [Serializable] - public class UnityStringEvent : UnityEvent - { - - } } \ No newline at end of file diff --git a/Assets/TCPClient/Script/Source/TCPUtility.cs b/Assets/TCPClient/Script/Source/TCPUtility.cs index 7bffb4b..cd1305a 100644 --- a/Assets/TCPClient/Script/Source/TCPUtility.cs +++ b/Assets/TCPClient/Script/Source/TCPUtility.cs @@ -180,4 +180,5 @@ namespace TCPClientTools } } + } diff --git a/Assets/TCPClient/Script/View/TCPClientView.cs b/Assets/TCPClient/Script/View/TCPClientView.cs index 29824c0..c976951 100644 --- a/Assets/TCPClient/Script/View/TCPClientView.cs +++ b/Assets/TCPClient/Script/View/TCPClientView.cs @@ -26,7 +26,7 @@ public class TCPClientView : MonoBehaviour,IController,ICanSendEvent public void initTCPService() { tcpAddress = "127.0.0.1"; - tcpPort = 9999; + tcpPort = 20000; deviceId = 1; GetArchitecture().RegisterEvent(e => { @@ -77,7 +77,7 @@ public class TCPClientView : MonoBehaviour,IController,ICanSendEvent return TCPMangerArchitecture.Interface; } } -public class LinkSuccessResponse : AbstractTCPResponse +public class LinkSuccessResponse : AbstractResponse { public string code; public string data; @@ -89,7 +89,7 @@ public class LinkSuccessResponse : AbstractTCPResponse } } -public class LinkTCPRequest :ITCPRequest{ +public class LinkTCPRequest :IRequest{ public string id; public int type; public LinkTCPRequest(int id) { diff --git a/Assets/TCPClient/Script/View/TCPPrinter.cs b/Assets/TCPClient/Script/View/TCPPrinter.cs index 3b3ff44..b391469 100644 --- a/Assets/TCPClient/Script/View/TCPPrinter.cs +++ b/Assets/TCPClient/Script/View/TCPPrinter.cs @@ -26,7 +26,7 @@ namespace TCPClientTools if (tcpUtil != null && !"".Equals(tcpUtil.getReceivedValue())) { GameObject item = Instantiate(tcpMsgItem, tcpMsgContent); item.GetComponentInChildren().text = tcpUtil.receivedData.Value; - this.GetModel().onTCPRecived.Invoke(tcpUtil.receivedData.Value); + this.GetModel().onDataRecived.Invoke(tcpUtil.receivedData.Value); } if (tcpUtil.getTimeOutState() && tcpUtil.isOpenTCP) { this.SendEvent(new onLinkException(tcpUtil.exceptionData.Value)); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index be6f693..ee0b6d5 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,7 +12,7 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany + companyName: JXSoft productName: JXSoftTools defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0}