diff --git a/protocol/src/main/resources/gdscript/ProtocolTemplate.gd b/protocol/src/main/resources/gdscript/ProtocolTemplate.gd index d914ba0e..58deba72 100644 --- a/protocol/src/main/resources/gdscript/ProtocolTemplate.gd +++ b/protocol/src/main/resources/gdscript/ProtocolTemplate.gd @@ -3,7 +3,7 @@ const PROTOCOL_ID = {} {} {} -func get_class() -> String: +func toString() -> String: return "{}" static func write(buffer, packet): diff --git a/protocol/src/main/resources/gdscript/buffer/ByteBuffer.gd b/protocol/src/main/resources/gdscript/buffer/ByteBuffer.gd index 00cc1105..b8669330 100644 --- a/protocol/src/main/resources/gdscript/buffer/ByteBuffer.gd +++ b/protocol/src/main/resources/gdscript/buffer/ByteBuffer.gd @@ -428,12 +428,20 @@ func writePacketArray(array, protocolId): protocolRegistration.write(self, element) func readPacketArray(protocolId): - var array = [] + var protocolRegistration = ProtocolManager.getProtocol(protocolId) + var array = Array([], typeof(protocolRegistration), StringName("RefCounted"), protocolRegistration) var size = readInt() if (size > 0): - var protocolRegistration = ProtocolManager.getProtocol(protocolId) for index in range(size): array.append(protocolRegistration.read(self)) + #var a = array.get_typed_class_name() + #var b = array.get_typed_script() + #var c = array.get_typed_builtin() + + #var typeArray: Array[ObjectA] = [] + #var aa = typeArray.get_typed_class_name() + #var bb = typeArray.get_typed_script() + #var cc = typeArray.get_typed_builtin() return array func writeIntIntMap(map): diff --git a/storage/src/test/java/com/zfoo/storage/export/ExportBinaryTest.java b/storage/src/test/java/com/zfoo/storage/export/ExportBinaryTest.java index 3a322e95..9e6928db 100644 --- a/storage/src/test/java/com/zfoo/storage/export/ExportBinaryTest.java +++ b/storage/src/test/java/com/zfoo/storage/export/ExportBinaryTest.java @@ -20,6 +20,7 @@ import com.zfoo.protocol.serializer.CodeLanguage; import com.zfoo.protocol.util.FileUtils; import com.zfoo.protocol.util.JsonUtils; import com.zfoo.storage.manager.StorageManager; +import com.zfoo.storage.model.anno.ExcelFieldName; import com.zfoo.storage.model.anno.Id; import com.zfoo.storage.model.anno.Resource; import com.zfoo.storage.model.config.StorageConfig; @@ -60,6 +61,7 @@ public class ExportBinaryTest { public int id; public String name; + @ExcelFieldName("年龄") public int age; public float score; public String[] courses;