From 7a366ac2eaa7c4020c8532ee6baeaba606752086 Mon Sep 17 00:00:00 2001 From: changyunjia <905640960@qq.com> Date: Mon, 20 Jul 2026 10:06:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Runtime/Logic/Manager/NetworkManager.cs | 2 +- .../ModuleUI/FirstReward/FirstRewardUI.cs | 12 +- .../Logic/ModuleUI/GameHome/GameHomeUI.cs | 4 +- .../Runtime/Logic/ModuleUI/Menu/MenuUI.cs | 6 +- .../Logic/ModuleUI/SaveingPot/SaveingPotUI.cs | 1 + .../Logic/ModuleUI/SheepPlay/SheepPlayUI.cs | 6 + Assets/Editor/UnityAppController.mm | 745 ++++++++++++++++++ Assets/Editor/UnityAppController.mm.meta | 27 + .../CrazyZooAssets/FGUI/G007_makeup_fui.bytes | Bin 40569 -> 40580 bytes .../CrazyZooAssets/FGUI/SaveingPot_fui.bytes | Bin 28006 -> 28013 bytes UserSettings/Layouts/default-2022.dwlt | 66 +- 11 files changed, 825 insertions(+), 44 deletions(-) create mode 100644 Assets/Editor/UnityAppController.mm create mode 100644 Assets/Editor/UnityAppController.mm.meta diff --git a/Assets/CrazyZoo/Runtime/Logic/Manager/NetworkManager.cs b/Assets/CrazyZoo/Runtime/Logic/Manager/NetworkManager.cs index b7d3a6d..10616a0 100644 --- a/Assets/CrazyZoo/Runtime/Logic/Manager/NetworkManager.cs +++ b/Assets/CrazyZoo/Runtime/Logic/Manager/NetworkManager.cs @@ -2,7 +2,7 @@ namespace ScrewsMaster { public class NetworkManager : BaseUnityManager { - public const string DomainDebugUrl = @"https://api.jsoncompare.online/"; + public const string DomainDebugUrl = @"https://wz-api-dev.tronwin.top/"; public static string DomainRelease = "zoomatchsolo.top"; // 改为只读属性，实时获取（等调用时 DomainRelease 早就初始化好了） diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/FirstReward/FirstRewardUI.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/FirstReward/FirstRewardUI.cs index 170e33b..8dc7eb8 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/FirstReward/FirstRewardUI.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/FirstReward/FirstRewardUI.cs @@ -84,7 +84,7 @@ namespace ScrewsMaster //初始化页面逻辑 private void InitView() { - + ui.text_num.text = GameHelper.GetPaymentTypeVO().payicon + ConfigSystem.GetConfig().InitialNum; var sk = FXManager.Instance.SetFx(ui.spine_parent, Fx_Type.fx_first_reward, ref closeCallback); sk.state.SetAnimation(0, "newbie_reward_an01", false); @@ -98,9 +98,9 @@ namespace ScrewsMaster sk.state.Complete += (a) => { ui.state.selectedIndex = com_firstreward.State_page; - - - + + + }; }); @@ -108,7 +108,7 @@ namespace ScrewsMaster ui.btn_get.SetClick(GetReward); ui.btn_close.SetClick(GetReward); ui.money.GetChild("number_text").text = GameHelper.Get102Str(GameHelper.Get102()); - + var lightSk = FXManager.Instance.SetFx(ui.bg_parent, Fx_Type.fx_win_light, ref closeCallback); lightSk.state.SetAnimation(0, "animation", true); } @@ -137,7 +137,7 @@ namespace ScrewsMaster DOVirtual.Float(0, (float)GameHelper.Get102(), 1, value => { ui.money.GetChild("number_text").text = GameHelper.Get102Str((decimal)value); }); PlayerPrefs.SetInt("FirstReward", 1); - + GameHelper.GetLoginModel().new_player = false; }); DOVirtual.DelayedCall(2.5f, () => { diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/GameHome/GameHomeUI.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/GameHome/GameHomeUI.cs index 625efe9..5e5f116 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/GameHome/GameHomeUI.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/GameHome/GameHomeUI.cs @@ -84,7 +84,7 @@ namespace ScrewsMaster // GotoH5(); // } // else - if (loginModel.new_player) + if (loginModel.new_player || (PlayerPrefs.GetInt("FirstReward", 0) != 1)) { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.FirstRewardUI_Open); loginModel.new_player = false; @@ -559,7 +559,7 @@ namespace ScrewsMaster // var level = ShowScrews.Instance.gameMode == GameHome.Mode_difficult ? ShowScrews.Instance.GetCurMaxLevel() : GameHelper.GetLevel();; var level = ShowScrews.Instance.gameMode == GameHome.Mode_difficult ? 1 : GameHelper.GetLevel(); ; ShowScrews.Instance.InitLogic(level); - + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepPlayUI_Open); AudioManager.Instance.PlayBGM(AudioConst.PlayingBg); } diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/Menu/MenuUI.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/Menu/MenuUI.cs index 9bcdb93..17e07ee 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/Menu/MenuUI.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/Menu/MenuUI.cs @@ -46,7 +46,7 @@ namespace ScrewsMaster protected override void OnOpenBefore(object args) { - // var mode = (int)args; + // var mode = (int)args; // ui.switchgift.selectedIndex = mode; InitView(); @@ -119,10 +119,12 @@ namespace ScrewsMaster ui.ExitBtn.SetClick(() => { CloseMenu(); + ShowScrews.Instance.TrackGameCompletion(false); ShowScrews.Instance.ClearLevelData(); UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.GameHomeUI_Open); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepPlayUI_Close); }); ui.btn_restore.SetClick(() => { @@ -241,7 +243,7 @@ namespace ScrewsMaster private void OnClickContact() { - GameHelper.OpenEmail(); + GameHelper.OpenEmail(); //Application.OpenURL("https://official.nutboltparty.fun/"); } diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SaveingPot/SaveingPotUI.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SaveingPot/SaveingPotUI.cs index 74001ad..53df9e0 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SaveingPot/SaveingPotUI.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SaveingPot/SaveingPotUI.cs @@ -149,6 +149,7 @@ namespace ScrewsMaster ShowScrews.Instance.InitLogic(level); AudioManager.Instance.PlayBGM(AudioConst.PlayingBg); CtrlCloseUI(); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepPlayUI_Open); UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.GameHomeUI_Close); } diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SheepPlay/SheepPlayUI.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SheepPlay/SheepPlayUI.cs index 597f0d5..cea47b9 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SheepPlay/SheepPlayUI.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/SheepPlay/SheepPlayUI.cs @@ -214,6 +214,12 @@ namespace ScrewsMaster { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ThreeDaysGiftUI_Open); }); + var loginModel = GameHelper.GetLoginModel(); + if (loginModel.new_player || (PlayerPrefs.GetInt("FirstReward", 0) != 1)) + { + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.FirstRewardUI_Open); + loginModel.new_player = false; + } } void UpdateEvent() { diff --git a/Assets/Editor/UnityAppController.mm b/Assets/Editor/UnityAppController.mm new file mode 100644 index 0000000..140bcdc --- /dev/null +++ b/Assets/Editor/UnityAppController.mm @@ -0,0 +1,745 @@ +#import "UnityAppController.h" +#import "UnityAppController+ViewHandling.h" +#import "UnityAppController+Rendering.h" +#import "iPhone_Sensors.h" + +#import +#import +#import +#import +#import + +#include + +// MSAA_DEFAULT_SAMPLE_COUNT was removed +// ENABLE_INTERNAL_PROFILER and related defines were moved to iPhone_Profiler.h +// kFPS define for removed: you can use Application.targetFrameRate (30 fps by default) +// DisplayLink is the only run loop mode now - all others were removed + +#include "CrashReporter.h" + +#include "UI/OrientationSupport.h" +#include "UI/UnityView.h" +#include "UI/Keyboard.h" +#include "UI/UnityViewControllerBase.h" +#include "Unity/InternalProfiler.h" +#include "Unity/DisplayManager.h" +#include "Unity/ObjCRuntime.h" +#include "PluginBase/AppDelegateListener.h" + +#include +#include +#include +#include +#include + +// we assume that app delegate is never changed and we can cache it, instead of re-query UIApplication every time +UnityAppController* _UnityAppController = nil; +UnityAppController* GetAppController() +{ + return _UnityAppController; +} + +// we keep old bools around to support "old" code that might have used them +bool _ios81orNewer = false, _ios82orNewer = false, _ios83orNewer = false, _ios90orNewer = false, _ios91orNewer = false; +bool _ios100orNewer = false, _ios101orNewer = false, _ios102orNewer = false, _ios103orNewer = false; +bool _ios110orNewer = false, _ios111orNewer = false, _ios112orNewer = false; +bool _ios130orNewer = false, _ios140orNewer = false, _ios150orNewer = false, _ios160orNewer = false; + +// minimal Unity initialization done, enough to do calls to provide data like URL launch +bool _unityEngineLoaded = false; +// was core of Unity loaded (non-graphics part prior to loading first scene) +bool _unityEngineInitialized = false; +// was unity rendering already inited: we should not touch rendering while this is false +bool _renderingInited = false; +// was unity inited: we should not touch unity api while this is false +bool _unityAppReady = false; +// see if there's a need to do internal player pause/resume handling +// +// Typically the trampoline code should manage this internally, but +// there are use cases, videoplayer, plugin code, etc where the player +// is paused before the internal handling comes relevant. Avoid +// overriding externally managed player pause/resume handling by +// caching the state +bool _wasPausedExternal = false; +// should we skip present on next draw: used in corner cases (like rotation) to fill both draw-buffers with some content +bool _skipPresent = false; +// was app "resigned active": some operations do not make sense while app is in background +bool _didResignActive = false; + +#if UNITY_SUPPORT_ROTATION +// Required to enable specific orientation for some presentation controllers: see supportedInterfaceOrientationsForWindow below for details +NSInteger _forceInterfaceOrientationMask = 0; +#endif + +@implementation UnityAppController + +@synthesize unityView = _unityView; +@synthesize unityDisplayLink = _displayLink; + +@synthesize rootView = _rootView; +@synthesize rootViewController = _rootController; +@synthesize mainDisplay = _mainDisplay; +@synthesize renderDelegate = _renderDelegate; +@synthesize quitHandler = _quitHandler; + +#if UNITY_SUPPORT_ROTATION +@synthesize interfaceOrientation = _curOrientation; +#endif + +- (id)init +{ + if ((self = _UnityAppController = [super init])) + { + // due to clang issues with generating warning for overriding deprecated methods + // we will simply assert if deprecated methods are present + // NB: methods table is initied at load (before this call), so it is ok to check for override + NSAssert(![self respondsToSelector: @selector(createUnityViewImpl)], + @"createUnityViewImpl is deprecated and will not be called. Override createUnityView" + ); + NSAssert(![self respondsToSelector: @selector(createViewHierarchyImpl)], + @"createViewHierarchyImpl is deprecated and will not be called. Override willStartWithViewController" + ); + NSAssert(![self respondsToSelector: @selector(createViewHierarchy)], + @"createViewHierarchy is deprecated and will not be implemented. Use createUI" + ); + } + return self; +} + +- (void)setWindow:(id)object {} +- (UIWindow*)window { return _window; } + + +- (void)shouldAttachRenderDelegate {} +- (void)preStartUnity {} + + +- (void)startUnity:(UIApplication*)application +{ + NSAssert(_unityAppReady == NO, @"[UnityAppController startUnity:] called after Unity has been initialized"); + + UnityInitApplicationGraphics(); + +#if !PLATFORM_VISIONOS + // we make sure that first level gets correct display list and orientation + [[DisplayManager Instance] updateDisplayListCacheInUnity]; +#endif + + UnityLoadApplication(); + Profiler_InitProfiler(); + + [self showGameUI]; + [self createDisplayLink]; + + UnitySetPlayerFocus(1); + + AVAudioSession* audioSession = [AVAudioSession sharedInstance]; + // If Unity audio is disabled, we set the category to ambient to make sure we don't mute other app's audio. We set the audio session + // to active so we can get outputVolume callbacks. If Unity audio is enabled, FMOD should have already handled all of this AVAudioSession init. + if (!UnityIsAudioManagerAvailableAndEnabled()) + { + [audioSession setCategory: AVAudioSessionCategoryAmbient error: nil]; + [audioSession setActive: YES error: nil]; + } + [audioSession addObserver: self forKeyPath: @"outputVolume" options: 0 context: nil]; + UnityUpdateMuteState([audioSession outputVolume] < 0.01f ? 1 : 0); + +#if UNITY_REPLAY_KIT_AVAILABLE + void InitUnityReplayKit(); // Classes/Unity/UnityReplayKit.mm + + InitUnityReplayKit(); +#endif + CTTelephonyNetworkInfo *networkInfo = [[CTTelephonyNetworkInfo alloc] init]; + + if (@available(iOS 12.0, *)) { + NSDictionary *ctDict = networkInfo.serviceSubscriberCellularProviders; + if ([ctDict allKeys].count > 1) { + NSArray *keys = [ctDict allKeys]; + CTCarrier *carrier1 = [ctDict objectForKey:[keys firstObject]]; + CTCarrier *carrier2 = [ctDict objectForKey:[keys lastObject]]; + if (carrier1.mobileCountryCode.length && carrier2.mobileCountryCode.length) { + UnitySendMessage("SdkManager", "haveSimCard", "TRUE"); + + }else if (!carrier1.mobileCountryCode.length && !carrier2.mobileCountryCode.length) { + UnitySendMessage("SdkManager", "haveSimCard", "FALSE"); + + }else { + UnitySendMessage("SdkManager", "haveSimCard", "TRUE"); + } + }else if ([ctDict allKeys].count == 1) { + NSArray *keys = [ctDict allKeys]; + CTCarrier *carrier1 = [ctDict objectForKey:[keys firstObject]]; + if (carrier1.mobileCountryCode.length) { + UnitySendMessage("SdkManager", "haveSimCard", "TRUE"); + }else { + UnitySendMessage("SdkManager", "haveSimCard", "FALSE"); + } + }else { + UnitySendMessage("SdkManager", "haveSimCard", "FALSE"); + } + } +} + +extern "C" void UnityDestroyDisplayLink() +{ + [GetAppController() destroyDisplayLink]; +} + +extern "C" void UnityRequestUnload() +{ + _unityAppReady = false; + [[NSNotificationCenter defaultCenter] postNotificationName: kUnityDidUnload object: nil]; +} + +extern "C" void UnityRequestQuit() +{ + _didResignActive = true; + if (GetAppController().quitHandler) + GetAppController().quitHandler(); + else + exit(0); +} + +extern void SensorsCleanup(); +extern "C" void UnityCleanupTrampoline() +{ + // Prevent multiple cleanups + if (_UnityAppController == nil) + return; + + // Unity view and viewController will not necessary be destroyed right after this function execution. + // We need to ensure that these objects will not receive any callbacks from system during that time. + _UnityAppController.window.rootViewController = nil; + [_UnityAppController.unityView removeFromSuperview]; + + [KeyboardDelegate Destroy]; + + SensorsCleanup(); + + Profiler_UninitProfiler(); + + [DisplayManager Destroy]; + + UnityDestroyDisplayLink(); + + _UnityAppController = nil; +} + +#if UNITY_SUPPORT_ROTATION + +- (NSUInteger)application:(UIApplication*)application supportedInterfaceOrientationsForWindow:(UIWindow*)window +{ + // No rootViewController is set because we are switching from one view controller to another, all orientations should be enabled + if ([window rootViewController] == nil) + return UIInterfaceOrientationMaskAll; + + // During splash screen show phase no forced orientations should be allowed. + // This will prevent unwanted rotation while splash screen is on and application is not yet ready to present (Ex. Fogbugz cases: 1190428, 1269547). + if (!_unityAppReady) + return [_rootController supportedInterfaceOrientations]; + + // Some presentation controllers (e.g. UIImagePickerController) require portrait orientation and will throw exception if it is not supported. + // At the same time enabling all orientations by returning UIInterfaceOrientationMaskAll might cause unwanted orientation change + // (e.g. when using UIActivityViewController to "share to" another application, iOS will use supportedInterfaceOrientations to possibly reorient). + // So to avoid exception we are returning combination of constraints for root view controller and orientation requested by iOS. + // _forceInterfaceOrientationMask is updated in willChangeStatusBarOrientation, which is called if some presentation controller insists on orientation change. + return [[window rootViewController] supportedInterfaceOrientations] | _forceInterfaceOrientationMask; +} + +- (void)application:(UIApplication*)application willChangeStatusBarOrientation:(UIInterfaceOrientation)newStatusBarOrientation duration:(NSTimeInterval)duration +{ + // Setting orientation mask which is requested by iOS: see supportedInterfaceOrientationsForWindow above for details + _forceInterfaceOrientationMask = 1 << newStatusBarOrientation; +} + +#endif + +#if UNITY_USES_REMOTE_NOTIFICATIONS + +- (void)application:(UIApplication*)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData*)deviceToken +{ + AppController_SendNotificationWithArg(kUnityDidRegisterForRemoteNotificationsWithDeviceToken, deviceToken); +} + +#if !PLATFORM_TVOS +- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))handler +{ + AppController_SendNotificationWithArg(kUnityDidReceiveRemoteNotification, userInfo); + + if (handler) + { + handler(UIBackgroundFetchResultNoData); + } +} + +#endif + +- (void)application:(UIApplication*)application didFailToRegisterForRemoteNotificationsWithError:(NSError*)error +{ + AppController_SendNotificationWithArg(kUnityDidFailToRegisterForRemoteNotificationsWithError, error); + + // alas people do not check remote notification error through api (which is clunky, i agree) so log here to have at least some visibility + ::printf("\nFailed to register for remote notifications:\n%s\n\n", [[error localizedDescription] UTF8String]); +} + +#endif + +// UIApplicationOpenURLOptionsKey was added only in ios10 sdk, while we still support ios9 sdk +- (BOOL)application:(UIApplication*)app openURL:(NSURL*)url options:(NSDictionary*)options +{ + id sourceApplication = options[UIApplicationOpenURLOptionsSourceApplicationKey], annotation = options[UIApplicationOpenURLOptionsAnnotationKey]; + + NSMutableDictionary* notifData = [NSMutableDictionary dictionaryWithCapacity: 3]; + if (url) + { + notifData[@"url"] = url; + UnitySetAbsoluteURL(url.absoluteString.UTF8String); + } + if (sourceApplication) notifData[@"sourceApplication"] = sourceApplication; + if (annotation) notifData[@"annotation"] = annotation; + + AppController_SendNotificationWithArg(kUnityOnOpenURL, notifData); + return YES; +} + +- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray > * _Nullable restorableObjects))restorationHandler +{ + NSURL* url = userActivity.webpageURL; + if (url) + UnitySetAbsoluteURL(url.absoluteString.UTF8String); + return YES; +} + +- (BOOL)application:(UIApplication*)application willFinishLaunchingWithOptions:(NSDictionary*)launchOptions +{ + AppController_SendNotificationWithArg(kUnityWillFinishLaunchingWithOptions, launchOptions); + NSURL* url = [self extractURLFromLaunchOptions: launchOptions]; + if (url != nil) + { + [self initUnityApplicationNoGraphics]; + UnitySetAbsoluteURL(url.absoluteString.UTF8String); + } + return YES; +} + +// Helper method to extract URL from launch options +- (NSURL*)extractURLFromLaunchOptions:(NSDictionary*)launchOptions +{ + // Check for the direct launch URL + NSURL* url = launchOptions[UIApplicationLaunchOptionsURLKey]; + if (url != nil) + { + return url; + } + + // Check for the user activity dictionary and URL from user activity + NSUserActivity* userActivity = launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey][@"UIApplicationLaunchOptionsUserActivityKey"]; + if (userActivity != nil && [userActivity.activityType isEqualToString: NSUserActivityTypeBrowsingWeb]) + { + url = userActivity.webpageURL; + if (url != nil) + { + return url; + } + } + + return nil; +} + +- (UIWindowScene*)pickStartupWindowScene:(NSSet*)scenes API_AVAILABLE(ios(13.0), tvos(13.0)) +{ + // if we have scene with UISceneActivationStateForegroundActive - pick it + // otherwise UISceneActivationStateForegroundInactive will work + // it will be the scene going into active state + // if there were no active/inactive scenes (only background) we should allow background scene + // this might happen in some cases with native plugins doing "things" + UIWindowScene *foregroundScene = nil, *backgroundScene = nil; + for (UIScene* scene in scenes) + { + if (![scene isKindOfClass: [UIWindowScene class]]) + continue; + UIWindowScene* windowScene = (UIWindowScene*)scene; + + if (scene.activationState == UISceneActivationStateForegroundActive) + return windowScene; + if (scene.activationState == UISceneActivationStateForegroundInactive) + foregroundScene = windowScene; + else if (scene.activationState == UISceneActivationStateBackground) + backgroundScene = windowScene; + } + + return foregroundScene ? foregroundScene : backgroundScene; +} + +- (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions +{ + ::printf("-> applicationDidFinishLaunching()\n"); + + // send notfications +#if !PLATFORM_TVOS && !PLATFORM_VISIONOS + if ([UIDevice currentDevice].generatesDeviceOrientationNotifications == NO) + [[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications]; +#endif + + // if application is in background, don't initialize Unity + // this happens if app uses location fence, notifications with content/actions, ... + // initUnityWithApplication: initializes rendering, possibly loads scene and calls Start(), none meant for background + if (UIApplication.sharedApplication.applicationState == UIApplicationStateBackground) + return YES; + + [self initUnityWithApplication: application]; + return YES; +} + +- (void)initUnityApplicationNoGraphics +{ + if (_unityEngineLoaded) + return; + _unityEngineLoaded = true; + UnityInitApplicationNoGraphics(UnityDataBundleDir()); +} + +- (void)initUnityWithApplication:(UIApplication*)application +{ + if (_unityEngineInitialized) + return; + _unityEngineInitialized = true; + + // basic unity init + [self initUnityApplicationNoGraphics]; + + [self selectRenderingAPI]; + [UnityRenderingView InitializeForAPI: self.renderingAPI]; + +#if !PLATFORM_VISIONOS + if (@available(iOS 13, tvOS 13, *)) + _window = [[UIWindow alloc] initWithWindowScene: [self pickStartupWindowScene: application.connectedScenes]]; + else + _window = [[UIWindow alloc] initWithFrame: [UIScreen mainScreen].bounds]; +#else + _window = [[UIWindow alloc] init]; +#endif + + _unityView = [self createUnityView]; + + + [DisplayManager Initialize]; + _mainDisplay = [DisplayManager Instance].mainDisplay; + [_mainDisplay createWithWindow: _window andView: _unityView]; + + [self createUI]; + [self preStartUnity]; + + // if you wont use keyboard you may comment it out at save some memory + [KeyboardDelegate Initialize]; + +#if UNITY_DEVELOPER_BUILD + // Causes a black screen after splash screen, but would deadlock if waiting for manged debugger otherwise + [self performSelector: @selector(startUnity:) withObject: application afterDelay: 0]; +#else + [self startUnity: application]; +#endif +} + +- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context +{ + if ([keyPath isEqual: @"outputVolume"]) + { + UnityUpdateMuteState([[AVAudioSession sharedInstance] outputVolume] < 0.01f ? 1 : 0); + } +} + +- (void)applicationDidEnterBackground:(UIApplication*)application +{ + ::printf("-> applicationDidEnterBackground()\n"); +} + +- (void)applicationWillEnterForeground:(UIApplication*)application +{ + ::printf("-> applicationWillEnterForeground()\n"); + + // applicationWillEnterForeground: might sometimes arrive *before* actually initing unity (e.g. locking on startup) + if (_unityAppReady) + { + // if we were showing video before going to background - the view size may be changed while we are in background + [GetAppController().unityView recreateRenderingSurfaceIfNeeded]; + } +} + +- (void)applicationDidBecomeActive:(UIApplication*)application +{ + ::printf("-> applicationDidBecomeActive()\n"); + + [self removeSnapshotViewController]; + + if (_unityAppReady) + { + if (UnityIsPaused() && _wasPausedExternal == false) + { + UnityWillResume(); + UnityPause(0); + } + if (_wasPausedExternal) + { + if (UnityIsFullScreenPlaying()) + TryResumeFullScreenVideo(); + } + // need to do this with delay because FMOD restarts audio in AVAudioSessionInterruptionNotification handler + [self performSelector: @selector(updateUnityAudioOutput) withObject: nil afterDelay: 0.1]; + UnitySetPlayerFocus(1); + } + else + { + [self initUnityWithApplication: application]; + } + + _didResignActive = false; +} + +- (void)updateUnityAudioOutput +{ + UnityUpdateMuteState([[AVAudioSession sharedInstance] outputVolume] < 0.01f ? 1 : 0); +} + +- (void)addSnapshotViewController +{ + if (!_didResignActive || self->_snapshotViewController) + { + return; + } + + UIView* snapshotView = [self createSnapshotView]; + + if (snapshotView != nil) + { + UIViewController* snapshotViewController = [AllocUnityViewController() init]; + snapshotViewController.modalPresentationStyle = UIModalPresentationFullScreen; + snapshotViewController.view = snapshotView; + + [self->_rootController presentViewController: snapshotViewController animated: false completion: nil]; + self->_snapshotViewController = snapshotViewController; + } +} + +- (void)removeSnapshotViewController +{ + // do this on the main queue async so that if we try to create one + // and remove in the same frame, this always happens after in the same queue + dispatch_async(dispatch_get_main_queue(), ^{ + if (self->_snapshotViewController) + { + // we've got a view on top of the snapshot view (3rd party plugin/social media login etc). + if (self->_snapshotViewController.presentedViewController) + { + [self performSelector: @selector(removeSnapshotViewController) withObject: nil afterDelay: 0.05]; + return; + } + + [self->_snapshotViewController dismissViewControllerAnimated: NO completion: nil]; + self->_snapshotViewController = nil; + + // Make sure that the keyboard input field regains focus after the application becomes active. + [[KeyboardDelegate Instance] becomeFirstResponder]; + } + }); +} + +- (void)applicationWillResignActive:(UIApplication*)application +{ + ::printf("-> applicationWillResignActive()\n"); + + if (_unityAppReady) + { + UnitySetPlayerFocus(0); + + // signal unity that the frame rendering have ended + // as we will not get the callback from the display link current frame + UnityDisplayLinkCallback(0); + + _wasPausedExternal = UnityIsPaused(); + if (_wasPausedExternal == false) + { + // Pause Unity only if we don't need special background processing + // otherwise batched player loop can be called to run user scripts. + if (!UnityGetUseCustomAppBackgroundBehavior()) + { +#if UNITY_SNAPSHOT_VIEW_ON_APPLICATION_PAUSE + // Force player to do one more frame, so scripts get a chance to render custom screen for minimized app in task manager. + // NB: UnityWillPause will schedule OnApplicationPause message, which will be sent normally inside repaint (unity player loop) + // NB: We will actually pause after the loop (when calling UnityPause). + UnityWillPause(); + [self repaint]; + UnityWaitForFrame(); + [self addSnapshotViewController]; +#endif + UnityPause(1); + } + } + } + + _didResignActive = true; +} + +- (void)applicationDidReceiveMemoryWarning:(UIApplication*)application +{ + UnityLowMemory(); +} + +- (void)applicationWillTerminate:(UIApplication*)application +{ + ::printf("-> applicationWillTerminate()\n"); + + // Only clean up if Unity has finished initializing, else the clean up process will crash, + // this happens if the app is force closed immediately after opening it. + if (_unityAppReady) + { + // make sure that we are in a "unity cannot be touched" state + // if there was some complex UI shown when terminating, we can get extra UI calls from iOS after applicationWillTerminate: + // and we want to make sure we never do anything touching unity runtime at this point + _unityAppReady = _renderingInited = _unityEngineInitialized = false; + _didResignActive = true; + + UnityCleanup(); + UnityCleanupTrampoline(); + } +} + +- (void)application:(UIApplication*)application handleEventsForBackgroundURLSession:(nonnull NSString *)identifier completionHandler:(nonnull void (^)())completionHandler +{ + NSDictionary* arg = @{identifier: completionHandler}; + AppController_SendNotificationWithArg(kUnityHandleEventsForBackgroundURLSession, arg); +} + +@end + + +void AppController_SendNotification(NSString* name) +{ + [[NSNotificationCenter defaultCenter] postNotificationName: name object: GetAppController()]; +} + +void AppController_SendNotificationWithArg(NSString* name, id arg) +{ + [[NSNotificationCenter defaultCenter] postNotificationName: name object: GetAppController() userInfo: arg]; +} + +void AppController_SendUnityViewControllerNotification(NSString* name) +{ + [[NSNotificationCenter defaultCenter] postNotificationName: name object: UnityGetGLViewController()]; +} + +extern "C" UIWindow* UnityGetMainWindow() { return GetAppController().mainDisplay.window; } +extern "C" UIViewController* UnityGetGLViewController() { return GetAppController().rootViewController; } +extern "C" UnityView* UnityGetUnityView() { return GetAppController().unityView; } +extern "C" UIView* UnityGetGLView() { return UnityGetUnityView(); } + + +extern "C" ScreenOrientation UnityCurrentOrientation() { return GetAppController().unityView.contentOrientation; } + + +bool LogToNSLogHandler(LogType logType, const char* log, va_list list) +{ + NSLogv([NSString stringWithUTF8String: log], list); + return true; +} + +static void AddNewAPIImplIfNeeded(); + +// From https://stackoverflow.com/questions/4744826/detecting-if-ios-app-is-run-in-debugger +static bool isDebuggerAttachedToConsole(void) +// Returns true if the current process is being debugged (either +// running under the debugger or has a debugger attached post facto). +{ + int junk; + int mib[4]; + struct kinfo_proc info; + size_t size; + + // Initialize the flags so that, if sysctl fails for some bizarre + // reason, we get a predictable result. + + info.kp_proc.p_flag = 0; + + // Initialize mib, which tells sysctl the info we want, in this case + // we're looking for information about a specific process ID. + + mib[0] = CTL_KERN; + mib[1] = KERN_PROC; + mib[2] = KERN_PROC_PID; + mib[3] = getpid(); + + // Call sysctl. + + size = sizeof(info); + junk = sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, NULL, 0); + assert(junk == 0); + + // We're being debugged if the P_TRACED flag is set. + // But if we are starting app on device (and make debugger wait and attach after start) + // it will NOT connect stout (only stderr, used by nslog) + // Hence we also check that stoud is rerouted + return ((info.kp_proc.p_flag & P_TRACED) != 0) && isatty(STDOUT_FILENO); +} + +void UnityInitTrampoline() +{ + InitCrashHandling(); + + NSString* version = [[UIDevice currentDevice] systemVersion]; +#define CHECK_VER(s) [version compare: s options: NSNumericSearch] != NSOrderedAscending + _ios81orNewer = CHECK_VER(@"8.1"); _ios82orNewer = CHECK_VER(@"8.2"); _ios83orNewer = CHECK_VER(@"8.3"); + _ios90orNewer = CHECK_VER(@"9.0"); _ios91orNewer = CHECK_VER(@"9.1"); + _ios100orNewer = CHECK_VER(@"10.0"); _ios101orNewer = CHECK_VER(@"10.1"); _ios102orNewer = CHECK_VER(@"10.2"); _ios103orNewer = CHECK_VER(@"10.3"); + _ios110orNewer = CHECK_VER(@"11.0"); _ios111orNewer = CHECK_VER(@"11.1"); _ios112orNewer = CHECK_VER(@"11.2"); + _ios130orNewer = CHECK_VER(@"13.0"); _ios140orNewer = CHECK_VER(@"14.0"); _ios150orNewer = CHECK_VER(@"15.0"); + _ios160orNewer = CHECK_VER(@"16.0"); +#undef CHECK_VER + + AddNewAPIImplIfNeeded(); + +#if !TARGET_IPHONE_SIMULATOR + // Use NSLog logging if a debugger is not attached, otherwise we write to stdout. + if (!isDebuggerAttachedToConsole()) + UnitySetLogEntryHandler(LogToNSLogHandler); +#endif +} + +extern "C" bool UnityiOS81orNewer() { return _ios81orNewer; } +extern "C" bool UnityiOS82orNewer() { return _ios82orNewer; } +extern "C" bool UnityiOS90orNewer() { return _ios90orNewer; } +extern "C" bool UnityiOS91orNewer() { return _ios91orNewer; } +extern "C" bool UnityiOS100orNewer() { return _ios100orNewer; } +extern "C" bool UnityiOS101orNewer() { return _ios101orNewer; } +extern "C" bool UnityiOS102orNewer() { return _ios102orNewer; } +extern "C" bool UnityiOS103orNewer() { return _ios103orNewer; } +extern "C" bool UnityiOS110orNewer() { return _ios110orNewer; } +extern "C" bool UnityiOS111orNewer() { return _ios111orNewer; } +extern "C" bool UnityiOS112orNewer() { return _ios112orNewer; } +extern "C" bool UnityiOS130orNewer() { return _ios130orNewer; } +extern "C" bool UnityiOS140orNewer() { return _ios140orNewer; } +extern "C" bool UnityiOS150orNewer() { return _ios150orNewer; } +extern "C" bool UnityiOS160orNewer() { return _ios160orNewer; } + +// sometimes apple adds new api with obvious fallback on older ios. +// in that case we simply add these functions ourselves to simplify code +static void AddNewAPIImplIfNeeded() +{ +#if !PLATFORM_VISIONOS + if (![[UIScreen class] instancesRespondToSelector: @selector(maximumFramesPerSecond)]) + { + IMP UIScreen_MaximumFramesPerSecond_IMP = imp_implementationWithBlock(^NSInteger(id _self) { + return 60; + }); + class_replaceMethod([UIScreen class], @selector(maximumFramesPerSecond), UIScreen_MaximumFramesPerSecond_IMP, UIScreen_maximumFramesPerSecond_Enc); + } + + if (![[UIView class] instancesRespondToSelector: @selector(safeAreaInsets)]) + { + IMP UIView_SafeAreaInsets_IMP = imp_implementationWithBlock(^UIEdgeInsets(id _self) { + return UIEdgeInsetsZero; + }); + class_replaceMethod([UIView class], @selector(safeAreaInsets), UIView_SafeAreaInsets_IMP, UIView_safeAreaInsets_Enc); + } +#endif +} diff --git a/Assets/Editor/UnityAppController.mm.meta b/Assets/Editor/UnityAppController.mm.meta new file mode 100644 index 0000000..f7d8ff8 --- /dev/null +++ b/Assets/Editor/UnityAppController.mm.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: ee30712e8a7a1784c82cae8834217c45 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/CrazyZooAssets/FGUI/G007_makeup_fui.bytes b/Assets/Resources/CrazyZooAssets/FGUI/G007_makeup_fui.bytes index 70417788ef4c6350104c2d0433c5d95a29480ade..79a679b2158e9d4e6d1e4ed8723c87f0801d1aa0 100644 GIT binary patch delta 56 zcmeylhpA;R(}uzc9Q@Atd1;wNxtq%;7;`WdPF~-qAnKc1l%A>(oLrPzuHc@Sm#z?0 MTAZ=@`iw=a0D&47IRF3v delta 45 zcmZqK%k*;((}uzcY`m^{C8FpFlJ0%->1M6Ql42{qM)V_Qd*R^`O%C;tN^8h B5*Gjf diff --git a/Assets/Resources/CrazyZooAssets/FGUI/SaveingPot_fui.bytes b/Assets/Resources/CrazyZooAssets/FGUI/SaveingPot_fui.bytes index 61d8ee7e7cf6baaf5f17fa547015a007dcf03fe4..f2c8ba17ad1076d677942d6a7b5bcb9d023a6ef6 100644 GIT binary patch delta 67 zcmaEMi}CF(#tpOe89z)8)NAPiJ@X>)WSCLmOGa&EJfW{v_1 S2}5sgWNCD1Z*H?HX+s42PZt;f diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 122fab3..54ce266 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -146,7 +146,7 @@ MonoBehaviour: m_MinSize: {x: 500, y: 50} m_MaxSize: {x: 40480, y: 8096} vertical: 0 - controlID: 148 + controlID: 37 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -173,7 +173,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 62 + controlID: 38 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -192,7 +192,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 265 + width: 300 height: 939 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -216,9 +216,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 265 + x: 300 y: 0 - width: 433 + width: 398 height: 939 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -336,7 +336,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 264 + width: 299 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -353,7 +353,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: e878f5ffec78f5fffc78f5ff0879f5ff4aacf5ff4eacf5ff5eacf5ff6aacf5ff16dff5ff1adff5ff2adff5ff36dff5ff26fbfffff4ffffff + m_ExpandedIDs: 8e90fdff2491fdff3a24feff4024feffa825feff0057feff2457feff3c57feff5257feffba57feff9e03ffffaa03ffffb003ffffd403ffffec03ffff0204ffff6a04ffff26fbfffff4ffffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -397,9 +397,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 265 + x: 300 y: 73 - width: 431 + width: 396 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -746,9 +746,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -4.525265, y: 1.0310006, z: 25.044537} + m_Target: {x: 10004.845, y: 9994.169, z: 0.049799226} speed: 2 - m_Value: {x: -4.525265, y: 1.0310006, z: 25.044537} + m_Value: {x: 10004.845, y: 9994.169, z: 0.049799226} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -798,9 +798,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 27.240633 + m_Target: 6.4705515 speed: 2 - m_Value: 27.240633 + m_Value: 6.4705515 m_Ortho: m_Target: 1 speed: 2 @@ -870,7 +870,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/Roy/newweb + - Assets/Editor m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -878,16 +878,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Scripts/Roy/newweb + - Assets/Editor m_LastFoldersGridSize: 16 m_LastProjectPath: D:\git_test\MergeGangRush_unity_IOS m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 7c7f0000 - m_LastClickedID: 32636 - m_ExpandedIDs: 00000000ee750000f0750000f2750000f4750000f6750000f8750000fa750000fc750000fe750000007600000276000006760000087600000a7600000c7600000e76000010760000727f000000ca9a3bffffff7f + m_SelectedIDs: 4a7f0000 + m_LastClickedID: 32586 + m_ExpandedIDs: 00000000ee750000f4750000f6750000f8750000fa750000fe75000000760000027600000476000006760000087600000a7600000c7600000e76000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -942,19 +942,19 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000486800005662000072770000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: CipherKit - m_OriginalName: CipherKit + m_Name: pluginIOs + m_OriginalName: pluginIOs m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 67584 + m_UserData: 23444 m_IsWaitingForDelay: 0 m_IsRenaming: 0 m_OriginalEventType: 0 @@ -1038,9 +1038,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 265 + x: 300 y: 73 - width: 431 + width: 396 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -1096,23 +1096,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 431 + width: 396 height: 897 - m_Scale: {x: 0.500558, y: 0.500558} - m_Translation: {x: 215.5, y: 448.5} + m_Scale: {x: 0.47826087, y: 0.47826087} + m_Translation: {x: 198, y: 448.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -430.51953 - y: -896 - width: 861.03906 - height: 1792 + x: -414 + y: -937.7727 + width: 828 + height: 1875.5454 m_MinimalGUI: 1 - m_defaultScale: 0.500558 - m_LastWindowPixelSize: {x: 431, y: 918} + m_defaultScale: 0.47826087 + m_LastWindowPixelSize: {x: 396, y: 918} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000100000000000000