From 65a0323e6e4e2704d03cee66c5ab945d715f88a2 Mon Sep 17 00:00:00 2001 From: ALEXTANG <574809918@qq.com> Date: Wed, 19 Apr 2023 22:42:28 +0800 Subject: [PATCH 1/2] Update EditorBuildSettings.asset --- ProjectSettings/EditorBuildSettings.asset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 3dd9e7ae..c6a09d41 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,6 +6,6 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/AATemp/temp.unity - guid: 18a2a610457925e44ac734e90182e6b6 + path: Assets/Scenes/main.unity + guid: ffce650b4a398384a896297542ef0992 m_configObjects: {} From 05a589e95865104fa7dbc2b8ab1d0efca0d1a761 Mon Sep 17 00:00:00 2001 From: ALEXTANG <574809918@qq.com> Date: Thu, 20 Apr 2023 17:55:45 +0800 Subject: [PATCH 2/2] [+] Repleace LubanLib => LubanLib.dll [+] Repleace LubanLib => LubanLib.dll --- .../BattleCore/BattleCore.Runtime.asmdef | 1 - .../HotFix/GameLogic/GameLogic.asmdef | 1 - .../HotFix/GameProto/GameProto.asmdef | 1 - Assets/TEngine/Libraries/LubanLib.dll | Bin 0 -> 62464 bytes Assets/TEngine/Libraries/LubanLib.dll.meta | 33 + Assets/TEngine/Libraries/LubanLib.meta | 8 - Assets/TEngine/Libraries/LubanLib/BeanBase.cs | 9 - .../Libraries/LubanLib/BeanBase.cs.meta | 11 - Assets/TEngine/Libraries/LubanLib/ByteBuf.cs | 1568 ----------------- .../Libraries/LubanLib/ByteBuf.cs.meta | 11 - Assets/TEngine/Libraries/LubanLib/ITypeId.cs | 7 - .../Libraries/LubanLib/ITypeId.cs.meta | 11 - .../Libraries/LubanLib/LubanLib.asmdef | 14 - .../Libraries/LubanLib/LubanLib.asmdef.meta | 7 - .../Libraries/LubanLib/SimpleJSON.meta | 8 - .../Libraries/LubanLib/SimpleJSON/LICENSE | 21 - .../LubanLib/SimpleJSON/LICENSE.meta | 7 - .../Libraries/LubanLib/SimpleJSON/README | 0 .../Libraries/LubanLib/SimpleJSON/README.meta | 7 - .../LubanLib/SimpleJSON/SimpleJSON.cs | 1434 --------------- .../LubanLib/SimpleJSON/SimpleJSON.cs.meta | 11 - .../LubanLib/SimpleJSON/SimpleJSONBinary.cs | 301 ---- .../SimpleJSON/SimpleJSONBinary.cs.meta | 11 - .../SimpleJSON/SimpleJSONDotNetTypes.cs | 516 ------ .../SimpleJSON/SimpleJSONDotNetTypes.cs.meta | 11 - .../LubanLib/SimpleJSON/SimpleJSONUnity.cs | 462 ----- .../SimpleJSON/SimpleJSONUnity.cs.meta | 11 - .../TEngine/Libraries/LubanLib/StringUtil.cs | 52 - .../Libraries/LubanLib/StringUtil.cs.meta | 11 - 29 files changed, 33 insertions(+), 4512 deletions(-) create mode 100644 Assets/TEngine/Libraries/LubanLib.dll create mode 100644 Assets/TEngine/Libraries/LubanLib.dll.meta delete mode 100644 Assets/TEngine/Libraries/LubanLib.meta delete mode 100644 Assets/TEngine/Libraries/LubanLib/BeanBase.cs delete mode 100644 Assets/TEngine/Libraries/LubanLib/BeanBase.cs.meta delete mode 100644 Assets/TEngine/Libraries/LubanLib/ByteBuf.cs delete mode 100644 Assets/TEngine/Libraries/LubanLib/ByteBuf.cs.meta delete mode 100644 Assets/TEngine/Libraries/LubanLib/ITypeId.cs delete mode 100644 Assets/TEngine/Libraries/LubanLib/ITypeId.cs.meta delete mode 100644 Assets/TEngine/Libraries/LubanLib/LubanLib.asmdef delete mode 100644 Assets/TEngine/Libraries/LubanLib/LubanLib.asmdef.meta delete mode 100644 Assets/TEngine/Libraries/LubanLib/SimpleJSON.meta delete mode 100644 Assets/TEngine/Libraries/LubanLib/SimpleJSON/LICENSE delete mode 100644 Assets/TEngine/Libraries/LubanLib/SimpleJSON/LICENSE.meta delete mode 100644 Assets/TEngine/Libraries/LubanLib/SimpleJSON/README delete mode 100644 Assets/TEngine/Libraries/LubanLib/SimpleJSON/README.meta delete mode 100644 Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSON.cs delete mode 100644 Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSON.cs.meta delete mode 100644 Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONBinary.cs delete mode 100644 Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONBinary.cs.meta delete mode 100644 Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONDotNetTypes.cs delete mode 100644 Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONDotNetTypes.cs.meta delete mode 100644 Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONUnity.cs delete mode 100644 Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONUnity.cs.meta delete mode 100644 Assets/TEngine/Libraries/LubanLib/StringUtil.cs delete mode 100644 Assets/TEngine/Libraries/LubanLib/StringUtil.cs.meta diff --git a/Assets/GameScripts/HotFix/BattleCore/BattleCore.Runtime.asmdef b/Assets/GameScripts/HotFix/BattleCore/BattleCore.Runtime.asmdef index d30fb368..b50305bd 100644 --- a/Assets/GameScripts/HotFix/BattleCore/BattleCore.Runtime.asmdef +++ b/Assets/GameScripts/HotFix/BattleCore/BattleCore.Runtime.asmdef @@ -2,7 +2,6 @@ "name": "BattleCore.Runtime", "rootNamespace": "BattleCore.Runtime", "references": [ - "GUID:b48be955427611241bcb6f2a07949c5b", "GUID:aa06d4cc755c979489c256c1bcca1dfb" ], "includePlatforms": [], diff --git a/Assets/GameScripts/HotFix/GameLogic/GameLogic.asmdef b/Assets/GameScripts/HotFix/GameLogic/GameLogic.asmdef index 7b2707b3..38d6f1d6 100644 --- a/Assets/GameScripts/HotFix/GameLogic/GameLogic.asmdef +++ b/Assets/GameScripts/HotFix/GameLogic/GameLogic.asmdef @@ -2,7 +2,6 @@ "name": "GameLogic", "rootNamespace": "GameLogic", "references": [ - "GUID:b48be955427611241bcb6f2a07949c5b", "GUID:08c3762f54316454ca6b6fbcb22b40e5", "GUID:a90b2d3377c5e4a4db95cc44fb82045e", "GUID:aa06d4cc755c979489c256c1bcca1dfb", diff --git a/Assets/GameScripts/HotFix/GameProto/GameProto.asmdef b/Assets/GameScripts/HotFix/GameProto/GameProto.asmdef index 6bd487fc..8cc30356 100644 --- a/Assets/GameScripts/HotFix/GameProto/GameProto.asmdef +++ b/Assets/GameScripts/HotFix/GameProto/GameProto.asmdef @@ -2,7 +2,6 @@ "name": "GameProto", "rootNamespace": "", "references": [ - "GUID:b48be955427611241bcb6f2a07949c5b", "GUID:08c3762f54316454ca6b6fbcb22b40e5", "GUID:aa06d4cc755c979489c256c1bcca1dfb" ], diff --git a/Assets/TEngine/Libraries/LubanLib.dll b/Assets/TEngine/Libraries/LubanLib.dll new file mode 100644 index 0000000000000000000000000000000000000000..b8cddc1bfdbfdf6638b656a2371400a2eb3a959b GIT binary patch literal 62464 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 literal 0 HcmV?d00001 diff --git a/Assets/TEngine/Libraries/LubanLib.dll.meta b/Assets/TEngine/Libraries/LubanLib.dll.meta new file mode 100644 index 00000000..278844e7 --- /dev/null +++ b/Assets/TEngine/Libraries/LubanLib.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 89116cb4080636043baf4cdf8887f3a5 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TEngine/Libraries/LubanLib.meta b/Assets/TEngine/Libraries/LubanLib.meta deleted file mode 100644 index 713896f0..00000000 --- a/Assets/TEngine/Libraries/LubanLib.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: df9c2517e8a362749a6ff0ec272ad70f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TEngine/Libraries/LubanLib/BeanBase.cs b/Assets/TEngine/Libraries/LubanLib/BeanBase.cs deleted file mode 100644 index 74e956f7..00000000 --- a/Assets/TEngine/Libraries/LubanLib/BeanBase.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Bright.Serialization; - -namespace Bright.Config -{ - public abstract class BeanBase : ITypeId - { - public abstract int GetTypeId(); - } -} diff --git a/Assets/TEngine/Libraries/LubanLib/BeanBase.cs.meta b/Assets/TEngine/Libraries/LubanLib/BeanBase.cs.meta deleted file mode 100644 index 008518e6..00000000 --- a/Assets/TEngine/Libraries/LubanLib/BeanBase.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9537f3ca9ccccf045973e0d3eb5f4dfa -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TEngine/Libraries/LubanLib/ByteBuf.cs b/Assets/TEngine/Libraries/LubanLib/ByteBuf.cs deleted file mode 100644 index ead9cbdf..00000000 --- a/Assets/TEngine/Libraries/LubanLib/ByteBuf.cs +++ /dev/null @@ -1,1568 +0,0 @@ -using System; -using System.Diagnostics.CodeAnalysis; -using System.Numerics; -using System.Runtime.CompilerServices; -using System.Text; - -namespace Bright.Serialization -{ - - public enum EDeserializeError - { - OK, - NOT_ENOUGH, - EXCEED_SIZE, - // UNMARSHAL_ERR, - } - - public class SerializationException : Exception - { - public SerializationException() { } - public SerializationException(string msg) : base(msg) { } - - public SerializationException(string message, Exception innerException) : base(message, innerException) - { - } - } - - public readonly struct SegmentSaveState - { - public SegmentSaveState(int readerIndex, int writerIndex) - { - ReaderIndex = readerIndex; - WriterIndex = writerIndex; - } - - public int ReaderIndex { get; } - - public int WriterIndex { get; } - } - - public sealed class ByteBuf : ICloneable, IEquatable - { - public ByteBuf() - { - Bytes = Array.Empty(); - ReaderIndex = WriterIndex = 0; - } - - public ByteBuf(int capacity) - { - Bytes = capacity > 0 ? new byte[capacity] : Array.Empty(); - ReaderIndex = 0; - WriterIndex = 0; - } - - public ByteBuf(byte[] bytes) - { - Bytes = bytes; - ReaderIndex = 0; - WriterIndex = Capacity; - } - - public ByteBuf(byte[] bytes, int readIndex, int writeIndex) - { - Bytes = bytes; - ReaderIndex = readIndex; - WriterIndex = writeIndex; - } - - public ByteBuf(int capacity, Action releaser) : this(capacity) - { - _releaser = releaser; - } - - public static ByteBuf Wrap(byte[] bytes) - { - return new ByteBuf(bytes, 0, bytes.Length); - } - - public void Replace(byte[] bytes) - { - Bytes = bytes; - ReaderIndex = 0; - WriterIndex = Capacity; - } - - public void Replace(byte[] bytes, int beginPos, int endPos) - { - Bytes = bytes; - ReaderIndex = beginPos; - WriterIndex = endPos; - } - - public int ReaderIndex { get; set; } - - public int WriterIndex { get; set; } - - private readonly Action _releaser; - - public int Capacity => Bytes.Length; - - public int Size { get { return WriterIndex - ReaderIndex; } } - - public bool Empty => WriterIndex <= ReaderIndex; - - public bool NotEmpty => WriterIndex > ReaderIndex; - - - public void AddWriteIndex(int add) - { - WriterIndex += add; - } - - public void AddReadIndex(int add) - { - ReaderIndex += add; - } - -#pragma warning disable CA1819 // 属性不应返回数组 - public byte[] Bytes { get; private set; } -#pragma warning restore CA1819 // 属性不应返回数组 - - public byte[] CopyData() - { - var n = Remaining; - if (n > 0) - { - var arr = new byte[n]; - Buffer.BlockCopy(Bytes, ReaderIndex, arr, 0, n); - return arr; - } - else - { - return Array.Empty(); - } - } - - public int Remaining { get { return WriterIndex - ReaderIndex; } } - - public void DiscardReadBytes() - { - WriterIndex -= ReaderIndex; - Array.Copy(Bytes, ReaderIndex, Bytes, 0, WriterIndex); - ReaderIndex = 0; - } - - public int NotCompactWritable { get { return Capacity - WriterIndex; } } - - public void WriteBytesWithoutSize(byte[] bs) - { - WriteBytesWithoutSize(bs, 0, bs.Length); - } - - public void WriteBytesWithoutSize(byte[] bs, int offset, int len) - { - EnsureWrite(len); - Buffer.BlockCopy(bs, offset, Bytes, WriterIndex, len); - WriterIndex += len; - } - - public void Clear() - { - ReaderIndex = WriterIndex = 0; - } - - private const int MIN_CAPACITY = 16; - - private static int PropSize(int initSize, int needSize) - { - for (int i = Math.Max(initSize, MIN_CAPACITY); ; i <<= 1) - { - if (i >= needSize) - { - return i; - } - } - } - - private void EnsureWrite0(int size) - { - var needSize = WriterIndex + size - ReaderIndex; - if (needSize < Capacity) - { - WriterIndex -= ReaderIndex; - Array.Copy(Bytes, ReaderIndex, Bytes, 0, WriterIndex); - ReaderIndex = 0; - } - else - { - int newCapacity = PropSize(Capacity, needSize); - var newBytes = new byte[newCapacity]; - WriterIndex -= ReaderIndex; - Buffer.BlockCopy(Bytes, ReaderIndex, newBytes, 0, WriterIndex); - ReaderIndex = 0; - Bytes = newBytes; - } - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void EnsureWrite(int size) - { - if (WriterIndex + size > Capacity) - { - EnsureWrite0(size); - } - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void EnsureRead(int size) - { - if (ReaderIndex + size > WriterIndex) - { - throw new SerializationException(); - } - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private bool CanRead(int size) - { - return (ReaderIndex + size <= WriterIndex); - } - - public void Append(byte x) - { - EnsureWrite(1); - Bytes[WriterIndex++] = x; - } - - public void WriteBool(bool b) - { - EnsureWrite(1); - Bytes[WriterIndex++] = (byte)(b ? 1 : 0); - } - - public bool ReadBool() - { - EnsureRead(1); - return Bytes[ReaderIndex++] != 0; - } - - public void WriteByte(byte x) - { - EnsureWrite(1); - Bytes[WriterIndex++] = x; - } - - public byte ReadByte() - { - EnsureRead(1); - return Bytes[ReaderIndex++]; - } - - - public void WriteShort(short x) - { - if (x >= 0) - { - if (x < 0x80) - { - EnsureWrite(1); - Bytes[WriterIndex++] = (byte)x; - return; - } - else if (x < 0x4000) - { - EnsureWrite(2); - Bytes[WriterIndex + 1] = (byte)x; - Bytes[WriterIndex] = (byte)((x >> 8) | 0x80); - WriterIndex += 2; - return; - } - } - EnsureWrite(3); - Bytes[WriterIndex] = 0xff; - Bytes[WriterIndex + 2] = (byte)x; - Bytes[WriterIndex + 1] = (byte)(x >> 8); - WriterIndex += 3; - } - - public short ReadShort() - { - EnsureRead(1); - int h = Bytes[ReaderIndex]; - if (h < 0x80) - { - ReaderIndex++; - return (short)h; - } - else if (h < 0xc0) - { - EnsureRead(2); - int x = ((h & 0x3f) << 8) | Bytes[ReaderIndex + 1]; - ReaderIndex += 2; - return (short)x; - } - else if ((h == 0xff)) - { - EnsureRead(3); - int x = (Bytes[ReaderIndex + 1] << 8) | Bytes[ReaderIndex + 2]; - ReaderIndex += 3; - return (short)x; - } - else - { - throw new SerializationException(); - } - } - - public short ReadFshort() - { - EnsureRead(2); - short x; -#if CPU_SUPPORT_MEMORY_NOT_ALIGN - unsafe - { - fixed (byte* b = &Bytes[ReaderIndex]) - { - x = *(short*)b; - } - } -#else - x = (short)((Bytes[ReaderIndex + 1] << 8) | Bytes[ReaderIndex]); - -#endif - ReaderIndex += 2; - return x; - } - - public void WriteFshort(short x) - { - EnsureWrite(2); -#if CPU_SUPPORT_MEMORY_NOT_ALIGN - unsafe - { - fixed (byte* b = &Bytes[WriterIndex]) - { - *(short*)b = x; - } - } -#else - Bytes[WriterIndex] = (byte)x; - Bytes[WriterIndex + 1] = (byte)(x >> 8); -#endif - WriterIndex += 2; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void WriteInt(int x) - { - WriteUint((uint)x); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public int ReadInt() - { - return (int)ReadUint(); - } - - - public void WriteUint(uint x) - { - // 如果有修改，记得也把 EndWriteSegment改了 - // 0 111 1111 - if (x < 0x80) - { - EnsureWrite(1); - Bytes[WriterIndex++] = (byte)x; - } - else if (x < 0x4000) // 10 11 1111, - - { - EnsureWrite(2); - Bytes[WriterIndex + 1] = (byte)x; - Bytes[WriterIndex] = (byte)((x >> 8) | 0x80); - WriterIndex += 2; - } - else if (x < 0x200000) // 110 1 1111, -,- - { - EnsureWrite(3); - Bytes[WriterIndex + 2] = (byte)x; - Bytes[WriterIndex + 1] = (byte)(x >> 8); - Bytes[WriterIndex] = (byte)((x >> 16) | 0xc0); - WriterIndex += 3; - } - else if (x < 0x10000000) // 1110 1111,-,-,- - { - EnsureWrite(4); - Bytes[WriterIndex + 3] = (byte)x; - Bytes[WriterIndex + 2] = (byte)(x >> 8); - Bytes[WriterIndex + 1] = (byte)(x >> 16); - Bytes[WriterIndex] = (byte)((x >> 24) | 0xe0); - WriterIndex += 4; - } - else - { - EnsureWrite(5); - Bytes[WriterIndex] = 0xf0; - Bytes[WriterIndex + 4] = (byte)x; - Bytes[WriterIndex + 3] = (byte)(x >> 8); - Bytes[WriterIndex + 2] = (byte)(x >> 16); - Bytes[WriterIndex + 1] = (byte)(x >> 24); - WriterIndex += 5; - } - } - - public uint ReadUint() - { - /// - /// 警告！ 如有修改，记得调整 TryDeserializeInplaceOctets - EnsureRead(1); - uint h = Bytes[ReaderIndex]; - if (h < 0x80) - { - ReaderIndex++; - return h; - } - else if (h < 0xc0) - { - EnsureRead(2); - uint x = ((h & 0x3f) << 8) | Bytes[ReaderIndex + 1]; - ReaderIndex += 2; - return x; - } - else if (h < 0xe0) - { - EnsureRead(3); - uint x = ((h & 0x1f) << 16) | ((uint)Bytes[ReaderIndex + 1] << 8) | Bytes[ReaderIndex + 2]; - ReaderIndex += 3; - return x; - } - else if (h < 0xf0) - { - - EnsureRead(4); - uint x = ((h & 0x0f) << 24) | ((uint)Bytes[ReaderIndex + 1] << 16) | ((uint)Bytes[ReaderIndex + 2] << 8) | Bytes[ReaderIndex + 3]; - ReaderIndex += 4; - return x; - } - else - { - EnsureRead(5); - uint x = ((uint)Bytes[ReaderIndex + 1] << 24) | ((uint)(Bytes[ReaderIndex + 2] << 16)) | ((uint)Bytes[ReaderIndex + 3] << 8) | Bytes[ReaderIndex + 4]; - ReaderIndex += 5; - return x; - } - } - - public unsafe void WriteUint_Unsafe(uint x) - { - // 0 111 1111 - if (x < 0x80) - { - EnsureWrite(1); - Bytes[WriterIndex++] = (byte)(x << 1); - } - else if (x < 0x4000)// 10 11 1111, - - { - EnsureWrite(2); - - fixed (byte* wb = &Bytes[WriterIndex]) - { - *(uint*)(wb) = (x << 2 | 0b01); - } - - WriterIndex += 2; - } - else if (x < 0x200000) // 110 1 1111, -,- - { - EnsureWrite(3); - - fixed (byte* wb = &Bytes[WriterIndex]) - { - *(uint*)(wb) = (x << 3 | 0b011); - } - WriterIndex += 3; - } - else if (x < 0x10000000) // 1110 1111,-,-,- - { - EnsureWrite(4); - fixed (byte* wb = &Bytes[WriterIndex]) - { - *(uint*)(wb) = (x << 4 | 0b0111); - } - WriterIndex += 4; - } - else - { - EnsureWrite(5); - fixed (byte* wb = &Bytes[WriterIndex]) - { - *(uint*)(wb) = (x << 5 | 0b01111); - } - WriterIndex += 5; - } - } - - public unsafe uint ReadUint_Unsafe() - { - /// - /// 警告！ 如有修改，记得调整 TryDeserializeInplaceOctets - EnsureRead(1); - uint h = Bytes[ReaderIndex]; - if ((h & 0b1) == 0b0) - { - ReaderIndex++; - return (h >> 1); - } - else if ((h & 0b11) == 0b01) - { - EnsureRead(2); - fixed (byte* rb = &Bytes[ReaderIndex]) - { - ReaderIndex += 2; - return (*(uint*)rb) >> 2; - } - } - else if ((h & 0b111) == 0b011) - { - EnsureRead(3); - fixed (byte* rb = &Bytes[ReaderIndex]) - { - ReaderIndex += 3; - return (*(uint*)rb) >> 3; - } - } - else if ((h & 0b1111) == 0b0111) - { - EnsureRead(4); - fixed (byte* rb = &Bytes[ReaderIndex]) - { - ReaderIndex += 4; - return (*(uint*)rb) >> 4; - } - } - else - { - EnsureRead(5); - fixed (byte* rb = &Bytes[ReaderIndex]) - { - ReaderIndex += 5; - return (*(uint*)rb) >> 5; - } - } - } - - public int ReadFint() - { - EnsureRead(4); - int x; -#if CPU_SUPPORT_MEMORY_NOT_ALIGN - unsafe - { - fixed (byte* b = &Bytes[ReaderIndex]) - { - x = *(int*)b; - } - } -#else - x = (Bytes[ReaderIndex + 3] << 24) | (Bytes[ReaderIndex + 2] << 16) | (Bytes[ReaderIndex + 1] << 8) | (Bytes[ReaderIndex]); - -#endif - ReaderIndex += 4; - return x; - } - - - public void WriteFint(int x) - { - EnsureWrite(4); -#if CPU_SUPPORT_MEMORY_NOT_ALIGN - unsafe - { - fixed (byte* b = &Bytes[WriterIndex]) - { - *(int*)b = x; - } - } -#else - Bytes[WriterIndex] = (byte)x; - Bytes[WriterIndex + 1] = (byte)(x >> 8); - Bytes[WriterIndex + 2] = (byte)(x >> 16); - Bytes[WriterIndex + 3] = (byte)(x >> 24); -#endif - WriterIndex += 4; - } - - public int ReadFint_Safe() - { - EnsureRead(4); - int x; - - x = (Bytes[ReaderIndex + 3] << 24) | (Bytes[ReaderIndex + 2] << 16) | (Bytes[ReaderIndex + 1] << 8) | (Bytes[ReaderIndex]); - - ReaderIndex += 4; - return x; - } - - - public void WriteFint_Safe(int x) - { - EnsureWrite(4); - Bytes[WriterIndex] = (byte)x; - Bytes[WriterIndex + 1] = (byte)(x >> 8); - Bytes[WriterIndex + 2] = (byte)(x >> 16); - Bytes[WriterIndex + 3] = (byte)(x >> 24); - WriterIndex += 4; - } - - public void WriteLong(long x) - { - WriteUlong((ulong)x); - } - - public long ReadLong() - { - return (long)ReadUlong(); - } - - public void WriteNumberAsLong(double x) - { - WriteLong((long)x); - } - - public double ReadLongAsNumber() - { - return ReadLong(); - } - - private void WriteUlong(ulong x) - { - // 0 111 1111 - if (x < 0x80) - { - EnsureWrite(1); - Bytes[WriterIndex++] = (byte)x; - } - else if (x < 0x4000) // 10 11 1111, - - { - EnsureWrite(2); - Bytes[WriterIndex + 1] = (byte)x; - Bytes[WriterIndex] = (byte)((x >> 8) | 0x80); - WriterIndex += 2; - } - else if (x < 0x200000) // 110 1 1111, -,- - { - EnsureWrite(3); - Bytes[WriterIndex + 2] = (byte)x; - Bytes[WriterIndex + 1] = (byte)(x >> 8); - Bytes[WriterIndex] = (byte)((x >> 16) | 0xc0); - WriterIndex += 3; - } - else if (x < 0x10000000) // 1110 1111,-,-,- - { - EnsureWrite(4); - Bytes[WriterIndex + 3] = (byte)x; - Bytes[WriterIndex + 2] = (byte)(x >> 8); - Bytes[WriterIndex + 1] = (byte)(x >> 16); - Bytes[WriterIndex] = (byte)((x >> 24) | 0xe0); - WriterIndex += 4; - } - else if (x < 0x800000000L) // 1111 0xxx,-,-,-,- - { - EnsureWrite(5); - Bytes[WriterIndex + 4] = (byte)x; - Bytes[WriterIndex + 3] = (byte)(x >> 8); - Bytes[WriterIndex + 2] = (byte)(x >> 16); - Bytes[WriterIndex + 1] = (byte)(x >> 24); - Bytes[WriterIndex] = (byte)((x >> 32) | 0xf0); - WriterIndex += 5; - } - else if (x < 0x40000000000L) // 1111 10xx, - { - EnsureWrite(6); - Bytes[WriterIndex + 5] = (byte)x; - Bytes[WriterIndex + 4] = (byte)(x >> 8); - Bytes[WriterIndex + 3] = (byte)(x >> 16); - Bytes[WriterIndex + 2] = (byte)(x >> 24); - Bytes[WriterIndex + 1] = (byte)(x >> 32); - Bytes[WriterIndex] = (byte)((x >> 40) | 0xf8); - WriterIndex += 6; - } - else if (x < 0x200000000000L) // 1111 110x, - { - EnsureWrite(7); - Bytes[WriterIndex + 6] = (byte)x; - Bytes[WriterIndex + 5] = (byte)(x >> 8); - Bytes[WriterIndex + 4] = (byte)(x >> 16); - Bytes[WriterIndex + 3] = (byte)(x >> 24); - Bytes[WriterIndex + 2] = (byte)(x >> 32); - Bytes[WriterIndex + 1] = (byte)(x >> 40); - Bytes[WriterIndex] = (byte)((x >> 48) | 0xfc); - WriterIndex += 7; - } - else if (x < 0x100000000000000L) // 1111 1110 - { - EnsureWrite(8); - Bytes[WriterIndex + 7] = (byte)x; - Bytes[WriterIndex + 6] = (byte)(x >> 8); - Bytes[WriterIndex + 5] = (byte)(x >> 16); - Bytes[WriterIndex + 4] = (byte)(x >> 24); - Bytes[WriterIndex + 3] = (byte)(x >> 32); - Bytes[WriterIndex + 2] = (byte)(x >> 40); - Bytes[WriterIndex + 1] = (byte)(x >> 48); - Bytes[WriterIndex] = 0xfe; - WriterIndex += 8; - } - else // 1111 1111 - { - EnsureWrite(9); - Bytes[WriterIndex] = 0xff; - Bytes[WriterIndex + 8] = (byte)x; - Bytes[WriterIndex + 7] = (byte)(x >> 8); - Bytes[WriterIndex + 6] = (byte)(x >> 16); - Bytes[WriterIndex + 5] = (byte)(x >> 24); - Bytes[WriterIndex + 4] = (byte)(x >> 32); - Bytes[WriterIndex + 3] = (byte)(x >> 40); - Bytes[WriterIndex + 2] = (byte)(x >> 48); - Bytes[WriterIndex + 1] = (byte)(x >> 56); - WriterIndex += 9; - } - } - - public ulong ReadUlong() - { - EnsureRead(1); - uint h = Bytes[ReaderIndex]; - if (h < 0x80) - { - ReaderIndex++; - return h; - } - else if (h < 0xc0) - { - EnsureRead(2); - uint x = ((h & 0x3f) << 8) | Bytes[ReaderIndex + 1]; - ReaderIndex += 2; - return x; - } - else if (h < 0xe0) - { - EnsureRead(3); - uint x = ((h & 0x1f) << 16) | ((uint)Bytes[ReaderIndex + 1] << 8) | Bytes[ReaderIndex + 2]; - ReaderIndex += 3; - return x; - } - else if (h < 0xf0) - { - EnsureRead(4); - uint x = ((h & 0x0f) << 24) | ((uint)Bytes[ReaderIndex + 1] << 16) | ((uint)Bytes[ReaderIndex + 2] << 8) | Bytes[ReaderIndex + 3]; - ReaderIndex += 4; - return x; - } - else if (h < 0xf8) - { - EnsureRead(5); - uint xl = ((uint)Bytes[ReaderIndex + 1] << 24) | ((uint)(Bytes[ReaderIndex + 2] << 16)) | ((uint)Bytes[ReaderIndex + 3] << 8) | (Bytes[ReaderIndex + 4]); - uint xh = h & 0x07; - ReaderIndex += 5; - return ((ulong)xh << 32) | xl; - } - else if (h < 0xfc) - { - EnsureRead(6); - uint xl = ((uint)Bytes[ReaderIndex + 2] << 24) | ((uint)(Bytes[ReaderIndex + 3] << 16)) | ((uint)Bytes[ReaderIndex + 4] << 8) | (Bytes[ReaderIndex + 5]); - uint xh = ((h & 0x03) << 8) | Bytes[ReaderIndex + 1]; - ReaderIndex += 6; - return ((ulong)xh << 32) | xl; - } - else if (h < 0xfe) - { - EnsureRead(7); - uint xl = ((uint)Bytes[ReaderIndex + 3] << 24) | ((uint)(Bytes[ReaderIndex + 4] << 16)) | ((uint)Bytes[ReaderIndex + 5] << 8) | (Bytes[ReaderIndex + 6]); - uint xh = ((h & 0x01) << 16) | ((uint)Bytes[ReaderIndex + 1] << 8) | Bytes[ReaderIndex + 2]; - ReaderIndex += 7; - return ((ulong)xh << 32) | xl; - } - else if (h < 0xff) - { - EnsureRead(8); - uint xl = ((uint)Bytes[ReaderIndex + 4] << 24) | ((uint)(Bytes[ReaderIndex + 5] << 16)) | ((uint)Bytes[ReaderIndex + 6] << 8) | (Bytes[ReaderIndex + 7]); - uint xh = /*((h & 0x01) << 24) |*/ ((uint)Bytes[ReaderIndex + 1] << 16) | ((uint)Bytes[ReaderIndex + 2] << 8) | Bytes[ReaderIndex + 3]; - ReaderIndex += 8; - return ((ulong)xh << 32) | xl; - } - else - { - EnsureRead(9); - uint xl = ((uint)Bytes[ReaderIndex + 5] << 24) | ((uint)(Bytes[ReaderIndex + 6] << 16)) | ((uint)Bytes[ReaderIndex + 7] << 8) | (Bytes[ReaderIndex + 8]); - uint xh = ((uint)Bytes[ReaderIndex + 1] << 24) | ((uint)Bytes[ReaderIndex + 2] << 16) | ((uint)Bytes[ReaderIndex + 3] << 8) | Bytes[ReaderIndex + 4]; - ReaderIndex += 9; - return ((ulong)xh << 32) | xl; - } - } - - - public void WriteFlong(long x) - { - EnsureWrite(8); -#if CPU_SUPPORT_MEMORY_NOT_ALIGN - unsafe - { - fixed (byte* b = &Bytes[WriterIndex]) - { - *(long*)b = x; - } - } -#else - - Bytes[WriterIndex] = (byte)x; - Bytes[WriterIndex + 1] = (byte)(x >> 8); - Bytes[WriterIndex + 2] = (byte)(x >> 16); - Bytes[WriterIndex + 3] = (byte)(x >> 24); - Bytes[WriterIndex + 4] = (byte)(x >> 32); - Bytes[WriterIndex + 5] = (byte)(x >> 40); - Bytes[WriterIndex + 6] = (byte)(x >> 48); - Bytes[WriterIndex + 7] = (byte)(x >> 56); -#endif - WriterIndex += 8; - } - - public long ReadFlong() - { - EnsureRead(8); - long x; -#if CPU_SUPPORT_MEMORY_NOT_ALIGN - unsafe - { - fixed (byte* b = &Bytes[ReaderIndex]) - { - x = *(long*)b; - } - } -#else - int xl = (Bytes[ReaderIndex + 3] << 24) | ((Bytes[ReaderIndex + 2] << 16)) | (Bytes[ReaderIndex + 1] << 8) | (Bytes[ReaderIndex]); - int xh = (Bytes[ReaderIndex + 7] << 24) | (Bytes[ReaderIndex + 6] << 16) | (Bytes[ReaderIndex + 5] << 8) | Bytes[ReaderIndex + 4]; - x = ((long)xh << 32) | (long)xl; -#endif - ReaderIndex += 8; - return x; - } - - private static unsafe void Copy8(byte* dst, byte* src) - { - dst[0] = src[0]; - dst[1] = src[1]; - dst[2] = src[2]; - dst[3] = src[3]; - dst[4] = src[4]; - dst[5] = src[5]; - dst[6] = src[6]; - dst[7] = src[7]; - } - - private static unsafe void Copy4(byte* dst, byte* src) - { - dst[0] = src[0]; - dst[1] = src[1]; - dst[2] = src[2]; - dst[3] = src[3]; - } - - - //const bool isLittleEndian = true; - public void WriteFloat(float x) - { - EnsureWrite(4); - unsafe - { - fixed (byte* b = &Bytes[WriterIndex]) - { -#if !CPU_SUPPORT_MEMORY_NOT_ALIGN - if ((long)b % 4 == 0) - { - *(float*)b = x; - } - else - { - Copy4(b, (byte*)&x); - } -#else - *(float*)b = x; -#endif - } - } - - //if (!BitConverter.IsLittleEndian) - //{ - // Array.Reverse(data, endPos, 4); - //} - WriterIndex += 4; - } - - public float ReadFloat() - { - EnsureRead(4); - //if (!BitConverter.IsLittleEndian) - //{ - // Array.Reverse(data, beginPos, 4); - //} - float x; - unsafe - { - fixed (byte* b = &Bytes[ReaderIndex]) - { -#if !CPU_SUPPORT_MEMORY_NOT_ALIGN - if ((long)b % 4 == 0) - { - x = *(float*)b; - } - else - { - *((int*)&x) = (b[0]) | (b[1] << 8) | (b[2] << 16) | (b[3] << 24); - } -#else - x = *(float*)b; -#endif - } - } - - ReaderIndex += 4; - return x; - } - - public void WriteDouble(double x) - { - EnsureWrite(8); - unsafe - { - fixed (byte* b = &Bytes[WriterIndex]) - { -#if !CPU_SUPPORT_MEMORY_NOT_ALIGN - if ((long)b % 8 == 0) - { - *(double*)b = x; - } - else - { - Copy8(b, (byte*)&x); - } -#else - *(double*)b = x; -#endif - } - //if (!BitConverter.IsLittleEndian) - //{ - // Array.Reverse(data, endPos, 8); - //} - } - - WriterIndex += 8; - } - - public double ReadDouble() - { - EnsureRead(8); - //if (!BitConverter.IsLittleEndian) - //{ - // Array.Reverse(data, beginPos, 8); - //} - double x; - unsafe - { - fixed (byte* b = &Bytes[ReaderIndex]) - { -#if !CPU_SUPPORT_MEMORY_NOT_ALIGN - if ((long)b % 8 == 0) - { - x = *(double*)b; - } - else - { - int low = (b[0]) | (b[1] << 8) | (b[2] << 16) | (b[3] << 24); - int high = (b[4]) | (b[5] << 8) | (b[6] << 16) | (b[7] << 24); - *((long*)&x) = ((long)high << 32) | (uint)low; - } -#else - x = *(double*)b; -#endif - } - } - - ReaderIndex += 8; - return x; - } - - public void WriteSize(int n) - { - WriteUint((uint)n); - } - - public int ReadSize() - { - return (int)ReadUint(); - } - - // marshal int - // n -> (n << 1) ^ (n >> 31) - // Read - // (x >>> 1) ^ ((x << 31) >> 31) - // (x >>> 1) ^ -(n&1) - public void WriteSint(int x) - { - WriteUint(((uint)x << 1) ^ ((uint)x >> 31)); - } - - public int ReadSint() - { - uint x = ReadUint(); - return (int)((x >> 1) ^ ((x & 1) << 31)); - } - - - // marshal long - // n -> (n << 1) ^ (n >> 63) - // Read - // (x >>> 1) ^((x << 63) >> 63) - // (x >>> 1) ^ -(n&1L) - public void WriteSlong(long x) - { - WriteUlong(((ulong)x << 1) ^ ((ulong)x >> 63)); - } - - public long ReadSlong() - { - long x = ReadLong(); - return ((long)((ulong)x >> 1) ^ ((x & 1) << 63)); - } - - public void WriteString(string x) - { - var n = x != null ? Encoding.UTF8.GetByteCount(x) : 0; - WriteSize(n); - if (n > 0) - { - EnsureWrite(n); - Encoding.UTF8.GetBytes(x, 0, x.Length, Bytes, WriterIndex); - WriterIndex += n; - } - } - - // byte[], [start, end) - public static Func StringCacheFinder { get; set; } - - public string ReadString() - { - var n = ReadSize(); - if (n > 0) - { - EnsureRead(n); - string s; - - if (StringCacheFinder == null) - { - s = Encoding.UTF8.GetString(Bytes, ReaderIndex, n); - } - else - { - // 只缓存比较小的字符串 - s = StringCacheFinder(Bytes, ReaderIndex, n); - } - ReaderIndex += n; - return s; - } - else - { - return string.Empty; - } - } - - public void WriteBytes(byte[] x) - { - var n = x != null ? x.Length : 0; - WriteSize(n); - if (n > 0) - { - EnsureWrite(n); - x.CopyTo(Bytes, WriterIndex); - WriterIndex += n; - } - } - - public byte[] ReadBytes() - { - var n = ReadSize(); - if (n > 0) - { - EnsureRead(n); - var x = new byte[n]; - Buffer.BlockCopy(Bytes, ReaderIndex, x, 0, n); - ReaderIndex += n; - return x; - } - else - { - return Array.Empty(); - } - } - - // 以下是一些特殊类型 - - public void WriteComplex(Complex x) - { - WriteDouble(x.Real); - WriteDouble(x.Imaginary); - } - - public Complex ReadComplex() - { - var x = ReadDouble(); - var y = ReadDouble(); - return new Complex(x, y); - } - - public void WriteVector2(Vector2 x) - { - WriteFloat(x.X); - WriteFloat(x.Y); - } - - public Vector2 ReadVector2() - { - float x = ReadFloat(); - float y = ReadFloat(); - return new Vector2(x, y); - } - - public void WriteVector3(Vector3 x) - { - WriteFloat(x.X); - WriteFloat(x.Y); - WriteFloat(x.Z); - } - - public Vector3 ReadVector3() - { - float x = ReadFloat(); - float y = ReadFloat(); - float z = ReadFloat(); - return new Vector3(x, y, z); - } - - public void WriteVector4(Vector4 x) - { - WriteFloat(x.X); - WriteFloat(x.Y); - WriteFloat(x.Z); - WriteFloat(x.W); - } - - public Vector4 ReadVector4() - { - float x = ReadFloat(); - float y = ReadFloat(); - float z = ReadFloat(); - float w = ReadFloat(); - return new Vector4(x, y, z, w); - } - - - public void WriteQuaternion(Quaternion x) - { - WriteFloat(x.X); - WriteFloat(x.Y); - WriteFloat(x.Z); - WriteFloat(x.W); - } - - public Quaternion ReadQuaternion() - { - float x = ReadFloat(); - float y = ReadFloat(); - float z = ReadFloat(); - float w = ReadFloat(); - return new Quaternion(x, y, z, w); - } - - - public void WriteMatrix4x4(Matrix4x4 x) - { - WriteFloat(x.M11); - WriteFloat(x.M12); - WriteFloat(x.M13); - WriteFloat(x.M14); - WriteFloat(x.M21); - WriteFloat(x.M22); - WriteFloat(x.M23); - WriteFloat(x.M24); - WriteFloat(x.M31); - WriteFloat(x.M32); - WriteFloat(x.M33); - WriteFloat(x.M34); - WriteFloat(x.M41); - WriteFloat(x.M42); - WriteFloat(x.M43); - WriteFloat(x.M44); - } - - public Matrix4x4 ReadMatrix4x4() - { - float m11 = ReadFloat(); - float m12 = ReadFloat(); - float m13 = ReadFloat(); - float m14 = ReadFloat(); - float m21 = ReadFloat(); - float m22 = ReadFloat(); - float m23 = ReadFloat(); - float m24 = ReadFloat(); - float m31 = ReadFloat(); - float m32 = ReadFloat(); - float m33 = ReadFloat(); - float m34 = ReadFloat(); - float m41 = ReadFloat(); - float m42 = ReadFloat(); - float m43 = ReadFloat(); - float m44 = ReadFloat(); - return new Matrix4x4(m11, m12, m13, m14, - m21, m22, m23, m24, - m31, m32, m33, m34, - m41, m42, m43, m44); - } - - internal void SkipBytes() - { - int n = ReadSize(); - EnsureRead(n); - ReaderIndex += n; - } - - - public void WriteByteBufWithSize(ByteBuf o) - { - int n = o.Size; - if (n > 0) - { - WriteSize(n); - WriteBytesWithoutSize(o.Bytes, o.ReaderIndex, n); - } - else - { - WriteByte(0); - } - } - - public void WriteByteBufWithoutSize(ByteBuf o) - { - int n = o.Size; - if (n > 0) - { - WriteBytesWithoutSize(o.Bytes, o.ReaderIndex, n); - } - } - - public bool TryReadByte(out byte x) - { - if (CanRead(1)) - { - x = Bytes[ReaderIndex++]; - return true; - } - else - { - x = 0; - return false; - } - } - - public EDeserializeError TryDeserializeInplaceByteBuf(int maxSize, ByteBuf inplaceTempBody) - { - //if (!CanRead(1)) { return EDeserializeError.NOT_ENOUGH; } - int oldReadIndex = ReaderIndex; - bool commit = false; - try - { - int n; - int h = Bytes[ReaderIndex]; - if (h < 0x80) - { - ReaderIndex++; - n = h; - } - else if (h < 0xc0) - { - if (!CanRead(2)) { return EDeserializeError.NOT_ENOUGH; } - n = ((h & 0x3f) << 8) | Bytes[ReaderIndex + 1]; - ReaderIndex += 2; - } - else if (h < 0xe0) - { - if (!CanRead(3)) { return EDeserializeError.NOT_ENOUGH; } - n = ((h & 0x1f) << 16) | (Bytes[ReaderIndex + 1] << 8) | Bytes[ReaderIndex + 2]; - ReaderIndex += 3; - } - else if (h < 0xf0) - { - if (!CanRead(4)) { return EDeserializeError.NOT_ENOUGH; } - n = ((h & 0x0f) << 24) | (Bytes[ReaderIndex + 1] << 16) | (Bytes[ReaderIndex + 2] << 8) | Bytes[ReaderIndex + 3]; - ReaderIndex += 4; - } - else - { - return EDeserializeError.EXCEED_SIZE; - } - - if (n > maxSize) - { - return EDeserializeError.EXCEED_SIZE; - } - if (Remaining < n) - { - return EDeserializeError.NOT_ENOUGH; - } - - int inplaceReadIndex = ReaderIndex; - ReaderIndex += n; - - inplaceTempBody.Replace(Bytes, inplaceReadIndex, ReaderIndex); - commit = true; - } - finally - { - if (!commit) - { - ReaderIndex = oldReadIndex; - } - } - - return EDeserializeError.OK; - } - - public void WriteRawTag(byte b1) - { - EnsureWrite(1); - Bytes[WriterIndex++] = b1; - } - - public void WriteRawTag(byte b1, byte b2) - { - EnsureWrite(2); - Bytes[WriterIndex] = b1; - Bytes[WriterIndex + 1] = b2; - WriterIndex += 2; - } - - public void WriteRawTag(byte b1, byte b2, byte b3) - { - EnsureWrite(3); - Bytes[WriterIndex] = b1; - Bytes[WriterIndex + 1] = b2; - Bytes[WriterIndex + 2] = b3; - WriterIndex += 3; - } - - #region segment - - - public void BeginWriteSegment(out int oldSize) - { - oldSize = Size; - EnsureWrite(1); - WriterIndex += 1; - } - - public void EndWriteSegment(int oldSize) - { - int startPos = ReaderIndex + oldSize; - int segmentSize = WriterIndex - startPos - 1; - - // 0 111 1111 - if (segmentSize < 0x80) - { - Bytes[startPos] = (byte)segmentSize; - } - else if (segmentSize < 0x4000) // 10 11 1111, - - { - EnsureWrite(1); - Bytes[WriterIndex] = Bytes[startPos + 1]; - Bytes[startPos + 1] = (byte)segmentSize; - - Bytes[startPos] = (byte)((segmentSize >> 8) | 0x80); - WriterIndex += 1; - } - else if (segmentSize < 0x200000) // 110 1 1111, -,- - { - EnsureWrite(2); - Bytes[WriterIndex + 1] = Bytes[startPos + 2]; - Bytes[startPos + 2] = (byte)segmentSize; - - Bytes[WriterIndex] = Bytes[startPos + 1]; - Bytes[startPos + 1] = (byte)(segmentSize >> 8); - - Bytes[startPos] = (byte)((segmentSize >> 16) | 0xc0); - WriterIndex += 2; - } - else if (segmentSize < 0x10000000) // 1110 1111,-,-,- - { - EnsureWrite(3); - Bytes[WriterIndex + 2] = Bytes[startPos + 3]; - Bytes[startPos + 3] = (byte)segmentSize; - - Bytes[WriterIndex + 1] = Bytes[startPos + 2]; - Bytes[startPos + 2] = (byte)(segmentSize >> 8); - - Bytes[WriterIndex] = Bytes[startPos + 1]; - Bytes[startPos + 1] = (byte)(segmentSize >> 16); - - Bytes[startPos] = (byte)((segmentSize >> 24) | 0xe0); - WriterIndex += 3; - } - else - { - throw new SerializationException("exceed max segment size"); - } - } - - public void ReadSegment(out int startIndex, out int segmentSize) - { - EnsureRead(1); - int h = Bytes[ReaderIndex++]; - - startIndex = ReaderIndex; - - if (h < 0x80) - { - segmentSize = h; - ReaderIndex += segmentSize; - } - else if (h < 0xc0) - { - EnsureRead(1); - segmentSize = ((h & 0x3f) << 8) | Bytes[ReaderIndex]; - int endPos = ReaderIndex + segmentSize; - Bytes[ReaderIndex] = Bytes[endPos]; - ReaderIndex += segmentSize + 1; - } - else if (h < 0xe0) - { - EnsureRead(2); - segmentSize = ((h & 0x1f) << 16) | ((int)Bytes[ReaderIndex] << 8) | Bytes[ReaderIndex + 1]; - int endPos = ReaderIndex + segmentSize; - Bytes[ReaderIndex] = Bytes[endPos]; - Bytes[ReaderIndex + 1] = Bytes[endPos + 1]; - ReaderIndex += segmentSize + 2; - } - else if (h < 0xf0) - { - EnsureRead(3); - segmentSize = ((h & 0x0f) << 24) | ((int)Bytes[ReaderIndex] << 16) | ((int)Bytes[ReaderIndex + 1] << 8) | Bytes[ReaderIndex + 2]; - int endPos = ReaderIndex + segmentSize; - Bytes[ReaderIndex] = Bytes[endPos]; - Bytes[ReaderIndex + 1] = Bytes[endPos + 1]; - Bytes[ReaderIndex + 2] = Bytes[endPos + 2]; - ReaderIndex += segmentSize + 3; - } - else - { - throw new SerializationException("exceed max size"); - } - if (ReaderIndex > WriterIndex) - { - throw new SerializationException("segment data not enough"); - } - } - - public void ReadSegment(ByteBuf buf) - { - ReadSegment(out int startPos, out var size); - buf.Bytes = Bytes; - buf.ReaderIndex = startPos; - buf.WriterIndex = startPos + size; - } - - public void EnterSegment(out SegmentSaveState saveState) - { - ReadSegment(out int startPos, out int size); - - saveState = new SegmentSaveState(ReaderIndex, WriterIndex); - ReaderIndex = startPos; - WriterIndex = startPos + size; - } - - public void LeaveSegment(SegmentSaveState saveState) - { - ReaderIndex = saveState.ReaderIndex; - WriterIndex = saveState.WriterIndex; - } - - #endregion - - public override string ToString() - { - string[] datas = new string[WriterIndex - ReaderIndex]; - for (var i = ReaderIndex; i < WriterIndex; i++) - { - datas[i - ReaderIndex] = Bytes[i].ToString("X2"); - } - return string.Join(".", datas); - } - - public override bool Equals(object obj) - { - return (obj is ByteBuf other) && Equals(other); - } - - public bool Equals(ByteBuf other) - { - if (other == null) - { - return false; - } - if (Size != other.Size) - { - return false; - } - for (int i = 0, n = Size; i < n; i++) - { - if (Bytes[ReaderIndex + i] != other.Bytes[other.ReaderIndex + i]) - { - return false; - } - } - return true; - } - - public object Clone() - { - return new ByteBuf(CopyData()); - } - - - public static ByteBuf FromString(string value) - { - var ss = value.Split(','); - byte[] data = new byte[ss.Length]; - for (int i = 0; i < data.Length; i++) - { - data[i] = byte.Parse(ss[i]); - } - return new ByteBuf(data); - } - - public override int GetHashCode() - { - int hash = 17; - for (int i = ReaderIndex; i < WriterIndex; i++) - { - hash = hash * 23 + Bytes[i]; - } - return hash; - } - - public void Release() - { - _releaser?.Invoke(this); - } - -#if SUPPORT_PUERTS_ARRAYBUF - // -- add for puerts - public Puerts.ArrayBuffer ReadArrayBuffer() - { - return new Puerts.ArrayBuffer(ReadBytes()); - } - - public void WriteArrayBuffer(Puerts.ArrayBuffer bytes) - { - WriteBytes(bytes.Bytes); - } -#endif - } -} diff --git a/Assets/TEngine/Libraries/LubanLib/ByteBuf.cs.meta b/Assets/TEngine/Libraries/LubanLib/ByteBuf.cs.meta deleted file mode 100644 index 404bedaf..00000000 --- a/Assets/TEngine/Libraries/LubanLib/ByteBuf.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 28207b76cd2c1f94bb989512c6bdee60 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TEngine/Libraries/LubanLib/ITypeId.cs b/Assets/TEngine/Libraries/LubanLib/ITypeId.cs deleted file mode 100644 index 2b8d71a6..00000000 --- a/Assets/TEngine/Libraries/LubanLib/ITypeId.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Bright.Serialization -{ - public interface ITypeId - { - int GetTypeId(); - } -} diff --git a/Assets/TEngine/Libraries/LubanLib/ITypeId.cs.meta b/Assets/TEngine/Libraries/LubanLib/ITypeId.cs.meta deleted file mode 100644 index d0acd452..00000000 --- a/Assets/TEngine/Libraries/LubanLib/ITypeId.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: eb496f299578d6a429a600f5cce01f2c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TEngine/Libraries/LubanLib/LubanLib.asmdef b/Assets/TEngine/Libraries/LubanLib/LubanLib.asmdef deleted file mode 100644 index da6c53d7..00000000 --- a/Assets/TEngine/Libraries/LubanLib/LubanLib.asmdef +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "LubanLib", - "rootNamespace": "", - "references": [], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": true, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/TEngine/Libraries/LubanLib/LubanLib.asmdef.meta b/Assets/TEngine/Libraries/LubanLib/LubanLib.asmdef.meta deleted file mode 100644 index 7260dfc0..00000000 --- a/Assets/TEngine/Libraries/LubanLib/LubanLib.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b48be955427611241bcb6f2a07949c5b -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TEngine/Libraries/LubanLib/SimpleJSON.meta b/Assets/TEngine/Libraries/LubanLib/SimpleJSON.meta deleted file mode 100644 index 2408a08a..00000000 --- a/Assets/TEngine/Libraries/LubanLib/SimpleJSON.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 271b7719175d16941ba67aef3e8d58eb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/LICENSE b/Assets/TEngine/Libraries/LubanLib/SimpleJSON/LICENSE deleted file mode 100644 index c41ebf5e..00000000 --- a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2012-2017 Markus Göbel (Bunny83) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/LICENSE.meta b/Assets/TEngine/Libraries/LubanLib/SimpleJSON/LICENSE.meta deleted file mode 100644 index a967ad82..00000000 --- a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/LICENSE.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a1c67fb7a28f34040b970bf97f982827 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/README b/Assets/TEngine/Libraries/LubanLib/SimpleJSON/README deleted file mode 100644 index e69de29b..00000000 diff --git a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/README.meta b/Assets/TEngine/Libraries/LubanLib/SimpleJSON/README.meta deleted file mode 100644 index 0b1dc488..00000000 --- a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/README.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7e1422f3aa49df44599ebc3c951a98f3 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSON.cs b/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSON.cs deleted file mode 100644 index 47777245..00000000 --- a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSON.cs +++ /dev/null @@ -1,1434 +0,0 @@ -/* * * * * - * A simple JSON Parser / builder - * ------------------------------ - * - * It mainly has been written as a simple JSON parser. It can build a JSON string - * from the node-tree, or generate a node tree from any valid JSON string. - * - * Written by Bunny83 - * 2012-06-09 - * - * Changelog now external. See Changelog.txt - * - * The MIT License (MIT) - * - * Copyright (c) 2012-2019 Markus Göbel (Bunny83) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * * * * */ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text; - -namespace SimpleJSON -{ - public enum JSONNodeType - { - Array = 1, - Object = 2, - String = 3, - Number = 4, - NullValue = 5, - Boolean = 6, - None = 7, - Custom = 0xFF, - } - public enum JSONTextMode - { - Compact, - Indent - } - - public abstract partial class JSONNode - { - #region Enumerators - public struct Enumerator - { - private enum Type { None, Array, Object } - private Type type; - private Dictionary.Enumerator m_Object; - private List.Enumerator m_Array; - public bool IsValid { get { return type != Type.None; } } - public Enumerator(List.Enumerator aArrayEnum) - { - type = Type.Array; - m_Object = default(Dictionary.Enumerator); - m_Array = aArrayEnum; - } - public Enumerator(Dictionary.Enumerator aDictEnum) - { - type = Type.Object; - m_Object = aDictEnum; - m_Array = default(List.Enumerator); - } - public KeyValuePair Current - { - get - { - if (type == Type.Array) - return new KeyValuePair(string.Empty, m_Array.Current); - else if (type == Type.Object) - return m_Object.Current; - return new KeyValuePair(string.Empty, null); - } - } - public bool MoveNext() - { - if (type == Type.Array) - return m_Array.MoveNext(); - else if (type == Type.Object) - return m_Object.MoveNext(); - return false; - } - } - public struct ValueEnumerator - { - private Enumerator m_Enumerator; - public ValueEnumerator(List.Enumerator aArrayEnum) : this(new Enumerator(aArrayEnum)) { } - public ValueEnumerator(Dictionary.Enumerator aDictEnum) : this(new Enumerator(aDictEnum)) { } - public ValueEnumerator(Enumerator aEnumerator) { m_Enumerator = aEnumerator; } - public JSONNode Current { get { return m_Enumerator.Current.Value; } } - public bool MoveNext() { return m_Enumerator.MoveNext(); } - public ValueEnumerator GetEnumerator() { return this; } - } - public struct KeyEnumerator - { - private Enumerator m_Enumerator; - public KeyEnumerator(List.Enumerator aArrayEnum) : this(new Enumerator(aArrayEnum)) { } - public KeyEnumerator(Dictionary.Enumerator aDictEnum) : this(new Enumerator(aDictEnum)) { } - public KeyEnumerator(Enumerator aEnumerator) { m_Enumerator = aEnumerator; } - public string Current { get { return m_Enumerator.Current.Key; } } - public bool MoveNext() { return m_Enumerator.MoveNext(); } - public KeyEnumerator GetEnumerator() { return this; } - } - - public class LinqEnumerator : IEnumerator>, IEnumerable> - { - private JSONNode m_Node; - private Enumerator m_Enumerator; - internal LinqEnumerator(JSONNode aNode) - { - m_Node = aNode; - if (m_Node != null) - m_Enumerator = m_Node.GetEnumerator(); - } - public KeyValuePair Current { get { return m_Enumerator.Current; } } - object IEnumerator.Current { get { return m_Enumerator.Current; } } - public bool MoveNext() { return m_Enumerator.MoveNext(); } - - public void Dispose() - { - m_Node = null; - m_Enumerator = new Enumerator(); - } - - public IEnumerator> GetEnumerator() - { - return new LinqEnumerator(m_Node); - } - - public void Reset() - { - if (m_Node != null) - m_Enumerator = m_Node.GetEnumerator(); - } - - IEnumerator IEnumerable.GetEnumerator() - { - return new LinqEnumerator(m_Node); - } - } - - #endregion Enumerators - - #region common interface - - public static bool forceASCII = false; // Use Unicode by default - public static bool longAsString = false; // lazy creator creates a JSONString instead of JSONNumber - public static bool allowLineComments = true; // allow "//"-style comments at the end of a line - - public abstract JSONNodeType Tag { get; } - - public virtual JSONNode this[int aIndex] { get { return null; } set { } } - - public virtual JSONNode this[string aKey] { get { return null; } set { } } - - public virtual string Value { get { return ""; } set { } } - - public virtual int Count { get { return 0; } } - - public virtual bool IsNumber { get { return false; } } - public virtual bool IsString { get { return false; } } - public virtual bool IsBoolean { get { return false; } } - public virtual bool IsNull { get { return false; } } - public virtual bool IsArray { get { return false; } } - public virtual bool IsObject { get { return false; } } - - public virtual bool Inline { get { return false; } set { } } - - public virtual void Add(string aKey, JSONNode aItem) - { - } - public virtual void Add(JSONNode aItem) - { - Add("", aItem); - } - - public virtual JSONNode Remove(string aKey) - { - return null; - } - - public virtual JSONNode Remove(int aIndex) - { - return null; - } - - public virtual JSONNode Remove(JSONNode aNode) - { - return aNode; - } - public virtual void Clear() { } - - public virtual JSONNode Clone() - { - return null; - } - - public virtual IEnumerable Children - { - get - { - yield break; - } - } - - public IEnumerable DeepChildren - { - get - { - foreach (var C in Children) - foreach (var D in C.DeepChildren) - yield return D; - } - } - - public virtual bool HasKey(string aKey) - { - return false; - } - - public virtual JSONNode GetValueOrDefault(string aKey, JSONNode aDefault) - { - return aDefault; - } - - public override string ToString() - { - StringBuilder sb = new StringBuilder(); - WriteToStringBuilder(sb, 0, 0, JSONTextMode.Compact); - return sb.ToString(); - } - - public virtual string ToString(int aIndent) - { - StringBuilder sb = new StringBuilder(); - WriteToStringBuilder(sb, 0, aIndent, JSONTextMode.Indent); - return sb.ToString(); - } - internal abstract void WriteToStringBuilder(StringBuilder aSB, int aIndent, int aIndentInc, JSONTextMode aMode); - - public abstract Enumerator GetEnumerator(); - public IEnumerable> Linq { get { return new LinqEnumerator(this); } } - public KeyEnumerator Keys { get { return new KeyEnumerator(GetEnumerator()); } } - public ValueEnumerator Values { get { return new ValueEnumerator(GetEnumerator()); } } - - #endregion common interface - - #region typecasting properties - - - public virtual double AsDouble - { - get - { - double v = 0.0; - if (double.TryParse(Value, NumberStyles.Float, CultureInfo.InvariantCulture, out v)) - return v; - return 0.0; - } - set - { - Value = value.ToString(CultureInfo.InvariantCulture); - } - } - - public virtual int AsInt - { - get { return (int)AsDouble; } - set { AsDouble = value; } - } - - public virtual float AsFloat - { - get { return (float)AsDouble; } - set { AsDouble = value; } - } - - public virtual bool AsBool - { - get - { - bool v = false; - if (bool.TryParse(Value, out v)) - return v; - return !string.IsNullOrEmpty(Value); - } - set - { - Value = (value) ? "true" : "false"; - } - } - - public virtual long AsLong - { - get - { - long val = 0; - if (long.TryParse(Value, out val)) - return val; - return 0L; - } - set - { - Value = value.ToString(); - } - } - - public virtual ulong AsULong - { - get - { - ulong val = 0; - if (ulong.TryParse(Value, out val)) - return val; - return 0; - } - set - { - Value = value.ToString(); - } - } - - public virtual JSONArray AsArray - { - get - { - return this as JSONArray; - } - } - - public virtual JSONObject AsObject - { - get - { - return this as JSONObject; - } - } - - - #endregion typecasting properties - - #region operators - - public static implicit operator JSONNode(string s) - { - return (s == null) ? (JSONNode) JSONNull.CreateOrGet() : new JSONString(s); - } - public static implicit operator string(JSONNode d) - { - return (d == null) ? null : d.Value; - } - - public static implicit operator JSONNode(double n) - { - return new JSONNumber(n); - } - public static implicit operator double(JSONNode d) - { - return (d == null) ? 0 : d.AsDouble; - } - - public static implicit operator JSONNode(float n) - { - return new JSONNumber(n); - } - public static implicit operator float(JSONNode d) - { - return (d == null) ? 0 : d.AsFloat; - } - - public static implicit operator JSONNode(int n) - { - return new JSONNumber(n); - } - public static implicit operator int(JSONNode d) - { - return (d == null) ? 0 : d.AsInt; - } - - public static implicit operator JSONNode(long n) - { - if (longAsString) - return new JSONString(n.ToString()); - return new JSONNumber(n); - } - public static implicit operator long(JSONNode d) - { - return (d == null) ? 0L : d.AsLong; - } - - public static implicit operator JSONNode(ulong n) - { - if (longAsString) - return new JSONString(n.ToString()); - return new JSONNumber(n); - } - public static implicit operator ulong(JSONNode d) - { - return (d == null) ? 0 : d.AsULong; - } - - public static implicit operator JSONNode(bool b) - { - return new JSONBool(b); - } - public static implicit operator bool(JSONNode d) - { - return (d == null) ? false : d.AsBool; - } - - public static implicit operator JSONNode(KeyValuePair aKeyValue) - { - return aKeyValue.Value; - } - - public static bool operator ==(JSONNode a, object b) - { - if (ReferenceEquals(a, b)) - return true; - bool aIsNull = a is JSONNull || ReferenceEquals(a, null) || a is JSONLazyCreator; - bool bIsNull = b is JSONNull || ReferenceEquals(b, null) || b is JSONLazyCreator; - if (aIsNull && bIsNull) - return true; - return !aIsNull && a.Equals(b); - } - - public static bool operator !=(JSONNode a, object b) - { - return !(a == b); - } - - public override bool Equals(object obj) - { - return ReferenceEquals(this, obj); - } - - public override int GetHashCode() - { - return base.GetHashCode(); - } - - #endregion operators - - [ThreadStatic] - private static StringBuilder m_EscapeBuilder; - internal static StringBuilder EscapeBuilder - { - get - { - if (m_EscapeBuilder == null) - m_EscapeBuilder = new StringBuilder(); - return m_EscapeBuilder; - } - } - internal static string Escape(string aText) - { - var sb = EscapeBuilder; - sb.Length = 0; - if (sb.Capacity < aText.Length + aText.Length / 10) - sb.Capacity = aText.Length + aText.Length / 10; - foreach (char c in aText) - { - switch (c) - { - case '\\': - sb.Append("\\\\"); - break; - case '\"': - sb.Append("\\\""); - break; - case '\n': - sb.Append("\\n"); - break; - case '\r': - sb.Append("\\r"); - break; - case '\t': - sb.Append("\\t"); - break; - case '\b': - sb.Append("\\b"); - break; - case '\f': - sb.Append("\\f"); - break; - default: - if (c < ' ' || (forceASCII && c > 127)) - { - ushort val = c; - sb.Append("\\u").Append(val.ToString("X4")); - } - else - sb.Append(c); - break; - } - } - string result = sb.ToString(); - sb.Length = 0; - return result; - } - - private static JSONNode ParseElement(string token, bool quoted) - { - if (quoted) - return token; - if (token.Length <= 5) - { - string tmp = token.ToLower(); - if (tmp == "false" || tmp == "true") - return tmp == "true"; - if (tmp == "null") - return JSONNull.CreateOrGet(); - } - double val; - if (double.TryParse(token, NumberStyles.Float, CultureInfo.InvariantCulture, out val)) - return val; - else - return token; - } - - public static JSONNode Parse(string aJSON) - { - Stack stack = new Stack(); - JSONNode ctx = null; - int i = 0; - StringBuilder Token = new StringBuilder(); - string TokenName = ""; - bool QuoteMode = false; - bool TokenIsQuoted = false; - bool HasNewlineChar = false; - while (i < aJSON.Length) - { - switch (aJSON[i]) - { - case '{': - if (QuoteMode) - { - Token.Append(aJSON[i]); - break; - } - stack.Push(new JSONObject()); - if (ctx != null) - { - ctx.Add(TokenName, stack.Peek()); - } - TokenName = ""; - Token.Length = 0; - ctx = stack.Peek(); - HasNewlineChar = false; - break; - - case '[': - if (QuoteMode) - { - Token.Append(aJSON[i]); - break; - } - - stack.Push(new JSONArray()); - if (ctx != null) - { - ctx.Add(TokenName, stack.Peek()); - } - TokenName = ""; - Token.Length = 0; - ctx = stack.Peek(); - HasNewlineChar = false; - break; - - case '}': - case ']': - if (QuoteMode) - { - - Token.Append(aJSON[i]); - break; - } - if (stack.Count == 0) - throw new Exception("JSON Parse: Too many closing brackets"); - - stack.Pop(); - if (Token.Length > 0 || TokenIsQuoted) - ctx.Add(TokenName, ParseElement(Token.ToString(), TokenIsQuoted)); - if (ctx != null) - ctx.Inline = !HasNewlineChar; - TokenIsQuoted = false; - TokenName = ""; - Token.Length = 0; - if (stack.Count > 0) - ctx = stack.Peek(); - break; - - case ':': - if (QuoteMode) - { - Token.Append(aJSON[i]); - break; - } - TokenName = Token.ToString(); - Token.Length = 0; - TokenIsQuoted = false; - break; - - case '"': - QuoteMode ^= true; - TokenIsQuoted |= QuoteMode; - break; - - case ',': - if (QuoteMode) - { - Token.Append(aJSON[i]); - break; - } - if (Token.Length > 0 || TokenIsQuoted) - ctx.Add(TokenName, ParseElement(Token.ToString(), TokenIsQuoted)); - TokenIsQuoted = false; - TokenName = ""; - Token.Length = 0; - TokenIsQuoted = false; - break; - - case '\r': - case '\n': - HasNewlineChar = true; - break; - - case ' ': - case '\t': - if (QuoteMode) - Token.Append(aJSON[i]); - break; - - case '\\': - ++i; - if (QuoteMode) - { - char C = aJSON[i]; - switch (C) - { - case 't': - Token.Append('\t'); - break; - case 'r': - Token.Append('\r'); - break; - case 'n': - Token.Append('\n'); - break; - case 'b': - Token.Append('\b'); - break; - case 'f': - Token.Append('\f'); - break; - case 'u': - { - string s = aJSON.Substring(i + 1, 4); - Token.Append((char)int.Parse( - s, - System.Globalization.NumberStyles.AllowHexSpecifier)); - i += 4; - break; - } - default: - Token.Append(C); - break; - } - } - break; - case '/': - if (allowLineComments && !QuoteMode && i + 1 < aJSON.Length && aJSON[i + 1] == '/') - { - while (++i < aJSON.Length && aJSON[i] != '\n' && aJSON[i] != '\r') ; - break; - } - Token.Append(aJSON[i]); - break; - case '\uFEFF': // remove / ignore BOM (Byte Order Mark) - break; - - default: - Token.Append(aJSON[i]); - break; - } - ++i; - } - if (QuoteMode) - { - throw new Exception("JSON Parse: Quotation marks seems to be messed up."); - } - if (ctx == null) - return ParseElement(Token.ToString(), TokenIsQuoted); - return ctx; - } - - } - // End of JSONNode - - public partial class JSONArray : JSONNode - { - private List m_List = new List(); - private bool inline = false; - public override bool Inline - { - get { return inline; } - set { inline = value; } - } - - public override JSONNodeType Tag { get { return JSONNodeType.Array; } } - public override bool IsArray { get { return true; } } - public override Enumerator GetEnumerator() { return new Enumerator(m_List.GetEnumerator()); } - - public override JSONNode this[int aIndex] - { - get - { - if (aIndex < 0 || aIndex >= m_List.Count) - return new JSONLazyCreator(this); - return m_List[aIndex]; - } - set - { - if (value == null) - value = JSONNull.CreateOrGet(); - if (aIndex < 0 || aIndex >= m_List.Count) - m_List.Add(value); - else - m_List[aIndex] = value; - } - } - - public override JSONNode this[string aKey] - { - get { return new JSONLazyCreator(this); } - set - { - if (value == null) - value = JSONNull.CreateOrGet(); - m_List.Add(value); - } - } - - public override int Count - { - get { return m_List.Count; } - } - - public override void Add(string aKey, JSONNode aItem) - { - if (aItem == null) - aItem = JSONNull.CreateOrGet(); - m_List.Add(aItem); - } - - public override JSONNode Remove(int aIndex) - { - if (aIndex < 0 || aIndex >= m_List.Count) - return null; - JSONNode tmp = m_List[aIndex]; - m_List.RemoveAt(aIndex); - return tmp; - } - - public override JSONNode Remove(JSONNode aNode) - { - m_List.Remove(aNode); - return aNode; - } - - public override void Clear() - { - m_List.Clear(); - } - - public override JSONNode Clone() - { - var node = new JSONArray(); - node.m_List.Capacity = m_List.Capacity; - foreach(var n in m_List) - { - if (n != null) - node.Add(n.Clone()); - else - node.Add(null); - } - return node; - } - - public override IEnumerable Children - { - get - { - foreach (JSONNode N in m_List) - yield return N; - } - } - - - internal override void WriteToStringBuilder(StringBuilder aSB, int aIndent, int aIndentInc, JSONTextMode aMode) - { - aSB.Append('['); - int count = m_List.Count; - if (inline) - aMode = JSONTextMode.Compact; - for (int i = 0; i < count; i++) - { - if (i > 0) - aSB.Append(','); - if (aMode == JSONTextMode.Indent) - aSB.AppendLine(); - - if (aMode == JSONTextMode.Indent) - aSB.Append(' ', aIndent + aIndentInc); - m_List[i].WriteToStringBuilder(aSB, aIndent + aIndentInc, aIndentInc, aMode); - } - if (aMode == JSONTextMode.Indent) - aSB.AppendLine().Append(' ', aIndent); - aSB.Append(']'); - } - } - // End of JSONArray - - public partial class JSONObject : JSONNode - { - private Dictionary m_Dict = new Dictionary(); - - private bool inline = false; - public override bool Inline - { - get { return inline; } - set { inline = value; } - } - - public override JSONNodeType Tag { get { return JSONNodeType.Object; } } - public override bool IsObject { get { return true; } } - - public override Enumerator GetEnumerator() { return new Enumerator(m_Dict.GetEnumerator()); } - - - public override JSONNode this[string aKey] - { - get - { - if (m_Dict.ContainsKey(aKey)) - return m_Dict[aKey]; - else - return new JSONLazyCreator(this, aKey); - } - set - { - if (value == null) - value = JSONNull.CreateOrGet(); - if (m_Dict.ContainsKey(aKey)) - m_Dict[aKey] = value; - else - m_Dict.Add(aKey, value); - } - } - - public override JSONNode this[int aIndex] - { - get - { - if (aIndex < 0 || aIndex >= m_Dict.Count) - return null; - return m_Dict.ElementAt(aIndex).Value; - } - set - { - if (value == null) - value = JSONNull.CreateOrGet(); - if (aIndex < 0 || aIndex >= m_Dict.Count) - return; - string key = m_Dict.ElementAt(aIndex).Key; - m_Dict[key] = value; - } - } - - public override int Count - { - get { return m_Dict.Count; } - } - - public override void Add(string aKey, JSONNode aItem) - { - if (aItem == null) - aItem = JSONNull.CreateOrGet(); - - if (aKey != null) - { - if (m_Dict.ContainsKey(aKey)) - m_Dict[aKey] = aItem; - else - m_Dict.Add(aKey, aItem); - } - else - m_Dict.Add(Guid.NewGuid().ToString(), aItem); - } - - public override JSONNode Remove(string aKey) - { - if (!m_Dict.ContainsKey(aKey)) - return null; - JSONNode tmp = m_Dict[aKey]; - m_Dict.Remove(aKey); - return tmp; - } - - public override JSONNode Remove(int aIndex) - { - if (aIndex < 0 || aIndex >= m_Dict.Count) - return null; - var item = m_Dict.ElementAt(aIndex); - m_Dict.Remove(item.Key); - return item.Value; - } - - public override JSONNode Remove(JSONNode aNode) - { - try - { - var item = m_Dict.Where(k => k.Value == aNode).First(); - m_Dict.Remove(item.Key); - return aNode; - } - catch - { - return null; - } - } - - public override void Clear() - { - m_Dict.Clear(); - } - - public override JSONNode Clone() - { - var node = new JSONObject(); - foreach (var n in m_Dict) - { - node.Add(n.Key, n.Value.Clone()); - } - return node; - } - - public override bool HasKey(string aKey) - { - return m_Dict.ContainsKey(aKey); - } - - public override JSONNode GetValueOrDefault(string aKey, JSONNode aDefault) - { - JSONNode res; - if (m_Dict.TryGetValue(aKey, out res)) - return res; - return aDefault; - } - - public override IEnumerable Children - { - get - { - foreach (KeyValuePair N in m_Dict) - yield return N.Value; - } - } - - internal override void WriteToStringBuilder(StringBuilder aSB, int aIndent, int aIndentInc, JSONTextMode aMode) - { - aSB.Append('{'); - bool first = true; - if (inline) - aMode = JSONTextMode.Compact; - foreach (var k in m_Dict) - { - if (!first) - aSB.Append(','); - first = false; - if (aMode == JSONTextMode.Indent) - aSB.AppendLine(); - if (aMode == JSONTextMode.Indent) - aSB.Append(' ', aIndent + aIndentInc); - aSB.Append('\"').Append(Escape(k.Key)).Append('\"'); - if (aMode == JSONTextMode.Compact) - aSB.Append(':'); - else - aSB.Append(" : "); - k.Value.WriteToStringBuilder(aSB, aIndent + aIndentInc, aIndentInc, aMode); - } - if (aMode == JSONTextMode.Indent) - aSB.AppendLine().Append(' ', aIndent); - aSB.Append('}'); - } - - } - // End of JSONObject - - public partial class JSONString : JSONNode - { - private string m_Data; - - public override JSONNodeType Tag { get { return JSONNodeType.String; } } - public override bool IsString { get { return true; } } - - public override Enumerator GetEnumerator() { return new Enumerator(); } - - - public override string Value - { - get { return m_Data; } - set - { - m_Data = value; - } - } - - public JSONString(string aData) - { - m_Data = aData; - } - public override JSONNode Clone() - { - return new JSONString(m_Data); - } - - internal override void WriteToStringBuilder(StringBuilder aSB, int aIndent, int aIndentInc, JSONTextMode aMode) - { - aSB.Append('\"').Append(Escape(m_Data)).Append('\"'); - } - public override bool Equals(object obj) - { - if (base.Equals(obj)) - return true; - string s = obj as string; - if (s != null) - return m_Data == s; - JSONString s2 = obj as JSONString; - if (s2 != null) - return m_Data == s2.m_Data; - return false; - } - public override int GetHashCode() - { - return m_Data.GetHashCode(); - } - public override void Clear() - { - m_Data = ""; - } - } - // End of JSONString - - public partial class JSONNumber : JSONNode - { - private double m_Data; - - public override JSONNodeType Tag { get { return JSONNodeType.Number; } } - public override bool IsNumber { get { return true; } } - public override Enumerator GetEnumerator() { return new Enumerator(); } - - public override string Value - { - get { return m_Data.ToString(CultureInfo.InvariantCulture); } - set - { - double v; - if (double.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture, out v)) - m_Data = v; - } - } - - public override double AsDouble - { - get { return m_Data; } - set { m_Data = value; } - } - public override long AsLong - { - get { return (long)m_Data; } - set { m_Data = value; } - } - public override ulong AsULong - { - get { return (ulong)m_Data; } - set { m_Data = value; } - } - - public JSONNumber(double aData) - { - m_Data = aData; - } - - public JSONNumber(string aData) - { - Value = aData; - } - - public override JSONNode Clone() - { - return new JSONNumber(m_Data); - } - - internal override void WriteToStringBuilder(StringBuilder aSB, int aIndent, int aIndentInc, JSONTextMode aMode) - { - aSB.Append(Value); - } - private static bool IsNumeric(object value) - { - return value is int || value is uint - || value is float || value is double - || value is decimal - || value is long || value is ulong - || value is short || value is ushort - || value is sbyte || value is byte; - } - public override bool Equals(object obj) - { - if (obj == null) - return false; - if (base.Equals(obj)) - return true; - JSONNumber s2 = obj as JSONNumber; - if (s2 != null) - return m_Data == s2.m_Data; - if (IsNumeric(obj)) - return Convert.ToDouble(obj) == m_Data; - return false; - } - public override int GetHashCode() - { - return m_Data.GetHashCode(); - } - public override void Clear() - { - m_Data = 0; - } - } - // End of JSONNumber - - public partial class JSONBool : JSONNode - { - private bool m_Data; - - public override JSONNodeType Tag { get { return JSONNodeType.Boolean; } } - public override bool IsBoolean { get { return true; } } - public override Enumerator GetEnumerator() { return new Enumerator(); } - - public override string Value - { - get { return m_Data.ToString(); } - set - { - bool v; - if (bool.TryParse(value, out v)) - m_Data = v; - } - } - public override bool AsBool - { - get { return m_Data; } - set { m_Data = value; } - } - - public JSONBool(bool aData) - { - m_Data = aData; - } - - public JSONBool(string aData) - { - Value = aData; - } - - public override JSONNode Clone() - { - return new JSONBool(m_Data); - } - - internal override void WriteToStringBuilder(StringBuilder aSB, int aIndent, int aIndentInc, JSONTextMode aMode) - { - aSB.Append((m_Data) ? "true" : "false"); - } - public override bool Equals(object obj) - { - if (obj == null) - return false; - if (obj is bool) - return m_Data == (bool)obj; - return false; - } - public override int GetHashCode() - { - return m_Data.GetHashCode(); - } - public override void Clear() - { - m_Data = false; - } - } - // End of JSONBool - - public partial class JSONNull : JSONNode - { - static JSONNull m_StaticInstance = new JSONNull(); - public static bool reuseSameInstance = true; - public static JSONNull CreateOrGet() - { - if (reuseSameInstance) - return m_StaticInstance; - return new JSONNull(); - } - private JSONNull() { } - - public override JSONNodeType Tag { get { return JSONNodeType.NullValue; } } - public override bool IsNull { get { return true; } } - public override Enumerator GetEnumerator() { return new Enumerator(); } - - public override string Value - { - get { return "null"; } - set { } - } - public override bool AsBool - { - get { return false; } - set { } - } - - public override JSONNode Clone() - { - return CreateOrGet(); - } - - public override bool Equals(object obj) - { - if (object.ReferenceEquals(this, obj)) - return true; - return (obj is JSONNull); - } - public override int GetHashCode() - { - return 0; - } - - internal override void WriteToStringBuilder(StringBuilder aSB, int aIndent, int aIndentInc, JSONTextMode aMode) - { - aSB.Append("null"); - } - } - // End of JSONNull - - internal partial class JSONLazyCreator : JSONNode - { - private JSONNode m_Node = null; - private string m_Key = null; - public override JSONNodeType Tag { get { return JSONNodeType.None; } } - public override Enumerator GetEnumerator() { return new Enumerator(); } - - public JSONLazyCreator(JSONNode aNode) - { - m_Node = aNode; - m_Key = null; - } - - public JSONLazyCreator(JSONNode aNode, string aKey) - { - m_Node = aNode; - m_Key = aKey; - } - - private T Set(T aVal) where T : JSONNode - { - if (m_Key == null) - m_Node.Add(aVal); - else - m_Node.Add(m_Key, aVal); - m_Node = null; // Be GC friendly. - return aVal; - } - - public override JSONNode this[int aIndex] - { - get { return new JSONLazyCreator(this); } - set { Set(new JSONArray()).Add(value); } - } - - public override JSONNode this[string aKey] - { - get { return new JSONLazyCreator(this, aKey); } - set { Set(new JSONObject()).Add(aKey, value); } - } - - public override void Add(JSONNode aItem) - { - Set(new JSONArray()).Add(aItem); - } - - public override void Add(string aKey, JSONNode aItem) - { - Set(new JSONObject()).Add(aKey, aItem); - } - - public static bool operator ==(JSONLazyCreator a, object b) - { - if (b == null) - return true; - return System.Object.ReferenceEquals(a, b); - } - - public static bool operator !=(JSONLazyCreator a, object b) - { - return !(a == b); - } - - public override bool Equals(object obj) - { - if (obj == null) - return true; - return System.Object.ReferenceEquals(this, obj); - } - - public override int GetHashCode() - { - return 0; - } - - public override int AsInt - { - get { Set(new JSONNumber(0)); return 0; } - set { Set(new JSONNumber(value)); } - } - - public override float AsFloat - { - get { Set(new JSONNumber(0.0f)); return 0.0f; } - set { Set(new JSONNumber(value)); } - } - - public override double AsDouble - { - get { Set(new JSONNumber(0.0)); return 0.0; } - set { Set(new JSONNumber(value)); } - } - - public override long AsLong - { - get - { - if (longAsString) - Set(new JSONString("0")); - else - Set(new JSONNumber(0.0)); - return 0L; - } - set - { - if (longAsString) - Set(new JSONString(value.ToString())); - else - Set(new JSONNumber(value)); - } - } - - public override ulong AsULong - { - get - { - if (longAsString) - Set(new JSONString("0")); - else - Set(new JSONNumber(0.0)); - return 0L; - } - set - { - if (longAsString) - Set(new JSONString(value.ToString())); - else - Set(new JSONNumber(value)); - } - } - - public override bool AsBool - { - get { Set(new JSONBool(false)); return false; } - set { Set(new JSONBool(value)); } - } - - public override JSONArray AsArray - { - get { return Set(new JSONArray()); } - } - - public override JSONObject AsObject - { - get { return Set(new JSONObject()); } - } - internal override void WriteToStringBuilder(StringBuilder aSB, int aIndent, int aIndentInc, JSONTextMode aMode) - { - aSB.Append("null"); - } - } - // End of JSONLazyCreator - - public static class JSON - { - public static JSONNode Parse(string aJSON) - { - return JSONNode.Parse(aJSON); - } - } -} diff --git a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSON.cs.meta b/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSON.cs.meta deleted file mode 100644 index 8391748f..00000000 --- a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSON.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 94f6ac1c525fff1408a03b9f299e6252 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONBinary.cs b/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONBinary.cs deleted file mode 100644 index df72f133..00000000 --- a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONBinary.cs +++ /dev/null @@ -1,301 +0,0 @@ -//#define USE_SharpZipLib -/* * * * * - * This is an extension of the SimpleJSON framework to provide methods to - * serialize a JSON object tree into a compact binary format. Optionally the - * binary stream can be compressed with the SharpZipLib when using the define - * "USE_SharpZipLib" - * - * Those methods where originally part of the framework but since it's rarely - * used I've extracted this part into this seperate module file. - * - * You can use the define "SimpleJSON_ExcludeBinary" to selectively disable - * this extension without the need to remove the file from the project. - * - * If you want to use compression when saving to file / stream / B64 you have to include - * SharpZipLib ( http://www.icsharpcode.net/opensource/sharpziplib/ ) in your project and - * define "USE_SharpZipLib" at the top of the file - * - * - * The MIT License (MIT) - * - * Copyright (c) 2012-2017 Markus Göbel (Bunny83) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * * * * */ -using System; - -namespace SimpleJSON -{ -#if !SimpleJSON_ExcludeBinary - public abstract partial class JSONNode - { - public abstract void SerializeBinary(System.IO.BinaryWriter aWriter); - - public void SaveToBinaryStream(System.IO.Stream aData) - { - var W = new System.IO.BinaryWriter(aData); - SerializeBinary(W); - } - -#if USE_SharpZipLib - public void SaveToCompressedStream(System.IO.Stream aData) - { - using (var gzipOut = new ICSharpCode.SharpZipLib.BZip2.BZip2OutputStream(aData)) - { - gzipOut.IsStreamOwner = false; - SaveToBinaryStream(gzipOut); - gzipOut.Close(); - } - } - - public void SaveToCompressedFile(string aFileName) - { - - System.IO.Directory.CreateDirectory((new System.IO.FileInfo(aFileName)).Directory.FullName); - using(var F = System.IO.File.OpenWrite(aFileName)) - { - SaveToCompressedStream(F); - } - } - public string SaveToCompressedBase64() - { - using (var stream = new System.IO.MemoryStream()) - { - SaveToCompressedStream(stream); - stream.Position = 0; - return System.Convert.ToBase64String(stream.ToArray()); - } - } - -#else - public void SaveToCompressedStream(System.IO.Stream aData) - { - throw new Exception("Can't use compressed functions. You need include the SharpZipLib and uncomment the define at the top of SimpleJSON"); - } - - public void SaveToCompressedFile(string aFileName) - { - throw new Exception("Can't use compressed functions. You need include the SharpZipLib and uncomment the define at the top of SimpleJSON"); - } - - public string SaveToCompressedBase64() - { - throw new Exception("Can't use compressed functions. You need include the SharpZipLib and uncomment the define at the top of SimpleJSON"); - } -#endif - - public void SaveToBinaryFile(string aFileName) - { - System.IO.Directory.CreateDirectory((new System.IO.FileInfo(aFileName)).Directory.FullName); - using (var F = System.IO.File.OpenWrite(aFileName)) - { - SaveToBinaryStream(F); - } - } - - public string SaveToBinaryBase64() - { - using (var stream = new System.IO.MemoryStream()) - { - SaveToBinaryStream(stream); - stream.Position = 0; - return System.Convert.ToBase64String(stream.ToArray()); - } - } - - public static JSONNode DeserializeBinary(System.IO.BinaryReader aReader) - { - JSONNodeType type = (JSONNodeType)aReader.ReadByte(); - switch (type) - { - case JSONNodeType.Array: - { - int count = aReader.ReadInt32(); - JSONArray tmp = new JSONArray(); - for (int i = 0; i < count; i++) - tmp.Add(DeserializeBinary(aReader)); - return tmp; - } - case JSONNodeType.Object: - { - int count = aReader.ReadInt32(); - JSONObject tmp = new JSONObject(); - for (int i = 0; i < count; i++) - { - string key = aReader.ReadString(); - var val = DeserializeBinary(aReader); - tmp.Add(key, val); - } - return tmp; - } - case JSONNodeType.String: - { - return new JSONString(aReader.ReadString()); - } - case JSONNodeType.Number: - { - return new JSONNumber(aReader.ReadDouble()); - } - case JSONNodeType.Boolean: - { - return new JSONBool(aReader.ReadBoolean()); - } - case JSONNodeType.NullValue: - { - return JSONNull.CreateOrGet(); - } - default: - { - throw new Exception("Error deserializing JSON. Unknown tag: " + type); - } - } - } - -#if USE_SharpZipLib - public static JSONNode LoadFromCompressedStream(System.IO.Stream aData) - { - var zin = new ICSharpCode.SharpZipLib.BZip2.BZip2InputStream(aData); - return LoadFromBinaryStream(zin); - } - public static JSONNode LoadFromCompressedFile(string aFileName) - { - using(var F = System.IO.File.OpenRead(aFileName)) - { - return LoadFromCompressedStream(F); - } - } - public static JSONNode LoadFromCompressedBase64(string aBase64) - { - var tmp = System.Convert.FromBase64String(aBase64); - var stream = new System.IO.MemoryStream(tmp); - stream.Position = 0; - return LoadFromCompressedStream(stream); - } -#else - public static JSONNode LoadFromCompressedFile(string aFileName) - { - throw new Exception("Can't use compressed functions. You need include the SharpZipLib and uncomment the define at the top of SimpleJSON"); - } - - public static JSONNode LoadFromCompressedStream(System.IO.Stream aData) - { - throw new Exception("Can't use compressed functions. You need include the SharpZipLib and uncomment the define at the top of SimpleJSON"); - } - - public static JSONNode LoadFromCompressedBase64(string aBase64) - { - throw new Exception("Can't use compressed functions. You need include the SharpZipLib and uncomment the define at the top of SimpleJSON"); - } -#endif - - public static JSONNode LoadFromBinaryStream(System.IO.Stream aData) - { - using (var R = new System.IO.BinaryReader(aData)) - { - return DeserializeBinary(R); - } - } - - public static JSONNode LoadFromBinaryFile(string aFileName) - { - using (var F = System.IO.File.OpenRead(aFileName)) - { - return LoadFromBinaryStream(F); - } - } - - public static JSONNode LoadFromBinaryBase64(string aBase64) - { - var tmp = System.Convert.FromBase64String(aBase64); - var stream = new System.IO.MemoryStream(tmp); - stream.Position = 0; - return LoadFromBinaryStream(stream); - } - } - - public partial class JSONArray : JSONNode - { - public override void SerializeBinary(System.IO.BinaryWriter aWriter) - { - aWriter.Write((byte)JSONNodeType.Array); - aWriter.Write(m_List.Count); - for (int i = 0; i < m_List.Count; i++) - { - m_List[i].SerializeBinary(aWriter); - } - } - } - - public partial class JSONObject : JSONNode - { - public override void SerializeBinary(System.IO.BinaryWriter aWriter) - { - aWriter.Write((byte)JSONNodeType.Object); - aWriter.Write(m_Dict.Count); - foreach (string K in m_Dict.Keys) - { - aWriter.Write(K); - m_Dict[K].SerializeBinary(aWriter); - } - } - } - - public partial class JSONString : JSONNode - { - public override void SerializeBinary(System.IO.BinaryWriter aWriter) - { - aWriter.Write((byte)JSONNodeType.String); - aWriter.Write(m_Data); - } - } - - public partial class JSONNumber : JSONNode - { - public override void SerializeBinary(System.IO.BinaryWriter aWriter) - { - aWriter.Write((byte)JSONNodeType.Number); - aWriter.Write(m_Data); - } - } - - public partial class JSONBool : JSONNode - { - public override void SerializeBinary(System.IO.BinaryWriter aWriter) - { - aWriter.Write((byte)JSONNodeType.Boolean); - aWriter.Write(m_Data); - } - } - public partial class JSONNull : JSONNode - { - public override void SerializeBinary(System.IO.BinaryWriter aWriter) - { - aWriter.Write((byte)JSONNodeType.NullValue); - } - } - internal partial class JSONLazyCreator : JSONNode - { - public override void SerializeBinary(System.IO.BinaryWriter aWriter) - { - - } - } -#endif -} diff --git a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONBinary.cs.meta b/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONBinary.cs.meta deleted file mode 100644 index c0f7b78c..00000000 --- a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONBinary.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 527736d8e73a6a044a27a4c3f5a713d3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONDotNetTypes.cs b/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONDotNetTypes.cs deleted file mode 100644 index 9c24e136..00000000 --- a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONDotNetTypes.cs +++ /dev/null @@ -1,516 +0,0 @@ -#region License and information -/* * * * * - * - * Extension file for the SimpleJSON framework for better support of some common - * .NET types. It does only work together with the SimpleJSON.cs - * It provides direct conversion support for types like decimal, char, byte, - * sbyte, short, ushort, uint, DateTime, TimeSpan and Guid. In addition there - * are conversion helpers for converting an array of number values into a byte[] - * or a List as well as converting an array of string values into a string[] - * or List. - * Finally there are some additional type conversion operators for some nullable - * types like short?, int?, float?, double?, long? and bool?. They will actually - * assign a JSONNull value when it's null or a JSONNumber when it's not. - * - * The MIT License (MIT) - * - * Copyright (c) 2020 Markus Göbel (Bunny83) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * * * * */ - -#endregion License and information - -namespace SimpleJSON -{ - using System.Globalization; - using System.Collections.Generic; - public partial class JSONNode - { - #region Decimal - public virtual decimal AsDecimal - { - get - { - decimal result; - if (!decimal.TryParse(Value, out result)) - result = 0; - return result; - } - set - { - Value = value.ToString(); - } - } - - public static implicit operator JSONNode(decimal aDecimal) - { - return new JSONString(aDecimal.ToString()); - } - - public static implicit operator decimal(JSONNode aNode) - { - return aNode.AsDecimal; - } - #endregion Decimal - - #region Char - public virtual char AsChar - { - get - { - if (IsString && Value.Length > 0) - return Value[0]; - if (IsNumber) - return (char)AsInt; - return '\0'; - } - set - { - if (IsString) - Value = value.ToString(); - else if (IsNumber) - AsInt = (int)value; - } - } - - public static implicit operator JSONNode(char aChar) - { - return new JSONString(aChar.ToString()); - } - - public static implicit operator char(JSONNode aNode) - { - return aNode.AsChar; - } - #endregion Decimal - - #region UInt - public virtual uint AsUInt - { - get - { - return (uint)AsDouble; - } - set - { - AsDouble = value; - } - } - - public static implicit operator JSONNode(uint aUInt) - { - return new JSONNumber(aUInt); - } - - public static implicit operator uint(JSONNode aNode) - { - return aNode.AsUInt; - } - #endregion UInt - - #region Byte - public virtual byte AsByte - { - get - { - return (byte)AsInt; - } - set - { - AsInt = value; - } - } - - public static implicit operator JSONNode(byte aByte) - { - return new JSONNumber(aByte); - } - - public static implicit operator byte(JSONNode aNode) - { - return aNode.AsByte; - } - #endregion Byte - #region SByte - public virtual sbyte AsSByte - { - get - { - return (sbyte)AsInt; - } - set - { - AsInt = value; - } - } - - public static implicit operator JSONNode(sbyte aSByte) - { - return new JSONNumber(aSByte); - } - - public static implicit operator sbyte(JSONNode aNode) - { - return aNode.AsSByte; - } - #endregion SByte - - #region Short - public virtual short AsShort - { - get - { - return (short)AsInt; - } - set - { - AsInt = value; - } - } - - public static implicit operator JSONNode(short aShort) - { - return new JSONNumber(aShort); - } - - public static implicit operator short(JSONNode aNode) - { - return aNode.AsShort; - } - #endregion Short - #region UShort - public virtual ushort AsUShort - { - get - { - return (ushort)AsInt; - } - set - { - AsInt = value; - } - } - - public static implicit operator JSONNode(ushort aUShort) - { - return new JSONNumber(aUShort); - } - - public static implicit operator ushort(JSONNode aNode) - { - return aNode.AsUShort; - } - #endregion UShort - - #region DateTime - public virtual System.DateTime AsDateTime - { - get - { - System.DateTime result; - if (!System.DateTime.TryParse(Value, CultureInfo.InvariantCulture, DateTimeStyles.None, out result)) - result = new System.DateTime(0); - return result; - } - set - { - Value = value.ToString(CultureInfo.InvariantCulture); - } - } - - public static implicit operator JSONNode(System.DateTime aDateTime) - { - return new JSONString(aDateTime.ToString(CultureInfo.InvariantCulture)); - } - - public static implicit operator System.DateTime(JSONNode aNode) - { - return aNode.AsDateTime; - } - #endregion DateTime - #region TimeSpan - public virtual System.TimeSpan AsTimeSpan - { - get - { - System.TimeSpan result; - if (!System.TimeSpan.TryParse(Value, CultureInfo.InvariantCulture, out result)) - result = new System.TimeSpan(0); - return result; - } - set - { - Value = value.ToString(); - } - } - - public static implicit operator JSONNode(System.TimeSpan aTimeSpan) - { - return new JSONString(aTimeSpan.ToString()); - } - - public static implicit operator System.TimeSpan(JSONNode aNode) - { - return aNode.AsTimeSpan; - } - #endregion TimeSpan - - #region Guid - public virtual System.Guid AsGuid - { - get - { - System.Guid result; - System.Guid.TryParse(Value, out result); - return result; - } - set - { - Value = value.ToString(); - } - } - - public static implicit operator JSONNode(System.Guid aGuid) - { - return new JSONString(aGuid.ToString()); - } - - public static implicit operator System.Guid(JSONNode aNode) - { - return aNode.AsGuid; - } - #endregion Guid - - #region ByteArray - public virtual byte[] AsByteArray - { - get - { - if (this.IsNull || !this.IsArray) - return null; - int count = Count; - byte[] result = new byte[count]; - for (int i = 0; i < count; i++) - result[i] = this[i].AsByte; - return result; - } - set - { - if (!IsArray || value == null) - return; - Clear(); - for (int i = 0; i < value.Length; i++) - Add(value[i]); - } - } - - public static implicit operator JSONNode(byte[] aByteArray) - { - return new JSONArray { AsByteArray = aByteArray }; - } - - public static implicit operator byte[](JSONNode aNode) - { - return aNode.AsByteArray; - } - #endregion ByteArray - #region ByteList - public virtual List AsByteList - { - get - { - if (this.IsNull || !this.IsArray) - return null; - int count = Count; - List result = new List(count); - for (int i = 0; i < count; i++) - result.Add(this[i].AsByte); - return result; - } - set - { - if (!IsArray || value == null) - return; - Clear(); - for (int i = 0; i < value.Count; i++) - Add(value[i]); - } - } - - public static implicit operator JSONNode(List aByteList) - { - return new JSONArray { AsByteList = aByteList }; - } - - public static implicit operator List (JSONNode aNode) - { - return aNode.AsByteList; - } - #endregion ByteList - - #region StringArray - public virtual string[] AsStringArray - { - get - { - if (this.IsNull || !this.IsArray) - return null; - int count = Count; - string[] result = new string[count]; - for (int i = 0; i < count; i++) - result[i] = this[i].Value; - return result; - } - set - { - if (!IsArray || value == null) - return; - Clear(); - for (int i = 0; i < value.Length; i++) - Add(value[i]); - } - } - - public static implicit operator JSONNode(string[] aStringArray) - { - return new JSONArray { AsStringArray = aStringArray }; - } - - public static implicit operator string[] (JSONNode aNode) - { - return aNode.AsStringArray; - } - #endregion StringArray - #region StringList - public virtual List AsStringList - { - get - { - if (this.IsNull || !this.IsArray) - return null; - int count = Count; - List result = new List(count); - for (int i = 0; i < count; i++) - result.Add(this[i].Value); - return result; - } - set - { - if (!IsArray || value == null) - return; - Clear(); - for (int i = 0; i < value.Count; i++) - Add(value[i]); - } - } - - public static implicit operator JSONNode(List aStringList) - { - return new JSONArray { AsStringList = aStringList }; - } - - public static implicit operator List (JSONNode aNode) - { - return aNode.AsStringList; - } - #endregion StringList - - #region NullableTypes - public static implicit operator JSONNode(int? aValue) - { - if (aValue == null) - return JSONNull.CreateOrGet(); - return new JSONNumber((int)aValue); - } - public static implicit operator int?(JSONNode aNode) - { - if (aNode == null || aNode.IsNull) - return null; - return aNode.AsInt; - } - - public static implicit operator JSONNode(float? aValue) - { - if (aValue == null) - return JSONNull.CreateOrGet(); - return new JSONNumber((float)aValue); - } - public static implicit operator float? (JSONNode aNode) - { - if (aNode == null || aNode.IsNull) - return null; - return aNode.AsFloat; - } - - public static implicit operator JSONNode(double? aValue) - { - if (aValue == null) - return JSONNull.CreateOrGet(); - return new JSONNumber((double)aValue); - } - public static implicit operator double? (JSONNode aNode) - { - if (aNode == null || aNode.IsNull) - return null; - return aNode.AsDouble; - } - - public static implicit operator JSONNode(bool? aValue) - { - if (aValue == null) - return JSONNull.CreateOrGet(); - return new JSONBool((bool)aValue); - } - public static implicit operator bool? (JSONNode aNode) - { - if (aNode == null || aNode.IsNull) - return null; - return aNode.AsBool; - } - - public static implicit operator JSONNode(long? aValue) - { - if (aValue == null) - return JSONNull.CreateOrGet(); - return new JSONNumber((long)aValue); - } - public static implicit operator long? (JSONNode aNode) - { - if (aNode == null || aNode.IsNull) - return null; - return aNode.AsLong; - } - - public static implicit operator JSONNode(short? aValue) - { - if (aValue == null) - return JSONNull.CreateOrGet(); - return new JSONNumber((short)aValue); - } - public static implicit operator short? (JSONNode aNode) - { - if (aNode == null || aNode.IsNull) - return null; - return aNode.AsShort; - } - #endregion NullableTypes - } -} diff --git a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONDotNetTypes.cs.meta b/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONDotNetTypes.cs.meta deleted file mode 100644 index 871d3c64..00000000 --- a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONDotNetTypes.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3ed716432925e134a8ab90917c118c9d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONUnity.cs b/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONUnity.cs deleted file mode 100644 index ee8a9121..00000000 --- a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONUnity.cs +++ /dev/null @@ -1,462 +0,0 @@ -#if UNITY_5_3_OR_NEWER -#region License and information -/* * * * * - * - * Unity extension for the SimpleJSON framework. It does only work together with - * the SimpleJSON.cs - * It provides several helpers and conversion operators to serialize/deserialize - * common Unity types such as Vector2/3/4, Rect, RectOffset, Quaternion and - * Matrix4x4 as JSONObject or JSONArray. - * This extension will add 3 static settings to the JSONNode class: - * ( VectorContainerType, QuaternionContainerType, RectContainerType ) which - * control what node type should be used for serializing the given type. So a - * Vector3 as array would look like [12,32,24] and {"x":12, "y":32, "z":24} as - * object. - * - * - * The MIT License (MIT) - * - * Copyright (c) 2012-2017 Markus Göbel (Bunny83) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * * * * */ - -#endregion License and information -using UnityEngine; - -namespace SimpleJSON -{ - public enum JSONContainerType { Array, Object } - public partial class JSONNode - { - public static byte Color32DefaultAlpha = 255; - public static float ColorDefaultAlpha = 1f; - public static JSONContainerType VectorContainerType = JSONContainerType.Array; - public static JSONContainerType QuaternionContainerType = JSONContainerType.Array; - public static JSONContainerType RectContainerType = JSONContainerType.Array; - public static JSONContainerType ColorContainerType = JSONContainerType.Array; - private static JSONNode GetContainer(JSONContainerType aType) - { - if (aType == JSONContainerType.Array) - return new JSONArray(); - return new JSONObject(); - } - - #region implicit conversion operators - public static implicit operator JSONNode(Vector2 aVec) - { - JSONNode n = GetContainer(VectorContainerType); - n.WriteVector2(aVec); - return n; - } - public static implicit operator JSONNode(Vector3 aVec) - { - JSONNode n = GetContainer(VectorContainerType); - n.WriteVector3(aVec); - return n; - } - public static implicit operator JSONNode(Vector4 aVec) - { - JSONNode n = GetContainer(VectorContainerType); - n.WriteVector4(aVec); - return n; - } - public static implicit operator JSONNode(Color aCol) - { - JSONNode n = GetContainer(ColorContainerType); - n.WriteColor(aCol); - return n; - } - public static implicit operator JSONNode(Color32 aCol) - { - JSONNode n = GetContainer(ColorContainerType); - n.WriteColor32(aCol); - return n; - } - public static implicit operator JSONNode(Quaternion aRot) - { - JSONNode n = GetContainer(QuaternionContainerType); - n.WriteQuaternion(aRot); - return n; - } - public static implicit operator JSONNode(Rect aRect) - { - JSONNode n = GetContainer(RectContainerType); - n.WriteRect(aRect); - return n; - } - public static implicit operator JSONNode(RectOffset aRect) - { - JSONNode n = GetContainer(RectContainerType); - n.WriteRectOffset(aRect); - return n; - } - - public static implicit operator Vector2(JSONNode aNode) - { - return aNode.ReadVector2(); - } - public static implicit operator Vector3(JSONNode aNode) - { - return aNode.ReadVector3(); - } - public static implicit operator Vector4(JSONNode aNode) - { - return aNode.ReadVector4(); - } - public static implicit operator Color(JSONNode aNode) - { - return aNode.ReadColor(); - } - public static implicit operator Color32(JSONNode aNode) - { - return aNode.ReadColor32(); - } - public static implicit operator Quaternion(JSONNode aNode) - { - return aNode.ReadQuaternion(); - } - public static implicit operator Rect(JSONNode aNode) - { - return aNode.ReadRect(); - } - public static implicit operator RectOffset(JSONNode aNode) - { - return aNode.ReadRectOffset(); - } - #endregion implicit conversion operators - - #region Vector2 - public Vector2 ReadVector2(Vector2 aDefault) - { - if (IsObject) - return new Vector2(this["x"].AsFloat, this["y"].AsFloat); - if (IsArray) - return new Vector2(this[0].AsFloat, this[1].AsFloat); - return aDefault; - } - public Vector2 ReadVector2(string aXName, string aYName) - { - if (IsObject) - { - return new Vector2(this[aXName].AsFloat, this[aYName].AsFloat); - } - return Vector2.zero; - } - - public Vector2 ReadVector2() - { - return ReadVector2(Vector2.zero); - } - public JSONNode WriteVector2(Vector2 aVec, string aXName = "x", string aYName = "y") - { - if (IsObject) - { - Inline = true; - this[aXName].AsFloat = aVec.x; - this[aYName].AsFloat = aVec.y; - } - else if (IsArray) - { - Inline = true; - this[0].AsFloat = aVec.x; - this[1].AsFloat = aVec.y; - } - return this; - } - #endregion Vector2 - - #region Vector3 - public Vector3 ReadVector3(Vector3 aDefault) - { - if (IsObject) - return new Vector3(this["x"].AsFloat, this["y"].AsFloat, this["z"].AsFloat); - if (IsArray) - return new Vector3(this[0].AsFloat, this[1].AsFloat, this[2].AsFloat); - return aDefault; - } - public Vector3 ReadVector3(string aXName, string aYName, string aZName) - { - if (IsObject) - return new Vector3(this[aXName].AsFloat, this[aYName].AsFloat, this[aZName].AsFloat); - return Vector3.zero; - } - public Vector3 ReadVector3() - { - return ReadVector3(Vector3.zero); - } - public JSONNode WriteVector3(Vector3 aVec, string aXName = "x", string aYName = "y", string aZName = "z") - { - if (IsObject) - { - Inline = true; - this[aXName].AsFloat = aVec.x; - this[aYName].AsFloat = aVec.y; - this[aZName].AsFloat = aVec.z; - } - else if (IsArray) - { - Inline = true; - this[0].AsFloat = aVec.x; - this[1].AsFloat = aVec.y; - this[2].AsFloat = aVec.z; - } - return this; - } - #endregion Vector3 - - #region Vector4 - public Vector4 ReadVector4(Vector4 aDefault) - { - if (IsObject) - return new Vector4(this["x"].AsFloat, this["y"].AsFloat, this["z"].AsFloat, this["w"].AsFloat); - if (IsArray) - return new Vector4(this[0].AsFloat, this[1].AsFloat, this[2].AsFloat, this[3].AsFloat); - return aDefault; - } - public Vector4 ReadVector4() - { - return ReadVector4(Vector4.zero); - } - public JSONNode WriteVector4(Vector4 aVec) - { - if (IsObject) - { - Inline = true; - this["x"].AsFloat = aVec.x; - this["y"].AsFloat = aVec.y; - this["z"].AsFloat = aVec.z; - this["w"].AsFloat = aVec.w; - } - else if (IsArray) - { - Inline = true; - this[0].AsFloat = aVec.x; - this[1].AsFloat = aVec.y; - this[2].AsFloat = aVec.z; - this[3].AsFloat = aVec.w; - } - return this; - } - #endregion Vector4 - - #region Color / Color32 - public Color ReadColor(Color aDefault) - { - if (IsObject) - return new Color(this["r"].AsFloat, this["g"].AsFloat, this["b"].AsFloat, HasKey("a")?this["a"].AsFloat:ColorDefaultAlpha); - if (IsArray) - return new Color(this[0].AsFloat, this[1].AsFloat, this[2].AsFloat, (Count>3)?this[3].AsFloat:ColorDefaultAlpha); - return aDefault; - } - public Color ReadColor() - { - return ReadColor(Color.clear); - } - public JSONNode WriteColor(Color aCol) - { - if (IsObject) - { - Inline = true; - this["r"].AsFloat = aCol.r; - this["g"].AsFloat = aCol.g; - this["b"].AsFloat = aCol.b; - this["a"].AsFloat = aCol.a; - } - else if (IsArray) - { - Inline = true; - this[0].AsFloat = aCol.r; - this[1].AsFloat = aCol.g; - this[2].AsFloat = aCol.b; - this[3].AsFloat = aCol.a; - } - return this; - } - - public Color32 ReadColor32(Color32 aDefault) - { - if (IsObject) - return new Color32((byte)this["r"].AsInt, (byte)this["g"].AsInt, (byte)this["b"].AsInt, (byte)(HasKey("a")?this["a"].AsInt:Color32DefaultAlpha)); - if (IsArray) - return new Color32((byte)this[0].AsInt, (byte)this[1].AsInt, (byte)this[2].AsInt, (byte)((Count>3)?this[3].AsInt:Color32DefaultAlpha)); - return aDefault; - } - public Color32 ReadColor32() - { - return ReadColor32(new Color32()); - } - public JSONNode WriteColor32(Color32 aCol) - { - if (IsObject) - { - Inline = true; - this["r"].AsInt = aCol.r; - this["g"].AsInt = aCol.g; - this["b"].AsInt = aCol.b; - this["a"].AsInt = aCol.a; - } - else if (IsArray) - { - Inline = true; - this[0].AsInt = aCol.r; - this[1].AsInt = aCol.g; - this[2].AsInt = aCol.b; - this[3].AsInt = aCol.a; - } - return this; - } - - #endregion Color / Color32 - - #region Quaternion - public Quaternion ReadQuaternion(Quaternion aDefault) - { - if (IsObject) - return new Quaternion(this["x"].AsFloat, this["y"].AsFloat, this["z"].AsFloat, this["w"].AsFloat); - if (IsArray) - return new Quaternion(this[0].AsFloat, this[1].AsFloat, this[2].AsFloat, this[3].AsFloat); - return aDefault; - } - public Quaternion ReadQuaternion() - { - return ReadQuaternion(Quaternion.identity); - } - public JSONNode WriteQuaternion(Quaternion aRot) - { - if (IsObject) - { - Inline = true; - this["x"].AsFloat = aRot.x; - this["y"].AsFloat = aRot.y; - this["z"].AsFloat = aRot.z; - this["w"].AsFloat = aRot.w; - } - else if (IsArray) - { - Inline = true; - this[0].AsFloat = aRot.x; - this[1].AsFloat = aRot.y; - this[2].AsFloat = aRot.z; - this[3].AsFloat = aRot.w; - } - return this; - } - #endregion Quaternion - - #region Rect - public Rect ReadRect(Rect aDefault) - { - if (IsObject) - return new Rect(this["x"].AsFloat, this["y"].AsFloat, this["width"].AsFloat, this["height"].AsFloat); - if (IsArray) - return new Rect(this[0].AsFloat, this[1].AsFloat, this[2].AsFloat, this[3].AsFloat); - return aDefault; - } - public Rect ReadRect() - { - return ReadRect(new Rect()); - } - public JSONNode WriteRect(Rect aRect) - { - if (IsObject) - { - Inline = true; - this["x"].AsFloat = aRect.x; - this["y"].AsFloat = aRect.y; - this["width"].AsFloat = aRect.width; - this["height"].AsFloat = aRect.height; - } - else if (IsArray) - { - Inline = true; - this[0].AsFloat = aRect.x; - this[1].AsFloat = aRect.y; - this[2].AsFloat = aRect.width; - this[3].AsFloat = aRect.height; - } - return this; - } - #endregion Rect - - #region RectOffset - public RectOffset ReadRectOffset(RectOffset aDefault) - { - if (this is JSONObject) - return new RectOffset(this["left"].AsInt, this["right"].AsInt, this["top"].AsInt, this["bottom"].AsInt); - if (this is JSONArray) - return new RectOffset(this[0].AsInt, this[1].AsInt, this[2].AsInt, this[3].AsInt); - return aDefault; - } - public RectOffset ReadRectOffset() - { - return ReadRectOffset(new RectOffset()); - } - public JSONNode WriteRectOffset(RectOffset aRect) - { - if (IsObject) - { - Inline = true; - this["left"].AsInt = aRect.left; - this["right"].AsInt = aRect.right; - this["top"].AsInt = aRect.top; - this["bottom"].AsInt = aRect.bottom; - } - else if (IsArray) - { - Inline = true; - this[0].AsInt = aRect.left; - this[1].AsInt = aRect.right; - this[2].AsInt = aRect.top; - this[3].AsInt = aRect.bottom; - } - return this; - } - #endregion RectOffset - - #region Matrix4x4 - public Matrix4x4 ReadMatrix() - { - Matrix4x4 result = Matrix4x4.identity; - if (IsArray) - { - for (int i = 0; i < 16; i++) - { - result[i] = this[i].AsFloat; - } - } - return result; - } - public JSONNode WriteMatrix(Matrix4x4 aMatrix) - { - if (IsArray) - { - Inline = true; - for (int i = 0; i < 16; i++) - { - this[i].AsFloat = aMatrix[i]; - } - } - return this; - } - #endregion Matrix4x4 - } -} -#endif diff --git a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONUnity.cs.meta b/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONUnity.cs.meta deleted file mode 100644 index a6246f41..00000000 --- a/Assets/TEngine/Libraries/LubanLib/SimpleJSON/SimpleJSONUnity.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 03ae607b1bfdb9043ba6bba186e06165 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TEngine/Libraries/LubanLib/StringUtil.cs b/Assets/TEngine/Libraries/LubanLib/StringUtil.cs deleted file mode 100644 index c91f2a11..00000000 --- a/Assets/TEngine/Libraries/LubanLib/StringUtil.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System.Collections.Generic; -using System.Text; - -namespace Bright.Common -{ - public static class StringUtil - { - public static string ToStr(object o) - { - return ToStr(o, new StringBuilder()); - } - - public static string ToStr(object o, StringBuilder sb) - { - foreach (var p in o.GetType().GetFields()) - { - - sb.Append($"{p.Name} = {p.GetValue(o)},"); - } - - foreach (var p in o.GetType().GetProperties()) - { - sb.Append($"{p.Name} = {p.GetValue(o)},"); - } - return sb.ToString(); - } - - public static string ArrayToString(T[] arr) - { - return "[" + string.Join(",", arr) + "]"; - } - - - public static string CollectionToString(IEnumerable arr) - { - return "[" + string.Join(",", arr) + "]"; - } - - - public static string CollectionToString(IDictionary dic) - { - var sb = new StringBuilder('{'); - foreach (var e in dic) - { - sb.Append(e.Key).Append(':'); - sb.Append(e.Value).Append(','); - } - sb.Append('}'); - return sb.ToString(); - } - } -} diff --git a/Assets/TEngine/Libraries/LubanLib/StringUtil.cs.meta b/Assets/TEngine/Libraries/LubanLib/StringUtil.cs.meta deleted file mode 100644 index 75ec967b..00000000 --- a/Assets/TEngine/Libraries/LubanLib/StringUtil.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: aab76bc328e69914394493ca645f6988 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: