zhaoyang 2 жил өмнө
parent
commit
19711e1b96
28 өөрчлөгдсөн 38 нэмэгдсэн , 10 устгасан
  1. 12 3
      FGUIProject/assets/Main/StoryFightFailUI.xml
  2. 10 5
      FGUIProject/assets/Main/components/ListFailItem.xml
  3. BIN
      FGUIProject/assets/Main/imagesNew/duihuakuang_db.png
  4. BIN
      FGUIProject/assets/Main/imagesNew/lm_touxiangdb.png
  5. BIN
      FGUIProject/assets/Main/imagesNew/shengqi.png
  6. BIN
      FGUIProject/assets/Main/imagesNew/tc_xuanxiangkuang_1.png
  7. BIN
      FGUIProject/assets/Main/imagesNew/yf_db_1.png
  8. BIN
      FGUIProject/assets/Main/imagesNew/zs_flower.png
  9. 6 0
      FGUIProject/assets/Main/package.xml
  10. 1 1
      GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs
  11. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListFailItem.cs
  12. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightFailUI.cs
  13. 3 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightFailView.cs
  14. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  15. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  16. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  17. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  18. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png
  19. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  20. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png
  21. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png
  22. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  23. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  24. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png
  25. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png
  26. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png
  27. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png
  28. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 12 - 3
FGUIProject/assets/Main/StoryFightFailUI.xml

@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1120">
+<component size="1080,1002">
   <displayList>
   <displayList>
-    <image id="n0_jx6z" name="n0" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0" size="1021,1120"/>
-    <list id="n1_jx6z" name="list" xy="90,411" size="900,653" overflow="scroll" lineGap="20" defaultItem="ui://mfvz4q8kjx6zpf" align="center">
+    <component id="n0_jx6z" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" pkg="eg2y0ldp" xy="0,0" size="1021,1000">
+      <property target="txtTitle" propertyId="0" value="阿福的提示"/>
+    </component>
+    <list id="n1_jx6z" name="list" xy="98,396" size="899,548" overflow="scroll" defaultItem="ui://mfvz4q8kjx6zpf" align="center">
+      <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </list>
+    <image id="n7_jx6z" name="n7" src="jx6zpl" fileName="imagesNew/duihuakuang_db.png" xy="431,180"/>
+    <text id="n9_jx6z" name="n9" xy="485,207" size="425,150" fontSize="32" color="#a88656" autoSize="none" text="通关失败别灰心!试试以下途径提升自己~"/>
+    <image id="n5_jx6z" name="n5" src="jx6zpm" fileName="imagesNew/lm_touxiangdb.png" xy="156,142" size="262,254" group="n8_jx6z" aspect="true"/>
+    <image id="n6_jx6z" name="n6" src="jx6zpn" fileName="imagesNew/shengqi.png" xy="200,166" group="n8_jx6z"/>
+    <group id="n8_jx6z" name="n8" xy="156,142" size="262,254"/>
+    <image id="n10_ebfi" name="n10" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="112,393" size="846,10"/>
   </displayList>
   </displayList>
 </component>
 </component>

+ 10 - 5
FGUIProject/assets/Main/components/ListFailItem.xml

@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="900,180" overflow="hidden">
+<component size="893,170" overflow="hidden">
   <displayList>
   <displayList>
-    <image id="n2_jx6z" name="n2" src="8xpg4r" fileName="imagesFight/zd_jsjm_ditu.png" xy="0,-67"/>
-    <text id="n3_jx6z" name="txtDesc" xy="62,64" size="230,51" fontSize="38" color="#9e7c50" vAlign="middle" singleLine="true" autoClearText="true" text="示例巴拉巴拉"/>
-    <component id="n4_jx6z" name="btnGo" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="668,58">
-      <Button title="前往"/>
+    <image id="n2_jx6z" name="n2" src="jx6zpo" fileName="imagesNew/tc_xuanxiangkuang_1.png" xy="0,18" group="n9_ebfi"/>
+    <text id="n3_jx6z" name="txtDesc" xy="72,74" size="196,44" group="n9_ebfi" fontSize="32" color="#a07c49" vAlign="middle" singleLine="true" autoClearText="true" text="示例巴拉巴拉"/>
+    <component id="n4_jx6z" name="btnGo" src="jx6ztoe" fileName="components/BtnStyle007.xml" pkg="eg2y0ldp" xy="648,67" group="n9_ebfi">
+      <Button title="前往" titleColor="#683c28"/>
     </component>
     </component>
+    <image id="n5_jx6z" name="n5" src="jx6zpq" fileName="imagesNew/zs_flower.png" xy="43,87" group="n9_ebfi"/>
+    <image id="n6_jx6z" name="n6" src="jx6zpp" fileName="imagesNew/yf_db_1.png" xy="817,0" group="n8_jx6z"/>
+    <text id="n7_jx6z" name="n7" xy="827,19" size="60,39" group="n8_jx6z" fontSize="28" color="#9a4e16" text="推荐"/>
+    <group id="n8_jx6z" name="grpRecommend" xy="817,0" size="76,79" group="n9_ebfi" advanced="true"/>
+    <group id="n9_ebfi" name="n9" xy="0,0" size="893,170"/>
   </displayList>
   </displayList>
 </component>
 </component>

BIN
FGUIProject/assets/Main/imagesNew/duihuakuang_db.png


BIN
FGUIProject/assets/Main/imagesNew/lm_touxiangdb.png


BIN
FGUIProject/assets/Main/imagesNew/shengqi.png


BIN
FGUIProject/assets/Main/imagesNew/tc_xuanxiangkuang_1.png


BIN
FGUIProject/assets/Main/imagesNew/yf_db_1.png


BIN
FGUIProject/assets/Main/imagesNew/zs_flower.png


+ 6 - 0
FGUIProject/assets/Main/package.xml

@@ -661,6 +661,12 @@
     <component id="jx6zpd" name="ButtonModle9.xml" path="/components/"/>
     <component id="jx6zpd" name="ButtonModle9.xml" path="/components/"/>
     <component id="jx6zpe" name="StoryFightFailUI.xml" path="/" exported="true"/>
     <component id="jx6zpe" name="StoryFightFailUI.xml" path="/" exported="true"/>
     <component id="jx6zpf" name="ListFailItem.xml" path="/components/"/>
     <component id="jx6zpf" name="ListFailItem.xml" path="/components/"/>
+    <image id="jx6zpl" name="duihuakuang_db.png" path="/imagesNew/"/>
+    <image id="jx6zpm" name="lm_touxiangdb.png" path="/imagesNew/"/>
+    <image id="jx6zpn" name="shengqi.png" path="/imagesNew/"/>
+    <image id="jx6zpo" name="tc_xuanxiangkuang_1.png" path="/imagesNew/"/>
+    <image id="jx6zpp" name="yf_db_1.png" path="/imagesNew/"/>
+    <image id="jx6zpq" name="zs_flower.png" path="/imagesNew/"/>
   </resources>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs

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

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListFailItem.cs

@@ -9,6 +9,7 @@ namespace UI.Main
         public GComponent target;
         public GComponent target;
         public GTextField m_txtDesc;
         public GTextField m_txtDesc;
         public GButton m_btnGo;
         public GButton m_btnGo;
+        public GGroup m_grpRecommend;
         public const string URL = "ui://mfvz4q8kjx6zpf";
         public const string URL = "ui://mfvz4q8kjx6zpf";
         public const string PACKAGE_NAME = "Main";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ListFailItem";
         public const string RES_NAME = "ListFailItem";
@@ -58,11 +59,13 @@ namespace UI.Main
         {
         {
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_btnGo = (GButton)comp.GetChild("btnGo");
             m_btnGo = (GButton)comp.GetChild("btnGo");
+            m_grpRecommend = (GGroup)comp.GetChild("grpRecommend");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
             m_txtDesc = null;
             m_txtDesc = null;
             m_btnGo = null;
             m_btnGo = null;
+            m_grpRecommend = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightFailUI.cs

@@ -7,6 +7,7 @@ namespace UI.Main
     public partial class UI_StoryFightFailUI
     public partial class UI_StoryFightFailUI
     {
     {
         public GComponent target;
         public GComponent target;
+        public GComponent m_comBg;
         public GList m_list;
         public GList m_list;
         public const string URL = "ui://mfvz4q8kjx6zpe";
         public const string URL = "ui://mfvz4q8kjx6zpe";
         public const string PACKAGE_NAME = "Main";
         public const string PACKAGE_NAME = "Main";
@@ -55,10 +56,12 @@ namespace UI.Main
 
 
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
+            m_comBg = (GComponent)comp.GetChild("comBg");
             m_list = (GList)comp.GetChild("list");
             m_list = (GList)comp.GetChild("list");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
+            m_comBg = null;
             m_list = null;
             m_list = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightFailView.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using ET;
 using ET;
 using FairyGUI;
 using FairyGUI;
 using UI.Main;
 using UI.Main;
+using UI.CommonGame;
 using UnityEngine;
 using UnityEngine;
 
 
 namespace GFGGame
 namespace GFGGame
@@ -31,6 +32,7 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
 
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_comBg.GetChild("btnClose").asCom.onClick.Add(Hide);
         }
         }
         protected override void AddEventListener()
         protected override void AddEventListener()
         {
         {
@@ -67,7 +69,7 @@ namespace GFGGame
 
 
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
-
+            item.m_grpRecommend.visible = _cfgs[index].isAdvise == 1;
             item.m_txtDesc.text = string.Format(_cfgs[index].desc, ConstDressUpScoreType.scoreTypeList()[fightCfg.scoreType]);
             item.m_txtDesc.text = string.Format(_cfgs[index].desc, ConstDressUpScoreType.scoreTypeList()[fightCfg.scoreType]);
             if (item.m_btnGo.data == null)
             if (item.m_btnGo.data == null)
             {
             {

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes