Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/CommonGame/components/ButtonBack.xml

@@ -3,11 +3,11 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <controller name="c1" exported="true" pages="0,浅色底,1,深色底" selected="0"/>
   <displayList>
-    <loader id="n4_uyux" name="loaBg" xy="-35,6" size="578,116" touchable="false" url="ui://eg2y0ldpuyuxtj7" autoSize="true">
-      <gearIcon controller="c1" pages="0,1" values="ui://eg2y0ldpuyuxtj7|ui://eg2y0ldpuyuxtj8"/>
+    <loader id="n4_uyux" name="loaBg" xy="-35,6" size="578,116" visible="false" touchable="false" autoSize="true">
+      <gearIcon controller="c1" pages="0,1" values="|ui://eg2y0ldpuyuxtj8"/>
     </loader>
     <loader id="n3_uyux" name="icon" xy="0,0" size="90,90" url="ui://eg2y0ldpuyuxtj4" autoSize="true"/>
-    <loader id="n5_uyux" name="loaTitle" xy="118,18" size="161,54" url="ui://eg2y0ldpuyuxtj6" autoSize="true"/>
+    <loader id="n5_uyux" name="loaTitle" xy="118,18" size="161,54" autoSize="true"/>
   </displayList>
   <Button/>
   <customProperty target="loaTitle" propertyId="1"/>

FGUIProject/assets/Studio/components/Button3.xml

@@ -2,7 +2,7 @@
 <component size="276,186" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n3_v482" name="n3" src="v4822d" fileName="images/cyjd_di_5.png" xy="0,0"/>
+    <image id="n3_v482" name="n3" src="v4822d" fileName="images/cyjd_di_5.png" xy="0,0" visible="false"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/Travel/TravelUI.xml

@@ -17,8 +17,8 @@
       <property target="loaTitle" propertyId="1" value="ui://jitclg1gwono1a"/>
     </component>
     <image id="n8_wono" name="n8" src="wonoo" fileName="images/xqfs_yldik_1.png" xy="2,280" group="n16_wono"/>
-    <loader id="n17_r9ri" name="n17" xy="250,439" size="495,749" group="n16_wono" url="ui://jitclg1gwono9" autoSize="true">
-      <gearIcon controller="c1" pages="0,1" values="ui://jitclg1gwono9|ui://jitclg1gwonob" default="ui://jitclg1gwonoa"/>
+    <loader id="n17_r9ri" name="n17" xy="299,520" size="522,733" group="n16_wono" scale="0.9,0.9" url="ui://jitclg1gwonob" autoSize="true">
+      <gearIcon controller="c1" pages="0,1" values="ui://jitclg1gwonob|ui://jitclg1gwonob" default="ui://jitclg1gwonoa"/>
     </loader>
     <component id="n1_wono" name="btnTips" src="wono3" fileName="components/Button1.xml" xy="926,372" group="n16_wono">
       <Button title="tips" controller="c2" page="1"/>

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

@@ -33,6 +33,11 @@ namespace GFGGame
         {
             CardData cardData = new CardData();
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cardInfoProto.CardId);
+            if (itemCfg == null)
+            {
+                ET.Log.Error(cardInfoProto.CardId + "ItemCfgArray配置不存在");
+                return;
+            }
             cardData.id = cardInfoProto.CardId;
             cardData.lv = cardInfoProto.Lvl;
             cardData.exp = cardInfoProto.Exp;

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

@@ -151,17 +151,17 @@ namespace GFGGame
             int suitHaveCount = 0;
             int suitTotalCount = 1;
             DressUpMenuSuitDataManager.GetTotalProgress(out suitHaveCount, out suitTotalCount);
-            int chapterItemHaveCount = 0;
-            int chapterItemTotalCount = 1;
-            InstanceZonesDataManager.GetTotalProgress(out chapterItemHaveCount, out chapterItemTotalCount);
-            int travelHaveCount = 0;
-            int travelTotalCount = 1;
-            TravelDataManager.Instance.GetTotalTravelProgress(out travelHaveCount, out travelTotalCount);
+            // int chapterItemHaveCount = 0;
+            // int chapterItemTotalCount = 1;
+            // InstanceZonesDataManager.GetTotalProgress(out chapterItemHaveCount, out chapterItemTotalCount);
+            // int travelHaveCount = 0;
+            // int travelTotalCount = 1;
+            // TravelDataManager.Instance.GetTotalTravelProgress(out travelHaveCount, out travelTotalCount);
 
-            int haveCount = suitHaveCount + chapterItemHaveCount + travelHaveCount;
-            int totalCount = suitTotalCount + chapterItemTotalCount + travelTotalCount;
+            // int haveCount = suitHaveCount + chapterItemHaveCount + travelHaveCount;
+            // int totalCount = suitTotalCount + chapterItemTotalCount + travelTotalCount;
 
-            decimal value = Math.Floor((decimal)100 * haveCount / totalCount);
+            decimal value = Math.Floor((decimal)100 * suitHaveCount / suitTotalCount);
             return value;
 
         }

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/SuitCfgManager.cs

@@ -23,7 +23,7 @@ namespace GFGGame
         public int GetItemSuitId(int itemId)
         {
             var itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-            if(itemCfg != null)
+            if (itemCfg != null)
             {
                 return itemCfg.suitId;
             }
@@ -38,7 +38,7 @@ namespace GFGGame
         public int GetTotalCountOfOneSuit(int suitId)
         {
             var suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
-            if(suitCfg != null)
+            if (suitCfg != null)
             {
                 return suitCfg.partsArr.Length;
             }
@@ -54,6 +54,11 @@ namespace GFGGame
         {
 
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+            if (suitCfg == null)
+            {
+                ET.Log.Error(suitId + "  SuitCfgArrayÅäÖò»´æÔÚ");
+                return new int[] { };
+            }
             if (checkScene)
             {
                 List<int> parts = new List<int>();