From 0814f45cfa135def28b44d2bef3b843e71283400 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 15 Jun 2021 14:46:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=83=AD=E6=9B=B4=E3=80=91?= =?UTF-8?q?=E5=85=88=E9=81=A3=E6=9C=8D=E7=9B=B8=E5=85=B3=E7=83=AD=E6=9B=B4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B7=BB=E5=8A=A0=EF=BC=8C=E8=85=BE=E8=AE=AF?= =?UTF-8?q?=E4=BA=91=E8=B7=AF=E5=BE=84=E5=88=B7=E6=96=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Editor/GameEditor/FrameTool/HotFixWindow.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs b/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs index 8488914c59..a64a7cdeb7 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(); @@ -547,11 +551,14 @@ 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()); From fbd02f1a29296eef91cb002b050d7eade3ef352c Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 15 Jun 2021 15:23:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=B7=A5=E5=85=B7=E3=80=91?= =?UTF-8?q?=E7=83=AD=E6=9B=B4=E5=92=8C=E6=89=93=E5=8C=85=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E5=AE=8C=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(); }