词牌界面换ui

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, () =>
             // {
@@ -108,10 +107,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 +127,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()
         {

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_11!a.png.meta → GameClient/Assets/ResIn/UI/Card/Card_atlas0_3!a.png.meta

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

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

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

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

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 7e7265bc38a3ea34baa3ea38ebd5f461
-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: