fix：1、添加兑换code界面。2、更改单双指的禁用和开启（打开其他界面时）

2026-06-24 11:22:55 +08:00
parent f0f102fe4c
commit 65a797d384
36 changed files with 341 additions and 28 deletions
@@ -1,14 +0,0 @@
-<linker>
-  <assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
-    <type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
-  </assembly>
-  <assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
-    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
-    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
-    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
-    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
-  </assembly>
-  <assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-    <type fullname="UnityEngine.TextAsset" preserve="all" />
-  </assembly>
-</linker>
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: e2a270a37f1f2df48a410cf714642d42
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -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;
    }
 }
@@ -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;
    }
 }
@@ -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);
+        }
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 413711e293fa68749b198e91ac5bb9b7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -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));
@@ -459,7 +459,8 @@ namespace ChillConnect
            //is debug test--------


-            //  return true;//zhushi
+            return true;//zhushi
+            // return false;//zhushi
            // return false;//zhushi
            return GetLoginModel().IsMagic;
        }
@@ -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);
@@ -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
@@ -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";

    }
 }
@@ -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";

    }
 }
@@ -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));
            
        }
    }
@@ -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";
        
    }
 }
@@ -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";

    }
 }
@@ -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);
            
            
            
@@ -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();

@@ -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);
        }
@@ -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, () =>
@@ -224,7 +224,8 @@ namespace ChillConnect
                        {
                            ui.btn_check_level.SetClick(() =>
                            {
-                                GameDispatcher.Instance.Dispatch(GameMsg.OpenGame);
+                                //跳转游戏，本来就在游戏中
+                                // GameDispatcher.Instance.Dispatch(GameMsg.OpenGame);
                                CtrlCloseUI();
                            });
                        }
@@ -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)
            // {
@@ -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();
        }
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 625f78d565b44a3b92054107c980d93c
+timeCreated: 1782269723
@@ -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;
+        }
+    }
+}
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a93167d1dab140d2917cf72e64e89770
+timeCreated: 1782269723
@@ -0,0 +1,15 @@
+namespace ChillConnect
+{
+    public class RedeemCodeModel : BaseModel
+    {
+        protected override void OnInit()
+        {
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+
+    }
+}
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 20b6c254390a48eabb165d883f54bf67
+timeCreated: 1782269723
@@ -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
+    }
+}
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 02aaefad43c146b18cb726f31814007e
+timeCreated: 1782269723
@@ -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);
+        }
+
+
+    }
+}
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: db2d94c85bfc42988faab968658f117e
+timeCreated: 1782269723
@@ -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;
@@ -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;
@@ -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();
        }
@@ -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