开服活动关卡加成属性弹窗

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

@@ -8,7 +8,6 @@ namespace UI.OpenServerActivity
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GComponent m_valueBar;
         public GButton m_btnBack;
         public GList m_list;
         public GLoader m_iconSuidAdd;
@@ -61,7 +60,6 @@ namespace UI.OpenServerActivity
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_list = (GList)comp.GetChild("list");
             m_iconSuidAdd = (GLoader)comp.GetChild("iconSuidAdd");
@@ -70,7 +68,6 @@ namespace UI.OpenServerActivity
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_valueBar = null;
             m_btnBack = null;
             m_list = null;
             m_iconSuidAdd = null;

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

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_OpenServerSuitAdditionUI
+    {
+        public GComponent target;
+        public GImage m_bg;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
+        public GTextField m_txtMaxCount;
+        public GList m_list;
+        public GTextField m_txtPer;
+        public const string URL = "ui://b8ha2mnsdcmv13";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "OpenServerSuitAdditionUI";
+        private static UI_OpenServerSuitAdditionUI _proxy;
+
+        public static UI_OpenServerSuitAdditionUI Create(GObject gObject = null)
+        {
+            var ui = new UI_OpenServerSuitAdditionUI();
+            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_OpenServerSuitAdditionUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_OpenServerSuitAdditionUI();
+            }
+            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_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
+            m_txtMaxCount = (GTextField)comp.GetChild("txtMaxCount");
+            m_list = (GList)comp.GetChild("list");
+            m_txtPer = (GTextField)comp.GetChild("txtPer");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
+            m_txtMaxCount = null;
+            m_list = null;
+            m_txtPer = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_suitAdditionItem
+    {
+        public GComponent target;
+        public GTextField m_txtName;
+        public GList m_list;
+        public const string URL = "ui://b8ha2mnsdcmv15";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "suitAdditionItem";
+        private static UI_suitAdditionItem _proxy;
+
+        public static UI_suitAdditionItem Create(GObject gObject = null)
+        {
+            var ui = new UI_suitAdditionItem();
+            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_suitAdditionItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_suitAdditionItem();
+            }
+            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_txtName = (GTextField)comp.GetChild("txtName");
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtName = null;
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -84,41 +84,25 @@ namespace GFGGame
 
         private void OnClickIconSuidAdd()
         {
-            ViewManager.GoBackFrom(typeof(OpenServerFightView).FullName);
+            ViewManager.Show<OpenServerSuitAdditionView>(new object[] { ConstLimitTimeActivityType.ActLimitStlyc, _storyLevelCfgs[0].id });
         }
         
         private void RenderListItem(int index, GObject obj)
         {
-            // int _index = _storyLevelCfgs.Count - index - 1;
             UI_OpenSererFightItem item = UI_OpenSererFightItem.Proxy(obj);
-            //item.m_c1.selectedIndex = index % 2 == 0 ? 0 : 1;
             item.m_txtName.text = _storyLevelCfgs[index].name;
-            bool isFight = string.IsNullOrEmpty(_storyLevelCfgs[index].storyStartID);
-            string resBg = isFight ? "cyjd_di_1" : "cyjd_di_2";
-            //item.m_loaBg.url = string.Format("ui://Studio/{0}", resBg);
-
-            if (isFight)
-            {
-                //item.m_loaBg.url = "ui://Studio/cyjd_di_1";
-                item.m_loaIcon.visible = false;
-                item.m_loaItem.visible = true;
-                StoryFightCfg storyFightCfg = StoryFightCfgArray.Instance.GetCfg(_storyLevelCfgs[index].fightID);
-                int itemId = storyFightCfg.bonusBaseArr[0][0];
-                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-                item.m_loaItem.url = ResPathUtil.GetIconPath(itemCfg);
-                if (item.m_loaItem.data == null)
-                {
-                    item.m_loaItem.onClick.Add(OnLoaItemClick);
-                }
-                item.m_loaItem.data = index;
-            }
-            else
+            item.m_loaIcon.visible = false;
+            item.m_loaItem.visible = true;
+            StoryFightCfg storyFightCfg = StoryFightCfgArray.Instance.GetCfg(_storyLevelCfgs[index].fightID);
+            int itemId = storyFightCfg.bonusBaseArr[0][0];
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            item.m_loaItem.url = ResPathUtil.GetIconPath(itemCfg);
+            if (item.m_loaItem.data == null)
             {
-                //item.m_loaBg.url = "ui://Studio/cyjd_di_2";
-                item.m_loaItem.visible = false;
-                item.m_loaIcon.visible = true;
-                item.m_loaIcon.url = string.Format("ui://Studio/{0}", _activityFightCfg.res);
+                item.m_loaItem.onClick.Add(OnLoaItemClick);
             }
+            item.m_loaItem.data = index;
+          
             item.m_grpLock.visible = index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index - 1].id);
 
             if (!item.m_grpLock.visible)

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

@@ -0,0 +1,123 @@
+using UnityEngine;
+using FairyGUI;
+using UI.OpenServerActivity;
+using System.Collections.Generic;
+using UI.CommonGame;
+
+namespace GFGGame
+{
+    public class OpenServerSuitAdditionView : BaseWindow
+    {
+        private UI_OpenServerSuitAdditionUI _ui;
+        private int _activityType;
+        private int _activityId;
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+
+        public override void Dispose()
+        {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_OpenServerSuitAdditionUI.PACKAGE_NAME;
+            _ui = UI_OpenServerSuitAdditionUI.Create();
+            viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+
+            _ui.m_list.itemRenderer = ListItemRenderer;
+            AddEffect();
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _activityType = (int)(this.viewData as object[])[0];
+            int levelID = (int)(this.viewData as object[])[1];
+            _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
+            ActivityFightCfg fightCfg = ActivityFightCfgArray.Instance.GetCfg(activityOpenCfg.params3Arr[0]);
+            _ui.m_list.numItems = fightCfg.activitySuitIdArr.Length;
+
+            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelID);
+            StudioDataManager.Instance.filingChapterId = levelCfg.chapterId;
+            float addition = StudioDataManager.Instance.GetAddition(ConstInstanceZonesType.PureFight);
+            addition = addition / 10000 * 100;
+            _ui.m_txtPer.text = "(" + addition + "%)";
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        private void ListItemRenderer(int index, GObject item)
+        {
+            UI_suitAdditionItem listItem = UI_suitAdditionItem.Proxy(item);
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
+            ActivityFightCfg fightCfg = ActivityFightCfgArray.Instance.GetCfg(activityOpenCfg.params3Arr[0]);
+            int suitId = fightCfg.activitySuitIdArr[index];
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+            listItem.m_txtName.text = suitCfg.name;
+            if (listItem.m_list.data == null)
+            {
+                listItem.m_list.itemRenderer = ListItemRewardRender;
+            }
+            listItem.m_list.data = suitCfg.partsArr;
+            listItem.m_list.numItems = suitCfg.partsArr.Length;
+            listItem.m_list.ResizeToFit();
+            listItem.target.height = listItem.m_list.y + listItem.m_list.height;
+            UI_suitAdditionItem.ProxyEnd();
+        }
+
+        private void ListItemRewardRender(int index, GObject obj)
+        {
+            int itemId = (int)(obj.parent.data as int[])[index];
+            UI_ComItem item = UI_ComItem.Proxy(obj);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            RarityIconController.UpdateRarityIcon(item.m_loaRarity, itemId, false);
+            item.target.data = itemCfg;
+            item.m_QualityType.selectedIndex = itemCfg.rarity - 1;
+            item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            item.m_txtCount.text = "1";
+            UI_ComItem.ProxyEnd();
+        }
+
+        private void AddEffect()
+        {
+            //边框左上角特效
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderLeftTop, "ui_Activity", "Com_window_L_up");
+
+            //边框右下角特效
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderRightDowm, "ui_Activity", "Com_window_R_Down");
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerSuitAdditionView.cs.meta

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