Merge remote-tracking branch 'remotes/origin/master' into xiaojie

# Conflicts:
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3!a.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes

GameClient/Assets/BuildSetting.asset

@@ -22,9 +22,16 @@ MonoBehaviour:
   - Assets/ResIn/Dll
   dirTypeList:
   - texture_dressup_es_
+  - texture_dressup_zr_
+  - texture_dressup_xz_
   - texture_dressup_js_
-  - texture_dressup_ss_
   - texture_dressup_ts_
-  - texture_dressup_xz_
-  - texture_dressup_zr_
+  - texture_dressup_ss_
   - prefab_
+  - txt_
+  - material_effect_
+  - texture_icon_
+  - fight_
+  - texture_fieldguide_icon_
+  - font_
+  - model_

GameClient/Assets/BuildSetting.asset.meta

@@ -2,7 +2,7 @@ fileFormatVersion: 2
 guid: fc6938ed19702ef4ea62d58dc96bd923
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 11400000
+  mainObjectFileID: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

GameClient/Assets/BuildSetting1.asset

@@ -1,35 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e5e55fcd4ab13e0499f04a829427db8b, type: 3}
-  m_Name: BuildSetting1
-  m_EditorClassIdentifier: 
-  dirBundleList:
-  - Assets/Res/Animation/Card
-  - Assets/Res/Animation/DressUp
-  - Assets/Res/Effect/DressUp
-  - Assets/Res/Effect/DressUpAni
-  - Assets/Res/Effect/UI
-  - Assets/ResIn/UI
-  - Assets/ResIn/Dll
-  dirTypeList:
-  - texture_dressup_es_
-  - texture_dressup_zr_
-  - texture_dressup_xz_
-  - texture_dressup_js_
-  - texture_dressup_ts_
-  - texture_dressup_ss_
-  - prefab_
-  - txt_
-  - material_effect_
-  - texture_icon_
-  - fight_
-  - texture_fieldguide_icon_

GameClient/Assets/BuildSetting1.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3d6745b5d6c6c494db20611090156808
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -263,7 +263,7 @@ namespace GFGEditor
             }
             foreach (string dir in sourceDirs)
             {
-                files = FileUtil.CopyFilesTo(dir, targetDir, saveName, new string[] { ".png", ".jpg", ".mp3", ".meta", ".mat", ".shader", ".tga", ".FBX", ".max" }, ragule);
+                files = FileUtil.CopyFilesTo(dir, targetDir, saveName, new string[] { ".png", ".jpg", ".mp3", ".meta", ".mat", ".shader", ".tga", ".FBX"}, ragule);
                 foreach (var file in files)
                 {
                     Debug.LogFormat("更新{0}", file);

GameClient/Assets/Editor/ToolsMenu.cs

@@ -314,7 +314,7 @@ namespace GFGEditor
         [MenuItem("Tools/Build/Build Bundles Res Init")]
         public static void BuildBundlesResIn()
         {
-            BuildScript.BuildCustomBundles(new string[] { "ResIn/Txt" }, "BuildSetting");
+            BuildScript.BuildCustomBundles(new string[] { "ResIn/Font" }, "BuildSetting");
         }
 
         [MenuItem("Tools/Build/Build Bundles All")]

GameClient/Assets/Game/HotUpdate/Data/CardDataManager.cs

@@ -84,12 +84,12 @@ namespace GFGGame
             return resources;
         }
 
+        //默认词牌排序规则 ：稀有度>星级>等级>种类（风>花>雪>月）
         public static List<CardData> SortItemList(List<CardData> arrayList)
         {
 
             arrayList.Sort((CardData a, CardData b) =>
             {
-
                 int rarityA = a.itemCfg.rarity;
                 int rarityB = b.itemCfg.rarity;
                 if (rarityA < rarityB)
@@ -100,6 +100,28 @@ namespace GFGGame
                 {
                     return -1;
                 }
+                else {
+                    if (a.star < b.star)
+                    {
+                        return 1;
+                    }
+                    else if (a.star > b.star) { 
+                        return -1;
+                    }
+                    else {
+                        if (a.lv < b.lv)
+                            return 1;
+                        else if (a.lv > b.lv)
+                            return -1;
+                        else
+                        {
+                            if (a.mainScore> b.mainScore)
+                                return 1;
+                            else if (a.mainScore < b.mainScore)
+                                return -1;
+                        }
+                    }
+                }
 
                 return string.Compare(a.itemCfg.res, b.itemCfg.res);
             });

GameClient/Assets/Game/HotUpdate/Data/TaskDataManager.cs

@@ -169,8 +169,9 @@ namespace GFGGame
                     var suitCfg = SuitCfgArray.Instance.GetCfg(taskCfg.paramsArr[0]);
                     return string.Format(activeRewardCfg.desc, suitCfg.name);
                 case ConstTaskType.UpgradeCardLvl:
-                case ConstTaskType.UpgradeCardStar:
                     return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount(), taskCfg.paramsArr[0]);
+                case ConstTaskType.UpgradeCardStar:
+                    return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount(), taskCfg.paramsArr[0]/5);
                 case ConstTaskType.FinishStory:
                 case ConstTaskType.FinishInstanceZones:
                     {

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

@@ -16,6 +16,8 @@ namespace UI.Card
         public UI_ComFosterTop m_ComFosterTop;
         public UI_ComFosterBottom m_ComFosterBottom;
         public GLoader m_loaGuide;
+        public GButton m_btnLeft;
+        public GButton m_btnRight;
         public Transition m_t0;
         public Transition m_t1;
         public Transition m_open;
@@ -75,6 +77,8 @@ namespace UI.Card
             m_ComFosterTop = (UI_ComFosterTop)UI_ComFosterTop.Create(comp.GetChild("ComFosterTop"));
             m_ComFosterBottom = (UI_ComFosterBottom)UI_ComFosterBottom.Create(comp.GetChild("ComFosterBottom"));
             m_loaGuide = (GLoader)comp.GetChild("loaGuide");
+            m_btnLeft = (GButton)comp.GetChild("btnLeft");
+            m_btnRight = (GButton)comp.GetChild("btnRight");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
             m_open = comp.GetTransition("open");
@@ -94,6 +98,8 @@ namespace UI.Card
             m_ComFosterBottom.Dispose();
             m_ComFosterBottom = null;
             m_loaGuide = null;
+            m_btnLeft = null;
+            m_btnRight = null;
             m_t0 = null;
             m_t1 = null;
             m_open = null;

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

@@ -12,6 +12,7 @@ namespace UI.Card
         public GTextField m_txtLast;
         public GTextField m_txtNow;
         public GList m_listProperty;
+        public GList m_listLastProperty;
         public const string URL = "ui://7l6lvkayjzrr8p";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "CardUpUI";
@@ -64,6 +65,7 @@ namespace UI.Card
             m_txtLast = (GTextField)comp.GetChild("txtLast");
             m_txtNow = (GTextField)comp.GetChild("txtNow");
             m_listProperty = (GList)comp.GetChild("listProperty");
+            m_listLastProperty = (GList)comp.GetChild("listLastProperty");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -72,6 +74,7 @@ namespace UI.Card
             m_txtLast = null;
             m_txtNow = null;
             m_listProperty = null;
+            m_listLastProperty = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,6 +8,8 @@ namespace UI.Card
     {
         public GComponent target;
         public Controller m_lightType;
+        public GGraph m_holderStarLight;
+        public GGraph m_holderUpStarMove;
         public const string URL = "ui://7l6lvkaym6batls";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "ComDodgeStar";
@@ -56,10 +58,14 @@ namespace UI.Card
         private void Init(GComponent comp)
         {
             m_lightType = comp.GetController("lightType");
+            m_holderStarLight = (GGraph)comp.GetChild("holderStarLight");
+            m_holderUpStarMove = (GGraph)comp.GetChild("holderUpStarMove");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_lightType = null;
+            m_holderStarLight = null;
+            m_holderUpStarMove = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -35,6 +35,7 @@ namespace UI.Card
         public GTextField m_txtTips;
         public GList m_listStarConsume;
         public UI_ComStarItem m_comStarItem;
+        public GGraph m_holderUpStar;
         public UI_ComDodgeStar m_dodgeStar0;
         public UI_ComDodgeStar m_dodgeStar1;
         public UI_ComDodgeStar m_dodgeStar2;
@@ -51,6 +52,7 @@ namespace UI.Card
         public GGraph m_holderflower;
         public GGraph m_holderTouchFlower;
         public GList m_listProperty;
+        public Transition m_starItemAlpha;
         public const string URL = "ui://7l6lvkayj4c69d";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "ComFosterBottom";
@@ -126,6 +128,7 @@ namespace UI.Card
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_listStarConsume = (GList)comp.GetChild("listStarConsume");
             m_comStarItem = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem"));
+            m_holderUpStar = (GGraph)comp.GetChild("holderUpStar");
             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"));
@@ -142,6 +145,7 @@ namespace UI.Card
             m_holderflower = (GGraph)comp.GetChild("holderflower");
             m_holderTouchFlower = (GGraph)comp.GetChild("holderTouchFlower");
             m_listProperty = (GList)comp.GetChild("listProperty");
+            m_starItemAlpha = comp.GetTransition("starItemAlpha");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -174,6 +178,7 @@ namespace UI.Card
             m_listStarConsume = null;
             m_comStarItem.Dispose();
             m_comStarItem = null;
+            m_holderUpStar = null;
             m_dodgeStar0.Dispose();
             m_dodgeStar0 = null;
             m_dodgeStar1.Dispose();
@@ -194,6 +199,7 @@ namespace UI.Card
             m_holderflower = null;
             m_holderTouchFlower = null;
             m_listProperty = null;
+            m_starItemAlpha = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -13,7 +13,10 @@ namespace UI.Card
         public GTextField m_txtLv;
         public GTextField m_txtName;
         public GLoader m_loaMainScore;
-        public GTextField m_txtStarLv;
+        public UI_ComDodgeStar m_dodgeStar0;
+        public UI_ComDodgeStar m_dodgeStar1;
+        public UI_ComDodgeStar m_dodgeStar2;
+        public UI_ComDodgeStar m_dodgeStar3;
         public const string URL = "ui://7l6lvkayojlzi";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "ListCardItem";
@@ -67,7 +70,10 @@ namespace UI.Card
             m_txtLv = (GTextField)comp.GetChild("txtLv");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
-            m_txtStarLv = (GTextField)comp.GetChild("txtStarLv");
+            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"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,7 +84,14 @@ namespace UI.Card
             m_txtLv = null;
             m_txtName = null;
             m_loaMainScore = null;
-            m_txtStarLv = 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;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComDodgeStar
+    {
+        public GComponent target;
+        public Controller m_lightType;
+        public const string URL = "ui://mfvz4q8ks5lgfsv";
+        public const string PACKAGE_NAME = "Main";
+        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/Main/UI_ComDodgeStar.cs.meta

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

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

@@ -8,12 +8,15 @@ namespace UI.Main
     {
         public GButton target;
         public UI_ComCardMask m_comCardMask;
+        public GLoader m_loaBorder;
+        public GLoader m_loaMainScore;
+        public GLoader m_loaRarity;
         public GTextField m_txtName;
-        public GTextField m_txtStarLv;
         public GTextField m_txtLv;
-        public GLoader m_loaRarity;
-        public GLoader m_loaMainScore;
-        public GLoader m_loaBorder;
+        public UI_ComDodgeStar m_dodgeStar0;
+        public UI_ComDodgeStar m_dodgeStar1;
+        public UI_ComDodgeStar m_dodgeStar2;
+        public UI_ComDodgeStar m_dodgeStar3;
         public const string URL = "ui://mfvz4q8kr1a99f";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ListCardItem";
@@ -62,23 +65,33 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_comCardMask = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("comCardMask"));
+            m_loaBorder = (GLoader)comp.GetChild("loaBorder");
+            m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
+            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_txtStarLv = (GTextField)comp.GetChild("txtStarLv");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
-            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
-            m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
-            m_loaBorder = (GLoader)comp.GetChild("loaBorder");
+            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"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comCardMask.Dispose();
             m_comCardMask = null;
+            m_loaBorder = null;
+            m_loaMainScore = null;
+            m_loaRarity = null;
             m_txtName = null;
-            m_txtStarLv = null;
             m_txtLv = null;
-            m_loaRarity = null;
-            m_loaMainScore = null;
-            m_loaBorder = 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;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,15 +7,18 @@ namespace UI.Main
     public partial class UI_StoryCardChooseUI
     {
         public GComponent target;
-        public GLoader m_loaScore;
+        public GImage m_bg;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
         public GTextField m_txtName;
+        public GButton m_btnCancel;
+        public GButton m_btnConfirm;
+        public GLoader m_loaScore;
         public GButton m_btnUpCard;
         public GTextField m_txtTips;
         public GList m_listSkill;
         public GList m_listCard;
         public UI_ComArenaSkillTips m_comSkillTips;
-        public GButton m_btnCancel;
-        public GButton m_btnConfirm;
         public const string URL = "ui://mfvz4q8kr1a99d";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryCardChooseUI";
@@ -63,28 +66,34 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_loaScore = (GLoader)comp.GetChild("loaScore");
+            m_bg = (GImage)comp.GetChild("bg");
+            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
             m_txtName = (GTextField)comp.GetChild("txtName");
+            m_btnCancel = (GButton)comp.GetChild("btnCancel");
+            m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
+            m_loaScore = (GLoader)comp.GetChild("loaScore");
             m_btnUpCard = (GButton)comp.GetChild("btnUpCard");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_listSkill = (GList)comp.GetChild("listSkill");
             m_listCard = (GList)comp.GetChild("listCard");
             m_comSkillTips = (UI_ComArenaSkillTips)UI_ComArenaSkillTips.Create(comp.GetChild("comSkillTips"));
-            m_btnCancel = (GButton)comp.GetChild("btnCancel");
-            m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaScore = null;
+            m_bg = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
             m_txtName = null;
+            m_btnCancel = null;
+            m_btnConfirm = null;
+            m_loaScore = null;
             m_btnUpCard = null;
             m_txtTips = null;
             m_listSkill = null;
             m_listCard = null;
             m_comSkillTips.Dispose();
             m_comSkillTips = null;
-            m_btnCancel = null;
-            m_btnConfirm = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -39,7 +39,6 @@ namespace GFGGame
 
             _ui.m_listRole.itemRenderer = RenderListRoleItem;
             _ui.m_listRole.onClickItem.Add(OnClickListRoleItem);
-            _ui.m_listRole.selectedIndex = 0;
 
             // EventAgent.AddEventListener(ConstMessage.CARD_REFRESH, () =>
             // {
@@ -81,7 +80,6 @@ namespace GFGGame
         }
         private void UpdateCardList()
         {
-
             List<CardData> cardList = CardDataManager.GetCardListByRarity(_ui.m_listRole.selectedIndex);
             if (CardDataManager.isFilter == true)
             {
@@ -108,10 +106,14 @@ namespace GFGGame
             listItem.m_txtName.text = data.itemCfg.name;
             RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetCardRed(data.id), "", 10, -4);
 
-            listItem.m_txtStarLv.text = data.star.ToString();
-            //           UI_ComStar comStar = UI_ComStar.Proxy(listItem.m_comStar);
-            // comStar.m_c1.selectedIndex = data.star;
-            // UI_ComStar.ProxyEnd();
+            int starLevelDodge = data.star / 5;
+            for (int i = 0; i < 4; i++)
+            {
+                UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(listItem.target.GetChild("dodgeStar" + i));
+                dodgeStar.m_lightType.selectedIndex = (starLevelDodge > i) ? 1 : 0;
+                UI_ComDodgeStar.ProxyEnd();
+            }
+
             UI_ListCardItem.ProxyEnd();
         }
         private void OnClickListCardItem(EventContext context)
@@ -124,15 +126,15 @@ namespace GFGGame
         {
             obj.data = index == 0 ? 0 : index;
         }
+
         private void OnClickListRoleItem(EventContext context)
         {
             int index = (int)(context.data as GObject).data;
-            this.UpdateCardList();
+            _ui.m_listRole.selectedIndex = index;
 
+            this.UpdateCardList();
         }
 
-
-
         /*******************************************************监听函数**************************************************/
         private void OnclickBtnFilter()
         {
@@ -153,10 +155,8 @@ namespace GFGGame
             CardDataManager._selectList.Clear();
             _ui.m_listRole.selectedIndex = 0;
             _ui.m_listCard.selectedIndex = 0;
-
         }
 
-
         private void CheckGuide(object param)
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
@@ -180,7 +180,6 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.UP_CARD_STAR, 8, "");
             GuideController.TryCompleteGuide(ConstGuideId.UP_CARD_STAR, 8);
-
         }
         protected override void TryCompleteGuide()
         {

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

@@ -24,12 +24,18 @@ namespace GFGGame
         private int _selectTab = 0;
         private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
         private List<GGraph> _listEffectHolder = new List<GGraph>();
+        private int wordRow = 4;  //字行数
+        private int wordNumber = 5;//字每行个数
+        private bool refDodgeStar = true;
         private EffectUI _effectUI1;
         private EffectUI _effectUI3;
         private EffectUI _effectUI4;
         private EffectUI _effectUI5;
         private EffectUI _effectUI6;
         private EffectUI _effectUI7;
+        private EffectUI _effectUI8;
+        private EffectUI _effectUI9;
+        private EffectUI _effectUI10;
 
         private GObject _consumeSelectItem;//选中的材料item
         private int _consumeSelectIndex = 0;//0为减，1为加
@@ -112,6 +118,9 @@ namespace GFGGame
             _ui.m_ComFosterBottom.m_listShowCard.itemRenderer = RenderListShowCardItem;
             _ui.m_ComFosterBottom.m_listShowCard.onClickItem.Add(OnClickShowCardListItem);
 
+            _ui.m_btnLeft.onClick.Add(OnClickBtnLeft);
+            _ui.m_btnRight.onClick.Add(OnClickBtnRight);
+
             // _ui.m_loaCard.onClick.Add(OnClickLoaCard);
             //_ui.m_loaListener1.onClick.Add(OnClickLoaCard);
             //_ui.m_comImgCard.target.onClick.Add(OnClickLoaCard);
@@ -123,6 +132,26 @@ namespace GFGGame
             _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_ComFosterBottom.m_holderfBgEff, "ui_Activity", "SX_Down_TX");
         }
 
+
+
+        private void OnClickBtnLeft()
+        {
+            _cardData = CardDataManager.GetCardDataById((this.viewData as CardData).id);
+
+            UpdateCardRes();
+
+
+
+        }
+
+        private void OnClickBtnRight()
+        {
+
+
+
+
+        }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -164,6 +193,16 @@ namespace GFGGame
             }
             _ui.m_ComFosterTop.m_btnStarReward.visible = _cardStarRewards.Count > 0;
             Timers.inst.AddUpdate(CheckGuide);
+
+
+
+            List<CardData> cardList = CardDataManager.GetCardListByRarity(0);
+            if (CardDataManager.isFilter == true)
+            {
+                //筛选
+                cardList = CardDataManager.FilterCardList(cardList);
+            }
+            cardList = CardDataManager.SortItemList(cardList);
         }
         protected override void AddEventListener()
         {
@@ -457,7 +496,6 @@ namespace GFGGame
             return true;
         }
 
-
         private void OnClickBtnMinus(GObject obj)
         {
             UI_ComConsume listItem = UI_ComConsume.Proxy(obj);
@@ -573,7 +611,7 @@ namespace GFGGame
                     if (_showLv - lv >= 1)
                     {
                         // this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
-                        ViewManager.Show<CardUpView>(new object[] { _cardData.scores, "lv", lv, _showLv }, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData });
+                        ViewManager.Show<CardUpView>(new object[] { _cardData.scores, "lv", lv, _showLv , _cardData.id }, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData });
                     }
                     this.UpdateCommon();
                     this.UpdateUpLvView();
@@ -616,9 +654,6 @@ namespace GFGGame
             return false;
         }
         /***********************************************************升星***************************************************/
-
-
-
         private void UpdateUpStarView()
         {
             CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
@@ -628,37 +663,11 @@ namespace GFGGame
                 return;
             }
 
-            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_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();
-                }
+            //升星后星数正5才不进入
+            if (refDodgeStar || _cardData.star % 5 != 0) { 
+                UpdateUpStarOfStarAndText();
             }
+            refDodgeStar = true;
 
             if (CardDataManager.isFullStar(_cardData.id, _cardData.star, false))
             {
@@ -686,6 +695,44 @@ namespace GFGGame
             }
         }
 
+        private void UpdateUpStarOfStarAndText()
+        {
+            UpdateUpStarOfStar();
+            UpdateUpStarOfText();
+        }
+
+        private void UpdateUpStarOfStar()
+        {
+            int starLevelDodge = _cardData.star / wordNumber;
+            for (int i = 0; i < wordRow; i++)
+            {
+                UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(_comFosterBottom.target.GetChild("dodgeStar" + i));
+                dodgeStar.m_lightType.selectedIndex = (starLevelDodge > i) ? 1 : 0;
+                UI_ComDodgeStar.ProxyEnd();
+            }
+        }
+
+        private void UpdateUpStarOfText()
+        {
+            int starLevel = _cardData.star / wordNumber;
+            if (starLevel >= wordRow)
+                starLevel = wordRow - 1;
+            int index = starLevel * wordNumber;
+            UI_ComStarItem comStarItem = UI_ComStarItem.Proxy(_comFosterBottom.target.GetChild("comStarItem"));
+            string starDesc = "";
+            for (int j = 0; j < _cardData.itemCfg.starDescArr[starLevel].Length; j++)
+            {
+                index++;
+                string str = _cardData.itemCfg.starDescArr[starLevel][j].ToString();
+                if (j < _cardData.itemCfg.starDescArr[starLevel].Length - 1)
+                    str += " /";
+
+                starDesc += index <= _cardData.star ? StringUtil.GetColorText(str, "#E5892F") : StringUtil.GetColorText(str, "#C8B693");
+            }
+            comStarItem.m_txtContent.text = starDesc;
+            UI_ComStarItem.ProxyEnd();
+        }
+
         private void RenderListStarConsumeItem(int index, GObject obj)
         {
             UI_ComItem listItem = UI_ComItem.Proxy(obj);
@@ -695,7 +742,7 @@ namespace GFGGame
             listItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             listItem.m_CountType.selectedIndex = 1;
             listItem.m_ButtonType.selectedIndex = 0;
-            listItem.m_QualityType.selectedIndex = itemCfg.rarity - 1;
+            listItem.m_QualityType.selectedIndex = 4;
             int needCount = cardStarCfg.materiarsArr[index][1];
             long hasCount = ItemDataManager.GetItemNum(cardStarCfg.materiarsArr[index][0]);
             listItem.m_txtDecomCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#FFFFFF");// StringUtil.GetColorText(needCount.ToString(), hasCount < needCount ? "#D27869" : "#FDF3D7"); ;
@@ -760,7 +807,7 @@ namespace GFGGame
             }
             //按钮点击特效
             _effectUI7 = EffectUIPool.CreateEffectUI(_ui.m_ComFosterBottom.m_holderTouchFlower, "ui_Activity", "SX_DJ");
-
+            
             CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
 
             if (_cardData.lv < cardStarCfg.needLv)
@@ -789,21 +836,101 @@ namespace GFGGame
         }
         private async void UpStar()
         {
-            CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
-
             bool result = await CardSProxy.UpgradeCardStar(_cardData.id);
             if (result)
             {
-
                 UpdateCommon();
+                refDodgeStar = false;
                 UpdateUpStarView();
                 UpdateCardRes();
                 // this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
-                ViewManager.Show<CardUpView>(new object[] { _cardData.scores, "star", _cardData.star - 1, _cardData.star }, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData });
+
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2);
                 UpdateRedDot();
+
+                if (_cardData.star % 5 == 0) {
+                    int starLevelDodge = _cardData.star / wordNumber;
+                    int starLevel = _cardData.star / wordNumber - 1;
+                    UI_ComStarItem comStarItem = UI_ComStarItem.Proxy(_comFosterBottom.target.GetChild("comStarItem"));
+                    string starDesc = "";
+                    for (int j = 0; j < _cardData.itemCfg.starDescArr[starLevel].Length; j++)
+                    {
+                        string str = _cardData.itemCfg.starDescArr[starLevel][j].ToString();
+                        if (j < _cardData.itemCfg.starDescArr[starLevel].Length - 1)
+                            str += " /";
+
+                        starDesc += str;
+                    }
+                    comStarItem.m_txtContent.text = StringUtil.GetColorText(starDesc, "#E5892F");
+                    UI_ComStarItem.ProxyEnd();
+
+                    Timers.inst.Add(0.1f, 1, EffectTxetDisappear);
+                }
+                else
+                    OpenCardUp("starNormal");
             }
         }
+        private void EffectTxetDisappear(object param)
+        {
+            if (_effectUI8 != null)
+            {
+                EffectUIPool.Recycle(_effectUI8);
+                _effectUI8 = null;
+            }
+            //升星字体特效
+            _effectUI8 = EffectUIPool.CreateEffectUI(_ui.m_ComFosterBottom.m_holderUpStar, "ui_Activity", "SX_Text_01");
+            _ui.m_ComFosterBottom.m_starItemAlpha.Play();
+            Timers.inst.Add(0.3f, 1, EffectTaril);
+        }
+        private void EffectTaril(object param)
+        {
+            if (_effectUI9 != null)
+            {
+                EffectUIPool.Recycle(_effectUI9);
+                _effectUI9 = null;
+            }
+            int starLevelDodge = _cardData.star / wordNumber;
+            UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(_comFosterBottom.target.GetChild("dodgeStar" + (starLevelDodge - 1)));
+            //升星字体拖尾特效
+            _effectUI9 = EffectUIPool.CreateEffectUI(dodgeStar.m_holderUpStarMove, "ui_Activity", "SX_Text_Taril_02");
+            UI_ComDodgeStar.ProxyEnd();
+            UpdateUpStarOfText();
+            Timers.inst.Add(1.4f, 1, EffectStar);
+        }
+        private void EffectStar(object param)
+        {
+            if (_effectUI9 != null)
+            {
+                EffectUIPool.Recycle(_effectUI9);
+                _effectUI9 = null;
+            }
+            if (_effectUI10 != null)
+            {
+                EffectUIPool.Recycle(_effectUI10);
+                _effectUI10 = null;
+            }
+            int starLevelDodge = _cardData.star / wordNumber;
+            UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(_comFosterBottom.target.GetChild("dodgeStar" + (starLevelDodge - 1)));
+            //星星特效
+            _effectUI10 = EffectUIPool.CreateEffectUI(dodgeStar.m_holderStarLight, "ui_Activity", "SX_Text_STAR_03");
+            UI_ComDodgeStar.ProxyEnd();
+
+            Timers.inst.Add(0.7f, 1, (obj) =>
+            {
+                if (_effectUI10 != null)
+                {
+                    EffectUIPool.Recycle(_effectUI10);
+                    _effectUI10 = null;
+                }
+                UpdateUpStarOfStar();
+                OpenCardUp("star");
+            });
+        }
+
+        private void OpenCardUp(string strType)
+        {
+            ViewManager.Show<CardUpView>(new object[] { _cardData.scores, strType, _cardData.star - 1, _cardData.star, _cardData.id }, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData });
+        }
         /***********************************************************升技能***************************************************/
 
         private void UpdateUpSkillView()
@@ -995,7 +1122,13 @@ namespace GFGGame
             _effectUI6 = null;
             EffectUIPool.Recycle(_effectUI7);
             _effectUI7 = null;
-
+            EffectUIPool.Recycle(_effectUI8);
+            _effectUI8 = null;
+            EffectUIPool.Recycle(_effectUI9);
+            _effectUI9 = null;
+            EffectUIPool.Recycle(_effectUI10);
+            _effectUI10 = null;
+            
             Timers.inst.Remove(CheckGuide);
             Timers.inst.Remove(OnTimedEvent);
             UI_ComCostCurrency.ProxyEnd();

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

@@ -68,7 +68,7 @@ namespace GFGGame
             }
             else
             {
-                item.m_txtTitle.text = string.Format("词牌星级达到{0}星", NumberUtil.GetChiniseNumberText(cardStarCfg.starLvl));
+                item.m_txtTitle.text = string.Format("词牌星级达到{0}星", NumberUtil.GetChiniseNumberText(cardStarCfg.starLvl / 5));
             }
             item.m_txtTips.visible = cardStarCfg.starLvl == cardData.itemCfg.animationCardStar;
             item.m_c1.selectedIndex = cardData.starRewardsState.ContainsKey(cardStarCfg.starLvl) ? cardData.starRewardsState[cardStarCfg.starLvl] : 0;

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

@@ -9,12 +9,18 @@ namespace GFGGame
 {
     public class CardUpView : BaseWindow
     {
-
         private UI_CardUpUI _ui;
         private Dictionary<int, int> _scores;
         private string _type;
         private int _lastNum;
         private int _curNum;
+        private int _cardId;
+        private CardLvlCfg _cardLvCfg;
+        private CardStarCfg _cardStarCfg;
+        private int _mainScore = 0;
+        private int _otherScore = 0;
+        private int _itemCfgMainScore = 0;
+
         public override void Dispose()
         {
             if (_ui != null)
@@ -37,9 +43,8 @@ namespace GFGGame
 
             //MakeFullScreen(_ui);
 
-
             _ui.m_listProperty.itemRenderer = RenderListPropertyItem;
-
+            _ui.m_listLastProperty.itemRenderer = RenderListLastPropertyItem;
         }
         protected override void OnShown()
         {
@@ -48,31 +53,82 @@ namespace GFGGame
             _type = (string)(viewData as object[])[1];
             _lastNum = (int)(viewData as object[])[2];
             _curNum = (int)(viewData as object[])[3];
+            _cardId = (int)(viewData as object[])[4];
 
             _ui.m_listProperty.numItems = _scores.Count;
+
             if (_type == "lv")
             {
                 _ui.m_c1.selectedIndex = 0;
                 _ui.m_txtLast.text = string.Format("{0}级", _lastNum);
                 _ui.m_txtNow.text = string.Format("{0}级", _curNum);
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_cardId);
+                _cardLvCfg = CardLvlCfgArray.Instance.GetCfgByrarityAndcardLvl(itemCfg.rarity, _lastNum);
+                _cardStarCfg = null;
+                _itemCfgMainScore = itemCfg.mainScore;
+
+                _mainScore = 0;
+                _otherScore = 0;
+                for (int i = _lastNum; i < _curNum; i++)
+                {
+                    CardLvlCfg cardLvCfg = CardLvlCfgArray.Instance.GetCfgByrarityAndcardLvl(itemCfg.rarity, i);
+                    _mainScore += cardLvCfg.mainScore;
+                    _otherScore += cardLvCfg.otherScore;
+                }
             }
-            else
+            else if (_type == "star")
             {
                 _ui.m_c1.selectedIndex = 1;
-                _ui.m_txtLast.text = string.Format("{0}星", _lastNum);
-                _ui.m_txtNow.text = string.Format("{0}星", _curNum);
+                _ui.m_txtLast.text = string.Format("{0}星", _lastNum / 5);
+                _ui.m_txtNow.text = string.Format("{0}星", _curNum / 5);
+                _cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardId, _lastNum);
+                _cardLvCfg = null;
+            }
+            else { 
+                _ui.m_c1.selectedIndex = 2;
+                _cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardId, _lastNum);
+                _cardLvCfg = null;
             }
+            _ui.m_listLastProperty.numItems = _scores.Count;
             Timers.inst.AddUpdate(CheckGuide);
         }
-        private void RenderListPropertyItem(int index, GObject obj)
+
+        private void RenderListLastPropertyItem(int index, GObject obj)
         {
+            UI_ListScoreItem listItem = UI_ListScoreItem.Proxy(obj);
+            int score = 0;
+            if (_cardStarCfg != null)
+            {
+                if (index == 0)
+                    score = _scores[index + 1] - _cardStarCfg.score1;
+                else if (index == 1)
+                    score = _scores[index + 1] - _cardStarCfg.score2;
+                else if (index == 2)
+                    score = _scores[index + 1] - _cardStarCfg.score3;
+                else if (index == 3)
+                    score = _scores[index + 1] - _cardStarCfg.score4;
+            }
+            else {
+                if ((index + 1) == _itemCfgMainScore)
+                    score = _scores[index + 1] - _mainScore;
+                else
+                    score = _scores[index + 1] - _otherScore;
+            }
+            listItem.m_txtProperty.text = score.ToString();
+            listItem.m_loaIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (index + 1));
+            UI_ListScoreItem.ProxyEnd();
+        }
 
+        private void RenderListPropertyItem(int index, GObject obj)
+        {
             UI_ListScoreItem listItem = UI_ListScoreItem.Proxy(obj);
 
             listItem.m_txtProperty.text = _scores[index + 1].ToString();
             listItem.m_loaIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (index + 1));
             UI_ListScoreItem.ProxyEnd();
         }
+
+        
         protected override void OnHide()
         {
             base.OnHide();

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

@@ -68,7 +68,7 @@ namespace GFGGame
                     break;
                 }
             }
-            _ui.m_txtLock.text = cardItemCfg == null || cfg.cardStar == 0 ? "" : string.Format("词牌【{0}】达到{1}星可养护", cardItemCfg.name, cfg.cardStar);
+            _ui.m_txtLock.text = cardItemCfg == null || cfg.cardStar == 0 ? "" : string.Format("词牌【{0}】达到{1}星可养护", cardItemCfg.name, cfg.cardStar / 5);
             _ui.m_txtLock.visible = cardItemCfg != null && cfg.cardStar > 0;
             _ui.m_listMaterials.numItems = cfg.materialsArr.Length;
             long has = ItemDataManager.GetItemNum(cfg.costId);

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

@@ -18,14 +18,21 @@ namespace GFGGame
         private int _skillId = 0;
 
         private List<EffectUI> _effects = new List<EffectUI>();
-        private EffectUI _effectUI1;
         private GComponent _comSelected;
 
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+
         public override void Dispose()
         {
             base.Dispose();
-            //EffectUIPool.Recycle(_effectUI1);
-            //_effectUI1 = null;
+             EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+
+            //EffectUIPool.Recycle(_effectUI3);
+            //_effectUI3 = null;
             if (_comSelected != null)
             {
                 _comSelected.RemoveFromParent();
@@ -66,7 +73,8 @@ namespace GFGGame
             _ui.m_btnUpCard.onClick.Add(OnBtnUpCardClikc);
 
             _comSelected = UIPackage.CreateObject(UI_MainUI.PACKAGE_NAME, "ComCardSelect").asCom;
-            //_effectUI1 = EffectUIPool.CreateEffectUI(_comSelected.GetChild("holder").asGraph, "ui_fight_new", "kp_Select");
+            //_effectUI3 = EffectUIPool.CreateEffectUI(_comSelected.GetChild("holder").asGraph, "ui_fight_new", "kp_Select");
+            AddEffect();
         }
 
         protected override void OnShown()
@@ -115,6 +123,7 @@ namespace GFGGame
 
         private void UpdateView(int index)
         {
+
             // CardData cardData = cardList[index];
             _ui.m_loaScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + _scoreType);
 
@@ -188,7 +197,15 @@ namespace GFGGame
             item.m_loaMainScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (cardData.itemCfg.mainScore));
             item.m_loaBorder.url = "ui://CommonGame/kp_kuang_" + cardData.itemCfg.rarity;
             // UI_ComStar comStar = UI_ComStar.Proxy(item.m_comStar);
-            item.m_txtStarLv.text = cardData.star.ToString();
+
+            int starLevelDodge = cardData.star / 5;
+            for (int i = 0; i < 4; i++)
+            {
+                UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(item.target.GetChild("dodgeStar" + i));
+                dodgeStar.m_lightType.selectedIndex = (starLevelDodge > i) ? 1 : 0;
+                UI_ComDodgeStar.ProxyEnd();
+            }
+
             // comStar.m_c1.selectedIndex = cardData.star;
             if (_effects.Count <= index)
             {
@@ -286,5 +303,13 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_listCard, ConstGuideId.SKILL_CARD_FIGHT, 2, "选择一张合适的词牌，增加过关战斗力。", 0);
             GuideController.TryCompleteGuide(ConstGuideId.SKILL_CARD_FIGHT, 2);
         }
+        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/ResIn/UI/Main/Main_atlas0_10.png.meta → GameClient/Assets/ResIn/UI/Card/Card_atlas0_3!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7e7265bc38a3ea34baa3ea38ebd5f461
+guid: df4e8f948cf454f4c88fd4ccab8ec2b6
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Main/Main_atlas0_11!a.png.meta → GameClient/Assets/ResIn/UI/Card/Card_atlas0_3.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b5f134ed10a79664dbc0253ec5964b94
+guid: 60991e13f2d0cd340b589e7b1a471ed0
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Main/Main_atlas0_10!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: e461562f60aa7e1488108b5d5bca2318
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Main/Main_atlas0_11.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 9dae9d10f5fac2e45bf7c0f3c6f05d25
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Resources/PlayerSettings.asset

@@ -13,9 +13,15 @@ MonoBehaviour:
   m_Name: PlayerSettings
   m_EditorClassIdentifier: 
   assets:
-  - privacypolicy_ed19a0cca9d07246eb1d85aa4bd69bbe
-  - privacypolicychildren_679f2f31989b3002daf503519fd771c5
-  - serviceprotocal_4a2a3eefdbec744df05fd8a503579d37
+  - fangzhengheitijianti-1_5a14c373cf8452ddb058c03bbe7254cd
+  - fzktjw--gb1-0_3abd4ead28ccd67e822cb1e278ca6da6
+  - sourcehanserifcn-bold-2_2a652db9af485f8969860f57a504dcb5
+  - sourcehanserifcn-extralight-3_d1ce9cf695002588d362057b69bb614c
+  - sourcehanserifcn-heavy-4_8be11de7b62ae116a5801e84c2295978
+  - sourcehanserifcn-light-5_71b6c1ff99427e71c9dd7598a155f9e2
+  - sourcehanserifcn-medium-6_c5d87031dac408fecddf9bfd42bafb09
+  - sourcehanserifcn-regular-1_827f0b7e3653035229eaa26ebaff940e
+  - sourcehanserifcn-semibold-7_ba893df23d35cb2a2fea13defe7da3a8
   - Manifest.version
   - Manifest
   offlineMode: 0

GameClient/Assets/StreamingAssets/Bundles/Manifest.version

@@ -1 +1 @@
-{"crc":2591188714,"size":666,"version":1,"appVersion":"1.6"}
+{"crc":426557319,"size":2183,"version":1,"appVersion":"1.6"}

GameClient/ProjectSettings/ProjectSettings.asset

@@ -145,7 +145,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.6
+  bundleVersion: 1.7
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0