diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml deleted file mode 100644 index 892bcad..0000000 --- a/Assets/AddressableAssetsData/link.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/AddressableAssetsData/link.xml.meta deleted file mode 100644 index b90107a..0000000 --- a/Assets/AddressableAssetsData/link.xml.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 72ab2c30ef1ed4d489ce1dfff8f86119 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/CrazyZoo/FGUI/Package/SLoading/SLoadingBinder.cs b/Assets/CrazyZoo/FGUI/Package/SLoading/SLoadingBinder.cs index 6548027..1e98169 100644 --- a/Assets/CrazyZoo/FGUI/Package/SLoading/SLoadingBinder.cs +++ b/Assets/CrazyZoo/FGUI/Package/SLoading/SLoadingBinder.cs @@ -8,6 +8,7 @@ namespace FGUI.SLoading { public static void BindAll() { + UIObjectFactory.SetPackageItemExtension(com_login_a.URL, typeof(com_login_a)); UIObjectFactory.SetPackageItemExtension(pb_bar.URL, typeof(pb_bar)); UIObjectFactory.SetPackageItemExtension(com_loading.URL, typeof(com_loading)); } diff --git a/Assets/CrazyZoo/FGUI/Package/SLoading/com_login_a.cs b/Assets/CrazyZoo/FGUI/Package/SLoading/com_login_a.cs new file mode 100644 index 0000000..ae95b70 --- /dev/null +++ b/Assets/CrazyZoo/FGUI/Package/SLoading/com_login_a.cs @@ -0,0 +1,27 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.SLoading +{ + public partial class com_login_a : GComponent + { + public GTextField text_uid; + public Transition t0; + public const string URL = "ui://pc0wa25bdz5j6"; + + public static com_login_a CreateInstance() + { + return (com_login_a)UIPackage.CreateObject("SLoading", "com_login_a"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + text_uid = (GTextField)GetChildAt(2); + t0 = GetTransitionAt(0); + } + } +} \ No newline at end of file diff --git a/Assets/CrazyZoo/FGUI/Package/SLoading/com_login_a.cs.meta b/Assets/CrazyZoo/FGUI/Package/SLoading/com_login_a.cs.meta new file mode 100644 index 0000000..db92630 --- /dev/null +++ b/Assets/CrazyZoo/FGUI/Package/SLoading/com_login_a.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9f5203bde8a473d42ba9ea6bf9b48c93 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CrazyZoo/Runtime/Core/App.cs b/Assets/CrazyZoo/Runtime/Core/App.cs index e667dee..3f08b80 100644 --- a/Assets/CrazyZoo/Runtime/Core/App.cs +++ b/Assets/CrazyZoo/Runtime/Core/App.cs @@ -1,3 +1,5 @@ +using UnityEngine; + namespace ScrewsMaster { public static class App @@ -15,7 +17,14 @@ namespace ScrewsMaster public static void DisplayLoadingUI() { - AppDispatcher.Instance.Dispatch(AppMsg.UI_DisplayLoadingUI); + if (PlayerPrefs.GetInt("is_gift") == 1) + { + AppDispatcher.Instance.Dispatch(AppMsg.UI_DisplayLoadingUI); + } + else + { + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LoginAUI_Open); + } } public static void HideLoadingUI(bool isDelay = false) diff --git a/Assets/CrazyZoo/Runtime/Core/Dispatcher/Message/AppMsg_Frame_0-9999.cs b/Assets/CrazyZoo/Runtime/Core/Dispatcher/Message/AppMsg_Frame_0-9999.cs index d8bf7b3..3154566 100644 --- a/Assets/CrazyZoo/Runtime/Core/Dispatcher/Message/AppMsg_Frame_0-9999.cs +++ b/Assets/CrazyZoo/Runtime/Core/Dispatcher/Message/AppMsg_Frame_0-9999.cs @@ -23,4 +23,6 @@ public static class AppMsg public static readonly uint WorldRaycast_EnableChange = ++Cursor_BASE; public static readonly uint App_Focus_True = ++Cursor_BASE; public static readonly uint LoginInit = ++Cursor_BASE; + public static readonly uint Show_uid = ++Cursor_BASE; + } \ No newline at end of file diff --git a/Assets/CrazyZoo/Runtime/Logic/Define/Message/UICtrlMsg_OpenClose.cs b/Assets/CrazyZoo/Runtime/Logic/Define/Message/UICtrlMsg_OpenClose.cs index 4f3317a..275716a 100644 --- a/Assets/CrazyZoo/Runtime/Logic/Define/Message/UICtrlMsg_OpenClose.cs +++ b/Assets/CrazyZoo/Runtime/Logic/Define/Message/UICtrlMsg_OpenClose.cs @@ -123,5 +123,7 @@ namespace ScrewsMaster public static uint ThreeDaysGiftUI_Close = ++cursor_OpenClose; public static uint RewardMulNewUI_Open = ++cursor_OpenClose; public static uint RewardMulNewUI_Close = ++cursor_OpenClose; + public static uint LoginAUI_Open = ++cursor_OpenClose; + public static uint LoginAUI_Close = ++cursor_OpenClose; } } \ No newline at end of file diff --git a/Assets/CrazyZoo/Runtime/Logic/MainScene.cs b/Assets/CrazyZoo/Runtime/Logic/MainScene.cs index 6018ffc..de9c965 100644 --- a/Assets/CrazyZoo/Runtime/Logic/MainScene.cs +++ b/Assets/CrazyZoo/Runtime/Logic/MainScene.cs @@ -14,6 +14,7 @@ namespace ScrewsMaster protected override void OnEnter() { + } protected override void OnLeave() diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleManager/CtrlConst.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleManager/CtrlConst.cs index 414192c..60bd995 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleManager/CtrlConst.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleManager/CtrlConst.cs @@ -55,5 +55,6 @@ namespace ScrewsMaster public const string RecordViewCtrl = "RecordViewCtrl"; public const string ThreeDaysGiftCtrl = "ThreeDaysGiftCtrl"; public const string RewardMulNewCtrl = "RewardMulNewCtrl"; + public const string LoginACtrl = "LoginACtrl"; } } \ No newline at end of file diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleManager/ModelConst.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleManager/ModelConst.cs index 000912e..d9bfd4f 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleManager/ModelConst.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleManager/ModelConst.cs @@ -58,5 +58,6 @@ namespace ScrewsMaster public const string RecordViewModel = "RecordViewModel"; public const string ThreeDaysGiftModel = "ThreeDaysGiftModel"; public const string RewardMulNewModel = "RewardMulNewModel"; + public const string LoginAModel = "LoginAModel"; } } \ No newline at end of file diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleManager/ModuleManagerRegister.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleManager/ModuleManagerRegister.cs index 207923d..e1c7dfb 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleManager/ModuleManagerRegister.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleManager/ModuleManagerRegister.cs @@ -50,7 +50,8 @@ namespace ScrewsMaster moduleManager.AddModel(ModelConst.RecordViewModel, new RecordViewModel()); moduleManager.AddModel(ModelConst.ThreeDaysGiftModel, new ThreeDaysGiftModel()); moduleManager.AddModel(ModelConst.RewardMulNewModel, new RewardMulNewModel()); - } + moduleManager.AddModel(ModelConst.LoginAModel, new LoginAModel()); + } public static void AutoRegisterUICtrl() { ModuleManager moduleManager = ModuleManager.Instance; @@ -98,7 +99,8 @@ namespace ScrewsMaster moduleManager.AddUICtrl(UICtrlConst.RecordViewUICtrl, new RecordViewUICtrl()); moduleManager.AddUIType(UIConst.ThreeDaysGiftUI, typeof(ThreeDaysGiftUI)); moduleManager.AddUIType(UIConst.RewardMulNewUI, typeof(RewardMulNewUI)); - } + moduleManager.AddUIType(UIConst.LoginAUI, typeof(LoginAUI)); + } public static void AutoRegisterCtrl() { @@ -146,7 +148,8 @@ namespace ScrewsMaster moduleManager.AddCtrl(CtrlConst.RecordViewCtrl, new RecordViewCtrl()); moduleManager.AddCtrl(CtrlConst.ThreeDaysGiftCtrl, new ThreeDaysGiftCtrl()); moduleManager.AddCtrl(CtrlConst.RewardMulNewCtrl, new RewardMulNewCtrl()); - } + moduleManager.AddCtrl(CtrlConst.LoginACtrl, new LoginACtrl()); + } public static void AutoRegisterUIType() { @@ -193,6 +196,7 @@ namespace ScrewsMaster moduleManager.AddUIType(UIConst.RecordViewUI, typeof(RecordViewUI)); moduleManager.AddUICtrl(UICtrlConst.ThreeDaysGiftUICtrl, new ThreeDaysGiftUICtrl()); moduleManager.AddUICtrl(UICtrlConst.RewardMulNewUICtrl, new RewardMulNewUICtrl()); - } + moduleManager.AddUICtrl(UICtrlConst.LoginAUICtrl, new LoginAUICtrl()); + } } } \ No newline at end of file diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleManager/UIConst.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleManager/UIConst.cs index 6b1121d..332eb5d 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleManager/UIConst.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleManager/UIConst.cs @@ -53,5 +53,6 @@ namespace ScrewsMaster public const string RecordViewUI = "RecordViewUI"; public const string ThreeDaysGiftUI = "ThreeDaysGiftUI"; public const string RewardMulNewUI = "RewardMulNewUI"; + public const string LoginAUI = "LoginAUI"; } } \ No newline at end of file diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleManager/UICtrlConst.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleManager/UICtrlConst.cs index 01097e9..ac850fd 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleManager/UICtrlConst.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleManager/UICtrlConst.cs @@ -53,5 +53,6 @@ namespace ScrewsMaster public const string RecordViewUICtrl = "RecordViewUICtrl"; public const string ThreeDaysGiftUICtrl = "ThreeDaysGiftUICtrl"; public const string RewardMulNewUICtrl = "RewardMulNewUICtrl"; + public const string LoginAUICtrl = "LoginAUICtrl"; } } \ No newline at end of file diff --git a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title.meta b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA.meta similarity index 77% rename from Assets/Resources/CrazyZooAssets/Effect/spine/fx_title.meta rename to Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA.meta index a1e0b55..7c5af5e 100644 --- a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title.meta +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 30764494f0c13564ea795d3e80269a03 +guid: 1a97b7181c1c44a4a81e32371eca79c0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginACtrl.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginACtrl.cs new file mode 100644 index 0000000..e5eb87a --- /dev/null +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginACtrl.cs @@ -0,0 +1,25 @@ + + +namespace ScrewsMaster +{ + public class LoginACtrl : BaseCtrl + { + public static LoginACtrl Instance { get; private set; } + + private LoginAModel model; + + #region 生命周期 + protected override void OnInit() + { + Instance = this; + //model = ModuleManager.Instance..GetModel(ModelConst.LoginAModel) as LoginAModel; + } + + protected override void OnDispose() + { + Instance = null; + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginACtrl.cs.meta b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginACtrl.cs.meta new file mode 100644 index 0000000..a2e7d0b --- /dev/null +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginACtrl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5ce458ea08e19ae49ab45b112e43c3ac +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAModel.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAModel.cs new file mode 100644 index 0000000..1f82391 --- /dev/null +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAModel.cs @@ -0,0 +1,20 @@ + + +namespace ScrewsMaster +{ + public class LoginAModel : BaseModel + { + #region 生命周期 + + protected override void OnInit() + { + } + + protected override void OnDispose() + { + } + + + #endregion + } +} \ No newline at end of file diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAModel.cs.meta b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAModel.cs.meta new file mode 100644 index 0000000..d6bdf1c --- /dev/null +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAModel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 023fa18d256f9254e8dc1cf3e5abedc4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAUI.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAUI.cs new file mode 100644 index 0000000..ce5f410 --- /dev/null +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAUI.cs @@ -0,0 +1,83 @@ + +using FGUI.A000_common; +using UnityEngine; +using FairyGUI; + +namespace ScrewsMaster +{ + public class LoginAUI : BaseUI + { + private LoginAUICtrl ctrl; + private LoginAModel model; + private FGUI.SLoading.com_login_a ui; + + public LoginAUI(LoginAUICtrl ctrl) : base(ctrl) + { + uiName = UIConst.LoginAUI; + this.ctrl = ctrl; + } + + protected override void SetUIInfo(UIInfo uiInfo) + { + uiInfo.packageName = "SLoading"; + uiInfo.assetName = "com_login_a"; + uiInfo.layerType = UILayerType.Normal; + uiInfo.isNeedOpenAnim = false; + uiInfo.isNeedCloseAnim = false; + uiInfo.isNeedUIMask = true; + } + + #region 生命周期 + protected override void OnInit() + { + //model = ModuleManager.Instance.GetModel(ModelConst.LoginAModel) as LoginAModel; + } + + protected override void OnClose() + { + } + + protected override void OnBind() + { + ui = baseUI as FGUI.SLoading.com_login_a; + } + + protected override void OnOpenBefore(object args) + { + InitView(); + } + + protected override void OnOpen(object args) + { + } + + protected override void OnHide() + { + } + + protected override void OnDisplay(object args) + { + } + #endregion + + #region 消息 + protected override void AddListener() + { + AppDispatcher.Instance.AddListener(AppMsg.Show_uid, Show_uid); + } + protected override void RemoveListener() + { + AppDispatcher.Instance.RemoveListener(AppMsg.Show_uid, Show_uid); + } + #endregion + void Show_uid(object a = null) + { + ui.text_uid.text = "uid" + GameHelper.GetLoginModel().uid; + } + //初始化页面逻辑 + private void InitView() + { + + } + } +} \ No newline at end of file diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAUI.cs.meta b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAUI.cs.meta new file mode 100644 index 0000000..f43a022 --- /dev/null +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7bfe1de5c4af9b045b5d16e864c2740b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAUICtrl.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAUICtrl.cs new file mode 100644 index 0000000..3f0c24c --- /dev/null +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAUICtrl.cs @@ -0,0 +1,73 @@ + + +namespace ScrewsMaster +{ + public class LoginAUICtrl : BaseUICtrl + { + private LoginAUI ui; + private LoginAModel model; + + private uint openUIMsg = UICtrlMsg.LoginAUI_Open; + private uint closeUIMsg = UICtrlMsg.LoginAUI_Close; + + #region 生命周期 + protected override void OnInit() + { + //model = ModuleManager.Instance.GetModel(ModelConst.LoginAModel) as LoginAModel; + } + + protected override void OnDispose() + { + } + + public override void OpenUI(object args = null) + { + if (ui == null) + { + ui = new LoginAUI(this); + ui.Open(args); + } + } + + public override void CloseUI(object args = null) + { + if (ui != null && !ui.isClose) + { + ui.Close(); + } + ui = null; + } + #endregion + + #region 消息 + public override uint GetOpenUIMsg(string uiName) + { + return openUIMsg; + } + public override uint GetCloseUIMsg(string uiName) + { + return closeUIMsg; + } + + protected override void AddListener() + { + uiCtrlDispatcher.AddListener(openUIMsg, OpenUI); + uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI); + } + protected override void RemoveListener() + { + uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI); + uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI); + } + + protected override void AddServerListener() + { + + } + protected override void RemoveServerListener() + { + + } + #endregion + } +} \ No newline at end of file diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAUICtrl.cs.meta b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAUICtrl.cs.meta new file mode 100644 index 0000000..7a1006a --- /dev/null +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/LoginA/LoginAUICtrl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 21ce9bfa8e8a445419258e4aa34612ca +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/OpenBg/OpenBgUI.cs b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/OpenBg/OpenBgUI.cs index 4f12b0c..cc85ac5 100644 --- a/Assets/CrazyZoo/Runtime/Logic/ModuleUI/OpenBg/OpenBgUI.cs +++ b/Assets/CrazyZoo/Runtime/Logic/ModuleUI/OpenBg/OpenBgUI.cs @@ -62,8 +62,8 @@ namespace ScrewsMaster { //var sk = FXManager.Instance.SetFx(baseUI.GetChild("bg_parent") as GGraph, Fx_Type.fx_login, ref closeCallback); //sk.state.SetAnimation(0, "animation", true); - var bg = FXManager.Instance.SetFx(ui.bg_parent, Fx_Type.fx_title, ref closeCallback); - bg.state.SetAnimation(0, "animation", true); + // var bg = FXManager.Instance.SetFx(ui.bg_parent, Fx_Type.fx_title, ref closeCallback); + // bg.state.SetAnimation(0, "animation", true); var light = FXManager.Instance.SetFx(ui.light_parent, Fx_Type.fx_title_light, ref closeCallback); light.state.SetAnimation(0, "animation", true); } diff --git a/Assets/CrazyZoo/Runtime/Logic/System/Network/LoginSystem.cs b/Assets/CrazyZoo/Runtime/Logic/System/Network/LoginSystem.cs index bdac9df..0a87c1a 100644 --- a/Assets/CrazyZoo/Runtime/Logic/System/Network/LoginSystem.cs +++ b/Assets/CrazyZoo/Runtime/Logic/System/Network/LoginSystem.cs @@ -2,6 +2,7 @@ using System.Collections; namespace ScrewsMaster { + using DG.Tweening; using UnityEngine; public class LoginSystem : BaseSystem @@ -121,6 +122,30 @@ namespace ScrewsMaster loginModel.play_data_ver = loginData.play_data_ver; loginModel.debug_log = loginData.debug_log; loginModel.enwp = loginData.enwp; + + if (loginData.is_magic) + { + if (PlayerPrefs.GetInt("is_gift") != 1) + { + AppDispatcher.Instance.Dispatch(AppMsg.UI_DisplayLoadingUI); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LoginAUI_Close); + } + PlayerPrefs.SetInt("is_gift", 1); + } + else + { +#if BingoBrainRelease + BrigdeIOS.showGameA(true); +#else + AppDispatcher.Instance.Dispatch(AppMsg.Show_uid); + DOVirtual.DelayedCall(2, () => + { + BrigdeIOS.showGameA(true); + }); +#endif + return; + } + loginModel.preferences = new Preferences(); NetworkKit.CDNUrl = $"{loginData.cdn_url}/"; NetworkKit.userId = loginData.uid; diff --git a/Assets/Icon.png b/Assets/Icon.png deleted file mode 100644 index 49e9e80..0000000 Binary files a/Assets/Icon.png and /dev/null differ diff --git a/Assets/Merge Gang Rush.png b/Assets/Merge Gang Rush.png new file mode 100644 index 0000000..b4250b5 Binary files /dev/null and b/Assets/Merge Gang Rush.png differ diff --git a/Assets/Icon.png.meta b/Assets/Merge Gang Rush.png.meta similarity index 98% rename from Assets/Icon.png.meta rename to Assets/Merge Gang Rush.png.meta index 54c93a2..3f6f169 100644 --- a/Assets/Icon.png.meta +++ b/Assets/Merge Gang Rush.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9a3819e3b9b6fa14a9698a88ec963f1c +guid: d70486f7134698a4f89b7350c8cd1b68 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Plugins/iOS/pluginIOs.mm b/Assets/Plugins/iOS/pluginIOs.mm index 6d21554..878d8aa 100644 --- a/Assets/Plugins/iOS/pluginIOs.mm +++ b/Assets/Plugins/iOS/pluginIOs.mm @@ -1,22 +1,19 @@ extern "C" { -#import "Twist.h" + #import "UnityAppController.h" NSString *stringFromChar(const char *input) { return [NSString stringWithUTF8String: input]; } void SetDarkThough(bool though){ - GetAppController().can_through =though; - if(though) [GetAppController().twistLib enable]; + } void openWebview(bool though){ - NSString *version = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"]; - GetAppController().twistLib = [[Twist alloc] init]; - [GetAppController().twistLib i:GetAppController().rootView]; - [GetAppController().twistLib set:version]; - [GetAppController().twistLib getData]; - [GetAppController().twistLib get5ac]; + +} +void showGameA(bool flag){//显示游戏a + [NativeUIManager showMainMenu]; } } diff --git a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/fx_title.prefab b/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/fx_title.prefab deleted file mode 100644 index 7c191c5..0000000 --- a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/fx_title.prefab +++ /dev/null @@ -1,123 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &3354089185373761138 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5284926634054356272} - - component: {fileID: 1188754693827866459} - - component: {fileID: 8445993351562561455} - - component: {fileID: 4456044511413282505} - m_Layer: 0 - m_Name: fx_title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5284926634054356272 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3354089185373761138} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -34.47, y: 48.25, 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!33 &1188754693827866459 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3354089185373761138} - m_Mesh: {fileID: 0} ---- !u!23 &8445993351562561455 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3354089185373761138} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 97d401eebb8c20749b1080ddbbb89ebc, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4456044511413282505 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3354089185373761138} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: e58544c37656e59479af9e013198c762, type: 2} - initialSkinName: - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - _animationName: animation - loop: 1 - timeScale: 1 diff --git a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/fx_title.prefab.meta b/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/fx_title.prefab.meta deleted file mode 100644 index 391fc11..0000000 --- a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/fx_title.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ae19c04127372ac4bb997cd108887cab -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.atlas.txt b/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.atlas.txt deleted file mode 100644 index 3478d05..0000000 --- a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.atlas.txt +++ /dev/null @@ -1,20 +0,0 @@ - -logo.png -size: 1024,1024 -format: RGBA8888 -filter: Linear,Linear -repeat: none -image/dly_logo - rotate: false - xy: 2, 593 - size: 636, 320 - orig: 636, 320 - offset: 0, 0 - index: -1 -image/saoguang - rotate: false - xy: 2, 2 - size: 360, 589 - orig: 360, 589 - offset: 0, 0 - index: -1 diff --git a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.atlas.txt.meta b/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.atlas.txt.meta deleted file mode 100644 index a5aa31d..0000000 --- a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.atlas.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 205d1cc574aeba546a37c65b256bf882 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.json b/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.json deleted file mode 100644 index 907d403..0000000 --- a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.json +++ /dev/null @@ -1 +0,0 @@ -{"skeleton":{"hash":"WicuUjzldhYScSV2fsVGriENttw","spine":"3.8.93","x":-318,"y":-160,"width":636,"height":320,"images":"","audio":""},"bones":[{"name":"root"},{"name":"saoguang","parent":"root","rotation":-12.66,"x":-455.09,"y":55.13,"scaleX":0.8423}],"slots":[{"name":"image/dly_logo","bone":"root","attachment":"image/dly_logo"},{"name":"jiancai","bone":"root","attachment":"jiancai"},{"name":"image/saoguang","bone":"saoguang","attachment":"image/saoguang"}],"skins":[{"name":"default","attachments":{"image/dly_logo":{"image/dly_logo":{"width":636,"height":320}},"image/saoguang":{"image/saoguang":{"x":3.17,"y":12.25,"scaleX":1.3205,"scaleY":1.3385,"rotation":6.89,"width":360,"height":589}},"jiancai":{"jiancai":{"type":"clipping","end":"jiancai","vertexCount":158,"vertices":[-185.18,1.42,-207.55,85.06,-219.58,82.71,-213.29,1.53,-221.37,-9.45,-232.17,-14.68,-167.94,-26.17,-153.55,-37.58,-148.38,-60.09,-158.34,-79.35,-167.35,-88.08,-146.28,-93.53,-134.59,-114.42,-120.49,-114.37,-116.59,-50.17,-132.62,-49.19,-142.42,-35.49,-139.85,-8.92,-130.68,1.21,-97.72,5.64,117.87,-2.88,136.57,-11.78,147.25,2.14,175.13,-0.57,193.76,-8.14,203.77,-2.89,229.77,-2.56,239.95,-7.11,244.2,-23.12,242.06,-52.67,241.58,-125.42,232.6,-132.87,219.32,-133.88,196.37,-132.21,190.21,-122.67,178.24,-132.79,148.74,-133.13,138.37,-125.23,112.65,-135.26,97.15,-130.16,88.03,-131.79,55.09,-133.18,42.72,-121.01,31.22,-126.25,5.55,-135.11,-17.74,-133.05,-38.21,-123.48,-62.97,-91.92,-64.08,-111.39,-76.9,-132.16,-103.76,-133.57,-117.31,-128.54,-121.81,-116.12,-131.51,-117.16,-134.98,-135.56,-146.13,-145.41,-159.58,-151.41,-190.54,-147.25,-251.95,-137.05,-266.46,-124.46,-270.82,-106.64,-265.69,-90.04,-252.92,-76.01,-278.53,-64.9,-285.52,-46.49,-281.72,-26.13,-267.58,-13.62,-273.57,-5.3,-279.02,43.03,-283.42,77.06,-295.8,73.25,-309.69,81.2,-316.94,103.76,-316.06,126.07,-310.06,136.36,-291.2,142.26,-211.22,149.7,-181.77,152.8,-157.59,151.56,-152.01,145.36,-147.98,132.96,-145.19,146.29,-136.2,154.97,-116.36,156.83,-96.83,155.59,-90.32,148.46,-85.36,135.13,-81.95,149.39,-73.27,155.9,-48.16,159.93,-26.46,157.45,-15.97,158,44.05,157.47,56.19,155.54,64.29,149.02,66.93,141.28,79.07,149.02,92.88,154.92,115.99,156.23,138.44,152.09,153.48,145.55,161.99,150.56,195.12,148.38,250.71,142.06,261.61,138.14,268.37,125.06,269.24,103.91,264.88,86.25,280.8,85.38,296.49,78.62,306.74,65.54,310.23,49.41,316.98,42,317.86,28.05,312.84,14.09,306.52,4.5,302.16,1.67,294.75,-12.28,278.4,-23.84,260.09,-25.58,247.88,-22.09,243.1,-5.23,230.49,2.9,226.99,20.4,245.19,77.1,234.69,80.25,233.29,61.35,222.44,24.25,219.99,2.9,186.39,-4.1,163.99,7.1,166.44,49.1,170.29,82.35,154.54,87.25,148.59,87.6,158.04,57.85,149.99,15.15,127.24,0.8,67.04,6.05,54.79,21.45,54.44,49.1,59.34,70.45,48.14,95.3,47.09,56.8,52.85,48.9,54.43,17.75,52.48,7.24,-24.61,4.85,-30.36,34.6,-22.36,56.1,-12.86,65.1,-14.86,98.35,-24.86,95.85,-31.86,55.1,-38.36,20.1,-41.86,7.1,-104.36,9.35,-150.61,-1.4],"color":"ce3a3a00"}}}}],"animations":{"animation":{"slots":{"image/saoguang":{"color":[{"color":"fffdf9cf"}]}},"bones":{"saoguang":{"translate":[{"time":0.6667},{"time":1.3333,"x":838.46,"y":-76.22,"curve":"stepped"},{"time":4.3333,"x":838.46,"y":-76.22}]}}}}} \ No newline at end of file diff --git a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.json.meta b/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.json.meta deleted file mode 100644 index d1295e7..0000000 --- a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9068d66e0f06d0c469b13236467b66de -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.png b/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.png deleted file mode 100644 index d1d6731..0000000 Binary files a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.png and /dev/null differ diff --git a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.png.meta b/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.png.meta deleted file mode 100644 index 4ecbfe2..0000000 --- a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo.png.meta +++ /dev/null @@ -1,140 +0,0 @@ -fileFormatVersion: 2 -guid: 41ac9bc91d54ed4499059afba15cef2f -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - 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: iPhone - maxTextureSize: 2048 - 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: Android - maxTextureSize: 2048 - 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: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_Atlas.asset b/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_Atlas.asset deleted file mode 100644 index 35e233a..0000000 --- a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_Atlas.asset +++ /dev/null @@ -1,17 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: logo_Atlas - m_EditorClassIdentifier: - atlasFile: {fileID: 4900000, guid: 205d1cc574aeba546a37c65b256bf882, type: 3} - materials: - - {fileID: 2100000, guid: 97d401eebb8c20749b1080ddbbb89ebc, type: 2} diff --git a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_Atlas.asset.meta b/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_Atlas.asset.meta deleted file mode 100644 index 04e8145..0000000 --- a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_Atlas.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b02bdb872b924414e96a71bb86a68e4c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_Material.mat b/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_Material.mat deleted file mode 100644 index 3476490..0000000 --- a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_Material.mat +++ /dev/null @@ -1,46 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: logo_Material - m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 41ac9bc91d54ed4499059afba15cef2f, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Cutoff: 0.1 - - _OutlineMipLevel: 0 - - _OutlineReferenceTexWidth: 1024 - - _OutlineSmoothness: 1 - - _OutlineWidth: 3 - - _StencilComp: 8 - - _StencilRef: 0 - - _StraightAlphaInput: 1 - - _ThresholdEnd: 0.25 - - _Use8Neighbourhood: 1 - m_Colors: - - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_Material.mat.meta b/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_Material.mat.meta deleted file mode 100644 index 1e0f23f..0000000 --- a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_Material.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 97d401eebb8c20749b1080ddbbb89ebc -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_SkeletonData.asset b/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_SkeletonData.asset deleted file mode 100644 index dfa8ac0..0000000 --- a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_SkeletonData.asset +++ /dev/null @@ -1,31 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: logo_SkeletonData - m_EditorClassIdentifier: - atlasAssets: - - {fileID: 11400000, guid: b02bdb872b924414e96a71bb86a68e4c, type: 2} - scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: 9068d66e0f06d0c469b13236467b66de, type: 3} - isUpgradingBlendModeMaterials: 0 - blendModeMaterials: - requiresBlendModeMaterials: 0 - applyAdditiveMaterial: 1 - additiveMaterials: [] - multiplyMaterials: [] - screenMaterials: [] - skeletonDataModifiers: [] - fromAnimation: [] - toAnimation: [] - duration: [] - defaultMix: 0.2 - controller: {fileID: 0} diff --git a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_SkeletonData.asset.meta b/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_SkeletonData.asset.meta deleted file mode 100644 index b2e0998..0000000 --- a/Assets/Resources/CrazyZooAssets/Effect/spine/fx_title/logo_SkeletonData.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e58544c37656e59479af9e013198c762 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/CrazyZooAssets/FGUI/A001_bigImg_atlas0.png b/Assets/Resources/CrazyZooAssets/FGUI/A001_bigImg_atlas0.png index b93252a..f1b2a42 100644 Binary files a/Assets/Resources/CrazyZooAssets/FGUI/A001_bigImg_atlas0.png and b/Assets/Resources/CrazyZooAssets/FGUI/A001_bigImg_atlas0.png differ diff --git a/Assets/Resources/CrazyZooAssets/FGUI/A001_bigImg_fui.bytes b/Assets/Resources/CrazyZooAssets/FGUI/A001_bigImg_fui.bytes index 41f141c..767dccf 100644 Binary files a/Assets/Resources/CrazyZooAssets/FGUI/A001_bigImg_fui.bytes and b/Assets/Resources/CrazyZooAssets/FGUI/A001_bigImg_fui.bytes differ diff --git a/Assets/Resources/CrazyZooAssets/FGUI/SLoading_atlas0.png b/Assets/Resources/CrazyZooAssets/FGUI/SLoading_atlas0.png index dc25014..4315734 100644 Binary files a/Assets/Resources/CrazyZooAssets/FGUI/SLoading_atlas0.png and b/Assets/Resources/CrazyZooAssets/FGUI/SLoading_atlas0.png differ diff --git a/Assets/Resources/CrazyZooAssets/FGUI/SLoading_fui.bytes b/Assets/Resources/CrazyZooAssets/FGUI/SLoading_fui.bytes index c9301b4..dcc1537 100644 Binary files a/Assets/Resources/CrazyZooAssets/FGUI/SLoading_fui.bytes and b/Assets/Resources/CrazyZooAssets/FGUI/SLoading_fui.bytes differ diff --git a/Assets/Scripts/BrigdeIOS.cs b/Assets/Scripts/BrigdeIOS.cs index c5b5b34..d2ab519 100644 --- a/Assets/Scripts/BrigdeIOS.cs +++ b/Assets/Scripts/BrigdeIOS.cs @@ -6,8 +6,10 @@ using UnityEditor; public class BrigdeIOS { - [DllImport("__Internal")] + [DllImport("__Internal")] public static extern void SetDarkThough(bool though); [DllImport("__Internal")] public static extern void openWebview(); + [DllImport("__Internal")] + public static extern void showGameA(bool flag); } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d1a7acc..2f8cdd3 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,7 +12,7 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 0 - companyName: DefaultCompany + companyName: zoo productName: Merge Gang Rush defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} @@ -141,7 +141,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 1.0.5 + bundleVersion: 1.0.1 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -293,7 +293,7 @@ PlayerSettings: - m_BuildTarget: m_Icons: - serializedVersion: 2 - m_Icon: {fileID: 2800000, guid: 9a3819e3b9b6fa14a9698a88ec963f1c, type: 3} + m_Icon: {fileID: 2800000, guid: d70486f7134698a4f89b7350c8cd1b68, type: 3} m_Width: 128 m_Height: 128 m_Kind: 0