JiNan/VirtualFramework
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into LouDi_Quan

Browse Source
This commit is contained in:
shenjianxing 2025-03-28 13:05:00 +08:00
commit 499f68dde6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/QFramework/Toolkits/ResKit/Scripts/Framework/ResSearchKeys.cs
View File

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

2
Assets/QFramework/Toolkits/ResKit/Scripts/Implements/NetImageRes.cs
View File

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

2
Assets/Scripts/Global/Global.cs
View File

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