挑战优化

FGUIProject/assets/DressUp/components/Component1.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="257,72">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n29_pjip" name="n29" src="j48o3z" fileName="images/dz_hz_fsk_1.png" xy="0,0"/>
     <image id="n28_pjip" name="n28" src="j48o3y" fileName="images/dz_hz_bxbx.png" xy="185,0">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <text id="n30_pjip" name="txtNeedName" xy="1,8" size="183,54" fontSize="28" color="#fff0db" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="名字五个字">
+    <text id="n30_pjip" name="txtNeedName" xy="-2,16" pivot="0.5,0" size="189,38" fontSize="27" color="#fff0db" align="center" vAlign="middle" autoClearText="true" text="孔雀东南飞·绣">
       <gearDisplay controller="c1" pages="0"/>
     </text>
     <list id="n31_oixc" name="listTag" xy="18,18" size="220,38" layout="row" lineGap="12" colGap="22" defaultItem="ui://eg2y0ldpih7566" vAlign="middle" autoClearItems="true">

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObjDataCache.cs

@@ -633,6 +633,16 @@ namespace GFGGame
             //推荐搭配自动穿必穿品
             if (fightCfg.needItemId > 0 && DressUpMenuItemDataManager.CheckHasItem(fightCfg.needItemId) && recommendList.IndexOf(fightCfg.needItemId) < 0)
             {
+                int subType = ItemUtilCS.GetItemSubType(fightCfg.needItemId);
+                for (int i = 0; i < recommendList.Count; i++)
+                {
+                    int recommendSubType = ItemUtilCS.GetItemSubType(recommendList[i]);
+                    if (recommendSubType == subType)
+                    {
+                        recommendList.RemoveAt(i);
+                        break;
+                    }
+                }
                 recommendList.Add(fightCfg.needItemId);
             }
             else if (fightCfg.needSuitId > 0 && DressUpMenuSuitDataManager.CheckHaveSuit(fightCfg.needSuitId))

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightQuicklyView.cs

@@ -57,6 +57,7 @@ namespace GFGGame
             Timers.inst.Remove(ShowBonusItem);
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateBtnFightTimes);
             EventAgent.RemoveEventListener(ConstMessage.STORY_FIGHT_QUICKLY_SUCCESS, StartShowBonus);
+            ViewManager.GoBackFrom(typeof(StoryFightQuicklyView).Name);
         }
 
         private void StartFight()

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

@@ -108,7 +108,7 @@ namespace GFGGame
             InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out int times, out string title);
             if (times > 0)
             {
-                ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, 1);
+                ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, 1, new object[] { typeof(StoryLevelInfoView).Name, this.viewData });
                 this.Hide();
             }
             else
@@ -138,13 +138,13 @@ namespace GFGGame
                 }
                 else
                 {
-                    ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, times);
+                    ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, times, new object[] { typeof(StoryLevelInfoView).Name, this.viewData });
                     this.Hide();
                 }
             }
             else
             {
-                ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, times);
+                ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, times, new object[] { typeof(StoryLevelInfoView).Name, this.viewData });
                 this.Hide();
 
             }

GameClient/ProjectSettings/ProjectSettings.asset

@@ -145,7 +145,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.2
+  bundleVersion: 1.3
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -699,7 +699,7 @@ PlayerSettings:
   webGLThreadsSupport: 0
   webGLDecompressionFallback: 0
   scriptingDefineSymbols:
-    7: ILRuntime1;PT_DEV111;PT_TEMP111
+    7: ILRuntime1;PT_DEV111;PT_TEMP
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend: