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

FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusUI.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1344">
   <displayList>
-    <component id="n1_mbf1" name="comBg" src="mbf1tn5" fileName="componentsBg/ComBg001.xml" pkg="eg2y0ldp" xy="0,0" size="1080,1344">
-      <property target="loaTitle" propertyId="1" value="ui://ubfk2kobmbf1b"/>
-    </component>
+    <image id="n5_e050" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,-2" size="1021,1346" group="n7_e050"/>
+    <component id="n6_e050" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="896,17" group="n7_e050"/>
+    <group id="n7_e050" name="n7" xy="0,-2" size="1021,1346"/>
     <list id="n3_mbf1" name="list" xy="98,173" size="883,1055" overflow="scroll" lineGap="22" defaultItem="ui://ubfk2kobmbf19" align="center" vAlign="middle">
       <item/>
       <item/>

FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskUI.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1344">
   <displayList>
-    <component id="n1_mbf1" name="comBg" src="mbf1tn5" fileName="componentsBg/ComBg001.xml" pkg="eg2y0ldp" xy="0,0" size="1080,1344">
-      <property target="loaTitle" propertyId="1" value="ui://ubfk2kobmbf1c"/>
-    </component>
+    <image id="n5_e050" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0" size="1021,1346" group="n7_e050"/>
+    <component id="n6_e050" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="896,16" group="n7_e050"/>
+    <group id="n7_e050" name="n7" xy="0,0" size="1021,1346"/>
     <list id="n3_mbf1" name="list" xy="98,173" size="883,1055" overflow="scroll" lineGap="22" defaultItem="ui://ubfk2kobmbf19" align="center" vAlign="middle">
       <item/>
       <item/>

FGUIProject/assets/CommonGame/componentsBg/ComBg000.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,992">
   <displayList>
-    <image id="n0_qik1" name="n0" src="qik1tm6" fileName="componentsBg/tanchuang_2.png" xy="0,0"/>
-    <component id="n1_qik1" name="btnClose" src="cu9wtmj" fileName="components/BtnCancel.xml" pkg="2bsz6nel" xy="896,8"/>
+    <image id="n0_qik1" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" xy="0,0" size="1021,992"/>
+    <component id="n1_qik1" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" xy="897,16"/>
     <image id="n2_qik1" name="n2" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="220,111" group="n5_qik1"/>
     <text id="n4_qik1" name="txtTitle" xy="380,92" pivot="0.5,0" size="348,54" group="n5_qik1" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" text="稀有升星材料(自选)"/>
     <image id="n3_qik1" name="n3" src="qik1tca" fileName="componentsBg/lm_dt_zsx2.png" xy="758,111" group="n5_qik1"/>

FGUIProject/assets/CommonGame/componentsBg/ComBg001.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,992">
   <displayList>
-    <image id="n0_qik1" name="n0" src="qik1tm6" fileName="componentsBg/tanchuang_2.png" xy="0,0">
+    <image id="n0_qik1" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" xy="0,0" size="1021,989">
       <relation target="" sidePair="height-height"/>
     </image>
-    <component id="n1_qik1" name="btnClose" src="cu9wtmj" fileName="components/BtnCancel.xml" pkg="2bsz6nel" xy="896,8"/>
+    <component id="n1_qik1" name="btnClose" src="e050tob" fileName="componentsBg/Component2.xml" xy="896,17"/>
     <loader id="n6_mbf1" name="loaTitle" xy="264,94" pivot="0.5,0" size="560,34" url="ui://eg2y0ldpmbf1tn6" autoSize="true"/>
   </displayList>
   <customProperty target="loaTitle" propertyId="1"/>

FGUIProject/assets/CommonGame/componentsBg/Component2.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="88,82">
+  <displayList>
+    <component id="n1_qik1" name="btnClose" src="cu9wtmj" fileName="components/BtnCancel.xml" pkg="2bsz6nel" xy="0,0"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/package.xml

@@ -318,7 +318,6 @@
     <image id="qik1tm3" name="jjsjs_txk_2.png" path="/images/"/>
     <image id="qik1tm4" name="pmts_xtk_1.png" path="/images/"/>
     <image id="qik1tm5" name="phbphb_txkk.png" path="/images/"/>
-    <image id="qik1tm6" name="tanchuang_2.png" path="/componentsBg/" scale="9grid" scale9grid="254,247,510,329"/>
     <component id="qik1tcb" name="ComBg000.xml" path="/componentsBg/" exported="true"/>
     <image id="qik1tca" name="lm_dt_zsx2.png" path="/componentsBg/"/>
     <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
@@ -363,6 +362,7 @@
     <image id="e050to6" name="tb_yajijiangzhang.png" path="/imgItemIcon/" exported="true"/>
     <image id="e050to7" name="tb_yajizijin.png" path="/imgItemIcon/" exported="true"/>
     <image id="e050to8" name="tb_zhizaoli.png" path="/imgItemIcon/" exported="true"/>
+    <component id="e050tob" name="Component2.xml" path="/componentsBg/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/components/Component1.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="350,75" overflow="hidden">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n29_pjip" name="n29" src="wonodz" fileName="images/dz_hz_fsk_2.png" xy="31,9">
       <gearDisplay controller="c1" pages="0"/>
@@ -8,7 +8,7 @@
     <image id="n28_pjip" name="n28" src="j48o3y" fileName="images/dz_hz_bxbx.png" xy="0,0">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <text id="n30_pjip" name="txtNeedName" xy="84,16" size="221,39" fontSize="28" color="#b08649" align="center" vAlign="middle" letterSpacing="-2" autoSize="none" autoClearText="true" text="孔雀东">
+    <text id="n30_pjip" name="txtNeedName" xy="74,18" size="208,39" fontSize="28" color="#b08649" align="center" vAlign="middle" letterSpacing="-2" autoSize="none" autoClearText="true" text="孔雀东南飞飞">
       <gearDisplay controller="c1" pages="0"/>
     </text>
     <list id="n31_oixc" name="listTag" xy="24,18" size="220,38" layout="row" lineGap="12" colGap="22" defaultItem="ui://eg2y0ldpih7566" vAlign="middle" autoClearItems="true">
@@ -16,5 +16,6 @@
       <item/>
       <item/>
     </list>
+    <image id="n32_ofwu" name="imgGot" src="ofwuf7" fileName="imagesNew/tb_gou_yiyongyou.png" xy="262,15" visible="false"/>
   </displayList>
 </component>

FGUIProject/assets/DressUp/package.xml

@@ -196,7 +196,7 @@
     <component id="v461f3" name="ComFightScore.xml" path="/components/"/>
     <image id="v461f4" name="jjcdi_jjcdi.png" path="/images/"/>
     <image id="v461f5" name="jjcdi_jjxian.png" path="/images/"/>
-    <image id="rv09f6" name="jjsy_xx_1(1).png" path="/images/"/>
+    <image id="ofwuf7" name="tb_gou_yiyongyou.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/EnduringGiftBox/components/ComLeftGiftBox.xml

@@ -2,7 +2,7 @@
 <component size="204,188">
   <displayList>
     <image id="n0_qqhz" name="n0" src="qqhzf" fileName="images/cz_lbicon_db.png" xy="10,0" group="n7_qqhz"/>
-    <loader id="n9_qqhz" name="loaIcon" xy="117,95" pivot="0.5,0.5" anchor="true" size="120,104" group="n7_qqhz" fill="scale"/>
+    <loader id="n9_qqhz" name="loaIcon" xy="115,94" pivot="0.5,0.5" anchor="true" size="136,120" group="n7_qqhz" fill="scale"/>
     <component id="n6_qqhz" name="comDiscount" src="qqhz1o" fileName="components/ComDiscount.xml" xy="0,2" group="n7_qqhz"/>
     <component id="n8_qqhz" name="comGouMaiGetText" src="qqhz1r" fileName="components/ComGouMaiGetText.xml" xy="10,127" group="n7_qqhz"/>
     <group id="n7_qqhz" name="n7" xy="0,0" size="204,186"/>

FGUIProject/assets/League/components/ComLeader.xml

@@ -6,7 +6,7 @@
     </component>
     <image id="n6_wm60" name="n6" src="wm6037" fileName="images/lm_db_touxiang.png" xy="0,0"/>
     <loader id="n10_wm60" name="loaHeadBorder" xy="157,180" pivot="0.5,0.5" anchor="true" size="230,203" scale="1.2,1.2" url="ui://eg2y0ldpwm60tl7" autoSize="true"/>
-    <loader id="n4_rv09" name="loaTitle" xy="69,100" size="35,113" url="ui://tw70qm9dwm603p" autoSize="true" clearOnPublish="true"/>
+    <loader id="n4_rv09" name="loaTitle" xy="45,112" size="35,113" url="ui://tw70qm9dwm603p" autoSize="true" clearOnPublish="true"/>
     <image id="n8_wm60" name="n8" src="wm6035" fileName="images/lm_mz_db.png" xy="30,257" group="n11_wm60"/>
     <text id="n9_wm60" name="txtLvl" xy="41,259" pivot="0.5,0" size="35,44" group="n11_wm60" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" text="20"/>
     <group id="n11_wm60" name="n11" xy="30,257" size="300,55"/>

FGUIProject/assets/League/components/ListSkillItem.xml

@@ -3,9 +3,7 @@
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n16_gfx4" name="n16" src="miy37n" fileName="images/lm_ch_dldb.png" xy="0,0" pivot="0.5,0"/>
-    <loader id="n23_miy3" name="loaIcon" xy="25,25" pivot="0.5,0.5" size="112,112" url="ui://eg2y0ldpu2u3tkq" autoSize="true">
-      <gearIcon controller="c1" pages="0" values="ui://eg2y0ldpu2u3tkq" default=""/>
-    </loader>
+    <loader id="n23_miy3" name="loaIcon" xy="22,22" pivot="0.5,0.5" size="115,115" url="ui://tw70qm9de05086" autoSize="true"/>
     <image id="n20_miy3" name="n20" src="miy37i" fileName="images/lm_ch_szdk.png" xy="-7,127"/>
     <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"/>

FGUIProject/assets/League/package.xml

@@ -202,6 +202,12 @@
     <component id="idkd80" name="ComSkillUp.xml" path="/"/>
     <component id="vols81" name="ComLine.xml" path="/components/"/>
     <image id="duuf82" name="lm_zjm_lxdwh_db.png" path="/images/"/>
+    <image id="e05083" name="tb_jn_5.png" path="/images/" exported="true"/>
+    <image id="e05084" name="tb_jn_6.png" path="/images/" exported="true"/>
+    <image id="e05085" name="tb_jn_3.png" path="/images/" exported="true"/>
+    <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"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -20,7 +20,7 @@
     <component id="n51_psph" name="myHead" src="o9ghtlq" fileName="components/ComHead2.xml" pkg="eg2y0ldp" xy="214,228" pivot="0.5,0.5" anchor="true" group="n66_e050" scale="0.7,0.7"/>
     <component id="n52_psph" name="targetHead" src="o9ghtlq" fileName="components/ComHead2.xml" pkg="eg2y0ldp" xy="932,228" pivot="0.5,0.5" anchor="true" group="n66_e050" scale="0.7,0.7"/>
     <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="147,83" pivot="0,0.5" anchor="true" group="n66_e050">
-      <ProgressBar value="100" max="100"/>
+      <ProgressBar value="50" max="100"/>
     </component>
     <group id="n66_e050" name="n66" xy="99,66" size="948,276"/>
   </displayList>

FGUIProject/assets/Main/components/ProgressBarTargetScore.xml

@@ -2,6 +2,7 @@
 <component size="850,33" extention="ProgressBar">
   <displayList>
     <image id="n11_fqor" name="n11" src="qkjsla" fileName="imagesNew/pro_bk_in.png" xy="-36,0"/>
+    <image id="n22_e050" name="n22" src="e050oz" fileName="imagesNew/jdt_shuangrenzd.png" xy="0,4"/>
     <component id="n1_uj53" name="comBar" src="k1khe7" fileName="components/Component2.xml" xy="0,4"/>
     <image id="n8_v95q" name="imgAni" src="k1khdp" fileName="imagesStory/zd_zdjdt_liang.png" xy="849,16" pivot="0.518,0.438" anchor="true" alpha="0.76">
       <relation target="n1_uj53" sidePair="right-right"/>

FGUIProject/assets/Main/package.xml

@@ -647,6 +647,7 @@
     <component id="t6j1ow" name="BtnModle2.xml" path="/components/"/>
     <image id="t6j1ox" name="zd_shanghai_db.png" path="/imagesNew/"/>
     <image id="jt8doy" name="db_qipaokuang.png" path="/imagesNew/" scale="9grid" scale9grid="17,9,177,18"/>
+    <image id="e050oz" name="jdt_shuangrenzd.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Store/StoreBlackCardRewardUI.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,992">
   <displayList>
-    <component id="n0_qik1" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" pkg="eg2y0ldp" xy="0,0">
-      <property target="txtTitle" propertyId="0" value="黑金卡专属"/>
-    </component>
+    <image id="n15_e050" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0" size="1021,992" group="n17_e050"/>
+    <component id="n16_e050" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="896,16" group="n17_e050"/>
+    <group id="n17_e050" name="n17" xy="0,0" size="1021,992"/>
     <image id="n6_qik1" name="n6" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="132,796"/>
     <text id="n7_qik1" name="n7" xy="241,822" size="682,86" fontSize="32" color="#a88656" align="center" autoSize="none" text="黑金卡玩家，每月1日5点起，可免费领取黑金卡 专属单品，请注意及时领取，逾期失效。"/>
     <list id="n14_qik1" name="list" xy="147,176" size="809,590" layout="flow_hz" lineGap="10" colGap="20" defaultItem="ui://p9mtgheoqik1tcj" autoClearItems="true">

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -251,7 +251,7 @@ namespace GFGEditor
             }
             foreach (string dir in sourceDirs)
             {
-                files = FileUtil.CopyFilesTo(dir, targetDir, saveName, new string[] { ".png", ".jpg", ".mp3", ".meta", ".mat", ".shader", ".tga", ".FBX", ".max", ".cs" }, ragule);
+                files = FileUtil.CopyFilesTo(dir, targetDir, saveName, new string[] { ".png", ".jpg", ".mp3", ".meta", ".mat", ".shader", ".tga", ".FBX", ".max" }, ragule);
                 foreach (var file in files)
                 {
                     Debug.LogFormat("更新{0}", file);

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

@@ -35,8 +35,8 @@ namespace GFGGame
         public int CurFightIndex = 0;//当前挑战场次下标
         public List<long> myScore = new List<long>();//对战数据，三轮分数
         public List<long> targetScore = new List<long>();//对战数据，三轮分数
-        public List<long> myFightScore = new List<long>();//对战数据，竞技场战力，搭配战力,卓越点击战力,卡牌战力
-        public List<long> targetFightScore = new List<long>();//对战数据，对手竞技场战力，搭配战力,卓越点击战力,卡牌战力
+        public List<long> myFightPower = new List<long>();//对战数据，竞技场战力，搭配战力,卓越点击战力,卡牌战力
+        public List<long> targetFightPower = new List<long>();//对战数据，对手竞技场战力，搭配战力,卓越点击战力,卡牌战力
 
         /*************************************************************************************************************************************/
 
@@ -74,8 +74,8 @@ namespace GFGGame
             // TextureDic.Clear();
             myScore.Clear();
             targetScore.Clear();
-            myFightScore.Clear();
-            targetFightScore.Clear();
+            myFightPower.Clear();
+            targetFightPower.Clear();
             roundTime.Clear();
             targetRoundTime.Clear();
             // LastTargetInfo = null;

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

@@ -68,7 +68,7 @@ namespace GFGGame
             item.m_loaMyCard.m_comCardmask.m_loaCard.url = cardCfg == null ? "" : ResPathUtil.GetCardSmallPath(cardCfg.res);
             ItemCfg targetCardCfg = ItemCfgArray.Instance.GetCfg(targetCardId);
             item.m_loaTargetCard.m_comCardmask.m_loaCard.url = targetCardCfg == null ? "" : ResPathUtil.GetCardSmallPath(targetCardCfg.res);
-            RoleInfoManager.Instance.UpdateHead(item.m_comMyHead, myHeadId, myHeadBorderId);
+            RoleInfoManager.Instance.UpdateHead(item.m_comMyHead, RoleDataManager.headId, RoleDataManager.headBorderId);
             if (targetHeadId > 0)
             {
                 RoleInfoManager.Instance.UpdateHead(item.m_comTargetHead, targetHeadId, targetBorderId);
@@ -116,7 +116,7 @@ namespace GFGGame
             com.m_txtTargetFightScore.text = targetAllScore.ToString();
             UI_ComAllScore.ProxyEnd();
 
-            bool isWin = winCount >= 2;
+            bool isWin = myAllScore > targetAllScore;
             return isWin;
         }
         /// <summary>

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

@@ -124,7 +124,13 @@ namespace GFGGame
             _targetData.cardId = fightCfg.targetCardId;
             _targetData.cardScore = fightCfg.targetCardScore;
             _targetData.tags = fightCfg.needTagsArr;
-            _targetData.skillLvs = new List<int>(fightCfg.targetSkillLvsArr);
+
+            List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(_targetData.cardId);
+            _targetData.skillLvs.Clear();
+            for (int i = 0; i < skillCfgs.Count; i++)
+            {
+                _targetData.skillLvs.Add(fightCfg.targetSkillLvsArr[0]);
+            }
             _targetData.itemScoreList.Clear();
             for (int i = 0; i < fightCfg.targetPartsScoreArr.Length; i++)
             {

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

@@ -23,6 +23,7 @@ namespace GFGGame
         public const int PART_PREFACT_CLICK = 8;//每次优秀点击
         public const int PART_FIGHT_BEGIN = 9;//每回合开始
         public const int PART_FIGHT_END = 10;//每回合结束
+        public const int ALL_PERFECT_START = 11;//登封造极开始
     }
 
 
@@ -300,6 +301,7 @@ namespace GFGGame
           || skillLvlCfg.beginTime == BeginTime.PART_PREFACT_CLICK && currentTime == BeginTime.PART_PREFACT_CLICK
           || skillLvlCfg.beginTime == BeginTime.PART_FIGHT_BEGIN && currentTime == BeginTime.PART_FIGHT_BEGIN
           || skillLvlCfg.beginTime == BeginTime.PART_FIGHT_END && currentTime == BeginTime.PART_FIGHT_END
+          || skillLvlCfg.beginTime == BeginTime.ALL_PERFECT_START && currentTime == BeginTime.ALL_PERFECT_START
           || skillLvlCfg.beginTime <= BeginTime.PART_SCORE_6 && currentTime == BeginTime.PART_FIGHT_BEGIN && partId == skillLvlCfg.beginTime)
             {
                 return true;

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

@@ -9,7 +9,7 @@ namespace GFGGame
         public int Type; //类型，由FightTargetType定义
         public OtherRoleInfoData RoleInfo = new OtherRoleInfoData(); //玩家数据
         public List<FightData> FightDatas = new List<FightData>();//搭配列表，与RobotDressupList只能存在一个，取决于Type
-        public List<long> FightScores = new List<long>();//搭配战力,卓越点击战力,卡牌战力
+        public List<long> FightPower = new List<long>();//搭配战力,卓越点击战力,卡牌战力
 
     }
 
@@ -24,7 +24,7 @@ namespace GFGGame
         public ArenaTargetData targetData;
         public List<long> MyScores = new List<long>();//自己3轮战斗分数
         public List<long> TargetScores = new List<long>();//对手3轮战斗分数
-        public List<long> FightScores = new List<long>();//自己 搭配战力,卓越点击战力,卡牌战力,对方的在targetData里
+        public List<long> FightPower = new List<long>();//自己 搭配战力,卓越点击战力,卡牌战力,对方的在targetData里
 
     }
 }

GameClient/Assets/Game/HotUpdate/Effect.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b35b8e2b0a0f19b4fb3a72e1d19c58c3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Effect/AutoRotation.cs

@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class AutoRotation : MonoBehaviour
+{
+    public Vector3 EulerAngleSpeed;
+    public bool running = true;
+
+    void Update()
+    {
+        if (running && EulerAngleSpeed != Vector3.zero)
+        {
+            transform.localRotation = Quaternion.Euler(EulerAngleSpeed * Time.deltaTime) * transform.localRotation;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Effect/AutoRotation.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 99a33f4cc350ca44485132f794e31efc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxBonusUI.cs

@@ -7,7 +7,8 @@ namespace UI.ActivityThemeLuckyBox
     public partial class UI_ActivityThemeLuckyBoxBonusUI
     {
         public GComponent target;
-        public GComponent m_comBg;
+        public GImage m_imgBg;
+        public GButton m_btnClose;
         public GList m_list;
         public const string URL = "ui://ubfk2kobmbf16";
         public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
@@ -56,12 +57,14 @@ namespace UI.ActivityThemeLuckyBox
 
         private void Init(GComponent comp)
         {
-            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_imgBg = (GImage)comp.GetChild("imgBg");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comBg = null;
+            m_imgBg = null;
+            m_btnClose = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxTaskUI.cs

@@ -7,7 +7,8 @@ namespace UI.ActivityThemeLuckyBox
     public partial class UI_ActivityThemeLuckyBoxTaskUI
     {
         public GComponent target;
-        public GComponent m_comBg;
+        public GImage m_imgBg;
+        public GButton m_btnClose;
         public GList m_list;
         public const string URL = "ui://ubfk2kobmbf1d";
         public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
@@ -56,12 +57,14 @@ namespace UI.ActivityThemeLuckyBox
 
         private void Init(GComponent comp)
         {
-            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_imgBg = (GImage)comp.GetChild("imgBg");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comBg = null;
+            m_imgBg = null;
+            m_btnClose = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg000.cs

@@ -7,6 +7,7 @@ namespace UI.CommonGame
     public partial class UI_ComBg000
     {
         public GComponent target;
+        public GImage m_imgBg;
         public GButton m_btnClose;
         public GTextField m_txtTitle;
         public const string URL = "ui://eg2y0ldpqik1tcb";
@@ -56,11 +57,13 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
+            m_imgBg = (GImage)comp.GetChild("imgBg");
             m_btnClose = (GButton)comp.GetChild("btnClose");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_imgBg = null;
             m_btnClose = null;
             m_txtTitle = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg001.cs

@@ -7,7 +7,8 @@ namespace UI.CommonGame
     public partial class UI_ComBg001
     {
         public GComponent target;
-        public GButton m_btnClose;
+        public GImage m_imgBg;
+        public UI_Component2 m_btnClose;
         public GLoader m_loaTitle;
         public const string URL = "ui://eg2y0ldpmbf1tn5";
         public const string PACKAGE_NAME = "CommonGame";
@@ -56,11 +57,14 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_imgBg = (GImage)comp.GetChild("imgBg");
+            m_btnClose = (UI_Component2)UI_Component2.Create(comp.GetChild("btnClose"));
             m_loaTitle = (GLoader)comp.GetChild("loaTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_imgBg = null;
+            m_btnClose.Dispose();
             m_btnClose = null;
             m_loaTitle = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Component2.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_Component2
+    {
+        public GComponent target;
+        public GButton m_btnClose;
+        public const string URL = "ui://eg2y0ldpe050tob";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "Component2";
+        private static UI_Component2 _proxy;
+
+        public static UI_Component2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component2();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Component2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_btnClose = (GButton)comp.GetChild("btnClose");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnClose = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Component2.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 931278ede28fbff47baf54a9149d84f7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_Component1.cs

@@ -10,6 +10,7 @@ namespace UI.DressUp
         public Controller m_c1;
         public GTextField m_txtNeedName;
         public GList m_listTag;
+        public GImage m_imgGot;
         public const string URL = "ui://mbo439wbpjip31";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "Component1";
@@ -60,12 +61,14 @@ namespace UI.DressUp
             m_c1 = comp.GetController("c1");
             m_txtNeedName = (GTextField)comp.GetChild("txtNeedName");
             m_listTag = (GList)comp.GetChild("listTag");
+            m_imgGot = (GImage)comp.GetChild("imgGot");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_txtNeedName = null;
             m_listTag = null;
+            m_imgGot = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreBlackCardRewardUI.cs

@@ -7,7 +7,8 @@ namespace UI.Store
     public partial class UI_StoreBlackCardRewardUI
     {
         public GComponent target;
-        public GComponent m_comBg;
+        public GImage m_imgBg;
+        public GButton m_btnClose;
         public GList m_list;
         public const string URL = "ui://p9mtgheoqik1tc8";
         public const string PACKAGE_NAME = "Store";
@@ -56,12 +57,14 @@ namespace UI.Store
 
         private void Init(GComponent comp)
         {
-            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_imgBg = (GImage)comp.GetChild("imgBg");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comBg = null;
+            m_imgBg = null;
+            m_btnClose = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

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

@@ -351,7 +351,7 @@ namespace GFGGame
             arenaHistory.Grade = arenaHistoryProto.Grade;
             arenaHistory.Rank = arenaHistoryProto.Rank;
             arenaHistory.targetData = GetArenaTargetData(arenaHistoryProto.target);
-            arenaHistory.FightScores = arenaHistoryProto.SelfFightPower;
+            arenaHistory.FightPower = arenaHistoryProto.SelfFightPower;
             arenaHistory.GradeChangeType = arenaHistoryProto.GradeChangeType;
             arenaHistory.MyScores = arenaHistoryProto.SelfRandScore;
             arenaHistory.TargetScores = arenaHistoryProto.TargetRandScore;
@@ -365,7 +365,7 @@ namespace GFGGame
             arenaTarget.Grade = arenaTargetProto.Grade;
             arenaTarget.RankInGrade = arenaTargetProto.RankInGrade;
             arenaTarget.Type = arenaTargetProto.Type;
-            arenaTarget.FightScores = arenaTargetProto.FightPower;
+            arenaTarget.FightPower = arenaTargetProto.FightPower;
             if (arenaTarget.Type == FightTargetType.PLAYER)
             {
                 arenaTarget.RoleInfo = RoleDataManager.GetOtherRoleInfoData(arenaTargetProto.RoleInfo);
@@ -438,7 +438,9 @@ namespace GFGGame
             fightData.res = string.IsNullOrEmpty(robotProto.RobotHead) ? "self" : robotProto.RobotHead;
             double cardScore = (double)robotCfg.cardScore * randoms;
             fightData.cardScore = (int)Math.Ceiling(cardScore);
+
             List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(fightData.cardId);
+            fightData.skillLvs.Clear();
             for (int i = 0; i < skillCfgs.Count; i++)
             {
                 fightData.skillLvs.Add(robotCfg.skillLvs);

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

@@ -151,6 +151,11 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     RoleDataManager.headId = response.HeadItemId;
+                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
+                    {
+                        LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId].RoleInfo.headId = RoleDataManager.headId;
+                    }
+
                     EventAgent.DispatchEvent(ConstMessage.CHANGE_ROLE_HEAD);
                     return true;
                 }
@@ -167,6 +172,10 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     RoleDataManager.headBorderId = response.HeadBorderItemId;
+                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
+                    {
+                        LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId].RoleInfo.headBorderId = RoleDataManager.headBorderId;
+                    }
                     EventAgent.DispatchEvent(ConstMessage.CHANGE_ROLE_HEAD);
                     return true;
                 }

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusView.cs

@@ -32,6 +32,7 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_btnClose.onClick.Add(Hide);
 
         }
         protected override void AddEventListener()

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs

@@ -3,6 +3,7 @@ using ET;
 using FairyGUI;
 using UI.ActivityThemeLuckyBox;
 using UnityEngine;
+using UI.CommonGame;
 
 namespace GFGGame
 {
@@ -32,7 +33,7 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_list.itemRenderer = RenderListItem;
-
+            _ui.m_btnClose.onClick.Add(Hide);
         }
         protected override void AddEventListener()
         {

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaFightRecordView.cs

@@ -63,7 +63,7 @@ namespace GFGGame
             item.m_txtTargetName.text = historyData.targetData.RoleInfo.roleName;
             item.m_txtRank.text = historyData.targetData.RankInGrade.ToString();
 
-            item.m_txtTargetFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(historyData.targetData.FightScores));
+            item.m_txtTargetFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(historyData.targetData.FightPower));
             ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, historyData.targetData.Grade);
             TimeUtil.FormattingTime(historyData.FightTime, TimeHelper.ServerNow(), out int num, out string str);
             str = str == "秒" ? "刚刚" : num + str + "前";

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRankView.cs

@@ -242,7 +242,7 @@ namespace GFGGame
                 if (arenaData.Type == FightTargetType.PLAYER)
                 {
                     //上榜的玩家一定战斗过，可以直接计算
-                    item.m_txtFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightScores));
+                    item.m_txtFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightPower));
                     RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, arenaData.RoleInfo.headBorderId);
                 }
                 else
@@ -300,10 +300,10 @@ namespace GFGGame
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, arenaData.RoleInfo.roleLv);
                 if (arenaData.Type == FightTargetType.PLAYER)
                 {
-                    long fightScore = _rankType != ArenaRankType.LAST_SEASON && rank > 100 && isSelf ? ArenaDataManager.Instance.GetAllFightScore(ArenaDataManager.Instance.DressupList) : ArenaDataManager.Instance.GetAllFightScore(arenaData.FightScores);
+                    long fightScore = _rankType != ArenaRankType.LAST_SEASON && rank > 100 && isSelf ? ArenaDataManager.Instance.GetAllFightScore(ArenaDataManager.Instance.DressupList) : ArenaDataManager.Instance.GetAllFightScore(arenaData.FightPower);
                     //上榜的玩家一定战斗过，可以直接计算
                     item.m_txtFightScore.text = string.Format("飞花令战力：{0}", fightScore);
-                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, arenaData.RoleInfo.headBorderId);
+                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.roleId == RoleDataManager.roleId ? RoleDataManager.headId : arenaData.RoleInfo.headId, arenaData.RoleInfo.roleId == RoleDataManager.roleId ? RoleDataManager.headBorderId : arenaData.RoleInfo.headBorderId);
                 }
                 else
                 {

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -99,8 +99,8 @@ namespace GFGGame
                 _dataManager.CurFightIndex = 0;
                 _dataManager.myScore.Clear();
                 _dataManager.targetScore.Clear();
-                _dataManager.myFightScore.Clear();
-                _dataManager.targetFightScore.Clear();
+                _dataManager.myFightPower.Clear();
+                _dataManager.targetFightPower.Clear();
 
                 UpdateTargetList();
             }
@@ -269,34 +269,31 @@ namespace GFGGame
         {
             _dataManager.myScore.Clear();
             _dataManager.targetScore.Clear();
-            _dataManager.myFightScore.Clear();
-            _dataManager.targetFightScore.Clear();
+            _dataManager.myFightPower.Clear();
+            _dataManager.targetFightPower.Clear();
 
-            int winCount = 0;
             if (_targetData.Type == FightTargetType.PLAYER)
             {
                 await ArenaSproxy.ReqArenaFightAttr(_targetData.RoleInfo.roleId, _targetData.FightDatas);
             }
+            long allScore = 0;
+            long targetAllScore = 0;
             for (int i = 0; i < _dataManager.ThemeList.Count; i++)
             {
-                long score = 0;
-                long targetScore = 0;
-
-
-                FightDataManager.Instance.GetQuickFightResult(i, _dataManager.DressupList[i], _targetData.FightDatas[i], out score, out targetScore);
+                FightDataManager.Instance.GetQuickFightResult(i, _dataManager.DressupList[i], _targetData.FightDatas[i], out long score, out long targetScore);
 
+                allScore += score;
+                targetAllScore += targetScore;
                 _dataManager.myScore.Add(score);
                 _dataManager.targetScore.Add(targetScore);
-                if (score > targetScore) winCount++;
             }
 
-            _dataManager.myFightScore = _dataManager.GetFightScoreList(_dataManager.DressupList);
-            _dataManager.targetFightScore = _dataManager.GetFightScoreList(_targetData.FightDatas);
-            bool result = await ArenaSproxy.ReqArenaFight(winCount >= 2, _targetData, _dataManager.myFightScore, _dataManager.targetFightScore, _dataManager.myScore, _dataManager.targetScore);
+            _dataManager.myFightPower = _dataManager.GetFightScoreList(_dataManager.DressupList);
+            _dataManager.targetFightPower = _dataManager.GetFightScoreList(_targetData.FightDatas);
+            bool result = await ArenaSproxy.ReqArenaFight(allScore > targetAllScore, _targetData, _dataManager.myFightPower, _dataManager.targetFightPower, _dataManager.myScore, _dataManager.targetScore);
 
             if (GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0 && _showOtherTargetGuide < 0)
             {
-
                 _showOtherTargetGuide = result ? 1 : 0;
             }
             return result;

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -152,16 +152,19 @@ namespace GFGGame
                 {
                     _ui.m_compNeed.m_txtNeedName.text = ItemUtil.GetItemName(_fightCfg.needItemId);
                     _ui.m_compNeed.target.data = _fightCfg.needItemId;
+                    _ui.m_compNeed.m_imgGot.visible = ItemDataManager.GetItemNum(_fightCfg.needItemId) > 0;
                 }
                 else if (_fightCfg.needSuitId > 0)
                 {
                     _ui.m_compNeed.m_txtNeedName.text = ItemUtil.GetSuitName(_fightCfg.needSuitId);
                     _ui.m_compNeed.target.data = _fightCfg.needSuitId;
+                    _ui.m_compNeed.m_imgGot.visible = DressUpMenuSuitDataManager.CheckHaveSuit(_fightCfg.needSuitId);
                 }
                 else
                 {
                     _ui.m_compNeed.m_c1.selectedIndex = 1;
                     _ui.m_compNeed.m_listTag.numItems = _fightCfg.needTagsArr.Length;
+                    _ui.m_compNeed.m_imgGot.visible = false;
                 }
             }
             InstanceZonesDataManager.currentScoreType = _fightCfg.scoreType;

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

@@ -183,6 +183,7 @@ namespace GFGGame
             UI_ListSkillItem item = UI_ListSkillItem.Proxy(obj);
             item.m_loaScore.url = ResPathUtil.GetScorePath(skillCfgs[index].score);
             item.m_txtScore.text = "+" + skillCfgs[index].value.ToString();
+            item.m_loaIcon.url = string.Format("ui://League/tb_jn_{0}", _type);
             bool isLock = !SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) || SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(skillCfgs[index].id) < 0;
             item.m_imgLock.visible = isLock;
             bool canActive = true;

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -213,10 +213,11 @@ namespace GFGGame
             GGraph holder = comBox.m_btnBuyTen.GetChild("holder").asGraph;
             holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
             comBox.m_holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+
             string resPath0 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "Button_Glow");
-            SceneController.AddObjectToView(null, null, holder, resPath0, out _gameObject0, out _wrapper0);
+            SceneController.AddObjectToView(_gameObject0, _wrapper0, holder, resPath0, out _gameObject0, out _wrapper0);
             string resPath1 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "but_text_dc");
-            SceneController.AddObjectToView(null, null, comBox.m_holder, resPath1, out _gameObject1, out _wrapper1);
+            SceneController.AddObjectToView(_gameObject1, _wrapper1, comBox.m_holder, resPath1, out _gameObject1, out _wrapper1);
 
             comBox.m_txtOwned.SetVar("v1", "" + count).FlushVars();
             comBox.m_txtOwned.SetVar("v2", "" + totalCount).FlushVars();

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

@@ -17,6 +17,7 @@ namespace GFGGame
         private int _curIndex;//当前评分index
         private int _score;//当前总分数
         private int _skillScore = 0;//当前卡牌技能分
+        private int _allSkillScore = 0;//当前卡牌技能叠加分，加到部件里的分，（部件开始、完美点击）
         private int _partScore = 0;//当前部件分+技能评分（_skillScore）
         private int _currentTime = BeginTime.PART_ALL_FIGHT_BEGIN;
         private double _mainScore;//总主属性分
@@ -250,17 +251,22 @@ namespace GFGGame
                     CheckPartBeginSkill(null);
                     break;
                 case BeginTime.PART_FIGHT_BEGIN:
+                    _allSkillScore += _skillScore;
                     //这里不把技能分加到总分里，因为技能分会算到部件分里
                     PartScoreStart();
                     break;
                 case BeginTime.PART_PREFACT_CLICK:
-                    _score += _skillScore;
+                    _allSkillScore += _skillScore;
                     PartScoreResultStart(ClickType.PREFACT_CLICK);
                     break;
                 case BeginTime.PART_FIGHT_END:
                     _score += _skillScore;
                     UpdateProgress();
                     break;
+                case BeginTime.ALL_PERFECT_START:
+                    _score += _skillScore;
+                    UpdateProgress();
+                    break;
             }
         }
         private void CheckPartBeginSkill(object param)
@@ -308,7 +314,7 @@ namespace GFGGame
         {
             // if (_isAllPerfect) return;
             if (_partId > FightScoreCfgArray.Instance.dataArray.Length) return;
-            _skillScore = 0;
+            // _skillScore = 0;
             _ui.m_comClick.target.touchable = false;
             int clickType = FightDataManager.Instance.GetClickType(_ui.m_comClick.m_comResult.m_holderCircle.scale.x);
             _ui.m_comClick.m_comResult.m_t0.Stop(true, false);
@@ -332,7 +338,7 @@ namespace GFGGame
             _ui.m_comClick.target.touchable = false;
 
             PartScoreResultEnd();
-            _partScore = ScoreSystemData.Instance.GetPartScore(roleData, _partId, clickType, _skillScore);
+            _partScore = ScoreSystemData.Instance.GetPartScore(roleData, _partId, clickType, _allSkillScore);
             _score += _partScore;
             _ui.m_comClick.m_comResult.target.GetChild("holder" + clickType).visible = true;
             _ui.m_comClick.m_comResult.m_c1.selectedIndex = clickType;
@@ -349,6 +355,7 @@ namespace GFGGame
                     _ui.m_comClick.m_comResult.m_txtCount2.text = _partScore.ToString();
                     break;
             }
+            _allSkillScore = 0;
         }
 
         private void PartScoreResultEnd()
@@ -396,6 +403,7 @@ namespace GFGGame
             {
                 if (_partId == FightScoreCfgArray.Instance.dataArray.Length + 1 && _prefectCount >= FightScoreCfgArray.Instance.dataArray.Length)//0)// 
                 {
+                    _currentTime = BeginTime.ALL_PERFECT_START;
                     AllCirclePlayStart();//完美八连击
                 }
                 else
@@ -466,8 +474,7 @@ namespace GFGGame
             _ui.m_comClick.m_comAllPerfect.m_t2.Play(() =>
                 {
                     _prefectCount = 0;
-                    UpdateProgress();
-
+                    SkillScoreStart(null);
                 });
             if (ViewManager.isViewOpen(typeof(GuideView).FullName) && GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0)
             {

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

@@ -205,7 +205,7 @@ namespace GFGGame
             _ui.m_btnSpeedUp.title = "x" + FightDataManager.Instance.fightSpeed;
             _ui.m_comClick.m_comAllPerfect.target.visible = false;
             // _ui.m_LoaMask.visible = false;
-            _ui.m_proScore.m_comBar.target.width = 0;
+            _ui.m_proScore.m_comBar.target.width = _ui.m_proScore.m_comBar.target.width / 2;
             _ui.m_btnSkip.visible = InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena;
 
 
@@ -220,7 +220,7 @@ namespace GFGGame
                 _targetMainScore = ScoreSystemData.Instance.GetRobotMainScore(targetData);
             }
 
-            _ui.m_proScore.m_txtNpcScore.text = targetData.name + " 0";
+            _ui.m_proScore.m_txtNpcScore.text = " 0";
             _targetRoundTimes = ScoreSystemData.Instance.GetRoundTime(targetData.cardId, targetData.skillLvs);
 
 
@@ -316,6 +316,13 @@ namespace GFGGame
 
             UpdateSkill1();
         }
+        private void CheckAllPerfectClickSkill()
+        {
+            _currentTime = BeginTime.ALL_PERFECT_START;
+
+            UpdateSkill0();
+        }
+
         private void CheckPartFightEndSkill()
         {
             _skillScore = 0;
@@ -424,6 +431,9 @@ namespace GFGGame
                 case BeginTime.PART_FIGHT_END:
                     UpdateProgress(OnePartScoreEnd);
                     break;
+                case BeginTime.ALL_PERFECT_START:
+                    UpdateProgress(OnePartScoreEnd);
+                    break;
             }
         }
 
@@ -530,7 +540,7 @@ namespace GFGGame
             _ui.m_proScore.m_txtMineScore.text = " " + _score;
             _ui.m_proScore.m_txtNpcScore.text = " " + _targetScore;
 
-            double proportion = _score + _targetScore == 0 ? 0 : _score / (_score + _targetScore);
+            double proportion = _score + _targetScore == 0 ? 0.5 : _score / (_score + _targetScore);
             float width = (float)(proportion * _ui.m_proScore.target.width);
             width = width > _ui.m_proScore.m_comBar.target.initWidth ? _ui.m_proScore.m_comBar.target.initWidth : width;
             GTween.To(_ui.m_proScore.m_comBar.target.width, width, 0.3f).SetTarget(_ui.m_proScore.m_comBar).OnUpdate((GTweener t) =>
@@ -548,7 +558,7 @@ namespace GFGGame
             {
                 if (_partId == FightScoreCfgArray.Instance.dataArray.Length + 1 && _prefectCount >= FightScoreCfgArray.Instance.dataArray.Length)// 0)// 
                 {
-                    _ui.m_comClick.m_comAllPerfect.target.visible = true;
+                    // CheckAllPerfectClickSkill();
                     AllCirclePlayStart();//完美八连击
                 }
                 else
@@ -614,7 +624,7 @@ namespace GFGGame
             _ui.m_comClick.m_comAllPerfect.m_t2.Play(() =>
                 {
                     _prefectCount = 0;
-                    UpdateProgress(OnePartScoreEnd);
+                    CheckAllPerfectClickSkill();
                 });
         }
         private void OnBtnSpeedUp()

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

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using ET;
 using FairyGUI;
 using UI.CommonGame;
@@ -162,15 +163,42 @@ namespace GFGGame
             _buyCount = Math.Max(1, _maxCanBuy);
             UpdateView();
         }
-        private async void OnBtnExchangeClick()
+        private void OnBtnExchangeClick()
         {
             ShopCfg cfg = ShopCfgArray.Instance.GetCfg(_goodIds);
-            if (cfg.costType != CostType.RMB && ItemDataManager.GetItemNum(cfg.costId) < cfg.price)
+
+            if (cfg.costType != CostType.RMB)
             {
-                PromptController.Instance.ShowFloatTextPrompt("道具不足");
-                return;
+                int costId = cfg.costId;
+                if (cfg.menu1 == ConstStoreTabId.STORE_ARENA && cfg.menu2 != ArenaDataManager.Instance.SeasonId && cfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM)
+                {
+                    costId = cfg.oldSeasonCostId;
+                }
+                if (costId == ConstItemID.ARENA_PAST_COST && ItemDataManager.GetItemNum(costId) < cfg.price
+                && ItemDataManager.GetItemNum(costId) + ItemDataManager.GetItemNum(ConstItemID.ARENA_CUR_COST) >= cfg.price)
+                {
+                    string oldSeasonName = ItemCfgArray.Instance.GetCfg(ConstItemID.ARENA_PAST_COST).name;
+                    string curSeasonName = ItemCfgArray.Instance.GetCfg(ConstItemID.ARENA_CUR_COST).name;
+                    string strTips = string.Format("{0}不足，是否确定将{1}1：1转化为花签够买该商品？", oldSeasonName, curSeasonName);
+                    AlertUI.Show(strTips, "")
+                    .SetLeftButton(true, "否").SetRightButton(true, "是", (object data) =>
+                    {
+                        ReqBuyGoodsAsync(_goodIds);
+                    });
+                    return;
+                }
+                else if (ItemDataManager.GetItemNum(costId) < cfg.price)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("道具不足");
+                    return;
+                }
             }
 
+            ReqBuyGoodsAsync(_goodIds);
+        }
+
+        private async void ReqBuyGoodsAsync(int _goodIds)
+        {
             bool result = await ShopSProxy.ReqShopBuy(_goodIds, _buyCount);
             if (result)
             {

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

@@ -30,8 +30,8 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
-            _ui.m_comBg.GetChild("btnClose").asCom.onClick.Add(Hide);
             _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_btnClose.onClick.Add(Hide);
 
         }
         protected override void AddEventListener()

GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 90bfe14dd02f1e54da1366d0fd6cc64a
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: f18dec6fa30e23d43ab84b08888016ef
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: