From ab11a7c233f700c6b4c77976acc8b3bbab22bbff Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 15 Jun 2021 15:23:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B7=A5=E5=85=B7=E3=80=91=E7=83=AD?= =?UTF-8?q?=E6=9B=B4=E5=92=8C=E6=89=93=E5=8C=85=E5=B7=A5=E5=85=B7=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=90=8E=E8=87=AA=E5=8A=A8=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/AutoPack.cs | 2 +- Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 a64a7cdeb7..d5ea9209c6 100644 --- a/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs +++ b/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs @@ -501,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(); } @@ -558,7 +559,6 @@ namespace GameEditor.FrameTool 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()); @@ -568,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(); }