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

FGUIProject/assets/CommonGame/package.xml

@@ -389,6 +389,7 @@
     <image id="m5qxs" name="ty_tc_l_db.png" path="/imagesNew/" exported="true"/>
     <image id="jx6zpm" name="lm_touxiangdb.png" path="/imagesNew/" exported="true"/>
     <image id="m5qxtos" name="an_m_white.png" path="/imagesNew/"/>
+    <image id="ruejtot" name="tc_bt_dk.png" path="/imagesNew/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Mail/MailUI.xml

@@ -5,10 +5,10 @@
     <image id="n18_m5qx" name="n18" src="m5qxs" fileName="imagesNew/ty_tc_l_db.png" pkg="eg2y0ldp" xy="32,191"/>
     <graph id="n20_m5qx" name="holderLeftTop" xy="160,115" size="69,35"/>
     <graph id="n21_m5qx" name="holderRightDowm" xy="894,1299" size="69,35"/>
-    <image id="n15_m5qx" name="n15" src="m5qxr" fileName="images/xgnc_btkuang.png" xy="320,59" group="n17_m5qx"/>
-    <text id="n16_m5qx" name="n16" xy="507,95" pivot="0.5,0.5" anchor="true" size="160,51" group="n17_m5qx" font="ui://eg2y0ldpa0cftkx" fontSize="38" color="#a98151" letterSpacing="2" text="系统邮箱"/>
-    <group id="n17_m5qx" name="n17" xy="320,59" size="386,71"/>
-    <list id="n7_ehs9" name="list" xy="50,229" size="902,900" overflow="scroll" lineGap="17" defaultItem="ui://y44a413eehs9d">
+    <image id="n15_m5qx" name="n15" src="ruejtot" fileName="imagesNew/tc_bt_dk.png" pkg="eg2y0ldp" xy="299,66" group="n17_m5qx"/>
+    <text id="n16_m5qx" name="n16" xy="502,98" pivot="0.5,0.5" anchor="true" size="81,52" group="n17_m5qx" font="ui://eg2y0ldpa0cftkx" fontSize="38" color="#a98151" letterSpacing="2" text="邮箱"/>
+    <group id="n17_m5qx" name="n17" xy="299,66" size="406,63"/>
+    <list id="n7_ehs9" name="list" xy="50,229" size="902,872" overflow="scroll" lineGap="33" defaultItem="ui://y44a413eehs9d">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/Mail/components/ListItem.xml

@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="901,148">
-  <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
-    <image id="n7_ehs9" name="bg" src="m5qxtoq" fileName="imagesNew/dx_db.png" pkg="eg2y0ldp" xy="0,0"/>
-    <image id="n10_m5qx" name="n10" src="jx6zpm" fileName="imagesNew/lm_touxiangdb.png" pkg="eg2y0ldp" xy="76,10" size="291,283" scale="0.46,0.46"/>
-    <loader id="n4_ehs9" name="loaIcon" xy="142,76" pivot="0.5,0.5" anchor="true" size="84,84" url="ui://y44a413eehs90" autoSize="true">
+    <loader id="n12_ruej" name="bg" xy="0,0" size="901,148" url="ui://eg2y0ldpm5qxtoq" autoSize="true"/>
+    <image id="n10_m5qx" name="n10" src="jx6zpm" fileName="imagesNew/lm_touxiangdb.png" pkg="eg2y0ldp" xy="76,8" size="291,283" scale="0.46,0.46"/>
+    <loader id="n4_ehs9" name="loaIcon" xy="142,76" pivot="0.5,0.5" anchor="true" size="66,41" touchable="false" url="ui://y44a413em5qxv" autoSize="true">
       <gearIcon controller="c1" pages="0,1,2,3" values="ui://y44a413em5qxv|ui://y44a413eehs96|ui://y44a413eehs97|ui://y44a413eehs90"/>
     </loader>
-    <text id="n5_ehs9" name="txtTitle" xy="215,26" size="423,52" font="ui://eg2y0ldpa0cftkx" fontSize="32" color="#9b7853" vAlign="middle" autoSize="none" autoClearText="true" text="请稍后..."/>
-    <text id="n6_ehs9" name="txtTime" xy="215,80" size="187,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#c19f7b" autoClearText="true" text="剩余时间：5天"/>
-    <component id="n8_ehs9" name="btnLook" src="m5qxtoo" fileName="components/Button18.xml" pkg="eg2y0ldp" xy="635,37">
-      <Button title="前往"/>
-    </component>
+    <text id="n5_ehs9" name="txtTitle" xy="214,23" size="423,52" font="ui://eg2y0ldpa0cftkx" fontSize="32" color="#9b7853" vAlign="middle" autoSize="none" autoClearText="true" text="请稍后..."/>
+    <text id="n6_ehs9" name="txtTime" xy="636,80" size="199,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#c19f7b" autoSize="none" autoClearText="true" text="剩余时间：5天"/>
   </displayList>
 </component>

FGUIProject/assets/Mail/package.xml

@@ -19,6 +19,7 @@
     <image id="oq7rp" name="yx_xiant_1.png" path="/images/"/>
     <image id="m5qxr" name="xgnc_btkuang.png" path="/images/" scale="9grid" scale9grid="99,17,198,34"/>
     <image id="m5qxv" name="tb_youjian.png" path="/images/"/>
+    <image id="ruejw" name="系统邮箱.png" path="/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Mail" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -28,6 +28,27 @@ namespace GFGGame
             {
                 _decomposeData[rarity].Add(itemId);
             }
+
+            //套装拥有的时候需要让材料重新加进列表
+            int[][] syntheticMateriarsArr = ItemDataManager.GetItemSyntheticSuitArr(itemId);
+            if (syntheticMateriarsArr.Length > 0) {
+                foreach (int[] materiars in syntheticMateriarsArr)
+                {
+                    int materialId = materiars[0];
+                    int materialItemType = ItemDataManager.GetItemType(materialId);
+                    if (materialItemType == ConstItemType.DRESS_UP) { 
+                        long materiarsCount = ItemCanDecomposeCount(materialId);
+                        if (materiarsCount> 0 && (materiarsCount + materiars[1] - DeductSynthesisNeedNum(materialId)) > 0)
+                        {
+                            rarity = ItemDataManager.GetItemRarity(materialId);
+                            if (_decomposeData[rarity].IndexOf(materialId) < 0)
+                            {
+                                _decomposeData[rarity].Add(materialId);
+                            }
+                        }
+                    }
+                }
+            }
         }
 
         public void Remove(int itemId)

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

@@ -150,6 +150,17 @@ namespace GFGGame
             return itemCfg.itemType;
         }
 
+        public static int[][] GetItemSyntheticSuitArr(int itemId)
+        {
+            _dataDic.TryGetValue(itemId, out var value);
+            if (value != null && value.syntheticMateriarsArr != null && value.syntheticMateriarsArr.Length > 0)
+            {
+                return value.syntheticMateriarsArr;
+            }
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            return itemCfg.syntheticMateriarsArr;
+        }
+
         public static int GetItemSubType(int itemId)
         {
             _dataDic.TryGetValue(itemId, out var value);

GameClient/Assets/Game/HotUpdate/Data/VO/ItemData.cs

@@ -10,6 +10,7 @@ namespace GFGGame
         public int itemType;
         public int subType;
         public int rarity;
+        public int[][] syntheticMateriarsArr;
 
         private Dictionary<int, int> AttributesDic = new Dictionary<int, int>();
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Mail/UI_ListItem.cs

@@ -8,11 +8,10 @@ namespace UI.Mail
     {
         public GComponent target;
         public Controller m_c1;
-        public GImage m_bg;
+        public GLoader m_bg;
         public GLoader m_loaIcon;
         public GTextField m_txtTitle;
         public GTextField m_txtTime;
-        public GButton m_btnLook;
         public const string URL = "ui://y44a413eehs9d";
         public const string PACKAGE_NAME = "Mail";
         public const string RES_NAME = "ListItem";
@@ -61,11 +60,10 @@ namespace UI.Mail
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_bg = (GImage)comp.GetChild("bg");
+            m_bg = (GLoader)comp.GetChild("bg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_btnLook = (GButton)comp.GetChild("btnLook");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -74,7 +72,6 @@ namespace UI.Mail
             m_loaIcon = null;
             m_txtTitle = null;
             m_txtTime = null;
-            m_btnLook = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/Mail/MailView.cs

@@ -119,11 +119,11 @@ namespace GFGGame
             long endTime = (data.timeSec + _retainDay * TimeUtil.SECOND_PER_DAY * 1000);
             string str = TimeUtil.FormattingTime(TimeHelper.ServerNow(), endTime);
             item.m_txtTime.text = string.Format("剩余时间：{0}", str);
-            if (item.m_btnLook.data == null)
+            if (item.m_bg.data == null)
             {
-                item.m_btnLook.onClick.Add(OnClickBtnLook);
+                item.m_bg.onClick.Add(OnClickBtnLook);
             }
-            item.m_btnLook.data = mailId;
+            item.m_bg.data = mailId;
 
             UI_ListItem.ProxyEnd();
         }

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

@@ -214,7 +214,7 @@ namespace GFGGame
             {
                 _time = currentChapterIndex - 2;
             }
-            else if (currentChapterIndex == childrenCount - 2)
+            else if (currentChapterIndex >= 1 && currentChapterIndex <= childrenCount - 2)
             {
                 _time = currentChapterIndex - 1;
             }