|
@@ -339,11 +339,11 @@ def mergeLanguage(game, sdk, subChannel, config):
|
|
|
|
|
|
if not os.path.exists(mergePath):
|
|
|
print('%s not exists!' % mergePath)
|
|
|
- return 1
|
|
|
+ return 0
|
|
|
|
|
|
if not os.path.isdir(mergePath):
|
|
|
print('%s not a dir!' % mergePath)
|
|
|
- return 1
|
|
|
+ return 0
|
|
|
|
|
|
for fileName in os.listdir(mergePath):
|
|
|
mergeJson(mergePath, decompliePath, fileName)
|
|
@@ -359,7 +359,7 @@ def mergeJson(srcDir, changeDir, fileName):
|
|
|
changeFile = os.path.join(changeDir, fileName)
|
|
|
if not os.path.exists(changeFile):
|
|
|
print('%s not exists!' % changeFile)
|
|
|
- return 1
|
|
|
+ return 0
|
|
|
jsonText1 = file_utils.readFile(srcFile)
|
|
|
jsonText2 = file_utils.readFile(changeFile)
|
|
|
print('*************src config*************')
|