From 595df075ed3cf882ee8bb2f0a62ea797ec543386 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 31 May 2021 20:24:15 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E3=80=90=E5=B7=A5=E5=85=B7=E3=80=91?= =?UTF-8?q?=E6=89=93=E5=8C=85=E5=B7=A5=E5=85=B7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/AutoPack.cs | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/Assets/Editor/AutoPack.cs b/Assets/Editor/AutoPack.cs index 16eb83ccd1..3e0e15ab07 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -253,8 +253,11 @@ public class AutoPack : EditorWindow Debug.Log(PackConfig[index][0] + ":母包工程资源替换完成"); // 替换build-id + + EditorUtility.DisplayProgressBar("重写AndroidManifest", "", 1f); RewriteManifest(fromPath + "/src/main/AndroidManifest.xml", toPath + "/src/main/AndroidManifest.xml"); Debug.Log(PackConfig[index][0] + ":母包Manifest修改完成"); + EditorUtility.ClearProgressBar(); } private static void RewriteManifest(string f, string t) { @@ -310,18 +313,39 @@ public class AutoPack : EditorWindow // 替换配置文件 private static void ReplaceConfigAndVersion(int index) { + EditorUtility.DisplayProgressBar("替换配置文件", "", 1f); string toPath = _MomPackPath + PackConfig[index][2] + "/src/main/assets/Android/"; string fromPath = _MomPackPath + PackConfig[index][2] + "/Config/"; File.Copy(fromPath + ConfigFileName, toPath + ConfigFileName, true); File.Copy(fromPath + VersionFileName, toPath + VersionFileName, true); Debug.Log(PackConfig[index][0]+":配置文件替换完成"); + EditorUtility.ClearProgressBar(); } // 开始生成apk private static void StartGradleBuild(int index) { - GameEditor.Util.ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "gradlew assembleDebug"); + EditorUtility.DisplayProgressBar("正在生成APK", "", 1f); + string apkPath = _MomPackPath + PackConfig[index][2] + "/APK/"; + if (!Directory.Exists(apkPath)) + { + Directory.CreateDirectory(apkPath); + } + string time = DateTime.Now.ToString("yyyy_MM_dd_hh_mm_ss"); + if (!Directory.Exists(apkPath + time)) + { + Directory.CreateDirectory(apkPath + time); + } + GameEditor.Util.ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "gradlew assembleRelease>" + apkPath + time +"/_log.txt"); + + EditorUtility.DisplayProgressBar("正在导出APK", "", 1f); + string apkFilePath = _MomPackPath + PackConfig[index][2] + "/build/outputs/apk/release/" + PackConfig[index][2] + "-release.apk"; + if (File.Exists(apkFilePath)) + { + File.Copy(apkFilePath, apkPath + time + "/" + PackConfig[index][2] + ".apk"); + } Debug.Log(PackConfig[index][0] + ":打包完成"); + EditorUtility.ClearProgressBar(); } //private static void ExportXcode(string _sceneName) From 5bc754678e1a9ae151fe4c2ee61ce6fa144a1113 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 31 May 2021 20:39:46 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua index 05ca1251e7..0aedce3bbe 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua @@ -227,7 +227,7 @@ function this.ShowCountTime() this.timer1 = Timer.New(function () freshData = freshData - 1 if freshData < 0 then - ChecRedPointEndLess(RedPointType.EndlessPanel) + CheckRedPointStatus(RedPointType.EndlessPanel) this:ClosePanel() else updateTime() From 9a98ff2e0af9b586b72cf3f539665e2ab3827329 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 31 May 2021 21:12:34 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E3=80=90=E5=B7=A5=E5=85=B7=E3=80=91?= =?UTF-8?q?=E6=8B=B7=E8=B4=9D=E8=BF=87=E7=A8=8B=E6=B7=BB=E5=8A=A0=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Core/Core/Utils/FileUtils.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/Scripts/Core/Core/Utils/FileUtils.cs b/Assets/Scripts/Core/Core/Utils/FileUtils.cs index 42d05b81e7..9035c3af00 100644 --- a/Assets/Scripts/Core/Core/Utils/FileUtils.cs +++ b/Assets/Scripts/Core/Core/Utils/FileUtils.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using UnityEditor; namespace GameCore { /// @@ -90,12 +91,15 @@ namespace GameCore { } Directory.CreateDirectory(toDir); string[] files = Directory.GetFiles(fromDir); + int i = 0; foreach (string formFileName in files) { string fileName = Path.GetFileName(formFileName); string toFileName = Path.Combine(toDir, fileName); File.Copy(formFileName, toFileName); + EditorUtility.DisplayProgressBar("复制文件夹:"+fromDir, formFileName, (float)(++i / files.Length)); } + EditorUtility.ClearProgressBar(); string[] fromDirs = Directory.GetDirectories(fromDir); foreach (string fromDirName in fromDirs) { From 10deef53cfcbf8e21c14490b188b212c5d90c1aa Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 31 May 2021 21:36:05 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=95=8C=E9=9D=A2=E8=83=8C=E6=99=AF=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/GameInit/UpdatePanel.cs | 28 ++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/GameInit/UpdatePanel.cs b/Assets/Scripts/GameInit/UpdatePanel.cs index a21ddcd880..cc4aca00c2 100644 --- a/Assets/Scripts/GameInit/UpdatePanel.cs +++ b/Assets/Scripts/GameInit/UpdatePanel.cs @@ -28,6 +28,7 @@ namespace GameLogic [SerializeField] UpdateMsgBox msgBox; + AssetBundle bundle; void Awake() { msgBox.gameObject.SetActive(false); @@ -41,7 +42,29 @@ namespace GameLogic string updatePanelBg = ConfigManager.Instance.GetConfigInfo("Setting.UPDATE_PANEL_BG.value"); if (updatePanelBg != null) { - this.transform.Find("Canvas/LoadingScreen/bg1").GetComponent().sprite = App.ResMgr.LoadSpriteAsset(updatePanelBg); + if (AppConst.bundleMode) + { + string path = AppConst.PersistentDataPath + "lz4/bg/loading/" + updatePanelBg + ".unity3d"; + if (!File.Exists(path)) + { + path = AppConst.StreamPath + "lz4/bg/loading/" + updatePanelBg + ".unity3d"; + } + bundle = AssetBundle.LoadFromFile(path, 0, GameLogic.AppConst.EncyptBytesLength); + if (bundle == null) + { + XDebug.Log.error(string.Format("{0} 不存在,请检查", path)); + return; + } + this.transform.Find("Canvas/LoadingScreen/bg1").GetComponent().sprite = bundle.LoadAsset(updatePanelBg); + } + else + { +#if UNITY_EDITOR + string path = AppConst.GameResPath + "/BG/Loading/" + updatePanelBg + ".jpg"; + Sprite sp = UnityEditor.AssetDatabase.LoadAssetAtPath(path); + this.transform.Find("Canvas/LoadingScreen/bg1").GetComponent().sprite = sp; +#endif + } } } private void OnDestroy() @@ -49,7 +72,8 @@ namespace GameLogic string updatePanelBg = ConfigManager.Instance.GetConfigInfo("Setting.UPDATE_PANEL_BG.value"); if (updatePanelBg != null) { - App.ResMgr.UnLoadAsset(updatePanelBg); + if (bundle != null) bundle.Unload(true); + bundle = null; } } From 3e12b641189d0e0c90290b2e14b3ef53b272718e Mon Sep 17 00:00:00 2001 From: JieLing Date: Mon, 31 May 2021 21:54:13 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E3=80=90=E6=89=93=E5=8C=85=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E3=80=91=E4=BF=AE=E5=A4=8D=E6=8B=B7=E8=B4=9D=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/AutoPack.cs | 20 ++++++++++++++------ Assets/Scripts/Core/Core/Utils/FileUtils.cs | 8 +++----- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Assets/Editor/AutoPack.cs b/Assets/Editor/AutoPack.cs index 3e0e15ab07..4a07af5fba 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -248,13 +248,17 @@ public class AutoPack : EditorWindow string to = toPath + dir; if (Directory.Exists(to)) Directory.Delete(to, true); Directory.CreateDirectory(to); - GameCore.FileUtils.CopyDir(fromPath + dir, to); + GameCore.FileUtils.CopyDir(fromPath + dir, to, (string dirName, string fileName, float progress)=> + { + EditorUtility.DisplayProgressBar("正在复制:"+ dirName, fileName, progress); + }); + EditorUtility.ClearProgressBar(); } Debug.Log(PackConfig[index][0] + ":母包工程资源替换完成"); // 替换build-id - EditorUtility.DisplayProgressBar("重写AndroidManifest", "", 1f); + EditorUtility.DisplayProgressBar("重写AndroidManifest", "", 0.5f); RewriteManifest(fromPath + "/src/main/AndroidManifest.xml", toPath + "/src/main/AndroidManifest.xml"); Debug.Log(PackConfig[index][0] + ":母包Manifest修改完成"); EditorUtility.ClearProgressBar(); @@ -306,14 +310,18 @@ public class AutoPack : EditorWindow string toPath = _MomPackPath + PackConfig[index][2] + "/src/main/assets/Android"; if (Directory.Exists(toPath)) Directory.Delete(toPath, true); Directory.CreateDirectory(toPath); - GameCore.FileUtils.CopyDir(ABPath, toPath); + GameCore.FileUtils.CopyDir(ABPath, toPath, (string dirName, string fileName, float progress) => + { + EditorUtility.DisplayProgressBar("正在复制:" + dirName, fileName, progress); + }); + EditorUtility.ClearProgressBar(); Debug.Log(PackConfig[index][0] + ":替换AB包完成"); } // 替换配置文件 private static void ReplaceConfigAndVersion(int index) { - EditorUtility.DisplayProgressBar("替换配置文件", "", 1f); + EditorUtility.DisplayProgressBar("替换配置文件", "", 0.5f); string toPath = _MomPackPath + PackConfig[index][2] + "/src/main/assets/Android/"; string fromPath = _MomPackPath + PackConfig[index][2] + "/Config/"; File.Copy(fromPath + ConfigFileName, toPath + ConfigFileName, true); @@ -325,7 +333,7 @@ public class AutoPack : EditorWindow // 开始生成apk private static void StartGradleBuild(int index) { - EditorUtility.DisplayProgressBar("正在生成APK", "", 1f); + EditorUtility.DisplayProgressBar("正在生成APK", "", 0.5f); string apkPath = _MomPackPath + PackConfig[index][2] + "/APK/"; if (!Directory.Exists(apkPath)) { @@ -338,7 +346,7 @@ public class AutoPack : EditorWindow } GameEditor.Util.ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "gradlew assembleRelease>" + apkPath + time +"/_log.txt"); - EditorUtility.DisplayProgressBar("正在导出APK", "", 1f); + EditorUtility.DisplayProgressBar("正在导出APK", "", 0.5f); string apkFilePath = _MomPackPath + PackConfig[index][2] + "/build/outputs/apk/release/" + PackConfig[index][2] + "-release.apk"; if (File.Exists(apkFilePath)) { diff --git a/Assets/Scripts/Core/Core/Utils/FileUtils.cs b/Assets/Scripts/Core/Core/Utils/FileUtils.cs index 9035c3af00..f583598890 100644 --- a/Assets/Scripts/Core/Core/Utils/FileUtils.cs +++ b/Assets/Scripts/Core/Core/Utils/FileUtils.cs @@ -1,6 +1,5 @@ using System; using System.IO; -using UnityEditor; namespace GameCore { /// @@ -81,7 +80,7 @@ namespace GameCore { /// /// /// - public static void CopyDir(string fromDir, string toDir) + public static void CopyDir(string fromDir, string toDir, Action callBack = null) { if (!Directory.Exists(fromDir)) return; @@ -97,15 +96,14 @@ namespace GameCore { string fileName = Path.GetFileName(formFileName); string toFileName = Path.Combine(toDir, fileName); File.Copy(formFileName, toFileName); - EditorUtility.DisplayProgressBar("复制文件夹:"+fromDir, formFileName, (float)(++i / files.Length)); + if (callBack != null) callBack(fromDir, fileName, (float)++i/files.Length); } - EditorUtility.ClearProgressBar(); string[] fromDirs = Directory.GetDirectories(fromDir); foreach (string fromDirName in fromDirs) { string dirName = Path.GetFileName(fromDirName); string toDirName = Path.Combine(toDir, dirName); - CopyDir(fromDirName, toDirName); + CopyDir(fromDirName, toDirName, callBack); } } From 70bc51f319f9cd6518f016d85eb4be863e13ff23 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 1 Jun 2021 10:41:03 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E3=80=90=E5=B7=A5=E5=85=B7=E3=80=91?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=89=93=E5=8C=85=E5=B7=A5=E5=85=B7GIT?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=8A=A0=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/AutoPack.cs | 54 +++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/Assets/Editor/AutoPack.cs b/Assets/Editor/AutoPack.cs index 4a07af5fba..c06b410a53 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -3,6 +3,7 @@ using UnityEditor; using System.IO; using System; using GameEditor.FrameTool; +using GameEditor.Util; public class AutoPack : EditorWindow { @@ -31,6 +32,8 @@ public class AutoPack : EditorWindow static string ExportPackPath; static string ScenePath; static string ABPath; + static string APKPath; + static string PackTime; // 判断是否要重新导出工程 static string[] ExportTypeList = @@ -178,15 +181,18 @@ public class AutoPack : EditorWindow ExportAS(i); ReplaceFromProject(i); ReplaceConfigAndVersion(i); + CreateLogFile(i); StartGradleBuild(i); break; case 1: // 只替换AB ReplaceFromAB(i); ReplaceConfigAndVersion(i); + CreateLogFile(i); StartGradleBuild(i); break; case 2: // 只重新打包 ReplaceConfigAndVersion(i); + CreateLogFile(i); StartGradleBuild(i); break; } @@ -194,6 +200,21 @@ public class AutoPack : EditorWindow } + public static void CreateLogFile(int index) + { + APKPath = _MomPackPath + PackConfig[index][2] + "/APK/"; + if (!Directory.Exists(APKPath)) + { + Directory.CreateDirectory(APKPath); + } + PackTime = DateTime.Now.ToString("yyyy_MM_dd_hh_mm_ss"); + APKPath += PackTime; + if (!Directory.Exists(APKPath)) + { + Directory.CreateDirectory(APKPath); + } + + } // 导出android 工程 public static void ExportAS(int index) { @@ -333,29 +354,34 @@ public class AutoPack : EditorWindow // 开始生成apk private static void StartGradleBuild(int index) { - EditorUtility.DisplayProgressBar("正在生成APK", "", 0.5f); - string apkPath = _MomPackPath + PackConfig[index][2] + "/APK/"; - if (!Directory.Exists(apkPath)) - { - Directory.CreateDirectory(apkPath); - } - string time = DateTime.Now.ToString("yyyy_MM_dd_hh_mm_ss"); - if (!Directory.Exists(apkPath + time)) - { - Directory.CreateDirectory(apkPath + time); - } - GameEditor.Util.ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "gradlew assembleRelease>" + apkPath + time +"/_log.txt"); + EditorUtility.DisplayProgressBar("正在生成APK", "", 0f); + GameEditor.Util.ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "gradlew assembleRelease>" + APKPath + "/_log.txt"); - EditorUtility.DisplayProgressBar("正在导出APK", "", 0.5f); + EditorUtility.DisplayProgressBar("正在导出APK", "", 1f); string apkFilePath = _MomPackPath + PackConfig[index][2] + "/build/outputs/apk/release/" + PackConfig[index][2] + "-release.apk"; if (File.Exists(apkFilePath)) { - File.Copy(apkFilePath, apkPath + time + "/" + PackConfig[index][2] + ".apk"); + File.Copy(apkFilePath, APKPath + "/" + PackConfig[index][2] + ".apk"); } Debug.Log(PackConfig[index][0] + ":打包完成"); EditorUtility.ClearProgressBar(); } + private static void GitUpdate(int index) + { + EditorUtility.DisplayProgressBar("正在更新母包", "", 0f); + ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "git pull>" + APKPath + "/_log.txt"); + EditorUtility.ClearProgressBar(); + } + private static void GitCommit(int index) + { + EditorUtility.DisplayProgressBar("正在提交修改", "", 0f); + ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "git add .>" + APKPath + "/_log.txt"); + ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "git commit 'AutoPack:"+ PackConfig[index][0]+" "+PackTime+"/"+ PackConfig[index][2] +".apk'"); + EditorUtility.ClearProgressBar(); + + } + //private static void ExportXcode(string _sceneName) //{ // PlayerSettings.productName = "太初行"; From d7947bcf75fa3b7ef038a46b3b189ac0d743deb7 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 1 Jun 2021 10:50:22 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E5=85=B3=E5=8D=A1=E5=A5=96=E5=8A=B1?= =?UTF-8?q?=E4=B8=8E=E5=9C=A8=E7=BA=BF=E5=A5=96=E5=8A=B1=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=EF=BC=8C=E5=B1=B1=E6=B2=B3=E7=A4=BE=E7=A8=B7=E5=9B=BE=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE=E5=9C=A8=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E5=A5=96=E5=8A=B1=E4=B8=8A=E6=96=B9=EF=BC=88=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E4=BD=8D=E7=BD=AE=E5=BA=94=E6=98=BE=E7=A4=BA=E5=9C=A8?= =?UTF-8?q?=E5=85=B6=E4=B8=8B=E6=96=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Fight/FightPointPassMainPanel.prefab | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index fbd985c18a..80a7fd45fa 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -25,7 +25,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2754606} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 46.44001, y: 0} + m_AnchoredPosition: {x: 46.44001, y: 29.799927} m_SizeDelta: {x: 95, y: 95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1340578678646069342 @@ -184,7 +184,7 @@ RectTransform: - {fileID: 4794193363044016226} - {fileID: 7979493423713549204} m_Father: {fileID: 1012972711} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5050,7 +5050,7 @@ ParticleSystem: --- !u!199 &689865173 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -5516,8 +5516,8 @@ RectTransform: m_Children: - {fileID: 698392784} - {fileID: 5391497229806396012} - - {fileID: 107230295} - {fileID: 2110103215} + - {fileID: 107230295} m_Father: {fileID: 6498494602927743175} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6389,12 +6389,12 @@ RectTransform: - {fileID: 6190705344566736628} - {fileID: 7044132877104389030} m_Father: {fileID: 1012972711} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 112, y: 112} + m_SizeDelta: {x: 112, y: 148.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2110103218 CanvasRenderer: @@ -11335,7 +11335,7 @@ ParticleSystem: --- !u!199 &53865032735354669 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16186,7 +16186,7 @@ ParticleSystem: --- !u!199 &53865032903479894 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20921,7 +20921,7 @@ ParticleSystem: --- !u!199 &53865033217178009 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25534,7 +25534,7 @@ ParticleSystem: --- !u!199 &53865033315684810 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -26483,7 +26483,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 391041880342581856} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -26492,7 +26492,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 79.74001, y: 33.1} + m_AnchoredPosition: {x: 79.74001, y: 62.900047} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7450004280634771642 @@ -31185,7 +31185,7 @@ ParticleSystem: --- !u!199 &4590674014730051834 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -31625,7 +31625,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 100, y: 217.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1473222624206509369 @@ -36527,7 +36527,7 @@ ParticleSystem: --- !u!199 &345244862577150605 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -41439,7 +41439,7 @@ ParticleSystem: --- !u!199 &1269342248769744005 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -46308,7 +46308,7 @@ ParticleSystem: --- !u!199 &1269342248929065148 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -51705,7 +51705,7 @@ ParticleSystem: --- !u!199 &3340559361339608959 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -52728,7 +52728,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 46.44001, y: 0} + m_AnchoredPosition: {x: 46.44001, y: 29.799927} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2163478246162048306 @@ -57868,7 +57868,7 @@ ParticleSystem: --- !u!199 &4461638917069206421 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -60093,7 +60093,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3747070971011954181} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -60102,7 +60102,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 47, y: -0.3} + m_AnchoredPosition: {x: 47, y: 29.499928} m_SizeDelta: {x: 109.23, y: 109.04} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3747070971011954178 @@ -65029,7 +65029,7 @@ ParticleSystem: --- !u!199 &8153914426121884216 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -70206,7 +70206,7 @@ ParticleSystem: --- !u!199 &4571234231691897658 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -70735,7 +70735,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4469323207721599499} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -70744,7 +70744,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 46.44001, y: 0} + m_AnchoredPosition: {x: 46.44001, y: 29.799927} m_SizeDelta: {x: 95, y: 95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8840073511339574820 @@ -71138,7 +71138,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4744240912008588426} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -71147,7 +71147,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 46.44001, y: -69.1} + m_AnchoredPosition: {x: 46.44001, y: -39.29995} m_SizeDelta: {x: 126.6, y: 31.45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8614474801755879562 @@ -71286,7 +71286,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4820421069940768290} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -71295,7 +71295,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 46.44001, y: -69.2} + m_AnchoredPosition: {x: 46.44001, y: -39.39995} m_SizeDelta: {x: 160, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4820421069940768301 @@ -76619,7 +76619,7 @@ ParticleSystem: --- !u!199 &6988990775388982249 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -82665,7 +82665,7 @@ ParticleSystem: --- !u!199 &1454073279585546898 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -87562,7 +87562,7 @@ ParticleSystem: --- !u!199 &6133679773105218358 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -92456,7 +92456,7 @@ ParticleSystem: --- !u!199 &6133679773792227019 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -97122,7 +97122,7 @@ ParticleSystem: --- !u!199 &6133679774607836274 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -97478,7 +97478,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &109213283015355470 @@ -98152,7 +98152,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6556360217626877981} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -98161,7 +98161,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 12.540012, y: -35.8} + m_AnchoredPosition: {x: 12.540012, y: -6.0000725} m_SizeDelta: {x: 160, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3138096716679861701 @@ -104480,7 +104480,7 @@ ParticleSystem: --- !u!199 &4325216380872068964 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -110039,7 +110039,7 @@ ParticleSystem: --- !u!199 &5429492888628637653 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -114816,7 +114816,7 @@ ParticleSystem: --- !u!199 &8548423836369118796 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -119699,7 +119699,7 @@ ParticleSystem: --- !u!199 &8548423836683259267 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -124534,7 +124534,7 @@ ParticleSystem: --- !u!199 &8548423837075803679 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -129254,7 +129254,7 @@ ParticleSystem: --- !u!199 &8548423837924684024 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} From 4322ac35bd9a99da3f5153c3357d0c9325382a16 Mon Sep 17 00:00:00 2001 From: JieLing Date: Tue, 1 Jun 2021 10:56:20 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E3=80=90=E6=89=93=E5=8C=85=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E3=80=91=E8=B0=83=E7=94=A8GIT=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/AutoPack.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Assets/Editor/AutoPack.cs b/Assets/Editor/AutoPack.cs index c06b410a53..8f05f25df9 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -181,19 +181,25 @@ public class AutoPack : EditorWindow ExportAS(i); ReplaceFromProject(i); ReplaceConfigAndVersion(i); + GitUpdate(i); CreateLogFile(i); StartGradleBuild(i); + GitCommit(i); break; case 1: // 只替换AB ReplaceFromAB(i); ReplaceConfigAndVersion(i); + GitUpdate(i); CreateLogFile(i); StartGradleBuild(i); + GitCommit(i); break; case 2: // 只重新打包 ReplaceConfigAndVersion(i); + GitUpdate(i); CreateLogFile(i); StartGradleBuild(i); + GitCommit(i); break; } } From 5c778aad2224df6289594ff77016c1f28df7f83f Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 1 Jun 2021 10:58:46 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E6=A3=AE=E7=BD=97=E5=B9=BB=E5=A2=83?= =?UTF-8?q?=E3=80=91=E8=AF=95=E7=82=BC=E7=B2=BE=E6=B0=94=E7=89=B9=E6=95=88?= =?UTF-8?q?=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua index 37b17a088e..6c5159e089 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua @@ -271,7 +271,7 @@ function this:SetActiveGameObj() this.heroGrid.gameObject:SetActive(true) this.enemyInfo.gameObject:SetActive(false) this.propList.gameObject:SetActive(false) - this.fireRoot.gameObject:SetActive(false) + this.fireRoot.gameObject:SetActive(isShow) this.EndLessEffect.gameObject:SetActive(false) this.endLessTitle.gameObject:SetActive(not isShow) this.stepROot.gameObject:SetActive(not isShow) From 8f29aa0cf82c2008f94750aaffd32d87de3a2903 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 1 Jun 2021 11:01:04 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E3=80=90=E6=89=93=E5=8C=85=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E3=80=91=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E8=A6=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=B0GIt=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/AutoPack.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Assets/Editor/AutoPack.cs b/Assets/Editor/AutoPack.cs index c06b410a53..b05f89a1d6 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -34,6 +34,7 @@ public class AutoPack : EditorWindow static string ABPath; static string APKPath; static string PackTime; + static bool CommitToGit; // 判断是否要重新导出工程 static string[] ExportTypeList = @@ -132,6 +133,7 @@ public class AutoPack : EditorWindow ExportType = EditorGUILayout.Popup("请选择出包方式", ExportType, ExportTypeList); EditorGUILayout.Space(); + CommitToGit = EditorGUILayout.ToggleLeft("是否要提交到Git", CommitToGit); EditorGUILayout.Space(); @@ -375,10 +377,13 @@ public class AutoPack : EditorWindow } private static void GitCommit(int index) { - EditorUtility.DisplayProgressBar("正在提交修改", "", 0f); - ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "git add .>" + APKPath + "/_log.txt"); - ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "git commit 'AutoPack:"+ PackConfig[index][0]+" "+PackTime+"/"+ PackConfig[index][2] +".apk'"); - EditorUtility.ClearProgressBar(); + if (CommitToGit) + { + EditorUtility.DisplayProgressBar("正在提交修改", "", 0f); + ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "git add .>" + APKPath + "/_log.txt"); + ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "git commit 'AutoPack:" + PackConfig[index][0] + " " + PackTime + "/" + PackConfig[index][2] + ".apk'"); + EditorUtility.ClearProgressBar(); + } } From 16eacf1a470384778e408319a2cb32673b406ed0 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 1 Jun 2021 11:02:08 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E3=80=90=E6=89=93=E5=8C=85=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E3=80=91=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=E5=91=BD?= =?UTF-8?q?=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/AutoPack.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Editor/AutoPack.cs b/Assets/Editor/AutoPack.cs index b05f89a1d6..71d8579096 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -381,7 +381,7 @@ public class AutoPack : EditorWindow { EditorUtility.DisplayProgressBar("正在提交修改", "", 0f); ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "git add .>" + APKPath + "/_log.txt"); - ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "git commit 'AutoPack:" + PackConfig[index][0] + " " + PackTime + "/" + PackConfig[index][2] + ".apk'"); + ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "git commit -m 'AutoPack:" + PackConfig[index][0] + " " + PackTime + "/" + PackConfig[index][2] + ".apk'"); EditorUtility.ClearProgressBar(); } From ba93c4e861f3b94493acf93aeec82dc82d526cc7 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 1 Jun 2021 11:16:37 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E3=80=90=E6=8A=BD=E5=8D=A1=E8=B7=B3?= =?UTF-8?q?=E8=BF=87=E9=9F=B3=E6=95=88=E6=B2=A1=E6=9C=89=E8=B7=B3=E8=BF=87?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Recruit/SingleRecruitPanel.lua | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua index 14aa100aab..f4bc8ee4b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua @@ -28,6 +28,10 @@ local func=nil this.time = Timer.New() this.time2 = Timer.New() this.time3 = Timer.New() +local Sound_Recruit2 +local Sound_Recruit3 +local Sound_Recruit4 + --初始化组件(用于子类重写) function SingleRecruitPanel:InitComponent() this.spLoader = SpriteLoader.New() @@ -150,6 +154,7 @@ function SingleRecruitPanel:BindEvent() UIManager.OpenPanel(UIName.TenRecruitPanel,heroData,type,recruitType) end this.jumpBtnGo:SetActive(false) + this.StopPanelSound() end) --确定按钮 Util.AddClick(self.goBtn,function() @@ -200,7 +205,7 @@ end --界面打开时调用(用于子类重写) function SingleRecruitPanel:OnOpen(...) this.UI_Effect_open:SetActive(true) - SoundManager.PlaySound(SoundConfig.Sound_Recruit4) + Sound_Recruit4 = SoundManager.PlaySound(SoundConfig.Sound_Recruit4) this.UI_Effect_choukaSSR:SetActive(false) this.UI_Effect_choukaSR:SetActive(false) this.UI_Effect_choukaR:SetActive(false) @@ -290,7 +295,7 @@ function SingleRecruitPanel:TenOpenPanel() this.UI_Effect_choukaSR:SetActive(false) this.UI_Effect_choukaR:SetActive(false) this.UI_Effect_appear:SetActive(true) - SoundManager.PlaySound(SoundConfig.Sound_Recruit2) + Sound_Recruit2 = SoundManager.PlaySound(SoundConfig.Sound_Recruit2) end, timeNum) this.time:Start() this.time3 = Timer.New(function () @@ -326,7 +331,7 @@ function SingleRecruitPanel:UpdataPanelData(_heroData) Game.GlobalEvent:DispatchEvent(GameEvent.UI.OnUpdateData, self.uiConfig.id) this.jumpBtnGo:SetActive(false) this.UI_Effect_appear:SetActive(false) - SoundManager.PlaySound(SoundConfig.Sound_Recruit3) + Sound_Recruit3 = SoundManager.PlaySound(SoundConfig.Sound_Recruit3) if heroStaticData and testLiveGO then poolManager:UnLoadLive(GetResourcePath(heroStaticData.Live), testLiveGO) @@ -446,8 +451,22 @@ function SingleRecruitPanel:OnClose() poolManager:UnLoadLive(GetResourcePath(heroStaticData.Live), testLiveGO) end heroStaticData, testLiveGO = nil, nil + this.StopPanelSound() +end +function this.StopPanelSound() + if Sound_Recruit2 then + SoundManager.StopSound(Sound_Recruit2) + Sound_Recruit2 = nil + end + if Sound_Recruit3 then + SoundManager.StopSound(Sound_Recruit3) + Sound_Recruit3 = nil + end + if Sound_Recruit4 then + SoundManager.StopSound(Sound_Recruit4) + Sound_Recruit4 = nil + end end - function SingleRecruitPanel:GetProStr(index) local proStr="" if index==1 then From 12fcc3ea14aa2ce6e68ef9bc4adf5ad899d47506 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 1 Jun 2021 11:44:49 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E3=80=90=E7=99=BE=E5=AE=9D=E5=95=86?= =?UTF-8?q?=E4=BC=9A=E3=80=91=E5=89=A9=E4=BD=99=E6=97=B6=E9=97=B4=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=8C=E5=BA=94=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=BD=93=E5=A4=A9=E5=88=B7=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/TreasureStore/TreasureStorePopup.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua b/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua index 601b323295..25a6c41107 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua @@ -215,9 +215,9 @@ function this.TimeCountDown() this.timer:Stop() this.timer = nil end - local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.TreasureStore) - local timeDown = endTime - GetTimeStamp() - --local timeDown = CalculateSecondsNowTo_N_OClock(24) + -- local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.TreasureStore) + -- local timeDown = endTime - GetTimeStamp() + local timeDown = CalculateSecondsNowTo_N_OClock(24) this.time.text = Language[10023]..TimeToHMS(timeDown) this.timer = Timer.New(function() timeDown = timeDown - 1 From ad004ddc5e4b85056e23fd6cb61c699e455b583e Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 1 Jun 2021 11:46:00 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E9=99=90=E6=97=B6=E5=8F=AC=E5=94=A4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index 41aa080b5f..c2bf5631b8 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -132,9 +132,13 @@ function TimeLimitUpHero:OnShow(_sortingOrder) local id = ActivityGiftManager.IsActivityTypeOpen(self.actConfig.ActiveType) if id and id > 0 then self.actId = id - local config = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType,"ActId",id) - if config then - self.actConfig = config + + local actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",globalActive[id].ShowArt,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType) + if not actConfig then + actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",id,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType) + end + if actConfig then + self.actConfig = actConfig end end end From 70486911673bb48b399314402f62c85da590ee67 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 1 Jun 2021 13:42:36 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E3=80=90=E5=BF=83=E6=84=BF=E6=8A=BD?= =?UTF-8?q?=E5=8D=A1=E3=80=91=E5=8D=81=E8=BF=9E=E6=B2=A1=E9=9F=B3=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua | 1 + .../~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua index b68dca1380..b45fda9b31 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua @@ -126,6 +126,7 @@ function QianKunBoxBuyTenPanel:OnSortingOrderChange() end --界面打开时调用(用于子类重写) function QianKunBoxBuyTenPanel:OnOpen(...) + SoundManager.PlaySound(SoundConfig.UI_Siyuanzhen) -- this.itemIcon1.sprite=this.spLoader:LoadSprite(GetResourcePath(ItemConfig[SecretBoxManager.MainCost[2][1][1]].ResourceID)) local args = { ... } this.drop=args[1] diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua index 6e796fcb7e..580d345dfc 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua @@ -116,6 +116,7 @@ function SecretBoxBuyTenPanel:OnSortingOrderChange() end --界面打开时调用(用于子类重写) function SecretBoxBuyTenPanel:OnOpen(...) + SoundManager.PlaySound(SoundConfig.UI_Siyuanzhen) -- this.itemIcon1.sprite=this.spLoader:LoadSprite(GetResourcePath(ItemConfig[SecretBoxManager.MainCost[2][1][1]].ResourceID)) local args = { ... } this.drop=args[1] From a1bc2ae463fd0f095701a4ce134c8a2926f1ea7c Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 1 Jun 2021 13:53:47 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/ActivityMainPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 243b2db15c..7439991460 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -69,7 +69,7 @@ function ActivityMainPanel:CheckActOpen(_index) local id = ActivityGiftManager.IsActivityTypeOpen(tabs[_index].ActiveType) if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[_index].ActiveType) then if GlobalActConfig[id].ShowArt and GlobalActConfig[id].ShowArt > 0 then - if tabs[_index].ActiveType == ActivityTypeDef.DynamicAct then + if tabs[_index].ActiveType == ActivityTypeDef.DynamicAct or tabs[_index].ActiveType == ActivityTypeDef.LimitUpHero then _CurPageIndex = _index elseif GlobalActConfig[id].ShowArt == this.activityType then _CurPageIndex = _index