From 3053d51d8aef6fb4dac07f419fb35e0f57f46540 Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Tue, 24 Mar 2020 19:39:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=9B=AE=E5=BD=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 + README.md | 45 +- client/cfg_array_example1.xml | 289 ------------ client/cfg_object1_cfg_object.xml | 88 ---- .../client}/cfg_array_example2.xml | 0 .../client}/cfg_array_example3.xml | 0 .../client}/cfg_object.xml | 0 .../server}/cfg_array_example1.ex | 0 .../server}/cfg_array_example2.ex | 0 .../server}/cfg_array_example3.ex | 0 {server => config_excel/server}/cfg_object.ex | 0 lancher.bat | 14 +- server/cfg_array.erl | 14 - server/cfg_array.ex | 16 - server/cfg_array.json | 3 - server/cfg_array.lua | 10 - server/cfg_array_example1.erl | 311 ------------- server/cfg_array_example1.hrl | 13 - server/cfg_array_example1.json | 332 -------------- server/cfg_array_example1.lua | 433 ------------------ server/cfg_array_example2.erl | 74 --- server/cfg_array_example2.hrl | 12 - server/cfg_array_example2.json | 217 --------- server/cfg_array_example2.lua | 282 ------------ server/cfg_array_example3.erl | 14 - server/cfg_array_example3.json | 3 - server/cfg_array_example3.lua | 10 - server/cfg_object.erl | 58 --- server/cfg_object.json | 102 ----- server/cfg_object.lua | 153 ------- server/cfg_object1_cfg_object.ex | 71 --- {slpp => src}/__init__.py | 0 color_print.py => src/color_print.py | 0 decoder.py => src/decoder.py | 4 +- ConfigConvertTool.py => src/genCfgs.py | 0 {slpp => src/slpp}/.gitignore | 0 {slpp => src/slpp}/LICENSE | 0 {slpp => src/slpp}/README.markdown | 2 +- .../slpp}/__init__.py | 0 {slpp => src/slpp}/setup.py | 0 ...d7f69af338f973c0ef21a9a06a145936367229.zip | Bin .../.gitignore | 0 .../LICENSE | 0 .../README.markdown | 2 +- .../__init__.py | 0 .../setup.py | 0 .../slpp.py | 0 .../tests.py | 2 +- {slpp => src/slpp}/slpp.py | 0 .../slpp}/tests.py | 0 writer.py => src/writer.py | 0 writer_elixir.py => src/writer_elixir.py | 0 .../writer_erlang_erl.py | 0 .../writer_erlang_hrl.py | 0 .../writer_json_array.py | 0 .../writer_json_object.py | 0 writer_lua.py => src/writer_lua.py | 0 writer_python.py => src/writer_python.py | 0 writer_xml.py => src/writer_xml.py | 0 59 files changed, 36 insertions(+), 2540 deletions(-) delete mode 100644 client/cfg_array_example1.xml delete mode 100644 client/cfg_object1_cfg_object.xml rename {client => config_excel/client}/cfg_array_example2.xml (100%) rename {client => config_excel/client}/cfg_array_example3.xml (100%) rename {client => config_excel/client}/cfg_object.xml (100%) rename {server => config_excel/server}/cfg_array_example1.ex (100%) rename {server => config_excel/server}/cfg_array_example2.ex (100%) rename {server => config_excel/server}/cfg_array_example3.ex (100%) rename {server => config_excel/server}/cfg_object.ex (100%) delete mode 100644 server/cfg_array.erl delete mode 100644 server/cfg_array.ex delete mode 100644 server/cfg_array.json delete mode 100644 server/cfg_array.lua delete mode 100644 server/cfg_array_example1.erl delete mode 100644 server/cfg_array_example1.hrl delete mode 100644 server/cfg_array_example1.json delete mode 100644 server/cfg_array_example1.lua delete mode 100644 server/cfg_array_example2.erl delete mode 100644 server/cfg_array_example2.hrl delete mode 100644 server/cfg_array_example2.json delete mode 100644 server/cfg_array_example2.lua delete mode 100644 server/cfg_array_example3.erl delete mode 100644 server/cfg_array_example3.json delete mode 100644 server/cfg_array_example3.lua delete mode 100644 server/cfg_object.erl delete mode 100644 server/cfg_object.json delete mode 100644 server/cfg_object.lua delete mode 100644 server/cfg_object1_cfg_object.ex rename {slpp => src}/__init__.py (100%) rename color_print.py => src/color_print.py (100%) rename decoder.py => src/decoder.py (98%) rename ConfigConvertTool.py => src/genCfgs.py (100%) rename {slpp => src/slpp}/.gitignore (100%) rename {slpp => src/slpp}/LICENSE (100%) rename {slpp => src/slpp}/README.markdown (97%) rename {slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229 => src/slpp}/__init__.py (100%) rename {slpp => src/slpp}/setup.py (100%) rename {slpp => src/slpp}/slpp-c4d7f69af338f973c0ef21a9a06a145936367229.zip (100%) rename {slpp => src/slpp}/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/.gitignore (100%) rename {slpp => src/slpp}/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/LICENSE (100%) rename {slpp => src/slpp}/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/README.markdown (97%) create mode 100644 src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/__init__.py rename {slpp => src/slpp}/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/setup.py (100%) rename {slpp => src/slpp}/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/slpp.py (100%) rename {slpp => src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229}/tests.py (99%) rename {slpp => src/slpp}/slpp.py (100%) rename {slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229 => src/slpp}/tests.py (100%) rename writer.py => src/writer.py (100%) rename writer_elixir.py => src/writer_elixir.py (100%) rename writer_erlang_erl.py => src/writer_erlang_erl.py (100%) rename writer_erlang_hrl.py => src/writer_erlang_hrl.py (100%) rename writer_json_array.py => src/writer_json_array.py (100%) rename writer_json_object.py => src/writer_json_object.py (100%) rename writer_lua.py => src/writer_lua.py (100%) rename writer_python.py => src/writer_python.py (100%) rename writer_xml.py => src/writer_xml.py (100%) diff --git a/.gitignore b/.gitignore index 9f6d91a..adafb51 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,5 @@ ENV/ # mypy .mypy_cache/ +config_excel/ + diff --git a/README.md b/README.md index 1b623e6..0bb4833 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,17 @@ # py_exceltools -python3 基于openpyxl的excel转换工具。支持xlsx文件转换为erlang,elixir,lua,json,xml,python等配置文件。 + python3 基于openpyxl的excel转换工具。支持xlsx文件转换为erlang,elixir,lua,json,xml,python等配置文件。 + 关于openpyxl库：https://pypi.python.org/pypi/openpyxl。 -关于openpyxl库：https://pypi.python.org/pypi/openpyxl。 - -## python和openpyxl安装 -linux安装 +## python(推荐3.5-3.7 因为目前pyinstaller支持这些版本)和openpyxl安装 +### linux安装 apt-get install python-pip pip install openpyxl - -win安装 - + +### win安装 安装python(同时安装pip并添加到Path) 安装openpyxl, 在安装python后在cmd中运行: pip install openpyxl -# 使用 +## 使用 lancher.bat(win)和lancher.sh(linux)为对应运行脚本。 当前配置了用于参考的参数来转换example.xlsx， 可在对应server、client输出文件夹查看生成配置效果。 @@ -29,10 +27,10 @@ win安装 注：对于client和server，如果未配置输出目录或转换器，则不会导出。 -# 数据类型 +## 数据类型 支持int(int64), number(float), string, tuple, list, dict, json、lua 其中tuple, list, dict 为 python原生数据结构 json 为json数据类型 Lua为 lua table -# 数据格式示范(可以参考本工具自带的示例配置表) +## 数据格式示范(可以参考本工具自带的示例配置表) int 整数 1,2,1000 64位 number 整数或者小数都OK string 字符串 excel表中配置时不需要额外加双引号 @@ -48,24 +46,25 @@ win安装 而且导出xml和jsonjsonarray都是用的库，出错的时候不太好找到对应配置错误的数据，需要配置前 就额外注意，以免不必要的懵逼和浪费时间，策划不太明白的可以请教程序或者百度 -# 打包exe -部署时，可以将python打包成exe。建议使用pyinstaller。 -pyinstaller3.2.1尚不支持python3.6.1，建议使用python 3.5。 - +## 打包exe + 部署时，可以将python打包成exe。建议使用pyinstaller。 pip install pyinstaller - pyinstaller -F -c ConfigConvertTool.py + pyinstaller -F -c genCfgs.py -excel文件名命名格式 +## 关于文件命名 +### excel文件名命名格式 为了表名的可视化和可理解性，文件命名支持 MMM-NNN.xlsx的方式。MMM可以是任意字符(一般为文件中文名，但是不用下划线结尾)， 作为文件名的注释性描述。NNN只能是数字,字母和下划线(不能以下划线开头和数字开头)，作为导出的配置以NNN做为表名前缀 -excel sheet命名格式 +### excel sheet命名格式 为了考虑策划会使用一个excel配置同一的功能的多个配置子表，且方便导出和查看，sheet命名为YYY-XXX或者 YYY+XXX， 或者YYY (里面不包含 "+"""-"), YYY可以为任意字符(一般为中文描述),XXX为导出配置的表名后缀， 当sheet命名为 YYY-XXX或者 YYY+XXX时 导出文件名为： NNN_XXX.lang(此种命名一般用于 一个excel配置多个需要导出的sheet页签) 当sheet命名为 YYY 时 导出文件名为： NNN.lang （此种命名用法仅仅用于一个excel只配置一个需要导出的sheet页签） lang为目标语言的后缀名 - 具体示例 - A_arrary表示例--cfg_array.xlsx 前缀Y可以用方便排序显示 更多具体参见配置excel示例 -* 在string中无法直接使用换行等特殊称号。请用\n等转义字符替代。 -* 由于xml并不存在数组等结构，不建议使用。 -* 工具会检测server和client标识。如果不存在，则不导出些表。方便策划做备注 + 具体示例： + A_arrary表示例--cfg_array.xlsx 前缀Y可以用方便排序显示 更多具体参见配置excel示例 + +## 注意 + * 在string中无法直接使用换行等特殊称号。请用\n等转义字符替代。 + * 由于xml并不存在数组等结构，不建议使用。 + * 工具会检测server和client标识。如果不存在，则不导出些表。方便策划做备注 diff --git a/client/cfg_array_example1.xml b/client/cfg_array_example1.xml deleted file mode 100644 index bb759b5..0000000 --- a/client/cfg_array_example1.xml +++ /dev/null @@ -1,289 +0,0 @@ - - - - - - 1 - 700 - - - 2 - 800 - - - 3 - 900 - - - 从小城镇 - 1001 - 88 - 黑切+蓝盾 - pos1 - 1 - - - - - 1 - 700 - - - 2 - 800 - - - 3 - 900 - - - 有钱就可以买 - 1001 - 88 - 黑切+蓝盾 - pos1 - 2 - - - - - 1 - 700 - - - 2 - 800 - - - 3 - 900 - - - 有钱就可以买 - 1001 - 89 - 黑切+蓝盾 - pos1 - 89 - - - - - 1 - 700 - - - 2 - 800 - - - 3 - 900 - - - 有钱就可以买 - 1001 - 88 - 黑切+蓝盾 - pos2 - 88.9 - - - - - 1 - 700 - - - 2 - 800 - - - 3 - 900 - - - 有钱就可以买 - 1001 - 89 - 黑切+蓝盾 - pos2 - 89 - - - - - 1 - 700 - - - 2 - 800 - - - 3 - 901 - - - 有钱就可以买 - 1002 - 88 - 黑切+蓝盾 - pos1 - 88 - - - - - 1 - 700 - - - 2 - 800 - - - 3 - 900 - - - 有钱就可以买 - 1002 - 89 - 黑切+蓝盾 - pos1 - 89 - - - - - 1 - 700 - - - 2 - 800 - - - 3 - 901 - - - 有钱就可以买 - 1002 - 90 - 黑切+蓝盾 - pos1 - 90 - - - - - 1 - 700 - - - 2 - 800 - - - 3 - 901 - - - 有钱就可以买 - 1002 - 88 - 黑切+蓝盾 - pos2 - 88 - - - - - 1 - 700 - - - 2 - 800 - - - 3 - 900 - - - 有钱就可以买 - 1002 - 89 - 黑切+蓝盾 - pos2 - 89 - - - - - 1 - 700 - - - 2 - 800 - - - 3 - 901 - - - 有钱就可以买 - 1002 - 90 - 黑切+蓝盾 - pos2 - 90 - - - - - 1 - 700 - - - 2 - 800 - - - 3 - 902 - - - 有钱就可以买 - 1003 - 85 - 黑切+蓝盾 - pos1 - 85 - - - - - 1 - 700 - - - 2 - 800 - - - 3 - 903 - - - 有钱就可以买 - 1004 - 80 - 黑切+蓝盾 - pos1 - 80 - - diff --git a/client/cfg_object1_cfg_object.xml b/client/cfg_object1_cfg_object.xml deleted file mode 100644 index 4525ce2..0000000 --- a/client/cfg_object1_cfg_object.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - 1001 - 100.1 - 100 - - - 1001 - 20 - - - 1002 - 20 - - - 1003 - 30 - - - - - 1001 - 10 - - - 1002 - 20 - - - - - 7003 - 1 - - - 3006 - 99 - - - 1001 - 20 - - 这就是一个测试 - - - - 1001 - 20 - - - 3006 - 99 - - - 7003 - 1 - - - - 12356 - 654321 - - - - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 9 - 9 - 9 - 9 - 9 - 9 - 9 - 9 - 9 - - 前面字段为errorID,这里是错误描述，是的object配置的server,client字段名还支持数字作为key(但是转出格式为xml和jsonarray时就不支持了) - fgfdg - 90 - diff --git a/client/cfg_array_example2.xml b/config_excel/client/cfg_array_example2.xml similarity index 100% rename from client/cfg_array_example2.xml rename to config_excel/client/cfg_array_example2.xml diff --git a/client/cfg_array_example3.xml b/config_excel/client/cfg_array_example3.xml similarity index 100% rename from client/cfg_array_example3.xml rename to config_excel/client/cfg_array_example3.xml diff --git a/client/cfg_object.xml b/config_excel/client/cfg_object.xml similarity index 100% rename from client/cfg_object.xml rename to config_excel/client/cfg_object.xml diff --git a/server/cfg_array_example1.ex b/config_excel/server/cfg_array_example1.ex similarity index 100% rename from server/cfg_array_example1.ex rename to config_excel/server/cfg_array_example1.ex diff --git a/server/cfg_array_example2.ex b/config_excel/server/cfg_array_example2.ex similarity index 100% rename from server/cfg_array_example2.ex rename to config_excel/server/cfg_array_example2.ex diff --git a/server/cfg_array_example3.ex b/config_excel/server/cfg_array_example3.ex similarity index 100% rename from server/cfg_array_example3.ex rename to config_excel/server/cfg_array_example3.ex diff --git a/server/cfg_object.ex b/config_excel/server/cfg_object.ex similarity index 100% rename from server/cfg_object.ex rename to config_excel/server/cfg_object.ex diff --git a/lancher.bat b/lancher.bat index 92f3eb5..2764aee 100644 --- a/lancher.bat +++ b/lancher.bat @@ -1,12 +1,12 @@ @echo off -:python ConfigConvertTool.py --input ./config_excel --srv server/ --clt client/ --timeout -1 --suffix .xlsx --swriter lua --cwriter lua -:python ConfigConvertTool.py --input ./config_excel --srv server/ --clt client/ --timeout -1 --suffix .xlsx --swriter erlanghrl -:python ConfigConvertTool.py --input ./config_excel --srv server/ --clt client/ --timeout -1 --suffix .xlsx --swriter erlangerl -:python ConfigConvertTool.py --input ./config_excel --srv server/ --clt client/ --timeout -1 --suffix .xlsx --swriter elixir -:python ConfigConvertTool.py --input ./config_excel --srv server/ --clt client/ --timeout -1 --suffix .xlsx --swriter jsonobject -:python ConfigConvertTool.py --input ./config_excel --srv server/ --clt client/ --timeout -1 --suffix .xlsx --cwriter jsonarray -python ConfigConvertTool.py --input ./config_excel --srv server/ --clt client/ --timeout -1 --suffix .xlsx --swriter elixir --cwriter xml +: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 pause diff --git a/server/cfg_array.erl b/server/cfg_array.erl deleted file mode 100644 index c549ffc..0000000 --- a/server/cfg_array.erl +++ /dev/null @@ -1,14 +0,0 @@ -%% Automatic generation from -->> -%% excel file name : A_object表示例--cfg_array -%% excel sheet name : +example3 - --module(cfg_array). - --compile(export_all). - -%% 演示 -get('level') -> - "啦啦啦！！！"; - -get(_) -> - undefined. \ No newline at end of file diff --git a/server/cfg_array.ex b/server/cfg_array.ex deleted file mode 100644 index 8ffa16f..0000000 --- a/server/cfg_array.ex +++ /dev/null @@ -1,16 +0,0 @@ -## Automatic generation from -->> -## excel file name: A_object表示例--cfg_array -## excel sheet name: +example3 - -defmodule Cfg_Array do - - ## 演示 - def get(:level) do - "啦啦啦！！！" - end - - def get(_) do - :undefined - end - -end \ No newline at end of file diff --git a/server/cfg_array.json b/server/cfg_array.json deleted file mode 100644 index 211e417..0000000 --- a/server/cfg_array.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "level":"啦啦啦！！！" -} \ No newline at end of file diff --git a/server/cfg_array.lua b/server/cfg_array.lua deleted file mode 100644 index c1d4203..0000000 --- a/server/cfg_array.lua +++ /dev/null @@ -1,10 +0,0 @@ --- Automatic generation from -->> --- excel file name: A_object表示例--cfg_array --- excel sheet name: +example3 - -local cfg_array = -{ - -- 演示 - level = '啦啦啦！！！' -} -return cfg_array \ No newline at end of file diff --git a/server/cfg_array_example1.erl b/server/cfg_array_example1.erl deleted file mode 100644 index 04d6a42..0000000 --- a/server/cfg_array_example1.erl +++ /dev/null @@ -1,311 +0,0 @@ -%% 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/server/cfg_array_example1.hrl b/server/cfg_array_example1.hrl deleted file mode 100644 index e4a7d55..0000000 --- a/server/cfg_array_example1.hrl +++ /dev/null @@ -1,13 +0,0 @@ -%% 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/server/cfg_array_example1.json b/server/cfg_array_example1.json deleted file mode 100644 index c2aa514..0000000 --- a/server/cfg_array_example1.json +++ /dev/null @@ -1,332 +0,0 @@ -{ - "1001":{ - "pos1":{ - "88":{ - "1":{ - "id":1001, - "str":"pos1", - "level":88, - "sub_level":1, - "name":"黑切+蓝盾", - "desc1":"从小城镇", - "attr":[ - [ - 1, - 700 - ], - [ - 2, - 800 - ], - [ - 3, - 900 - ] - ] - }, - "2":{ - "id":1001, - "str":"pos1", - "level":88, - "sub_level":2, - "name":"黑切+蓝盾", - "desc1":"有钱就可以买", - "attr":[ - [ - 1, - 700 - ], - [ - 2, - 800 - ], - [ - 3, - 900 - ] - ] - } - }, - "89":{ - "89":{ - "id":1001, - "str":"pos1", - "level":89, - "sub_level":89, - "name":"黑切+蓝盾", - "desc1":"有钱就可以买", - "attr":[ - [ - 1, - 700 - ], - [ - 2, - 800 - ], - [ - 3, - 900 - ] - ] - } - } - }, - "pos2":{ - "88":{ - "88.9":{ - "id":1001, - "str":"pos2", - "level":88, - "sub_level":88.9, - "name":"黑切+蓝盾", - "desc1":"有钱就可以买", - "attr":[ - [ - 1, - 700 - ], - [ - 2, - 800 - ], - [ - 3, - 900 - ] - ] - } - }, - "89":{ - "89":{ - "id":1001, - "str":"pos2", - "level":89, - "sub_level":89, - "name":"黑切+蓝盾", - "desc1":"有钱就可以买", - "attr":[ - [ - 1, - 700 - ], - [ - 2, - 800 - ], - [ - 3, - 900 - ] - ] - } - } - } - }, - "1002":{ - "pos1":{ - "88":{ - "88":{ - "id":1002, - "str":"pos1", - "level":88, - "sub_level":88, - "name":"黑切+蓝盾", - "desc1":"有钱就可以买", - "attr":[ - [ - 1, - 700 - ], - [ - 2, - 800 - ], - [ - 3, - 901 - ] - ] - } - }, - "89":{ - "89":{ - "id":1002, - "str":"pos1", - "level":89, - "sub_level":89, - "name":"黑切+蓝盾", - "desc1":"有钱就可以买", - "attr":[ - [ - 1, - 700 - ], - [ - 2, - 800 - ], - [ - 3, - 900 - ] - ] - } - }, - "90":{ - "90":{ - "id":1002, - "str":"pos1", - "level":90, - "sub_level":90, - "name":"黑切+蓝盾", - "desc1":"有钱就可以买", - "attr":[ - [ - 1, - 700 - ], - [ - 2, - 800 - ], - [ - 3, - 901 - ] - ] - } - } - }, - "pos2":{ - "88":{ - "88":{ - "id":1002, - "str":"pos2", - "level":88, - "sub_level":88, - "name":"黑切+蓝盾", - "desc1":"有钱就可以买", - "attr":[ - [ - 1, - 700 - ], - [ - 2, - 800 - ], - [ - 3, - 901 - ] - ] - } - }, - "89":{ - "89":{ - "id":1002, - "str":"pos2", - "level":89, - "sub_level":89, - "name":"黑切+蓝盾", - "desc1":"有钱就可以买", - "attr":[ - [ - 1, - 700 - ], - [ - 2, - 800 - ], - [ - 3, - 900 - ] - ] - } - }, - "90":{ - "90":{ - "id":1002, - "str":"pos2", - "level":90, - "sub_level":90, - "name":"黑切+蓝盾", - "desc1":"有钱就可以买", - "attr":[ - [ - 1, - 700 - ], - [ - 2, - 800 - ], - [ - 3, - 901 - ] - ] - } - } - } - }, - "1003":{ - "pos1":{ - "85":{ - "85":{ - "id":1003, - "str":"pos1", - "level":85, - "sub_level":85, - "name":"黑切+蓝盾", - "desc1":"有钱就可以买", - "attr":[ - [ - 1, - 700 - ], - [ - 2, - 800 - ], - [ - 3, - 902 - ] - ] - } - } - } - }, - "1004":{ - "pos1":{ - "80":{ - "80":{ - "id":1004, - "str":"pos1", - "level":80, - "sub_level":80, - "name":"黑切+蓝盾", - "desc1":"有钱就可以买", - "attr":[ - [ - 1, - 700 - ], - [ - 2, - 800 - ], - [ - 3, - 903 - ] - ] - } - } - } - } -} \ No newline at end of file diff --git a/server/cfg_array_example1.lua b/server/cfg_array_example1.lua deleted file mode 100644 index 09b52de..0000000 --- a/server/cfg_array_example1.lua +++ /dev/null @@ -1,433 +0,0 @@ --- 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/server/cfg_array_example2.erl b/server/cfg_array_example2.erl deleted file mode 100644 index 1d920e4..0000000 --- a/server/cfg_array_example2.erl +++ /dev/null @@ -1,74 +0,0 @@ -%% 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/server/cfg_array_example2.hrl b/server/cfg_array_example2.hrl deleted file mode 100644 index 7455081..0000000 --- a/server/cfg_array_example2.hrl +++ /dev/null @@ -1,12 +0,0 @@ -%% 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/server/cfg_array_example2.json b/server/cfg_array_example2.json deleted file mode 100644 index 66911d7..0000000 --- a/server/cfg_array_example2.json +++ /dev/null @@ -1,217 +0,0 @@ -{ - "1":{ - "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 - } - }, - "2":{ - "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 - } - }, - "3":{ - "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 - } - }, - "4":{ - "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 - } - }, - "5":{ - "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 - } - } -} \ No newline at end of file diff --git a/server/cfg_array_example2.lua b/server/cfg_array_example2.lua deleted file mode 100644 index 4b2972b..0000000 --- a/server/cfg_array_example2.lua +++ /dev/null @@ -1,282 +0,0 @@ --- 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/server/cfg_array_example3.erl b/server/cfg_array_example3.erl deleted file mode 100644 index 6ae9139..0000000 --- a/server/cfg_array_example3.erl +++ /dev/null @@ -1,14 +0,0 @@ -%% 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/server/cfg_array_example3.json b/server/cfg_array_example3.json deleted file mode 100644 index 211e417..0000000 --- a/server/cfg_array_example3.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "level":"啦啦啦！！！" -} \ No newline at end of file diff --git a/server/cfg_array_example3.lua b/server/cfg_array_example3.lua deleted file mode 100644 index 24dc120..0000000 --- a/server/cfg_array_example3.lua +++ /dev/null @@ -1,10 +0,0 @@ --- 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/server/cfg_object.erl b/server/cfg_object.erl deleted file mode 100644 index 87f1858..0000000 --- a/server/cfg_object.erl +++ /dev/null @@ -1,58 +0,0 @@ -%% 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是就会报错） -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/server/cfg_object.json b/server/cfg_object.json deleted file mode 100644 index 521b0aa..0000000 --- a/server/cfg_object.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "open_level":90, - "add_value1":100.1, - "add_value2":100, - "act_id":1001, - "open":"18:00:0", - "10000":"前面字段为errorID,这里是错误描述，是的object配置的server,client字段名还支持数字作为key(但是转出格式为xml和jsonarray时就不支持了)", - "award1":[ - [ - 1001, - 20 - ], - [ - 1002, - 20 - ], - [ - 1003, - 30 - ] - ], - "award2":[ - [ - 1001, - 10 - ], - [ - 1002, - 20 - ] - ], - "award3":{ - "1":{ - "res":1001, - "id":10001, - "count":1 - }, - "2":{ - "id":10001, - "count":1, - "res":[ - 1002, - 1 - ] - } - }, - "award4":{ - "test":"这就是一个测试", - "rr":[ - 1001, - 20 - ], - "ff":[ - 3006, - 99 - ], - "aa":[ - 7003, - 1 - ] - }, - "award5":[ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 9, - 9, - 9, - 9, - 9, - 9, - 9, - 9, - 9 - ], - "award6":[ - [ - 1001, - 20 - ], - [ - 3006, - 99 - ], - [ - 7003, - 1 - ], - { - "jsonobject":[ - 12356, - 654321 - ] - } - ] -} \ No newline at end of file diff --git a/server/cfg_object.lua b/server/cfg_object.lua deleted file mode 100644 index c3bda2b..0000000 --- a/server/cfg_object.lua +++ /dev/null @@ -1,153 +0,0 @@ --- 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是就会报错） - 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/server/cfg_object1_cfg_object.ex b/server/cfg_object1_cfg_object.ex deleted file mode 100644 index 9b2d9b5..0000000 --- a/server/cfg_object1_cfg_object.ex +++ /dev/null @@ -1,71 +0,0 @@ -## Automatic generation from -->> -## excel file name: A_object表示例--cfg_object1 -## excel sheet name: A_object表示例--cfg_object - -defmodule Cfg_Object1_Cfg_Object do - - ## 开放等级 - def get(:open_level) do - 90 - end - - ## 额外添加属性值1 - def get(:add_value1) do - 100.1 - end - - ## 额外添加属性值2 - def get(:add_value2) do - 100 - end - - ## 活动id - def get(:act_id) do - 1001 - end - - ## 开始时间 - def get(:open) do - "fgfdg" - end - - ## 错误信息 - def get(10000) do - "前面字段为errorID,这里是错误描述，是的object配置的server,client字段名还支持数字作为key(但是转出格式为xml和jsonarray时就不支持了)" - end - - ## 奖励1 - def get(:award1) do - [[1001, 20], {1002, 20}, [1003, 30]] - end - - ## 奖励2 - def get(:award2) do - {{1001, 10}, [1002, 20]} - end - - ## 奖励3(这条转成xml是就会报错,因为KEY为数字） - def get(:award3) do - %{1 => %{:res => 1001, :id => 10001, :count => 1}, 2 => %{:res => [1002, 1], :id => 10001, :count => 1}} - end - - ## 奖励4 - def get(:award4) do - %{:rr => [1001, 20], :ff => [3006, 99], :aa => [7003, 1], :test => "这就是一个测试"} - end - - ## 奖励5 - def get(:award5) do - [1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9] - end - - ## 奖励 - def get(:award6) do - [[1001, 20], [3006, 99], [7003, 1], %{:jsonobject => [12356, 654321]}] - end - - def get(_) do - :undefined - end - -end \ No newline at end of file diff --git a/slpp/__init__.py b/src/__init__.py similarity index 100% rename from slpp/__init__.py rename to src/__init__.py diff --git a/color_print.py b/src/color_print.py similarity index 100% rename from color_print.py rename to src/color_print.py diff --git a/decoder.py b/src/decoder.py similarity index 98% rename from decoder.py rename to src/decoder.py index 445ebd8..77f9d76 100644 --- a/decoder.py +++ b/src/decoder.py @@ -427,14 +427,14 @@ class ExcelDoc: return sheeter def decode(self,srv_path,clt_path,srv_writer,clt_writer): - color_print.printYellow( " start covert: %s \n" % self.file.ljust(44, "*") ) + color_print.printYellow(" start covert: %s \n" % self.file.ljust(44, "*")) base_name = os.path.splitext( self.file )[0] wb = openpyxl.load_workbook( self.abspath ) for wb_sheet in wb.worksheets: Sheeter = self.need_decode( wb_sheet ) if None == Sheeter : - color_print.printPink( " covert skip........... sheet name -> %s\n" % wb_sheet.title ) + color_print.printPink(" covert skip........... sheet name -> %s\n" % wb_sheet.title) continue sheet = Sheeter( base_name,wb_sheet,srv_writer,clt_writer ) diff --git a/ConfigConvertTool.py b/src/genCfgs.py similarity index 100% rename from ConfigConvertTool.py rename to src/genCfgs.py diff --git a/slpp/.gitignore b/src/slpp/.gitignore similarity index 100% rename from slpp/.gitignore rename to src/slpp/.gitignore diff --git a/slpp/LICENSE b/src/slpp/LICENSE similarity index 100% rename from slpp/LICENSE rename to src/slpp/LICENSE diff --git a/slpp/README.markdown b/src/slpp/README.markdown similarity index 97% rename from slpp/README.markdown rename to src/slpp/README.markdown index 64673c4..88c07e1 100644 --- a/slpp/README.markdown +++ b/src/slpp/README.markdown @@ -15,7 +15,7 @@ array table: 0x2014200 Parse lua data: ```python ->>> from slpp import slpp as lua +>>> from src.slpp import slpp as lua >>> data = lua.decode('{ array = { 65, 23, 5 }, dict = { string = "value", array = { 3, 6, 4}, mixed = { 43, 54.3, false, string = "value", 9 } } }') >>> print data {'array': [65, 23, 5], 'dict': {'mixed': {0: 43, 1: 54.33, 2: False, 4: 9, 'string': 'value'}, 'array': [3, 6, 4], 'string': 'value'}} diff --git a/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/__init__.py b/src/slpp/__init__.py similarity index 100% rename from slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/__init__.py rename to src/slpp/__init__.py diff --git a/slpp/setup.py b/src/slpp/setup.py similarity index 100% rename from slpp/setup.py rename to src/slpp/setup.py diff --git a/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229.zip b/src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229.zip similarity index 100% rename from slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229.zip rename to src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229.zip diff --git a/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/.gitignore b/src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/.gitignore similarity index 100% rename from slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/.gitignore rename to src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/.gitignore diff --git a/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/LICENSE b/src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/LICENSE similarity index 100% rename from slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/LICENSE rename to src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/LICENSE diff --git a/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/README.markdown b/src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/README.markdown similarity index 97% rename from slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/README.markdown rename to src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/README.markdown index 64673c4..88c07e1 100644 --- a/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/README.markdown +++ b/src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/README.markdown @@ -15,7 +15,7 @@ array table: 0x2014200 Parse lua data: ```python ->>> from slpp import slpp as lua +>>> from src.slpp import slpp as lua >>> data = lua.decode('{ array = { 65, 23, 5 }, dict = { string = "value", array = { 3, 6, 4}, mixed = { 43, 54.3, false, string = "value", 9 } } }') >>> print data {'array': [65, 23, 5], 'dict': {'mixed': {0: 43, 1: 54.33, 2: False, 4: 9, 'string': 'value'}, 'array': [3, 6, 4], 'string': 'value'}} diff --git a/src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/__init__.py b/src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/setup.py b/src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/setup.py similarity index 100% rename from slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/setup.py rename to src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/setup.py diff --git a/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/slpp.py b/src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/slpp.py similarity index 100% rename from slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/slpp.py rename to src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/slpp.py diff --git a/slpp/tests.py b/src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/tests.py similarity index 99% rename from slpp/tests.py rename to src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/tests.py index 31b63e9..cf4ea27 100644 --- a/slpp/tests.py +++ b/src/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -from slpp import slpp as lua +from src.slpp import slpp as lua """ Tests for slpp diff --git a/slpp/slpp.py b/src/slpp/slpp.py similarity index 100% rename from slpp/slpp.py rename to src/slpp/slpp.py diff --git a/slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/tests.py b/src/slpp/tests.py similarity index 100% rename from slpp/slpp-c4d7f69af338f973c0ef21a9a06a145936367229/tests.py rename to src/slpp/tests.py diff --git a/writer.py b/src/writer.py similarity index 100% rename from writer.py rename to src/writer.py diff --git a/writer_elixir.py b/src/writer_elixir.py similarity index 100% rename from writer_elixir.py rename to src/writer_elixir.py diff --git a/writer_erlang_erl.py b/src/writer_erlang_erl.py similarity index 100% rename from writer_erlang_erl.py rename to src/writer_erlang_erl.py diff --git a/writer_erlang_hrl.py b/src/writer_erlang_hrl.py similarity index 100% rename from writer_erlang_hrl.py rename to src/writer_erlang_hrl.py diff --git a/writer_json_array.py b/src/writer_json_array.py similarity index 100% rename from writer_json_array.py rename to src/writer_json_array.py diff --git a/writer_json_object.py b/src/writer_json_object.py similarity index 100% rename from writer_json_object.py rename to src/writer_json_object.py diff --git a/writer_lua.py b/src/writer_lua.py similarity index 100% rename from writer_lua.py rename to src/writer_lua.py diff --git a/writer_python.py b/src/writer_python.py similarity index 100% rename from writer_python.py rename to src/writer_python.py diff --git a/writer_xml.py b/src/writer_xml.py similarity index 100% rename from writer_xml.py rename to src/writer_xml.py