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

FGUIProject/assets/Common/components/Button24.xml

@@ -5,7 +5,7 @@
     <image id="n0_f2bf" name="n0" src="f2bftjx" fileName="imagesExport/cpjl_anniuty_2.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_f2bf" name="n1" xy="0,-2" size="250,81" fontSize="44" color="#f3efef" align="center" vAlign="middle" autoSize="none" strokeColor="#ac9c9c" strokeSize="2" shadowColor="#a99e9e" shadowOffset="2,2" text="领取">
+    <text id="n1_f2bf" name="title" xy="0,-2" size="250,81" fontSize="44" color="#f3efef" align="center" vAlign="middle" autoSize="none" strokeColor="#ac9c9c" strokeSize="2" shadowColor="#a99e9e" shadowOffset="2,2" text="领取">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/CommonGame/components/BtnStyle1Small.xml

@@ -4,7 +4,7 @@
   <displayList>
     <loader id="n4_u2u3" name="icon" xy="0,0" size="144,43" aspect="true" url="ui://eg2y0ldpo9gh4m" fill="scale" autoSize="true"/>
     <text id="n3_u2u3" name="title" xy="51,4" pivot="0.5,0" size="41,35" font="ui://eg2y0ldpa0cftkz" fontSize="25" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
-      <relation target="" sidePair="middle-middle,left-right"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>
   <Button/>

FGUIProject/assets/League/LeaguePrayUI.xml

@@ -5,15 +5,15 @@
     <image id="n14_o9gh" name="n14" src="o9gh4r" fileName="images/biaotizi_7.png" xy="209,107"/>
     <component id="n15_o9gh" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="914,60"/>
     <component id="n9_rv09" name="comPary0" src="rv0929" fileName="components/ComPary.xml" xy="116,207">
-      <property target="LoaIcon" propertyId="1" value="ui://eg2y0ldpu2u3tkq"/>
+      <property target="LoaIcon" propertyId="1" value="ui://tw70qm9dofwu8b"/>
       <property target="txtName" propertyId="0" value="白檀香"/>
     </component>
     <component id="n10_rv09" name="comPary1" src="rv0929" fileName="components/ComPary.xml" xy="418,207">
-      <property target="LoaIcon" propertyId="1" value="ui://eg2y0ldpu2u3tkq"/>
+      <property target="LoaIcon" propertyId="1" value="ui://tw70qm9dofwu89"/>
       <property target="txtName" propertyId="0" value="苏合香"/>
     </component>
     <component id="n11_rv09" name="comPary2" src="rv0929" fileName="components/ComPary.xml" xy="720,207">
-      <property target="LoaIcon" propertyId="1" value="ui://eg2y0ldpu2u3tkq"/>
+      <property target="LoaIcon" propertyId="1" value="ui://tw70qm9dofwu8a"/>
       <property target="txtName" propertyId="0" value="天木香"/>
     </component>
   </displayList>

FGUIProject/assets/League/components/ComPary.xml

@@ -6,10 +6,10 @@
   </controller>
   <displayList>
     <image id="n14_o9gh" name="n14" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="0,0"/>
-    <image id="n13_o9gh" name="n13" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="32,66" pkg="eg2y0ldp"/>
+    <image id="n13_o9gh" name="n13" src="o9gh4g" fileName="imagesNew/lm_kuang_icon.png" pkg="eg2y0ldp" xy="32,66"/>
     <image id="n16_o9gh" name="n16" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="17,276"/>
-    <loader id="n2_rv09" name="LoaIcon" xy="74,109" pivot="0.5,0" size="128,128" aspect="true" url="ui://eg2y0ldpu2u3tkq" align="center" fill="scale"/>
-    <text id="n3_rv09" name="txtName" xy="83,270" pivot="0.5,0" size="107,48" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" text="白檀香"/>
+    <loader id="n2_rv09" name="LoaIcon" xy="66,101" pivot="0.5,0.5" size="144,144" aspect="true" url="ui://eg2y0ldpu2u3tkq" align="center" fill="scale"/>
+    <text id="n3_rv09" name="txtName" xy="83,270" pivot="0.5,0" size="107,47" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" text="白檀香"/>
     <text id="n9_a0cf" name="n9" xy="15,361" size="103,35" group="n17_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#b08d5c" text="每次祈福"/>
     <component id="n4_rv09" name="comGain" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="170,361" group="n17_o9gh" scale="0.7,0.7" controller="c1,1"/>
     <group id="n17_o9gh" name="n17" xy="15,361" size="289,46"/>

FGUIProject/assets/League/components/ListGiftButItem.xml

@@ -4,7 +4,7 @@
     <image id="n19_9jv6" name="n19" src="9jv65t" fileName="images/lm_kp_db_chang.png" xy="0,0" group="n22_9jv6"/>
     <loader id="n12_pvb4" name="loaIcon" xy="134,265" pivot="0.5,0.5" size="112,112" group="n22_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
     <text id="n15_pvb4" name="txtCount" xy="210,437" pivot="0.5,0" size="144,34" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="24" color="#b08548" letterSpacing="-2" text="今日剩余：1/1"/>
-    <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/BtnStyle1Small.xml" pkg="eg2y0ldp" xy="126,588" group="n22_9jv6">
+    <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/BtnStyle1Small.xml" pkg="eg2y0ldp" xy="109,588" size="156,49" group="n22_9jv6">
       <Button title="采购" icon="ui://eg2y0ldp9jv66c"/>
     </component>
     <component id="n16_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="124,636" pivot="0.5,0" group="n22_9jv6" scale="0.7,0.7" controller="c1,1"/>

FGUIProject/assets/League/components/ListGiftGetItem.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="386,759">
-  <controller name="c1" pages="0,,1," selected="0">
+  <controller name="c1" pages="0,,1," selected="1">
     <remark page="0" value="可领取"/>
     <remark page="1" value="已领取"/>
   </controller>
   <displayList>
-    <loader id="n29_9jv6" name="n29" xy="5,0" size="377,754" group="n28_9jv6" url="ui://tw70qm9d9jv65s" align="center" vAlign="middle" autoSize="true">
+    <loader id="n29_9jv6" name="n29" xy="5,0" size="377,754" group="n28_9jv6" url="ui://tw70qm9d9jv65p" align="center" vAlign="middle" autoSize="true">
       <gearIcon controller="c1" pages="0" values="ui://tw70qm9d9jv65s" default="ui://tw70qm9d9jv65p"/>
     </loader>
     <loader id="n21_9jv6" name="loaType" xy="22,101" size="62,203" group="n28_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
@@ -16,7 +16,7 @@
       <item/>
       <item/>
     </list>
-    <image id="n26_9jv6" name="n26" src="9jv66g" fileName="images/lm_biaoqian_ylq.png" xy="28,300" group="n28_9jv6">
+    <image id="n26_9jv6" name="n26" src="9jv66g" fileName="images/lm_biaoqian_ylq.png" xy="28,312" group="n28_9jv6">
       <gearDisplay controller="c1" pages="1"/>
     </image>
     <group id="n28_9jv6" name="n28" xy="-113,0" size="612,754"/>

FGUIProject/assets/League/package.xml

@@ -208,6 +208,9 @@
     <image id="e05086" name="tb_jn_1.png" path="/images/" exported="true"/>
     <image id="e05087" name="tb_jn_2.png" path="/images/" exported="true"/>
     <image id="e05088" name="tb_jn_4.png" path="/images/" exported="true"/>
+    <image id="ofwu89" name="tb_xiang_suhexiang.png" path="/images/"/>
+    <image id="ofwu8a" name="tb_xiang_tianmuxiang.png" path="/images/"/>
+    <image id="ofwu8b" name="tb_xiang_baitanxiang.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

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

@@ -129,7 +129,7 @@ namespace GFGGame
             _targetData.skillLvs.Clear();
             for (int i = 0; i < skillCfgs.Count; i++)
             {
-                _targetData.skillLvs.Add(fightCfg.targetSkillLvsArr[0]);
+                _targetData.skillLvs.Add(fightCfg.targetSkillLvs);
             }
             _targetData.itemScoreList.Clear();
             for (int i = 0; i < fightCfg.targetPartsScoreArr.Length; i++)

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

@@ -108,6 +108,7 @@ namespace GFGGame
             }
             item.m_comItem.m_c1.selectedIndex = _getDatas[index].IsGet ? 1 : 0;
             item.m_comItem.m_loaType.url = string.Format("ui://League/lm_biaoqian_{0}", _getDatas[index].GiftCfg.type);
+            item.m_comItem.m_loaIcon.url = ResPathUtil.GetIconPath(_getDatas[index].GiftCfg.res, "png");
             item.m_comItem.m_listGift.data = _getDatas[index].GiftCfg.bonusArr;
             item.m_comItem.m_listGift.numItems = _getDatas[index].GiftCfg.bonusArr.Length;
             if (item.target.data == null)
@@ -128,6 +129,7 @@ namespace GFGGame
             item.m_comItem.m_txtCount.text = string.Format(strCount, buyData.GiftCfg.limit - buyData.BuyCount, buyData.GiftCfg.limit);
             long day = TimeUtil.FormattingTime11(TimeHelper.ServerNow(), buyData.EndTime);
             item.m_comItem.m_loaType.url = string.Format("ui://League/lm_biaoqian_{0}", _buyDatas[index].GiftCfg.type);
+            item.m_comItem.m_loaIcon.url = ResPathUtil.GetIconPath(_buyDatas[index].GiftCfg.res, "png");
             item.m_comItem.m_txtTime.visible = buyData.EndTime != 0;
             item.m_comItem.m_txtTime.text = string.Format("剩余{0}天", StringUtil.GetColorText(day.ToString(), "#E45E29"));
             item.m_comItem.m_grpLock.visible = LeagueDataManager.Instance.HallLevel < buyData.GiftCfg.level;

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

@@ -61,8 +61,9 @@ namespace GFGGame
                 }
                 PassivitySkillCfg skillCfg = PassivitySkillCfgArray.Instance.GetCfg(skillId);
                 _ui.m_comSkillShow.m_txtName.text = skillCfg.name;
-                _ui.m_comSkillShow.m_ComSkillScore.m_txtCount.text = skillScoreDic[skillId].ToString();
-
+                _ui.m_comSkillShow.m_ComSkillScore.m_txtCount.SetVar("value", skillScoreDic[skillId].ToString()).FlushVars();
+                _ui.m_comSkillShow.m_ComSkillScore.m_txtCount1.SetVar("value", skillScoreDic[skillId].ToString()).FlushVars();
+                _ui.m_comSkillShow.m_ComSkillScore.m_c1.selectedIndex = skillScoreDic[skillId] >= 0 ? 0 : 1;
                 string res = skillCfg.res;
                 if (string.IsNullOrEmpty(skillCfg.res))
                 {

GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeAddUpView.cs

@@ -80,6 +80,8 @@ namespace GFGGame
             _curSelectIndex = Math.Max(0, RoleDataManager.vipLv - 1);
             _ui.m_list.selectedIndex = _curSelectIndex;
             _ui.m_list.ScrollToView(_curSelectIndex);
+            _ui.m_btnLeft.visible = _curSelectIndex == 0 ? false : true;
+            _ui.m_btnRight.visible = _curSelectIndex < _ui.m_list.numItems - 1 ? true : false;
             ShopViewManager.Instance.UpdateVipProgressCom(_ui.m_comVipLv.target);
             UpdateRedDot();
         }
@@ -245,6 +247,8 @@ namespace GFGGame
         {
             _curSelectIndex = _ui.m_list.GetFirstChildInView();
             _ui.m_list.selectedIndex = _curSelectIndex;
+            _ui.m_btnLeft.visible = _curSelectIndex == 0 ? false : true;
+            _ui.m_btnRight.visible = _curSelectIndex < _ui.m_list.numItems - 1 ? true : false;
         }
 
         private void UpdateRedDot()