智能扫荡功能

FGUIProject/assets/Main/StoryFightQuicklyUI.xml

@@ -1,10 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="936,1130">
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n0_s2cc" name="n0" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,1130" group="n19_mueb"/>
     <image id="n18_srnc" name="n18" src="ehs93" fileName="images/yx_btzs.png" pkg="eg2y0ldp" xy="33,-93" group="n19_mueb"/>
     <image id="n3_s2cc" name="n3" src="srnc98" fileName="images/zd_btzi_1.png" xy="15,-120" group="n19_mueb"/>
-    <list id="n13_s2cc" name="list" xy="20,63" size="895,850" group="n19_mueb" overflow="scroll" lineGap="10" align="center"/>
+    <image id="n27_qe01" name="n27" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" pkg="eg2y0ldp" xy="239,32" group="n29_qe01"/>
+    <text id="n28_qe01" name="txtName" xy="335,32" pivot="0.5,0" size="284,74" group="n29_qe01" fontSize="56" color="#8f6e30" text="活跃度奖励"/>
+    <group id="n29_qe01" name="n29" xy="239,32" size="475,85" group="n19_mueb"/>
+    <graph id="n32_qe01" name="n32" xy="43,140" size="850,58" group="n35_qe01" alpha="0.2" type="rect" lineSize="0" lineColor="#ff666666" fillColor="#ff666666" corner="10"/>
+    <text id="n33_qe01" name="txtItemName" xy="54,145" size="324,44" group="n35_qe01" fontSize="32" color="#cb9d57" text="目标道具：孔雀东南飞"/>
+    <text id="n34_qe01" name="txtItemNeedNum" xy="725,146" pivot="1,0" size="152,44" group="n35_qe01" fontSize="32" color="#cb9d57" align="right" text="还需：8个"/>
+    <group id="n35_qe01" name="grpNeeditem" xy="43,140" size="850,58" group="n19_mueb" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </group>
+    <list id="n13_s2cc" name="list" xy="20,232" size="895,681" group="n19_mueb" overflow="scroll" lineGap="10" align="center">
+      <gearXY controller="c1" pages="1" values="20,232" default="20,168"/>
+      <gearSize controller="c1" pages="1" values="895,681,1,1" default="895,745,1,1"/>
+      <relation target="" sidePair="bottomext-bottom"/>
+    </list>
     <text id="n15_s2cc" name="txtPowerDesc" xy="613,1080" size="170,42" group="n19_mueb" fontSize="30" color="#c1aa8f" align="center" vars="true" autoSize="none" text="消耗体力{v1=60}"/>
     <component id="n6_s2cc" name="btnExit" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="57,958" group="n16_nzmy">
       <Button title="结束挑战"/>

FGUIProject/assets/Main/components/StoryFightQuicklyBonusListItem.xml

@@ -3,8 +3,8 @@
   <displayList>
     <text id="n7_s2cc" name="txtTimes" xy="19,3" size="103,51" fontSize="38" color="#9b7853" vars="true" text="第{n=1}次"/>
     <image id="n8_s2cc" name="n8" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="8,65" size="848,12"/>
-    <text id="n9_s2cc" name="txtExp" xy="557,12" size="155,41" fontSize="30" color="#ba9a78" vars="true" text="经验: +{n=300}"/>
-    <image id="n10_s2cc" name="n10" src="8xpg4y" fileName="imagesFight/zd_jsjm_jyz.png" xy="726,11"/>
+    <text id="n9_s2cc" name="txtExp" xy="760,14" size="77,42" fontSize="30" color="#ba9a78" vars="true" text="+{n=300}"/>
+    <image id="n10_s2cc" name="n10" src="8xpg4y" fileName="imagesFight/zd_jsjm_jyz.png" xy="629,13"/>
     <list id="n11_s2cc" name="list" xy="-1,97" size="865,276" layout="flow_hz" colGap="60" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
       <item/>
       <item/>

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

@@ -7,6 +7,11 @@ namespace UI.Main
     public partial class UI_StoryFightQuicklyUI
     {
         public GComponent target;
+        public Controller m_c1;
+        public GTextField m_txtName;
+        public GTextField m_txtItemName;
+        public GTextField m_txtItemNeedNum;
+        public GGroup m_grpNeeditem;
         public GList m_list;
         public GTextField m_txtPowerDesc;
         public GButton m_btnExit;
@@ -60,6 +65,11 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtItemName = (GTextField)comp.GetChild("txtItemName");
+            m_txtItemNeedNum = (GTextField)comp.GetChild("txtItemNeedNum");
+            m_grpNeeditem = (GGroup)comp.GetChild("grpNeeditem");
             m_list = (GList)comp.GetChild("list");
             m_txtPowerDesc = (GTextField)comp.GetChild("txtPowerDesc");
             m_btnExit = (GButton)comp.GetChild("btnExit");
@@ -69,6 +79,11 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
+            m_txtName = null;
+            m_txtItemName = null;
+            m_txtItemNeedNum = null;
+            m_grpNeeditem = null;
             m_list = null;
             m_txtPowerDesc = null;
             m_btnExit = null;

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs

@@ -90,14 +90,13 @@ namespace GFGGame
             item.m_txtNeed.text = need.ToString();
             item.m_txtHas.text = StringUtil.GetColorText(has.ToString(), has >= need ? "#F2DB96" : "#C9F1A5");
             if (_canFoster && has < need) _canFoster = false;
-            item.target.data = materialsArr[index][0];
+            item.target.data = materialsArr[index];
             UI_ListMaterialsItem.ProxyEnd();
         }
         private void OnListMaterialsItem(EventContext context)
         {
-            int itemId = (int)(context.data as GComponent).data;
-            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { typeof(ClothingView).FullName, ( this.viewData as object[])[4]  }
-    });
+            int[] itemData = (int[])(context.data as GComponent).data;
+            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemData[0], new object[] { typeof(ClothingView).FullName, (this.viewData as object[])[4] }, itemData[1] });
         }
 
         private void ListPropertyItemRender(int index, GObject obj)

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -370,14 +370,14 @@ namespace GFGGame
             item.m_txtHas.text = StringUtil.GetColorText(has.ToString(), has >= need ? "#F2DB96" : "#C9F1A5");
             item.m_txtNeed.text = need.ToString();
             if (_canRenew && has < need) _canRenew = false;
-            item.target.data = materialsArr[index][0];
+            item.target.data = materialsArr[index];
             UI_ListMaterialsItem.ProxyEnd();
         }
         private void OnListRenewMaterialsItem(EventContext context)
         {
-            int itemId = (int)(context.data as GComponent).data;
+            int[] itemData = (int[])(context.data as GComponent).data;
             // GoodsItemTipsController.ShowItemTips(itemId);
-            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { typeof(ClothingView).FullName, this.viewData } });
+            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemData[0], new object[] { typeof(ClothingView).FullName, this.viewData }, itemData[1] });
         }
 
         private async void OnClickBtnRenew()

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

@@ -386,8 +386,8 @@ namespace GFGGame
             UI_MateriasListItem listItem = UI_MateriasListItem.Proxy(context.sender as GObject);
             ItemData itemData = listItem.target.data as ItemData;
             int num = ItemDataManager.GetItemNum(itemData.id);
-            int needCount = (itemData.num - num) > 0 ? itemData.num - num : 1;
-            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemData.id, new object[] { ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { _suitId, _selectedItemId } }, needCount });
+            // int needCount = (itemData.num - num) > 0 ? itemData.num - num : 1;
+            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemData.id, new object[] { ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { _suitId, _selectedItemId } }, itemData.num });
             UI_Component3.ProxyEnd();
             UI_MateriasListItem.ProxyEnd();
         }

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

@@ -132,20 +132,23 @@ namespace GFGGame
             GObject listItem = context.data as GObject;
             string[] infos = listItem.data as string[];
             string functionId = infos[0];
+            object[] temp = viewData as object[];
+            int hasNum = ItemDataManager.GetItemNum(_itemId);
+            int needCount = 0;
             bool isJump = true;
             switch (functionId)
             {
                 case ConstFunctionId.FU_ZHUANG_DIAN:
                     this.Hide();
-                    object[] temp = viewData as object[];
                     int count = temp.Length > 2 ? (int)temp[2] : 0;
+                    needCount = (count - hasNum) > 0 ? count - hasNum : 1;
                     int shopId = int.Parse(infos[1]);
                     if (shopId == ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID)
                     {
                         PromptController.Instance.ShowFloatTextPrompt("活动暂未开启");
                         break;
                     }
-                    isJump = ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { shopId, null, _itemId, count }, _fromeViewDatas, true, true);
+                    isJump = ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { shopId, null, _itemId, needCount }, _fromeViewDatas, true, true);
                     break;
                 case ConstFunctionId.FU_ZHUANG_DECOMPOSE:
                     this.Hide();
@@ -162,6 +165,7 @@ namespace GFGGame
                     isJump = ViewManager.Show<RechargeStoreView>(exchangeValue, _fromeViewDatas);
                     break;
                 case ConstFunctionId.JU_QING_GUAN_QIA:
+                    int needItemCount = temp.Length > 2 ? (int)temp[2] : 0;
                     string value = infos[1];
                     var levelCfgId = int.Parse(value);
                     var levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
@@ -184,7 +188,8 @@ namespace GFGGame
                             _fromeViewDatas = null;
                         }
                         isJump = ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, levelCfg.chapterId, _fromeViewDatas, true);
-                        InstanceZonesController.ShowLevelView(levelCfgId, StudioDataManager.Instance.OnFinishStoryLevel);
+                        InstanceZonesController.ShowLevelView(levelCfgId, StudioDataManager.Instance.OnFinishStoryLevel, _itemId, needItemCount);
+                        break;
                     }
                     else if (levelCfg.type == ConstInstanceZonesType.Studio)
                     {
@@ -228,12 +233,12 @@ namespace GFGGame
 
                         ViewManager.Show(viewName, new object[] { type, 0 }, _fromeViewDatas);
                         StudioDataManager.Instance.VIEW_NAME = viewName;
-                        InstanceZonesController.ShowLevelView(levelCfgId, StudioDataManager.Instance.OnFinishStoryLevel);
+                        InstanceZonesController.ShowLevelView(levelCfgId, StudioDataManager.Instance.OnFinishStoryLevel, _itemId, needItemCount);
                         isJump = true;
                         break;
                     }
-                    isJump = true;
-                    StoryController.ShowLevelView(levelCfgId);
+                    // isJump = true;
+                    // StoryController.ShowLevelView(levelCfgId);
                     // StoryController.ShowLevelView(levelCfgId);
                     break;
                 case ConstFunctionId.FU_ZHUANG_HE_CHENG:

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

@@ -15,7 +15,7 @@ namespace GFGGame
 
         private static OnFinishStoryLevelCall _onFinishStoryLevelCall;
 
-        public static void ShowLevelView(int levelCfgId, OnFinishStoryLevelCall onFinishStoryLevelCall)
+        public static void ShowLevelView(int levelCfgId, OnFinishStoryLevelCall onFinishStoryLevelCall, int needitemId = 0, int needItemCount = 0)
         {
             _onFinishStoryLevelCall = onFinishStoryLevelCall;
             InstanceZonesDataManager.currentLevelCfgId = levelCfgId;
@@ -28,7 +28,7 @@ namespace GFGGame
                     Debug.LogError(string.Format("战斗id：{0}  无配置", levelCfg.fightID));
                     return;
                 }
-                ViewManager.Show(ViewName.STORY_LEVEL_INFO_VIEW, levelCfgId);
+                ViewManager.Show(ViewName.STORY_LEVEL_INFO_VIEW, new object[] { levelCfgId, needitemId, needItemCount });
             }
             else if (!string.IsNullOrEmpty(levelCfg.storyStartID))
             {

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

@@ -14,6 +14,8 @@ namespace GFGGame
         private int _type;
         private int _storyType;
         private int _fightType;
+        private int _needItemId;
+        private int _needItemCount;
 
         private List<List<ItemData>> _totalBonusList;
         private int _index;
@@ -50,7 +52,9 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _fightType = (int)viewData;
+            _fightType = (int)(viewData as object[])[0];
+            _needItemId = (int)(viewData as object[])[1];
+            _needItemCount = (int)(viewData as object[])[2];
             _levelID = InstanceZonesDataManager.currentLevelCfgId;
 
             InstanceZonesDataManager.isQuicklyFighting = true;
@@ -60,6 +64,15 @@ namespace GFGGame
             _storyType = levelCfg.subType;
             _expAdd = fightCfg.exp;
             _power = levelCfg.power;
+            string title = levelCfg.name;
+            switch (levelCfg.type)
+            {
+                case ConstInstanceZonesType.Story:
+                    title = MainStoryDataManager.CurrentChapterOrder + "-" + InstanceZonesDataManager.currentLevelOrder + " " + levelCfg.name;
+                    break;
+            }
+            _ui.m_txtName.text = title;
+            updateNeedItem();
             StartFight();
 
         }
@@ -157,6 +170,7 @@ namespace GFGGame
 
                 _ui.m_btnExit.visible = true;
                 UpdateBtnFightTimes();
+                updateNeedItem();
             }
             _ui.m_list.ScrollToView(_index - 1, true);
 
@@ -193,5 +207,18 @@ namespace GFGGame
                 }
             }
         }
+
+        private void updateNeedItem()
+        {
+            if (_needItemId <= 0 || _needItemCount <= 0)
+            {
+                _ui.m_c1.selectedIndex = 0;
+                return;
+            }
+            _ui.m_c1.selectedIndex = 1;
+            _ui.m_txtItemName.text = string.Format("目标道具：{0}", ItemCfgArray.Instance.GetCfg(_needItemId).name);
+            int hasCount = ItemDataManager.GetItemNum(_needItemId);
+            _ui.m_txtItemNeedNum.text = string.Format("还需：{0}个", Math.Max(0, _needItemCount - hasCount));
+        }
     }
 }

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

@@ -13,6 +13,8 @@ namespace GFGGame
         private UI_StoryLevelInfoUI _ui;
 
         private int _levelID;
+        private int _needItemId;
+        private int _needItemCount;
         private int _type;
         private int _storyType;
         private List<ItemData> _bonusList = new List<ItemData>();
@@ -56,7 +58,9 @@ namespace GFGGame
             base.OnShown();
             ViewManager.SetMaskAlpha(0.8f);
 
-            _levelID = (int)viewData;
+            _levelID = (int)(viewData as object[])[0];
+            _needItemId = (int)(viewData as object[])[1];
+            _needItemCount = (int)(viewData as object[])[2];
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
             _type = levelCfg.type;
             _storyType = levelCfg.subType;
@@ -122,7 +126,7 @@ namespace GFGGame
             InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out int times, out string title);
             if (times > 0)
             {
-                ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, 1, new object[] { typeof(StoryLevelInfoView).FullName, this.viewData });
+                ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, new object[] { 1, _needItemId, _needItemCount }, new object[] { typeof(StoryLevelInfoView).FullName, this.viewData });
                 this.Hide();
             }
             else
@@ -149,7 +153,7 @@ namespace GFGGame
         {
             //只要按钮显示说明一定可以速刷多次
             InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out int times, out string title);
-            ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, times, new object[] { typeof(StoryLevelInfoView).FullName, this.viewData });
+            ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, new object[] { times, _needItemId, _needItemCount }, new object[] { typeof(StoryLevelInfoView).FullName, this.viewData });
             this.Hide();
 
         }