引导

FGUIProject/assets/ClothingDecompose/ClothingDecomposeUI.xml

@@ -10,7 +10,7 @@
     </image>
     <image id="n22_qyr6" name="n22" src="qyr6n" fileName="images/fzfj_erdituditu.png" xy="72,406"/>
     <component id="n28_cb92" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,7"/>
-    <component id="n0_wlc2" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n0_wlc2" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n1_wlc2" name="btnRule" src="wlc21" fileName="components/Button1.xml" xy="975,194"/>
     <list id="n29_ez2u" name="listTab" xy="100,343" size="880,63" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="2" colGap="12">
       <item url="ui://h9mv1l71wlc22" icon="ui://h9mv1l71qyr6j" selectedIcon="ui://h9mv1l71qyr6e"/>
@@ -35,7 +35,7 @@
     <component id="n16_wlc2" name="btnDecompose" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="368,1553">
       <Button title="分解"/>
     </component>
-    <text id="n17_wlc2" name="txtConsume" xy="440,1506" pivot="0.5,0" size="199,41" fontSize="30" color="#da826e" align="center" text="消耗金币X200">
+    <text id="n17_wlc2" name="txtConsume" xy="445,1506" pivot="0.5,0" size="188,41" fontSize="30" color="#da826e" align="center" text="消耗金币X200">
       <relation target="" sidePair="center-center"/>
     </text>
     <text id="n18_wlc2" name="txtTips" xy="254,1660" size="571,44" fontSize="26" color="#bbafa3" align="center" autoSize="none" text="服装会自动保留一件不显示在列表中"/>

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

@@ -89,7 +89,7 @@ namespace GFGGame
                 StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_AUTO_PLAY, _autoPlay == true ? 1 : 0).Coroutine();
             }
         }
-        public int maxFightSpeed = 4;
+        public int maxFightSpeed = 2;
         private int _fightSpeed = 1;
         public int fightSpeed
         {

GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -231,6 +231,12 @@ namespace GFGGame
             _ui.m_listReward.numItems = _decomposeCount > 0 ? cfg.itemsArr.Length : 0;
             _ui.m_txtShow.text = string.Format("*  分解{0}件{1}可获得  *", StringUtil.GetColorText(_decomposeCount.ToString(), "#DA826E"), ConstDressRarity.DressRarityList()[_curRarity]);
             ET.Log.Debug("分解消耗：  " + cfg.consumeId + "   找不到物品配置");
+            if (itemCfg == null)
+            {
+                _ui.m_txtConsume.visible = false;
+                return;
+            }
+            _ui.m_txtConsume.visible = true;
             _ui.m_txtConsume.text = string.Format("消耗{0}X{1}", itemCfg.name, (_decomposeCount * cfg.consumeCount));
         }
         private void ListRewardItemRander(int index, GObject obj)

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

@@ -243,8 +243,7 @@ namespace GFGGame
             //     _ui.m_comClick.m_comAllPerfect.target.onTouchBegin.Add(OnComAllCircleClickBegin);
             //     _ui.m_comClick.m_comAllPerfect.target.onTouchEnd.Add(AllCircleScoreEnd);
             // }
-
-            CheckPartAllFightBegin();
+            Timers.inst.Add(1, 0, CheckGuide);
         }
         /****************************************************************************************************************/
         private void SkillScoreStart(int roleType, out int skillScore, out int targetSkillScore, out Dictionary<int, int> skillScoreDic, out bool showCard)
@@ -701,6 +700,7 @@ namespace GFGGame
             }
             else
             {
+                CheckPartAllFightBegin();
                 Timers.inst.Remove(CheckGuide);
             }
         }
@@ -711,10 +711,11 @@ namespace GFGGame
 
             // if (playStop)
             // {
-            //     GuideController.TryGuide(_ui.m_comMineCircle.target, ConstGuideId.TARGET_FIGHT, 1, "这里可以观察双方的分数计算。");
+            //    
             // }
             // GuideController.TryGuide(_ui.m_btnSkill0.target, ConstGuideId.TARGET_FIGHT, 2, "使用技能，可以增加胜出的几率哦，长按查看技能说明。");
-            // GuideController.TryCompleteGuide(ConstGuideId.TARGET_FIGHT, 2);
+            GuideController.TryGuide(_ui.m_proScore.target, ConstGuideId.TARGET_FIGHT, 1, "这里可以观察双方的分数计算。");
+            GuideController.TryCompleteGuide(ConstGuideId.TARGET_FIGHT, 1);
 
         }
     }