From 4f1a0333caa7c75a1f3466db3214cf1f3496e8f9 Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Mon, 24 Mar 2025 17:18:29 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Art/UIPrefab/UIModuleSelect.prefab | 101 ++++++++++++++++++++-- Assets/Scripts/UI/UIModuleSelect.cs | 28 +++++- Assets/Scripts/Xml/XmlParser.cs | 4 + 3 files changed, 127 insertions(+), 6 deletions(-) diff --git a/Assets/Art/UIPrefab/UIModuleSelect.prefab b/Assets/Art/UIPrefab/UIModuleSelect.prefab index ee521fbc..330a3a09 100644 --- a/Assets/Art/UIPrefab/UIModuleSelect.prefab +++ b/Assets/Art/UIPrefab/UIModuleSelect.prefab @@ -1,5 +1,80 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &362378255116206407 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4007744310226606941} + - component: {fileID: 7455571532591409758} + - component: {fileID: 8685952999310058692} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4007744310226606941 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 362378255116206407} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1041589483741693935} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7455571532591409758 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 362378255116206407} + m_CullTransparentMesh: 1 +--- !u!114 &8685952999310058692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 362378255116206407} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &369348797227731928 GameObject: m_ObjectHideFlags: 0 @@ -379,6 +454,7 @@ GameObject: - component: {fileID: 5800286210300119797} - component: {fileID: 7870331819941572208} - component: {fileID: 5640205172889648423} + - component: {fileID: 2499191464483522175} m_Layer: 5 m_Name: Label m_TagString: Untagged @@ -402,9 +478,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -30, y: -30} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 14.999985} + m_SizeDelta: {x: -30, y: -219} + m_Pivot: {x: 0.5, y: 0.000000029802322} --- !u!222 &7870331819941572208 CanvasRenderer: m_ObjectHideFlags: 0 @@ -467,8 +543,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 + m_HorizontalAlignment: 32 + m_VerticalAlignment: 1024 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -502,6 +578,20 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &2499191464483522175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2191389905807484100} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &2417640497830947151 GameObject: m_ObjectHideFlags: 0 @@ -1265,6 +1355,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 4007744310226606941} - {fileID: 5800286210300119797} m_Father: {fileID: 5394197843809455320} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/UI/UIModuleSelect.cs b/Assets/Scripts/UI/UIModuleSelect.cs index 39db96ce..db52b44c 100644 --- a/Assets/Scripts/UI/UIModuleSelect.cs +++ b/Assets/Scripts/UI/UIModuleSelect.cs @@ -12,7 +12,7 @@ namespace QFramework.Example } public partial class UIModuleSelect : UIPanel { - + ResLoader loader; protected override void OnInit(IUIData uiData = null) { mData = uiData as UIModuleSelectData ?? new UIModuleSelectData(); @@ -29,6 +29,7 @@ namespace QFramework.Example { Application.Quit(); }); + loader = ResLoader.Allocate(); } protected override void OnOpen(IUIData uiData = null) @@ -57,6 +58,23 @@ namespace QFramework.Example SceneManager.sceneLoaded += OnLoadFinished; }); }); + if (string.IsNullOrEmpty(item.Icon)==false) + { + var icon = obj.transform.Find("Icon").GetComponent(); + var localImageUrl = Global.imagePath + item.Icon; + loader.Add2Load(localImageUrl.ToNetImageResName(), + (bool success, IRes res) => + { + if (success) + { + icon.sprite = Utility.GetSprite(res.Asset as Texture2D); + } + }); + icon.gameObject.SetActive(true); + + } + + lastIndex = index; } } @@ -71,6 +89,14 @@ namespace QFramework.Example }); } + else + { + UIKit.OpenPanelAsync(canvasLevel: UILevel.PopUI).ToAction().StartGlobal(); + loader.LoadAsync(() => + { + TypeEventSystem.Global.Send(new OnLoadingHide()); + }); + } diff --git a/Assets/Scripts/Xml/XmlParser.cs b/Assets/Scripts/Xml/XmlParser.cs index 1acb3558..58602bab 100644 --- a/Assets/Scripts/Xml/XmlParser.cs +++ b/Assets/Scripts/Xml/XmlParser.cs @@ -25,6 +25,9 @@ namespace XMLTool public string Scene { get; set; } public string ModuleName { get; set; } public string Descript { get; set; } + + public string Icon { get; set; } + public List Operations { get; set; } public List Devices { get; set; } @@ -265,6 +268,7 @@ namespace XMLTool // ģ module.type = moduleElement.Element("Type")?.Value; module.ModuleName = moduleElement.Element("Name")?.Value; + module.Icon = moduleElement.Element("Icon")?.Value; module.Descript = moduleElement.Element("Descript")?.Value.Trim(); module.Scene = moduleElement.Element("Scene")?.Value; From cd4b67cf73e8fcab6899c4568cb86d560a7b37c2 Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Mon, 24 Mar 2025 17:38:27 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E7=AD=94=E6=A1=88=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/Scripts/UI/UIInput.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/UI/UIInput.cs b/Assets/Scripts/UI/UIInput.cs index c3c00e62..26e19459 100644 --- a/Assets/Scripts/UI/UIInput.cs +++ b/Assets/Scripts/UI/UIInput.cs @@ -3,6 +3,7 @@ using UnityEngine.UI; using QFramework; using System.Collections.Generic; using TMPro; +using System.Linq; namespace QFramework.Example { @@ -123,7 +124,8 @@ namespace QFramework.Example { foreach (var item in mData.inputs) { - if (VarController.Instance.Get(item.var).ToString() != item.answer) + var list = item.answer.Split('|').ToList(); + if (list.Contains(VarController.Instance.Get(item.var).ToString())==false) { return false; } From e7480454363274143d9491d0a12af6395e3c0102 Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Mon, 24 Mar 2025 17:43:19 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Doc/Xml配置文档.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Doc/Xml配置文档.xml b/Doc/Xml配置文档.xml index fc8e3bb7..979b458f 100644 --- a/Doc/Xml配置文档.xml +++ b/Doc/Xml配置文档.xml @@ -79,6 +79,7 @@ Input 为输入框(可多个) var里面存储是输入值 btn 为按钮(可多个) checkAnswer 是否开启检查答案 + answer 是正确答案 用|分割 可以支持多个正确答案 wrongLabel 输入错误的提示文字 wrongCount 错误后重新输入的次数 autoHide 错误弹窗自动消失的停留时间 @@ -87,8 +88,8 @@ wrongScore错误的分数 (每错一次扣一次分) --> - - + + @@ -259,6 +260,11 @@ Scene Study + + 图片名字 模块1 From a1f29f328b2879c2b3410625a416e02ee5c8e849 Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Tue, 25 Mar 2025 10:46:22 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BE=97=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Controller/ScoreController.cs | 18 +++++++++++++++++- Assets/Scripts/UI/UITipWindow.cs | 4 ++++ Doc/Xml配置文档.xml | 6 ++++-- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/Controller/ScoreController.cs b/Assets/Scripts/Controller/ScoreController.cs index c7616f4f..5a31979b 100644 --- a/Assets/Scripts/Controller/ScoreController.cs +++ b/Assets/Scripts/Controller/ScoreController.cs @@ -2,7 +2,9 @@ using QFramework; using System; using System.Collections; using System.Collections.Generic; +using TMPro; using UnityEngine; +using UnityEngine.SocialPlatforms.Impl; using XMLTool; public class ScoreController : MonoSingleton @@ -59,7 +61,7 @@ public class ScoreController : MonoSingleton } - public Dictionary GetCurScore() + public Dictionary GetCurScoreData() { var data = moduleDict[Global.Instance.curModule.ModuleName]; return data.scoreDict; @@ -100,6 +102,20 @@ public class ScoreController : MonoSingleton } } + /// + /// ȡǰܷ + /// + public float GetCurScore() + { + float score = 0; + var data = moduleDict[Global.Instance.curModule.ModuleName]; + foreach (var item in data.scoreDict) + { + score += item.Value.value; + } + return score; + } + private void OnQuit(OnModuleQuit quit) diff --git a/Assets/Scripts/UI/UITipWindow.cs b/Assets/Scripts/UI/UITipWindow.cs index 70cdc263..e87e9b9f 100644 --- a/Assets/Scripts/UI/UITipWindow.cs +++ b/Assets/Scripts/UI/UITipWindow.cs @@ -39,6 +39,10 @@ namespace QFramework.Example { mData = uiData as UITipWindowData ?? new UITipWindowData(); TypeEventSystem.Global.Register(OnStepChanged).UnRegisterWhenDisabled(gameObject); + if (mData.txt.Contains("{Score}")) + { + mData.txt = mData.txt.Replace("{Score}", ScoreController.Instance.GetCurScore().ToString()); + } Label.text = mData.txt; BtnContent.RemoveAllChildren(); if (mData != null) diff --git a/Doc/Xml配置文档.xml b/Doc/Xml配置文档.xml index 979b458f..0d9a267b 100644 --- a/Doc/Xml配置文档.xml +++ b/Doc/Xml配置文档.xml @@ -222,8 +222,10 @@ - - + + + From 739dd53e02639293cad606f5944a99821689532e Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Tue, 25 Mar 2025 17:34:51 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=AF=BC=E5=87=BAdata=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=E8=BF=9B=E8=A1=8C=E7=BB=9F=E4=B8=80=E5=B0=8F=E5=86=99?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Editor/LowercaseFileRenamer.cs | 145 ++++++++++++++++++ .../Editor/LowercaseFileRenamer.cs.meta | 11 ++ Assets/Scripts/Editor/VirtualFPostProcess.cs | 82 +++++----- 3 files changed, 203 insertions(+), 35 deletions(-) create mode 100644 Assets/Scripts/Editor/LowercaseFileRenamer.cs create mode 100644 Assets/Scripts/Editor/LowercaseFileRenamer.cs.meta diff --git a/Assets/Scripts/Editor/LowercaseFileRenamer.cs b/Assets/Scripts/Editor/LowercaseFileRenamer.cs new file mode 100644 index 00000000..2333e5a6 --- /dev/null +++ b/Assets/Scripts/Editor/LowercaseFileRenamer.cs @@ -0,0 +1,145 @@ +#if UNITY_EDITOR +using UnityEditor; +using UnityEngine; +using System.IO; +using System; + +public class WindowsLowercaseRenamer : EditorWindow +{ + [MenuItem("Assets/Windowsȫ")] + private static void SafeRenameAll() + { + string dataPath = Global.dataPath; + + // Ŀ¼ + ProcessRootDirectory(dataPath); + + // Ŀ¼ļ + ProcessDirectoriesRecursive(dataPath); + ProcessFilesRecursive(dataPath); + + AssetDatabase.Refresh(); + Debug.Log("ȫɣ"); + } + // Ŀ¼ + private static void ProcessRootDirectory(string originalPath) + { + try + { + DirectoryInfo rootInfo = new DirectoryInfo(originalPath); + string targetRootName = rootInfo.Name.ToLowerInvariant(); + + // Ŀ¼ƲϹ淶 + if (rootInfo.Name != targetRootName) + { + string parentPath = rootInfo.Parent.FullName; + string newRootPath = Path.Combine(parentPath, targetRootName); + + // ⴦Ŀ¼ҪȨ + if (Directory.Exists(newRootPath)) + { + string tempPath = Path.Combine(parentPath, Guid.NewGuid().ToString()); + Directory.Move(originalPath, tempPath); + Directory.Move(tempPath, newRootPath); + } + else + { + Directory.Move(originalPath, newRootPath); + } + + Debug.Log($"Ŀ¼ɹ: {originalPath} {newRootPath}"); + + // ȫ·Ҫ + Global.dataPath = newRootPath; // ʵGlobalʵֿҪ + } + } + catch (Exception ex) + { + Debug.LogError($"Ŀ¼ʧ: {ex.Message}"); + } + } + private static void ProcessDirectoriesRecursive(string path) + { + foreach (var dirPath in Directory.GetDirectories(path)) + { + // ݹ鴦Ŀ¼ + ProcessDirectoriesRecursive(dirPath); + + DirectoryInfo dirInfo = new DirectoryInfo(dirPath); + string targetName = dirInfo.Name.ToLowerInvariant(); + + // ʵĿ¼Ϲ淶ʱ + if (dirInfo.Name != targetName) + { + string parentPath = dirInfo.Parent.FullName; + string newPath = Path.Combine(parentPath, targetName); + + try + { + // ⴦WindowsҪʱ + //if (Directory.Exists(newPath)) + //{ + // string tempPath = Path.Combine(parentPath, Guid.NewGuid().ToString()); + // Directory.Move(dirPath, tempPath); + // Directory.Move(tempPath, newPath); + //} + //else + //{ + Directory.Move(dirPath, newPath); + //} + + Debug.Log($"Ŀ¼ɹ: {dirPath} {newPath}"); + } + catch (Exception ex) + { + Debug.LogError($"Ŀ¼ʧ: {dirPath}\n{ex.Message}"); + } + } + } + } + + private static void ProcessFilesRecursive(string path) + { + foreach (var filePath in Directory.GetFiles(path)) + { + FileInfo fileInfo = new FileInfo(filePath); + string targetName = Path.GetFileNameWithoutExtension(fileInfo.Name).ToLowerInvariant(); + string targetExt = fileInfo.Extension.ToLowerInvariant(); + string newFileName = $"{targetName}{targetExt}"; + + // Ƚʵļ + if (fileInfo.Name != newFileName) + { + string newPath = Path.Combine(fileInfo.DirectoryName, newFileName); + + try + { + // Windows⴦ĿڵСдͬ + if (File.Exists(newPath)) + { + string tempPath = Path.Combine(fileInfo.DirectoryName, Guid.NewGuid().ToString() + fileInfo.Extension); + File.Move(filePath, tempPath); + File.Move(tempPath, newPath); + } + else + { + File.Move(filePath, newPath); + } + + Debug.Log($"ļɹ: {filePath} {newPath}"); + } + catch (Exception ex) + { + Debug.LogError($"ļʧ: {filePath}\n{ex.Message}"); + } + } + } + + // ݹĿ¼ + foreach (var dirPath in Directory.GetDirectories(path)) + { + ProcessFilesRecursive(dirPath); + } + } +} +#endif \ No newline at end of file diff --git a/Assets/Scripts/Editor/LowercaseFileRenamer.cs.meta b/Assets/Scripts/Editor/LowercaseFileRenamer.cs.meta new file mode 100644 index 00000000..852097e7 --- /dev/null +++ b/Assets/Scripts/Editor/LowercaseFileRenamer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3fc1a350612ff074eb9880438ed8d526 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/VirtualFPostProcess.cs b/Assets/Scripts/Editor/VirtualFPostProcess.cs index a89bdefc..41b0b061 100644 --- a/Assets/Scripts/Editor/VirtualFPostProcess.cs +++ b/Assets/Scripts/Editor/VirtualFPostProcess.cs @@ -7,60 +7,72 @@ using UnityEngine; public class VirtualFPostProcess : IPostprocessBuildWithReport { - // صȼԽԽִУ public int callbackOrder => 0; - // ڴɺִ public void OnPostprocessBuild(BuildReport report) { - // ȡĿĿ¼· string projectPath = Application.dataPath; - - // ȡDataļе· string dataFolderPath = Path.Combine(projectPath, "../Data"); + string buildOutputPath = GetValidBuildPath(report); - // ȡĿ¼ - string buildOutputPath = report.summary.outputPath; - if (buildOutputPath.Contains(".exe")) - { - var paths = buildOutputPath.Split('/'); - buildOutputPath = buildOutputPath.Replace(paths[paths.Length - 1], ""); - } - // DataļǷ if (Directory.Exists(dataFolderPath)) { - // DataļиƵĿĿ¼ - string targetDataPath = Path.Combine(buildOutputPath, "Data"); - CopyDirectory(dataFolderPath, targetDataPath); - Debug.Log($"Data folder copied to build output directory: {targetDataPath}"); + // ĿĿ¼ǿСд + string targetDataPath = Path.Combine(buildOutputPath, "data"); + CopyDirectoryWithLowerCaseNames(dataFolderPath, targetDataPath); + Debug.Log($"Ŀ¼ѸƵ: {targetDataPath}"); } else { - Debug.LogWarning("Data folder not found at: " + dataFolderPath); + Debug.LogWarning("δҵĿ¼: " + dataFolderPath); } } - // ݹ鸴ļеĸļļ - private void CopyDirectory(string sourceDir, string destinationDir) + private string GetValidBuildPath(BuildReport report) { - // ȷĿĿ¼ - if (!Directory.Exists(destinationDir)) + string path = report.summary.outputPath; + if (path.Contains(".exe")) { - Directory.CreateDirectory(destinationDir); + return Path.GetDirectoryName(path); + } + return path; + } + + private void CopyDirectoryWithLowerCaseNames(string sourceDir, string targetDir) + { + // СдĿĿ¼ + var lowerTargetDir = ConvertToLowerPath(targetDir); + Directory.CreateDirectory(lowerTargetDir); + + // ļСдת + foreach (var file in Directory.GetFiles(sourceDir)) + { + string fileName = Path.GetFileName(file); + string lowerName = ConvertToLowerPath(fileName); + File.Copy(file, Path.Combine(lowerTargetDir, lowerName), true); } - // ԴĿ¼еļ - foreach (string file in Directory.GetFiles(sourceDir)) + // ݹ鴦Ŀ¼Сдת + foreach (var dir in Directory.GetDirectories(sourceDir)) { - string destFile = Path.Combine(destinationDir, Path.GetFileName(file)); - File.Copy(file, destFile, true); // ļ - } - - // ԴĿ¼еļ - foreach (string subDir in Directory.GetDirectories(sourceDir)) - { - string destSubDir = Path.Combine(destinationDir, Path.GetFileName(subDir)); - CopyDirectory(subDir, destSubDir); // ݹ鸴ļ + string dirName = Path.GetFileName(dir); + string lowerDirName = ConvertToLowerPath(dirName); + CopyDirectoryWithLowerCaseNames(dir, Path.Combine(lowerTargetDir, lowerDirName)); } } -} + + // ӢĻ·תСд + private string ConvertToLowerPath(string input) + { + char[] chars = input.ToCharArray(); + for (int i = 0; i < chars.Length; i++) + { + // ֻASCIIĸַĵUnicodeֲַ䣩 + if (chars[i] >= 'A' && chars[i] <= 'Z') + { + chars[i] = (char)(chars[i] | 0x20); // תСд + } + } + return new string(chars); + } +} \ No newline at end of file From 1203cccf31dd67929c4552aa833ebf3801552be1 Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Wed, 26 Mar 2025 09:48:17 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=90=E7=BB=A9?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E6=98=AF=E5=90=A6=E4=BB=85=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=BD=93=E5=89=8D=E6=A8=A1=E5=9D=97=20=E5=8F=AF?= =?UTF-8?q?=E9=80=89=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Actions/ActionHelper.cs | 5 ++ Assets/Scripts/Actions/ShowScoreAction.cs | 82 +++++++++++++++++++ .../Scripts/Actions/ShowScoreAction.cs.meta | 3 + Assets/Scripts/UI/UIScore.cs | 41 +++++++++- Assets/Scripts/Xml/XmlParser.cs | 13 +++ Doc/Xml配置文档.xml | 5 ++ 6 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 Assets/Scripts/Actions/ShowScoreAction.cs create mode 100644 Assets/Scripts/Actions/ShowScoreAction.cs.meta diff --git a/Assets/Scripts/Actions/ActionHelper.cs b/Assets/Scripts/Actions/ActionHelper.cs index 2aa3890f..aa954ba9 100644 --- a/Assets/Scripts/Actions/ActionHelper.cs +++ b/Assets/Scripts/Actions/ActionHelper.cs @@ -277,6 +277,11 @@ public class ActionHelper var dictAction = (XMLTool.DictionaryAction)act; return QFramework.OperationChangeAction.Allocate(dictAction.args); } + case "ShowScore": + { + var dictAction = (XMLTool.DictionaryAction)act; + return QFramework.ShowScoreAction.Allocate(dictAction.args); + } default: Debug.LogError($"ûҵAction{act.Type}"); break; diff --git a/Assets/Scripts/Actions/ShowScoreAction.cs b/Assets/Scripts/Actions/ShowScoreAction.cs new file mode 100644 index 00000000..e3edf2f1 --- /dev/null +++ b/Assets/Scripts/Actions/ShowScoreAction.cs @@ -0,0 +1,82 @@ +using QFramework.Example; +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace QFramework +{ + internal class ShowScoreAction : IAction + { + + public System.Action OnFinished { get; set; } + + + private ShowScoreAction() + { + } + + private static readonly SimpleObjectPool mPool = + new SimpleObjectPool(() => new ShowScoreAction(), null, 10); + + Dictionary datas; + public static ShowScoreAction Allocate(Dictionary datas, System.Action OnFinished = null) + { + var retNode = mPool.Allocate(); + retNode.ActionID = ActionKit.ID_GENERATOR++; + retNode.Deinited = false; + retNode.Reset(); + retNode.datas = datas; + retNode.OnFinished = OnFinished; + return retNode; + } + + + public ulong ActionID { get; set; } + public ActionStatus Status { get; set; } + + public void OnStart() + { + UIScoreData data = new UIScoreData(); + if (datas.ContainsKey("onlyCurModule")) + { + if (bool.TryParse(datas["onlyCurModule"], out data.onlyCurModule) == false) + { + data.onlyCurModule = false; + } + } + UIKit.OpenPanelAsync(canvasLevel: UILevel.PopUI, uiData: data).ToAction().StartGlobal(() => this.Finish()); + } + + public void OnExecute(float dt) + { + //this.Finish(); + //OnFinished?.Invoke(); + } + + public void OnFinish() + { + } + + public void Reset() + { + Status = ActionStatus.NotStart; + Paused = false; + } + + public bool Paused { get; set; } + + public void Deinit() + { + if (!Deinited) + { + OnFinished = null; + Deinited = true; + mPool.Recycle(this); + } + } + + public bool Deinited { get; set; } + } + + +} \ No newline at end of file diff --git a/Assets/Scripts/Actions/ShowScoreAction.cs.meta b/Assets/Scripts/Actions/ShowScoreAction.cs.meta new file mode 100644 index 00000000..c2877c41 --- /dev/null +++ b/Assets/Scripts/Actions/ShowScoreAction.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0ba81906fe012d2468c5a69a833ed765 +timeCreated: 1647655796 \ No newline at end of file diff --git a/Assets/Scripts/UI/UIScore.cs b/Assets/Scripts/UI/UIScore.cs index 30dfd68d..bc346de6 100644 --- a/Assets/Scripts/UI/UIScore.cs +++ b/Assets/Scripts/UI/UIScore.cs @@ -6,6 +6,10 @@ namespace QFramework.Example { public class UIScoreData : UIPanelData { + /// + /// ֻʾǰģ + /// + public bool onlyCurModule = false; } public partial class UIScore : UIPanel { @@ -63,14 +67,30 @@ namespace QFramework.Example protected override void OnOpen(IUIData uiData = null) { + mData = uiData as UIScoreData ?? new UIScoreData(); Content.RemoveAllChildren(); float sum = 0; float score = 0; - foreach (var moduleDict in ScoreController.Instance.moduleDict) + + bool onlyCur = false; + if (uiData == null) { - foreach (var item in moduleDict.Value.scoreDict) + if (bool.TryParse(Global.Instance.curModule.OnlyCurScore, out onlyCur) == false) + { + onlyCur = false; + } + } + else + { + onlyCur = mData.onlyCurModule; + } + + + if (onlyCur) + { + foreach (var item in ScoreController.Instance.GetCurScoreData()) { GameObject obj = GameObject.Instantiate(ItemPrefab.gameObject, Content); obj.transform.Find("Step").GetComponent().text = item.Value.step; @@ -81,6 +101,23 @@ namespace QFramework.Example score += item.Value.value; } } + else + { + foreach (var moduleDict in ScoreController.Instance.moduleDict) + { + foreach (var item in moduleDict.Value.scoreDict) + { + GameObject obj = GameObject.Instantiate(ItemPrefab.gameObject, Content); + obj.transform.Find("Step").GetComponent().text = item.Value.step; + obj.transform.Find("Name").GetComponent().text = item.Value.name; + obj.transform.Find("Sum").GetComponent().text = item.Value.sum; + obj.transform.Find("Score").GetComponent().text = item.Value.value.ToString(); + sum += float.Parse(item.Value.sum); + score += item.Value.value; + } + } + } + this.Score.text = score.ToString(); this.Sum.text = sum.ToString(); diff --git a/Assets/Scripts/Xml/XmlParser.cs b/Assets/Scripts/Xml/XmlParser.cs index 58602bab..580bf747 100644 --- a/Assets/Scripts/Xml/XmlParser.cs +++ b/Assets/Scripts/Xml/XmlParser.cs @@ -26,6 +26,7 @@ namespace XMLTool public string ModuleName { get; set; } public string Descript { get; set; } + public string OnlyCurScore { get; set; } public string Icon { get; set; } public List Operations { get; set; } @@ -269,6 +270,7 @@ namespace XMLTool module.type = moduleElement.Element("Type")?.Value; module.ModuleName = moduleElement.Element("Name")?.Value; module.Icon = moduleElement.Element("Icon")?.Value; + module.OnlyCurScore = moduleElement.Element("OnlyCurScore")?.Value; module.Descript = moduleElement.Element("Descript")?.Value.Trim(); module.Scene = moduleElement.Element("Scene")?.Value; @@ -1557,6 +1559,17 @@ namespace XMLTool newAction = act; } break; + case "ShowScore": + { + var act = new DictionaryAction(); + XAttribute onlyCurModule = action.Attribute("onlyCurModule"); + if (onlyCurModule != null) + { + act.args.Add("onlyCurModule", onlyCurModule.Value); + } + newAction = act; + } + break; default: newAction = new Action(); break; diff --git a/Doc/Xml配置文档.xml b/Doc/Xml配置文档.xml index 0d9a267b..2cc18340 100644 --- a/Doc/Xml配置文档.xml +++ b/Doc/Xml配置文档.xml @@ -18,6 +18,9 @@ + + + Study + + false + position left/right 可以让道具栏在左侧或者右侧 + errorCount 错误的次数 不为0的情况下 大于这个次数才会触发WrongScore--> + position="right" + wrongCount="0"> Date: Wed, 26 Mar 2025 17:46:02 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A0=E8=BD=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/UI/UIBackPack.cs | 1 + Assets/Scripts/UI/UIOperationList.cs | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/UI/UIBackPack.cs b/Assets/Scripts/UI/UIBackPack.cs index cfbb880b..00b392b4 100644 --- a/Assets/Scripts/UI/UIBackPack.cs +++ b/Assets/Scripts/UI/UIBackPack.cs @@ -27,6 +27,7 @@ namespace QFramework.Example protected override void OnOpen(IUIData uiData = null) { + mData = uiData as UIBackPackData ?? new UIBackPackData(); Content.RemoveAllChildren(); foreach (var device in mData.devices) diff --git a/Assets/Scripts/UI/UIOperationList.cs b/Assets/Scripts/UI/UIOperationList.cs index 6c282f59..d294edc8 100644 --- a/Assets/Scripts/UI/UIOperationList.cs +++ b/Assets/Scripts/UI/UIOperationList.cs @@ -17,7 +17,6 @@ namespace QFramework.Example protected override void OnInit(IUIData uiData = null) { mData = uiData as UIOperationListData ?? new UIOperationListData(); - TypeEventSystem.Global.Register((arg) => Refresh()).UnRegisterWhenGameObjectDestroyed(gameObject); TypeEventSystem.Global.Register((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject); } @@ -80,8 +79,9 @@ namespace QFramework.Example protected override void OnOpen(IUIData uiData = null) { + TypeEventSystem.Global.Register((arg) => Refresh()); TypeEventSystem.Global.Register(OnStepChanged).UnRegisterWhenDisabled(this); - Refresh(); + } public void Refresh() @@ -149,9 +149,17 @@ namespace QFramework.Example protected override void OnShow() { + Refresh(); } protected override void OnClose() { + TypeEventSystem.Global.UnRegister((arg) => Refresh()); + } + + public override void Hide() + { + base.Hide(); + TypeEventSystem.Global.UnRegister((arg) => Refresh()); } } } From 783fc2c4dd0059756c9b8453228e242ab92c8137 Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Thu, 27 Mar 2025 10:09:22 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js.meta | 0 .../{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/FileSaver.js | 0 .../js/FileSaver.js.meta | 0 .../js/docxtemplater.js | 0 .../js/docxtemplater.js.meta | 0 .../js/imagemodule.js | 0 .../js/imagemodule.js.meta | 0 .../js/imgManager.js | 0 .../js/imgManager.js.meta | 0 .../{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/index.js | 0 .../js/index.js.meta | 0 .../js/package-lock.json | 0 .../js/package-lock.json.meta | 0 .../{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/package.json | 0 .../js/package.json.meta | 0 .../js/pizzip-utils-ie.js | 0 .../js/pizzip-utils-ie.js.meta | 0 .../js/pizzip-utils.js | 0 .../js/pizzip-utils.js.meta | 0 .../{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/pizzip.js | 0 .../js/pizzip.js.meta | 0 21 files changed, 0 insertions(+), 0 deletions(-) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/FileSaver.js (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/FileSaver.js.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/docxtemplater.js (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/docxtemplater.js.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/imagemodule.js (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/imagemodule.js.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/imgManager.js (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/imgManager.js.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/index.js (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/index.js.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/package-lock.json (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/package-lock.json.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/package.json (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/package.json.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/pizzip-utils-ie.js (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/pizzip-utils-ie.js.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/pizzip-utils.js (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/pizzip-utils.js.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/pizzip.js (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS => WebGLDownloadWordJS1}/js/pizzip.js.meta (100%) diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS1/js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/FileSaver.js b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/FileSaver.js similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/FileSaver.js rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/FileSaver.js diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/FileSaver.js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/FileSaver.js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/FileSaver.js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/FileSaver.js.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/docxtemplater.js b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/docxtemplater.js similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/docxtemplater.js rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/docxtemplater.js diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/docxtemplater.js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/docxtemplater.js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/docxtemplater.js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/docxtemplater.js.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/imagemodule.js b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/imagemodule.js similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/imagemodule.js rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/imagemodule.js diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/imagemodule.js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/imagemodule.js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/imagemodule.js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/imagemodule.js.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/imgManager.js b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/imgManager.js similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/imgManager.js rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/imgManager.js diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/imgManager.js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/imgManager.js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/imgManager.js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/imgManager.js.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/index.js b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/index.js similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/index.js rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/index.js diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/index.js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/index.js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/index.js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/index.js.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/package-lock.json b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/package-lock.json similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/package-lock.json rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/package-lock.json diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/package-lock.json.meta b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/package-lock.json.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/package-lock.json.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/package-lock.json.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/package.json b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/package.json similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/package.json rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/package.json diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/package.json.meta b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/package.json.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/package.json.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/package.json.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip-utils-ie.js b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip-utils-ie.js similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip-utils-ie.js rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip-utils-ie.js diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip-utils-ie.js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip-utils-ie.js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip-utils-ie.js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip-utils-ie.js.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip-utils.js b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip-utils.js similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip-utils.js rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip-utils.js diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip-utils.js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip-utils.js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip-utils.js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip-utils.js.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip.js b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip.js similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip.js rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip.js diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip.js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip.js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip.js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip.js.meta From a8c7c1ed62218de54e12ee9f996e20a617224a34 Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Thu, 27 Mar 2025 10:09:37 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E8=BF=98=E8=BF=9C=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js.meta | 0 .../{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/FileSaver.js | 0 .../js/FileSaver.js.meta | 0 .../js/docxtemplater.js | 0 .../js/docxtemplater.js.meta | 0 .../js/imagemodule.js | 0 .../js/imagemodule.js.meta | 0 .../js/imgManager.js | 0 .../js/imgManager.js.meta | 0 .../{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/index.js | 0 .../js/index.js.meta | 0 .../js/package-lock.json | 0 .../js/package-lock.json.meta | 0 .../{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/package.json | 0 .../js/package.json.meta | 0 .../js/pizzip-utils-ie.js | 0 .../js/pizzip-utils-ie.js.meta | 0 .../js/pizzip-utils.js | 0 .../js/pizzip-utils.js.meta | 0 .../{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/pizzip.js | 0 .../js/pizzip.js.meta | 0 21 files changed, 0 insertions(+), 0 deletions(-) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/FileSaver.js (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/FileSaver.js.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/docxtemplater.js (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/docxtemplater.js.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/imagemodule.js (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/imagemodule.js.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/imgManager.js (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/imgManager.js.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/index.js (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/index.js.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/package-lock.json (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/package-lock.json.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/package.json (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/package.json.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/pizzip-utils-ie.js (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/pizzip-utils-ie.js.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/pizzip-utils.js (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/pizzip-utils.js.meta (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/pizzip.js (100%) rename Assets/StreamingAssets/{WebGLDownloadWordJS1 => WebGLDownloadWordJS}/js/pizzip.js.meta (100%) diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS/js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS/js.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/FileSaver.js b/Assets/StreamingAssets/WebGLDownloadWordJS/js/FileSaver.js similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/FileSaver.js rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/FileSaver.js diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/FileSaver.js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS/js/FileSaver.js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/FileSaver.js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/FileSaver.js.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/docxtemplater.js b/Assets/StreamingAssets/WebGLDownloadWordJS/js/docxtemplater.js similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/docxtemplater.js rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/docxtemplater.js diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/docxtemplater.js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS/js/docxtemplater.js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/docxtemplater.js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/docxtemplater.js.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/imagemodule.js b/Assets/StreamingAssets/WebGLDownloadWordJS/js/imagemodule.js similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/imagemodule.js rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/imagemodule.js diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/imagemodule.js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS/js/imagemodule.js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/imagemodule.js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/imagemodule.js.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/imgManager.js b/Assets/StreamingAssets/WebGLDownloadWordJS/js/imgManager.js similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/imgManager.js rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/imgManager.js diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/imgManager.js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS/js/imgManager.js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/imgManager.js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/imgManager.js.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/index.js b/Assets/StreamingAssets/WebGLDownloadWordJS/js/index.js similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/index.js rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/index.js diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/index.js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS/js/index.js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/index.js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/index.js.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/package-lock.json b/Assets/StreamingAssets/WebGLDownloadWordJS/js/package-lock.json similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/package-lock.json rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/package-lock.json diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/package-lock.json.meta b/Assets/StreamingAssets/WebGLDownloadWordJS/js/package-lock.json.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/package-lock.json.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/package-lock.json.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/package.json b/Assets/StreamingAssets/WebGLDownloadWordJS/js/package.json similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/package.json rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/package.json diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/package.json.meta b/Assets/StreamingAssets/WebGLDownloadWordJS/js/package.json.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/package.json.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/package.json.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip-utils-ie.js b/Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip-utils-ie.js similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip-utils-ie.js rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip-utils-ie.js diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip-utils-ie.js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip-utils-ie.js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip-utils-ie.js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip-utils-ie.js.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip-utils.js b/Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip-utils.js similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip-utils.js rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip-utils.js diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip-utils.js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip-utils.js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip-utils.js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip-utils.js.meta diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip.js b/Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip.js similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip.js rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip.js diff --git a/Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip.js.meta b/Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip.js.meta similarity index 100% rename from Assets/StreamingAssets/WebGLDownloadWordJS1/js/pizzip.js.meta rename to Assets/StreamingAssets/WebGLDownloadWordJS/js/pizzip.js.meta