From fc0d177b77007037f7f14db6da55c92d57c2694c Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Tue, 24 Mar 2020 21:35:32 +0800 Subject: [PATCH] =?UTF-8?q?erlang=E5=AD=97=E7=AC=A6=E4=B8=B2=E8=BD=AC?= =?UTF-8?q?=E4=B8=BA=E4=BA=8C=E8=BF=9B=E5=88=B6=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 +- config_excel/client/cfg_array_example1.lua | 433 +++++++++++++++++++++ config_excel/client/cfg_array_example2.lua | 313 +++++++++++++++ config_excel/client/cfg_array_example3.lua | 10 + config_excel/client/cfg_object.lua | 132 +++++++ config_excel/server/cfg_array_example1.erl | 311 +++++++++++++++ config_excel/server/cfg_array_example1.hrl | 13 + config_excel/server/cfg_array_example1.lua | 433 +++++++++++++++++++++ config_excel/server/cfg_array_example2.erl | 74 ++++ config_excel/server/cfg_array_example2.hrl | 12 + config_excel/server/cfg_array_example2.lua | 282 ++++++++++++++ config_excel/server/cfg_array_example3.erl | 14 + config_excel/server/cfg_array_example3.lua | 10 + config_excel/server/cfg_object.erl | 58 +++ config_excel/server/cfg_object.lua | 153 ++++++++ lancher.bat | 14 +- src/writer_erlang_erl.py | 12 +- src/writer_erlang_hrl.py | 4 +- 18 files changed, 2266 insertions(+), 16 deletions(-) create mode 100644 config_excel/client/cfg_array_example1.lua create mode 100644 config_excel/client/cfg_array_example2.lua create mode 100644 config_excel/client/cfg_array_example3.lua create mode 100644 config_excel/client/cfg_object.lua create mode 100644 config_excel/server/cfg_array_example1.erl create mode 100644 config_excel/server/cfg_array_example1.hrl create mode 100644 config_excel/server/cfg_array_example1.lua create mode 100644 config_excel/server/cfg_array_example2.erl create mode 100644 config_excel/server/cfg_array_example2.hrl create mode 100644 config_excel/server/cfg_array_example2.lua create mode 100644 config_excel/server/cfg_array_example3.erl create mode 100644 config_excel/server/cfg_array_example3.lua create mode 100644 config_excel/server/cfg_object.erl create mode 100644 config_excel/server/cfg_object.lua diff --git a/.gitignore b/.gitignore index adafb51..af4eb2b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ __pycache__/ # C extensions *.so - +.idea # yongzhong office temp file $* @@ -108,5 +108,3 @@ ENV/ # mypy .mypy_cache/ -config_excel/ - diff --git a/config_excel/client/cfg_array_example1.lua b/config_excel/client/cfg_array_example1.lua new file mode 100644 index 0000000..6385ee7 --- /dev/null +++ b/config_excel/client/cfg_array_example1.lua @@ -0,0 +1,433 @@ +-- Automatic generation from -->> +-- excel file name: A_array表示例--cfg_array +-- excel sheet name: 示例1-example1 + +local cfg_array_example1 = +--: id ## 唯一id +--: str ## 佩戴位置 +--: level ## 等级 +--: sub_level ## 等级 +--: name ## 装备名字 +--: attr ## 装备增加属性 +--: desc ## 装备来源描述 + +{ + [1001] = + { + pos1 = + { + [88] = + { + [1] = + { + id = 1001, + str = 'pos1', + level = 88, + sub_level = 1, + name = '黑切+蓝盾', + desc = '从小城镇', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 900 + } + } + }, + [2] = + { + id = 1001, + str = 'pos1', + level = 88, + sub_level = 2, + name = '黑切+蓝盾', + desc = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 900 + } + } + } + }, + [89] = + { + [89] = + { + id = 1001, + str = 'pos1', + level = 89, + sub_level = 89, + name = '黑切+蓝盾', + desc = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 900 + } + } + } + } + }, + pos2 = + { + [88] = + { + [88.9] = + { + id = 1001, + str = 'pos2', + level = 88, + sub_level = 88.9, + name = '黑切+蓝盾', + desc = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 900 + } + } + } + }, + [89] = + { + [89] = + { + id = 1001, + str = 'pos2', + level = 89, + sub_level = 89, + name = '黑切+蓝盾', + desc = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 900 + } + } + } + } + } + }, + [1002] = + { + pos1 = + { + [88] = + { + [88] = + { + id = 1002, + str = 'pos1', + level = 88, + sub_level = 88, + name = '黑切+蓝盾', + desc = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 901 + } + } + } + }, + [89] = + { + [89] = + { + id = 1002, + str = 'pos1', + level = 89, + sub_level = 89, + name = '黑切+蓝盾', + desc = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 900 + } + } + } + }, + [90] = + { + [90] = + { + id = 1002, + str = 'pos1', + level = 90, + sub_level = 90, + name = '黑切+蓝盾', + desc = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 901 + } + } + } + } + }, + pos2 = + { + [88] = + { + [88] = + { + id = 1002, + str = 'pos2', + level = 88, + sub_level = 88, + name = '黑切+蓝盾', + desc = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 901 + } + } + } + }, + [89] = + { + [89] = + { + id = 1002, + str = 'pos2', + level = 89, + sub_level = 89, + name = '黑切+蓝盾', + desc = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 900 + } + } + } + }, + [90] = + { + [90] = + { + id = 1002, + str = 'pos2', + level = 90, + sub_level = 90, + name = '黑切+蓝盾', + desc = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 901 + } + } + } + } + } + }, + [1003] = + { + pos1 = + { + [85] = + { + [85] = + { + id = 1003, + str = 'pos1', + level = 85, + sub_level = 85, + name = '黑切+蓝盾', + desc = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 902 + } + } + } + } + } + }, + [1004] = + { + pos1 = + { + [80] = + { + [80] = + { + id = 1004, + str = 'pos1', + level = 80, + sub_level = 80, + name = '黑切+蓝盾', + desc = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 903 + } + } + } + } + } + } +} +return cfg_array_example1 \ No newline at end of file diff --git a/config_excel/client/cfg_array_example2.lua b/config_excel/client/cfg_array_example2.lua new file mode 100644 index 0000000..c3717a7 --- /dev/null +++ b/config_excel/client/cfg_array_example2.lua @@ -0,0 +1,313 @@ +-- Automatic generation from -->> +-- excel file name: A_array表示例--cfg_array +-- excel sheet name: 示例2+example2 + +local cfg_array_example2 = +--: id ## 英雄id +--: name ## 英雄名字 +--: material ## 合成消耗 +--: attr ## 属性 +--: desc ## 来源描述(服务器不导出) +--: award1 ## 奖励1 +--: award2 ## 奖励2 + +{ + [1] = + { + id = 1, + name = 'examp1001', + material = + { + [1] = + { + res = 1, + id = 10001, + count = 1 + }, + [2] = + { + res = 1, + id = 10001, + count = 1 + } + }, + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 900 + }, + [4] = + { + add = + { + [1] = 4, + [2] = 100 + } + } + }, + desc = + { + [1] = '来源1', + [2] = '来源2', + [3] = '来源4' + }, + award1 = + { + [1] = 1, + [2] = 2, + [3] = 3 + }, + award2 = + { + id = 1, + type = 2, + num = 3 + } + }, + [2] = + { + id = 2, + name = 'examp1002', + material = + { + res = 1, + id = 10001, + count = 1 + }, + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 901 + }, + [4] = + { + add = + { + [1] = 5, + [2] = 100 + } + } + }, + desc = + { + [1] = '来源1', + [2] = '来源2', + [3] = '来源4' + }, + award1 = + { + [1] = 1, + [2] = 2, + [3] = 3 + }, + award2 = + { + id = 1, + type = 2, + num = 3 + } + }, + [3] = + { + id = 3, + name = 'examp1003', + material = + { + [1] = 1, + [2] = 2, + [3] = 3, + [4] = 4, + [5] = 5, + [6] = 6, + [7] = 7, + [8] = 8, + [9] = 9, + [10] = 9, + [11] = 9, + [12] = 9, + [13] = 9, + [14] = 9, + [15] = 9, + [16] = 9, + [17] = 9, + [18] = 9 + }, + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 902 + }, + [4] = + { + add = + { + [1] = 6, + [2] = 100 + } + } + }, + desc = + { + [1] = '来源1', + [2] = '来源2', + [3] = '来源5' + }, + award1 = + { + [1] = 1, + [2] = 2, + [3] = 3 + }, + award2 = + { + id = 1, + type = 2, + num = 3 + } + }, + [4] = + { + id = 4, + name = 'examp1004', + material = + { + [1] = '测试数据', + [2] = '测试数据2', + [3] = '测试数据3' + }, + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 903 + }, + [4] = + { + add = + { + [1] = 7, + [2] = 100 + } + } + }, + desc = + { + [1] = '来源1', + [2] = '来源2', + [3] = '来源6' + }, + award1 = + { + [1] = 1, + [2] = 2, + [3] = 3 + }, + award2 = + { + id = 1, + type = 2, + num = 3 + } + }, + [5] = + { + id = 5, + name = 'examp1004', + material = + { + [1] = 'test' + }, + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 903 + }, + [4] = + { + add = + { + [1] = 7, + [2] = 100 + } + } + }, + desc = + { + [1] = '来源1', + [2] = '来源2', + [3] = '来源6' + }, + award1 = + { + [1] = 1, + [2] = 2, + [3] = 3 + }, + award2 = + { + id = 1, + type = 2, + num = 3 + } + } +} +return cfg_array_example2 \ No newline at end of file diff --git a/config_excel/client/cfg_array_example3.lua b/config_excel/client/cfg_array_example3.lua new file mode 100644 index 0000000..24dc120 --- /dev/null +++ b/config_excel/client/cfg_array_example3.lua @@ -0,0 +1,10 @@ +-- Automatic generation from -->> +-- excel file name: A_array表示例--cfg_array +-- excel sheet name: +example3 + +local cfg_array_example3 = +{ + -- 演示 + level = '啦啦啦！！！' +} +return cfg_array_example3 \ No newline at end of file diff --git a/config_excel/client/cfg_object.lua b/config_excel/client/cfg_object.lua new file mode 100644 index 0000000..3e66585 --- /dev/null +++ b/config_excel/client/cfg_object.lua @@ -0,0 +1,132 @@ +-- Automatic generation from -->> +-- excel file name: A_object表示例--cfg_object +-- excel sheet name: 武器(这个sheet就不会附加到导出名后部分) + +local cfg_object = +{ + -- 开放等级 + open_level =90, + + -- 额外添加属性值1 + add_value1 =100.1, + + -- 额外添加属性值2 + add_value2 =100, + + -- 活动id + actId =1001, + + -- 开始时间 + open ='18:00:0', + + -- 错误信息 + jj10000 ='前面字段为errorID,这里是错误描述，是的object配置的server,client字段名还支持数字作为key(但是转出格式为xml和jsonarray时就不支持了)', + + -- 奖励1 + award1 = + { + [1] = + { + [1] = 1001, + [2] = 20 + }, + [2] = + { + [1] = 1002, + [2] = 20 + }, + [3] = + { + [1] = 1003, + [2] = 30 + } + }, + + -- 奖励2 + award2 = + { + [1] = + { + [1] = 1001, + [2] = 10 + }, + [2] = + { + [1] = 1002, + [2] = 20 + } + }, + + -- 奖励4 + award4 = + { + test = '这就是一个测试', + rr = + { + [1] = 1001, + [2] = 20 + }, + ff = + { + [1] = 3006, + [2] = 99 + }, + aa = + { + [1] = 7003, + [2] = 1 + } + }, + + -- 奖励 + award6 = + { + [1] = + { + [1] = 1001, + [2] = 20 + }, + [2] = + { + [1] = 3006, + [2] = 99 + }, + [3] = + { + [1] = 7003, + [2] = 1 + }, + [4] = + { + jsonobject = + { + [1] = 12356, + [2] = 654321 + } + } + }, + + -- 奖励5 + award7 = + { + [1] = 1, + [2] = 2, + [3] = 3, + [4] = 4, + [5] = 5, + [6] = 6, + [7] = 7, + [8] = 8, + [9] = 9, + [10] = 9, + [11] = 9, + [12] = 9, + [13] = 9, + [14] = 9, + [15] = 9, + [16] = 9, + [17] = 9, + [18] = 9 + } +} +return cfg_object \ No newline at end of file diff --git a/config_excel/server/cfg_array_example1.erl b/config_excel/server/cfg_array_example1.erl new file mode 100644 index 0000000..220aee5 --- /dev/null +++ b/config_excel/server/cfg_array_example1.erl @@ -0,0 +1,311 @@ +%% Automatic generation from -->> +%% excel file name : A_array表示例--cfg_array +%% excel sheet name : 示例1-example1 + +-module(cfg_array_example1). + +-include("cfg_array_example1.hrl"). +-compile(export_all). + +get(1001, <<"pos1">>, 88, 1) -> + #cfg_array_example1{ + 'id' = 1001 + ,'str' = <<"pos1">> + ,'level' = 88 + ,'sub_level' = 1 + ,'name' = <<"黑切+蓝盾">> + ,'attr' = [[1, 700], [2, 800], [3, 900]] + ,'desc1' = <<"从小城镇">> + }; + +get(1001, <<"pos1">>, 88, 2) -> + #cfg_array_example1{ + 'id' = 1001 + ,'str' = <<"pos1">> + ,'level' = 88 + ,'sub_level' = 2 + ,'name' = <<"黑切+蓝盾">> + ,'attr' = [[1, 700], [2, 800], [3, 900]] + ,'desc1' = <<"有钱就可以买">> + }; + +get(1001, <<"pos1">>, 89, 89) -> + #cfg_array_example1{ + 'id' = 1001 + ,'str' = <<"pos1">> + ,'level' = 89 + ,'sub_level' = 89 + ,'name' = <<"黑切+蓝盾">> + ,'attr' = [[1, 700], [2, 800], [3, 900]] + ,'desc1' = <<"有钱就可以买">> + }; + +get(1001, <<"pos2">>, 88, 88.9) -> + #cfg_array_example1{ + 'id' = 1001 + ,'str' = <<"pos2">> + ,'level' = 88 + ,'sub_level' = 88.9 + ,'name' = <<"黑切+蓝盾">> + ,'attr' = [[1, 700], [2, 800], [3, 900]] + ,'desc1' = <<"有钱就可以买">> + }; + +get(1001, <<"pos2">>, 89, 89) -> + #cfg_array_example1{ + 'id' = 1001 + ,'str' = <<"pos2">> + ,'level' = 89 + ,'sub_level' = 89 + ,'name' = <<"黑切+蓝盾">> + ,'attr' = [[1, 700], [2, 800], [3, 900]] + ,'desc1' = <<"有钱就可以买">> + }; + +get(1002, <<"pos1">>, 88, 88) -> + #cfg_array_example1{ + 'id' = 1002 + ,'str' = <<"pos1">> + ,'level' = 88 + ,'sub_level' = 88 + ,'name' = <<"黑切+蓝盾">> + ,'attr' = [[1, 700], [2, 800], [3, 901]] + ,'desc1' = <<"有钱就可以买">> + }; + +get(1002, <<"pos1">>, 89, 89) -> + #cfg_array_example1{ + 'id' = 1002 + ,'str' = <<"pos1">> + ,'level' = 89 + ,'sub_level' = 89 + ,'name' = <<"黑切+蓝盾">> + ,'attr' = [[1, 700], [2, 800], [3, 900]] + ,'desc1' = <<"有钱就可以买">> + }; + +get(1002, <<"pos1">>, 90, 90) -> + #cfg_array_example1{ + 'id' = 1002 + ,'str' = <<"pos1">> + ,'level' = 90 + ,'sub_level' = 90 + ,'name' = <<"黑切+蓝盾">> + ,'attr' = [[1, 700], [2, 800], [3, 901]] + ,'desc1' = <<"有钱就可以买">> + }; + +get(1002, <<"pos2">>, 88, 88) -> + #cfg_array_example1{ + 'id' = 1002 + ,'str' = <<"pos2">> + ,'level' = 88 + ,'sub_level' = 88 + ,'name' = <<"黑切+蓝盾">> + ,'attr' = [[1, 700], [2, 800], [3, 901]] + ,'desc1' = <<"有钱就可以买">> + }; + +get(1002, <<"pos2">>, 89, 89) -> + #cfg_array_example1{ + 'id' = 1002 + ,'str' = <<"pos2">> + ,'level' = 89 + ,'sub_level' = 89 + ,'name' = <<"黑切+蓝盾">> + ,'attr' = [[1, 700], [2, 800], [3, 900]] + ,'desc1' = <<"有钱就可以买">> + }; + +get(1002, <<"pos2">>, 90, 90) -> + #cfg_array_example1{ + 'id' = 1002 + ,'str' = <<"pos2">> + ,'level' = 90 + ,'sub_level' = 90 + ,'name' = <<"黑切+蓝盾">> + ,'attr' = [[1, 700], [2, 800], [3, 901]] + ,'desc1' = <<"有钱就可以买">> + }; + +get(1003, <<"pos1">>, 85, 85) -> + #cfg_array_example1{ + 'id' = 1003 + ,'str' = <<"pos1">> + ,'level' = 85 + ,'sub_level' = 85 + ,'name' = <<"黑切+蓝盾">> + ,'attr' = [[1, 700], [2, 800], [3, 902]] + ,'desc1' = <<"有钱就可以买">> + }; + +get(1004, <<"pos1">>, 80, 80) -> + #cfg_array_example1{ + 'id' = 1004 + ,'str' = <<"pos1">> + ,'level' = 80 + ,'sub_level' = 80 + ,'name' = <<"黑切+蓝盾">> + ,'attr' = [[1, 700], [2, 800], [3, 903]] + ,'desc1' = <<"有钱就可以买">> + }; + +get(_, _, _, _) -> + undefined. + +get_all() -> + [ + {1001, <<"pos1">>, 88, 1} + ,{1001, <<"pos1">>, 88, 2} + ,{1001, <<"pos1">>, 89, 89} + ,{1001, <<"pos2">>, 88, 88.9} + ,{1001, <<"pos2">>, 89, 89} + ,{1002, <<"pos1">>, 88, 88} + ,{1002, <<"pos1">>, 89, 89} + ,{1002, <<"pos1">>, 90, 90} + ,{1002, <<"pos2">>, 88, 88} + ,{1002, <<"pos2">>, 89, 89} + ,{1002, <<"pos2">>, 90, 90} + ,{1003, <<"pos1">>, 85, 85} + ,{1004, <<"pos1">>, 80, 80} + ]. + +get_list() -> + get_all(). + +get_list(1001) -> + [ + {1001, <<"pos1">>, 88, 1} + ,{1001, <<"pos1">>, 88, 2} + ,{1001, <<"pos1">>, 89, 89} + ,{1001, <<"pos2">>, 88, 88.9} + ,{1001, <<"pos2">>, 89, 89} + ]; + +get_list(1002) -> + [ + {1002, <<"pos1">>, 88, 88} + ,{1002, <<"pos1">>, 89, 89} + ,{1002, <<"pos1">>, 90, 90} + ,{1002, <<"pos2">>, 88, 88} + ,{1002, <<"pos2">>, 89, 89} + ,{1002, <<"pos2">>, 90, 90} + ]; + +get_list(1003) -> + [ + {1003, <<"pos1">>, 85, 85} + ]; + +get_list(1004) -> + [ + {1004, <<"pos1">>, 80, 80} + ]; + +get_list(_) -> + []. + +get_list(1001, <<"pos1">>) -> + [ + {1001, <<"pos1">>, 88, 1} + ,{1001, <<"pos1">>, 88, 2} + ,{1001, <<"pos1">>, 89, 89} + ]; + +get_list(1001, <<"pos2">>) -> + [ + {1001, <<"pos2">>, 88, 88.9} + ,{1001, <<"pos2">>, 89, 89} + ]; + +get_list(1002, <<"pos1">>) -> + [ + {1002, <<"pos1">>, 88, 88} + ,{1002, <<"pos1">>, 89, 89} + ,{1002, <<"pos1">>, 90, 90} + ]; + +get_list(1002, <<"pos2">>) -> + [ + {1002, <<"pos2">>, 88, 88} + ,{1002, <<"pos2">>, 89, 89} + ,{1002, <<"pos2">>, 90, 90} + ]; + +get_list(1003, <<"pos1">>) -> + [ + {1003, <<"pos1">>, 85, 85} + ]; + +get_list(1004, <<"pos1">>) -> + [ + {1004, <<"pos1">>, 80, 80} + ]; + +get_list(_, _) -> + []. + +get_list(1001, <<"pos1">>, 88) -> + [ + {1001, <<"pos1">>, 88, 1} + ,{1001, <<"pos1">>, 88, 2} + ]; + +get_list(1001, <<"pos1">>, 89) -> + [ + {1001, <<"pos1">>, 89, 89} + ]; + +get_list(1001, <<"pos2">>, 88) -> + [ + {1001, <<"pos2">>, 88, 88.9} + ]; + +get_list(1001, <<"pos2">>, 89) -> + [ + {1001, <<"pos2">>, 89, 89} + ]; + +get_list(1002, <<"pos1">>, 88) -> + [ + {1002, <<"pos1">>, 88, 88} + ]; + +get_list(1002, <<"pos1">>, 89) -> + [ + {1002, <<"pos1">>, 89, 89} + ]; + +get_list(1002, <<"pos1">>, 90) -> + [ + {1002, <<"pos1">>, 90, 90} + ]; + +get_list(1002, <<"pos2">>, 88) -> + [ + {1002, <<"pos2">>, 88, 88} + ]; + +get_list(1002, <<"pos2">>, 89) -> + [ + {1002, <<"pos2">>, 89, 89} + ]; + +get_list(1002, <<"pos2">>, 90) -> + [ + {1002, <<"pos2">>, 90, 90} + ]; + +get_list(1003, <<"pos1">>, 85) -> + [ + {1003, <<"pos1">>, 85, 85} + ]; + +get_list(1004, <<"pos1">>, 80) -> + [ + {1004, <<"pos1">>, 80, 80} + ]; + +get_list(_, _, _) -> + []. + diff --git a/config_excel/server/cfg_array_example1.hrl b/config_excel/server/cfg_array_example1.hrl new file mode 100644 index 0000000..f2e2dc3 --- /dev/null +++ b/config_excel/server/cfg_array_example1.hrl @@ -0,0 +1,13 @@ +%% Automatic generation from -->> +%% excel file name : A_array表示例--cfg_array +%% excel sheet name : 示例1-example1 + +-record(cfg_array_example1, { + 'id' %% 唯一id + , 'str' %% 佩戴位置 + , 'level' %% 等级 + , 'sub_level' %% 等级 + , 'name' %% 装备名字 + , 'attr' %% 装备增加属性 + , 'desc1' %% 装备来源描述 +}). \ No newline at end of file diff --git a/config_excel/server/cfg_array_example1.lua b/config_excel/server/cfg_array_example1.lua new file mode 100644 index 0000000..09b52de --- /dev/null +++ b/config_excel/server/cfg_array_example1.lua @@ -0,0 +1,433 @@ +-- Automatic generation from -->> +-- excel file name: A_array表示例--cfg_array +-- excel sheet name: 示例1-example1 + +local cfg_array_example1 = +--: id ## 唯一id +--: str ## 佩戴位置 +--: level ## 等级 +--: sub_level ## 等级 +--: name ## 装备名字 +--: attr ## 装备增加属性 +--: desc1 ## 装备来源描述 + +{ + [1001] = + { + pos1 = + { + [88] = + { + [1] = + { + id = 1001, + str = 'pos1', + level = 88, + sub_level = 1, + name = '黑切+蓝盾', + desc1 = '从小城镇', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 900 + } + } + }, + [2] = + { + id = 1001, + str = 'pos1', + level = 88, + sub_level = 2, + name = '黑切+蓝盾', + desc1 = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 900 + } + } + } + }, + [89] = + { + [89] = + { + id = 1001, + str = 'pos1', + level = 89, + sub_level = 89, + name = '黑切+蓝盾', + desc1 = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 900 + } + } + } + } + }, + pos2 = + { + [88] = + { + [88.9] = + { + id = 1001, + str = 'pos2', + level = 88, + sub_level = 88.9, + name = '黑切+蓝盾', + desc1 = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 900 + } + } + } + }, + [89] = + { + [89] = + { + id = 1001, + str = 'pos2', + level = 89, + sub_level = 89, + name = '黑切+蓝盾', + desc1 = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 900 + } + } + } + } + } + }, + [1002] = + { + pos1 = + { + [88] = + { + [88] = + { + id = 1002, + str = 'pos1', + level = 88, + sub_level = 88, + name = '黑切+蓝盾', + desc1 = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 901 + } + } + } + }, + [89] = + { + [89] = + { + id = 1002, + str = 'pos1', + level = 89, + sub_level = 89, + name = '黑切+蓝盾', + desc1 = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 900 + } + } + } + }, + [90] = + { + [90] = + { + id = 1002, + str = 'pos1', + level = 90, + sub_level = 90, + name = '黑切+蓝盾', + desc1 = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 901 + } + } + } + } + }, + pos2 = + { + [88] = + { + [88] = + { + id = 1002, + str = 'pos2', + level = 88, + sub_level = 88, + name = '黑切+蓝盾', + desc1 = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 901 + } + } + } + }, + [89] = + { + [89] = + { + id = 1002, + str = 'pos2', + level = 89, + sub_level = 89, + name = '黑切+蓝盾', + desc1 = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 900 + } + } + } + }, + [90] = + { + [90] = + { + id = 1002, + str = 'pos2', + level = 90, + sub_level = 90, + name = '黑切+蓝盾', + desc1 = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 901 + } + } + } + } + } + }, + [1003] = + { + pos1 = + { + [85] = + { + [85] = + { + id = 1003, + str = 'pos1', + level = 85, + sub_level = 85, + name = '黑切+蓝盾', + desc1 = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 902 + } + } + } + } + } + }, + [1004] = + { + pos1 = + { + [80] = + { + [80] = + { + id = 1004, + str = 'pos1', + level = 80, + sub_level = 80, + name = '黑切+蓝盾', + desc1 = '有钱就可以买', + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 903 + } + } + } + } + } + } +} +return cfg_array_example1 \ No newline at end of file diff --git a/config_excel/server/cfg_array_example2.erl b/config_excel/server/cfg_array_example2.erl new file mode 100644 index 0000000..17cf010 --- /dev/null +++ b/config_excel/server/cfg_array_example2.erl @@ -0,0 +1,74 @@ +%% Automatic generation from -->> +%% excel file name : A_array表示例--cfg_array +%% excel sheet name : 示例2+example2 + +-module(cfg_array_example2). + +-include("cfg_array_example2.hrl"). +-compile(export_all). + +get(1) -> + #cfg_array_example2{ + 'id' = 1 + ,'name' = <<"examp1001">> + ,'material' = [#{'res' => 1, 'id' => 10001, 'count' => 1}, #{'res' => 1, 'id' => 10001, 'count' => 1}] + ,'attr' = [[1, 700], [2, 800], [3, 900], #{'add' => [4, 100]}] + ,'award1' = {1, 2, 3} + ,'award2' = #{'id' => 1, 'type' => 2, 'num' => 3} + }; + +get(2) -> + #cfg_array_example2{ + 'id' = 2 + ,'name' = <<"examp1002">> + ,'material' = #{'res' => 1, 'id' => 10001, 'count' => 1} + ,'attr' = [[1, 700], [2, 800], [3, 901], #{'add' => [5, 100]}] + ,'award1' = {1, 2, 3} + ,'award2' = #{'id' => 1, 'type' => 2, 'num' => 3} + }; + +get(3) -> + #cfg_array_example2{ + 'id' = 3 + ,'name' = <<"examp1003">> + ,'material' = [1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9] + ,'attr' = [[1, 700], [2, 800], [3, 902], #{'add' => [6, 100]}] + ,'award1' = {1, 2, 3} + ,'award2' = #{'id' => 1, 'type' => 2, 'num' => 3} + }; + +get(4) -> + #cfg_array_example2{ + 'id' = 4 + ,'name' = <<"examp1004">> + ,'material' = [<<"测试数据">>, <<"测试数据2">>, <<"测试数据3">>] + ,'attr' = [[1, 700], [2, 800], [3, 903], #{'add' => [7, 100]}] + ,'award1' = {1, 2, 3} + ,'award2' = #{'id' => 1, 'type' => 2, 'num' => 3} + }; + +get(5) -> + #cfg_array_example2{ + 'id' = 5 + ,'name' = <<"examp1004">> + ,'material' = [<<"test">>] + ,'attr' = [[1, 700], [2, 800], [3, 903], #{'add' => [7, 100]}] + ,'award1' = {1, 2, 3} + ,'award2' = #{'id' => 1, 'type' => 2, 'num' => 3} + }; + +get(_) -> + undefined. + +get_all() -> + [ + {1} + ,{2} + ,{3} + ,{4} + ,{5} + ]. + +get_list() -> + get_all(). + diff --git a/config_excel/server/cfg_array_example2.hrl b/config_excel/server/cfg_array_example2.hrl new file mode 100644 index 0000000..5d436a0 --- /dev/null +++ b/config_excel/server/cfg_array_example2.hrl @@ -0,0 +1,12 @@ +%% Automatic generation from -->> +%% excel file name : A_array表示例--cfg_array +%% excel sheet name : 示例2+example2 + +-record(cfg_array_example2, { + 'id' %% 英雄id + , 'name' %% 英雄名字 + , 'material' %% 合成消耗 + , 'attr' %% 属性 + , 'award1' %% 奖励1 + , 'award2' %% 奖励2 +}). \ No newline at end of file diff --git a/config_excel/server/cfg_array_example2.lua b/config_excel/server/cfg_array_example2.lua new file mode 100644 index 0000000..4b2972b --- /dev/null +++ b/config_excel/server/cfg_array_example2.lua @@ -0,0 +1,282 @@ +-- Automatic generation from -->> +-- excel file name: A_array表示例--cfg_array +-- excel sheet name: 示例2+example2 + +local cfg_array_example2 = +--: id ## 英雄id +--: name ## 英雄名字 +--: material ## 合成消耗 +--: attr ## 属性 +--: award1 ## 奖励1 +--: award2 ## 奖励2 + +{ + [1] = + { + id = 1, + name = 'examp1001', + material = + { + [1] = + { + res = 1, + id = 10001, + count = 1 + }, + [2] = + { + res = 1, + id = 10001, + count = 1 + } + }, + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 900 + }, + [4] = + { + add = + { + [1] = 4, + [2] = 100 + } + } + }, + award1 = + { + [1] = 1, + [2] = 2, + [3] = 3 + }, + award2 = + { + id = 1, + type = 2, + num = 3 + } + }, + [2] = + { + id = 2, + name = 'examp1002', + material = + { + res = 1, + id = 10001, + count = 1 + }, + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 901 + }, + [4] = + { + add = + { + [1] = 5, + [2] = 100 + } + } + }, + award1 = + { + [1] = 1, + [2] = 2, + [3] = 3 + }, + award2 = + { + id = 1, + type = 2, + num = 3 + } + }, + [3] = + { + id = 3, + name = 'examp1003', + material = + { + [1] = 1, + [2] = 2, + [3] = 3, + [4] = 4, + [5] = 5, + [6] = 6, + [7] = 7, + [8] = 8, + [9] = 9, + [10] = 9, + [11] = 9, + [12] = 9, + [13] = 9, + [14] = 9, + [15] = 9, + [16] = 9, + [17] = 9, + [18] = 9 + }, + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 902 + }, + [4] = + { + add = + { + [1] = 6, + [2] = 100 + } + } + }, + award1 = + { + [1] = 1, + [2] = 2, + [3] = 3 + }, + award2 = + { + id = 1, + type = 2, + num = 3 + } + }, + [4] = + { + id = 4, + name = 'examp1004', + material = + { + [1] = '测试数据', + [2] = '测试数据2', + [3] = '测试数据3' + }, + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 903 + }, + [4] = + { + add = + { + [1] = 7, + [2] = 100 + } + } + }, + award1 = + { + [1] = 1, + [2] = 2, + [3] = 3 + }, + award2 = + { + id = 1, + type = 2, + num = 3 + } + }, + [5] = + { + id = 5, + name = 'examp1004', + material = + { + [1] = 'test' + }, + attr = + { + [1] = + { + [1] = 1, + [2] = 700 + }, + [2] = + { + [1] = 2, + [2] = 800 + }, + [3] = + { + [1] = 3, + [2] = 903 + }, + [4] = + { + add = + { + [1] = 7, + [2] = 100 + } + } + }, + award1 = + { + [1] = 1, + [2] = 2, + [3] = 3 + }, + award2 = + { + id = 1, + type = 2, + num = 3 + } + } +} +return cfg_array_example2 \ No newline at end of file diff --git a/config_excel/server/cfg_array_example3.erl b/config_excel/server/cfg_array_example3.erl new file mode 100644 index 0000000..ab9eaaf --- /dev/null +++ b/config_excel/server/cfg_array_example3.erl @@ -0,0 +1,14 @@ +%% Automatic generation from -->> +%% excel file name : A_array表示例--cfg_array +%% excel sheet name : +example3 + +-module(cfg_array_example3). + +-compile(export_all). + +%% 演示 +get('level') -> + <<"啦啦啦！！！">>; + +get(_) -> + undefined. \ No newline at end of file diff --git a/config_excel/server/cfg_array_example3.lua b/config_excel/server/cfg_array_example3.lua new file mode 100644 index 0000000..24dc120 --- /dev/null +++ b/config_excel/server/cfg_array_example3.lua @@ -0,0 +1,10 @@ +-- Automatic generation from -->> +-- excel file name: A_array表示例--cfg_array +-- excel sheet name: +example3 + +local cfg_array_example3 = +{ + -- 演示 + level = '啦啦啦！！！' +} +return cfg_array_example3 \ No newline at end of file diff --git a/config_excel/server/cfg_object.erl b/config_excel/server/cfg_object.erl new file mode 100644 index 0000000..5d7003b --- /dev/null +++ b/config_excel/server/cfg_object.erl @@ -0,0 +1,58 @@ +%% Automatic generation from -->> +%% excel file name : A_object表示例--cfg_object +%% excel sheet name : 武器(这个sheet就不会附加到导出名后部分) + +-module(cfg_object). + +-compile(export_all). + +%% 开放等级 +get('open_level') -> + 90; + +%% 额外添加属性值1 +get('add_value1') -> + 100.1; + +%% 额外添加属性值2 +get('add_value2') -> + 100; + +%% 活动id +get('act_id') -> + 1001; + +%% 开始时间 +get('open') -> + <<"18:00:0">>; + +%% 错误信息 +get(10000) -> + <<"前面字段为errorID,这里是错误描述，是的object配置的server,client字段名还支持数字作为key(但是转出格式为xml和jsonarray时就不支持了)">>; + +%% 奖励1 +get('award1') -> + [[1001, 20], {1002, 20}, [1003, 30]]; + +%% 奖励2 +get('award2') -> + {{1001, 10}, [1002, 20]}; + +%% 奖励3(这条转成xml是就会报错,因为KEY为数字） +get('award3') -> + #{1 => #{'res' => 1001, 'id' => 10001, 'count' => 1}, 2 => #{'res' => [1002, 1], 'id' => 10001, 'count' => 1}}; + +%% 奖励4 +get('award4') -> + #{'rr' => [1001, 20], 'ff' => [3006, 99], 'aa' => [7003, 1], 'test' => <<"这就是一个测试">>}; + +%% 奖励5 +get('award5') -> + [1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9]; + +%% 奖励 +get('award6') -> + [[1001, 20], [3006, 99], [7003, 1], #{'jsonobject' => [12356, 654321]}]; + +get(_) -> + undefined. \ No newline at end of file diff --git a/config_excel/server/cfg_object.lua b/config_excel/server/cfg_object.lua new file mode 100644 index 0000000..df44c12 --- /dev/null +++ b/config_excel/server/cfg_object.lua @@ -0,0 +1,153 @@ +-- Automatic generation from -->> +-- excel file name: A_object表示例--cfg_object +-- excel sheet name: 武器(这个sheet就不会附加到导出名后部分) + +local cfg_object = +{ + -- 开放等级 + open_level =90, + + -- 额外添加属性值1 + add_value1 =100.1, + + -- 额外添加属性值2 + add_value2 =100, + + -- 活动id + act_id =1001, + + -- 开始时间 + open ='18:00:0', + + -- 错误信息 + [10000] ='前面字段为errorID,这里是错误描述，是的object配置的server,client字段名还支持数字作为key(但是转出格式为xml和jsonarray时就不支持了)', + + -- 奖励1 + award1 = + { + [1] = + { + [1] = 1001, + [2] = 20 + }, + [2] = + { + [1] = 1002, + [2] = 20 + }, + [3] = + { + [1] = 1003, + [2] = 30 + } + }, + + -- 奖励2 + award2 = + { + [1] = + { + [1] = 1001, + [2] = 10 + }, + [2] = + { + [1] = 1002, + [2] = 20 + } + }, + + -- 奖励3(这条转成xml是就会报错,因为KEY为数字） + award3 = + { + [1] = + { + res = 1001, + id = 10001, + count = 1 + }, + [2] = + { + id = 10001, + count = 1, + res = + { + [1] = 1002, + [2] = 1 + } + } + }, + + -- 奖励4 + award4 = + { + test = '这就是一个测试', + rr = + { + [1] = 1001, + [2] = 20 + }, + ff = + { + [1] = 3006, + [2] = 99 + }, + aa = + { + [1] = 7003, + [2] = 1 + } + }, + + -- 奖励5 + award5 = + { + [1] = 1, + [2] = 2, + [3] = 3, + [4] = 4, + [5] = 5, + [6] = 6, + [7] = 7, + [8] = 8, + [9] = 9, + [10] = 9, + [11] = 9, + [12] = 9, + [13] = 9, + [14] = 9, + [15] = 9, + [16] = 9, + [17] = 9, + [18] = 9 + }, + + -- 奖励 + award6 = + { + [1] = + { + [1] = 1001, + [2] = 20 + }, + [2] = + { + [1] = 3006, + [2] = 99 + }, + [3] = + { + [1] = 7003, + [2] = 1 + }, + [4] = + { + jsonobject = + { + [1] = 12356, + [2] = 654321 + } + } + } +} +return cfg_object \ No newline at end of file diff --git a/lancher.bat b/lancher.bat index 2764aee..d9227e5 100644 --- a/lancher.bat +++ b/lancher.bat @@ -1,12 +1,12 @@ @echo off -:python genCfgs.py --input ./config_excel --srv server/ --clt client/ --timeout -1 --suffix .xlsx --swriter lua --cwriter lua -:python genCfgs.py --input ./config_excel --srv server/ --clt client/ --timeout -1 --suffix .xlsx --swriter erlanghrl -:python genCfgs.py --input ./config_excel --srv server/ --clt client/ --timeout -1 --suffix .xlsx --swriter erlangerl -:python genCfgs.py --input ./config_excel --srv server/ --clt client/ --timeout -1 --suffix .xlsx --swriter elixir -:python genCfgs.py --input ./config_excel --srv server/ --clt client/ --timeout -1 --suffix .xlsx --swriter jsonobject -:python genCfgs.py --input ./config_excel --srv server/ --clt client/ --timeout -1 --suffix .xlsx --cwriter jsonarray -python src/genCfgs.py --input ./config_excel --srv server/ --clt client/ --timeout -1 --suffix .xlsx --swriter elixir --cwriter xml +python src/genCfgs.py --input ./config_excel --srv ./config_excel/server/ --clt ./config_excel/client/ --timeout -1 --suffix .xlsx --swriter lua --cwriter lua +python src/genCfgs.py --input ./config_excel --srv ./config_excel/server/ --clt ./config_excel/client/ --timeout -1 --suffix .xlsx --swriter erlanghrl +python src/genCfgs.py --input ./config_excel --srv ./config_excel/server/ --clt ./config_excel/client/ --timeout -1 --suffix .xlsx --swriter erlangerl +:python src/genCfgs.py --input ./config_excel --srv ./config_excel/server/ --clt ./config_excel/client/ --timeout -1 --suffix .xlsx --swriter elixir +:python src/genCfgs.py --input ./config_excel --srv ./config_excel/server/ --clt ./config_excel/client/ --timeout -1 --suffix .xlsx --swriter jsonobject +:python src/genCfgs.py --input ./config_excel --srv ./config_excel/server/ --clt ./config_excel/client/ --timeout -1 --suffix .xlsx --cwriter jsonarray +:python src/genCfgs.py --input ./config_excel --srv ./config_excel/server/ --clt ./config_excel/client/ --timeout -1 --suffix .xlsx --swriter elixir --cwriter xml pause diff --git a/src/writer_erlang_erl.py b/src/writer_erlang_erl.py index fbe109a..12280c1 100644 --- a/src/writer_erlang_erl.py +++ b/src/writer_erlang_erl.py @@ -65,7 +65,8 @@ class ErlangerlWriter(Writer): val_type = type( lk ) if str == val_type : - lk = lk.replace("\"", "\'") + lk = lk.replace("<<\"", "\'") + lk = lk.replace("\">>", "\'") key = "".join( ["get(",lk,") ->\n"] ) @@ -104,7 +105,8 @@ class ErlangerlWriter(Writer): val_type = type( lk ) if str == val_type : - lk = lk.replace("\"", "\'") + lk = lk.replace("<<\"", "\'") + lk = lk.replace("\">>", "\'") oneval = "".join( [lk, " = ", lv , "\n"] ) @@ -199,7 +201,9 @@ class ErlangerlWriter(Writer): val_type = type( lk ) if str == val_type : - lk = lk.replace("\"", "\'") + lk = lk.replace("<<\"", "\'") + lk = lk.replace("\">>", "\'") + key = "".join( [lk," => "] ) val = "".join( [key, lv] ) dict_ctx_list.append(val) @@ -243,7 +247,7 @@ class ErlangerlWriter(Writer): return False,str( int(value) ) return False,str( value ) elif str == val_type or unicode == val_type: - return False, "".join(["\"",value,"\""]) + return False, "".join(["<<\"",value,"\">>"]) elif tuple == val_type : return self.tuple_to_erlang(value,indent) elif dict == val_type : diff --git a/src/writer_erlang_hrl.py b/src/writer_erlang_hrl.py index b6c8c4f..b2522cf 100644 --- a/src/writer_erlang_hrl.py +++ b/src/writer_erlang_hrl.py @@ -67,8 +67,8 @@ class ErlanghrlWriter(Writer): list_text_list.append( val ) - list_str = " ,".join( list_text_list ) - list_str = list_str + " })." + list_str = " , ".join( list_text_list ) + list_str = list_str + "})." return False, list_str # 转换为文本数据 之前解析出来的excel数据存放方式存在LIST(array格式)和DICT(object格式)两种类型