Ver Fonte

章节解锁渐现效果

zhangyuqian há 1 ano atrás
pai
commit
8c79cf144e

+ 4 - 4
GameClient/Assets/Game/HotUpdate/DressUp/MyDressUpHelper.cs

@@ -116,7 +116,7 @@ namespace GFGGame
             return count;
         }
 
-        public static void PutOnRecommendItems2(int id)
+        public static void PutOnRecommendItems2()
         {
             Dictionary<int, List<int>> itemsDic = GetRecommendItems();
             List<int> recommendList = new List<int>();
@@ -125,8 +125,8 @@ namespace GFGGame
                 if (key == ConstDressUpItemType.SHANG_YI || key == ConstDressUpItemType.XIA_ZHUANG || key == ConstDressUpItemType.LIAN_YI_QUN) continue;
                 recommendList.AddRange(itemsDic[key]);
             }
-            //StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
-            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(id);
+            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
+            //StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(id);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(fightCfg.needSuitId);
             int[] suitParts = suitCfg == null ? new int[] { } : suitCfg.partsArr;
@@ -166,7 +166,7 @@ namespace GFGGame
 
             dressUpObj.PutOnItemList(recommendList);
         }
-        private static Dictionary<int, List<int>> GetRecommendItems()
+        private static Dictionary<int, List<int>> GetRecommendItems( int id = 0)
         {
             GetClassifyDictionaty(out Dictionary<int, List<int>> needListBySubType, out Dictionary<int, List<int>> recommendListBySubType);
             DressUpMenuItemCfg1[] menuCfg1s = DressUpMenuItemCfg1Array.Instance.dataArray;

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompStoryLevelItem.cs

@@ -19,6 +19,7 @@ namespace UI.Main
         public GLoader m_fightIconB;
         public UI_CompFlower2 m_flower;
         public GGraph m_holder;
+        public Transition m_t0;
         public const string URL = "ui://mfvz4q8ko4m7fqd";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompStoryLevelItem";
@@ -78,6 +79,7 @@ namespace UI.Main
             m_fightIconB = (GLoader)comp.GetChild("fightIconB");
             m_flower = (UI_CompFlower2)UI_CompFlower2.Create(comp.GetChild("flower"));
             m_holder = (GGraph)comp.GetChild("holder");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -95,6 +97,7 @@ namespace UI.Main
             m_flower.Dispose();
             m_flower = null;
             m_holder = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs

@@ -69,7 +69,7 @@ namespace GFGGame
             base.OnShown();
 
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_fhl");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_bg1","jpg");
             _activityId = (int)(this.viewData as object[])[0];
             _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(_activityId);
             _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(_activityId);

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -680,7 +680,8 @@ namespace GFGGame
             }
             InstanceZonesDataManager.usedRecommend = true;
             // MyDressUpHelper.PutOnRecommendItems();
-            MyDressUpHelper.PutOnRecommendItems2(_levelCfg.id);
+            InstanceZonesDataManager.currentLevelCfgId = _levelID;
+            MyDressUpHelper.PutOnRecommendItems2();
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制:{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
             UpdateStepBtn(true);
             // UpdateListPartsSelected();

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -363,6 +363,7 @@ namespace GFGGame
                         levelItem.target.AddChild(_effFirst);
                         levelItem.m_fightBg.visible = false;
                         levelItem.m_loaDialogBg.visible = false;
+                        levelItem.m_t0.Play();
                         _effFirst.visible = true;
                         //Timers.inst.Add(1.7f, 1, HideEffect, obj);
                     }

BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes