查阅建档

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticListUI.xml

@@ -6,9 +6,11 @@
     </loader>
     <component id="n0_j539" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <image id="n12_j539" name="n12" src="j5394" fileName="images/jbhc_bti.png" xy="164,102"/>
-    <list id="n4_j539" name="listMenu" xy="250,218" size="580,80" layout="flow_hz" colGap="-18" autoItemSize="true" align="center">
+    <list id="n4_j539" name="listMenu" xy="31,218" size="1017,80" layout="flow_hz" colGap="-18" autoItemSize="true" align="center" foldInvisibleItems="true">
       <relation target="" sidePair="center-center"/>
       <item url="ui://4f294tdkj539f"/>
+      <item url="ui://4f294tdkj539h"/>
+      <item url="ui://4f294tdkkqeb25"/>
     </list>
     <image id="n7_j539" name="n7" src="j539a" fileName="images/jbhc_diban_2.png" xy="28,332" size="1024,1588">
       <relation target="" sidePair="bottomext-bottom"/>

FGUIProject/assets/ClothingSynthetic/components/Button4.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="298,79" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_j539" name="n0" src="j5393" fileName="images/jbhc_btban_2.png" xy="0,0">
+      <gearDisplay controller="button" pages="0,2"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_j539" name="n1" src="j5392" fileName="images/jbhc_btban_1.png" xy="0,0">
+      <gearDisplay controller="button" pages="1,3"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n5_j539" name="n5" src="j5396" fileName="images/jbhc_btzi_2.png" xy="68,12" visible="false">
+      <gearDisplay controller="button" pages="1,3"/>
+    </image>
+    <image id="n6_j539" name="n6" src="j5397" fileName="images/jbhc_btzi_3.png" xy="68,12" visible="false">
+      <gearDisplay controller="button" pages="0,2"/>
+    </image>
+    <text id="n7_kqeb" name="n7" xy="66,9" size="164,54" fontSize="40" text="查阅建档"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/ClothingSynthetic/package.xml

@@ -47,6 +47,7 @@
     <movieclip id="wet222" name="MovieClip1.jta" path="/effect/"/>
     <image id="wet223" name="hd.png" path="/images/" scale="9grid" scale9grid="49,49,98,98"/>
     <component id="wet224" name="ComSelect.xml" path="/components/" exported="true"/>
+    <component id="kqeb25" name="Button4.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingSynthetic" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -114,7 +114,6 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetFriendGiftRed()
         {
-            ET.Log.Debug("zoya:count:" + FriendDataManager.Instance.Count);
             if (FriendDataManager.Instance.Count >= GlobalCfgArray.globalCfg.maxGetPowerCount) return false;
 
             List<FriendInfoData> friendInfos = FriendDataManager.Instance.FriendDatas;

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -47,6 +47,7 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hc_bj_1");
 
             _ui.m_listMenu.selectedIndex = 0;
+            _ui.m_listMenu.GetChildAt(1).visible = false;
             UpdateSuitList();
             Timers.inst.AddUpdate(CheckGuide);
         }
@@ -106,28 +107,38 @@ namespace GFGGame
             RarityIconController.UpdateRarityIcon(listItem.m_rarity, suitId, false, true);
             bool haveSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitId);
             bool isLock = false;
-            SuitCfg suitSyntheticCfg = SuitCfgArray.Instance.GetCfg(suitId);
-            if (suitSyntheticCfg.syntheticStoryLevelId > 0)
+            // SuitCfg suitSyntheticCfg = SuitCfgArray.Instance.GetCfg(suitId);
+            if (suitCfg.syntheticStoryLevelId > 0)
             {
                 //int chapter = 0;
                 //int level = 0;
                 //CalculateHelper.GetStoryChapterLevel(suitSyntheticCfg.storyLevelId, out var chapter, out var level);
-                bool isLevelPass = InstanceZonesDataManager.CheckLevelPass(suitSyntheticCfg.syntheticStoryLevelId);
+                bool isLevelPass = InstanceZonesDataManager.CheckLevelPass(suitCfg.syntheticStoryLevelId);
                 if (!isLevelPass)
                 {
                     isLock = true;
-                    var levelCfg = StoryLevelCfgArray.Instance.GetCfg(suitSyntheticCfg.syntheticStoryLevelId);
-                    var chapterCfg = StoryChapterCfgArray.Instance.GetCfg(levelCfg.chapterId);
-                    listItem.m_txtLockDesc.text = string.Format("通关第{0}章第{1}关", chapterCfg.order, levelCfg.order);
+                    var levelCfg = StoryLevelCfgArray.Instance.GetCfg(suitCfg.syntheticStoryLevelId);
+                    string str = "";
+                    if (levelCfg.type == ConstInstanceZonesType.Filing)
+                    {
+                        StoryLevelCfg cfg = StoryLevelCfgArray.Instance.GetCfg(suitCfg.syntheticStoryLevelId);
+                        str = string.Format("需通关{0}关卡解锁", cfg.name);
+                    }
+                    else
+                    {
+                        var chapterCfg = StoryChapterCfgArray.Instance.GetCfg(levelCfg.chapterId);
+                        str = string.Format("通关第{0}章第{1}关", chapterCfg.order, levelCfg.order);
+                    }
+                    listItem.m_txtLockDesc.text = str;
                 }
             }
-            if (suitSyntheticCfg.syntheticPreSuitId > 0)
+            if (suitCfg.syntheticPreSuitId > 0)
             {
-                bool hasPreSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitSyntheticCfg.syntheticPreSuitId);
+                bool hasPreSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitCfg.syntheticPreSuitId);
                 if (!hasPreSuit)
                 {
                     isLock = true;
-                    string preSuitName = SuitUtil.GetSuitName(suitSyntheticCfg.syntheticPreSuitId);
+                    string preSuitName = SuitUtil.GetSuitName(suitCfg.syntheticPreSuitId);
                     listItem.m_txtLockDesc.text = string.Format("集齐{0}套装", preSuitName);
                 }
             }