Merge branch 'master' into LouDi_Quan

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

@@ -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:") ||

Assets/QFramework/Toolkits/ResKit/Scripts/Implements/LocalImageRes.cs

@@ -32,7 +32,7 @@ namespace QFramework
     {
         public static string ToLocalImageResName(this string selfFilePath)
         {
-            return string.Format("LocalImage:{0}", selfFilePath);
+            return string.Format("localimage:{0}", selfFilePath);
         }
     }