diff --git a/Assets/ResWork/UI/Image/Battle/map-back-board.png.meta b/Assets/ResWork/UI/Image/Battle/map-back-board.png.meta index 2d38e5143..186f57c49 100644 --- a/Assets/ResWork/UI/Image/Battle/map-back-board.png.meta +++ b/Assets/ResWork/UI/Image/Battle/map-back-board.png.meta @@ -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: 0, y: 0, z: 334, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -139,7 +139,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/ResWork/UI/Image/Pet/pet-guage-bar-bg t.png b/Assets/ResWork/UI/Image/Pet/pet-guage-bar-bg t.png new file mode 100644 index 000000000..abc89d3de Binary files /dev/null and b/Assets/ResWork/UI/Image/Pet/pet-guage-bar-bg t.png differ diff --git a/Assets/ResWork/UI/Image/Pet/pet-guage-bar-bg t.png.meta b/Assets/ResWork/UI/Image/Pet/pet-guage-bar-bg t.png.meta new file mode 100644 index 000000000..47c68a1ec --- /dev/null +++ b/Assets/ResWork/UI/Image/Pet/pet-guage-bar-bg t.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: a907b7d50704db44b9c1781dfd0b4fc0 +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: 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 + 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: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Battle/pet-guage-bar-bg.png b/Assets/ResWork/UI/Image/Pet/pet-guage-bar-bg.png similarity index 100% rename from Assets/ResWork/UI/Image/Battle/pet-guage-bar-bg.png rename to Assets/ResWork/UI/Image/Pet/pet-guage-bar-bg.png diff --git a/Assets/ResWork/UI/Image/Battle/pet-guage-bar-bg.png.meta b/Assets/ResWork/UI/Image/Pet/pet-guage-bar-bg.png.meta similarity index 100% rename from Assets/ResWork/UI/Image/Battle/pet-guage-bar-bg.png.meta rename to Assets/ResWork/UI/Image/Pet/pet-guage-bar-bg.png.meta diff --git a/Assets/ResWork/UI/Image/Battle/pet-guage-bar-white.png b/Assets/ResWork/UI/Image/Pet/pet-guage-bar-white.png similarity index 100% rename from Assets/ResWork/UI/Image/Battle/pet-guage-bar-white.png rename to Assets/ResWork/UI/Image/Pet/pet-guage-bar-white.png diff --git a/Assets/ResWork/UI/Image/Battle/pet-guage-bar-white.png.meta b/Assets/ResWork/UI/Image/Pet/pet-guage-bar-white.png.meta similarity index 100% rename from Assets/ResWork/UI/Image/Battle/pet-guage-bar-white.png.meta rename to Assets/ResWork/UI/Image/Pet/pet-guage-bar-white.png.meta diff --git a/Assets/ResWork/UI/Image/Battle/pet-image-frame.png b/Assets/ResWork/UI/Image/Pet/pet-image-frame.png similarity index 100% rename from Assets/ResWork/UI/Image/Battle/pet-image-frame.png rename to Assets/ResWork/UI/Image/Pet/pet-image-frame.png diff --git a/Assets/ResWork/UI/Image/Battle/pet-image-frame.png.meta b/Assets/ResWork/UI/Image/Pet/pet-image-frame.png.meta similarity index 100% rename from Assets/ResWork/UI/Image/Battle/pet-image-frame.png.meta rename to Assets/ResWork/UI/Image/Pet/pet-image-frame.png.meta diff --git a/Assets/ResWork/UI/Image/Battle/pet-main-skill-icon.png b/Assets/ResWork/UI/Image/Pet/pet-main-skill-icon.png similarity index 100% rename from Assets/ResWork/UI/Image/Battle/pet-main-skill-icon.png rename to Assets/ResWork/UI/Image/Pet/pet-main-skill-icon.png diff --git a/Assets/ResWork/UI/Image/Battle/pet-main-skill-icon.png.meta b/Assets/ResWork/UI/Image/Pet/pet-main-skill-icon.png.meta similarity index 100% rename from Assets/ResWork/UI/Image/Battle/pet-main-skill-icon.png.meta rename to Assets/ResWork/UI/Image/Pet/pet-main-skill-icon.png.meta diff --git a/Assets/ResWork/UI/Image/Battle/pet-main-stat-box.png b/Assets/ResWork/UI/Image/Pet/pet-main-stat-box.png similarity index 100% rename from Assets/ResWork/UI/Image/Battle/pet-main-stat-box.png rename to Assets/ResWork/UI/Image/Pet/pet-main-stat-box.png diff --git a/Assets/ResWork/UI/Image/Battle/pet-main-stat-box.png.meta b/Assets/ResWork/UI/Image/Pet/pet-main-stat-box.png.meta similarity index 100% rename from Assets/ResWork/UI/Image/Battle/pet-main-stat-box.png.meta rename to Assets/ResWork/UI/Image/Pet/pet-main-stat-box.png.meta diff --git a/Assets/ResWork/UI/Image/Battle/pet-main-stat-icon.png b/Assets/ResWork/UI/Image/Pet/pet-main-stat-icon.png similarity index 100% rename from Assets/ResWork/UI/Image/Battle/pet-main-stat-icon.png rename to Assets/ResWork/UI/Image/Pet/pet-main-stat-icon.png diff --git a/Assets/ResWork/UI/Image/Battle/pet-main-stat-icon.png.meta b/Assets/ResWork/UI/Image/Pet/pet-main-stat-icon.png.meta similarity index 100% rename from Assets/ResWork/UI/Image/Battle/pet-main-stat-icon.png.meta rename to Assets/ResWork/UI/Image/Pet/pet-main-stat-icon.png.meta diff --git a/Assets/ResWork/UIPrefabs/InGame/IngamePetCard.prefab b/Assets/ResWork/UIPrefabs/InGame/IngamePetCard.prefab index d624ab7de..2ed4c4d88 100644 --- a/Assets/ResWork/UIPrefabs/InGame/IngamePetCard.prefab +++ b/Assets/ResWork/UIPrefabs/InGame/IngamePetCard.prefab @@ -1,41 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &515294004453334908 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6567611071149382715} - m_Layer: 0 - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6567611071149382715 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 515294004453334908} - 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: - - {fileID: 2378137630008094284} - m_Father: {fileID: 4979777991448685706} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &844180190484634845 GameObject: m_ObjectHideFlags: 0 @@ -47,7 +11,7 @@ GameObject: - component: {fileID: 6641322232018589546} - component: {fileID: 5535378735059555346} - component: {fileID: 5287756765956475010} - m_Layer: 0 + m_Layer: 5 m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} @@ -101,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} + m_Sprite: {fileID: 21300000, guid: c9b47c8afed58f548aaf7921419fba4c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -111,95 +75,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1008146635377226991 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4979777991448685706} - - component: {fileID: 6973341370431411388} - m_Layer: 0 - m_Name: Slider_berserk - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4979777991448685706 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1008146635377226991} - 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: - - {fileID: 2535336140050636388} - - {fileID: 6567611071149382715} - m_Father: {fileID: 1303839936856560027} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: -13.5} - m_SizeDelta: {x: 0, y: 9} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &6973341370431411388 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1008146635377226991} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1211876957291205299} - m_FillRect: {fileID: 2378137630008094284} - m_HandleRect: {fileID: 0} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 0.5 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] --- !u!1 &2554317628215625870 GameObject: m_ObjectHideFlags: 0 @@ -210,7 +85,7 @@ GameObject: m_Component: - component: {fileID: 107170614138175546} - component: {fileID: 2829501000363712437} - m_Layer: 0 + m_Layer: 5 m_Name: Slider_hp m_TagString: Untagged m_Icon: {fileID: 0} @@ -231,12 +106,13 @@ RectTransform: m_Children: - {fileID: 6350530812779169190} - {fileID: 984494141301242914} + - {fileID: 3493641490970301891} m_Father: {fileID: 1303839936856560027} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: -4.5} - m_SizeDelta: {x: 0, y: 9} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -2.6, y: -14.9} + m_SizeDelta: {x: 94, y: 19} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2829501000363712437 MonoBehaviour: @@ -285,7 +161,7 @@ MonoBehaviour: m_MinValue: 0 m_MaxValue: 1 m_WholeNumbers: 0 - m_Value: 0.5 + m_Value: 0.845 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -300,7 +176,7 @@ GameObject: - component: {fileID: 4715906395780219849} - component: {fileID: 3973387558161725696} - component: {fileID: 8399647952359172447} - m_Layer: 0 + m_Layer: 5 m_Name: face m_TagString: Untagged m_Icon: {fileID: 0} @@ -321,10 +197,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1303839936856560027} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 102, y: 101} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3973387558161725696 CanvasRenderer: @@ -354,82 +230,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f7664eecb9c33804fab5eb39b0730e1f, 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 &3051036387629577105 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2535336140050636388} - - component: {fileID: 5512534215784380819} - - component: {fileID: 8782879369712152998} - m_Layer: 0 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2535336140050636388 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3051036387629577105} - 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: 4979777991448685706} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5512534215784380819 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3051036387629577105} - m_CullTransparentMesh: 1 ---- !u!114 &8782879369712152998 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3051036387629577105} - 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: 0, g: 0, b: 0, a: 0.6666667} - 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: 65f581562538e304cbbfe8ee3beab09c, type: 3} + m_Sprite: {fileID: 21300000, guid: ef8229b752aa696459711de8be58e2dd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -450,7 +251,7 @@ GameObject: - component: {fileID: 6334457928749651176} - component: {fileID: 277810028238938010} - component: {fileID: 2548225479760850373} - m_Layer: 0 + m_Layer: 5 m_Name: attacktypebg m_TagString: Untagged m_Icon: {fileID: 0} @@ -472,10 +273,10 @@ RectTransform: - {fileID: 5161843371259969670} m_Father: {fileID: 1303839936856560027} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 11.5, y: 11} - m_SizeDelta: {x: 23, y: 22} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -9.7, y: 15.1} + m_SizeDelta: {x: 43, y: 43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &277810028238938010 CanvasRenderer: @@ -505,7 +306,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1ba8cc83be9dbf24db970f72c3128e71, type: 3} + m_Sprite: {fileID: 21300000, guid: eb58472819f71524a9a4579ef320b17a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -550,7 +351,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &4923925510282691680 +--- !u!1 &3606394810531620564 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -558,64 +359,64 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2378137630008094284} - - component: {fileID: 8774450865475589774} - - component: {fileID: 1211876957291205299} - m_Layer: 0 - m_Name: Fill + - component: {fileID: 3493641490970301891} + - component: {fileID: 6405116707714444411} + - component: {fileID: 6046789561224934242} + m_Layer: 5 + m_Name: mask m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2378137630008094284 +--- !u!224 &3493641490970301891 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4923925510282691680} + m_GameObject: {fileID: 3606394810531620564} 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: 6567611071149382715} + m_Father: {fileID: 107170614138175546} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 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: 0, y: 0} + m_SizeDelta: {x: 96, y: 24} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8774450865475589774 +--- !u!222 &6405116707714444411 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4923925510282691680} + m_GameObject: {fileID: 3606394810531620564} m_CullTransparentMesh: 1 ---- !u!114 &1211876957291205299 +--- !u!114 &6046789561224934242 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4923925510282691680} + m_GameObject: {fileID: 3606394810531620564} 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: 0.60784316, g: 0, b: 1, a: 1} + 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: 65f581562538e304cbbfe8ee3beab09c, type: 3} + m_Sprite: {fileID: 21300000, guid: a907b7d50704db44b9c1781dfd0b4fc0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -636,7 +437,7 @@ GameObject: - component: {fileID: 6350530812779169190} - component: {fileID: 4295033826702785542} - component: {fileID: 3955214784634310827} - m_Layer: 0 + m_Layer: 5 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -657,10 +458,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 107170614138175546} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 96, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4295033826702785542 CanvasRenderer: @@ -683,14 +484,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.6666667} + m_Color: {r: 0, g: 0, b: 0, 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: 65f581562538e304cbbfe8ee3beab09c, type: 3} + m_Sprite: {fileID: 21300000, guid: 1bdbc3076234c2c4090c91a8eac3d6f8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -711,7 +512,7 @@ GameObject: - component: {fileID: 4242632587874139151} - component: {fileID: 6494293777102311758} - component: {fileID: 1131690825878101170} - m_Layer: 0 + m_Layer: 5 m_Name: shieldtime m_TagString: Untagged m_Icon: {fileID: 0} @@ -765,12 +566,12 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} + m_Sprite: {fileID: 21300000, guid: abfaf37dcfcf2fe4a946a9bcd48f7f7d, type: 3} m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 - m_FillAmount: 0.728 + m_FillAmount: 0.249 m_FillClockwise: 1 m_FillOrigin: 2 m_UseSpriteMesh: 0 @@ -807,7 +608,6 @@ RectTransform: - {fileID: 1628092158212097127} - {fileID: 4715906395780219849} - {fileID: 107170614138175546} - - {fileID: 4979777991448685706} - {fileID: 6334457928749651176} - {fileID: 7310193929187884738} - {fileID: 6585263534833399476} @@ -818,7 +618,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -66.5, y: 305.6} - m_SizeDelta: {x: 78, y: 78} + m_SizeDelta: {x: 104, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2437459072261602851 MonoBehaviour: @@ -842,7 +642,6 @@ MonoBehaviour: - {fileID: 5851384049414407066} - {fileID: 8744080277100484966} - {fileID: 1131690825878101170} - slider_berserk: {fileID: 6973341370431411388} slider_hp: {fileID: 2829501000363712437} --- !u!1 &8128196453817547961 GameObject: @@ -855,7 +654,7 @@ GameObject: - component: {fileID: 7310193929187884738} - component: {fileID: 6745776617699670185} - component: {fileID: 2712445850747724473} - m_Layer: 0 + m_Layer: 5 m_Name: cooltime m_TagString: Untagged m_Icon: {fileID: 0} @@ -989,7 +788,7 @@ GameObject: - component: {fileID: 5161843371259969670} - component: {fileID: 5456348859719261344} - component: {fileID: 5851384049414407066} - m_Layer: 0 + m_Layer: 5 m_Name: attacktype m_TagString: Untagged m_Icon: {fileID: 0} @@ -1005,15 +804,15 @@ RectTransform: m_GameObject: {fileID: 8387308270097313974} 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_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 6334457928749651176} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 45, y: 43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5456348859719261344 CanvasRenderer: @@ -1062,7 +861,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 984494141301242914} - m_Layer: 0 + m_Layer: 5 m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -1100,7 +899,7 @@ GameObject: - component: {fileID: 6585263534833399476} - component: {fileID: 2011011301581514483} - component: {fileID: 8744080277100484966} - m_Layer: 0 + m_Layer: 5 m_Name: cool m_TagString: Untagged m_Icon: {fileID: 0} @@ -1154,12 +953,12 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} + m_Sprite: {fileID: 21300000, guid: abfaf37dcfcf2fe4a946a9bcd48f7f7d, type: 3} m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 - m_FillAmount: 1 + m_FillAmount: 0.526 m_FillClockwise: 1 m_FillOrigin: 2 m_UseSpriteMesh: 0 @@ -1177,7 +976,7 @@ GameObject: - component: {fileID: 3487690113690426937} - component: {fileID: 4940512975844798307} - component: {fileID: 2563150531032053902} - m_Layer: 0 + m_Layer: 5 m_Name: btn_petcard m_TagString: Untagged m_Icon: {fileID: 0} @@ -1198,10 +997,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1303839936856560027} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 104, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9112594506917663698 CanvasRenderer: @@ -1231,7 +1030,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1c301d1bea1c10a4ba40f3ce561cbdd9, type: 3} + m_Sprite: {fileID: 21300000, guid: 5530fc88a041bd54ba5d2f2e2c879683, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index e731c3edc..d78ac1134 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -3072,6 +3072,139 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &364204699162867951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7400847127857308737} + - component: {fileID: 3950195606969584076} + - component: {fileID: 8429057128326394302} + - component: {fileID: 3204835384201463271} + - component: {fileID: 7640047324243409391} + m_Layer: 5 + m_Name: btn_ + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7400847127857308737 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364204699162867951} + 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: 1707234196888589553} + 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: 55, y: 62} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3950195606969584076 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364204699162867951} + m_CullTransparentMesh: 1 +--- !u!114 &8429057128326394302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364204699162867951} + 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: 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: 4e26fd1a51022724e9768d54958dceb7, 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!114 &3204835384201463271 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364204699162867951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8429057128326394302} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &7640047324243409391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364204699162867951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &372488356545969969 GameObject: m_ObjectHideFlags: 0 @@ -9947,9 +10080,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6415367922768528216} - {fileID: 4670786236948560329} - - {fileID: 3948127612777823680} - {fileID: 365265949171303323} - {fileID: 4247629930335866296} - {fileID: 7923927867486339260} @@ -18589,6 +18720,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2011774429720397408 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6740604667899987626} + - component: {fileID: 3512535646758721854} + - component: {fileID: 8899099754044705856} + m_Layer: 5 + m_Name: porter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6740604667899987626 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2011774429720397408} + 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: + - {fileID: 516909275809143126} + m_Father: {fileID: 9109461315942411836} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 40.665, y: -41.89} + m_SizeDelta: {x: 81.33, y: 83.78} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3512535646758721854 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2011774429720397408} + m_CullTransparentMesh: 1 +--- !u!114 &8899099754044705856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2011774429720397408} + 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: 79ed91652c5ba0c4a9b13c86ce407722, 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 &2015528665735771348 GameObject: m_ObjectHideFlags: 0 @@ -20973,6 +21180,42 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2194825532003870057 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1573179782677818475} + m_Layer: 5 + m_Name: AboveMgs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1573179782677818475 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2194825532003870057} + 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: + - {fileID: 6713301904854514297} + m_Father: {fileID: 2647977513349308266} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2200083055675027614 GameObject: m_ObjectHideFlags: 0 @@ -33887,7 +34130,7 @@ RectTransform: m_Children: - {fileID: 454094203320341425} - {fileID: 6074532687477413714} - m_Father: {fileID: 2931286266799411332} + m_Father: {fileID: 8541309915134075684} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -42914,7 +43157,7 @@ RectTransform: m_Father: {fileID: 1406900139135982907} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.412, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -43287,6 +43530,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4336743930434219477 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1707234196888589553} + - component: {fileID: 2897572520046386252} + - component: {fileID: 9071237840378316688} + m_Layer: 5 + m_Name: potion + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1707234196888589553 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4336743930434219477} + 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: + - {fileID: 7400847127857308737} + m_Father: {fileID: 9109461315942411836} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 143.995, y: -41.89} + m_SizeDelta: {x: 81.33, y: 83.78} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2897572520046386252 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4336743930434219477} + m_CullTransparentMesh: 1 +--- !u!114 &9071237840378316688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4336743930434219477} + 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: 79ed91652c5ba0c4a9b13c86ce407722, 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 &4357917579263931561 GameObject: m_ObjectHideFlags: 0 @@ -49750,7 +50069,7 @@ RectTransform: m_Children: - {fileID: 3070417278977715533} - {fileID: 202559973709166813} - m_Father: {fileID: 2931286266799411332} + m_Father: {fileID: 8541309915134075684} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -54981,6 +55300,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5773819295343028814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6713301904854514297} + - component: {fileID: 6479361704044258701} + - component: {fileID: 752985132059692409} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6713301904854514297 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5773819295343028814} + 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: + - {fileID: 9109461315942411836} + m_Father: {fileID: 1573179782677818475} + 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: 252.17, y: 262.15} + m_SizeDelta: {x: 458.78, y: 173.06} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6479361704044258701 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5773819295343028814} + m_CullTransparentMesh: 1 +--- !u!114 &752985132059692409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5773819295343028814} + 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: a4b92b215dec7714a90b790cce237d78, type: 3} + m_Type: 1 + 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 &5786430209971166478 GameObject: m_ObjectHideFlags: 0 @@ -68892,6 +69287,139 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7217671701813255486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 516909275809143126} + - component: {fileID: 6032814686189909402} + - component: {fileID: 730203198787331083} + - component: {fileID: 5825634178114144207} + - component: {fileID: 8824880122828555279} + m_Layer: 5 + m_Name: btn_ + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &516909275809143126 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7217671701813255486} + 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: 6740604667899987626} + 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: 55, y: 62} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6032814686189909402 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7217671701813255486} + m_CullTransparentMesh: 1 +--- !u!114 &730203198787331083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7217671701813255486} + 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: 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: a2df83fb167d7b040bf757cfdab8cde5, 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!114 &5825634178114144207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7217671701813255486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 730203198787331083} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &8824880122828555279 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7217671701813255486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7220762127595110800 GameObject: m_ObjectHideFlags: 0 @@ -72935,9 +73463,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 795777954291663711} - {fileID: 3764310506534080148} - {fileID: 4698706880244843650} + - {fileID: 795777954291663711} + - {fileID: 6415367922768528216} + - {fileID: 3948127612777823680} m_Father: {fileID: 5707331028172779298} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -75478,7 +76008,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2647977513349308266 RectTransform: m_ObjectHideFlags: 0 @@ -75497,6 +76027,7 @@ RectTransform: - {fileID: 4825512513270908954} - {fileID: 2150864123731021576} - {fileID: 9135424313123639976} + - {fileID: 1573179782677818475} m_Father: {fileID: 5707331028172779298} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -82737,6 +83268,70 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8570491508817718336 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9109461315942411836} + - component: {fileID: 8461835093220163118} + m_Layer: 5 + m_Name: layout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9109461315942411836 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8570491508817718336} + 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: + - {fileID: 6740604667899987626} + - {fileID: 1707234196888589553} + m_Father: {fileID: 6713301904854514297} + 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: -222.1, y: 7.1} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8461835093220163118 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8570491508817718336} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 22 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &8578983288257440622 GameObject: m_ObjectHideFlags: 0 @@ -111977,21 +112572,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2647977513349308266} m_Modifications: - - target: {fileID: 515294004453334908, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 844180190484634845, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1008146635377226991, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - target: {fileID: 1303839936856560027, guid: b7647c1153b54fe4c95030106c8c8ab3, type: 3} propertyPath: m_Pivot.x @@ -112025,12 +112605,12 @@ PrefabInstance: - target: {fileID: 1303839936856560027, guid: b7647c1153b54fe4c95030106c8c8ab3, type: 3} propertyPath: m_SizeDelta.x - value: 78 + value: 104 objectReference: {fileID: 0} - target: {fileID: 1303839936856560027, guid: b7647c1153b54fe4c95030106c8c8ab3, type: 3} propertyPath: m_SizeDelta.y - value: 78 + value: 104 objectReference: {fileID: 0} - target: {fileID: 1303839936856560027, guid: b7647c1153b54fe4c95030106c8c8ab3, type: 3} @@ -112070,12 +112650,12 @@ PrefabInstance: - target: {fileID: 1303839936856560027, guid: b7647c1153b54fe4c95030106c8c8ab3, type: 3} propertyPath: m_AnchoredPosition.x - value: -66.5 + value: -78 objectReference: {fileID: 0} - target: {fileID: 1303839936856560027, guid: b7647c1153b54fe4c95030106c8c8ab3, type: 3} propertyPath: m_AnchoredPosition.y - value: 435 + value: 598 objectReference: {fileID: 0} - target: {fileID: 1303839936856560027, guid: b7647c1153b54fe4c95030106c8c8ab3, type: 3} @@ -112092,91 +112672,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2378137630008094284, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2378137630008094284, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2554317628215625870, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2991124989061397232, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3051036387629577105, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3432411931506372075, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4923925510282691680, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5092014823540043967, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5459813620709615738, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - target: {fileID: 6641322232018589546, guid: b7647c1153b54fe4c95030106c8c8ab3, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.845 objectReference: {fileID: 0} - target: {fileID: 6641322232018589546, guid: b7647c1153b54fe4c95030106c8c8ab3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6957816333201879133, guid: b7647c1153b54fe4c95030106c8c8ab3, type: 3} propertyPath: m_Name value: IngamePetCard objectReference: {fileID: 0} - - target: {fileID: 8128196453817547961, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 8387308270097313974, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 8884733653118496396, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 9034957591240768442, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 9197436778786999075, guid: b7647c1153b54fe4c95030106c8c8ab3, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Script/UI/Pet/IngamePetCard.cs b/Assets/Script/UI/Pet/IngamePetCard.cs index 9e7595064..9cd6b3c5e 100644 --- a/Assets/Script/UI/Pet/IngamePetCard.cs +++ b/Assets/Script/UI/Pet/IngamePetCard.cs @@ -4,7 +4,7 @@ using UnityEngine.UI; public class IngamePetCard : CardCoolTimeBase { public Image[] sprites; // 0 등급, 1 아이콘, 2 공격타입bg, 3 공격타입, 4 쿨타임, 5 쉴드시간 - public Slider slider_berserk, slider_hp; + public Slider slider_hp; PetListTableData m_PetTableData; //ServerData_Pet m_ServerData_Pet; @@ -16,7 +16,6 @@ public class IngamePetCard : CardCoolTimeBase m_PetTableData = null; sprites[0].sprite = UIAtlasMgr.Ins.Get_Sprite("empty_slot_pet"); sprites[1].enabled = sprites[3].enabled = sprites[5].enabled = false; - slider_berserk.gameObject.SetActive(false); slider_hp.gameObject.SetActive(false); CoolTime_Off(); } @@ -30,11 +29,9 @@ public class IngamePetCard : CardCoolTimeBase sprites[1].enabled = true; sprites[1].color = Color.white; //var chapter = InGameInfo.Ins.Get_CurStageData().Chapter; - if (m_PetTableData != null)// && chapter != 104) + if (!DSUtil.CheckNull(m_PetTableData)) { Set_CoolTime(0f, 100f, 0); - slider_berserk.gameObject.SetActive(true); - Set_Gage(0f); slider_hp.gameObject.SetActive(true); Set_HPGage(1f); Set_Icon(false); @@ -52,7 +49,6 @@ public class IngamePetCard : CardCoolTimeBase m_PetTableData = _ptd; sprite_cooltime.gameObject.SetActive(false); label_cooltime.text = ""; - slider_berserk.gameObject.SetActive(false); slider_hp.gameObject.SetActive(false); Set_Icon(false); sprites[5].enabled = false; @@ -72,7 +68,6 @@ public class IngamePetCard : CardCoolTimeBase label_cooltime.text = ""; } - public void Set_Gage(float _v) { slider_berserk.value = _v; } public void Set_HPGage(float _v) { slider_hp.value = _v; if (_v <= 0f) sprites[1].color = Color.gray; } public void Set_Icon(bool _isberserk) {