代码调整

izming · izming · commit c665ed38a2dc · 2015-01-12T14:14:40.000+08:00
diff --git a/hhlc/__init__.py b/hhlc/__init__.py
@@ -59,20 +59,20 @@ def main(xls, export, tmpl, command, ptype):
     call(xls, export, tmpl, command, ptype)
 
 def callEtc(heroPath, sszPath, exportPath):
-    import etc
+    import hhlc.etc as etc
     etc.call(heroPath, sszPath, exportPath)
 
 if __name__ == '__main__':
-    call(
-        "D:\\works\\hhl\\projects\\config\\xls", 
-        "D:\\works\\hhl\\projects\\client\\src\\conf", 
-        "D:\\works\\hhl\\projects\\config\\templates",
-        ["skill"],
-        "lua")
-
-    # callEtc(
-    #     "D:\\works\\hhl\\projects\\resource\\art",
-    #     "D:\\works\\hhl\\projects\\resource\\art\\ssz",
-    #     "D:\\works\\hhl\\projects\\resource\\skill"
-    # )
+    # call(
+    #     "D:\\works\\hhl\\projects\\config\\xls", 
+    #     "D:\\works\\hhl\\projects\\client\\src\\conf", 
+    #     "D:\\works\\hhl\\projects\\config\\templates",
+    #     ["skill"],
+    #     "lua")
+
+    callEtc(
+        "D:\\works\\hhl\\projects\\resource\\art",
+        "D:\\works\\hhl\\projects\\resource\\art\\ssz",
+        "D:\\works\\hhl\\projects\\resource\\skill"
+    )
 
diff --git a/hhlc/etc.py b/hhlc/etc.py
@@ -34,7 +34,6 @@ def parseHero(self, files):
         tmpStr = ''
 
         for path in files:
-            slog.info("parse: %s", os.path.basename(path))
             heroId = os.path.basename(path).split('.')[0]
             obj = json.loads(read_file(path))
             tmpStr += self._parseHero(obj, heroId)
@@ -164,6 +163,7 @@ def call(heroPath, sszPath, exportPath):
 
     # parse heros
     files = filter(herosFiles, get_files(heroPath, ["json"]))
+    slog.info("parse: etc.json")
     parser.parseHero(files)
 
     # parse ssz
diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@
 
 setup(
     name="hhlc",
-    version="0.1.3",
+    version="0.1.6",
     url='http://zengrong.net/',
     author='zrong',
     author_email='zrongzrong@gmail.com',
