Merge remote-tracking branch 'origin/master' into ios

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

@@ -32,6 +32,7 @@ namespace UI.CommonGame
         public GGroup m_grpGot;
         public GImage m_lock;
         public GImage m_mask;
+        public GTextField m_txtAddition;
         public const string URL = "ui://eg2y0ldpwet2tae";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComItem";
@@ -104,6 +105,7 @@ namespace UI.CommonGame
             m_grpGot = (GGroup)comp.GetChild("grpGot");
             m_lock = (GImage)comp.GetChild("lock");
             m_mask = (GImage)comp.GetChild("mask");
+            m_txtAddition = (GTextField)comp.GetChild("txtAddition");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -132,6 +134,7 @@ namespace UI.CommonGame
             m_grpGot = null;
             m_lock = null;
             m_mask = null;
+            m_txtAddition = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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_OpenServerStoryUI.cs

@@ -10,6 +10,7 @@ namespace UI.OpenServerActivity
         public GLoader m_loaBg;
         public GComponent m_valueBar;
         public GButton m_btnBack;
+        public GList m_list;
         public const string URL = "ui://b8ha2mnspll2g";
         public const string PACKAGE_NAME = "OpenServerActivity";
         public const string RES_NAME = "OpenServerStoryUI";
@@ -60,12 +61,14 @@ namespace UI.OpenServerActivity
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_valueBar = null;
             m_btnBack = null;
+            m_list = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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_StoryItem.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_StoryItem
+    {
+        public GComponent target;
+        public Controller m_storyImageType;
+        public Controller m_posType;
+        public GTextField m_txtTitle;
+        public const string URL = "ui://b8ha2mnsebioi";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "StoryItem";
+        private static UI_StoryItem _proxy;
+
+        public static UI_StoryItem Create(GObject gObject = null)
+        {
+            var ui = new UI_StoryItem();
+            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_StoryItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_StoryItem();
+            }
+            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_storyImageType = comp.GetController("storyImageType");
+            m_posType = comp.GetController("posType");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_storyImageType = null;
+            m_posType = null;
+            m_txtTitle = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 725306f9ee41a3040831feac1ff6bc41
+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/MainStory/StoryLevelInfoView.cs

@@ -93,7 +93,7 @@ namespace GFGGame
                 DressUpFightType dressUpFightType = new DressUpFightType();
                 dressUpFightType.levelID = _levelID;
                 dressUpFightType.teaPartID = 0;
-                ViewManager.Show<DressUpFightView>(dressUpFightType);
+                ViewManager.Show<DressUpFightView>(dressUpFightType,true);
                 this.Hide();
             }
             else

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

@@ -102,8 +102,7 @@ namespace GFGGame
         private void OnClickBtnAnswerTianmen()
         {
             //剧情入口
-            PromptController.Instance.ShowFloatTextPrompt("暂未开启");
-            //ViewManager.Show<OpenServerStoryView>(ConstLimitTimeActivityType.ActLimitStlyc);
+            ViewManager.Show<OpenServerStoryView>(ConstLimitTimeActivityType.ActLimitStlyc);
         }
 
         private void OnClickBtnTenShu()

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/OpenServerStoryView.cs

@@ -9,9 +9,7 @@ namespace GFGGame
     public class OpenServerStoryView : BaseWindow
     {
         private UI_OpenServerStoryUI _ui;
-        private int itemIndex = 0;
-        private List<StoryLevelCfg> _storyLevelCfgs;
-        private ActivityFightCfg _activityFightCfg;
+        private Dictionary<int,List<StoryLevelCfg>> _storyLevelCfgs = new Dictionary<int, List<StoryLevelCfg>>();
         private int _activityId;
         private int _activityType;
         private ActivityOpenCfg _activityCfg;
@@ -41,6 +39,7 @@ namespace GFGGame
             isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_list.itemRenderer = RenderListItem;
         }
 
         protected override void AddEventListener()
@@ -54,11 +53,11 @@ 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("kfhd_sdcy_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_sdcy_gq");
             _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
-            _activityFightCfg = ActivityFightCfgArray.Instance.GetCfg(_activityCfg.params3Arr[0]);
-            _storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_activityFightCfg.type, _activityFightCfg.subType, _activityCfg.params3Arr[0]);
+            _storyLevelCfgs.Clear();
+            _ui.m_list.numItems = _activityCfg.params4Arr.Length;
         }
 
         protected override void OnHide()
@@ -76,5 +75,42 @@ namespace GFGGame
             ViewManager.GoBackFrom(typeof(OpenServerStoryView).FullName);
         }
 
+        private void RenderListItem(int index, GObject obj)
+        {
+            UI_StoryItem item = UI_StoryItem.Proxy(obj);
+
+            var activityStoryCfg = ActivityStoryCfgArray.Instance.GetCfg(_activityCfg.params4Arr[index]);
+
+            item.m_posType.selectedIndex = index % 2;
+
+            if (index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index - 1][0].id))
+                item.m_storyImageType.selectedIndex = 0;
+            else
+                item.m_storyImageType.selectedIndex = index+1;
+
+            var storyLevelCfg = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(activityStoryCfg.type, activityStoryCfg.subType, _activityCfg.params4Arr[index]);
+            _storyLevelCfgs.Add(index, storyLevelCfg);
+
+            if (item.target.data == null)
+                item.target.onClick.Add(OnClickBtnPlay);
+
+            item.target.data = index;
+            UI_StoryItem.ProxyEnd();
+        }
+
+        private void OnClickBtnPlay(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int index = (int)obj.data;
+            StoryLevelCfg storyLevelCfg = _storyLevelCfgs[index][0];
+            if (index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index - 1][0].id))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("Ðèͨ¹ØÇ°Öùؿ¨");
+                return;
+            }
+
+            MainStoryDataManager.currentLevelCfgId = storyLevelCfg.id;
+            InstanceZonesController.ShowLevelView(storyLevelCfg.id, StudioDataManager.Instance.OnFinishStudioStoryLevel);
+        }
     }
 }

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

@@ -0,0 +1,133 @@
+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";
+            float addition = 0;
+            if (ItemDataManager.GetItemNum(itemId) > 0) {
+                addition += itemCfg.addition;
+                addition = addition / 10000 * 100;
+                item.m_txtAddition.text = string.Format("获得加成:{0}%" , addition);
+                item.m_Lock.selectedIndex = 3;
+            }
+            else
+                item.m_Lock.selectedIndex = 2;
+
+            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: 

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeNameView.cs

@@ -102,11 +102,19 @@ namespace GFGGame
             string costName = ItemUtil.GetItemName(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
             int count = GlobalCfgArray.globalCfg.changeNameCostArr[1];
 
-            AlertUI.Show(string.Format("是否花费{0}个{1}改名1次？", count, costName))
-            .SetLeftButton(true).SetRightButton(true, "确定", (object data) =>
+            long haveNum = ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
+            if (haveNum >= count)
             {
-                ChangeName(roleName);
-            });
+                AlertUI.Show(string.Format("是否花费{0}个{1}改名1次？", count, costName))
+                .SetLeftButton(true).SetRightButton(true, "确定", (object data) =>
+                {
+                    ChangeName(roleName);
+                });
+            }
+            else
+            {
+                PromptController.Instance.ShowFloatTextPrompt("改名卡数量不足");
+            }
 
         }