diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdStringSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdStringSerializer.java index 0b99efab..b9f43acf 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdStringSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GdStringSerializer.java @@ -33,14 +33,14 @@ public class GdStringSerializer implements IGdSerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { - GenerateProtocolFile.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("buffer.writeString({})", objectStr)).append(LS); } @Override public String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration) { String result = "result" + GenerateProtocolFile.index.getAndIncrement(); - GenerateProtocolFile.addTab(builder, deep); + GenerateProtocolFile.addTabAscii(builder, deep); builder.append(StringUtils.format("var {} = buffer.readString()", result)).append(LS); return result; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GenerateGdUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GenerateGdUtils.java index e75603cf..df78ff93 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GenerateGdUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/gdscript/GenerateGdUtils.java @@ -186,7 +186,7 @@ public abstract class GenerateGdUtils { var field = sequencedFields.get(i); IFieldRegistration fieldRegistration = fieldRegistrations[GenerateProtocolFile.indexOf(fields, field)]; var fieldName = field.getName(); - gdBuilder.append(TAB_ASCII).append(StringUtils.format("map[\"{}\"] = {}", fieldName, fieldName)); + gdBuilder.append(TAB_ASCII).append(StringUtils.format("m[\"{}\"] = {}", fieldName, fieldName)); if (i != sequencedFields.size() - 1) { gdBuilder.append(LS); } diff --git a/protocol/src/main/resources/gdscript/ProtocolTemplate.gd b/protocol/src/main/resources/gdscript/ProtocolTemplate.gd index 8bbc33ef..f1922e18 100644 --- a/protocol/src/main/resources/gdscript/ProtocolTemplate.gd +++ b/protocol/src/main/resources/gdscript/ProtocolTemplate.gd @@ -4,13 +4,10 @@ const PROTOCOL_CLASS_NAME = "{}" {} {} -func map() -> Dictionary: - var map = {} -{} - return map - func _to_string() -> String: - return JSON.stringify(map()) + var m = {} +{} + return JSON.stringify(m) static func write(buffer, packet): if (buffer.writePacketFlag(packet)):