Merge branch 'master' into LouDi_Pig

This commit is contained in:
shenjianxing 2025-03-28 13:10:22 +08:00
commit 2fd97a417f
3 changed files with 3 additions and 3 deletions

View File

@ -26,7 +26,7 @@ namespace QFramework
{
var resSearchRule = SafeObjectPool<ResSearchKeys>.Instance.Allocate();
if (assetName.Contains("NetImage:") ||
if (assetName.Contains("netimage:") ||
assetName.Contains("localimage:") ||
assetName.Contains("localaudio:") ||
assetName.Contains("localtext:") ||

View File

@ -33,7 +33,7 @@ namespace QFramework
{
public static string ToNetImageResName(this string selfHttpUrl)
{
return string.Format("NetImage:{0}", selfHttpUrl);
return string.Format("netimage:{0}", selfHttpUrl);
}
}

View File

@ -13,7 +13,7 @@ public class Global : Singleton<Global>
public XMLTool.AppData appData;
public Module curModule;
public Body3D.Body cur3DPart;
#if UNITY_WEBGL
#if UNITY_WEBGL && !UNITY_EDITOR
public static string dataPath = Application.dataPath + "/Data";
#else
public static string dataPath = Application.dataPath + "/../Data";