添加华容道新活动逻辑

GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -1089,6 +1089,11 @@ namespace GFGGame
             || ActivityGetYuanXiaoDataManager.Instance.ShowTaskRedDots(TaskFuncType.YuanXiaoActivity);
         }
 
+        public bool GetActivityFYJYRed()
+        {
+            return ActivityTeaDataManager.Instance.CheckHRDRed();
+        }
+
         /// <summary>
         /// 摘星免费抽奖
         /// </summary>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoEntryUI.cs

@@ -8,10 +8,11 @@ namespace UI.ActivityHuaRongDao
     {
         public GComponent target;
         public Controller m_activityID;
-        public GLoader m_loaBg;
+        public GGraph m_mask;
         public GButton m_btnClose;
-        public GButton m_btnRule;
+        public GLoader m_loaBg;
         public GButton m_btnBack;
+        public GButton m_btnRule;
         public UI_scrollPane m_scrollPane;
         public GTextField m_curLevel;
         public GTextField m_txtTime;
@@ -67,10 +68,11 @@ namespace UI.ActivityHuaRongDao
         private void Init(GComponent comp)
         {
             m_activityID = comp.GetController("activityID");
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_btnClose = (GButton)comp.GetChild("btnClose");
-            m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
             m_scrollPane = (UI_scrollPane)UI_scrollPane.Create(comp.GetChild("scrollPane"));
             m_curLevel = (GTextField)comp.GetChild("curLevel");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
@@ -82,10 +84,11 @@ namespace UI.ActivityHuaRongDao
         public void Dispose(bool disposeTarget = false)
         {
             m_activityID = null;
-            m_loaBg = null;
+            m_mask = null;
             m_btnClose = null;
-            m_btnRule = null;
+            m_loaBg = null;
             m_btnBack = null;
+            m_btnRule = null;
             m_scrollPane.Dispose();
             m_scrollPane = null;
             m_curLevel = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoUI.cs

@@ -9,7 +9,10 @@ namespace UI.ActivityHuaRongDao
         public GComponent target;
         public Controller m_state;
         public Controller m_activityID;
+        public GGraph m_mask;
+        public GButton m_btnClose;
         public GLoader m_loaBg;
+        public GButton m_btnBack;
         public UI_item m_item;
         public GTextField m_seconds;
         public GGroup m_tips;
@@ -19,9 +22,8 @@ namespace UI.ActivityHuaRongDao
         public UI_items m_items;
         public UI_items m_itemsOrigin;
         public GGraph m_maskTouch;
-        public GGraph m_mask;
+        public GGraph m_mask_2;
         public GGraph m_maskGlobal;
-        public GButton m_btnBack;
         public Transition m_showMask;
         public Transition m_hideMask;
         public const string URL = "ui://wf8geywtnx120";
@@ -73,7 +75,10 @@ namespace UI.ActivityHuaRongDao
         {
             m_state = comp.GetController("state");
             m_activityID = comp.GetController("activityID");
+            m_mask = (GGraph)comp.GetChild("mask");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_item = (UI_item)UI_item.Create(comp.GetChild("item"));
             m_seconds = (GTextField)comp.GetChild("seconds");
             m_tips = (GGroup)comp.GetChild("tips");
@@ -83,9 +88,8 @@ namespace UI.ActivityHuaRongDao
             m_items = (UI_items)UI_items.Create(comp.GetChild("items"));
             m_itemsOrigin = (UI_items)UI_items.Create(comp.GetChild("itemsOrigin"));
             m_maskTouch = (GGraph)comp.GetChild("maskTouch");
-            m_mask = (GGraph)comp.GetChild("mask");
+            m_mask_2 = (GGraph)comp.GetChild("mask");
             m_maskGlobal = (GGraph)comp.GetChild("maskGlobal");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_showMask = comp.GetTransition("showMask");
             m_hideMask = comp.GetTransition("hideMask");
         }
@@ -93,7 +97,10 @@ namespace UI.ActivityHuaRongDao
         {
             m_state = null;
             m_activityID = null;
+            m_mask = null;
+            m_btnClose = null;
             m_loaBg = null;
+            m_btnBack = null;
             m_item.Dispose();
             m_item = null;
             m_seconds = null;
@@ -106,9 +113,8 @@ namespace UI.ActivityHuaRongDao
             m_itemsOrigin.Dispose();
             m_itemsOrigin = null;
             m_maskTouch = null;
-            m_mask = null;
+            m_mask_2 = null;
             m_maskGlobal = null;
-            m_btnBack = null;
             m_showMask = null;
             m_hideMask = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxStarUI.cs

@@ -53,6 +53,7 @@ namespace UI.LuckyBox
         public UI_ComStar m_comStar1_2_9;
         public GGroup m_grpComStar2;
         public GGroup m_star;
+        public GGraph m_mask;
         public Transition m_t0;
         public const string URL = "ui://drx9d1usl5nzm";
         public const string PACKAGE_NAME = "LuckyBox";
@@ -147,6 +148,7 @@ namespace UI.LuckyBox
             m_comStar1_2_9 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_9"));
             m_grpComStar2 = (GGroup)comp.GetChild("grpComStar2");
             m_star = (GGroup)comp.GetChild("star");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
@@ -230,6 +232,7 @@ namespace UI.LuckyBox
             m_comStar1_2_9 = null;
             m_grpComStar2 = null;
             m_star = null;
+            m_mask = null;
             m_t0 = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoEntryView.cs

@@ -23,8 +23,8 @@ namespace GFGGame
 
             viewCom = _ui.target;
             isfullScreen = true;
+
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gf_pjxq_bj");
-            isReturnView = true;
 
             _ui.m_btnStart.onClick.Add(OnBtnStartClick);
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
@@ -55,8 +55,10 @@ namespace GFGGame
             _ui.m_hide.Play();
             _activityID = (int)viewData;
             InitIDList();
-            await InitInfo();
+            _ui.m_activityID.selectedPage = _activityID.ToString();
+            isReturnView = _ui.m_btnBack.touchable;
 
+            await InitInfo();
             if (!isShowing)
             {
                 return;
@@ -85,6 +87,9 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_HUARONGDAO_UPDATE, UpdateUI);
         }
 
+        /// <summary>
+        /// 初始化关卡列表
+        /// </summary>
         private void InitIDList()
         {
             IDList = new List<int>();
@@ -109,7 +114,6 @@ namespace GFGGame
         private async Task InitInfo()
         {
             curLevel = await GetCurLevel(_activityID);
-            _ui.m_activityID.selectedPage = _activityID.ToString();
 
             RoleLimitData limitData;
 
@@ -203,7 +207,7 @@ namespace GFGGame
             HuarongRoadGame cfg = HuarongRoadGameArray.Instance.GetCfg(IDList[curLevel]);
 
             var result = await MiniGameProxy.ReqMiniGameStart(cfg.id, cfg.type, _activityID);
-            if (!result) return;
+            if (!result || !isShowing) return;
 
             ViewManager.Show<ActivityHuaRongDaoView>(new object[] { cfg, _activityID });
         }

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoView.cs

@@ -64,9 +64,9 @@ namespace GFGGame
             viewCom = _ui.target;
             isfullScreen = true;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gf_pjxq_bj");
-            isReturnView = true;
 
             _ui.m_item.target.visible = false;
+            _ui.m_btnClose.onClick.Add(OnBtnBackClick);
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_state.onChanged.Add(OnChangeLookOriginState);
             _ui.m_btnRefresh.onClick.Add(OnClickBtnRefresh);
@@ -89,7 +89,7 @@ namespace GFGGame
             _cfg = (HuarongRoadGame)arr[0];
             _activityID = (int)arr[1];
             _ui.m_activityID.selectedPage = _activityID.ToString();
-
+            isReturnView = _ui.m_btnBack.touchable;
             RefreshData();
             _cancellationTokenSource = new CancellationTokenSource();
             Task task = StartAnimation(_cancellationTokenSource.Token);
@@ -237,6 +237,7 @@ namespace GFGGame
 
         private void ControlMenuItemVisual(bool show = true)
         {
+            _ui.m_btnClose.visible = show;
             _ui.m_btnBack.visible = show;
             _ui.m_btnLookPic.visible = show;
             _ui.m_btnHidePic.visible = show;
@@ -552,12 +553,16 @@ namespace GFGGame
                 _ui.m_maskGlobal.visible = true;
                 obj.TweenMove(newGrid.pos, 0.1f).OnComplete(() =>
                 {
-                    _ui.m_maskGlobal.visible = false;
                     if (CheckWin())
                     {
                         ControlMenuItemVisual(false);
+                        _ui.m_maskGlobal.visible = false;
                         Win(_cancellationTokenSource.Token);
                     }
+                    else
+                    {
+                        _ui.m_maskGlobal.visible = false;
+                    }
                 });
             }
         }

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -111,6 +111,7 @@ namespace GFGGame
             _ui.m_btnTea.target.onClick.Add(OnClickBtnTea);
             _ui.m_btnActivityZCJB.target.onClick.Add(OnClickBtnZCJB);
             _ui.m_btnGetYuanXiao.target.onClick.Add(OnClickBtnGetYuanXiao);
+            _ui.m_btnActivityFYJY.target.visible = false;
             _ui.m_btnActivityFYJY.target.onClick.Add(OnClickBtnFYJY);
             _btnLeague.onClick.Add(OnClickBtnLeague);
             _btnStore.onClick.Add(OnClickBtnStore);
@@ -1045,8 +1046,19 @@ namespace GFGGame
                 }
             }
 
+            // 逢缘解语活动（华容道小游戏）
+            if (_ui.m_btnActivityFYJY.target.visible)
+            {
+                if (redPointUpdateFrame == 23)
+                {
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnActivityFYJY.target
+                        , RedDotDataManager.Instance.GetActivityFYJYRed(), "", -15, -1);
+
+                }
+            }
+
             redPointUpdateFrame++;
-            if(redPointUpdateFrame > 23)
+            if(redPointUpdateFrame > 24)
             {
                 redPointUpdateFrame = -1;
             }

GameClient/Assets/ResIn/UI/Main/Main_atlas0_12!a.png.meta

@@ -1,120 +0,0 @@
-fileFormatVersion: 2
-guid: 9ba8b683ecd004a4d85ca067cec09927
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  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
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 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
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 50
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 50
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Main/Main_atlas0_12.png.meta

@@ -1,120 +0,0 @@
-fileFormatVersion: 2
-guid: 534cd3a9a0c30214ea1d7c86a0f79cf4
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  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
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 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
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 50
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 50
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: