Assets/QFramework/Toolkits/ResKit/Scripts/Framework/ResSearchKeys.cs

@@ -7,15 +7,14 @@
  ****************************************************************************/
 
 using System;
-using System.Diagnostics;
 
 namespace QFramework
 {
-    public class ResSearchKeys : IPoolable, IPoolType
+    public class ResSearchKeys : IPoolable,IPoolType
     {   
         public string AssetName { get; set; }
 
-        public string OwnerBundle { get; set; }
+        public string OwnerBundle { get;  set; }
 
         public Type AssetType { get; set; }
 
@@ -25,20 +24,7 @@ namespace QFramework
         public static ResSearchKeys Allocate(string assetName, string ownerBundleName = null, Type assetType = null)
         {
             var resSearchRule = SafeObjectPool<ResSearchKeys>.Instance.Allocate();
-
+            resSearchRule.AssetName = assetName.ToLower();
-            if (assetName.Contains("netimage:") ||
-                assetName.Contains("localimage:") ||
-                assetName.Contains("localaudio:") ||
-                assetName.Contains("localtext:") ||
-                assetName.Contains("localbytes:"))
-            {
-                // ÔÝʱÕâÑùдËÀ´¦Àí
-                resSearchRule.AssetName = assetName;
-            }
-            else
-            {
-                resSearchRule.AssetName = assetName.ToLower();
-            }
             resSearchRule.OwnerBundle = ownerBundleName == null ? null : ownerBundleName.ToLower();
             resSearchRule.AssetType = assetType;
             resSearchRule.OriginalAssetName = assetName;

Assets/Scripts/Actions/TimeLineAction.cs

@@ -60,6 +60,7 @@ public class TimeLineAction : IAction
 
     public void OnExecute(float dt)
     {
+        Debug.LogError($"time:{play.time * fps} >= curEnd:{curEndFrame}  ");
         if (curEndFrame != -1 && play.time * fps >= curEndFrame)
         {
             play.time = curEndFrame / 24;
@@ -68,6 +69,7 @@ public class TimeLineAction : IAction
         }
         if (play.state != PlayState.Playing)
         {
+            Debug.LogError("Finished");
             Finished();
         }
     }

Assets/Scripts/Editor/VirtualFPostProcess.cs

@@ -1,8 +1,6 @@
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using UnityEditor;
 using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
 using UnityEngine;
@@ -20,7 +18,7 @@ public class VirtualFPostProcess : IPostprocessBuildWithReport
         if (Directory.Exists(dataFolderPath))
         {
             // 目标目录强制小写
-            string targetDataPath = Path.Combine(buildOutputPath, "Data");
+            string targetDataPath = Path.Combine(buildOutputPath, "data");
             CopyDirectoryWithLowerCaseNames(dataFolderPath, targetDataPath);
             Debug.Log($"数据目录已复制到: {targetDataPath}");
         }
@@ -28,72 +26,6 @@ public class VirtualFPostProcess : IPostprocessBuildWithReport
         {
             Debug.LogWarning("未找到数据目录: " + dataFolderPath);
         }
-        DeletAssetBundle(buildOutputPath);
-    }
-
-    /// <summary>
-    /// 删除不属于当前平台的资源
-    /// </summary>
-    public void DeletAssetBundle(string buildOutPutPath)
-    {
-        if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.WebGL)
-        {
-            string path = Path.Combine(buildOutPutPath, "StreamingAssets", "AssetBundles");
-            if (Directory.Exists(path))
-            {
-                string[] allDirectories = Directory.GetDirectories(path);
-                foreach (string dir in allDirectories)
-                {
-                    string dirName = Path.GetFileName(dir);
-                    if (!dirName.Equals("WebGL", StringComparison.OrdinalIgnoreCase)) // 忽略大小写
-                    {
-                        try
-                        {
-                            Directory.Delete(dir, true);
-                            Debug.Log($"Deleted directory: {dir}");
-                        }
-                        catch (Exception e)
-                        {
-                            Debug.LogError($"Failed to delete {dir}: {e.Message}");
-                        }
-                    }
-                }
-            }
-            else
-            {
-                Debug.LogError($"Directory not found: {path}");
-            }
-        }
-        else if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.StandaloneWindows|| EditorUserBuildSettings.activeBuildTarget == BuildTarget.StandaloneWindows64)
-        {
-            string path = Path.Combine(buildOutPutPath, "VirtualFramwork_Data", "StreamingAssets", "AssetBundles");
-            if (Directory.Exists(path))
-            {
-                string[] allDirectories = Directory.GetDirectories(path);
-                foreach (string dir in allDirectories)
-                {
-                    string dirName = Path.GetFileName(dir);
-                    if (!dirName.Equals("Windows", StringComparison.OrdinalIgnoreCase)) // 忽略大小写
-                    {
-                        try
-                        {
-                            Directory.Delete(dir, true);
-                            Debug.Log($"Deleted directory: {dir}");
-                        }
-                        catch (Exception e)
-                        {
-                            Debug.LogError($"Failed to delete {dir}: {e.Message}");
-                        }
-                    }
-                }
-            }
-            else
-            {
-                Debug.LogError($"Directory not found: {path}");
-            }
-        }
-     
-
     }
 
     private string GetValidBuildPath(BuildReport report)
@@ -109,25 +41,23 @@ public class VirtualFPostProcess : IPostprocessBuildWithReport
     private void CopyDirectoryWithLowerCaseNames(string sourceDir, string targetDir)
     {
         // 创建小写目标目录
-        //var lowerTargetDir = ConvertToLowerPath(targetDir);
+        var lowerTargetDir = ConvertToLowerPath(targetDir);
-        Directory.CreateDirectory(targetDir);
+        Directory.CreateDirectory(lowerTargetDir);
 
         // 复制文件（带小写转换）
         foreach (var file in Directory.GetFiles(sourceDir))
         {
             string fileName = Path.GetFileName(file);
-            // 暂时废弃小写转换
+            string lowerName = ConvertToLowerPath(fileName);
-            //string lowerName = ConvertToLowerPath(fileName);
+            File.Copy(file, Path.Combine(lowerTargetDir, lowerName), true);
-            File.Copy(file, Path.Combine(targetDir, fileName), true);
         }
 
         // 递归处理子目录（带小写转换）
         foreach (var dir in Directory.GetDirectories(sourceDir))
         {
             string dirName = Path.GetFileName(dir);
-            // 暂时废弃小写转换
+            string lowerDirName = ConvertToLowerPath(dirName);
-            //string lowerDirName = ConvertToLowerPath(dirName);
+            CopyDirectoryWithLowerCaseNames(dir, Path.Combine(lowerTargetDir, lowerDirName));
-            CopyDirectoryWithLowerCaseNames(dir, Path.Combine(targetDir, dirName));
         }
     }
 

Assets/Scripts/Global/Global.cs

@@ -13,11 +13,8 @@ public class Global : Singleton<Global>
     public XMLTool.AppData appData;
     public Module curModule;
     public Body3D.Body cur3DPart;
-#if UNITY_WEBGL
+
-    public static string dataPath = Application.dataPath + "/Data";
-#else
     public static string dataPath = Application.dataPath + "/../Data";
-#endif
     public static string deviceIconsPath = dataPath + "/DeviceIcons/";
     public static string audioPath = dataPath + "/Audio/";
     public static string appXmlPath = dataPath + "/App.xml";