스킬 완료

Assets/ResWork/UI/Image/Skill/attack_icon.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 70737e353e85d11449fb9e8d8894493e
+guid: 6df65ea01197de64db304499fd4e9365
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/ResWork/UI/Image/Skill/avoid_icon.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f7e11d391b1d4ba4eb48f04e19734f3d
+guid: 559b152aace87c94685457d72e630d2e
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/ResWork/UI/Image/Skill/scroll bar back.png.meta

@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: 29f4627d736c13a4ea690cd373cf6ac2
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 1
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 0
+  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: 6, y: 9, z: 7, w: 8}
+  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
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ResWork/UI/Image/Skill/scroll bar color.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fafdf7fdd19078447b15751701ca5ece
+guid: e9866004c0c72bf419e623c00baf542e
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -49,7 +49,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 4, y: 7, z: 5, w: 7}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -139,7 +139,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

Assets/ResWork/UIPrefabs/Common/BattleUI.prefab

@@ -37,8 +37,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 288, y: -115.9}
+  m_AnchoredPosition: {x: 106.07, y: -347.14}
-  m_SizeDelta: {x: 90, y: 90}
+  m_SizeDelta: {x: 218.42, y: 80.29}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3464558102048653457
 CanvasRenderer:
@@ -61,14 +61,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.49803925, g: 0.83921576, b: 0.9921569, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 4204c252fcbac504e8a50f23a3420d1d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -163,7 +163,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1399918668994270110
 RectTransform:
   m_ObjectHideFlags: 0
@@ -181,7 +181,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 89, y: 83}
+  m_SizeDelta: {x: 66, y: 67}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5703750343862071117
 CanvasRenderer:
@@ -211,7 +211,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 5fe23778afeb41641b0622fc1c91dc8d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 559b152aace87c94685457d72e630d2e, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -286,8 +286,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 4204c252fcbac504e8a50f23a3420d1d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 79ed91652c5ba0c4a9b13c86ce407722, type: 3}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -369,6 +369,81 @@ MonoBehaviour:
   gos:
   - {fileID: 5661378587943002927}
   - {fileID: 361263156263940327}
+--- !u!1 &4238507734591236891
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5518398995343199588}
+  - component: {fileID: 3284832022707167560}
+  - component: {fileID: 4787149509931142361}
+  m_Layer: 5
+  m_Name: New Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5518398995343199588
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4238507734591236891}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5348763621509571247}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 116, y: 102}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3284832022707167560
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4238507734591236891}
+  m_CullTransparentMesh: 1
+--- !u!114 &4787149509931142361
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4238507734591236891}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 6df65ea01197de64db304499fd4e9365, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5002552871201140199
 GameObject:
   m_ObjectHideFlags: 0
@@ -920,7 +995,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 5518398995343199588}
   m_Father: {fileID: 4460242486586314136}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1092,7 +1168,8 @@ MonoBehaviour:
   m_text: "\uCC29\uC6A9"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2}
-  m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2}
+  m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57,
+    type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1116,8 +1193,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 20
+  m_fontSize: 35
-  m_fontSizeBase: 20
+  m_fontSizeBase: 35
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 10
@@ -1179,6 +1256,18 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 4460242486586314136}
     m_Modifications:
+    - target: {fileID: 67439331489394908, guid: ba9d3a9dca146764c9eab1afcce6c695,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 79ed91652c5ba0c4a9b13c86ce407722,
+        type: 3}
+    - target: {fileID: 1189055321421896372, guid: ba9d3a9dca146764c9eab1afcce6c695,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 79ed91652c5ba0c4a9b13c86ce407722,
+        type: 3}
     - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695,
         type: 3}
       propertyPath: m_Name
@@ -1315,6 +1404,18 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 4460242486586314136}
     m_Modifications:
+    - target: {fileID: 67439331489394908, guid: ba9d3a9dca146764c9eab1afcce6c695,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 79ed91652c5ba0c4a9b13c86ce407722,
+        type: 3}
+    - target: {fileID: 1189055321421896372, guid: ba9d3a9dca146764c9eab1afcce6c695,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 79ed91652c5ba0c4a9b13c86ce407722,
+        type: 3}
     - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695,
         type: 3}
       propertyPath: m_Name
@@ -1451,6 +1552,18 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 4460242486586314136}
     m_Modifications:
+    - target: {fileID: 67439331489394908, guid: ba9d3a9dca146764c9eab1afcce6c695,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 79ed91652c5ba0c4a9b13c86ce407722,
+        type: 3}
+    - target: {fileID: 1189055321421896372, guid: ba9d3a9dca146764c9eab1afcce6c695,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 79ed91652c5ba0c4a9b13c86ce407722,
+        type: 3}
     - target: {fileID: 1740112032792105139, guid: ba9d3a9dca146764c9eab1afcce6c695,
         type: 3}
       propertyPath: images.Array.data[0]
@@ -1596,6 +1709,18 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 4460242486586314136}
     m_Modifications:
+    - target: {fileID: 67439331489394908, guid: ba9d3a9dca146764c9eab1afcce6c695,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 79ed91652c5ba0c4a9b13c86ce407722,
+        type: 3}
+    - target: {fileID: 1189055321421896372, guid: ba9d3a9dca146764c9eab1afcce6c695,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 79ed91652c5ba0c4a9b13c86ce407722,
+        type: 3}
     - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695,
         type: 3}
       propertyPath: m_Name
@@ -1732,6 +1857,18 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 4460242486586314136}
     m_Modifications:
+    - target: {fileID: 67439331489394908, guid: ba9d3a9dca146764c9eab1afcce6c695,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 79ed91652c5ba0c4a9b13c86ce407722,
+        type: 3}
+    - target: {fileID: 1189055321421896372, guid: ba9d3a9dca146764c9eab1afcce6c695,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 79ed91652c5ba0c4a9b13c86ce407722,
+        type: 3}
     - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695,
         type: 3}
       propertyPath: m_Name
@@ -1868,6 +2005,18 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 4460242486586314136}
     m_Modifications:
+    - target: {fileID: 67439331489394908, guid: ba9d3a9dca146764c9eab1afcce6c695,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 79ed91652c5ba0c4a9b13c86ce407722,
+        type: 3}
+    - target: {fileID: 1189055321421896372, guid: ba9d3a9dca146764c9eab1afcce6c695,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 79ed91652c5ba0c4a9b13c86ce407722,
+        type: 3}
     - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695,
         type: 3}
       propertyPath: m_Name

Assets/Script/UI/Skill/SkillCard.cs

@@ -53,17 +53,15 @@ public class SkillCard : CardCoolTimeBase
     public override void Set_CardType(eUICardType _type)
     {
         base.Set_CardType(_type);
-        var et = images[0].GetComponent<EventTrigger>();
+        var et = images[1].GetComponent<EventTrigger>();
         switch (CardType)
         {
             case eUICardType.UI:
-                if (!DSUtil.CheckNull(et) && et.enabled)
+                et.enabled = false;
-                    et.enabled = false;
                 images[1].GetComponent<Button>().onClick.AddListener(OnClick_SkillUI);
                 break;
             case eUICardType.Use:
-                if (!DSUtil.CheckNull(et) && !et.enabled)
+                et.enabled = true;
-                    et.enabled = true;
                 break;
         }
     }

Assets/Script/UI/Skill/SkillUI.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 public class SkillUI : BotMenuBase
 {
     public SkillUI_SkillInfo m_SkillUI_SkillInfo;
-    public TabUIBase m_Tab;
+    public TabUIBase m_Tab, m_TabSkillType;
     public BattleUI m_BattleUI;
     public SkillEquipUI m_SkillEquipUI;
 
@@ -12,11 +12,19 @@ public class SkillUI : BotMenuBase
     { { "Active", eSkillType.Active }, { "Passive", eSkillType.Passive }, { "JobPassive", eSkillType.JobPassive } };
 
     List<TabUIData> list_tabData = new List<TabUIData> { new TabUIData{ }, new TabUIData{ }, new TabUIData{ } };
+    List<TabUIData> list_skilltabData = new List<TabUIData>
+    { new TabUIData { n_btnName = 214 }, new TabUIData { n_btnName = 215 }, new TabUIData { n_btnName = 216 } };
 
     public override void Set()
     {
         m_SkillEquipUI.OnClick_Back();
         base.Set();
+        Set_PresetTab();
+        Set_SkillTab();
+        Set_Money(table_skilllist.Ins.Get_MatIds());
+    }
+    void Set_PresetTab()
+    {
         var sdata = ServerInfo.Ins.m_ServerData;
         for (int i = 0; i < list_tabData.Count; i++)
         {
@@ -26,8 +34,16 @@ public class SkillUI : BotMenuBase
         m_Tab.Set_Index(sdata.Equip.Preset - 1);
         m_Tab.Set(list_tabData);
         OnClick_Preset();
-
+    }
-        Set_Money(table_skilllist.Ins.Get_MatIds());
+    void Set_SkillTab()
+    {
+        var sdata = ServerInfo.Ins.m_ServerData;
+        for (int i = 0; i < list_skilltabData.Count; i++)
+        {
+            list_skilltabData[i].onClick = OnClick_SkillType;
+        }
+        m_TabSkillType.Set(list_skilltabData);
+        OnClick_SkillType();
     }
 
     public override void Set_UI()
@@ -41,9 +57,10 @@ public class SkillUI : BotMenuBase
         m_BattleUI.Set(eUICardType.UI, sdata.Equip.Preset);
     }
 
-    public void OnClick_SkillType(string skillType)
+    public void OnClick_SkillType()
     {
-        m_SkillType = skillType;
+        var index = m_TabSkillType.Get_Index();
+        m_SkillType = index == 0 ? "JobPassive" : index == 1 ? "Active" : "Passive";
         Set_UI();
     }