词牌升星ui调整

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComDodgeStar.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Card
+{
+    public partial class UI_ComDodgeStar
+    {
+        public GComponent target;
+        public Controller m_lightType;
+        public const string URL = "ui://7l6lvkaym6batls";
+        public const string PACKAGE_NAME = "Card";
+        public const string RES_NAME = "ComDodgeStar";
+        private static UI_ComDodgeStar _proxy;
+
+        public static UI_ComDodgeStar Create(GObject gObject = null)
+        {
+            var ui = new UI_ComDodgeStar();
+            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_ComDodgeStar Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComDodgeStar();
+            }
+            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_lightType = comp.GetController("lightType");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_lightType = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComDodgeStar.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComFosterBottom.cs

@@ -25,7 +25,6 @@ namespace UI.Card
         public GButton m_btnAll;
         public GButton m_btnClearAll;
         public GButton m_btnUpLv;
-        public GGraph m_holderflower;
         public GComponent m_ComLvConsumeGold;
         public GTextField m_txtCurExp;
         public GTextField m_txtMaxExp;
@@ -35,10 +34,11 @@ namespace UI.Card
         public GComponent m_comStarCousumeGold;
         public GTextField m_txtTips;
         public GList m_listStarConsume;
-        public UI_ComStarItem m_comStarItem0;
-        public UI_ComStarItem m_comStarItem1;
-        public UI_ComStarItem m_comStarItem2;
-        public UI_ComStarItem m_comStarItem3;
+        public UI_ComStarItem m_comStarItem;
+        public UI_ComDodgeStar m_dodgeStar0;
+        public UI_ComDodgeStar m_dodgeStar1;
+        public UI_ComDodgeStar m_dodgeStar2;
+        public UI_ComDodgeStar m_dodgeStar3;
         public GList m_listShowCard;
         public GGroup m_grpStar;
         public GList m_listSkill;
@@ -48,6 +48,8 @@ namespace UI.Card
         public GButton m_btnStar;
         public GButton m_btnSkill;
         public GGroup m_grpTab;
+        public GGraph m_holderflower;
+        public GGraph m_holderTouchFlower;
         public GList m_listProperty;
         public const string URL = "ui://7l6lvkayj4c69d";
         public const string PACKAGE_NAME = "Card";
@@ -114,7 +116,6 @@ namespace UI.Card
             m_btnAll = (GButton)comp.GetChild("btnAll");
             m_btnClearAll = (GButton)comp.GetChild("btnClearAll");
             m_btnUpLv = (GButton)comp.GetChild("btnUpLv");
-            m_holderflower = (GGraph)comp.GetChild("holderflower");
             m_ComLvConsumeGold = (GComponent)comp.GetChild("ComLvConsumeGold");
             m_txtCurExp = (GTextField)comp.GetChild("txtCurExp");
             m_txtMaxExp = (GTextField)comp.GetChild("txtMaxExp");
@@ -124,10 +125,11 @@ namespace UI.Card
             m_comStarCousumeGold = (GComponent)comp.GetChild("comStarCousumeGold");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_listStarConsume = (GList)comp.GetChild("listStarConsume");
-            m_comStarItem0 = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem0"));
-            m_comStarItem1 = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem1"));
-            m_comStarItem2 = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem2"));
-            m_comStarItem3 = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem3"));
+            m_comStarItem = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem"));
+            m_dodgeStar0 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar0"));
+            m_dodgeStar1 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar1"));
+            m_dodgeStar2 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar2"));
+            m_dodgeStar3 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar3"));
             m_listShowCard = (GList)comp.GetChild("listShowCard");
             m_grpStar = (GGroup)comp.GetChild("grpStar");
             m_listSkill = (GList)comp.GetChild("listSkill");
@@ -137,6 +139,8 @@ namespace UI.Card
             m_btnStar = (GButton)comp.GetChild("btnStar");
             m_btnSkill = (GButton)comp.GetChild("btnSkill");
             m_grpTab = (GGroup)comp.GetChild("grpTab");
+            m_holderflower = (GGraph)comp.GetChild("holderflower");
+            m_holderTouchFlower = (GGraph)comp.GetChild("holderTouchFlower");
             m_listProperty = (GList)comp.GetChild("listProperty");
         }
         public void Dispose(bool disposeTarget = false)
@@ -159,7 +163,6 @@ namespace UI.Card
             m_btnAll = null;
             m_btnClearAll = null;
             m_btnUpLv = null;
-            m_holderflower = null;
             m_ComLvConsumeGold = null;
             m_txtCurExp = null;
             m_txtMaxExp = null;
@@ -169,14 +172,16 @@ namespace UI.Card
             m_comStarCousumeGold = null;
             m_txtTips = null;
             m_listStarConsume = null;
-            m_comStarItem0.Dispose();
-            m_comStarItem0 = null;
-            m_comStarItem1.Dispose();
-            m_comStarItem1 = null;
-            m_comStarItem2.Dispose();
-            m_comStarItem2 = null;
-            m_comStarItem3.Dispose();
-            m_comStarItem3 = null;
+            m_comStarItem.Dispose();
+            m_comStarItem = null;
+            m_dodgeStar0.Dispose();
+            m_dodgeStar0 = null;
+            m_dodgeStar1.Dispose();
+            m_dodgeStar1 = null;
+            m_dodgeStar2.Dispose();
+            m_dodgeStar2 = null;
+            m_dodgeStar3.Dispose();
+            m_dodgeStar3 = null;
             m_listShowCard = null;
             m_grpStar = null;
             m_listSkill = null;
@@ -186,6 +191,8 @@ namespace UI.Card
             m_btnStar = null;
             m_btnSkill = null;
             m_grpTab = null;
+            m_holderflower = null;
+            m_holderTouchFlower = null;
             m_listProperty = null;
             if(disposeTarget && target != null)
             {

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

@@ -8,10 +8,11 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public Controller m_QualityType;
-        public Controller m_ViewType;
+        public Controller m_CountType;
         public Controller m_TouchType;
         public Controller m_NewType;
         public Controller m_ShowName;
+        public Controller m_ButtonType;
         public GImage m_imgSelect;
         public GLoader m_loaBg;
         public GLoader m_loaIcon;
@@ -76,10 +77,11 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_QualityType = comp.GetController("QualityType");
-            m_ViewType = comp.GetController("ViewType");
+            m_CountType = comp.GetController("CountType");
             m_TouchType = comp.GetController("TouchType");
             m_NewType = comp.GetController("NewType");
             m_ShowName = comp.GetController("ShowName");
+            m_ButtonType = comp.GetController("ButtonType");
             m_imgSelect = (GImage)comp.GetChild("imgSelect");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
@@ -100,10 +102,11 @@ namespace UI.CommonGame
         public void Dispose(bool disposeTarget = false)
         {
             m_QualityType = null;
-            m_ViewType = null;
+            m_CountType = null;
             m_TouchType = null;
             m_NewType = null;
             m_ShowName = null;
+            m_ButtonType = null;
             m_imgSelect = null;
             m_loaBg = null;
             m_loaIcon = null;

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

@@ -29,6 +29,7 @@ namespace GFGGame
         private EffectUI _effectUI4;
         private EffectUI _effectUI5;
         private EffectUI _effectUI6;
+        private EffectUI _effectUI7;
 
         private GObject _consumeSelectItem;//选中的材料item
         private int _consumeSelectIndex = 0;//0为减，1为加
@@ -523,6 +524,13 @@ namespace GFGGame
 
         private void OnClickBtnUpLv()
         {
+            if (_effectUI7 != null)
+            {
+                EffectUIPool.Recycle(_effectUI7);
+                _effectUI7 = null;
+            }
+            //按钮点击特效
+            _effectUI7 = EffectUIPool.CreateEffectUI(_ui.m_ComFosterBottom.m_holderTouchFlower, "ui_Activity", "SX_DJ");
 
             int itemMoneyId = ItemCfgArray.Instance.GetCfg(upgradeCardItemsArr[0]).cardUpLvGoldsArr[_cardData.itemCfg.rarity - 1][0];
             _comLvConsumeGold = UI_ComCost.Proxy(_comFosterBottom.m_ComLvConsumeGold);
@@ -619,20 +627,39 @@ namespace GFGGame
                 ET.Log.Error("词牌：" + _cardData.id + "   无" + _cardData.star + "星升星配置");
                 return;
             }
-            int index = 1;
-            for (int i = 0; i < 4; i++)
+
+            int wordRow = 4;  //字行数
+            int wordNumber = 5;//字每行个数
+
+            int starLevelDodge =  _cardData.star / wordNumber;
+            int starLevel =  _cardData.star / wordNumber;
+            if (starLevel >= wordRow) 
+                starLevel = wordRow - 1;
+
+            int index = starLevel * wordNumber;
+            for (int i = 0; i < wordRow; i++)
             {
-                UI_ComStarItem comStarItem = UI_ComStarItem.Proxy(_comFosterBottom.target.GetChild("comStarItem" + i));
-                string starDesc = "";
-                for (int j = 0; j < _cardData.itemCfg.starDescArr[i].Length; j++)
-                {
-                    char str = _cardData.itemCfg.starDescArr[i][j];
-                    starDesc += index <= _cardData.star ? StringUtil.GetColorText(str.ToString(), "#D07D40") : StringUtil.GetColorText(str.ToString(), "#716660");
-                    index++;
+                UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(_comFosterBottom.target.GetChild("dodgeStar" + i));
+                dodgeStar.m_lightType.selectedIndex = (starLevelDodge > i)  ? 1 : 0;
+                UI_ComDodgeStar.ProxyEnd();
+
+                if (i == starLevel) { 
+                    UI_ComStarItem comStarItem = UI_ComStarItem.Proxy(_comFosterBottom.target.GetChild("comStarItem"));
+                    string starDesc = "";
+                    for (int j = 0; j < _cardData.itemCfg.starDescArr[i].Length; j++)
+                    {
+                        index++;
+                        string str = _cardData.itemCfg.starDescArr[i][j].ToString();
+                        if (j < _cardData.itemCfg.starDescArr[i].Length - 1)
+                            str += " /";
+
+                        starDesc += index <= _cardData.star ? StringUtil.GetColorText(str, "#E5892F") : StringUtil.GetColorText(str, "#C8B693");
+                    }
+                    comStarItem.m_txtContent.text = starDesc;
+                    UI_ComStarItem.ProxyEnd();
                 }
-                comStarItem.m_txtContent.text = starDesc;
-                UI_ComStarItem.ProxyEnd();
             }
+
             if (CardDataManager.isFullStar(_cardData.id, _cardData.star, false))
             {
                 _comFosterBottom.m_ctrlFullStar.selectedIndex = 1;
@@ -656,25 +683,23 @@ namespace GFGGame
                 _comFosterBottom.m_comStarCousumeGold.visible = _cardData.lv >= cardStarCfg.needLv;
                 _comFosterBottom.m_btnUpStar.grayed = int.Parse(_comFosterBottom.m_btnUpStar.data.ToString()) == 0 ? true : false;
                 // _comFosterBottom.m_btnUpStar.GetChild("ani").asMovieClip.visible = false;// !_comFosterBottom.m_btnUpStar.grayed;
-
             }
         }
 
-
         private void RenderListStarConsumeItem(int index, GObject obj)
         {
-
-            UI_ComStarConsume listItem = UI_ComStarConsume.Proxy(obj);
+            UI_ComItem listItem = UI_ComItem.Proxy(obj);
             CardStarCfg cardStarCfg = listItem.target.parent.data as CardStarCfg;
 
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cardStarCfg.materiarsArr[index][0]);
-            listItem.m_loaItem.url = ResPathUtil.GetIconPath(itemCfg);
-
+            listItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            listItem.m_CountType.selectedIndex = 1;
+            listItem.m_ButtonType.selectedIndex = 0;
+            listItem.m_QualityType.selectedIndex = itemCfg.rarity - 1;
             int needCount = cardStarCfg.materiarsArr[index][1];
             long hasCount = ItemDataManager.GetItemNum(cardStarCfg.materiarsArr[index][0]);
-            listItem.m_txtNeedCount.text = needCount.ToString();// StringUtil.GetColorText(needCount.ToString(), hasCount < needCount ? "#D27869" : "#FDF3D7"); ;
-            listItem.m_txtHasCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#716660"); //;  hasCount.ToString();
-            listItem.m_btnPlus.visible = false;
+            listItem.m_txtDecomCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#FFFFFF");// StringUtil.GetColorText(needCount.ToString(), hasCount < needCount ? "#D27869" : "#FDF3D7"); ;
+            listItem.m_txtDecomHasCount.text = "/" + needCount.ToString();   //;  hasCount.ToString();     
             if (listItem.target.data == null)
             {
                 listItem.target.onClick.Add(() => OnClickBtnPlusStarConsum(index));
@@ -687,7 +712,7 @@ namespace GFGGame
             if (hasCount < needCount)
             {
                 //材料不足显示加号
-                listItem.m_btnPlus.visible = true;
+                listItem.m_ButtonType.selectedIndex = 2;
             }
         }
 
@@ -725,8 +750,16 @@ namespace GFGGame
             object[] sourceDatas = new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } };
             GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);
         }
+
         private void OnClickBtnUpStar()
         {
+            if (_effectUI7 != null)
+            {
+                EffectUIPool.Recycle(_effectUI7);
+                _effectUI7 = null;
+            }
+            //按钮点击特效
+            _effectUI7 = EffectUIPool.CreateEffectUI(_ui.m_ComFosterBottom.m_holderTouchFlower, "ui_Activity", "SX_DJ");
 
             CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
 
@@ -960,7 +993,9 @@ namespace GFGGame
             _effectUI5 = null;
             EffectUIPool.Recycle(_effectUI6);
             _effectUI6 = null;
-            
+            EffectUIPool.Recycle(_effectUI7);
+            _effectUI7 = null;
+
             Timers.inst.Remove(CheckGuide);
             Timers.inst.Remove(OnTimedEvent);
             UI_ComCostCurrency.ProxyEnd();

GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -127,7 +127,8 @@ namespace GFGGame
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_clothingDatas[index]);
             RarityIconController.UpdateRarityIcon(item.m_loaRarity, itemCfg.id, false);
             string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
-            item.m_ViewType.selectedIndex = 1;
+            item.m_CountType.selectedIndex = 1;
+            item.m_ButtonType.selectedIndex = 1;
             item.m_ShowName.selectedIndex = 1;
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg.res, ext);
             item.m_txtName.text = itemCfg.name;