修复bug

config_utils_record.py

@@ -37,32 +37,9 @@ def checkChannelConfig(config):
         config['screenOrientation'] = 'landscape'
     if 'outName' not in config:
         config['outName'] = config['name']
-
-    if 'recordConfig' in config:
-        setRecordConfig(config, config['recordConfig'])
         
     return True
 
-def setRecordConfig(config, recordConfig):
-    configData = None
-    if 'configData' in config:
-        configData = config['configData']
-        configData['bgMusic'] = 'bg_music.mp3'
-        configData['gameId'] = recordConfig['gameId']
-        configData['gameName'] = recordConfig['gameName']
-        configData['gameIcon'] = recordConfig['gameIcon']
-        configData['gameUrl'] = recordConfig['gameUrl']
-        configData['skinId'] = recordConfig['skinId']
-    else:
-        config['configData'] = {
-            'bgMusic':'bg_music.mp3',
-            'gameId':recordConfig['gameId'],
-            'gameName':recordConfig['gameName'],
-            'gameIcon':recordConfig['gameIcon'],
-            'gameUrl':recordConfig['gameUrl'],
-            'skinId':recordConfig['skinId']
-        }
-
 def replaceArgs(config):
     '''
     替换占位符

package_utils_record.py

@@ -63,14 +63,14 @@ def pack(game, sdk, config):
         return ret
     # 添加meta-data
     ret = addMetaData(game, sdk, subChannel, config)
-    if ret:
-        return ret
-    # 增加配置文件
-    ret = addConfig(game, sdk, subChannel, config)
     if ret:
         return ret
     # 复制app res资源
     ret = copyAppRes(game, sdk, subChannel, config)
+    if ret:
+        return ret
+    # 增加配置文件
+    ret = addConfig(game, sdk, subChannel, config)
     if ret:
         return ret
     # 更改包名
@@ -456,6 +456,7 @@ def addConfig(game, sdk, subChannel, config):
     添加config.json
     '''
     if 'configData' not in config:
+        print('configData is null')
         return 0
 
     print('add config.json...')

package_web_record.py

@@ -65,6 +65,10 @@ def package(config, sdk):
     if 'properties' in config:
         jsonConfig['properties'] = config['properties']
 
+    jsonConfig['bgMusic'] = config['bgMusic']
+    if 'recordConfig' in config:
+        setRecordConfig(jsonConfig, config['recordConfig'])
+
     # 获取sdk相关配置
     getSdkConfig(sdk, jsonConfig, config)
 
@@ -77,6 +81,26 @@ def package(config, sdk):
     # 打包
     package_utils_record.packConsole(game, sdk, subChannel)
 
+def setRecordConfig(config, recordConfig):
+    configData = None
+    if 'configData' in config:
+        configData = config['configData']
+        configData['bgMusic'] = 'bg_music.mp3'
+        configData['gameId'] = recordConfig['gameId']
+        configData['gameName'] = recordConfig['gameName']
+        configData['gameIcon'] = recordConfig['gameIcon']
+        configData['gameUrl'] = recordConfig['gameUrl']
+        configData['skinId'] = recordConfig['skinId']
+    else:
+        config['configData'] = {
+            'bgMusic':'bg_music.mp3',
+            'gameId':recordConfig['gameId'],
+            'gameName':recordConfig['gameName'],
+            'gameIcon':recordConfig['gameIcon'],
+            'gameUrl':recordConfig['gameUrl'],
+            'skinId':recordConfig['skinId']
+        }
+
 def toBoolean(booleanStr):
     if type(booleanStr) == bool:
         return booleanStr