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

FGUIProject/assets/DressUp/DressUpUI.xml

@@ -56,18 +56,18 @@
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button title="下一步" titleColor="#fdfaed" titleFontSize="54"/>
     </component>
-    <component id="n27_j48o" name="btnAction" src="f4xv3o" fileName="components/Button6.xml" xy="27,1184" size="157,133" group="n34_wono" visible="false">
+    <component id="n27_j48o" name="btnAction" src="f4xv3o" fileName="components/Button6.xml" xy="27,900" size="157,133" group="n34_wono" visible="false">
       <gearDisplay controller="c2" pages="0"/>
       <Button icon="ui://mbo439wbj48o3x"/>
     </component>
-    <component id="n24_f4xv" name="btnPhoto" src="f4xv3o" fileName="components/Button6.xml" xy="56,1184" group="n34_wono">
+    <component id="n24_f4xv" name="btnPhoto" src="f4xv3o" fileName="components/Button6.xml" xy="56,900" group="n34_wono">
       <gearDisplay controller="c2" pages="0"/>
       <Button icon="ui://mbo439wbq08xm"/>
     </component>
-    <component id="n20_f4xv" name="btnLastStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1326" group="n34_wono" visible="false">
+    <component id="n20_f4xv" name="btnLastStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1042" group="n34_wono">
       <Button icon="ui://mbo439wbq08x6"/>
     </component>
-    <component id="n21_f4xv" name="btnNextStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1468" group="n34_wono" visible="false">
+    <component id="n21_f4xv" name="btnNextStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1184" group="n34_wono">
       <Button icon="ui://mbo439wbq08xl"/>
     </component>
     <component id="n29_8lqj" name="btnHide" src="f4xv3o" fileName="components/Button6.xml" xy="56,1326" group="n34_wono">
@@ -79,7 +79,7 @@
     <component id="n22_f4xv" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="56,1610" group="n34_wono">
       <Button icon="ui://mbo439wbq08xn"/>
     </component>
-    <group id="n34_wono" name="n34" xy="56,1184" size="110,536" group="n30_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
+    <group id="n34_wono" name="n34" xy="56,900" size="110,820" group="n30_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </group>
     <group id="n30_8lqj" name="grpContent" xy="35,0" size="1275,1920" advanced="true">

FGUIProject/assets/Main/StoryCardChooseUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1639">
+<component size="1080,1468">
   <displayList>
-    <image id="n7_sx2v" name="n7" src="sx2v9r" fileName="imagesStory/zd_tctcdi_1.png" xy="0,-600" size="1080,2228"/>
+    <image id="n7_sx2v" name="n7" src="sx2v9r" fileName="imagesStory/zd_tctcdi_1.png" xy="0,-530" size="1080,2228"/>
     <image id="n9_wzce" name="n9" src="sx2v9u" fileName="imagesStory/zd_tctcxian_1.png" xy="320,178"/>
     <loader id="n4_cn27" name="loaScore" xy="658,114" size="58,58" aspect="true" visible="false" url="ui://eg2y0ldp842s6h" fill="scaleMatchWidth">
       <relation target="n5_cn27" sidePair="left-right"/>
@@ -18,7 +18,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n0_r1a9" name="listCard" xy="41,415" size="998,961" layout="flow_hz" overflow="scroll" lineGap="15" colGap="10" defaultItem="ui://mfvz4q8kr1a99f" autoClearItems="true">
+    <list id="n0_r1a9" name="listCard" xy="41,415" size="998,813" layout="flow_hz" overflow="scroll" lineGap="15" colGap="10" defaultItem="ui://mfvz4q8kr1a99f" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -38,13 +38,13 @@
       <item/>
     </list>
     <component id="n17_ofwu" name="comSkillTips" src="ofwup2" fileName="components/ComArenaSkillTips.xml" xy="99,316" visible="false"/>
-    <image id="n18_ebfi" name="n18" src="ebfipr" fileName="imagesStory/zd_tctcdi_1_zz.png" xy="30,1270"/>
-    <component id="n2_r1a9" name="btnCancel" src="ih7595" fileName="components/Button11.xml" pkg="mk0fwx0x" xy="129,1435" group="n12_ofwu">
+    <image id="n18_ebfi" name="n18" src="ebfipr" fileName="imagesStory/zd_tctcdi_1_zz.png" xy="51,1119"/>
+    <component id="n2_r1a9" name="btnCancel" src="ih7595" fileName="components/Button11.xml" pkg="mk0fwx0x" xy="129,1294" group="n12_ofwu">
       <Button title="取消"/>
     </component>
-    <component id="n3_r1a9" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="571,1435" group="n12_ofwu">
+    <component id="n3_r1a9" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="571,1294" group="n12_ofwu">
       <Button title="确认"/>
     </component>
-    <group id="n12_ofwu" name="n12" xy="129,1435" size="822,105"/>
+    <group id="n12_ofwu" name="n12" xy="129,1294" size="822,105"/>
   </displayList>
 </component>

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

@@ -239,8 +239,12 @@ namespace GFGGame
             int leagueSkillScore = LeagueDataManager.Instance.GetAllSkillScore(scoreType);
             arrayList.Sort((CardData a, CardData b) =>
             {
-                double scoreA = GetSkillFightScore(itemSum, baseScore, leagueSkillScore, a.id, a.scores[scoreType], SkillDataManager.Instance.GetCardSkillLvs(a.id));
-                double scoreB = GetSkillFightScore(itemSum, baseScore, leagueSkillScore, b.id, b.scores[scoreType], SkillDataManager.Instance.GetCardSkillLvs(b.id));
+                List<int> skillLvsA = SkillDataManager.Instance.GetCardSkillLvs(a.id);
+                List<int> skillLvsB = SkillDataManager.Instance.GetCardSkillLvs(b.id);
+                double addA = a.scores[scoreType] * ConstScoreSystem.PERFECT_SCORE * ConstScoreSystem.CLICK_SCORE / ConstScoreSystem.PART_SCORE * 6d;
+                double addB = b.scores[scoreType] * ConstScoreSystem.PERFECT_SCORE * ConstScoreSystem.CLICK_SCORE / ConstScoreSystem.PART_SCORE * 6d;
+                double scoreA = GetSkillFightScore(itemSum, baseScore, leagueSkillScore, a.id, a.scores[scoreType], skillLvsA) + addA;
+                double scoreB = GetSkillFightScore(itemSum, baseScore, leagueSkillScore, b.id, b.scores[scoreType], skillLvsB) + addB;
                 if (scoreA < scoreB)
                 {
                     return 1;
@@ -276,6 +280,8 @@ namespace GFGGame
                 if (skillLvlCfg == null) continue;
                 skillScore += skillBaseScore * ((float)skillLvlCfg.fightPowerParam / 10000f);
             }
+            ET.Log.Debug("cardId:" + cardId);
+            ET.Log.Debug("skillScore:" + skillScore);
             return (long)Math.Ceiling(skillScore); ;
         }
 

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -225,7 +225,7 @@ namespace GFGGame
                 _cardObj = null;
             }
             string resPath = ResPathUtil.GetCardAnimationPath(_cardData.resources[_cardData.resIndex]);
-            if (Versions.Contains(resPath))
+            if (_cardData.itemCfg.animationCardStar > 0 && _cardData.star >= _cardData.itemCfg.animationCardStar && Versions.Contains(resPath))
             {
                 SceneController.AddObjectToView(_cardObj, _wrapper, _ui.m_comCard.m_comCardHolder.m_holder, resPath, out _cardObj, out _wrapper);
             }
@@ -733,9 +733,9 @@ namespace GFGGame
             if (result)
             {
 
-                this.UpdateCommon();
-                this.UpdateUpStarView();
-
+                UpdateCommon();
+                UpdateUpStarView();
+                UpdateCardRes();
                 // this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
                 ViewManager.Show(ViewName.CARD_UP_VIEW, new object[] { _cardData.scores, "star", _cardData.star - 1, _cardData.star }, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData });
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2);

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

@@ -329,7 +329,7 @@ namespace GFGGame
                     MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
                 }
             }
-            AddMemoryDressup();
+            MyDressUpHelper.AddMemoryDressup();
             UpdateListPartsSelected(id);
             UpdateListSuitPartsSelected();
             // AddMemoryDressup();
@@ -384,13 +384,10 @@ namespace GFGGame
             {
                 MyDressUpHelper.dressUpObj.PutOnOrTakeOffAction(id);
             }
-            AddMemoryDressup();
+            MyDressUpHelper.AddMemoryDressup();
             UpdateListSuitPartsSelected();
         }
-        private void AddMemoryDressup()
-        {
 
-        }
         private void UpdateStepBtn()
         {
             _ui.m_btnLastStep.enabled = MyDressUpHelper.stepIndex > 0;
@@ -449,7 +446,7 @@ namespace GFGGame
             UpdateBtnAction();
             _ui.m_partsList.m_list.numItems = _currentList3.Count;
             _ui.m_partsList2.m_list.numItems = _currentList4.Count;
-            AddMemoryDressup();
+            MyDressUpHelper.AddMemoryDressup();
         }
 
         private void OnClickBtnSave()

update_res.sh

@@ -1,2 +1,8 @@
+git fetch
+git pull
+cd GameClient/Assets/Game/CSShare
+git fetch
+git pull
+cd ../../../../
 cd GameClient/Assets/Res
 svn update