Merge remote-tracking branch 'remotes/origin/master' into xiaojie

FGUIProject/assets/LuckyBox/LuckyBoxNewDressUI.xml

@@ -8,7 +8,7 @@
     <image id="n6_duuf" name="n6" src="volstar" fileName="imageNews/zx_tx_hengxiang.png" xy="0,420" group="n9_duuf"/>
     <image id="n7_duuf" name="n7" src="volstav" fileName="imageNews/zx_tx_yuanquan.png" xy="28,381" group="n9_duuf"/>
     <image id="n8_duuf" name="n8" src="volstaw" fileName="imageNews/zx_tx_zhongjian.png" xy="53,484" group="n9_duuf"/>
-    <group id="n9_duuf" name="n9" xy="0,381" size="1080,1158" advanced="true">
+    <group id="n9_duuf" name="n9" xy="0,381" size="1080,1158" visible="false" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
     <component id="n0_qdrt" name="comCard" src="qdrt1a" fileName="components/ComCard.xml" xy="66,475" pivot="0.5,0.5" touchable="false">

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

@@ -122,7 +122,10 @@ namespace GFGGame
             var preChapterCfg = StoryChapterCfgArray.Instance.GetCfg(preChapterId);
             if (preChapterCfg != null)
             {
-                return InstanceZonesDataManager.CheckChapterPass(preChapterCfg.type, preChapterCfg.subType, preChapterCfg.id, preChapterCfg.levelCount);
+                if(!InstanceZonesDataManager.CheckChapterPass(preChapterCfg.type, preChapterCfg.subType, preChapterCfg.id, preChapterCfg.levelCount))
+                {
+                    return false;
+                }
             }
             //前置关卡
             return CheckNeedChapterPass(chapterId, out var needChapterId);

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs

@@ -103,35 +103,35 @@ namespace GFGGame
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemdata.id);
             string resPath = "";
             string resPath1 = "";
-            // switch (itemCfg.rarity)
-            // {
-            //     case ConstDressRarity.Rarity_TIANYI:
-            //         resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_Yellow_01");
-            //         SceneController.AddObjectToView(gameObject1, wrapper1, _ui.m_comCard.m_holder, resPath, out gameObject1, out wrapper1);
-            //         _ui.m_comCard.m_holder.visible = true;
-            //         resPath1 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_Yellow_01_top");
-            //         SceneController.AddObjectToView(gameObject2, wrapper2, _ui.m_comCard.m_holder1, resPath1, out gameObject2, out wrapper2);
-            //         _ui.m_comCard.m_holder1.visible = true;
-            //         break;
-            //     case ConstDressRarity.Rarity_DIANCANG:
-            //         resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_Purple_02");
-            //         SceneController.AddObjectToView(gameObject1, wrapper1, _ui.m_comCard.m_holder, resPath, out gameObject1, out wrapper1);
-            //         _ui.m_comCard.m_holder.visible = true;
-            //         resPath1 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_Purple_02_top");
-            //         SceneController.AddObjectToView(gameObject2, wrapper2, _ui.m_comCard.m_holder1, resPath1, out gameObject2, out wrapper2);
-            //         _ui.m_comCard.m_holder1.visible = true;
-            //         break;
-            //     case ConstDressRarity.Rarity_ZHENXI:
-            //         resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_Bule_03");
-            //         SceneController.AddObjectToView(gameObject1, wrapper1, _ui.m_comCard.m_holder, resPath, out gameObject1, out wrapper1);
-            //         _ui.m_comCard.m_holder.visible = true;
-            //         break;
-            //     case ConstDressRarity.Rarity_FANPIN:
-            //         resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_grey_04");
-            //         SceneController.AddObjectToView(gameObject1, wrapper1, _ui.m_comCard.m_holder, resPath, out gameObject1, out wrapper1);
-            //         _ui.m_comCard.m_holder.visible = true;
-            //         break;
-            // }
+            switch (itemCfg.rarity)
+            {
+                case ConstDressRarity.Rarity_TIANYI:
+                    resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_Yellow_01");
+                    SceneController.AddObjectToView(gameObject1, wrapper1, _ui.m_comCard.m_holder, resPath, out gameObject1, out wrapper1);
+                    _ui.m_comCard.m_holder.visible = true;
+                    resPath1 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_Yellow_01_top");
+                    SceneController.AddObjectToView(gameObject2, wrapper2, _ui.m_comCard.m_holder1, resPath1, out gameObject2, out wrapper2);
+                    _ui.m_comCard.m_holder1.visible = true;
+                    break;
+                case ConstDressRarity.Rarity_DIANCANG:
+                    resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_Purple_02");
+                    SceneController.AddObjectToView(gameObject1, wrapper1, _ui.m_comCard.m_holder, resPath, out gameObject1, out wrapper1);
+                    _ui.m_comCard.m_holder.visible = true;
+                    resPath1 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_Purple_02_top");
+                    SceneController.AddObjectToView(gameObject2, wrapper2, _ui.m_comCard.m_holder1, resPath1, out gameObject2, out wrapper2);
+                    _ui.m_comCard.m_holder1.visible = true;
+                    break;
+                case ConstDressRarity.Rarity_ZHENXI:
+                    resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_Bule_03");
+                    SceneController.AddObjectToView(gameObject1, wrapper1, _ui.m_comCard.m_holder, resPath, out gameObject1, out wrapper1);
+                    _ui.m_comCard.m_holder.visible = true;
+                    break;
+                case ConstDressRarity.Rarity_FANPIN:
+                    resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_grey_04");
+                    SceneController.AddObjectToView(gameObject1, wrapper1, _ui.m_comCard.m_holder, resPath, out gameObject1, out wrapper1);
+                    _ui.m_comCard.m_holder.visible = true;
+                    break;
+            }
 
             _ui.m_comCard.m_loaType.url = ResPathUtil.GetCommonGameResPath("hd_sxicon_" + itemCfg.rarity);
             _ui.m_comCard.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);