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

FGUIProject/assets/League/LeagueJoinUI.xml

@@ -25,7 +25,7 @@
     <text id="n13_a0cf" name="n13" xy="608,422" pivot="0.5,0" size="116,39" group="n15_a0cf" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" align="center" text="是否审核"/>
     <text id="n14_a0cf" name="n14" xy="857,422" pivot="0.5,0" size="60,39" group="n15_a0cf" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" align="center" text="操作"/>
     <group id="n15_a0cf" name="n15" xy="0,420" size="1080,41" group="n16_a0cf"/>
-    <list id="n5_u2u3" name="list" xy="70,484" size="936,968" group="n16_a0cf" lineGap="17" defaultItem="ui://tw70qm9drv091f" autoClearItems="true">
+    <list id="n5_u2u3" name="list" xy="70,484" size="936,968" group="n16_a0cf" lineGap="5" defaultItem="ui://tw70qm9drv091f" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
@@ -33,8 +33,9 @@
       <item/>
       <item/>
       <item/>
+      <item/>
     </list>
-    <component id="n6_u2u3" name="btnChange" src="a0cf2z" fileName="components/Button42.xml" xy="375,1510" group="n16_a0cf">
+    <component id="n6_u2u3" name="btnChange" src="a0cf2z" fileName="components/Button42.xml" xy="375,1526" group="n16_a0cf">
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="换一批"/>
     </component>

FGUIProject/assets/League/components/ListJoinItem.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="935,137">
+<component size="935,144">
   <displayList>
-    <text id="n7_u2u3" name="txtLeagueName" xy="150,23" size="188,39" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#923c1a" autoClearText="true" text="联盟名字7个字"/>
-    <text id="n11_u2u3" name="txtMemberCount" xy="401,49" pivot="0.5,0" size="55,37" fontSize="27" color="#66512c" align="center" vars="true" text="{value=0}/{maxValue=70}"/>
-    <text id="n12_rv09" name="txtCheck" xy="584,49" pivot="0.5,0" size="30,38" font="ui://eg2y0ldpa0cftks" fontSize="27" color="#66512c" align="center" text="是"/>
-    <component id="n14_rv09" name="btnJoin" src="rv091e" fileName="components/Button5.xml" xy="704,43" pkg="mk0fwx0x">
+    <text id="n7_u2u3" name="txtLeagueName" xy="150,23" size="188,39" group="n19_duuf" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#923c1a" autoClearText="true" text="联盟名字7个字"/>
+    <text id="n11_u2u3" name="txtMemberCount" xy="401,49" pivot="0.5,0" size="54,37" group="n19_duuf" fontSize="27" color="#66512c" align="center" vars="true" text="{value=0}/{maxValue=70}"/>
+    <text id="n12_rv09" name="txtCheck" xy="584,49" pivot="0.5,0" size="30,37" group="n19_duuf" font="ui://eg2y0ldpa0cftks" fontSize="27" color="#66512c" align="center" text="是"/>
+    <component id="n14_rv09" name="btnJoin" src="rv091e" fileName="components/BtnSmall.xml" pkg="mk0fwx0x" xy="704,43" group="n19_duuf">
       <Button title="申请"/>
     </component>
-    <component id="n15_a0cf" name="comLeagueHead" src="a0cf30" fileName="components/ComLeagueHead.xml" xy="5,0"/>
-    <image id="n17_a0cf" name="n17" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="2,138"/>
-    <image id="n18_a0cf" name="imgAd" src="a0cf2j" fileName="images/lm_yz.png" xy="150,74"/>
+    <component id="n15_a0cf" name="comLeagueHead" src="a0cf30" fileName="components/ComLeagueHead.xml" xy="5,0" group="n19_duuf"/>
+    <image id="n17_a0cf" name="n17" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="2,138" group="n19_duuf"/>
+    <image id="n18_a0cf" name="imgAd" src="a0cf2j" fileName="images/lm_yz.png" xy="150,74" group="n19_duuf"/>
+    <group id="n19_duuf" name="n19" xy="2,0" size="931,150"/>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/LuckyBoxActivityUI.xml

@@ -27,7 +27,7 @@
     <group id="n52_mbf1" name="n52" xy="9,246" size="151,459" advanced="true"/>
     <image id="n56_mbf1" name="n56" src="mbf1tam" fileName="images/cj_tswz_db.png" xy="136,1497" group="n54_mbf1"/>
     <image id="n53_mbf1" name="n53" src="mbf1tam" fileName="images/cj_tswz_db.png" xy="136,1497" group="n54_mbf1"/>
-    <text id="n44_mbf1" name="txtCount" xy="284,1496" pivot="0.5,0" size="511,42" group="n54_mbf1" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#fff7d4" align="center" vars="true" text="{value=15}次摘星内必得【{name=沧海月明}】限定部件"/>
+    <text id="n44_mbf1" name="txtCount" xy="280,1496" pivot="0.5,0" size="519,42" group="n54_mbf1" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#fff7d4" align="center" ubb="true" vars="true" text="[color=#4BFB4B]{value=15}[/color] 次摘星内必得【{name=沧海月明}】限定部件"/>
     <group id="n54_mbf1" name="n54" xy="136,1496" size="808,43" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>

FGUIProject/assets/LuckyBox/components/ComCard.xml

@@ -2,7 +2,7 @@
 <component size="948,970">
   <displayList>
     <graph id="n6_dcro" name="holder" xy="473,484" size="1,1" visible="false" touchable="false" type="rect"/>
-    <loader id="n2_qdrt" name="loaIcon" xy="295,257" pivot="0.5,0.5" size="424,424" aspect="true" url="ui://eg2y0ldpkubi7e" align="center" vAlign="middle" fill="scaleMatchWidth"/>
+    <loader id="n2_qdrt" name="loaIcon" xy="332,294" pivot="0.5,0.5" size="350,350" aspect="true" url="ui://eg2y0ldpm9wm8v" align="center" vAlign="middle" fill="scaleMatchWidth"/>
     <text id="n5_qdrt" name="txtDiscribe" xy="473,1056" pivot="0.5,0" anchor="true" size="406,101" visible="false" fontSize="30" color="#c2a773" autoSize="none" text="赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王"/>
     <image id="n12_duuf" name="n12" src="volstbk" fileName="imageNews/zx_zhuangshi_diaoshi.png" xy="645,164" group="n13_duuf"/>
     <loader id="n1_qdrt" name="loaType" xy="645,299" size="44,94" group="n13_duuf" url="ui://eg2y0ldpo9ghtll" fill="scaleMatchWidth" autoSize="true"/>

GameClient/Assets/Editor/Xasset/Builds/BuildTask.cs

@@ -107,10 +107,6 @@ namespace VEngine.Editor.Builds
             var suitCfgs = SuitCfgArray.Instance.dataArray;
             foreach(var suitCfg in suitCfgs)
             {
-                if (suitCfg.isHide <= 0)
-                {
-                    continue;
-                }
                 HideSuitActionRes(suitCfg, hideFilePathList, hideDirPahtList);
             }
             //卡牌资源打包屏蔽
@@ -130,6 +126,7 @@ namespace VEngine.Editor.Builds
             }
             CheckAssets();
             EditorUtility.ClearProgressBar();
+            return;
             FinishBuild();
         }
 
@@ -154,9 +151,33 @@ namespace VEngine.Editor.Builds
             string resPath;
             if(!string.IsNullOrEmpty(suitCfg.aniRes))
             {
-                //立绘
-                //resPath = ResPathUtil.GetDressUpPath(suitCfg.aniRes);
-                //hideFilePathList.Add(resPath);
+                //屏蔽立绘资源，临时代码，下个大版本将删除
+                bool used = false;
+                var luckyboxCfgs = LuckyBoxCfgArray.Instance.dataArray;
+                foreach(var luckyboxCfg in luckyboxCfgs)
+                {
+                    if(luckyboxCfg.isAni <= 0 && luckyboxCfg.suitIdArr != null)
+                    {
+
+                        if (Array.IndexOf(luckyboxCfg.suitIdArr, suitCfg.id) >= 0)
+                        {
+                            used = true;
+                        }
+                    }
+                }
+                if(used)
+                {
+                    Debug.Log($"suit {suitCfg.id} used picture res");
+                }
+                else
+                {
+                    resPath = ResPathUtil.GetDressUpPath(suitCfg.aniRes);
+                    hideFilePathList.Add(resPath);
+                }
+                if (suitCfg.isHide <= 0)
+                {
+                    return;
+                }
                 //动画
                 resPath = ResPathUtil.GetDressUpAnimationDirPath(suitCfg.aniRes);
                 hideDirPahtList.Add(resPath);

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

@@ -28,6 +28,7 @@ namespace GFGGame
             ET.Log.Debug("vipLv:" + level);
             ET.Log.Debug("vipExp:" + RoleDataManager.vipExp);
             VipCfg vipCfg = VipCfgArray.Instance.GetCfg(RoleDataManager.vipLv);
+            if (vipCfg == null) return;
             VipCfg nextVipCfg = VipCfgArray.Instance.GetCfg(RoleDataManager.vipLv + 1);
             com.m_txtTipsFull.visible = RoleDataManager.vipExp >= vipCfg.num && nextVipCfg == null;
             com.m_grpTips.visible = nextVipCfg != null || RoleDataManager.vipExp < vipCfg.num;

GameClient/Assets/Game/HotUpdate/ServerProxy/DailyWelfareSProxy.cs

@@ -66,8 +66,8 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     // DailyWelfareManager.Instance.SupplyRewardDatas.Add(id);
-                    List<ItemData> bonus = ItemUtil.CreateItemDataList(response.reward);
-                    BonusController.TryShowBonusList(bonus);
+                    DailySupplyCfg supplyCfg = DailySupplyCfgArray.Instance.GetCfg(id);
+                    BonusController.TryShowBonusList(supplyCfg.bonusArr);
                     return true;
                 }
             }

GameClient/Assets/Game/HotUpdate/ServerProxy/LeagueSproxy.cs

@@ -86,6 +86,7 @@ namespace GFGGame
                         leagueData.SubOwnerId = 0;
                     }
                 }
+                LeagueDataManager.Instance.LeagueData.Num = LeagueDataManager.Instance.LeagueData.Num - 1;
                 EventAgent.DispatchEvent(ConstMessage.LEAGUE_MEMBER_CHANGE);
             }
             await ETTask.CompletedTask;
@@ -108,6 +109,7 @@ namespace GFGGame
             {
                 LeagueMemberData memberData = LeagueSproxy.GetLeagueMemberData(message.RoleInfo);
                 LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[memberData.RoleInfo.roleId] = memberData;
+                LeagueDataManager.Instance.LeagueData.Num = LeagueDataManager.Instance.LeagueData.Num + 1;
             }
             EventAgent.DispatchEvent(ConstMessage.LEAGUE_MEMBER_CHANGE);
             await ETTask.CompletedTask;