Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

FGUIProject/assets/ClothingShop/components/Component1.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1050" overflow="hidden">
   <displayList>
-    <component id="n3_hinb" name="compMover" src="ugdz1h" fileName="components/Component2.xml" xy="347,490"/>
+    <component id="n3_hinb" name="compMover" src="ugdz1h" fileName="components/Component2.xml" xy="400,490"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/GetBonusUI.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="902,442">
-  <displayList>
-    <image id="n1_8xpg" name="n1" src="q08x4" fileName="images/di_1.png" pkg="mk0fwx0x" xy="0,0" size="902,442"/>
-    <image id="n2_8xpg" name="n2" src="s2cc4h" fileName="imagesGoods/zx_tsk_xian.png" xy="154,93"/>
-    <text id="n3_8xpg" name="n3" xy="369,34" size="164,54" fontSize="40" color="#8b85e3" text="获得奖励"/>
-    <list id="n4_s2cc" name="listBonus" xy="51,157" size="800,220" layout="row" overflow="scroll" scroll="horizontal" colGap="40" defaultItem="ui://eg2y0ldp8xpgy" align="center" autoClearItems="true">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-  </displayList>
-</component>

FGUIProject/assets/CommonGame/components/BonusItem.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="148,230">
-  <displayList>
-    <component id="n29_t8o1" name="goodsItem" src="s2cc4j" fileName="components/GoodsItem.xml" xy="0,0"/>
-    <text id="n31_t8o1" name="txtOwned" xy="-51,189" size="250,34" fontSize="24" color="#f29295" align="center" vars="true" autoSize="none" text="已拥有:{count=0}"/>
-    <image id="n34_8xpg" name="iconBonusOnce" src="8xpg12" fileName="imagesExport/zx_jq_zi_1.png" xy="16,-4"/>
-  </displayList>
-</component>

FGUIProject/assets/CommonGame/components/BonusItem1.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="148,187">
-  <displayList>
-    <component id="n29_t8o1" name="iconItem" src="s2cc4i" fileName="components/GoodsIconItem.xml" xy="0,0"/>
-    <image id="n30_s2cc" name="iconOwned" src="fka77" fileName="imagesExport/cj_yihde.png" xy="0,114"/>
-    <text id="n32_s2cc" name="txtName" xy="0,151" size="148,36" fontSize="26" color="#8b85e3" align="center" autoSize="none" autoClearText="true" text="金币"/>
-  </displayList>
-</component>

FGUIProject/assets/CommonGame/components/ComItem.xml

@@ -2,7 +2,7 @@
 <component size="221,280" overflow="hidden">
   <displayList>
     <image id="n11_ehs9" name="n11" src="j48o99" fileName="images/kp_sjsj_di_3.png" xy="16,0" group="n21_qr4e"/>
-    <loader id="n12_ehs9" name="loaIcon" xy="112,96" pivot="0.5,0.5" anchor="true" size="150,150" group="n21_qr4e" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scale"/>
+    <loader id="n12_ehs9" name="loaIcon" xy="110,96" pivot="0.5,0.5" anchor="true" size="116,116" group="n21_qr4e" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scale"/>
     <text id="n14_ehs9" name="txtName" xy="111,194" pivot="0.5,0" anchor="true" size="228,44" group="n21_qr4e" fontSize="32" color="#9b7f61" text="赵钱孙李·巴拉"/>
     <image id="n16_j8b3" name="imgGot" src="j48o9b" fileName="images/yx_yilq.png" xy="23,80" group="n21_qr4e"/>
     <image id="n22_cs8j" name="imgNotGot" src="cs8jthx" fileName="images/yx_whd.png" xy="21,83" group="n21_qr4e"/>

FGUIProject/assets/CommonGame/components/ComRewardItem.xml

@@ -2,7 +2,7 @@
 <component size="204,232">
   <displayList>
     <image id="n2_m9wm" name="n2" src="m9wm8s" fileName="images/gxhd_gd_dik.png" xy="0,0"/>
-    <loader id="n3_m9wm" name="loaIcon" xy="23,23" size="150,150" url="ui://eg2y0ldpm9wm8v" fill="scaleFree"/>
+    <loader id="n3_m9wm" name="loaIcon" xy="40,40" pivot="0.5,0.5" size="116,116" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scaleFree"/>
     <text id="n5_m9wm" name="txtCount" xy="162,160" pivot="1,1" size="34,36" fontSize="26" color="#efd78d" text="x1"/>
     <text id="n4_m9wm" name="txtName" xy="98,196" pivot="0.5,0" anchor="true" size="106,36" fontSize="26" color="#fdedbe" text="赵钱孙李"/>
     <image id="n6_kzte" name="imgOnceBonus" src="kzteths" fileName="images/gxhd_scjlscjl.png" xy="8,134"/>

FGUIProject/assets/CommonGame/components/GoodsIconItem.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="148,148">
-  <displayList>
-    <image id="n29_t8o1" name="bg" src="8xpgz" fileName="imagesExport/zx_jq_tbdi_1.png" xy="0,0"/>
-    <loader id="n28_t8o1" name="icon" xy="14,14" size="120,120" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
-    <loader id="n30_d4iw" name="rarity" xy="110,-9" size="42,96" url="ui://eg2y0ldpd4iw4y"/>
-  </displayList>
-</component>

FGUIProject/assets/CommonGame/components/GoodsItem.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="148,187">
-  <displayList>
-    <component id="n29_t8o1" name="iconItem" src="s2cc4i" fileName="components/GoodsIconItem.xml" xy="0,0"/>
-    <image id="n30_s2cc" name="n30" src="8xpg11" fileName="imagesGoods/zx_jq_tbdi_2.png" xy="0,114"/>
-    <text id="n31_s2cc" name="txtNumber" xy="26,113" size="92,37" fontSize="24" color="#ffffff" align="center" autoSize="none" autoClearText="true" text="2000"/>
-    <text id="n32_s2cc" name="txtName" xy="0,151" size="148,36" fontSize="26" color="#8b85e3" align="center" autoSize="none" autoClearText="true" text="金币"/>
-  </displayList>
-</component>

FGUIProject/assets/CommonGame/package.xml

@@ -4,12 +4,8 @@
     <image id="8xpgz" name="zx_jq_tbdi_1.png" path="/imagesExport/" exported="true"/>
     <image id="8xpg11" name="zx_jq_tbdi_2.png" path="/imagesExport/" exported="true"/>
     <image id="8xpg12" name="zx_jq_zi_1.png" path="/imagesExport/" exported="true"/>
-    <component id="8xpg4f" name="GetBonusUI.xml" path="/" exported="true"/>
     <component id="s2cc4g" name="GoodsItemTips.xml" path="/" exported="true"/>
     <image id="s2cc4h" name="zx_tsk_xian.png" path="/imagesExport/" exported="true"/>
-    <component id="s2cc4i" name="GoodsIconItem.xml" path="/components/" exported="true"/>
-    <component id="s2cc4j" name="GoodsItem.xml" path="/components/" exported="true"/>
-    <component id="8xpgy" name="BonusItem.xml" path="/components/" exported="true"/>
     <image id="slb41d" name="hz_fanhui.png" path="/imagesExport/" exported="true"/>
     <image id="slb41b" name="hz_fanhuizjm.png" path="/imagesExport/" exported="true"/>
     <image id="d4iw4x" name="zx_bq_shuxing_3.png" path="/imagesExport/" exported="true"/>
@@ -39,7 +35,6 @@
     <component id="ga165c" name="ButtonTab1.xml" path="/components/" exported="true"/>
     <image id="ga16f" name="zx_jq_djdikbti.png" path="/imagesExport/" exported="true"/>
     <image id="s2cc55" name="zd_xztup_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="21,3,8,6"/>
-    <component id="ga165d" name="BonusItem1.xml" path="/components/" exported="true"/>
     <image id="fka77" name="cj_yihde.png" path="/imagesExport/" exported="true"/>
     <component id="tu965e" name="GetSuitItemUI.xml" path="/" exported="true"/>
     <image id="tu965f" name="cj_drpf_jdt_1.png" path="/images/" scale="9grid" scale9grid="143,8,288,9"/>

FGUIProject/assets/RechargeStore/ItemExchangeUI.xml

@@ -28,7 +28,7 @@
     <component id="n6_hinb" name="btnExchange" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="278,566">
       <Button title="兑换"/>
     </component>
-    <text id="n31_10not" name="txtDiscribe" xy="315,176" size="550,49" fontSize="36" color="#a38b64" autoSize="none" text="描述描述描述描述描述描述描述描述"/>
+    <text id="n31_10not" name="txtDiscribe" xy="315,176" size="546,96" fontSize="36" color="#a38b64" autoSize="none" text="描述描述描述描述描述描述描述描述"/>
   </displayList>
   <relation target="n0_hinb" sidePair="height-height"/>
 </component>

FGUIProject/assets/RoleLvUp/RoleLvUpUI.xml

@@ -3,12 +3,20 @@
   <displayList>
     <image id="n0_mueb" name="n0" src="mueb2" fileName="images/sjsd_kuangdi_1.png" xy="12,0"/>
     <text id="n1_mueb" name="txtLv" xy="350,307" pivot="0.5,0.5" anchor="true" size="190,191" fontSize="150" color="#cda45f" text="35"/>
-    <text id="n4_mueb" name="n4" xy="185,635" size="62,49" group="n7_mueb" fontSize="36" color="#e4c084" text="LV."/>
-    <text id="n3_mueb" name="txtLastLv" xy="240,599" size="93,94" group="n7_mueb" fontSize="72" color="#e4c084" text="34"/>
-    <text id="n5_mueb" name="n5" xy="326,624" size="47,49" group="n7_mueb" fontSize="36" color="#e4c084" text="&gt;&gt;"/>
-    <text id="n6_mueb" name="n6" xy="366,635" size="62,49" group="n7_mueb" fontSize="36" color="#e4c084" text="LV."/>
-    <text id="n2_mueb" name="txtCurLv" xy="421,599" size="93,94" group="n7_mueb" fontSize="72" color="#e4c084" text="35"/>
-    <group id="n7_mueb" name="n7" xy="185,599" size="329,94" advanced="true" layout="hz" colGap="-7" excludeInvisibles="true">
+    <text id="n4_mueb" name="n4" xy="155,635" size="62,49" group="n7_mueb" fontSize="36" color="#e4c084" text="LV.">
+      <relation target="n3_mueb" sidePair="right-left"/>
+    </text>
+    <text id="n3_mueb" name="txtLastLv" xy="217,599" pivot="1,0" size="93,94" group="n7_mueb" fontSize="72" color="#e4c084" text="34">
+      <relation target="n5_mueb" sidePair="right-left"/>
+    </text>
+    <text id="n5_mueb" name="n5" xy="326,635" size="47,49" group="n7_mueb" fontSize="36" color="#e4c084" text="&gt;&gt;"/>
+    <text id="n6_mueb" name="n6" xy="389,635" size="62,49" group="n7_mueb" fontSize="36" color="#e4c084" text="LV.">
+      <relation target="n5_mueb" sidePair="left-right"/>
+    </text>
+    <text id="n2_mueb" name="txtCurLv" xy="451,599" size="93,94" group="n7_mueb" fontSize="72" color="#e4c084" text="35">
+      <relation target="n6_mueb" sidePair="left-right"/>
+    </text>
+    <group id="n7_mueb" name="n7" xy="155,599" size="389,94" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n8_mueb" name="com0" src="mueb4" fileName="components/Component1.xml" xy="92,723" group="n11_mueb"/>

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

@@ -222,6 +222,7 @@ namespace GFGGame
             ActivitySProxy.ReqDailyLoginInfos().Coroutine();
             NoticeSProxy.ReqSystemNoticeList().Coroutine();
             StudioSProxy.ReqStudioInfos().Coroutine();
+            MailSProxy.ReqMailCount().Coroutine();
 
             EquipDataCache.cacher.autoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY) <= 0 ? false : true;
             EquipDataCache.cacher.fightSpeed = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY_SPEED) <= 1 ? 1 : StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY_SPEED);
@@ -238,11 +239,7 @@ namespace GFGGame
                     ViewManager.Show<FieldFightEndView>();
                 }
             }
-            bool result2 = await MailSProxy.ReqMailCount();
-            if (result2)
-            {
-                MailSProxy.ReqMailList(0, MailDataManager.Instance.TotolCount, true).Coroutine();
-            }
+
         }
     }
 }

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

@@ -233,11 +233,7 @@ namespace GFGGame
                 return false;//没穿必需品
             }
 
-            int starCount = GetResultStarCount(score);
-            if (starCount <= 0)
-            {
-                return false;//低于一星
-            }
+
 
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(currentLevelCfgId);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
@@ -245,13 +241,21 @@ namespace GFGGame
             if (hasFightTarget)
             {
                 npcScore = EquipDataCache.cacher.npcTotalScore;
-                if (score < npcScore)
+                if (score > npcScore)
+                {
+                    return true;//分数低于对战对象
+                }
+            }
+            else
+            {
+                int starCount = GetResultStarCount(score);
+                if (starCount > 0)
                 {
-                    return false;//分数低于对战对象
+                    return true;//低于一星
                 }
             }
 
-            return true;
+            return false;
         }
 
         public static int GetCanFightTime(int levelCfgId)

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

@@ -53,14 +53,14 @@ namespace GFGGame
         public bool GetMailRed()
         {
             if (MailDataManager.Instance.UnreadCount > 0) return true;
-            Dictionary<long, MailInfo> mailInfoDic = MailDataManager.Instance.MailInfoDic;
-            foreach (MailInfo mailInfo in mailInfoDic.Values)
-            {
-                if (MailDataManager.Instance.GetMailState(mailInfo) == 1) return false;//数据已排序，第一个已读，则所没有含奖邮件
-                if (MailDataManager.Instance.GetMailState(mailInfo) == 3) return false;//数据已排序，第一个已领，则所有奖励已领
-                if (MailDataManager.Instance.GetMailState(mailInfo) == 2) return true;//数据已排序，有奖励未领
+            // Dictionary<long, MailInfo> mailInfoDic = MailDataManager.Instance.MailInfoDic;
+            // foreach (MailInfo mailInfo in mailInfoDic.Values)
+            // {
+            //     if (MailDataManager.Instance.GetMailState(mailInfo) == 1) return false;//数据已排序，第一个已读，则所没有含奖邮件
+            //     if (MailDataManager.Instance.GetMailState(mailInfo) == 3) return false;//数据已排序，第一个已领，则所有奖励已领
+            //     if (MailDataManager.Instance.GetMailState(mailInfo) == 2) return true;//数据已排序，有奖励未领
 
-            }
+            // }
 
             return false;
         }

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

@@ -581,6 +581,7 @@ namespace GFGGame
             int liangyiqunIndex = -1;
             int shangyiIndex = -1;
             int xiazhuangIndex = -1;
+            int neidaIndex = -1;
             for (int i = 0; i < recommendList.Count; i++)
             {
                 int subType = ItemUtilCS.GetItemSubType(recommendList[i]);
@@ -599,6 +600,11 @@ namespace GFGGame
                 {
                     xiazhuangIndex = i;
                     continue;
+                }
+                if (subType == ConstDressUpItemType.NEI_DA)
+                {
+                    neidaIndex = i;
+                    continue;
 
                 }
             }
@@ -612,7 +618,8 @@ namespace GFGGame
                     int lianyiqunScore = DressUpMenuItemDataManager.GetItemScore(recommendList[liangyiqunIndex]);
                     int shangyiScore = DressUpMenuItemDataManager.GetItemScore(recommendList[shangyiIndex]);
                     int xiazhuangScore = DressUpMenuItemDataManager.GetItemScore(recommendList[xiazhuangIndex]);
-                    if (lianyiqunScore > shangyiScore + xiazhuangScore)
+                    int neidaScore = neidaIndex >= 0 ? DressUpMenuItemDataManager.GetItemScore(recommendList[neidaIndex]) : 0;
+                    if (lianyiqunScore > shangyiScore + xiazhuangScore + neidaScore)
                     {
                         recommendList.RemoveAt(xiazhuangIndex);
                         recommendList.RemoveAt(xiazhuangIndex);

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

@@ -1,78 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_BonusItem
-    {
-        public GComponent target;
-        public UI_GoodsItem m_goodsItem;
-        public GTextField m_txtOwned;
-        public GImage m_iconBonusOnce;
-        public const string URL = "ui://eg2y0ldp8xpgy";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "BonusItem";
-        private static UI_BonusItem _proxy;
-
-        public static UI_BonusItem Create(GObject gObject = null)
-        {
-            var ui = new UI_BonusItem();
-            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_BonusItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_BonusItem();
-            }
-            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_goodsItem = (UI_GoodsItem)UI_GoodsItem.Create(comp.GetChild("goodsItem"));
-            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
-            m_iconBonusOnce = (GImage)comp.GetChild("iconBonusOnce");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_goodsItem.Dispose();
-            m_goodsItem = null;
-            m_txtOwned = null;
-            m_iconBonusOnce = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

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

@@ -1,78 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_BonusItem1
-    {
-        public GComponent target;
-        public UI_GoodsIconItem m_iconItem;
-        public GImage m_iconOwned;
-        public GTextField m_txtName;
-        public const string URL = "ui://eg2y0ldpga165d";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "BonusItem1";
-        private static UI_BonusItem1 _proxy;
-
-        public static UI_BonusItem1 Create(GObject gObject = null)
-        {
-            var ui = new UI_BonusItem1();
-            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_BonusItem1 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_BonusItem1();
-            }
-            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_iconItem = (UI_GoodsIconItem)UI_GoodsIconItem.Create(comp.GetChild("iconItem"));
-            m_iconOwned = (GImage)comp.GetChild("iconOwned");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_iconItem.Dispose();
-            m_iconItem = null;
-            m_iconOwned = null;
-            m_txtName = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

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

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_GetBonusUI
-    {
-        public GComponent target;
-        public GList m_listBonus;
-        public const string URL = "ui://eg2y0ldp8xpg4f";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "GetBonusUI";
-        private static UI_GetBonusUI _proxy;
-
-        public static UI_GetBonusUI Create(GObject gObject = null)
-        {
-            var ui = new UI_GetBonusUI();
-            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_GetBonusUI Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_GetBonusUI();
-            }
-            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_listBonus = (GList)comp.GetChild("listBonus");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_listBonus = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

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

@@ -1,77 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_GoodsIconItem
-    {
-        public GComponent target;
-        public GImage m_bg;
-        public GLoader m_icon;
-        public GLoader m_rarity;
-        public const string URL = "ui://eg2y0ldps2cc4i";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "GoodsIconItem";
-        private static UI_GoodsIconItem _proxy;
-
-        public static UI_GoodsIconItem Create(GObject gObject = null)
-        {
-            var ui = new UI_GoodsIconItem();
-            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_GoodsIconItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_GoodsIconItem();
-            }
-            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_bg = (GImage)comp.GetChild("bg");
-            m_icon = (GLoader)comp.GetChild("icon");
-            m_rarity = (GLoader)comp.GetChild("rarity");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_bg = null;
-            m_icon = null;
-            m_rarity = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

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

@@ -1,78 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_GoodsItem
-    {
-        public GComponent target;
-        public UI_GoodsIconItem m_iconItem;
-        public GTextField m_txtNumber;
-        public GTextField m_txtName;
-        public const string URL = "ui://eg2y0ldps2cc4j";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "GoodsItem";
-        private static UI_GoodsItem _proxy;
-
-        public static UI_GoodsItem Create(GObject gObject = null)
-        {
-            var ui = new UI_GoodsItem();
-            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_GoodsItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_GoodsItem();
-            }
-            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_iconItem = (UI_GoodsIconItem)UI_GoodsIconItem.Create(comp.GetChild("iconItem"));
-            m_txtNumber = (GTextField)comp.GetChild("txtNumber");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_iconItem.Dispose();
-            m_iconItem = null;
-            m_txtNumber = null;
-            m_txtName = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetBonusView.cs

@@ -6,82 +6,82 @@ namespace GFGGame
 {
     public class GetBonusView : BaseWindow
     {
-        private UI_GetBonusUI _ui;
-        private List<ItemData> _bonusList;
-        protected override void OnInit()
-        {
-            base.OnInit();
-            _ui = UI_GetBonusUI.Create();
-            this.viewCom = _ui.target;
-            this.viewCom.Center();
-            this.modal = true;
+        // private UI_GetBonusUI _ui;
+        // private List<ItemData> _bonusList;
+        // protected override void OnInit()
+        // {
+        //     base.OnInit();
+        //     _ui = UI_GetBonusUI.Create();
+        //     this.viewCom = _ui.target;
+        //     this.viewCom.Center();
+        //     this.modal = true;
 
-            _ui.m_listBonus.itemRenderer = UpdateBonusItem;
+        //     _ui.m_listBonus.itemRenderer = UpdateBonusItem;
 
-            _ui.m_listBonus.onClickItem.Add(OnClickListBonusItem);
-        }
+        //     _ui.m_listBonus.onClickItem.Add(OnClickListBonusItem);
+        // }
 
-        protected override void OnShown()
-        {
-            base.OnShown();
-            _bonusList = this.viewData as List<ItemData>;
-            if (_bonusList != null)
-            {
-                _ui.m_listBonus.numItems = _bonusList.Count;
-            }
-            else
-            {
-                _ui.m_listBonus.numItems = 0;
-            }
-            if (_ui.m_listBonus.numItems > 4)
-            {
-                _ui.m_listBonus.columnGap = 40;
-            }
-            else
-            {
-                _ui.m_listBonus.columnGap = 60;
-            }
-            int targetY = (int)(this.viewCom.y + _ui.target.y + _ui.target.height);
-        }
+        // protected override void OnShown()
+        // {
+        //     base.OnShown();
+        //     _bonusList = this.viewData as List<ItemData>;
+        //     if (_bonusList != null)
+        //     {
+        //         _ui.m_listBonus.numItems = _bonusList.Count;
+        //     }
+        //     else
+        //     {
+        //         _ui.m_listBonus.numItems = 0;
+        //     }
+        //     if (_ui.m_listBonus.numItems > 4)
+        //     {
+        //         _ui.m_listBonus.columnGap = 40;
+        //     }
+        //     else
+        //     {
+        //         _ui.m_listBonus.columnGap = 60;
+        //     }
+        //     int targetY = (int)(this.viewCom.y + _ui.target.y + _ui.target.height);
+        // }
 
-        protected override void OnHide()
-        {
-            base.OnHide();
-            GetSuitItemController.TryShow(0);
-        }
+        // protected override void OnHide()
+        // {
+        //     base.OnHide();
+        //     GetSuitItemController.TryShow(0);
+        // }
 
-        private void OnClickListBonusItem(EventContext context)
-        {
-            GComponent item = context.data as GComponent;
-            int itemId = (int)item.data;
-            GoodsItemTipsController.ShowItemTips(itemId);
-        }
+        // private void OnClickListBonusItem(EventContext context)
+        // {
+        //     GComponent item = context.data as GComponent;
+        //     int itemId = (int)item.data;
+        //     GoodsItemTipsController.ShowItemTips(itemId);
+        // }
 
-        private void UpdateBonusItem(int index, GObject item)
-        {
-            ItemData itemData = _bonusList[index] as ItemData;
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
-            UI_BonusItem listItem = UI_BonusItem.Proxy(item);
-            listItem.m_goodsItem.m_txtNumber.text = "x" + itemData.num;
-            listItem.m_txtOwned.SetVar("count", "" + ItemDataManager.GetItemNum(itemData.id)).FlushVars();
-            listItem.m_goodsItem.m_txtName.text = itemCfg.name;
-            listItem.m_goodsItem.m_iconItem.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
-            listItem.m_iconBonusOnce.visible = itemData.isOnceBonus;
-            RarityIconController.UpdateRarityIcon(listItem.m_goodsItem.m_iconItem.m_rarity, itemData.id, true);
-            listItem.target.data = itemData.id;
-        }
+        // private void UpdateBonusItem(int index, GObject item)
+        // {
+        //     ItemData itemData = _bonusList[index] as ItemData;
+        //     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
+        //     UI_BonusItem listItem = UI_BonusItem.Proxy(item);
+        //     listItem.m_goodsItem.m_txtNumber.text = "x" + itemData.num;
+        //     listItem.m_txtOwned.SetVar("count", "" + ItemDataManager.GetItemNum(itemData.id)).FlushVars();
+        //     listItem.m_goodsItem.m_txtName.text = itemCfg.name;
+        //     listItem.m_goodsItem.m_iconItem.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
+        //     listItem.m_iconBonusOnce.visible = itemData.isOnceBonus;
+        //     RarityIconController.UpdateRarityIcon(listItem.m_goodsItem.m_iconItem.m_rarity, itemData.id, true);
+        //     listItem.target.data = itemData.id;
+        // }
 
-        protected override void UpdateToCheckGuide(object param)
-        {
-            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(null, ConstGuideId.GET_BONUS_FIRST, 1, "恭喜你，获得了第一份奖励，点击图标可以查看物品信息，点击半透明区域继续", -1, true, (int)(this.viewCom.y + _ui.target.y + _ui.target.height));
-        }
-        protected override void TryCompleteGuide()
-        {
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.GET_BONUS_FIRST);
-            GuideController.TryCompleteGuideIndex(cfg.id, 1);
-            GuideController.TryCompleteGuide(ConstGuideId.GET_BONUS_FIRST, 1);
+        // protected override void UpdateToCheckGuide(object param)
+        // {
+        //     if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+        //     GuideController.TryGuide(null, ConstGuideId.GET_BONUS_FIRST, 1, "恭喜你，获得了第一份奖励，点击图标可以查看物品信息，点击半透明区域继续", -1, true, (int)(this.viewCom.y + _ui.target.y + _ui.target.height));
+        // }
+        // protected override void TryCompleteGuide()
+        // {
+        //     GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.GET_BONUS_FIRST);
+        //     GuideController.TryCompleteGuideIndex(cfg.id, 1);
+        //     GuideController.TryCompleteGuide(ConstGuideId.GET_BONUS_FIRST, 1);
 
-        }
+        // }
     }
 }

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

@@ -127,10 +127,6 @@ namespace GFGGame
             }
 
 
-            if (!string.IsNullOrEmpty(_fightCfg.music))
-            {
-                MusicManager.Instance.Play(ResPathUtil.GetMusicPath(_fightCfg.music, "mp3"));
-            }
             _ui.m_compNeed.target.visible = _fightCfg.needItemId > 0 || _fightCfg.needSuitId > 0 || _fightCfg.needTagsArr.Length > 0;
             if (_ui.m_compNeed.target.visible)
             {

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

@@ -96,6 +96,15 @@ namespace GFGGame
         private void OnClickBtnFightOnce()
         {
             // int time = InstanceZonesDataManager.GetCanFightTime(_levelID);
+            int starCount = InstanceZonesDataManager.GetStarCountHistory(_levelID);
+            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
+            StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
+
+            if (starCount < fightCfg.quickFightStart)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("挑战星数不足");
+                return;
+            }
             InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out int times, out string title);
             if (times > 0)
             {
@@ -110,6 +119,15 @@ namespace GFGGame
 
         private void OnClickBtnFightTimes()
         {
+            int starCount = InstanceZonesDataManager.GetStarCountHistory(_levelID);
+            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
+            StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
+
+            if (starCount < fightCfg.quickFightStart)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("挑战星数不足");
+                return;
+            }
             InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out int times, out string title);
 
             if (_type == ConstInstanceZonesType.Story && _storyType == ConstInstanceZonesSubType.Normal)