diff --git a/Assets/Resources/UI/UIMainMenu.prefab b/Assets/Resources/UI/UIMainMenu.prefab index e8759ea..d731d56 100644 --- a/Assets/Resources/UI/UIMainMenu.prefab +++ b/Assets/Resources/UI/UIMainMenu.prefab @@ -1396,6 +1396,7 @@ MonoBehaviour: appleUserIdText: {fileID: 5200266615250658360} DeleteAccountButton: {fileID: 1117439657247871432} LogOutButton: {fileID: 2886384592295336126} + SettingButton: {fileID: 3980948398050332762} --- !u!1 &6722503920034882643 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Buy/IAPManager.cs b/Assets/Scripts/Buy/IAPManager.cs index 28ac5dc..704ab9e 100644 --- a/Assets/Scripts/Buy/IAPManager.cs +++ b/Assets/Scripts/Buy/IAPManager.cs @@ -31,6 +31,11 @@ public class IAPManager : MonoBehaviour, IDetailedStoreListener async void Start() { + if (GameConfig.platform!= RuntimePlatform.IPhonePlayer) + { + Debug.LogWarning("非 iOS 平台,无法初始化 IAP"); + return; + } await UnityServices.InitializeAsync(); // 初始化 UGS var builder = ConfigurationBuilder.Instance(StandardPurchasingModule.Instance()); builder.AddProduct(subscriptionId, ProductType.Subscription); diff --git a/Assets/Scripts/Data/GameConfig.cs b/Assets/Scripts/Data/GameConfig.cs new file mode 100644 index 0000000..a1bd0be --- /dev/null +++ b/Assets/Scripts/Data/GameConfig.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GameConfig +{ +#if UNITY_ANDROID + public static RuntimePlatform platform = RuntimePlatform.Android; +#elif UNITY_IPHONE + public static RuntimePlatform platform = RuntimePlatform.IPhonePlayer; +#else + public static RuntimePlatform platform = RuntimePlatform.WebGLPlayer; +#endif + + +} diff --git a/Assets/Scripts/Data/GameConfig.cs.meta b/Assets/Scripts/Data/GameConfig.cs.meta new file mode 100644 index 0000000..ce2ed71 --- /dev/null +++ b/Assets/Scripts/Data/GameConfig.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f8d8ad7c45ecf8845af206bbddf3dc5d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Data/GameData.cs b/Assets/Scripts/Data/GameData.cs index 0161c1f..fe383f0 100644 --- a/Assets/Scripts/Data/GameData.cs +++ b/Assets/Scripts/Data/GameData.cs @@ -4,6 +4,7 @@ using UnityEngine; public class GameData : MonoBehaviour { + public static GameData Instance { get; private set; } //public string username = "ο"; @@ -25,3 +26,10 @@ public class GameData : MonoBehaviour DontDestroyOnLoad(gameObject); // л } } + +public enum GameDataType +{ + Username, + AppleUserId, + IsYouke +} diff --git a/Assets/Scripts/Init.cs b/Assets/Scripts/Init.cs index f6d910a..9bd6c9d 100644 --- a/Assets/Scripts/Init.cs +++ b/Assets/Scripts/Init.cs @@ -7,7 +7,15 @@ public class Init : MonoBehaviour // Start is called before the first frame update void Start() { - UIManager.Instance.OpenUI(); + + if (GameConfig.platform == RuntimePlatform.WebGLPlayer) + { + UIManager.Instance.OpenUI(); + } + else + { + UIManager.Instance.OpenUI(); + } } // Update is called once per frame diff --git a/Assets/Scripts/UI/UIMainMenu.cs b/Assets/Scripts/UI/UIMainMenu.cs index 361aba1..a2dd8b9 100644 --- a/Assets/Scripts/UI/UIMainMenu.cs +++ b/Assets/Scripts/UI/UIMainMenu.cs @@ -14,11 +14,17 @@ public class UIMainMenu : UIBase [SerializeField] Button LogOutButton; + [SerializeField] + GameObject SettingButton; public override void OnOpen(params object[] args) { DeleteAccountButton.onClick.AddListener(ClickDeleteAccountButton); LogOutButton.onClick.AddListener(ClickLogOutButton); + if (GameConfig.platform == RuntimePlatform.WebGLPlayer) + { + SettingButton.SetActive(false); + } } diff --git a/Assets/StreamingAssets/build_info b/Assets/StreamingAssets/build_info index 75b22eb..d9914af 100644 --- a/Assets/StreamingAssets/build_info +++ b/Assets/StreamingAssets/build_info @@ -1 +1 @@ -Build from CHINAMI-5S19PK6 at 2025/8/5 17:18:43 \ No newline at end of file +Build from CHINAMI-5S19PK6 at 2025/8/7 17:29:08 \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 5b6d08b..41b3cb0 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -44,10 +44,10 @@ PlayerSettings: m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1920 defaultScreenHeight: 1080 - defaultScreenWidthWeb: 960 - defaultScreenHeightWeb: 600 + defaultScreenWidthWeb: 480 + defaultScreenHeightWeb: 854 m_StereoRenderingPath: 0 - m_ActiveColorSpace: 1 + m_ActiveColorSpace: 0 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 @@ -155,15 +155,16 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: + Android: com.sange.MosquitoKillerOutdoor iPhone: com.sange.quwen buildNumber: Standalone: 0 iPhone: 0 tvOS: 0 - overrideDefaultApplicationIdentifier: 1 + overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 22 - AndroidTargetSdkVersion: 0 + AndroidTargetSdkVersion: 28 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 1 @@ -245,7 +246,7 @@ PlayerSettings: useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 useCustomProguardFile: 0 - AndroidTargetArchitectures: 1 + AndroidTargetArchitectures: 3 AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -552,6 +553,8 @@ PlayerSettings: m_EncodingQuality: 1 - m_BuildTarget: tvOS m_EncodingQuality: 1 + - m_BuildTarget: WebGL + m_EncodingQuality: 1 m_BuildTargetGroupLightmapSettings: [] m_BuildTargetNormalMapEncoding: - m_BuildTarget: Android @@ -803,7 +806,7 @@ PlayerSettings: webGLDebugSymbols: 0 webGLEmscriptenArgs: webGLModulesDirectory: - webGLTemplate: APPLICATION:Default + webGLTemplate: APPLICATION:Minimal webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 @@ -815,7 +818,8 @@ PlayerSettings: scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} - scriptingBackend: {} + scriptingBackend: + Android: 1 il2cppCompilerConfiguration: {} managedStrippingLevel: EmbeddedLinux: 1 @@ -836,7 +840,7 @@ PlayerSettings: allowUnsafeCode: 0 useDeterministicCompilation: 1 enableRoslynAnalyzers: 1 - selectedPlatform: 3 + selectedPlatform: 4 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1