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

# Conflicts:
#	GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes

FGUIProject/assets/EnduringGiftBox/components/ComRewardIconItem.xml

@@ -4,7 +4,7 @@
   <displayList>
     <image id="n5_qqhz" name="bagYellow" src="qqhz1e" fileName="images/wpk_db_1.png" xy="0,0" size="132,132"/>
     <image id="n0_nd17" name="bagBlue" src="qqhz1a" fileName="images/wpk_db_2.png" xy="0,0" size="132,132"/>
-    <loader id="n3_vixc" name="loaIcon" xy="66,66" pivot="0.5,0.5" anchor="true" size="80,80" aspect="true" url="ui://xz8kxrecng0i27" fill="scaleFree"/>
+    <loader id="n3_vixc" name="loaIcon" xy="67,66" pivot="0.5,0.5" anchor="true" size="102,102" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
     <image id="n6_qqhz" name="bagYellowEx" src="qqhz1f" fileName="images/wpk_sz_db.png" xy="7,95" size="118,31"/>
     <image id="n1_nd17" name="bagBlueEx" src="qqhz1b" fileName="images/wpk_sz_db2.png" xy="7,95" size="118,31"/>
     <text id="n2_nd17" name="num" xy="9,85" size="116,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" autoSize="none" text="120"/>

FGUIProject/assets/EnduringGiftBox/components/ComRsGifBoxIconItem.xml

@@ -3,7 +3,7 @@
   <displayList>
     <component id="n3_yjmk" name="comRewardIconItem" src="qqhz1g" fileName="components/ComRewardIconItem.xml" xy="3,2" size="132,132" aspect="true" scale="1.09,1.09"/>
     <text id="n1_yjmk" name="txtItemName" xy="6,138" size="143,56" fontSize="39" color="#a47e49" align="center" autoSize="none" text="体力"/>
-    <graph id="n4_droi" name="holderItem" xy="77,71" size="46,42" visible="false"/>
+    <graph id="n4_droi" name="holderItem" xy="77,71" size="46,42" aspect="true" visible="false"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Visible" target="n4_droi" value="false"/>

FGUIProject/assets/LuckyBox/LuckyBoxNewDressUI.xml

@@ -14,7 +14,7 @@
     <component id="n0_qdrt" name="comCard" src="qdrt1a" fileName="components/ComCard.xml" xy="66,475" pivot="0.5,0.5" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n3_qdrt" name="btnPass" src="qdrt1c" fileName="components/Button4.xml" xy="917,1802">
+    <component id="n3_qdrt" name="btnPass" src="qdrt1c" fileName="components/Button4.xml" xy="917,1720">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button icon="ui://drx9d1usvolstbo"/>
     </component>

FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml

@@ -4,9 +4,9 @@
     <remark page="0" value="买一次"/>
     <remark page="1" value="买十次"/>
   </controller>
-  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="2"/>
+  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <loader id="n0_l5nz" name="bg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1uso1391g" fill="scaleMatchWidth">
+    <loader id="n0_l5nz" name="bg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1uso1391h" fill="scaleMatchWidth">
       <gearIcon controller="ctrlRewardsType" pages="0,1,2" values="ui://drx9d1uso1391h|ui://drx9d1uso1391i|ui://drx9d1uso1391g"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
@@ -26,13 +26,14 @@
     <component id="n12_l5nz" name="comStar1_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="232,537" group="n19_l5nz"/>
     <component id="n13_l5nz" name="comStar1_0_1" src="l5nzq" fileName="components/ComStar.xml" xy="449,224" group="n19_l5nz"/>
     <component id="n14_l5nz" name="comStar1_0_2" src="l5nzq" fileName="components/ComStar.xml" xy="849,557" group="n19_l5nz"/>
-    <component id="n15_l5nz" name="comStar1_0_3" src="l5nzq" fileName="components/ComStar.xml" xy="419,803" group="n19_l5nz"/>
-    <component id="n33_o139" name="comStar1_0_4" src="l5nzq" fileName="components/ComStar.xml" xy="253,1005" group="n19_l5nz"/>
+    <component id="n15_l5nz" name="comStar1_0_3" src="l5nzq" fileName="components/ComStar.xml" xy="419,676" group="n19_l5nz"/>
+    <component id="n33_o139" name="comStar1_0_4" src="l5nzq" fileName="components/ComStar.xml" xy="278,861" group="n19_l5nz"/>
     <component id="n34_o139" name="comStar1_0_5" src="l5nzq" fileName="components/ComStar.xml" xy="828,1066" group="n19_l5nz"/>
     <component id="n35_o139" name="comStar1_0_6" src="l5nzq" fileName="components/ComStar.xml" xy="253,1398" group="n19_l5nz"/>
-    <component id="n36_o139" name="comStar1_0_7" src="l5nzq" fileName="components/ComStar.xml" xy="584,1272" group="n19_l5nz"/>
+    <component id="n36_o139" name="comStar1_0_7" src="l5nzq" fileName="components/ComStar.xml" xy="618,1272" group="n19_l5nz"/>
     <component id="n37_o139" name="comStar1_0_8" src="l5nzq" fileName="components/ComStar.xml" xy="586,1619" group="n19_l5nz"/>
-    <group id="n19_l5nz" name="grpComStar0" xy="193,185" size="695,1473" advanced="true">
+    <component id="n51_e050" name="comStar1_0_9" src="l5nzq" fileName="components/ComStar.xml" xy="901,438" group="n19_l5nz"/>
+    <group id="n19_l5nz" name="grpComStar0" xy="227,219" size="679,1405" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="0" condition="0"/>
       <relation target="" sidePair="left-center,top-middle"/>

FGUIProject/assets/LuckyBox/components/ComCard.xml

@@ -2,15 +2,15 @@
 <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="332,294" pivot="0.5,0.5" size="350,350" aspect="true" url="ui://eg2y0ldpm9wm8v" align="center" vAlign="middle" fill="scaleMatchWidth"/>
+    <loader id="n2_qdrt" name="loaIcon" xy="299,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"/>
     <loader id="n3_qdrt" name="loaProperty" xy="645,242" size="44,44" group="n13_duuf" aspect="true" url="ui://eg2y0ldp842s6k" fill="scaleMatchWidth"/>
     <group id="n13_duuf" name="n13" xy="645,164" size="54,248"/>
-    <image id="n14_duuf" name="n14" src="volstax" fileName="imageNews/zx_wp_baseboard.png" xy="336,880" size="332,50" group="n15_duuf"/>
-    <text id="n4_qdrt" name="txtName" xy="502,905" pivot="0.5,0.5" anchor="true" size="84,54" group="n15_duuf" fontSize="40" color="#915e15" text="服装"/>
-    <group id="n15_duuf" name="n15" xy="336,878" size="332,54"/>
+    <image id="n14_duuf" name="n14" src="volstax" fileName="imageNews/zx_wp_baseboard.png" xy="308,880" size="332,50" group="n15_duuf"/>
+    <text id="n4_qdrt" name="txtName" xy="474,905" pivot="0.5,0.5" anchor="true" size="84,54" group="n15_duuf" fontSize="40" color="#915e15" text="服装"/>
+    <group id="n15_duuf" name="n15" xy="308,878" size="332,54"/>
     <graph id="n17_duuf" name="holder1" xy="473,484" size="1,1" visible="false" touchable="false" type="rect"/>
   </displayList>
 </component>

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -15,13 +15,14 @@
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1" icon="ui://mfvz4q8kt31nj8"/>
     </component>
-    <component id="n51_psph" name="myHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="-25,169" visible="false"/>
-    <component id="n52_psph" name="targetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="879,175" visible="false"/>
-    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,127" pivot="0,0.5" anchor="true">
-      <ProgressBar value="100" max="100"/>
-    </component>
     <component id="n54_psph" name="comTargetCard" src="volsov" fileName="components/ComTargetSkillShow.xml" xy="1180,420" pivot="0.5,0.5" anchor="true" aspect="true" scale="0.3,0.3"/>
     <component id="n55_psph" name="comDeduction" src="psphix" fileName="components/ComDeduction.xml" xy="45,292" size="0,53"/>
+    <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"/>
+    </component>
+    <group id="n66_e050" name="n66" xy="99,66" size="948,276"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Scale" target="n54_psph" value="0.3,0.3"/>

FGUIProject/assets/Main/StorySkillUI.xml

@@ -11,6 +11,6 @@
   </displayList>
   <transition name="t1">
     <item time="0" type="Scale" target="n7_psph" tween="true" startValue="1,1" endValue="0,0" duration="12" ease="Linear"/>
-    <item time="0" type="XY" target="n7_psph" tween="true" startValue="540,960" endValue="926,237" duration="12" ease="Linear"/>
+    <item time="0" type="XY" target="n7_psph" tween="true" startValue="540,960" endValue="926,225" duration="12" ease="Linear"/>
   </transition>
 </component>

FGUIProject/assets/Main/components/ProgressBarTargetScore.xml

@@ -6,16 +6,16 @@
     <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"/>
     </image>
-    <image id="n12_fqor" name="n12" src="qkjskk" fileName="imagesNew/zdqp_dikuang.png" xy="-8,34" group="n16_fqor"/>
-    <image id="n13_fqor" name="n13" src="qkjsl1" fileName="imagesNew/font_zdsz_picture.png" xy="-2,39" group="n16_fqor"/>
-    <image id="n14_fqor" name="n14" src="qkjsk8" fileName="imagesNew/score.png" xy="43,40" group="n16_fqor"/>
-    <text id="n15_fqor" name="txtMineScore" xy="108,41" size="150,32" group="n16_fqor" font="ui://mfvz4q8kqkjsny" fontSize="36" color="#fff6e3" vAlign="middle" letterSpacing="-6" bold="true" text="0123456789"/>
-    <group id="n16_fqor" name="n16" xy="-8,34" size="324,44"/>
-    <image id="n17_fqor" name="n17" src="qkjskk" fileName="imagesNew/zdqp_dikuang.png" xy="526,34" pivot="0.5,0" group="n21_fqor" scale="-1,1"/>
-    <image id="n18_fqor" name="n18" src="qkjsl1" fileName="imagesNew/font_zdsz_picture.png" xy="812,39" group="n21_fqor"/>
-    <image id="n19_fqor" name="n19" src="qkjsk8" fileName="imagesNew/score.png" xy="739,40" group="n21_fqor"/>
-    <text id="n20_fqor" name="txtNpcScore" xy="700,41" pivot="1,0" size="38,32" group="n21_fqor" font="ui://mfvz4q8kqkjsny" fontSize="36" color="#fff6e3" align="right" vAlign="middle" letterSpacing="-6" bold="true" text="01"/>
-    <group id="n21_fqor" name="n21" xy="526,34" size="324,44"/>
+    <image id="n12_fqor" name="n12" src="qkjskk" fileName="imagesNew/zdqp_dikuang.png" xy="-8,40" group="n16_fqor"/>
+    <image id="n13_fqor" name="n13" src="qkjsl1" fileName="imagesNew/font_zdsz_picture.png" xy="-2,45" group="n16_fqor"/>
+    <image id="n14_fqor" name="n14" src="qkjsk8" fileName="imagesNew/score.png" xy="43,46" group="n16_fqor"/>
+    <text id="n15_fqor" name="txtMineScore" xy="108,47" size="150,32" group="n16_fqor" font="ui://mfvz4q8kqkjsny" fontSize="36" color="#fff6e3" vAlign="middle" letterSpacing="-6" bold="true" text="0123456789"/>
+    <group id="n16_fqor" name="n16" xy="-8,40" size="324,44"/>
+    <image id="n17_fqor" name="n17" src="qkjskk" fileName="imagesNew/zdqp_dikuang.png" xy="526,40" pivot="0.5,0" group="n21_fqor" scale="-1,1"/>
+    <image id="n18_fqor" name="n18" src="qkjsl1" fileName="imagesNew/font_zdsz_picture.png" xy="812,45" group="n21_fqor"/>
+    <image id="n19_fqor" name="n19" src="qkjsk8" fileName="imagesNew/score.png" xy="739,46" group="n21_fqor"/>
+    <text id="n20_fqor" name="txtNpcScore" xy="700,47" pivot="1,0" size="38,32" group="n21_fqor" font="ui://mfvz4q8kqkjsny" fontSize="36" color="#fff6e3" align="right" vAlign="middle" letterSpacing="-6" bold="true" text="01"/>
+    <group id="n21_fqor" name="n21" xy="526,40" size="324,44"/>
     <graph id="n9_weok" name="holder" xy="770,15" pivot="0.5,0.5" anchor="true" size="100,100">
       <relation target="n1_uj53" sidePair="right-right"/>
     </graph>

GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -69,8 +69,13 @@ namespace GFGGame
             {
                 return false;
             }
+
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
-            if (GuideDataManager.currentGuideId != 0 && GuideDataManager.currentGuideId != cfg.id) return false;
+            if (cfg == null || GuideDataManager.currentGuideId != 0 && GuideDataManager.currentGuideId != cfg.id) return false;
+            if (guideKey == ConstGuideId.ARENA_OPEN && (InstanceZonesDataManager.CheckLevelPass(cfg.storyLevelId) || ArenaDataManager.Instance.IsArenaClearing))
+            {
+                return false;//竞技场结算中或已通关指定开启关卡，不引导
+            }
             GRoot.inst.touchable = false;
             bool isStoryLevelGuide = cfg.storyLevelId > 0;
             bool isFinishCurId = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_GUIDE + cfg.id) > 0;//当前引导未完成
@@ -149,6 +154,7 @@ namespace GFGGame
         public static bool TryCompleteGuideIndex(string guideKey, int index)
         {
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
+            if (cfg == null) return false;
             HideGuide();
             if (GuideDataManager.TryCompleteGuideIndex(cfg.id, index))
             {
@@ -169,6 +175,7 @@ namespace GFGGame
 
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
             bool result = false;
+            if (cfg == null) return;
             if (!GuideDataManager.CheckAllIndexFinish(cfg.id, count)) return;
 
             result = await GuideDataManager.TryCompleteGuide(cfg.id);

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

@@ -371,7 +371,7 @@ namespace GFGGame
         /// 所有部件主属性和
         /// </summary>
         /// <returns></returns>
-        public long GetItemScoreSum(List<int> itemScoreList)
+        public long GetItemScoreSum(List<float> itemScoreList)
         {
             long scoreSum = 0;
             for (int i = 0; i < itemScoreList.Count; i++)

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

@@ -73,9 +73,9 @@ namespace GFGGame
 
         public static int IsGuideFinish(string guideKey)
         {
-            if (GameGlobal.skipGuide) return 1;
-
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
+            if (GameGlobal.skipGuide || cfg == null) return 1;
+
             return StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_GUIDE + cfg.id);
 
         }

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

@@ -125,7 +125,10 @@ namespace GFGGame
             _targetData.cardScore = fightCfg.targetCardScore;
             _targetData.tags = fightCfg.needTagsArr;
             _targetData.skillLvs = new List<int>(fightCfg.targetSkillLvsArr);
-            _targetData.itemScoreList = new List<int>(fightCfg.targetPartsScoreArr);
+            for (int i = 0; i < fightCfg.targetPartsScoreArr.Length; i++)
+            {
+                _targetData.itemScoreList.Add(fightCfg.targetPartsScoreArr[i]);
+            }
             _targetData.type = FightTargetType.ROBOT;
             _targetData.res = fightCfg.targetRes;
             return _targetData;

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

@@ -492,6 +492,40 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetMeiRiTeHuiRed()
         {
+            var activityInfoByTypeList =
+                ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB3);
+
+            var list = activityInfoByTypeList
+                .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
+
+            if (list.Count == 0)
+            {
+                return false;
+            }
+
+            bool isSoldOut = true;
+            foreach (var activityInfo in list)
+            {
+                ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.ActivityId);
+                var paramsArr = activityOpenCfg.paramsArr;
+                foreach (var shopCfgId in paramsArr)
+                {
+                    var shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);
+                    var remainBuyNum = shopCfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfgId);
+                    //只要有一个商品还能购买，就不是售罄
+                    if (remainBuyNum > 0)
+                    {
+                        isSoldOut = false;
+                        break;
+                    }
+                }
+            }
+
+            if (isSoldOut)
+            {
+                return false;
+            }
+
             return !LimitedTimeGiftBoxDataManager.Instance.IsOpenMeiRiTeHui;
         }
 

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

@@ -43,7 +43,7 @@ namespace GFGGame
                 FightScoreCfg cfg = typeCfgs[j];
                 if (roleData.pardScoreListDic.ContainsKey(cfg.id) == false)
                 {
-                    roleData.pardScoreListDic.Add(cfg.id, new List<int>());
+                    roleData.pardScoreListDic.Add(cfg.id, new List<float>());
                 }
                 if (roleData.pardListDic.ContainsKey(cfg.id) == false)
                 {

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

@@ -12,7 +12,7 @@ namespace GFGGame
         public int cardScore;//卡牌对应主题的属性分数
         public string[] tags = { };////本次战斗要求的标签
         public List<int> skillLvs = new List<int>();
-        public List<int> itemScoreList = new List<int>();//对应服装当前主题的实际分数
+        public List<float> itemScoreList = new List<float>();//对应服装当前主题的实际分数
         public Dictionary<int, int> itemScoreDic = new Dictionary<int, int>();//对应服装当前主题的实际分数
         public int type = 0;
         /**********************************************玩家独立数据*****************************************/
@@ -20,7 +20,7 @@ namespace GFGGame
         public int headId;//头像id
         public int borderId;//头像框id
         public Dictionary<int, List<int>> pardListDic = new Dictionary<int, List<int>>();//战斗部位，部件列表,战斗开始时更新
-        public Dictionary<int, List<int>> pardScoreListDic = new Dictionary<int, List<int>>();//战斗部位，部件分数列表,战斗开始时更新
+        public Dictionary<int, List<float>> pardScoreListDic = new Dictionary<int, List<float>>();//战斗部位，部件分数列表,战斗开始时更新
         public List<int> itemList = new List<int>();
 
         /**********************************************机器人独立数据*****************************************/

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObj.cs

@@ -592,7 +592,7 @@ namespace GFGGame
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_dressUpData.actionId);
                 var hasAniRes = ResPathUtil.CheckDressUpAnimationResExist(suitCfg.aniRes);
                 var actionRes = hasAniRes ? suitCfg.aniRes : null;
-                DressUpUtil.UpdateBody(actionRes, _sceneObj, _needSetMask, _roleObj);
+                DressUpUtil.UpdateBody(actionRes, _sceneObj, false, _roleObj);
             }
             else
             {

GameClient/Assets/Game/HotUpdate/DressUp/DressUpPart.cs

@@ -0,0 +1,19 @@
+using FairyGUI;
+using UnityEngine;
+
+namespace GFGGame
+{
+
+    public class DressUpPart : MonoBehaviour
+    {
+        public TimerCallback OnTimer;
+
+        private void OnDestroy()
+        {
+            if(OnTimer != null)
+            {
+                Timers.inst.Remove(OnTimer);
+            }
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/DressUp/DressUpPart.cs.meta

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

GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs

@@ -173,7 +173,7 @@ namespace GFGGame
             if (!string.IsNullOrEmpty(actionRes))
             {
                 string resPath = ResPathUtil.GetDressUpAnimationPath(actionRes);
-                if (CheckGameObjExisted(parentObj, BODY_ANIMATION_NAME, resPath))
+                if (GetGameObjExisted(parentObj, BODY_ANIMATION_NAME, resPath) != null)
                 {
                     return;
                 }
@@ -181,7 +181,7 @@ namespace GFGGame
             else
             {
                 string resPath = ResPathUtil.GetDressUpPath(BODY_DEFAULT_RES_NAME, extPng);
-                if (CheckGameObjExisted(parentObj, BODY_SPRITE_NAME, resPath))
+                if (GetGameObjExisted(parentObj, BODY_SPRITE_NAME, resPath) != null)
                 {
                     return;
                 }
@@ -271,7 +271,12 @@ namespace GFGGame
                 addAniObj = AddAnimationObj(res, objName, parentObj, sortingOrder);
                 if (addAniObj != null && spriteObj != null)
                 {
-                    Timers.inst.Add(0.03f, 1, (obj) =>
+                    var dressUpPart = addAniObj.GetComponent<DressUpPart>();
+                    if(dressUpPart == null)
+                    {
+                        dressUpPart = addAniObj.AddComponent<DressUpPart>();
+                    }
+                    dressUpPart.OnTimer = (obj) =>
                     {
                         if (parentObj != null && parentObj.transform != null)
                         {
@@ -292,7 +297,8 @@ namespace GFGGame
                                 }
                             }
                         }
-                    });
+                    };
+                    Timers.inst.Add(0.03f, 1, dressUpPart.OnTimer);
                 }
             }
 
@@ -308,12 +314,13 @@ namespace GFGGame
             {
                 return null;
             }
-            if (CheckGameObjExisted(parentObj, objName, resPath))
+            var gameObj = GetGameObjExisted(parentObj, objName, resPath);
+            if (gameObj != null)
             {
-                return null;
+                return gameObj;
             }
             SpriteRenderer spr = null;
-            var gameObj = parentObj.transform.Find(objName)?.gameObject;
+            gameObj = parentObj.transform.Find(objName)?.gameObject;
             if (gameObj == null)
             {
                 gameObj = new GameObject(objName);
@@ -358,12 +365,13 @@ namespace GFGGame
             {
                 return null;
             }
-            if(CheckGameObjExisted(parentObj, objName, resPath))
+            var gameObj = GetGameObjExisted(parentObj, objName, resPath);
+            if (gameObj != null)
             {
-                return null;
+                return gameObj;
             }
             var prefab = GFGAsset.Load<GameObject>(resPath);
-            var gameObj = GameObject.Instantiate(prefab);
+            gameObj = GameObject.Instantiate(prefab);
             AddAssetReleaser(gameObj, resPath);
             if (objName == BODY_ANIMATION_NAME)
             {
@@ -390,19 +398,20 @@ namespace GFGGame
             return gameObj;
         }
 
-        private static void TryAddEffectObj(string res, string objName, GameObject parentObj, int sortingOrder, bool inAniDir)
+        private static GameObject TryAddEffectObj(string res, string objName, GameObject parentObj, int sortingOrder, bool inAniDir)
         {
             var resPath = ResPathUtil.GetDressUpEffectPath(res, inAniDir);
             if (!VEngine.Versions.Contains(resPath))
             {
-                return;
+                return null;
             }
-            if (CheckGameObjExisted(parentObj, objName, resPath))
+            var gameObj = GetGameObjExisted(parentObj, objName, resPath);
+            if (gameObj != null)
             {
-                return;
+                return gameObj;
             }
             GameObject effPre = GFGAsset.Load<GameObject>(resPath);
-            var gameObj = GameObject.Instantiate(effPre);
+            gameObj = GameObject.Instantiate(effPre);
             AddAssetReleaser(gameObj, resPath);
             gameObj.transform.SetParent(parentObj.transform, false);
             gameObj.name = objName;
@@ -412,6 +421,7 @@ namespace GFGGame
                 GameObject.Destroy(sortingGroup);
             }
             SetRenderersOrder(gameObj, sortingOrder + 1);//特效层默认高一个层级
+            return gameObj;
         }
 
         private static bool TryRemoveObj(GameObject parentObj, string objName)
@@ -433,11 +443,11 @@ namespace GFGGame
             return false;
         }
 
-        private static bool CheckGameObjExisted(GameObject parentObj, string objName, string resPath)
+        private static GameObject GetGameObjExisted(GameObject parentObj, string objName, string resPath)
         {
             if (parentObj == null)
             {
-                return false;
+                return null;
             }
             Transform transform = parentObj.transform.Find(objName);
             if (transform != null)
@@ -451,12 +461,12 @@ namespace GFGGame
                         if (assetReleaser.resPath == resPath)
                         {
 
-                            return true;
+                            return gameObj;
                         }
                     }
                 }
             }
-            return false;
+            return null;
         }
 
         public static GameObject CreateAnimationObj(string resPath)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckBoxBonusShowUI.cs

@@ -21,7 +21,6 @@ namespace UI.LuckyBox
         public UI_LuckyBoxBonusShowItem m_item8;
         public UI_LuckyBoxBonusShowItem m_item9;
         public GGroup m_grpItems;
-        public GButton m_btnPass;
         public Transition m_t0;
         public Transition m_t1;
         public const string URL = "ui://drx9d1use050tf3";
@@ -85,7 +84,6 @@ namespace UI.LuckyBox
             m_item8 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item8"));
             m_item9 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item9"));
             m_grpItems = (GGroup)comp.GetChild("grpItems");
-            m_btnPass = (GButton)comp.GetChild("btnPass");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
         }
@@ -116,7 +114,6 @@ namespace UI.LuckyBox
             m_item9.Dispose();
             m_item9 = null;
             m_grpItems = null;
-            m_btnPass = null;
             m_t0 = null;
             m_t1 = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxStarUI.cs

@@ -23,6 +23,7 @@ namespace UI.LuckyBox
         public UI_ComStar m_comStar1_0_6;
         public UI_ComStar m_comStar1_0_7;
         public UI_ComStar m_comStar1_0_8;
+        public UI_ComStar m_comStar1_0_9;
         public GGroup m_grpComStar0;
         public UI_ComStar m_comStar1_1_0;
         public UI_ComStar m_comStar1_1_1;
@@ -108,6 +109,7 @@ namespace UI.LuckyBox
             m_comStar1_0_6 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_0_6"));
             m_comStar1_0_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_0_7"));
             m_comStar1_0_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_0_8"));
+            m_comStar1_0_9 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_0_9"));
             m_grpComStar0 = (GGroup)comp.GetChild("grpComStar0");
             m_comStar1_1_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_0"));
             m_comStar1_1_1 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_1"));
@@ -161,6 +163,8 @@ namespace UI.LuckyBox
             m_comStar1_0_7 = null;
             m_comStar1_0_8.Dispose();
             m_comStar1_0_8 = null;
+            m_comStar1_0_9.Dispose();
+            m_comStar1_0_9 = null;
             m_grpComStar0 = null;
             m_comStar1_1_0.Dispose();
             m_comStar1_1_0 = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightTargetScoreUI.cs

@@ -11,11 +11,11 @@ namespace UI.Main
         public GButton m_btnBack;
         public GButton m_btnSpeedUp;
         public GButton m_btnSkip;
+        public UI_ComTargetSkillShow m_comTargetCard;
+        public UI_ComDeduction m_comDeduction;
         public GComponent m_myHead;
         public GComponent m_targetHead;
         public UI_ProgressBarTargetScore m_proScore;
-        public UI_ComTargetSkillShow m_comTargetCard;
-        public UI_ComDeduction m_comDeduction;
         public Transition m_t1;
         public Transition m_t2;
         public const string URL = "ui://mfvz4q8k8xpg3w";
@@ -69,11 +69,11 @@ namespace UI.Main
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             m_btnSkip = (GButton)comp.GetChild("btnSkip");
+            m_comTargetCard = (UI_ComTargetSkillShow)UI_ComTargetSkillShow.Create(comp.GetChild("comTargetCard"));
+            m_comDeduction = (UI_ComDeduction)UI_ComDeduction.Create(comp.GetChild("comDeduction"));
             m_myHead = (GComponent)comp.GetChild("myHead");
             m_targetHead = (GComponent)comp.GetChild("targetHead");
             m_proScore = (UI_ProgressBarTargetScore)UI_ProgressBarTargetScore.Create(comp.GetChild("proScore"));
-            m_comTargetCard = (UI_ComTargetSkillShow)UI_ComTargetSkillShow.Create(comp.GetChild("comTargetCard"));
-            m_comDeduction = (UI_ComDeduction)UI_ComDeduction.Create(comp.GetChild("comDeduction"));
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
         }
@@ -84,14 +84,14 @@ namespace UI.Main
             m_btnBack = null;
             m_btnSpeedUp = null;
             m_btnSkip = null;
-            m_myHead = null;
-            m_targetHead = null;
-            m_proScore.Dispose();
-            m_proScore = null;
             m_comTargetCard.Dispose();
             m_comTargetCard = null;
             m_comDeduction.Dispose();
             m_comDeduction = null;
+            m_myHead = null;
+            m_targetHead = null;
+            m_proScore.Dispose();
+            m_proScore = null;
             m_t1 = null;
             m_t2 = null;
             if(disposeTarget && target != null)

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

@@ -317,7 +317,10 @@ namespace GFGGame
                     for (int i = 0; i < response.data.Count; i++)
                     {
                         list[i].cardScore = response.data[i].CardScore;
-                        list[i].itemScoreList = response.data[i].SuitScore;
+                        for (int j = 0; j < response.data[i].SuitScore.Count; j++)
+                        {
+                            list[i].itemScoreList.Add(response.data[i].SuitScore[j]);
+                        }
                         list[i].itemList = response.DressupList[i].EquipIds;
                         list[i].cardId = response.DressupList[i].CardId;
                         List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(response.data[i].CardId);
@@ -424,12 +427,12 @@ namespace GFGGame
                 fightData.tagAddition = robotCfg.tagAddition;
             }
             fightData.itemScoreList.Clear();
-            double randoms = robotProto.Randoms.Count >= robotCfg.partsScoreArr.Length ? (double)robotProto.Randoms[index] / 10000d : 1;
+            float randoms = robotProto.Randoms.Count >= index ? robotProto.Randoms[index] / 10000f : 1f;
 
             for (int i = 0; i < robotCfg.partsScoreArr.Length; i++)
             {
-                double score = (double)robotCfg.partsScoreArr[i] * randoms;
-                fightData.itemScoreList.Add((int)Math.Ceiling(score));
+                float score = robotCfg.partsScoreArr[i] * randoms;
+                fightData.itemScoreList.Add(score);
             }
             fightData.type = FightTargetType.ROBOT;
             fightData.res = string.IsNullOrEmpty(robotProto.RobotHead) ? "self" : robotProto.RobotHead;

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

@@ -42,8 +42,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _taskCfgs = TaskDataManager.Instance.GetTaskCfgs(TaskType.LuckyBoxActivity); //TaskCfgArray.Instance.GetCfgsBytaskType(TaskType.LuckyBoxActivity);
-            _ui.m_list.numItems = _taskCfgs.Count;
+            UpdateView();
         }
 
         protected override void OnHide()
@@ -57,7 +56,11 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
-
+        private void UpdateView()
+        {
+            _taskCfgs = TaskDataManager.Instance.GetTaskCfgs(TaskType.LuckyBoxActivity); //TaskCfgArray.Instance.GetCfgsBytaskType(TaskType.LuckyBoxActivity);
+            _ui.m_list.numItems = _taskCfgs.Count;
+        }
         private void RenderListItem(int index, GObject obj)
         {
             UI_ListItem item = UI_ListItem.Proxy(obj);
@@ -104,7 +107,7 @@ namespace GFGGame
             if (!(context.sender is GObject btnGet)) return;
             var result = await TaskSProxy.GetTaskBonus((int)btnGet.data);
             if (!result) return;
-            _ui.m_list.numItems = _taskCfgs.Count;
+            UpdateView();
 
         }
 

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

@@ -443,7 +443,7 @@ namespace GFGGame
         }
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0 && !_dataManager.IsArenaClearing)
             {
                 UpdateToCheckGuide(null);
             }

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -10,7 +10,7 @@ namespace GFGGame
     public class LuckyBoxController
     {
         private GComponent _com;
-        private UI_ComModel _comModel;
+        // private UI_ComModel _comModel;
         private DressUpObjUI _dressUpObjUI;
         private LuckyBoxCfg _luckyBoxCfg;
         private const int _turnTime = 8;
@@ -26,10 +26,11 @@ namespace GFGGame
 
         public void OnShown(int luckyBoxId)
         {
-            _comModel = UI_ComModel.Proxy(_com);
+            // _comModel = UI_ComModel.Proxy(_com);
             _curTime = _turnTime;
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId);
             ChangeRes();
+            Timers.inst.Remove(UpdateTime);
             Timers.inst.Add(_turnTime, 0, UpdateTime);
         }
 
@@ -50,7 +51,7 @@ namespace GFGGame
 
         private void ChangeRes()
         {
-
+            UI_ComModel _comModel = UI_ComModel.Proxy(_com);
             _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.bgResArr[_bgIndex]);
             if (_luckyBoxCfg.resArr.Length > 0)
             {
@@ -85,13 +86,16 @@ namespace GFGGame
                     _comModel.m_holder.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
                 }
             }
+            UI_ComModel.ProxyEnd();
         }
         public void OnHide()
         {
             _bgIndex = 0;
             _modelIndex = 0;
             _dressUpObjUI.ResetSceneObj(0, false, false, null, false);
+            UI_ComModel _comModel = UI_ComModel.Proxy(_com);
             _comModel.m_loaRes.url = "";
+            UI_ComModel.ProxyEnd();
             Timers.inst.Remove(UpdateTime);
         }
 
@@ -102,7 +106,6 @@ namespace GFGGame
                 _dressUpObjUI.Dispose();
                 _dressUpObjUI = null;
             }
-            UI_ComModel.ProxyEnd();
         }
     }
 }

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

@@ -69,7 +69,7 @@ namespace GFGGame
         {
             _ui.m_listRarity.numItems = ConstDressRarity.DressRarityList().Count;
             _ui.m_listScore.numItems = ConstDressUpScoreType.scoreTypeList().Count;
-            _ui.m_listTag.numItems = ConstDressTag.DressTagList().Count;
+            _ui.m_listTag.numItems = TagCfgArray.Instance.dataArray.Length;//  ConstDressTag.DressTagList().Count;
         }
 
         private void RenderListRarityItem(int index, GObject obj)
@@ -92,10 +92,11 @@ namespace GFGGame
         private void RenderListTagItem(int index, GObject obj)
         {
             GButton item = obj.asButton;
-            item.text = ConstDressTag.DressTagList()[index].name;
-            item.icon = "ui://DressUp/sxsx_fgdi_" + ConstDressTag.DressTagList()[index].type;
+            TagCfg tagCfg = TagCfgArray.Instance.dataArray[index];
+            item.text = tagCfg.name;
+            item.icon = "ui://DressUp/sxsx_fgdi_" + tagCfg.type;
             // item.data = 
-            string data = string.Format("{0}_{1}", ConstDressTag.DressTagList()[index].type, ConstDressTag.DressTagList()[index].name);
+            string data = string.Format("{0}_{1}", tagCfg.type, tagCfg.name);
             item.data = data;
             item.selected = _selectTagList.IndexOf(data) >= 0;
         }

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

@@ -67,7 +67,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-
+            _rewardList.Clear();
         }
 
         private void UpdateItem(GComponent com, int index)

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

@@ -9,8 +9,9 @@ namespace GFGGame
     public class LuckyBoxNewCardView : BaseWindow
     {
         private UI_LuckyBoxNewCardUI _ui;
-        private List<int> _newCardList = new List<int>();
-        private List<ItemData> _newDressList = new List<ItemData>();
+        // private List<int> _newCardList = new List<int>();
+        // private List<ItemData> _newDressList = new List<ItemData>();
+        private int _cardId;
         public override void Dispose()
         {
             if (_ui != null)
@@ -29,7 +30,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.onClick.Add(OnClickBtnBg);
+            _ui.m_loaBg.onClick.Add(Hide);
         }
         protected override void AddEventListener()
         {
@@ -39,17 +40,15 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
-            _newCardList = new List<int>((this.viewData as object[])[0] as List<int>);
-            _newDressList = new List<ItemData>((this.viewData as object[])[1] as List<ItemData>);
+            _cardId = (int)this.viewData;
+            // _newCardList = new List<int>((this.viewData as object[])[0] as List<int>);
             updateView();
 
         }
         private void updateView()
         {
-            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(_newCardList[0]);
+            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(_cardId);
             _ui.m_loaBg.url = ResPathUtil.GetCardPath(cfg.res);
-            _newCardList.RemoveAt(0);
         }
         protected override void OnHide()
         {
@@ -63,19 +62,5 @@ namespace GFGGame
 
         }
 
-        private void OnClickBtnBg()
-        {
-            if (_newCardList.Count == 0)
-            {
-                this.Hide();
-                if (_newDressList.Count > 0)
-                {
-                    ViewManager.Show<LuckyBoxNewDressView>(_newDressList);
-                }
-                return;
-            }
-            updateView();
-
-        }
     }
 }

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

@@ -12,6 +12,7 @@ namespace GFGGame
     {
         private UI_LuckyBoxNewDressUI _ui;
         private List<ItemData> _rewardList = new List<ItemData>();
+        private List<ItemData> _rewardParamList = new List<ItemData>();
         private List<ItemData> _newRewardList = new List<ItemData>();
         private List<ItemData> _oldRewardList = new List<ItemData>();
         // private List<ItemData> _showRewardList = new List<ItemData>();
@@ -49,7 +50,7 @@ namespace GFGGame
 
 
             _ui.m_loaBg.onTouchBegin.Add(OnClickBg);
-            _ui.m_btnPass.onClick.Add(OnClickBtnPass);
+            _ui.m_btnPass.onClick.Add(Hide);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
 
             string resPath = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_zs");
@@ -58,6 +59,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _rewardParamList.Clear();
+            _rewardParamList.AddRange(this.viewData as List<ItemData>);
             _rewardList.AddRange(this.viewData as List<ItemData>);
             _ui.m_btnPass.visible = false;
             _newRewardList.Clear();
@@ -123,7 +126,17 @@ namespace GFGGame
             _ui.m_comCard.m_loaProperty.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + itemCfg.mainScore);
             _ui.m_comCard.m_txtName.text = itemCfg.name;
             _ui.m_comCard.m_txtDiscribe.text = itemCfg.desc;
-            _ui.m_t_open.Play();
+            if (itemCfg.itemType == ConstItemType.CARD)
+            {
+                _ui.m_t_open.Play(() =>
+                {
+                    ViewManager.Show<LuckyBoxNewCardView>(itemCfg.id);
+                });
+            }
+            else
+            {
+                _ui.m_t_open.Play();
+            }
             if (LuckyBoxDataManager.Instance.FirstRewardList.ContainsKey(_rewardList.Count - 1) == true)
             {
                 LuckyBoxDataManager.Instance.FirstRewardList.Remove(_rewardList.Count - 1);
@@ -134,22 +147,11 @@ namespace GFGGame
 
         private void OnClickBg()
         {
-            if (_rewardList.Count == 0)
+            if (_newRewardList.Count == 0 && _oldRewardList.Count == 0)
             {
-                //     // if (_type == (int)FirstGetCardViewType.JUMP)
-                //     // {
-                //     ViewManager.Show(ViewName.LUCKY_BOX_BONUS_VIEW, new object[] { (this.viewData as object[])[0] as List<ItemData>, _rewardList });
-                //     // }
-                //     // else if (_type == (int)FirstGetCardViewType.CANNOT_JUMP)
-                //     // {
-                //     //     GetSuitItemController.TryShow(0);
-
-                //     // }
                 this.Hide();
                 return;
             }
-
-
             _ui.m_t_close.Play(() =>
             {
                 _ui.m_comCard.m_holder.visible = false;
@@ -181,17 +183,14 @@ namespace GFGGame
             }
             return false;
         }
-        private void OnClickBtnPass()
-        {
-            this.Hide();
-        }
+
         protected override void OnHide()
         {
             _ui.m_t_close.Stop(true, false);
             _ui.m_t_open.Stop(true, false);
             _rewardList.Clear();
             base.OnHide();
-            ViewManager.Show<LuckyBoxBonusShowView>(this.viewData);
+            ViewManager.Show<LuckyBoxBonusShowView>(_rewardParamList);
         }
     }
 }

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

@@ -142,6 +142,7 @@ namespace GFGGame
                 gcom1.visible = false;
                 comStar.target.AddChildAt(gcom1, 2);
                 gcom1.scale = new Vector2(scale, scale);
+                gcom1.rotation = rotation;
 
                 // GComponent gcom2 = CreateEffect(comStar, 3, "ui_ck_xs");
                 // gcom2.visible = false;

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

@@ -14,6 +14,7 @@ namespace GFGGame
         private GameObject _sceneObject;
         private FightData roleData;
         private int _partId;//当前评分part
+        private int _curIndex;//当前评分index
         private int _score;//当前总分数
         private int _skillScore = 0;//当前卡牌技能分
         private int _partScore = 0;//当前部件分+技能评分（_skillScore）
@@ -208,6 +209,7 @@ namespace GFGGame
             _currentTime = BeginTime.PART_ALL_FIGHT_BEGIN;
             // _stopFight = false;
             _partId = FightScoreCfgArray.Instance.dataArray[0].id;
+            _curIndex = 0;
             _score = 0;
             _skillScore = 0;//技能附加分
             _mainScore = ScoreSystemData.Instance.GetMainScore(roleData);
@@ -216,7 +218,7 @@ namespace GFGGame
 
             if (GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) > 0)
             {
-                _ui.m_comClick.target.touchable = true;
+                // _ui.m_comClick.target.touchable = true;
                 _ui.m_btnBack.visible = true;
                 Timers.inst.Add(0.5f, 1, SkillScoreStart);//评分结束
             }
@@ -269,7 +271,9 @@ namespace GFGGame
         }
         private void PartScoreStart()
         {
+            if (_curIndex == _partId) return;
             _ui.m_comClick.target.touchable = !FightDataManager.Instance.autoPlay;
+            _curIndex = _partId;
 
             Vector2 pos = (_ui.m_comClick.target.GetChild("grh_" + (_partId - 1)).asGraph).xy;
             float x = 0f;
@@ -435,12 +439,7 @@ namespace GFGGame
             _ui.m_comClick.m_comAllPerfect.m_t1.timeScale = FightDataManager.Instance.fightSpeed;// 1 / _speed;
             _ui.m_comClick.m_comAllPerfect.m_t1.Play(AllCircleScoreEnd);
             Timers.inst.Add(0.1f, 0, ComAllCirclePressTime);
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0)
-            {
-                GuideCfg guideCfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.START_FIGHT);
-                GuideController.TryCompleteGuideIndex(ConstGuideId.START_FIGHT, 10);
-                GuideController.TryCompleteGuide(ConstGuideId.START_FIGHT, 10);
-            }
+
         }
         private void ComAllCirclePressTime(object param = null)
         {
@@ -470,6 +469,12 @@ namespace GFGGame
                     UpdateProgress();
 
                 });
+            if (ViewManager.isViewOpen(typeof(GuideView).FullName) && GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0)
+            {
+                GuideCfg guideCfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.START_FIGHT);
+                GuideController.TryCompleteGuideIndex(ConstGuideId.START_FIGHT, 10);
+                GuideController.TryCompleteGuide(ConstGuideId.START_FIGHT, 10);
+            }
         }
 
         private void GetCurStar(out int star)

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 42c9d001c86a8c94aa7474f5c42ed700
-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/LuckyBox/LuckyBox_atlas0_6.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 48a483de93f7a6b45b4ca5d3443a996a
-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: