diff --git a/Assets/Editor/AutoPack.cs b/Assets/Editor/AutoPack.cs index 7cd81d029f..a6bc9ba6d6 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -405,7 +405,7 @@ public class AutoPack : EditorWindow "git add ." + printlog, "echo git commit -m 'AutoPack:" + PackConfig[index][0] + "-" + PackTime + "-" + PackConfig[index][2] + ".apk'" + printlog, "git commit -m 'AutoPack:" + PackConfig[index][0] + "-" + PackTime + "-" + PackConfig[index][2] + ".apk'" + printlog, - + "git push", }; ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], commands); EditorUtility.ClearProgressBar(); diff --git a/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs b/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs index 8488914c59..d5ea9209c6 100644 --- a/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs +++ b/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs @@ -253,6 +253,10 @@ namespace GameEditor.FrameTool new string[]{ "灵动-专服", "mht_china/zf", "cdn_mht_zf_release", "china/zf_test" }, new string[]{ "草花", "mht_china/zf", "cdn_caohua", "china/zf_test" }, new string[]{ "喜扑", "mht_china/zf", "cdn_xipu", "china/zf_test" }, + + new string[]{ "先遣-内网", "mht_china/local", "local12_cn_local", "china/local" }, + new string[]{ "先遣-测试", "mht_china/xq", "cdn_xq_test", "china/test" }, + new string[]{ "先遣-正式", "mht_china/xq", "cdn_xq_release", "china/test" }, }; static Dictionary _HotFixConfigDic = new Dictionary(); @@ -497,6 +501,7 @@ namespace GameEditor.FrameTool EditorUtility.DisplayProgressBar("正在提交到GIT:", commitName, 1f); ProcessUtil.ProcessCommand(toPath, "git add ."); ProcessUtil.ProcessCommand(toPath, "git commit -m " + commitName); + ProcessUtil.ProcessCommand(toPath, "git push"); EditorUtility.ClearProgressBar(); } @@ -547,11 +552,13 @@ namespace GameEditor.FrameTool } log.Add("CDN TYPE: "+ info["cdn_type"]); string toolsDir = _HotFixProjectPath + "/Tools/" + info["cdn_type"]; - string command = string.Format("python UpLoad.py {0} {1} {2}>>{3}", _HotFixProjectPath + "/Root/" + hfs.dir_name, hfs.dir_cdn_setting, changeFileName, hfs.path_cdn_setting + "__HotFixLog/" + logName + ".log"); log.Add("TOOLS DIR: " + toolsDir); + string command = string.Format("python UpLoad.py {0} {1} {2}>>{3}", _HotFixProjectPath + "/Root/" + hfs.dir_name, hfs.dir_cdn_setting, changeFileName, hfs.path_cdn_setting + "__HotFixLog/" + logName + ".log"); log.Add("UPLOAD COMMAND: " + command); ProcessUtil.ProcessCommand(toolsDir, command); - + string flushCommand = string.Format("python Flush.py {0}>>{1}", hfs.cdn_version.resUrl, hfs.path_cdn_setting + "__HotFixLog/" + logName + ".log"); + log.Add("Flush COMMAND: " + flushCommand); + ProcessUtil.ProcessCommand(toolsDir, flushCommand); // write log EditorUtility.DisplayProgressBar("正在生成Log文件:", logName, 1f); WriteLog(hfs.path_cdn_setting + "__HotFixLog", logName, log.ToArray()); @@ -561,6 +568,7 @@ namespace GameEditor.FrameTool EditorUtility.DisplayProgressBar("正在提交到GIT:", commitName, 1f); ProcessUtil.ProcessCommand(hfs.path_cdn_setting, "git add ."); ProcessUtil.ProcessCommand(hfs.path_cdn_setting, "git commit -m " + commitName); + ProcessUtil.ProcessCommand(hfs.path_cdn_setting, "git push"); EditorUtility.ClearProgressBar(); }