Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Assets/Art/VFX/Textures/fx fenglin.png.meta   resolved by origin/master(远端) version

Assets/Art/VFX/Textures/fx fenglin.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: B30fvC38V36pL186T0QmeAgPojfZojLHVbFD4J73DUqgurlG2b0dqBiFMFnk
+guid: CHpNvCyqBXLc2FUwRRPyedfxPogTscyJv6o8krnRsLOhz9gKgMvfbegUsQ3F
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -112,6 +112,34 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Scripts/ThirdParty/Crasheye/Crasheye.cs

@@ -108,7 +108,7 @@ public class Crasheye : MonoBehaviour
         }
         else if (Application.platform == RuntimePlatform.WindowsPlayer)
         {
-#if UNITY_STANDALONE_WIN
+#if UNITY_STANDALONE_WIN && !UNITY_EDITOR
             DumpForPC.SetURL(url);
 #endif
         }
@@ -122,7 +122,7 @@ public class Crasheye : MonoBehaviour
     public static void SetForceUpload(bool isForceUpload)
     {
         Debug.Log("SetForceUpload");
-#if UNITY_STANDALONE_WIN
+#if UNITY_STANDALONE_WIN  && !UNITY_EDITOR
         DumpForPC.SetForceUpload(isForceUpload);
 #endif
     }
@@ -148,7 +148,7 @@ public class Crasheye : MonoBehaviour
         }
         else if (Application.platform == RuntimePlatform.WindowsPlayer)
         {
-#if UNITY_STANDALONE_WIN
+#if UNITY_STANDALONE_WIN  && !UNITY_EDITOR
             DumpForPC.Init(Your_AppKey, YourChannelId);
 #endif
         }
@@ -178,7 +178,7 @@ public class Crasheye : MonoBehaviour
         }
         else if (Application.platform == RuntimePlatform.WindowsPlayer)
         {
-#if UNITY_STANDALONE_WIN
+#if UNITY_STANDALONE_WIN  && !UNITY_EDITOR
             Debug.Log("RegisterLogCallback");
             AppDomain.CurrentDomain.UnhandledException += DumpForPC.OnHandleUnresolvedException;
             SetRegisterLogFunction(DumpForPC.OnHandleLogCallback);
@@ -291,7 +291,7 @@ public class Crasheye : MonoBehaviour
 #endif
         } else if (Application.platform == RuntimePlatform.WindowsPlayer)
         {
-#if UNITY_STANDALONE_WIN
+#if UNITY_STANDALONE_WIN  && !UNITY_EDITOR
             DumpForPC.SendScriptException(errorTitle, stacktrace, language);
 #endif
         }
@@ -386,7 +386,7 @@ public class Crasheye : MonoBehaviour
         }
         else if (Application.platform == RuntimePlatform.WindowsPlayer)
         {
-#if UNITY_STANDALONE_WIN
+#if UNITY_STANDALONE_WIN && !UNITY_EDITOR
             DumpForPC.SetAppVersion(yourAppVersion);
 #endif
         }
@@ -417,7 +417,7 @@ public class Crasheye : MonoBehaviour
         }
         else if (Application.platform == RuntimePlatform.WindowsPlayer)
         {
-#if UNITY_STANDALONE_WIN
+#if UNITY_STANDALONE_WIN && !UNITY_EDITOR
             DumpForPC.SetUserIdentifier_UTF8(userIdentifier);
 #endif
         }
@@ -454,7 +454,7 @@ public class Crasheye : MonoBehaviour
         }
         else if (Application.platform == RuntimePlatform.WindowsPlayer)
         {
-#if UNITY_STANDALONE_WIN
+#if UNITY_STANDALONE_WIN && !UNITY_EDITOR
             DumpForPC.AddExtraData(key,value);
 #endif
         }
@@ -476,7 +476,7 @@ public class Crasheye : MonoBehaviour
         }
         else if (Application.platform == RuntimePlatform.WindowsPlayer)
         {
-#if UNITY_STANDALONE_WIN
+#if UNITY_STANDALONE_WIN && !UNITY_EDITOR
             DumpForPC.AddExtraDataUTF8(key, value);
 #endif
         }
@@ -576,7 +576,7 @@ public class Crasheye : MonoBehaviour
         }
         else if (Application.platform == RuntimePlatform.WindowsPlayer)
         {
-#if UNITY_STANDALONE_WIN
+#if UNITY_STANDALONE_WIN && !UNITY_EDITOR
             DumpForPC.SetBreadCrumbType(type);
 #endif
         }
@@ -606,7 +606,7 @@ public class Crasheye : MonoBehaviour
 #endif
         } else if (Application.platform == RuntimePlatform.WindowsPlayer)
         {
-#if UNITY_STANDALONE_WIN
+#if UNITY_STANDALONE_WIN && !UNITY_EDITOR
             DumpForPC.leaveBreadcrumb(breadcrumb);
 #endif
         }
@@ -701,7 +701,7 @@ public class Crasheye : MonoBehaviour
     public static bool SetBackgroundUpload(bool isBackgroundUpload)
     {
         
-#if UNITY_STANDALONE_WIN
+#if UNITY_STANDALONE_WIN && !UNITY_EDITOR
         return DumpForPC.SetBackgroundUpload(isBackgroundUpload);
 #endif
         return false;
@@ -710,7 +710,7 @@ public class Crasheye : MonoBehaviour
     public static bool SetCrashCallback(FnOnCrashCallback pCallback)
     {
 
-#if UNITY_STANDALONE_WIN
+#if UNITY_STANDALONE_WIN && !UNITY_EDITOR
         return DumpForPC.SetOnMiniDumpCreateCallBack((bCaptureSucceed, cpszCrashReportFile)=>{
             string  szCrashReportFile = Marshal.PtrToStringUni(cpszCrashReportFile);
             pCallback?.Invoke(bCaptureSucceed, szCrashReportFile);
@@ -721,7 +721,7 @@ public class Crasheye : MonoBehaviour
     
     public static bool PushLogTrace(string cpszMessage)
     {
-#if UNITY_STANDALONE_WIN
+#if UNITY_STANDALONE_WIN && !UNITY_EDITOR
         return DumpForPC.PushLogTrace(cpszMessage);
 #endif
         return false;