From 65a797d3842cb8afe9b2fd98785420f3cd0ef5d6 Mon Sep 17 00:00:00 2001 From: barry Date: Wed, 24 Jun 2026 11:22:55 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A1=E3=80=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=85=91=E6=8D=A2code=E7=95=8C=E9=9D=A2=E3=80=822=E3=80=81?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8D=95=E5=8F=8C=E6=8C=87=E7=9A=84=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E5=92=8C=E5=BC=80=E5=90=AF=EF=BC=88=E6=89=93=E5=BC=80?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=95=8C=E9=9D=A2=E6=97=B6=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/AddressableAssetsData/link.xml | 14 ---- Assets/AddressableAssetsData/link.xml.meta | 7 -- .../Define/Message/GameMsg_Logic.cs | 1 + .../Define/Message/UICtrlMsg_OpenClose.cs | 2 + .../FGUI/package/tixian/com_redeem_code.cs | 39 +++++++++ .../package/tixian/com_redeem_code.cs.meta | 11 +++ .../FGUI/package/tixian/tixianBinder.cs | 1 + Assets/ChillConnect/Helper/GameHelper.cs | 3 +- Assets/ChillConnect/Manager/HallManager.cs | 3 +- .../ChillConnectAssets/FGUI/tixian_fui.bytes | Bin 55744 -> 58656 bytes Assets/Resources/GameConfig.asset | 2 +- Assets/Scripts/ModuleManager/CtrlConst.cs | 1 + Assets/Scripts/ModuleManager/ModelConst.cs | 1 + .../ModuleManager/ModuleManagerRegister.cs | 4 + Assets/Scripts/ModuleManager/UIConst.cs | 1 + Assets/Scripts/ModuleManager/UICtrlConst.cs | 1 + .../Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs | 53 +++++++++++++ .../ModuleUI/ArrowTheme/ArrowThemeUI.cs | 3 + .../Scripts/ModuleUI/ArrowTips/ArrowTipsUI.cs | 4 + Assets/Scripts/ModuleUI/H5/H5UI.cs | 3 + .../ModuleUI/MakeupConfirm/MakeupConfirmUI.cs | 3 +- .../ModuleUI/PersonView/PersonViewUI.cs | 3 + .../ModuleUI/PettyAward/PettyAwardUI.cs | 3 + Assets/Scripts/ModuleUI/RedeemCode.meta | 3 + .../ModuleUI/RedeemCode/RedeemCodeCtrl.cs | 19 +++++ .../RedeemCode/RedeemCodeCtrl.cs.meta | 3 + .../ModuleUI/RedeemCode/RedeemCodeModel.cs | 15 ++++ .../RedeemCode/RedeemCodeModel.cs.meta | 3 + .../ModuleUI/RedeemCode/RedeemCodeUI.cs | 75 ++++++++++++++++++ .../ModuleUI/RedeemCode/RedeemCodeUI.cs.meta | 3 + .../ModuleUI/RedeemCode/RedeemCodeUICtrl.cs | 64 +++++++++++++++ .../RedeemCode/RedeemCodeUICtrl.cs.meta | 3 + .../ModuleUI/SaveingPot/SaveingPotUI.cs | 4 + .../ModuleUI/SignInView/SignInViewUI.cs | 5 ++ .../ModuleUI/StatementView/StatementViewUI.cs | 3 + ProjectSettings/ProjectSettings.asset | 6 +- 36 files changed, 341 insertions(+), 28 deletions(-) delete mode 100644 Assets/AddressableAssetsData/link.xml delete mode 100644 Assets/AddressableAssetsData/link.xml.meta create mode 100644 Assets/ChillConnect/FGUI/package/tixian/com_redeem_code.cs create mode 100644 Assets/ChillConnect/FGUI/package/tixian/com_redeem_code.cs.meta create mode 100644 Assets/Scripts/ModuleUI/RedeemCode.meta create mode 100644 Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeCtrl.cs create mode 100644 Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeCtrl.cs.meta create mode 100644 Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeModel.cs create mode 100644 Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeModel.cs.meta create mode 100644 Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUI.cs create mode 100644 Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUI.cs.meta create mode 100644 Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUICtrl.cs create mode 100644 Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUICtrl.cs.meta diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml deleted file mode 100644 index 613bf01..0000000 --- a/Assets/AddressableAssetsData/link.xml +++ /dev/null @@ -1,14 +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 34408f2..0000000 --- a/Assets/AddressableAssetsData/link.xml.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e2a270a37f1f2df48a410cf714642d42 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ChillConnect/Define/Message/GameMsg_Logic.cs b/Assets/ChillConnect/Define/Message/GameMsg_Logic.cs index 54b0fa4..cfde4e7 100644 --- a/Assets/ChillConnect/Define/Message/GameMsg_Logic.cs +++ b/Assets/ChillConnect/Define/Message/GameMsg_Logic.cs @@ -62,5 +62,6 @@ namespace ChillConnect public static uint ThemeChange = ++Cursor_BASE; public static uint UpdateSpeed = ++Cursor_BASE; public static uint UseProps = ++Cursor_BASE; + public static uint StopArrowTouch = ++Cursor_BASE; } } diff --git a/Assets/ChillConnect/Define/Message/UICtrlMsg_OpenClose.cs b/Assets/ChillConnect/Define/Message/UICtrlMsg_OpenClose.cs index 76c48f3..e25ee7b 100644 --- a/Assets/ChillConnect/Define/Message/UICtrlMsg_OpenClose.cs +++ b/Assets/ChillConnect/Define/Message/UICtrlMsg_OpenClose.cs @@ -139,5 +139,7 @@ namespace ChillConnect public static uint GameAgainUI_Close = ++cursor_OpenClose; public static uint ArrowThemeUI_Open = ++cursor_OpenClose; public static uint ArrowThemeUI_Close = ++cursor_OpenClose; + public static uint RedeemCodeUI_Open = ++cursor_OpenClose; + public static uint RedeemCodeUI_Close = ++cursor_OpenClose; } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/tixian/com_redeem_code.cs b/Assets/ChillConnect/FGUI/package/tixian/com_redeem_code.cs new file mode 100644 index 0000000..44bf598 --- /dev/null +++ b/Assets/ChillConnect/FGUI/package/tixian/com_redeem_code.cs @@ -0,0 +1,39 @@ +/** This is an automatically generated class by FairyGUI. Please do not modify it. **/ + +using FairyGUI; +using FairyGUI.Utils; + +namespace FGUI.tixian +{ + public partial class com_redeem_code : GComponent + { + public GTextField text_title; + public GButton btn_close; + public GTextField lab_mn2; + public GTextField lab_ticket; + public GTextField lab_code; + public btn_code btn_copy; + public btn_code btn_contact_us; + public GButton btn_back; + public const string URL = "ui://md8tkwlzrftfel"; + + public static com_redeem_code CreateInstance() + { + return (com_redeem_code)UIPackage.CreateObject("tixian", "com_redeem_code"); + } + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + text_title = (GTextField)GetChildAt(1); + btn_close = (GButton)GetChildAt(2); + lab_mn2 = (GTextField)GetChildAt(6); + lab_ticket = (GTextField)GetChildAt(14); + lab_code = (GTextField)GetChildAt(16); + btn_copy = (btn_code)GetChildAt(17); + btn_contact_us = (btn_code)GetChildAt(18); + btn_back = (GButton)GetChildAt(22); + } + } +} \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/tixian/com_redeem_code.cs.meta b/Assets/ChillConnect/FGUI/package/tixian/com_redeem_code.cs.meta new file mode 100644 index 0000000..0d82d8f --- /dev/null +++ b/Assets/ChillConnect/FGUI/package/tixian/com_redeem_code.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 413711e293fa68749b198e91ac5bb9b7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ChillConnect/FGUI/package/tixian/tixianBinder.cs b/Assets/ChillConnect/FGUI/package/tixian/tixianBinder.cs index 69f6f19..eb4e167 100644 --- a/Assets/ChillConnect/FGUI/package/tixian/tixianBinder.cs +++ b/Assets/ChillConnect/FGUI/package/tixian/tixianBinder.cs @@ -25,6 +25,7 @@ namespace FGUI.tixian UIObjectFactory.SetPackageItemExtension(com_cord.URL, typeof(com_cord)); UIObjectFactory.SetPackageItemExtension(com_rank.URL, typeof(com_rank)); UIObjectFactory.SetPackageItemExtension(com_newRecord.URL, typeof(com_newRecord)); + UIObjectFactory.SetPackageItemExtension(com_redeem_code.URL, typeof(com_redeem_code)); UIObjectFactory.SetPackageItemExtension(com_ticket_item.URL, typeof(com_ticket_item)); UIObjectFactory.SetPackageItemExtension(btn_kicket.URL, typeof(btn_kicket)); UIObjectFactory.SetPackageItemExtension(btn_code.URL, typeof(btn_code)); diff --git a/Assets/ChillConnect/Helper/GameHelper.cs b/Assets/ChillConnect/Helper/GameHelper.cs index 586bdce..fc8f7b9 100644 --- a/Assets/ChillConnect/Helper/GameHelper.cs +++ b/Assets/ChillConnect/Helper/GameHelper.cs @@ -459,7 +459,8 @@ namespace ChillConnect //is debug test-------- - // return true;//zhushi + return true;//zhushi + // return false;//zhushi // return false;//zhushi return GetLoginModel().IsMagic; } diff --git a/Assets/ChillConnect/Manager/HallManager.cs b/Assets/ChillConnect/Manager/HallManager.cs index f66e320..6f754db 100644 --- a/Assets/ChillConnect/Manager/HallManager.cs +++ b/Assets/ChillConnect/Manager/HallManager.cs @@ -157,7 +157,8 @@ namespace ChillConnect private void EnterGame(object obj) { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MainUI_Close); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RainPlayUI_Open); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ArrowGameUI_Open); + // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RainPlayUI_Open); AudioManager.Instance.StopBGM(); AudioManager.Instance.PlayBGM(AudioConst.GameBg); diff --git a/Assets/Resources/ChillConnectAssets/FGUI/tixian_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/tixian_fui.bytes index 8ae1b24d1d9ca0934d4ddbabdb1a57cc04bd54f6..832d06965a151763eab7263d3d789dd143cd56d1 100644 GIT binary patch delta 5752 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 diff --git a/Assets/Resources/GameConfig.asset b/Assets/Resources/GameConfig.asset index 7a03126..f862632 100644 --- a/Assets/Resources/GameConfig.asset +++ b/Assets/Resources/GameConfig.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c836612725633cc4093d7ac06e7d9ef1, type: 3} m_Name: GameConfig m_EditorClassIdentifier: - packageName: com.matchgame.captaindicedubloons + packageName: com.candydoggame.arrowgamebeattap hardwareAcceleration: 1 diff --git a/Assets/Scripts/ModuleManager/CtrlConst.cs b/Assets/Scripts/ModuleManager/CtrlConst.cs index a258bb1..fb43288 100644 --- a/Assets/Scripts/ModuleManager/CtrlConst.cs +++ b/Assets/Scripts/ModuleManager/CtrlConst.cs @@ -59,6 +59,7 @@ namespace ChillConnect public const string GameAgainCtrl = "GameAgainCtrl"; public const string ArrowThemeCtrl = "ArrowThemeCtrl"; public const string ArrowTipsCtrl = "ArrowTipsCtrl"; + public const string RedeemCodeCtrl = "RedeemCodeCtrl"; } } \ No newline at end of file diff --git a/Assets/Scripts/ModuleManager/ModelConst.cs b/Assets/Scripts/ModuleManager/ModelConst.cs index 850a9e7..39ab467 100644 --- a/Assets/Scripts/ModuleManager/ModelConst.cs +++ b/Assets/Scripts/ModuleManager/ModelConst.cs @@ -59,6 +59,7 @@ namespace ChillConnect public const string GameAgainModel = "GameAgainModel"; public const string ArrowThemeModel = "ArrowThemeModel"; public const string ArrowTipsModel = "ArrowTipsModel"; + public const string RedeemCodeModel = "RedeemCodeModel"; } } \ No newline at end of file diff --git a/Assets/Scripts/ModuleManager/ModuleManagerRegister.cs b/Assets/Scripts/ModuleManager/ModuleManagerRegister.cs index 9049f8f..8990271 100644 --- a/Assets/Scripts/ModuleManager/ModuleManagerRegister.cs +++ b/Assets/Scripts/ModuleManager/ModuleManagerRegister.cs @@ -62,6 +62,7 @@ namespace ChillConnect moduleManager.AddModel(ModelConst.GameAgainModel, new GameAgainModel()); moduleManager.AddModel(ModelConst.ArrowThemeModel, new ArrowThemeModel()); moduleManager.AddModel(ModelConst.ArrowTipsModel, new ArrowTipsModel()); + moduleManager.AddModel(ModelConst.RedeemCodeModel, new RedeemCodeModel()); } @@ -122,6 +123,7 @@ namespace ChillConnect moduleManager.AddUICtrl(UICtrlConst.GameAgainUICtrl, new GameAgainUICtrl()); moduleManager.AddUICtrl(UICtrlConst.ArrowThemeUICtrl, new ArrowThemeUICtrl()); moduleManager.AddUICtrl(UICtrlConst.ArrowTipsUICtrl, new ArrowTipsUICtrl()); + moduleManager.AddUICtrl(UICtrlConst.RedeemCodeUICtrl, new RedeemCodeUICtrl()); @@ -185,6 +187,7 @@ namespace ChillConnect moduleManager.AddCtrl(CtrlConst.GameAgainCtrl, new GameAgainCtrl()); moduleManager.AddCtrl(CtrlConst.ArrowThemeCtrl, new ArrowThemeCtrl()); moduleManager.AddCtrl(CtrlConst.ArrowTipsCtrl, new ArrowTipsCtrl()); + moduleManager.AddCtrl(CtrlConst.RedeemCodeCtrl, new RedeemCodeCtrl()); } @@ -246,6 +249,7 @@ namespace ChillConnect moduleManager.AddUIType(UIConst.GameAgainUI, typeof(GameAgainUI)); moduleManager.AddUIType(UIConst.ArrowThemeUI, typeof(ArrowThemeUI)); moduleManager.AddUIType(UIConst.ArrowTipsUI, typeof(ArrowTipsUI)); + moduleManager.AddUIType(UIConst.RedeemCodeUI, typeof(RedeemCodeUI)); } } diff --git a/Assets/Scripts/ModuleManager/UIConst.cs b/Assets/Scripts/ModuleManager/UIConst.cs index 9b2d7d1..f63f125 100644 --- a/Assets/Scripts/ModuleManager/UIConst.cs +++ b/Assets/Scripts/ModuleManager/UIConst.cs @@ -58,6 +58,7 @@ namespace ChillConnect public const string GameAgainUI = "GameAgainUI"; public const string ArrowThemeUI = "ArrowThemeUI"; public const string ArrowTipsUI = "ArrowTipsUI"; + public const string RedeemCodeUI = "RedeemCodeUI"; } } \ No newline at end of file diff --git a/Assets/Scripts/ModuleManager/UICtrlConst.cs b/Assets/Scripts/ModuleManager/UICtrlConst.cs index efb0e1f..c873373 100644 --- a/Assets/Scripts/ModuleManager/UICtrlConst.cs +++ b/Assets/Scripts/ModuleManager/UICtrlConst.cs @@ -59,6 +59,7 @@ namespace ChillConnect public const string GameAgainUICtrl = "GameAgainUICtrl"; public const string ArrowThemeUICtrl = "ArrowThemeUICtrl"; public const string ArrowTipsUICtrl = "ArrowTipsUICtrl"; + public const string RedeemCodeUICtrl = "RedeemCodeUICtrl"; } } \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs b/Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs index 6ace554..71bdb14 100644 --- a/Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs +++ b/Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs @@ -172,8 +172,59 @@ namespace ChillConnect return new Vector2(x, y); } + #region 全局计数式开关 + // 全局开关(true： 恢复输入 false：禁用输入) + private void OpenOrStopGameInput(object obj = null) + { + if (obj != null && !(bool)obj) + { + // 禁用输入 + DisableGameInput(); + } + else + { + // 恢复输入 + EnableGameInput(); + } + } + + private int _inputDisableCount = 0; + // 禁用输入 + private void DisableGameInput() + { + _inputDisableCount++; + // 只有第一次禁用时执行清理 + if (_inputDisableCount == 1) + { + if (_viewContainer != null) + _viewContainer.touchable = false; + + _isDraging = false; + _isTwoFingerTouch = false; + _lastTouchPos = Vector2.zero; + } + } + + // 恢复输入 + private void EnableGameInput(object obj = null) + { + _inputDisableCount = Mathf.Max(0, _inputDisableCount - 1); + // 计数归0时才真正恢复 + if (_inputDisableCount == 0) + { + if (_viewContainer != null) + _viewContainer.touchable = true; + } + } + + #endregion + public override void OnUpdate() { + // Update 里判断改为： + if (_inputDisableCount > 0) + return; + // 初始化未完成，直接跳过拖拽 if (!_initComplete) return; @@ -333,6 +384,7 @@ namespace ChillConnect GameDispatcher.Instance.AddListener(GameMsg.ThemeChange, SetModel); GameDispatcher.Instance.AddListener(GameMsg.UpdateSpeed, SetSpeed); GameDispatcher.Instance.AddListener(GameMsg.UseProps, SetUserPorp); + GameDispatcher.Instance.AddListener(GameMsg.StopArrowTouch,OpenOrStopGameInput); } @@ -344,6 +396,7 @@ namespace ChillConnect GameDispatcher.Instance.RemoveListener(GameMsg.ThemeChange, SetModel); GameDispatcher.Instance.RemoveListener(GameMsg.UpdateSpeed, SetSpeed); GameDispatcher.Instance.RemoveListener(GameMsg.UseProps, SetUserPorp); + GameDispatcher.Instance.RemoveListener(GameMsg.StopArrowTouch, OpenOrStopGameInput); diff --git a/Assets/Scripts/ModuleUI/ArrowTheme/ArrowThemeUI.cs b/Assets/Scripts/ModuleUI/ArrowTheme/ArrowThemeUI.cs index 5b2dd79..2427235 100644 --- a/Assets/Scripts/ModuleUI/ArrowTheme/ArrowThemeUI.cs +++ b/Assets/Scripts/ModuleUI/ArrowTheme/ArrowThemeUI.cs @@ -38,6 +38,7 @@ namespace ChillConnect protected override void OnClose() { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, true); } // @@ -49,6 +50,8 @@ namespace ChillConnect protected override void OnOpenBefore(object args) { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, false); + ui.btn_switch.state.selectedIndex = DataMgr.ArrowDarkTheme.Value; SetBtnState(); diff --git a/Assets/Scripts/ModuleUI/ArrowTips/ArrowTipsUI.cs b/Assets/Scripts/ModuleUI/ArrowTips/ArrowTipsUI.cs index 706dce6..09b0817 100644 --- a/Assets/Scripts/ModuleUI/ArrowTips/ArrowTipsUI.cs +++ b/Assets/Scripts/ModuleUI/ArrowTips/ArrowTipsUI.cs @@ -33,6 +33,8 @@ namespace ChillConnect protected override void OnClose() { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, true); + CommonHelper.FadeOut(ui); } @@ -43,6 +45,8 @@ namespace ChillConnect protected override void OnOpenBefore(object args) { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, false); + if (args != null) InitView((int)args); } diff --git a/Assets/Scripts/ModuleUI/H5/H5UI.cs b/Assets/Scripts/ModuleUI/H5/H5UI.cs index 35f1a14..e42bb56 100644 --- a/Assets/Scripts/ModuleUI/H5/H5UI.cs +++ b/Assets/Scripts/ModuleUI/H5/H5UI.cs @@ -37,6 +37,8 @@ namespace ChillConnect protected override void OnClose() { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, true); + GameDispatcher.Instance.Dispatch(GameMsg.showBroadCast); } @@ -49,6 +51,7 @@ namespace ChillConnect protected override void OnOpenBefore(object args) { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, false); GameDispatcher.Instance.Dispatch(GameMsg.hideBroadCast); // delayedCall = DOVirtual.DelayedCall(0.3f, () => diff --git a/Assets/Scripts/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs b/Assets/Scripts/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs index 76311b4..bb0f456 100644 --- a/Assets/Scripts/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs +++ b/Assets/Scripts/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs @@ -224,7 +224,8 @@ namespace ChillConnect { ui.btn_check_level.SetClick(() => { - GameDispatcher.Instance.Dispatch(GameMsg.OpenGame); + //跳转游戏，本来就在游戏中 + // GameDispatcher.Instance.Dispatch(GameMsg.OpenGame); CtrlCloseUI(); }); } diff --git a/Assets/Scripts/ModuleUI/PersonView/PersonViewUI.cs b/Assets/Scripts/ModuleUI/PersonView/PersonViewUI.cs index d1ef635..6fa4099 100644 --- a/Assets/Scripts/ModuleUI/PersonView/PersonViewUI.cs +++ b/Assets/Scripts/ModuleUI/PersonView/PersonViewUI.cs @@ -46,6 +46,8 @@ namespace ChillConnect protected override void OnClose() { // WebviewManager.ShezhiACT(true); + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, true); + } protected override void OnBind() @@ -55,6 +57,7 @@ namespace ChillConnect protected override void OnOpenBefore(object args) { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, false); // if (Screen.safeArea.y != 0) // { diff --git a/Assets/Scripts/ModuleUI/PettyAward/PettyAwardUI.cs b/Assets/Scripts/ModuleUI/PettyAward/PettyAwardUI.cs index 5daefc3..ed64e9b 100644 --- a/Assets/Scripts/ModuleUI/PettyAward/PettyAwardUI.cs +++ b/Assets/Scripts/ModuleUI/PettyAward/PettyAwardUI.cs @@ -39,6 +39,8 @@ namespace ChillConnect protected override void OnClose() { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, true); + closeCallback?.Invoke(); } @@ -49,6 +51,7 @@ namespace ChillConnect protected override void OnOpenBefore(object args) { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, false); InitView(); } diff --git a/Assets/Scripts/ModuleUI/RedeemCode.meta b/Assets/Scripts/ModuleUI/RedeemCode.meta new file mode 100644 index 0000000..c498814 --- /dev/null +++ b/Assets/Scripts/ModuleUI/RedeemCode.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 625f78d565b44a3b92054107c980d93c +timeCreated: 1782269723 \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeCtrl.cs b/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeCtrl.cs new file mode 100644 index 0000000..5874f30 --- /dev/null +++ b/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeCtrl.cs @@ -0,0 +1,19 @@ +namespace ChillConnect +{ + public class RedeemCodeCtrl : BaseCtrl + { + public static RedeemCodeCtrl Instance { get; private set; } + + private RedeemCodeModel model; + + protected override void OnInit() + { + Instance = this; + } + + protected override void OnDispose() + { + Instance = null; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeCtrl.cs.meta b/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeCtrl.cs.meta new file mode 100644 index 0000000..d42646a --- /dev/null +++ b/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeCtrl.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a93167d1dab140d2917cf72e64e89770 +timeCreated: 1782269723 \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeModel.cs b/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeModel.cs new file mode 100644 index 0000000..ab68d3e --- /dev/null +++ b/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeModel.cs @@ -0,0 +1,15 @@ +namespace ChillConnect +{ + public class RedeemCodeModel : BaseModel + { + protected override void OnInit() + { + } + + protected override void OnDispose() + { + } + + + } +} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeModel.cs.meta b/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeModel.cs.meta new file mode 100644 index 0000000..79e6eea --- /dev/null +++ b/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeModel.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 20b6c254390a48eabb165d883f54bf67 +timeCreated: 1782269723 \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUI.cs b/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUI.cs new file mode 100644 index 0000000..1bdb7aa --- /dev/null +++ b/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUI.cs @@ -0,0 +1,75 @@ +using System.Collections; +using System.Globalization; +using DG.Tweening; +using FairyGUI; +using FGUI.Loading_25; +using FGUI.tixian; +using UnityEngine; + +namespace ChillConnect +{ + public class RedeemCodeUI : BaseUI + { + private RedeemCodeUICtrl ctrl; + private RedeemCodeModel model; + private com_redeem_code ui; + + public RedeemCodeUI(RedeemCodeUICtrl ctrl) : base(ctrl) + { + uiName = UIConst.RedeemCodeUI; + this.ctrl = ctrl; + } + + protected override void SetUIInfo(UIInfo uiInfo) + { + uiInfo.packageName = "tixian"; + uiInfo.assetName = "com_redeem_code"; + uiInfo.layerType = UILayerType.Loading; + uiInfo.isNeedOpenAnim = false; + uiInfo.isNeedCloseAnim = false; + uiInfo.isNeedUIMask = false; + } + + #region 生命周期 + + protected override void OnInit() + { + } + + protected override void OnClose() + { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, true); + } + + protected override void OnBind() + { + ui = baseUI as com_redeem_code; + } + + protected override void OnOpenBefore(object args) + { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, false); + + } + + protected override void OnOpen(object args) + { + } + + #endregion + + #region 消息 + + protected override void AddListener() + { + + } + + protected override void RemoveListener() + { + + } + + #endregion + } +} diff --git a/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUI.cs.meta b/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUI.cs.meta new file mode 100644 index 0000000..cd1ea9c --- /dev/null +++ b/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUI.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 02aaefad43c146b18cb726f31814007e +timeCreated: 1782269723 \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUICtrl.cs b/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUICtrl.cs new file mode 100644 index 0000000..1d58d4d --- /dev/null +++ b/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUICtrl.cs @@ -0,0 +1,64 @@ +namespace ChillConnect +{ + public class RedeemCodeUICtrl : BaseUICtrl + { + private RedeemCodeUI ui; + private RedeemCodeModel model; + + private uint openUIMsg = UICtrlMsg.RedeemCodeUI_Open; + private uint closeUIMsg = UICtrlMsg.RedeemCodeUI_Close; + + #region 生命周期 + + protected override void OnInit() + { + } + + protected override void OnDispose() + { + } + + public override void OpenUI(object args = null) + { + if (ui == null) + { + ui = new RedeemCodeUI(this); + ui.Open(args); + } + } + + public override void CloseUI(object args = null) + { + if (ui is { isClose: false }) + { + ui.Close(); + } + + ui = null; + } + + #endregion + + public override uint GetOpenUIMsg(string uiName) + { + return openUIMsg; + } + + public override uint GetCloseUIMsg(string uiName) + { + return closeUIMsg; + } + + protected override void AddListener() + { + AppDispatcher.Instance.AddListener(AppMsg.UI_DisplayLoadingUI, OpenUI); + } + + protected override void RemoveListener() + { + AppDispatcher.Instance.RemoveListener(AppMsg.UI_DisplayLoadingUI, OpenUI); + } + + + } +} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUICtrl.cs.meta b/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUICtrl.cs.meta new file mode 100644 index 0000000..7340c60 --- /dev/null +++ b/Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUICtrl.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: db2d94c85bfc42988faab968658f117e +timeCreated: 1782269723 \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/SaveingPot/SaveingPotUI.cs b/Assets/Scripts/ModuleUI/SaveingPot/SaveingPotUI.cs index 8832b31..b364e04 100644 --- a/Assets/Scripts/ModuleUI/SaveingPot/SaveingPotUI.cs +++ b/Assets/Scripts/ModuleUI/SaveingPot/SaveingPotUI.cs @@ -50,6 +50,8 @@ namespace ChillConnect protected override void OnClose() { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, true); + AdRedeemManager.Instance.Destroy(); HallManager.Instance.UpdateSecondEvent -= updateSpeedCD; HallManager.Instance.UpdateSecondEvent -= Update; @@ -71,6 +73,8 @@ namespace ChillConnect protected override void OnOpenBefore(object args) { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, false); + if (Screen.safeArea.y != 0) {//刘海屏 ui.group_.y += Screen.safeArea.y; diff --git a/Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs b/Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs index 3c70bd4..cdcab4a 100644 --- a/Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs +++ b/Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs @@ -46,6 +46,8 @@ namespace ChillConnect protected override void OnClose() { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, true); + GameHelper.showGameUI = true; } @@ -56,6 +58,9 @@ namespace ChillConnect protected override void OnOpenBefore(object args) { + + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, false); + if (Screen.safeArea.y != 0) { ui.com_gold.y += 68; diff --git a/Assets/Scripts/ModuleUI/StatementView/StatementViewUI.cs b/Assets/Scripts/ModuleUI/StatementView/StatementViewUI.cs index c4b303c..26b10ea 100644 --- a/Assets/Scripts/ModuleUI/StatementView/StatementViewUI.cs +++ b/Assets/Scripts/ModuleUI/StatementView/StatementViewUI.cs @@ -38,6 +38,8 @@ namespace ChillConnect protected override void OnClose() { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, false); + //open_sign(); } @@ -48,6 +50,7 @@ namespace ChillConnect protected override void OnOpenBefore(object args) { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, false); InitView(); } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 86cd8fb..462df07 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: matchgame - productName: "Captain\u2019s Dice & Dubloons" + productName: 'Arrow Game: Beat Tap' defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -141,7 +141,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 1.0.2 + bundleVersion: 1.0.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -163,7 +163,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.matchgame.captaindicedubloons + Android: com.candydoggame.arrowgamebeattap iPhone: com.matchgame.captaindicedubloons buildNumber: Standalone: 0