diff --git a/Assets/CrazyZoo/Scene/MainScene.unity b/Assets/CrazyZoo/Scene/MainScene.unity index badddff..5159d98 100644 --- a/Assets/CrazyZoo/Scene/MainScene.unity +++ b/Assets/CrazyZoo/Scene/MainScene.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.3708708, g: 0.37838137, b: 0.35725543, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -123,51 +122,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &48343771 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 48343773} - - component: {fileID: 48343772} - m_Layer: 0 - m_Name: WebviewManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &48343772 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 48343771} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1eb2bc549fe045758bca6f69676b6bf4, type: 3} - m_Name: - m_EditorClassIdentifier: - orthoCamera: {fileID: 0} ---- !u!4 &48343773 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 48343771} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 10005.4, y: 9989.2, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &102266212 GameObject: m_ObjectHideFlags: 1 @@ -284,8 +238,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03245a515d1e47a8ab5720b508bef85b, type: 3} m_Name: m_EditorClassIdentifier: - appID: - is_init: 0 --- !u!1 &263133450 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7817730197660402642, guid: 96d1bffd106d2c447b20e183018429ad, type: 3} @@ -1008,6 +960,50 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2063856613 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2063856615} + - component: {fileID: 2063856614} + m_Layer: 0 + m_Name: SdkManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2063856614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2063856613} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f320161c7337dbf46989861b4ea8d8b9, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &2063856615 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2063856613} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 18.55826, y: -38.032883, z: 25.181892} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -1023,6 +1019,6 @@ SceneRoots: - {fileID: 2014148569} - {fileID: 436127301} - {fileID: 764984842} - - {fileID: 48343773} - {fileID: 1342349630} - {fileID: 2030319311} + - {fileID: 2063856615} diff --git a/Assets/Scripts/Roy/newweb/NetworkKit_sdk.cs b/Assets/Scripts/Roy/newweb/NetworkKit_sdk.cs index 49eeea7..9772cc8 100644 --- a/Assets/Scripts/Roy/newweb/NetworkKit_sdk.cs +++ b/Assets/Scripts/Roy/newweb/NetworkKit_sdk.cs @@ -10,6 +10,8 @@ using System; using DontConfuse; using System.Linq; using System.Security.Cryptography; +using FutureCore; +using ScrewsMaster; @@ -32,9 +34,19 @@ public class NetworkKit_sdk { PlayerPrefs.SetString(JarvisToken_SDK, token); } - public const string DomainDebugUrl = @"https://sdkapi.jsoncompare.online/api/"; + public const string DomainDebugUrl = @"https://sdkapi.jsoncompare.online/"; + public static string DomainRelease = "zoomatchsolo.top"; + + // 改为只读属性，实时获取（等调用时 DomainRelease 早就初始化好了） + public static string DomainReleaseUrl => $"https://{DomainRelease}/sdkapi/"; + + // 改为只读属性，实时获取 +#if JarvisRelease + public static string CrazyUrl => DomainReleaseUrl; +#else + public static string CrazyUrl => DomainDebugUrl; +#endif - public static readonly string DomainReleaseUrl = $"https://bingotornado.top/api/"; private static IEnumerator PostInternal(string url, object requestData, UnityAction onCompleted, Dictionary header = null) @@ -42,13 +54,13 @@ public class NetworkKit_sdk string requestJson = JsonConvert.SerializeObject(requestData); string url2 = url; -#if BingoBrainRelease +#if JarvisRelease url2 = Base64Kit_sdk.Encode(url); requestJson = Base64Kit_sdk.Encode(requestJson); #endif byte[] bytes = Encoding.UTF8.GetBytes(requestJson); - string url1 = DomainDebugUrl + url2; - //Debug.Log($"Url: {url1}"); + string url1 = CrazyUrl + url2; + Debug.Log($"Url: {url1}"); UnityWebRequest loginRequest = new UnityWebRequest(url1, UnityWebRequest.kHttpVerbPOST) { uploadHandler = new UploadHandlerRaw(bytes), @@ -72,7 +84,7 @@ public class NetworkKit_sdk else { string receiveContent = loginRequest.downloadHandler.text; -#if BingoBrainRelease +#if JarvisRelease if (!receiveContent.IsNullOrWhiteSpace()) { receiveContent = receiveContent.Substring(0, receiveContent.Length - 1); @@ -335,73 +347,73 @@ public class NetworkKit_sdk } public class Base64Kit_sdk { - // public static string Base64Encode(string source) - // { - // byte[] bytes = Encoding.UTF8.GetBytes(source); - // string encode = Convert.ToBase64String(bytes); - // return encode; - // } - // public static string Encode(string data, bool is_apple_pay = false) - // { - // var key = BingoBrain.Network.DomainRelease; - // //if (is_apple_pay) key = "com.leisuregames.crazygourmet"; + public static string Base64Encode(string source) + { + byte[] bytes = Encoding.UTF8.GetBytes(source); + string encode = Convert.ToBase64String(bytes); + return encode; + } + public static string Encode(string data, bool is_apple_pay = false) + { + var key = NetworkKit_sdk.DomainRelease; + //if (is_apple_pay) key = "com.leisuregames.crazygourmet"; - // var keyMD5 = MD5Kit.MD5String1(key); - // //UnityEngine.Debug.Log("Base64 Encode Key: " + keyMD5); - // var str = Base64EncodeUtil.Base64Encode(data + keyMD5); + var keyMD5 = MD5Kit.MD5String1(key); + //UnityEngine.Debug.Log("Base64 Encode Key: " + keyMD5); + var str = Base64EncodeUtil.Base64Encode(data + keyMD5); - // var bytes = Encoding.UTF8.GetBytes(str); - // for (int i = 0, j = bytes.Length - 1; i < j; i += 1, j -= 1) - // { - // if (i % 2 == 0) - // { - // (bytes[i], bytes[j]) = (bytes[j], bytes[i]); - // } - // } + var bytes = Encoding.UTF8.GetBytes(str); + for (int i = 0, j = bytes.Length - 1; i < j; i += 1, j -= 1) + { + if (i % 2 == 0) + { + (bytes[i], bytes[j]) = (bytes[j], bytes[i]); + } + } - // var loginData = Encoding.UTF8.GetString(bytes); - // return loginData; - // } + var loginData = Encoding.UTF8.GetString(bytes); + return loginData; + } - // public static string Decode(string data) - // { - // var bytes = Encoding.UTF8.GetBytes(data); - // for (int i = 0, j = bytes.Length - 1; i < j; i += 1, j -= 1) - // { - // if (i % 2 == 0) - // { - // (bytes[i], bytes[j]) = (bytes[j], bytes[i]); - // } - // } + public static string Decode(string data) + { + var bytes = Encoding.UTF8.GetBytes(data); + for (int i = 0, j = bytes.Length - 1; i < j; i += 1, j -= 1) + { + if (i % 2 == 0) + { + (bytes[i], bytes[j]) = (bytes[j], bytes[i]); + } + } - // var str = Encoding.UTF8.GetString(bytes); - // var str1 = Base64EncodeUtil.Base64Decode(str); - // var key = BingoBrain.Network.DomainRelease; - // var keyMD5 = MD5Kit.MD5String1(key); - // // Debug.Log("Base64 Decode Key: " + keyMD5); - // // Debug.Log("Base64 Decode str1: " + str1); - // var result = str1.Replace(keyMD5, string.Empty); - // return result; - // } + var str = Encoding.UTF8.GetString(bytes); + var str1 = Base64EncodeUtil.Base64Decode(str); + var key = NetworkKit_sdk.DomainRelease; + var keyMD5 = MD5Kit.MD5String1(key); + // Debug.Log("Base64 Decode Key: " + keyMD5); + // Debug.Log("Base64 Decode str1: " + str1); + var result = str1.Replace(keyMD5, string.Empty); + return result; + } - // public static string Decode(string data, string key) - // { - // var bytes = Encoding.UTF8.GetBytes(data); - // for (int i = 0, j = bytes.Length - 1; i < j; i += 1, j -= 1) - // { - // if (i % 2 == 0) - // { - // (bytes[i], bytes[j]) = (bytes[j], bytes[i]); - // } - // } + public static string Decode(string data, string key) + { + var bytes = Encoding.UTF8.GetBytes(data); + for (int i = 0, j = bytes.Length - 1; i < j; i += 1, j -= 1) + { + if (i % 2 == 0) + { + (bytes[i], bytes[j]) = (bytes[j], bytes[i]); + } + } - // var str = Encoding.UTF8.GetString(bytes); - // var str1 = Base64EncodeUtil.Base64Decode(str); - // // var key = NetworkManager.DomainRelease; - // var keyMD5 = MD5Kit.MD5String1(key); - // var result = str1.Replace(keyMD5, string.Empty); - // return result; - // } + var str = Encoding.UTF8.GetString(bytes); + var str1 = Base64EncodeUtil.Base64Decode(str); + // var key = NetworkManager.DomainRelease; + var keyMD5 = MD5Kit.MD5String1(key); + var result = str1.Replace(keyMD5, string.Empty); + return result; + } private static byte[] GenerateKey(string secret) { using var sha256 = SHA256.Create();