对战对方技能展示

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -20,13 +20,13 @@
     <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,127" pivot="0,0.5" anchor="true">
       <ProgressBar value="100" max="100"/>
     </component>
-    <component id="n54_psph" name="comTargetCard" src="psphiz" fileName="components/ComTargetCard.xml" xy="1180,540" pivot="0.5,0.5" anchor="true" size="174,250" aspect="true"/>
+    <component id="n54_psph" name="comTargetCard" src="volsov" fileName="components/ComTargetSkillShow.xml" xy="1180,420" pivot="0.5,0.5" anchor="true" aspect="true" scale="0.3,0.3"/>
     <component id="n55_psph" name="comDeduction" src="psphix" fileName="components/ComDeduction.xml" xy="102,500" pivot="0.5,0.5" anchor="true" scale="0,0"/>
   </displayList>
   <transition name="t1">
-    <item time="0" type="Scale" target="n54_psph" value="1,1"/>
-    <item time="0" type="XY" target="n54_psph" tween="true" startValue="1180,540" endValue="995,540" duration="6" ease="Linear"/>
-    <item time="24" type="Scale" target="n54_psph" tween="true" startValue="1,1" endValue="0,0" duration="6" ease="Linear"/>
+    <item time="0" type="Scale" target="n54_psph" value="0.3,0.3"/>
+    <item time="0" type="XY" target="n54_psph" tween="true" startValue="1180,420" endValue="995,420" duration="6" ease="Linear"/>
+    <item time="24" type="Scale" target="n54_psph" tween="true" startValue="0.3,0.3" endValue="0,0" duration="6" ease="Linear"/>
   </transition>
   <transition name="t2">
     <item time="0" type="Scale" target="n55_psph" tween="true" startValue="0,0" endValue="1,1" duration="6" ease="Linear"/>

FGUIProject/assets/Main/components/ComTargetSkillShow.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="546,997" overflow="hidden">
+  <displayList>
+    <image id="n18_vols" name="n18" src="qkjsjv" fileName="imagesNew/dikuang_card_light2.png" xy="-267,-67" group="n14_idkd"/>
+    <graph id="n15_idkd" name="holderBottom" xy="268,538" size="10,10" group="n14_idkd" type="rect"/>
+    <image id="n13_idkd" name="n13" src="qkjskb" fileName="imagesNew/dikuang_card.png" xy="0,96" group="n14_idkd"/>
+    <component id="n0_py00" name="comSkillCard" src="py009o" fileName="components/ComSkillCard.xml" xy="11,95" pivot="0.5,0.5" group="n14_idkd"/>
+    <component id="n6_om9f" name="ComSkillScore" src="om9f9w" fileName="components/ComSkillScore.xml" xy="322,129" pivot="0.5,0.5" group="n14_idkd"/>
+    <text id="n17_idkd" name="txtName" xy="46,0" size="454,79" group="n21_vols" visible="false" font="ui://eg2y0ldpa0cftks" fontSize="60" color="#fefef6" align="center" ubb="true" autoSize="none" text="月中天"/>
+    <graph id="n16_idkd" name="holderTop" xy="275,512" size="10,10" group="n21_vols" type="rect"/>
+    <image id="n19_vols" name="n19" src="qkjsky" fileName="imagesNew/skill_card_light1.png" xy="404,22" group="n21_vols"/>
+    <image id="n20_vols" name="n20" src="qkjsky" fileName="imagesNew/skill_card_light1.png" xy="0,22" pivot="0.5,0" group="n21_vols" scale="-1,1"/>
+    <group id="n21_vols" name="n21" xy="0,0" size="546,522" group="n14_idkd" visible="false" advanced="true"/>
+    <group id="n14_idkd" name="n14" xy="-267,-67" size="1080,1156"/>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n0_py00" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+    <item time="0" type="Alpha" target="n13_idkd" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+    <item time="0" type="Visible" target="n15_idkd" value="true"/>
+    <item time="0" type="Visible" target="n16_idkd" value="true"/>
+    <item time="0" type="Visible" target="n17_idkd" value="false"/>
+    <item time="0" type="Visible" target="n6_om9f" value="false"/>
+    <item time="0" type="XY" target="n0_py00" tween="true" startValue="-802,0" endValue="11,0" duration="18" ease="Expo.Out"/>
+    <item time="0" type="XY" target="n13_idkd" tween="true" startValue="802,1" endValue="0,1" duration="18" ease="Expo.Out"/>
+    <item time="18" type="Scale" target="n6_om9f" tween="true" startValue="0,0" endValue="1.4,1.4" duration="6" ease="Linear"/>
+    <item time="18" type="Visible" target="n17_idkd" value="true"/>
+    <item time="18" type="Visible" target="n6_om9f" value="true"/>
+    <item time="24" type="Scale" target="n6_om9f" tween="true" startValue="1.4,1.4" endValue="1,1" duration="6" ease="Linear"/>
+    <item time="60" type="Visible" target="n17_idkd" value="true"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Alpha" target="n0_py00" tween="true" startValue="1" endValue="0" duration="18" ease="Linear"/>
+    <item time="0" type="Alpha" target="n13_idkd" tween="true" startValue="1" endValue="0" duration="18" ease="Linear"/>
+    <item time="0" type="Visible" target="n15_idkd" value="false"/>
+    <item time="0" type="Visible" target="n16_idkd" value="false"/>
+    <item time="0" type="Visible" target="n17_idkd" value="false"/>
+    <item time="0" type="Visible" target="n6_om9f" value="false"/>
+    <item time="0" type="XY" target="n0_py00" tween="true" startValue="11,0" endValue="-802,0" duration="18" ease="Expo.In"/>
+    <item time="0" type="XY" target="n13_idkd" tween="true" startValue="0,1" endValue="802,1" duration="18" ease="Expo.In"/>
+  </transition>
+</component>

FGUIProject/assets/Main/package.xml

@@ -643,6 +643,7 @@
     <component id="volsos" name="ComAd.xml" path="/components/"/>
     <component id="volsot" name="ListAdItem.xml" path="/components/"/>
     <component id="volsou" name="ComAdSelectItem.xml" path="/components/"/>
+    <component id="volsov" name="ComTargetSkillShow.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

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

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

@@ -0,0 +1,91 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComTargetSkillShow
+    {
+        public GComponent target;
+        public GGraph m_holderBottom;
+        public UI_ComSkillCard m_comSkillCard;
+        public UI_ComSkillScore m_ComSkillScore;
+        public GTextField m_txtName;
+        public GGraph m_holderTop;
+        public Transition m_t0;
+        public Transition m_t1;
+        public const string URL = "ui://mfvz4q8kvolsov";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComTargetSkillShow";
+        private static UI_ComTargetSkillShow _proxy;
+
+        public static UI_ComTargetSkillShow Create(GObject gObject = null)
+        {
+            var ui = new UI_ComTargetSkillShow();
+            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_ComTargetSkillShow Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComTargetSkillShow();
+            }
+            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_holderBottom = (GGraph)comp.GetChild("holderBottom");
+            m_comSkillCard = (UI_ComSkillCard)UI_ComSkillCard.Create(comp.GetChild("comSkillCard"));
+            m_ComSkillScore = (UI_ComSkillScore)UI_ComSkillScore.Create(comp.GetChild("ComSkillScore"));
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_holderTop = (GGraph)comp.GetChild("holderTop");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holderBottom = null;
+            m_comSkillCard.Dispose();
+            m_comSkillCard = null;
+            m_ComSkillScore.Dispose();
+            m_ComSkillScore = null;
+            m_txtName = null;
+            m_holderTop = null;
+            m_t0 = null;
+            m_t1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComTargetCard.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComTargetSkillShow.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d96de092cb5e39e4e8b216fb575a111d
+guid: 68c26aca7ae0ca045b5b0d1ea5e12c8d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -14,7 +14,7 @@ namespace UI.Main
         public GComponent m_myHead;
         public GComponent m_targetHead;
         public UI_ProgressBarTargetScore m_proScore;
-        public UI_ComTargetCard m_comTargetCard;
+        public UI_ComTargetSkillShow m_comTargetCard;
         public UI_ComDeduction m_comDeduction;
         public Transition m_t1;
         public Transition m_t2;
@@ -72,7 +72,7 @@ namespace UI.Main
             m_myHead = (GComponent)comp.GetChild("myHead");
             m_targetHead = (GComponent)comp.GetChild("targetHead");
             m_proScore = (UI_ProgressBarTargetScore)UI_ProgressBarTargetScore.Create(comp.GetChild("proScore"));
-            m_comTargetCard = (UI_ComTargetCard)UI_ComTargetCard.Create(comp.GetChild("comTargetCard"));
+            m_comTargetCard = (UI_ComTargetSkillShow)UI_ComTargetSkillShow.Create(comp.GetChild("comTargetCard"));
             m_comDeduction = (UI_ComDeduction)UI_ComDeduction.Create(comp.GetChild("comDeduction"));
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");

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

@@ -334,7 +334,8 @@ namespace GFGGame
             if (t_skillScoreSelf > 0)
             {
                 _targetScore += t_skillScoreSelf;
-                _ui.m_comTargetCard.m_txtScore.text = t_skillScoreSelf.ToString();
+                _ui.m_comTargetCard.m_ComSkillScore.m_txtCount.text = t_skillScoreSelf.ToString();
+                _ui.m_comTargetCard.m_comSkillCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardPath(ItemCfgArray.Instance.GetCfg(targetData.cardId).res);
                 _ui.m_t1.timeScale = FightDataManager.Instance.fightSpeed;
                 _ui.m_t1.Play();
             }
@@ -370,7 +371,8 @@ namespace GFGGame
             if (t_skillScoreSelf > 0)
             {
                 _targetSkillScore += t_skillScoreSelf;
-                _ui.m_comTargetCard.m_txtScore.text = t_skillScoreSelf.ToString();
+                _ui.m_comTargetCard.m_comSkillCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardPath(ItemCfgArray.Instance.GetCfg(targetData.cardId).res);
+                _ui.m_comTargetCard.m_ComSkillScore.m_txtCount.text = t_skillScoreSelf.ToString();
                 _ui.m_t1.timeScale = FightDataManager.Instance.fightSpeed;
                 _ui.m_t1.Play();
             }

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

@@ -66,7 +66,7 @@ namespace GFGGame
                 string res = skillCfg.res;
                 if (string.IsNullOrEmpty(skillCfg.res))
                 {
-                    res = "kp_mengying";
+                    res = ItemCfgArray.Instance.GetCfg(skillCfg.cardId).res;
                     ET.Log.Error("技能" + skillCfg.skillId + "  未配资源");
                 }
                 _ui.m_comSkillShow.m_comSkillCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardPath(res);

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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: b038fe94dd528f248b9a962cd84743fc
+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_8.png.meta

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