战斗选卡点技能图标弹出技能描述

FGUIProject/assets/Main/ComSkillTips.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="365,168">
+  <displayList>
+    <image id="n20_ofwu" name="n20" src="jcej4p" fileName="imagesNew/jjcdi_jjcdi.png" pkg="eg2y0ldp" xy="0,0" pivot="0.5,0.5" group="n24_ofwu" flip="both"/>
+    <image id="n21_ofwu" name="n21" src="jcej4o" fileName="imagesNew/jjcdi_jjxian.png" pkg="eg2y0ldp" xy="19,68" group="n24_ofwu"/>
+    <text id="n22_ofwu" name="txtName" xy="16,22" size="152,41" group="n24_ofwu" fontSize="30" color="#f8f1db" text="飞花令战力"/>
+    <text id="n23_ofwu" name="txtSkillTips" xy="19,74" size="330,89" group="n24_ofwu" fontSize="22" color="#f8f1db" autoSize="none" text="搭配战力搭配战力搭配战力搭配战力搭配战力搭配战力搭配战力搭配战力搭配战力搭配战力搭配战力搭配战力搭配战力"/>
+    <group id="n24_ofwu" name="n24" xy="0,0" size="365,168"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/ListCardSkillItem.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="108,108">
+<component size="108,108" extention="Button">
   <displayList>
     <image id="n16_ofwu" name="n16" src="ofwutoc" fileName="imagesNew/card_jn_db.png" pkg="eg2y0ldp" xy="0,0"/>
     <component id="n14_ofwu" name="comSkill" src="ofwup1" fileName="ListCardSkillItemMask.xml" xy="6,6"/>
@@ -7,4 +7,5 @@
     <text id="n18_ofwu" name="txtLv" xy="80,65" pivot="0.5,0" size="20,44" group="n19_ofwu" fontSize="32" color="#fdfaf3" align="center" text="9"/>
     <group id="n19_ofwu" name="n19" xy="70,65" size="39,45"/>
   </displayList>
+  <Button mode="Radio"/>
 </component>

FGUIProject/assets/Main/StoryCardChooseUI.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n7_sx2v" name="n7" src="sx2v9r" fileName="imagesStory/zd_tctcdi_1.png" xy="23,-365"/>
     <image id="n9_wzce" name="n9" src="sx2v9u" fileName="imagesStory/zd_tctcxian_1.png" xy="320,178"/>
-    <loader id="n4_cn27" name="loaScore" xy="658,114" size="58,58" aspect="true" url="ui://eg2y0ldp842s6h" fill="scaleMatchWidth">
+    <loader id="n4_cn27" name="loaScore" xy="658,114" size="58,58" aspect="true" visible="false" url="ui://eg2y0ldp842s6h" fill="scaleMatchWidth">
       <relation target="n5_cn27" sidePair="left-right"/>
     </loader>
     <text id="n5_cn27" name="txtName" xy="439,107" pivot="0.5,0" size="202,66" font="ui://eg2y0ldpa0cftkz" fontSize="50" color="#9b7853" autoClearText="true" text="技能名字"/>
@@ -29,13 +29,14 @@
     <component id="n13_ofwu" name="btnUpCard" src="rv091e" fileName="components/BtnSmall.xml" pkg="mk0fwx0x" xy="768,245">
       <Button title="提升词牌"/>
     </component>
-    <list id="n15_ofwu" name="listSkill" xy="99,207" size="365,110" layout="row" overflow="scroll" colGap="16" defaultItem="ui://mfvz4q8kofwup0">
+    <list id="n15_ofwu" name="listSkill" xy="99,207" size="365,113" layout="row" overflow="scroll" colGap="16" defaultItem="ui://mfvz4q8kofwup0">
       <item/>
       <item/>
       <item/>
     </list>
-    <text id="n11_wzce" name="txtTips" xy="719,342" size="267,52" group="n16_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="38" color="#c67c6b" text="选择适合的词牌"/>
+    <text id="n11_wzce" name="txtTips" xy="719,342" size="267,51" group="n16_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="38" color="#c67c6b" text="选择适合的词牌"/>
     <image id="n10_wzce" name="n10" src="sx2v9q" fileName="imagesStory/zd_tctcxian_2.png" xy="680,360" group="n16_ofwu"/>
     <group id="n16_ofwu" name="n16" xy="680,342" size="306,52"/>
+    <component id="n17_ofwu" name="comSkillTips" src="ofwup2" fileName="ComSkillTips.xml" xy="99,316" visible="false"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ListCardItem.xml

@@ -4,11 +4,11 @@
   <displayList>
     <component id="n9_wzce" name="comCardMask" src="wzce9v" fileName="components/ComCardMask.xml" xy="4,3" group="n23_ofwu"/>
     <image id="n8_sx2v" name="n8" src="sx2v9s" fileName="imagesStory/zd_tctcdikugn_1.png" xy="5,156" group="n23_ofwu"/>
-    <text id="n3_r1a9" name="txtName" xy="57,236" size="105,46" group="n23_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="34" color="#6a5d56" text="赵钱孙"/>
+    <text id="n3_r1a9" name="txtName" xy="57,236" pivot="0.5,0" size="105,46" group="n23_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="34" color="#6a5d56" align="center" text="赵钱孙"/>
     <text id="n12_wzce" name="txtLv" xy="153,192" pivot="1,0" size="51,34" group="n23_ofwu" fontSize="24" color="#fff9f1" align="right" leading="-8" ubb="true" vars="true" text="30级"/>
-    <text id="n18_v461" name="txtStarLv" xy="153,173" pivot="1,0" size="27,34" group="n19_v461" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30"/>
-    <image id="n17_v461" name="n17" src="pq5x64" fileName="imagesExport/kp_xingx.png" pkg="eg2y0ldp" xy="180,177" group="n19_v461"/>
-    <group id="n19_v461" name="n19" xy="153,173" size="53,34" group="n23_ofwu" advanced="true" layout="hz" excludeInvisibles="true">
+    <text id="n18_v461" name="txtStarLv" xy="152,173" pivot="1,0" size="27,34" group="n19_v461" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30"/>
+    <image id="n17_v461" name="n17" src="pq5x64" fileName="imagesExport/kp_xingx.png" pkg="eg2y0ldp" xy="177,177" group="n19_v461"/>
+    <group id="n19_v461" name="n19" xy="152,173" size="51,34" group="n23_ofwu" advanced="true" layout="hz" colGap="-2" excludeInvisibles="true">
       <relation target="" sidePair="right-right"/>
     </group>
     <loader id="n7_sx2v" name="loaRarity" xy="168,13" size="40,85" group="n23_ofwu" aspect="true" url="ui://eg2y0ldpo9ghtli" fill="scaleMatchWidth"/>

FGUIProject/assets/Main/package.xml

@@ -495,7 +495,6 @@
     <image id="qkjskf" name="font_zdqp_back_dfzj.png" path="/imagesNew/"/>
     <image id="qkjskg" name="font_zdsz_dikuang.png" path="/imagesNew/"/>
     <image id="qkjskh" name="txk_dikuang.png" path="/imagesNew/"/>
-    <image id="qkjski" name="txk_LevelDikuang.png" path="/imagesNew/"/>
     <image id="qkjskj" name="zdpf_dikuang.png" path="/imagesNew/"/>
     <image id="qkjskk" name="zdqp_dikuang.png" path="/imagesNew/"/>
     <image id="qkjskl" name="zdqp_fail.png" path="/imagesNew/"/>
@@ -650,6 +649,7 @@
     <image id="e050oz" name="jdt_shuangrenzd.png" path="/imagesNew/"/>
     <component id="ofwup0" name="ListCardSkillItem.xml" path="/"/>
     <component id="ofwup1" name="ListCardSkillItemMask.xml" path="/"/>
+    <component id="ofwup2" name="ComSkillTips.xml" path="/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillTips.cs.meta

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

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

@@ -6,7 +6,7 @@ namespace UI.Main
 {
     public partial class UI_ListCardSkillItem
     {
-        public GComponent target;
+        public GButton target;
         public UI_ListCardSkillItemMask m_comSkill;
         public GTextField m_txtLv;
         public const string URL = "ui://mfvz4q8kofwup0";
@@ -18,9 +18,9 @@ namespace UI.Main
         {
             var ui = new UI_ListCardSkillItem();
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -33,9 +33,9 @@ namespace UI.Main
             }
             var ui = _proxy;
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }

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

@@ -15,6 +15,7 @@ namespace UI.Main
         public GButton m_btnUpCard;
         public GList m_listSkill;
         public GTextField m_txtTips;
+        public UI_ComSkillTips m_comSkillTips;
         public const string URL = "ui://mfvz4q8kr1a99d";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryCardChooseUI";
@@ -70,6 +71,7 @@ namespace UI.Main
             m_btnUpCard = (GButton)comp.GetChild("btnUpCard");
             m_listSkill = (GList)comp.GetChild("listSkill");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_comSkillTips = (UI_ComSkillTips)UI_ComSkillTips.Create(comp.GetChild("comSkillTips"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -81,6 +83,8 @@ namespace UI.Main
             m_btnUpCard = null;
             m_listSkill = null;
             m_txtTips = null;
+            m_comSkillTips.Dispose();
+            m_comSkillTips = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -13,7 +13,9 @@ namespace GFGGame
         private UI_StoryCardChooseUI _ui;
         private List<CardData> cardList = new List<CardData>();
         private static int _scoreType;
+        private int _selectedIndex = 0;
         private int _cardId = 0;//记录打开界面时的竞技场卡牌id
+        private int _skillId = 0;
 
         private List<GameObject> _effects = new List<GameObject>();
         private List<GoWrapper> _wrappers = new List<GoWrapper>();
@@ -86,17 +88,43 @@ namespace GFGGame
             List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
             _ui.m_listSkill.data = skillCfgs;
             _ui.m_listSkill.numItems = skillCfgs.Count;
+            _ui.m_comSkillTips.target.visible = false;
+            _selectedIndex = index;
         }
-
         private void RenderListSkillItem(int index, GObject obj)
         {
             List<PassivitySkillCfg> skillCfgs = obj.parent.data as List<PassivitySkillCfg>;
             UI_ListCardSkillItem item = UI_ListCardSkillItem.Proxy(obj);
             item.m_comSkill.m_loaSkill.url = ResPathUtil.GetCardSmallPath(skillCfgs[index].res);
             item.m_txtLv.text = SkillDataManager.Instance.GetCardSkillLv(skillCfgs[index].cardId, skillCfgs[index].skillId).ToString();
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnSkillItemClick);
+            }
+            item.target.data = index;// skillCfgs[index];
             UI_ListCardSkillItem.ProxyEnd();
         }
+        private void OnSkillItemClick(EventContext context)
+        {
+            GObject gObject = context.sender as GObject;
+            int index = (int)gObject.data;
+            List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardList[_selectedIndex].id);
+
+            PassivitySkillCfg skillCfg = skillCfgs[index];
+            _ui.m_comSkillTips.target.visible = _skillId != skillCfg.skillId;
 
+            Vector2 posInA = _ui.m_listSkill.GetChildAt(index).asCom.position;
+            Vector2 posInB = _ui.m_listSkill.TransformPoint(posInA, _ui.target);
+            _ui.m_comSkillTips.target.SetPosition(posInB.x, posInB.y + 110, 0);
+
+            _ui.m_comSkillTips.m_txtName.text = skillCfg.name;
+            int skillLv = SkillDataManager.Instance.GetCardSkillLv(skillCfg.cardId, skillCfg.skillId);
+            PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillCfg.skillId);
+            _ui.m_comSkillTips.m_txtSkillTips.text = skillLvlCfg.describe;
+
+            _skillId = skillCfg.skillId;
+
+        }
         private void RenderListCardItem(int index, GObject obj)
         {
             CardData cardData = cardList[index];
@@ -178,8 +206,8 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            _skillId = 0;
             _ui.m_listCard.ScrollToView(0);
-
             Timers.inst.Remove(CheckGuide);
 
         }

GameClient/Assets/ResIn/UI/Arena/Arena_atlas0_5!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 006c617d7ead06747b17accbb2613176
+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/Arena/Arena_atlas0_5.png.meta

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