开服活动剧情关卡ui调整界面

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_StoryItem.cs

@@ -9,9 +9,13 @@ namespace UI.OpenServerActivity
         public GComponent target;
         public Controller m_storyImageType;
         public Controller m_posType;
+        public GLoader m_loaItemBg;
+        public UI_item m_rewardItem;
         public GTextField m_txtTitle;
         public GTextField m_txtNumber;
         public GTextField m_txtNotOpenTitle;
+        public GLoader m_loaNeedIcon;
+        public GTextField m_txtNotOpenTitle_2;
         public const string URL = "ui://b8ha2mnsebioi";
         public const string PACKAGE_NAME = "OpenServerActivity";
         public const string RES_NAME = "StoryItem";
@@ -61,17 +65,26 @@ namespace UI.OpenServerActivity
         {
             m_storyImageType = comp.GetController("storyImageType");
             m_posType = comp.GetController("posType");
+            m_loaItemBg = (GLoader)comp.GetChild("loaItemBg");
+            m_rewardItem = (UI_item)UI_item.Create(comp.GetChild("rewardItem"));
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtNumber = (GTextField)comp.GetChild("txtNumber");
             m_txtNotOpenTitle = (GTextField)comp.GetChild("txtNotOpenTitle");
+            m_loaNeedIcon = (GLoader)comp.GetChild("loaNeedIcon");
+            m_txtNotOpenTitle_2 = (GTextField)comp.GetChild("txtNotOpenTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_storyImageType = null;
             m_posType = null;
+            m_loaItemBg = null;
+            m_rewardItem.Dispose();
+            m_rewardItem = null;
             m_txtTitle = null;
             m_txtNumber = null;
             m_txtNotOpenTitle = null;
+            m_loaNeedIcon = null;
+            m_txtNotOpenTitle_2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_item.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_item
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GImage m_imgNum;
+        public GTextField m_txtCount;
+        public const string URL = "ui://b8ha2mnsn58x1j";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "item";
+        private static UI_item _proxy;
+
+        public static UI_item Create(GObject gObject = null)
+        {
+            var ui = new UI_item();
+            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_item Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_item();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_imgNum = (GImage)comp.GetChild("imgNum");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_imgNum = null;
+            m_txtCount = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_item.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -202,7 +202,6 @@ namespace GFGGame
             float imgInitHight = _ui.target.height - 570;//UI界面上小图时的高度
             float imgIniWidth = _cardResInitWidth * imgInitHight / _cardResInitHight;//UI界面上小图时的宽度
             _cardScale = imgIniWidth < _ui.target.width ? _ui.target.width / _cardResInitWidth : imgInitHight / _cardResInitHight;
-
             comCardImgResInitSize = Vector2.zero;
             comCardImgResTargetSize = Vector2.zero;
 

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerFightView.cs

@@ -63,8 +63,9 @@ namespace GFGGame
             _storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_activityFightCfg.type, _activityFightCfg.subType, _activityCfg.params3Arr[0]);
             _ui.m_list.numItems = _storyLevelCfgs.Count;
             UpdateItem();
-
-            _ui.m_txtFreeNum.text = "10/11";
+            RoleLimitData limitData = RoleLimitDataManager.GetLimitData(_activityFightCfg.limit);
+            int time = limitData.TotalPlayMax - limitData.PlayTimes;
+            _ui.m_txtFreeNum.text = time + "/" + limitData.TotalPlayMax;
         }
 
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerStoryView.cs

@@ -53,7 +53,7 @@ namespace GFGGame
             _activityType = (int)this.viewData;
             StudioDataManager.Instance.VIEW_NAME = typeof(OpenServerStoryView).FullName;
             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _activityType;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_sdcy_gq");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("sdcy_jq_bg");
             _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _storyLevelCfgs.Clear();
@@ -79,26 +79,46 @@ namespace GFGGame
         {
             UI_StoryItem item = UI_StoryItem.Proxy(obj);
 
-            var activityStoryCfg = ActivityStoryCfgArray.Instance.GetCfg(_activityCfg.params4Arr[index]);
+            ActivityStoryCfg activityStoryCfg = ActivityStoryCfgArray.Instance.GetCfg(_activityCfg.params4Arr[index]);
             var storyLevelCfg = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(activityStoryCfg.type, activityStoryCfg.subType, _activityCfg.params4Arr[index]);
             _storyLevelCfgs.Add(index, storyLevelCfg);
 
             item.m_posType.selectedIndex = index % 2;
             item.m_txtTitle.text = activityStoryCfg.name;
             item.m_txtNumber.text = "0" + (index + 1);
+            item.m_rewardItem.m_txtCount.text = storyLevelCfg[0].bonusOnceArr[0][1].ToString();
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(storyLevelCfg[0].bonusOnceArr[0][0]);
+            item.m_rewardItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            if (item.m_rewardItem.target.data == null)
+                item.m_rewardItem.target.onClick.Add(OnClickIcon);
+
+            item.m_rewardItem.target.data = itemCfg.id;
 
             if (index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index - 1][0].id))
                 item.m_storyImageType.selectedIndex = 0;
             else
                 item.m_storyImageType.selectedIndex = index+1;
-         
-            if (item.target.data == null)
-                item.target.onClick.Add(OnClickBtnPlay);
 
-            item.target.data = index;
+
+            if (activityStoryCfg.needItemsArr.Length > 0) { 
+                item.m_txtNotOpenTitle.text = string.Format("ÊÕ¼¯{0}/{1}¸ö", ItemDataManager.GetItemNum(activityStoryCfg.needItemsArr[0][0]), activityStoryCfg.needItemsArr[0][1]);
+                ItemCfg itemNeedCfg = ItemCfgArray.Instance.GetCfg(activityStoryCfg.needItemsArr[0][0]);
+                item.m_loaNeedIcon.url = ResPathUtil.GetIconPath(itemNeedCfg);
+            }
+            if (item.m_loaItemBg.data == null)
+                item.m_loaItemBg.onClick.Add(OnClickBtnPlay);
+
+            item.m_loaItemBg.data = index;
             UI_StoryItem.ProxyEnd();
         }
 
+        private void OnClickIcon(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int itemId = (int)obj.data;
+            GoodsItemTipsController.ShowItemTips(itemId);
+        }
+
         private void OnClickBtnPlay(EventContext context)
         {
             GObject obj = context.sender as GObject;