Skip to content

Commit

Permalink
多加2行,好看一点
Browse files Browse the repository at this point in the history
  • Loading branch information
owent committed Mar 17, 2018
1 parent c429a52 commit b7c2f78
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/com/owent/xresloader/data/dst/DataDstLua.java
Expand Up @@ -205,6 +205,7 @@ public final byte[] dumpConst(HashMap<String, Object> data) {

// 写入全局,需要防止覆盖问题
if (ProgramOptions.getInstance().luaGlobal) {
sb.append(getSystemEndl());
sb.append("local function extend(dst, src)").append(endl);
sb.append(ident).append("for k, v in pairs(src) do").append(endl);
sb.append(ident).append(ident).append("if not dst[k] or 'table' ~= type(v) then").append(endl);
Expand All @@ -220,6 +221,7 @@ public final byte[] dumpConst(HashMap<String, Object> data) {
sb.append("extend(_G, const_res)").append(endl).append(endl);
}

sb.append(getSystemEndl());
if (isUsingLuaModule()) {
for(HashMap.Entry<String, Object> itemSet: data.entrySet()) {
sb.append(String.format("%s = const_res.%s", itemSet.getKey(), itemSet.getKey())).append(endl);
Expand Down

0 comments on commit b7c2f78

Please sign in to comment.