雅集问题修复

FGUIProject/assets/League/LeagueMemberAppointUI.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,647">
-  <controller name="c1" pages="0,,1," selected="1">
+  <controller name="c1" pages="0,,1," selected="0">
     <remark page="0" value="副会长"/>
     <remark page="1" value="会长"/>
   </controller>
-  <controller name="c2" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="c2" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
     <image id="n7_wm60" name="n7" src="o9gh40" fileName="images/tanchuang.png" xy="0,0" size="1021,647"/>
     <image id="n10_o9gh" name="n10" src="o9gh4j" fileName="images/lm_biaotizi_6.png" xy="260,88"/>
-    <component id="n17_o9gh" name="btnClose" src="a0cftl2" fileName="components/BtnCloose.xml" pkg="eg2y0ldp" xy="911,26"/>
-    <component id="n6_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="612,88">
+    <component id="n17_o9gh" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="911,26"/>
+    <component id="n6_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="612,88" size="36,37">
       <Button icon="ui://tw70qm9do9gh4b"/>
     </component>
     <image id="n11_o9gh" name="n11" src="o9gh4h" fileName="images/lm_kuang_3.png" xy="60,149" group="n16_o9gh"/>
@@ -27,14 +27,14 @@
       <Button controller="c2" page="2"/>
       <property target="txtName" propertyId="0" value="副社长"/>
     </component>
-    <component id="n2_rv09" name="btnAppoint2" src="rv091s" fileName="components/Button15.xml" xy="230,357" group="n3_rv09">
+    <component id="n2_rv09" name="btnAppoint2" src="rv091s" fileName="components/Button15.xml" xy="230,211" group="n3_rv09">
       <gearDisplay controller="c1" pages="0,1"/>
-      <Button checked="true" controller="c2" page="3"/>
+      <Button controller="c2" page="3"/>
       <property target="txtName" propertyId="0" value="御史"/>
     </component>
-    <group id="n3_rv09" name="n3" xy="230,211" size="620,199" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
+    <group id="n3_rv09" name="n3" xy="230,211" size="620,53" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
     <component id="n5_rv09" name="btnKick" src="rv091g" fileName="components/BtnBig.xml" pkg="mk0fwx0x" xy="410,520">
-      <Button title="请离联盟"/>
+      <Button title="请离雅集"/>
     </component>
     <image id="n18_o9gh" name="n18" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,480"/>
   </displayList>

FGUIProject/assets/League/LeagueMemberUI.xml

@@ -37,14 +37,14 @@
     <component id="n23_rv09" name="btnRecruit" src="rv091r" fileName="components/Button14.xml" xy="90,1564" group="n25_rv09">
       <Button title="招募成员"/>
     </component>
-    <component id="n22_rv09" name="btnApplyList" src="rv091p" fileName="components/BtnYellowBig.xml" pkg="eg2y0ldp" xy="317,1564" group="n25_rv09">
+    <component id="n22_rv09" name="btnApplyList" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="317,1564" group="n25_rv09">
       <Button title="申请列表"/>
     </component>
-    <component id="n24_rv09" name="btnMemberLog" src="rv091p" fileName="components/BtnYellowBig.xml" pkg="eg2y0ldp" xy="544,1564" group="n25_rv09">
-      <Button title="联盟信息"/>
+    <component id="n24_rv09" name="btnMemberLog" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="544,1564" group="n25_rv09">
+      <Button title="雅集信息"/>
     </component>
     <component id="n21_rv09" name="btnExit" src="rv091o" fileName="components/Button11.xml" xy="771,1562" group="n25_rv09">
-      <Button title="退出联盟"/>
+      <Button title="退出雅集"/>
     </component>
     <group id="n25_rv09" name="n25" xy="90,1562" size="900,61" advanced="true" layout="hz" colGap="40" excludeInvisibles="true">
       <gearDisplay controller="c1" pages="1"/>
@@ -53,7 +53,7 @@
     <component id="n35_wm60" name="btnExit1" src="wm603x" fileName="components/Button111.xml" xy="375,1562">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottom-bottom"/>
-      <Button title="退出联盟"/>
+      <Button title="退出雅集"/>
     </component>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueUI.xml

@@ -18,7 +18,7 @@
     </component>
     <text id="n30_gfx4" name="txtLowKeep" xy="771,32" pivot="1,0" size="255,41" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#ff0000" align="right" text="已连续低维护：1天"/>
     <image id="n23_o9gh" name="n23" src="o9gh45" fileName="images/lm_zjm_lmmzkuang.png" xy="139,261" group="n31_fqor"/>
-    <text id="n10_u2u3" name="txtUnionName" xy="185,263" pivot="0.5,0" size="212,44" group="n31_fqor" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fff6dc" align="center" autoClearText="true" text="联盟名字7个字"/>
+    <text id="n10_u2u3" name="txtUnionName" xy="185,263" pivot="0.5,0" size="212,44" group="n31_fqor" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fff6dc" align="center" autoClearText="true" text="雅集名字7个字"/>
     <component id="n20_a0cf" name="comLeagueHead" src="a0cf30" fileName="components/ComLeagueHead.xml" xy="44,213" group="n31_fqor"/>
     <group id="n31_fqor" name="n31" xy="44,213" size="405,136"/>
     <image id="n25_o9gh" name="n25" src="o9gh47" fileName="images/lm_zjm_gonggao.png" xy="599,253" size="444,136" group="n26_o9gh">

FGUIProject/assets/League/components/ListSkillItem.xml

@@ -10,11 +10,8 @@
     <loader id="n10_pvb4" name="loaScore" xy="28,3" size="44,44" group="n13_pvb4" url="ui://eg2y0ldp842s6h"/>
     <text id="n11_pvb4" name="txtScore" xy="73,0" size="60,50" group="n13_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="37" color="#7c561e" letterSpacing="-2" text="+10"/>
     <group id="n13_pvb4" name="n13" xy="28,0" size="105,50"/>
-    <image id="n17_gfx4" name="imgLock" src="miy37h" fileName="images/lm_ch_wdl_zz.png" xy="-6,-6" group="n22_miy3"/>
-    <image id="n21_miy3" name="n21" src="miy37t" fileName="imagesNew/tb_suo.png" pkg="eg2y0ldp" xy="59,75" group="n22_miy3"/>
-    <group id="n22_miy3" name="grpLock" xy="-6,-6" size="175,174" advanced="true">
-      <gearDisplay controller="c1" pages="0"/>
-    </group>
+    <image id="n17_gfx4" name="imgLock" src="miy37h" fileName="images/lm_ch_wdl_zz.png" xy="-6,-6"/>
+    <image id="n21_miy3" name="imgSuo" src="miy37t" fileName="imagesNew/tb_suo.png" pkg="eg2y0ldp" xy="59,75"/>
     <component id="n12_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="16,127" pivot="0.5,0" scale="0.75,0.75" controller="c1,1"/>
   </displayList>
 </component>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillItem.cs

@@ -12,7 +12,7 @@ namespace UI.League
         public GLoader m_loaScore;
         public GTextField m_txtScore;
         public GImage m_imgLock;
-        public GGroup m_grpLock;
+        public GImage m_imgSuo;
         public GComponent m_comCost;
         public const string URL = "ui://tw70qm9dpvb45d";
         public const string PACKAGE_NAME = "League";
@@ -66,7 +66,7 @@ namespace UI.League
             m_loaScore = (GLoader)comp.GetChild("loaScore");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
             m_imgLock = (GImage)comp.GetChild("imgLock");
-            m_grpLock = (GGroup)comp.GetChild("grpLock");
+            m_imgSuo = (GImage)comp.GetChild("imgSuo");
             m_comCost = (GComponent)comp.GetChild("comCost");
         }
         public void Dispose(bool disposeTarget = false)
@@ -76,7 +76,7 @@ namespace UI.League
             m_loaScore = null;
             m_txtScore = null;
             m_imgLock = null;
-            m_grpLock = null;
+            m_imgSuo = null;
             m_comCost = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/Views/League/LeagueApplyView.cs

@@ -29,12 +29,14 @@ namespace GFGGame
             packageName = UI_LeagueApplyUI.PACKAGE_NAME;
             _ui = UI_LeagueApplyUI.Create();
             this.viewCom = _ui.target;
-            isfullScreen = true;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
             _ui.m_btnNoCheck.onClick.Add(OnBtnNoCheckClick);
             _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
-            _ui.m_btnRule.data = 300006;
+            _ui.m_btnRule.data = 300007;
             _ui.m_btnClose.onClick.Add(Hide);
 
             _ui.m_list.itemRenderer = RenderListItem;

GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberAppointView.cs

@@ -35,7 +35,7 @@ namespace GFGGame
 
             _ui.m_btnClose.onClick.Add(Hide);
             _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
-            _ui.m_btnRule.data = 300007;
+            _ui.m_btnRule.data = 300006;
             _ui.m_btnKick.onClick.Add(OnBtnKickClick);
             _ui.m_btnAppoint0.target.onClick.Add(OnBtnAppointClick);
             _ui.m_btnAppoint0.target.data = LeaguePos.Owner;

GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberLogView.cs

@@ -26,7 +26,9 @@ namespace GFGGame
             packageName = UI_LeagueMemberLogUI.PACKAGE_NAME;
             _ui = UI_LeagueMemberLogUI.Create();
             this.viewCom = _ui.target;
-            isfullScreen = true;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_btnClose.onClick.Add(Hide);
             _ui.m_list.itemRenderer = RenderListItem;

GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs

@@ -149,7 +149,18 @@ namespace GFGGame
             item.m_loaScore.url = ResPathUtil.GetScorePath(skillCfgs[index].score);
             item.m_txtScore.text = "+" + skillCfgs[index].value.ToString();
             bool isLock = !SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) || SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(skillCfgs[index].id) < 0;
-            item.m_grpLock.visible = isLock;
+            item.m_imgLock.visible = isLock;
+            bool canActive = true;
+            List<LeagueSkillCfg> lastSkillCfgs = LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(_type, skillCfgs[index].layer - 1);
+            for (int i = 0; i < lastSkillCfgs.Count; i++)
+            {
+                if (!SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) || SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(lastSkillCfgs[i].id) < 0)
+                {
+                    canActive = false;
+                    break;
+                }
+            }
+            item.m_imgSuo.visible = !canActive;
             ItemUtil.UpdateItemNeedNum(item.m_comCost, skillCfgs[index].consumeArr[0], false, "#FFFBF4");
             if (item.target.data == null)
             {