查阅建档

FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1160" designImageOffsetX="-750">
-  <controller name="ctrlNeed" pages="0,,1,,2,,3," selected="0"/>
+  <controller name="ctrlNeed" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
     <loader id="n44_yoe2" name="btnBg" xy="0,-153" size="1080,1414" touchable="false" url="ui://mfvz4q8kj48o94" autoSize="true"/>
     <component id="n0_vxw5" name="btnStart" src="t8o13i" fileName="componentsLevel/ButtonStart.xml" xy="766,864">
@@ -29,14 +29,13 @@
       <item/>
     </list>
     <group id="n52_rqo4" name="n52" xy="387,349" size="400,49"/>
-    <text id="n48_rqo4" name="n48" xy="387,349" size="184,49" group="n53_rqo4" fontSize="36" color="#9b7f61" text="通关条件：">
-      <gearDisplay controller="ctrlNeed" pages="1,2"/>
-      <gearText controller="ctrlNeed" pages="1,2" values="套装增益：|通关加分：" default="通关条件："/>
-    </text>
-    <richtext id="n49_rqo4" name="txtAddition" xy="580,352" size="132,44" group="n53_rqo4" fontSize="32" color="#a28d77" text="赵钱孙李">
-      <gearDisplay controller="ctrlNeed" pages="1"/>
-    </richtext>
-    <group id="n53_rqo4" name="n53" xy="387,349" size="325,49" advanced="true">
+    <text id="n48_rqo4" name="n48" xy="387,349" size="184,49" group="n53_rqo4" fontSize="36" color="#9b7f61" text="套装增益："/>
+    <richtext id="n49_rqo4" name="txtAddition" xy="580,352" size="132,44" group="n53_rqo4" fontSize="32" color="#a28d77" text="赵钱孙李"/>
+    <component id="n56_hbio" name="btnAdditionDesc" src="hbiofi" fileName="components/Button3.xml" xy="728,341" size="68,61" group="n53_rqo4" aspect="true"/>
+    <image id="n57_hbio" name="n57" src="hbiofj" fileName="images/dz_hz_rwdh_1.png" xy="635,212" pivot="0.5,0" size="445,131" group="n59_hbio"/>
+    <text id="n58_hbio" name="txtAdditionDesc" xy="651,212" size="412,107" group="n59_hbio" fontSize="30" color="#805b38" align="center" vAlign="middle" ubb="true" autoSize="none" autoClearText="true" text="孔雀东南飞套装收集进度:(0/1)"/>
+    <group id="n59_hbio" name="grpAdditionDesc" xy="635,212" size="445,131" group="n53_rqo4" advanced="true"/>
+    <group id="n53_rqo4" name="n53" xy="387,212" size="693,190" advanced="true">
       <gearDisplay controller="ctrlNeed" pages="3"/>
     </group>
     <text id="n15_t8o1" name="txtLevelDesc" xy="387,419" size="638,140" fontSize="32" color="#a28d77" leading="10" ubb="true" autoSize="none" autoClearText="true" text="旋律在指尖流转，在天幕中划出一道 起伏的星轨折线谱，爱与星光于此吟 唱。参与限时活动星幕下的奏鸣！"/>

FGUIProject/assets/Main/components/Button3.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="113,102" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n3_hbio" name="n3" src="wg7t8v" fileName="images/zjm_gndj_2.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Main/package.xml

@@ -386,6 +386,8 @@
     <image id="jj4dff" name="zjm_ty.png" path="/images/"/>
     <image id="r0yxfg" name="zhuxian_szdi.png" path="/images/"/>
     <image id="rkrwfh" name="dhjm_dianse.png" path="/imagesDialog/"/>
+    <component id="hbiofi" name="Button3.xml" path="/components/"/>
+    <image id="hbiofj" name="dz_hz_rwdh_1.png" path="/images/" scale="9grid" scale9grid="249,32,73,64"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -117,5 +117,20 @@ namespace GFGGame
             ViewManager.Show<StudioFilingView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName), true);
 
         }
+
+        public float GetAdditionBySuitId(int suitId)
+        {
+            float addition = 0;
+            SuitCfg cfg = SuitCfgArray.Instance.GetCfg(suitId);
+            for (int i = 0; i < cfg.partsArr.Length; i++)
+            {
+                if (ItemDataManager.GetItemNum(cfg.partsArr[i]) > 0)
+                {
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.partsArr[i]);
+                    addition += itemCfg.addition;
+                }
+            }
+            return addition;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryLevelInfoUI.cs

@@ -17,6 +17,9 @@ namespace UI.Main
         public GRichTextField m_txtNeed;
         public GList m_listTag;
         public GRichTextField m_txtAddition;
+        public GButton m_btnAdditionDesc;
+        public GTextField m_txtAdditionDesc;
+        public GGroup m_grpAdditionDesc;
         public GTextField m_txtLevelDesc;
         public GLoader m_loaderHead;
         public GTextField m_txtTargetName;
@@ -86,6 +89,9 @@ namespace UI.Main
             m_txtNeed = (GRichTextField)comp.GetChild("txtNeed");
             m_listTag = (GList)comp.GetChild("listTag");
             m_txtAddition = (GRichTextField)comp.GetChild("txtAddition");
+            m_btnAdditionDesc = (GButton)comp.GetChild("btnAdditionDesc");
+            m_txtAdditionDesc = (GTextField)comp.GetChild("txtAdditionDesc");
+            m_grpAdditionDesc = (GGroup)comp.GetChild("grpAdditionDesc");
             m_txtLevelDesc = (GTextField)comp.GetChild("txtLevelDesc");
             m_loaderHead = (GLoader)comp.GetChild("loaderHead");
             m_txtTargetName = (GTextField)comp.GetChild("txtTargetName");
@@ -112,6 +118,9 @@ namespace UI.Main
             m_txtNeed = null;
             m_listTag = null;
             m_txtAddition = null;
+            m_btnAdditionDesc = null;
+            m_txtAdditionDesc = null;
+            m_grpAdditionDesc = null;
             m_txtLevelDesc = null;
             m_loaderHead = null;
             m_txtTargetName = null;

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs

@@ -74,7 +74,7 @@ namespace GFGGame
             _ui.m_comTipsBase.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             RarityIconController.UpdateRarityIcon(_ui.m_comTipsBase.m_loaRarity, itemCfg.id, false);
 
-
+            ET.Log.Debug(itemCfg.name + "  itemId:" + itemCfg.id);
         }
         private void UpdateScore()
         {

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

@@ -47,6 +47,14 @@ namespace GFGGame
 
         public static async ETTask CheckStoryFightResult()
         {
+            StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
+            if (storyLevelCfg.type == ConstInstanceZonesType.Filing)
+            {
+                FilingCfg filingCfg = FilingCfgArray.Instance.GetCfg(StudioDataManager.Instance.filingChapterId);
+                float addition = StudioDataManager.Instance.GetAdditionBySuitId(filingCfg.suitId);
+                addition = addition / 10000 * EquipDataCache.cacher.totalScore;
+                EquipDataCache.cacher.totalScore += (int)Math.Round(addition);
+            }
             var score = EquipDataCache.cacher.totalScore;
             //客户端先做判断，成功和失败处理不同
             var success = InstanceZonesDataManager.GetFightResult(score, out var npcScore);

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

@@ -341,6 +341,7 @@ namespace GFGGame
         private void Skip(object param = null)
         {
             Reset();
+
             InstanceZonesController.CheckStoryFightResult().Coroutine();
         }
         private void OnBtnBackClick()

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

@@ -43,6 +43,7 @@ namespace GFGGame
             _ui.m_btnStart.onClick.Add(OnClickBtnStart);
             _ui.m_btnFightOnce.onClick.Add(OnClickBtnFightOnce);
             _ui.m_btnFightTimes.onClick.Add(OnClickBtnFightTimes);
+            _ui.m_btnAdditionDesc.onClick.Add(OnBtnAdditionDescClick);
 
             _ui.m_btnGuide.onClick.Add(this.Hide);
 
@@ -267,6 +268,18 @@ namespace GFGGame
                 _ui.m_ctrlNeed.selectedIndex = 2;
                 _ui.m_listTag.numItems = fightCfg.needTagsArr.Length;
             }
+            else if (levelCfg.type == ConstInstanceZonesType.Filing)
+            {
+                _ui.m_ctrlNeed.selectedIndex = 3;
+                FilingCfg filingCfg = FilingCfgArray.Instance.GetCfg(StudioDataManager.Instance.filingChapterId);
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(filingCfg.suitId);
+                float addition = StudioDataManager.Instance.GetAdditionBySuitId(filingCfg.suitId);
+                addition = addition / 10000 * 100;
+                _ui.m_txtAddition.text = string.Format("{0}%加成", addition);
+                DressUpMenuSuitDataManager.GetSuitProgressBySuitId(filingCfg.suitId, out int count, out int totalCount);
+                _ui.m_txtAdditionDesc.text = string.Format("{0}套装收集进度:{1}/{2}", suitCfg.name, count, totalCount);
+                _ui.m_grpAdditionDesc.visible = false;
+            }
         }
 
         private void RenderListTagItem(int index, GObject obj)
@@ -281,6 +294,10 @@ namespace GFGGame
             UI_ListTagItem.ProxyEnd();
         }
 
+        private void OnBtnAdditionDescClick()
+        {
+            _ui.m_grpAdditionDesc.visible = !_ui.m_grpAdditionDesc.visible;
+        }
         private void CheckGuide(object param)
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0