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

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

FGUIProject/assets/Bag/package.xml

@@ -6,7 +6,6 @@
     <image id="si5zti4" name="wpbb_di.png" path="/images/"/>
     <image id="si5zti6" name="wpbb_xtxt.png" path="/images/"/>
     <component id="si5zti7" name="ListItem.xml" path="/components/"/>
-    <component id="dhoati8" name="Component1.xml" path="/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Bag" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/Card/components/ListCardItem.xml

@@ -6,7 +6,7 @@
     <loader id="n23_94m1" name="loaBorder" xy="-2,-2" size="242,441" url="ui://7l6lvkay94m19w" autoSize="true"/>
     <loader id="n19_pq5x" name="loaRarity" xy="178,14" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <text id="n8_ojlz" name="txtLv" xy="170,387" size="58,34" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30级"/>
-    <text id="n9_ojlz" name="txtName" xy="63,432" size="112,49" fontSize="36" color="#6a5d56" autoSize="none" text="赵钱孙"/>
+    <text id="n9_ojlz" name="txtName" xy="45,432" pivot="0.5,0" size="148,49" fontSize="36" color="#6a5d56" text="赵钱孙里"/>
     <component id="n18_ojlz" name="comStar" src="ojlzh" fileName="components/ComStar.xml" pkg="eg2y0ldp" xy="10,397" controller="c1,2"/>
     <loader id="n24_qr4e" name="loaMainScore" xy="20,21" size="46,46" aspect="true" url="ui://eg2y0ldp842s6h" fill="scaleMatchWidth"/>
   </displayList>

FGUIProject/assets/CommonGame/components/ComponentValueBar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,47" opaque="false">
-  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10," selected="9">
+  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10," selected="8">
     <remark page="0" value="体力金币马蹄珍珠"/>
     <remark page="1" value="体力金币马蹄"/>
     <remark page="2" value="抽卡兑换"/>
@@ -28,10 +28,10 @@
       <gearXY controller="c1" pages="0,1,5,6,8" values="814,2|684,2|684,2|684,2|814,2" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x5"/>
     </component>
-    <component id="n48_r9ri" name="btnGallery" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
+    <component id="n48_r9ri" name="btnGallery" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,2">
       <gearDisplay controller="c1" pages="9"/>
       <gearXY controller="c1" pages="0,1,3,5,6,8,9" values="814,2|684,2|814,2|684,2|684,2|814,2|814,2" default="688,5"/>
-      <Button title="100" icon="ui://eg2y0ldpq08x5"/>
+      <Button title="100" icon="ui://eg2y0ldpdhoatk2"/>
     </component>
     <component id="n38_r9gf" name="btnPower" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="0,5">
       <gearDisplay controller="c1" pages="0,1"/>
@@ -43,17 +43,17 @@
       <gearXY controller="c1" pages="0,1,3,5" values="-780,5|1079,5|979,5|296,2" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n40_r9gf" name="btnGold" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="296,2">
+    <component id="n40_r9gf" name="btnGold" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="230,5">
       <gearDisplay controller="c1" pages="0,1,6,7,10"/>
       <gearXY controller="c1" pages="0,1,6,7,10" values="296,2|555,2|555,2|814,2|296,2" default="230,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x3"/>
     </component>
-    <component id="n39_r9gf" name="btnDiamondRed" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="555,2">
+    <component id="n39_r9gf" name="btnDiamondRed" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
       <gearDisplay controller="c1" pages="0,1,5,6,10"/>
       <gearXY controller="c1" pages="0,1,3,5,6,10" values="555,2|814,5|979,5|555,2|814,2|555,2" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x6"/>
     </component>
-    <component id="n41_r9gf" name="btnDiamondPurple" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,2">
+    <component id="n41_r9gf" name="btnDiamondPurple" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
       <gearDisplay controller="c1" pages="0,5,10"/>
       <gearXY controller="c1" pages="0,1,3,5,6,8,10" values="814,2|814,2|1207,5|814,2|814,2|688,5|814,2" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x5"/>

FGUIProject/assets/CommonGame/package.xml

@@ -238,6 +238,8 @@
     <image id="v95qtk0" name="ejzjm_gbzt.png" path="/imagesExport/" exported="true"/>
     <image id="v95qtk1" name="luyin.png" path="/imgItemIcon/" exported="true"/>
     <image id="r9ril" name="grxx_xinxin.png" path="/imagesExport/" exported="true"/>
+    <image id="dhoatk2" name="hlhdjficon_1.png" path="/imgItemIcon/" exported="true"/>
+    <image id="dhoatk3" name="shalou.png" path="/imgItemIcon/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyLogin/package.xml

@@ -9,10 +9,9 @@
     <image id="ox5bb" name="yzhd_dyt_2.png" path="/images/" exported="true"/>
     <image id="ox5bc" name="yzhd_dyt_3.png" path="/images/" exported="true"/>
     <image id="ox5bd" name="yzhd_dyt_4.png" path="/images/" exported="true"/>
-    <image id="ox5be" name="yzhd_dyt_5.png" path="/images/" exported="true"/>
-    <image id="ox5bf" name="yzhd_dyt_6.png" path="/images/" exported="true"/>
-    <image id="ox5bg" name="yzhd_dyt_7.png" path="/images/" exported="true"/>
-    <image id="ox5bh" name="yzhd_xt.png" path="/images/"/>
+    <image id="ox5be" name="yzhd_dyt_6.png" path="/images/" exported="true"/>
+    <image id="ox5bf" name="yzhd_dyt_7.png" path="/images/" exported="true"/>
+    <image id="ox5bg" name="yzhd_dyt_5.png" path="/images/" exported="true"/>
     <image id="ox5bi" name="yzhd_zszs.png" path="/images/"/>
     <component id="rkrwj" name="Component1.xml" path="/"/>
   </resources>

FGUIProject/assets/LuckyBox/components/ComCard.xml

@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1020,736">
+<component size="948,970">
   <displayList>
-    <loader id="n0_qdrt" name="bg" xy="0,0" size="1020,739" url="ui://drx9d1usqdrt14" autoSize="true"/>
-    <loader id="n1_qdrt" name="loaType" xy="630,234" size="43,168" aspect="true" url="ui://eg2y0ldpqdrt15" fill="scaleMatchWidth"/>
-    <loader id="n2_qdrt" name="loaIcon" xy="402,238" size="216,216" aspect="true" url="ui://eg2y0ldpkubi7e" fill="scaleMatchWidth"/>
-    <loader id="n3_qdrt" name="loaProperty" xy="356,257" size="50,50" aspect="true" url="ui://eg2y0ldp842s6k" fill="scaleMatchWidth"/>
-    <text id="n5_qdrt" name="txtDiscribe" xy="510,550" pivot="0.5,0" anchor="true" size="602,101" fontSize="34" color="#b4a188" autoSize="none" text="赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王"/>
-    <graph id="n6_dcro" name="holder" xy="509,363" size="1,1" touchable="false" type="rect"/>
-    <image id="n7_v95q" name="n7" src="v95q2r" fileName="images/hd_kkbt_1.png" xy="307,80" group="n8_v95q"/>
-    <text id="n4_qdrt" name="txtName" xy="510,115" pivot="0.5,0.5" anchor="true" size="100,64" group="n8_v95q" font="ui://eg2y0ldpwonotja" fontSize="48" color="#ac854e" text="服装"/>
-    <group id="n8_v95q" name="n8" xy="307,80" size="406,68"/>
+    <loader id="n0_qdrt" name="bg" xy="0,0" size="948,970" url="ui://drx9d1usqdrt14" autoSize="true"/>
+    <loader id="n1_qdrt" name="loaType" xy="693,211" size="54,224" url="ui://eg2y0ldpqdrt15" fill="scaleMatchWidth"/>
+    <loader id="n2_qdrt" name="loaIcon" xy="295,197" size="358,358" aspect="true" url="ui://eg2y0ldpkubi7e" fill="scaleMatchWidth"/>
+    <loader id="n3_qdrt" name="loaProperty" xy="256,234" size="60,60" aspect="true" url="ui://eg2y0ldp842s6k" fill="scaleMatchWidth"/>
+    <text id="n5_qdrt" name="txtDiscribe" xy="474,697" pivot="0.5,0" anchor="true" size="406,101" fontSize="30" color="#c2a773" autoSize="none" text="赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王"/>
+    <graph id="n6_dcro" name="holder" xy="467,473" size="1,1" touchable="false" type="rect"/>
+    <text id="n4_qdrt" name="txtName" xy="469,72" pivot="0.5,0.5" anchor="true" size="100,64" fontSize="48" color="#feeac2" text="服装"/>
   </displayList>
 </component>

FGUIProject/assets/Main/MainUI.xml

@@ -78,7 +78,7 @@
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xg" name="btnTuJian"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xf" name="btnTianGong"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kndrd7k" name="btnStore"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kwg7t8x" name="btnBag"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kdhoaif" name="btnBag"/>
     </list>
     <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="964,466" pivot="0.5,0" anchor="true" group="n57_oju1">
       <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>

FGUIProject/assets/Main/package.xml

@@ -436,6 +436,7 @@
     <image id="v95qic" name="zjm_1.png" path="/images/" atlas="alone_npot"/>
     <image id="v95qid" name="zd_zdjnsm_1.png" path="/imagesFight/"/>
     <component id="v95qie" name="ComSkillTips.xml" path="/"/>
+    <image id="dhoaif" name="zjm_bbbb.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Studio/StudioFilingNpcUI.xml

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <component id="n6_orst" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="10,60" group="n8_orst">
+    <graph id="n9_dhoa" name="loaBg" xy="0,0" size="1080,1920" alpha="0.6" type="rect" lineSize="0" fillColor="#ff000000">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <component id="n6_orst" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80" group="n8_orst">
       <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpsi5zti5"/>
     </component>
-    <image id="n7_orst" name="n7" src="orst1z" fileName="images/dndn_zi.png" xy="159,80" group="n8_orst"/>
-    <group id="n8_orst" name="n8" xy="10,60" size="257,95"/>
+    <image id="n7_orst" name="n7" src="orst1z" fileName="images/dndn_zi.png" xy="159,100" group="n8_orst"/>
+    <group id="n8_orst" name="n8" xy="35,80" size="232,90"/>
     <list id="n1_hbio" name="list" xy="0,500" size="1080,919" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://xz8kxrechbio1u">
       <relation target="" sidePair="middle-middle"/>
       <item/>

FGUIProject/assets/Studio/StudioFilingUI.xml

@@ -26,11 +26,11 @@
     <component id="n3_rqo4" name="btnReward" src="rqo41m" fileName="components/Button2.xml" xy="896,1743">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <component id="n4_rqo4" name="btnSuit" src="rqo41n" fileName="components/Button3.xml" xy="0,1734" group="n20_rqo4"/>
-    <image id="n26_v482" name="n26" src="v4822l" fileName="images/cyjd_di_6.png" xy="150,1830" pivot="0.5,0" anchor="true" group="n20_rqo4"/>
-    <text id="n15_rqo4" name="txtSuitName" xy="150,1762" pivot="0.5,0" anchor="true" size="170,56" group="n20_rqo4" fontSize="42" color="#c7a26d" text="熔金漫纪"/>
-    <text id="n19_rqo4" name="txtSuitProgress" xy="150,1829" pivot="0.5,0" anchor="true" size="83,44" group="n20_rqo4" fontSize="32" color="#d28a79" text="1/10"/>
-    <group id="n20_rqo4" name="n20" xy="0,1734" size="276,186" advanced="true">
+    <component id="n4_rqo4" name="btnSuit" src="rqo41n" fileName="components/Button3.xml" xy="0,1734" size="435,186" group="n20_rqo4"/>
+    <image id="n26_v482" name="n26" src="v4822l" fileName="images/cyjd_di_6.png" xy="211,1844" pivot="0.5,0" anchor="true" size="146,43" group="n20_rqo4"/>
+    <text id="n15_rqo4" name="txtSuitName" xy="211,1776" pivot="0.5,0" anchor="true" size="170,56" group="n20_rqo4" fontSize="42" color="#c7a26d" text="熔金漫纪"/>
+    <text id="n19_rqo4" name="txtSuitProgress" xy="211,1843" pivot="0.5,0" anchor="true" size="83,44" group="n20_rqo4" fontSize="32" color="#d28a79" text="1/10"/>
+    <group id="n20_rqo4" name="n20" xy="0,1734" size="435,186" advanced="true">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </group>
   </displayList>

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

@@ -101,10 +101,25 @@ namespace GFGGame
         {
 
             StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(levelId);
-            bool isPass = InstanceZonesDataManager.CheckLevelPass(storyLevelCfg.needStoryLevelId);
+            StudioCfg cfg = StudioCfgArray.Instance.GetCfg(storyLevelCfg.chapterId);
+            int needStoryLevelId = 0;
+            if (cfg.funId == typeof(StudioFilingView).Name)
+            {
+                needStoryLevelId = cfg.storyLevelId;
+            }
+            else
+            {
+                needStoryLevelId = storyLevelCfg.needStoryLevelId;
+            }
+            bool isPass = InstanceZonesDataManager.CheckLevelPass(needStoryLevelId);
+            StoryLevelCfg needStoryLevelCfg = StoryLevelCfgArray.Instance.GetCfg(needStoryLevelId);
+            if (!isPass && needStoryLevelCfg != null) content = string.Format("完成主线{0}-{1}解锁", needStoryLevelCfg.chapterId, needStoryLevelCfg.order);
+
+
             bool isRoleLv = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) >= storyLevelCfg.needRoleLv;
-            bool isLastPast = true;
+            if (!isRoleLv) content = string.Format("主角等级达到{0}级解锁", storyLevelCfg.needRoleLv);
 
+            bool isLastPast = true;
             List<StoryLevelCfg> storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(storyLevelCfg.type, storyLevelCfg.subType, storyLevelCfg.chapterId);
             int index = storyLevelCfgs.IndexOf(storyLevelCfg);
             if (index > 0 && index < storyLevelCfgs.Count)
@@ -112,11 +127,9 @@ namespace GFGGame
                 isLastPast = InstanceZonesDataManager.CheckLevelPass(storyLevelCfgs[index - 1].id);
 
             }
-            content = "";
-            if (!isRoleLv) content = string.Format("主角等级达到{0}级解锁", storyLevelCfg.needRoleLv);
             if (!isLastPast) content = string.Format("需通关{0}", storyLevelCfgs[index].name);
-            StoryLevelCfg needStoryLevelCfg = StoryLevelCfgArray.Instance.GetCfg(storyLevelCfg.needStoryLevelId);
-            if (!isPass && needStoryLevelCfg != null) content = string.Format("完成主线{0}-{1}解锁", needStoryLevelCfg.chapterId, needStoryLevelCfg.order);
+
+            content = "";
             canFight = isPass && isRoleLv && isLastPast;
         }
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioFilingNpcUI.cs

@@ -7,6 +7,7 @@ namespace UI.Studio
     public partial class UI_StudioFilingNpcUI
     {
         public GComponent target;
+        public GGraph m_loaBg;
         public GButton m_btnback;
         public GList m_list;
         public const string URL = "ui://xz8kxrecrqo41j";
@@ -56,11 +57,13 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
+            m_loaBg = (GGraph)comp.GetChild("loaBg");
             m_btnback = (GButton)comp.GetChild("btnback");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_loaBg = null;
             m_btnback = null;
             m_list = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -404,9 +404,7 @@ namespace GFGGame
             int count = 0;
             int totalCount = 0;
             DressUpMenuSuitDataManager.GetSuitProgressBySuitId(_suitId, out count, out totalCount);
-            _ui.m_txtProgress.SetVar("v1", "" + count);
-            _ui.m_txtProgress.SetVar("v2", "" + totalCount);
-            _ui.m_txtProgress.FlushVars();
+            _ui.m_txtProgress.text = string.Format("{0}/{1}", count, totalCount);
         }
         private void OnClickBtnHome()
         {

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

@@ -56,7 +56,7 @@ namespace GFGGame
             }));
             _valueBar.m_btnTravel.onClick.Add(() =>
             {
-
+                GoodsItemTipsController.ShowItemTips(GlobalCfgArray.globalCfg.travelCostArr[0]);
             });
             _valueBar.m_btnGallery.onClick.Add(() =>
             {

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

@@ -204,9 +204,10 @@ namespace GFGGame
                         if (studioCfg.funId == typeof(StudioFilingView).Name)
                         {
                             StudioDataManager.Instance.filingChapterId = studioCfg.id;
-                            ViewManager.Show<StudioFilingView>();
+                            ViewManager.Show<StudioFilingView>(null, _fromeViewDatas);
                             MainStoryDataManager.currentLevelCfgId = levelCfg.id;
                             InstanceZonesController.ShowLevelView(levelCfg.id, StudioDataManager.Instance.OnFinishFilingStoryLevel);
+                            isJump = true;
                         }
                         else
                         {

GameClient/Assets/Game/HotUpdate/Views/DailyLogin/DailyLoginView.cs

@@ -53,7 +53,7 @@ namespace GFGGame
             _cfgs = DailyLoginCfgArray.Instance.GetCfgsBytype((int)ConstBonusType.Item);
             _cfg = DailyLoginCfgArray.Instance.GetCfgsBytype((int)ConstBonusType.Suit)[0];
             UpdateView();
-            _ui.m_comIcon.m_loaIcon.url = "ui://DailyLogin/yzhd_dyt_7";
+            _ui.m_comIcon.m_loaIcon.url = "ui://DailyLogin/yzhd_dyt_5";
             _ui.m_comIcon.m_loaIcon.data = _cfg;
         }
         private void UpdateView()

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

@@ -104,7 +104,7 @@ namespace GFGGame
             _ui.m_loaMask.visible = false;
             int[][] bonus = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.luckyBoxId).bonusArr;
             List<ItemData> itemDatas = ItemUtil.CreateItemDataList(bonus, LuckyBoxDataManager.Instance.times);
-            ViewManager.Show<LuckyBoxNewDressView>(new object[] { itemDatas });
+            ViewManager.Show<LuckyBoxNewDressView>(itemDatas);
         }
         private void ShowBonusList()
         {
@@ -232,11 +232,13 @@ namespace GFGGame
                 if (cfg.itemType == ConstItemType.DRESS_UP)
                 {
                     List<ItemData> itemDatas = ItemUtil.CreateItemDataList(itemData.id, itemData.num);
-                    ViewManager.Show<LuckyBoxNewDressView>(new object[] { itemDatas });
+                    ViewManager.Show<LuckyBoxNewDressView>(itemDatas);
                 }
                 else if (cfg.itemType == ConstItemType.CARD)
                 {
-                    ViewManager.Show<LuckyBoxNewCardView>(new object[] { itemData.id });
+                    List<int> list = new List<int>();
+                    list.Add(itemData.id);
+                    ViewManager.Show<LuckyBoxNewCardView>(new object[] { list, new List<ItemData>() });
                 }
             }
             openCount++;
@@ -257,6 +259,11 @@ namespace GFGGame
 
         private void OnBtnPassClick()
         {
+            if (openCount == itemList.Count)
+            {
+                OnClickBg();
+                return;
+            }
             _ui.m_loaMask.visible = true;
             if (itemList.Count == 1)
             {
@@ -304,15 +311,16 @@ namespace GFGGame
         {
             _ui.m_loaMask.visible = false;
             _ui.m_loaOpen.visible = false;
-            if (newItemList.Count > 0)
+
+            if (newCardList.Count > 0)
             {
-                ViewManager.Show<LuckyBoxNewDressView>(new object[] { newItemList });
+                ViewManager.Show<LuckyBoxNewCardView>(new object[] { newCardList, newItemList }
+                );
             }
-            if (newCardList.Count > 0)
+            else if (newItemList.Count > 0)
             {
-                ViewManager.Show<LuckyBoxNewCardView>(newCardList);
+                ViewManager.Show<LuckyBoxNewDressView>(newItemList);
             }
-
         }
     }
 }

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

@@ -9,7 +9,8 @@ namespace GFGGame
     public class LuckyBoxNewCardView : BaseWindow
     {
         private UI_LuckyBoxNewCardUI _ui;
-        private List<int> _newCardList;
+        private List<int> _newCardList = new List<int>();
+        private List<ItemData> _newDressList = new List<ItemData>();
         public override void Dispose()
         {
             if (_ui != null)
@@ -38,9 +39,10 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _newCardList = this.viewData as List<int>;
-
 
+            _newCardList = new List<int>((this.viewData as object[])[0] as List<int>);
+            _newDressList = new List<ItemData>((this.viewData as object[])[1] as List<ItemData>);
+            updateView();
 
         }
         private void updateView()
@@ -63,14 +65,17 @@ namespace GFGGame
 
         private void OnClickBtnBg()
         {
-            if (_newCardList.Count > 0)
-            {
-                updateView();
-            }
-            else
+            if (_newCardList.Count == 0)
             {
                 this.Hide();
+                if (_newDressList.Count > 0)
+                {
+                    ViewManager.Show<LuckyBoxNewDressView>(_newDressList);
+                }
+                return;
             }
+            updateView();
+
         }
     }
 }

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

@@ -47,12 +47,12 @@ namespace GFGGame
 
 
             string resPath = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_zs");
-            // SceneController.AddObjectToView(gameObject, null, _ui.m_comCard.m_holder, resPath, out gameObject, out wrapper);
+            SceneController.AddObjectToView(gameObject, null, _ui.m_comCard.m_holder, resPath, out gameObject, out wrapper);
         }
         protected override void OnShown()
         {
             base.OnShown();
-            List<ItemData> rewardList = (this.viewData as object[])[0] as List<ItemData>;
+            List<ItemData> rewardList = this.viewData as List<ItemData>;
             if (_rewardList.Count > 0)
             {
                 _rewardList.AddRange(rewardList);

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

@@ -84,7 +84,10 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0)
+            {
+                GRoot.inst.touchable = false;
+            }
 
             int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];
             if (this.viewData != null)
@@ -375,6 +378,7 @@ namespace GFGGame
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0)
             {
+                GRoot.inst.touchable = true;
                 UpdateToCheckGuide(null);
             }
             else
@@ -386,6 +390,7 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+
             GButton btnBuyTen = _ui.m_listBg.GetChildAt(0).asCom.GetChild("btnBuyTen").asButton;
 
             GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX, 1, "“摘星”里可以通过星辰的力量获得服饰。", -1, true, _ui.target.height - 600);

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

@@ -123,7 +123,7 @@ namespace GFGGame
                 return;
             }
 
-            this.clickBlankToClose = false;
+            // this.clickBlankToClose = false;
             // _ui.m_t0.Play(() =>
             // {
             _fightTimes = _fightType == 1 ? 1 : _fightTimes;
@@ -140,11 +140,14 @@ namespace GFGGame
         }
         private async void ReqFightQuickly(object param)
         {
-            bool isFinish = _needItemId > 0 && _needItemCount > 0 && ItemDataManager.GetItemNum(_needItemId) >= _needItemCount;
+            int hasCount = ItemDataManager.GetItemNum(_needItemId);
+            bool isFinish = _needItemId > 0 && _needItemCount > 0 && hasCount >= _needItemCount;
+            _ui.m_txtItemNeedNum.text = string.Format("还需：{0}个", Math.Max(0, _needItemCount - hasCount));
             if (_index >= _fightTimes || isFinish)
             {
                 if (isFinish)
                 {
+                    _ui.m_txtItemNeedNum.text = "材料已足够";
                     PromptController.Instance.ShowFloatTextPrompt("材料已足够");
                 }
                 ShowEnding();
@@ -197,7 +200,7 @@ namespace GFGGame
             _ui.m_comCostCurrent.visible = true;
 
             _index = 0;
-            this.clickBlankToClose = true;
+            // this.clickBlankToClose = true;
         }
 
         private void ListItemRender(int index, GObject item)

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingNpcView.cs

@@ -33,9 +33,9 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
             // this.viewCom.Center();
-            this.modal = true;
+            // this.modal = true;
             viewAnimationType = EnumViewAnimationType.None;
-            this.clickBlankToClose = false;
+            this.clickBlankToClose = true;
 
             _comSelect = new GComponent();
             _comSelect = UIPackage.CreateObject(UI_StudioFilingNpcUI.PACKAGE_NAME, "ComNpcItemSelect").asCom;
@@ -44,6 +44,7 @@ namespace GFGGame
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.onClickItem.Add(OnListItemClick);
             _ui.m_btnback.onClick.Add(this.Hide);
+            _ui.m_loaBg.onClick.Add(this.Hide);
 
         }
         protected override void AddEventListener()

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -22,7 +22,7 @@ namespace GFGGame
         private static GComponent _debugLayer;
         private static GComponent _floatLayer;
 
-        private static Dictionary<string, object[]> _goBackDatas = new Dictionary<string, object[]>();
+        private static Dictionary<string, List<object[]>> _goBackDatas = new Dictionary<string, List<object[]>>();
 
         public static void Init()
         {
@@ -147,10 +147,13 @@ namespace GFGGame
                 }
                 if (goBackParams != null)
                 {
-                    _goBackDatas[name] = goBackParams;
+                    if (!_goBackDatas.ContainsKey(name))
+                    {
+                        _goBackDatas.Add(name, new List<object[]>());
+                    }
+                    _goBackDatas[name].Add(goBackParams);
                 }
                 Debug.Log("当前打开：" + name);
-
             }
             return true;
 
@@ -211,7 +214,11 @@ namespace GFGGame
                 }
                 if (goBackParams != null)
                 {
-                    _goBackDatas[name] = goBackParams;
+                    if (!_goBackDatas.ContainsKey(name))
+                    {
+                        _goBackDatas.Add(name, new List<object[]>());
+                    }
+                    _goBackDatas[name].Add(goBackParams);
                 }
                 else if (resetGobackParams)
                 {
@@ -255,13 +262,14 @@ namespace GFGGame
             }
         }
 
-        public static void GoBackFrom(string viewName, bool clearGoBackDatas = false)
+        public static void GoBackFrom(string viewName)
         {
             string name = GetName(viewName);
             ViewManager.Hide(name);
-            if (_goBackDatas.ContainsKey(name))
+            if (_goBackDatas.ContainsKey(name) && _goBackDatas[name].Count > 0)
             {
-                object[] gobackItems = _goBackDatas[name];
+                List<object[]> goBackdatas = _goBackDatas[name];
+                object[] gobackItems = goBackdatas[goBackdatas.Count - 1];
                 string tViewName = gobackItems[0] as string;
 
                 object tViewData = null;
@@ -269,8 +277,8 @@ namespace GFGGame
                 {
                     tViewData = gobackItems[1];
                 }
-
                 ViewManager.Show(tViewName, tViewData);
+                _goBackDatas[name].RemoveAt(goBackdatas.Count - 1);
             }
             else
             {
@@ -281,8 +289,11 @@ namespace GFGGame
         public static object[] GetGoBackDatas(string viewName)
         {
             string name = GetName(viewName);
-            object[] value;
-            _goBackDatas.TryGetValue(name, out value);
+            object[] value = null;
+            if (_goBackDatas.ContainsKey(name) && _goBackDatas[name].Count > 0)
+            {
+                value = _goBackDatas[name][_goBackDatas[name].Count - 1];
+            }
             return value;
         }
         public static UIView GetUIView(string viewName)