Преглед изворни кода

updated link mechanic UI, fixed cost memory values for link

mbunch_kascope пре 1 година
родитељ
комит
18b0028d92

+ 8 - 0
Assets/Image/UI/Link Mechanic.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a661fd5badfc6ae4a84f7a7d3d63eed8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Image/UI/Link Mechanic/component_link_background_sources_.png


+ 171 - 0
Assets/Image/UI/Link Mechanic/component_link_background_sources_.png.meta

@@ -0,0 +1,171 @@
+fileFormatVersion: 2
+guid: d31beeb35b3681349b7acd4c50b328da
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 2
+    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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 8192
+    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: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Image/UI/Link Mechanic/icon__link_intact_white.png


+ 171 - 0
Assets/Image/UI/Link Mechanic/icon__link_intact_white.png.meta

@@ -0,0 +1,171 @@
+fileFormatVersion: 2
+guid: de845ea9b55857d4e9f76095ec270166
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 2
+    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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 8192
+    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: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 169 - 0
Assets/Prefab/CardInfo.prefab

@@ -327,6 +327,97 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &5547918605615519800
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8544959899899956261}
+  - component: {fileID: 4641412053226398726}
+  - component: {fileID: 636615155886787719}
+  - component: {fileID: 971488650971322618}
+  m_Layer: 0
+  m_Name: BackGroundLinkMask
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8544959899899956261
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5547918605615519800}
+  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: 1239235794989370393}
+  m_Father: {fileID: 2413544843684430837}
+  m_RootOrder: 1
+  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: 410, y: 140}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4641412053226398726
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5547918605615519800}
+  m_CullTransparentMesh: 1
+--- !u!114 &636615155886787719
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5547918605615519800}
+  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: 0.003921569}
+  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: d5c61c20145a93546a111b9f548b7e9c, 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!114 &971488650971322618
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5547918605615519800}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &5628202629766487747
 GameObject:
   m_ObjectHideFlags: 0
@@ -471,6 +562,7 @@ MonoBehaviour:
   - {fileID: 7657533223761220741}
   - {fileID: 2593065810414958860}
   - {fileID: 6876301294514452486}
+  LinkBackground: {fileID: 5547918605615519800}
   CardImage: {fileID: 6639072173550699241}
   InheritedEffectText: {fileID: 3185575908673456546}
   InheritedEffectFont_ENG: {fileID: 11400000, guid: 83e4a8c28a636e04cb43dc01214a9a41, type: 2}
@@ -1120,6 +1212,82 @@ MonoBehaviour:
             m_StringArgument: 
             m_BoolArgument: 0
           m_CallState: 2
+--- !u!1 &8456282574075911248
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1239235794989370393}
+  - component: {fileID: 7688311221096608520}
+  - component: {fileID: 4330575902001390280}
+  m_Layer: 0
+  m_Name: BackGround Link
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1239235794989370393
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8456282574075911248}
+  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: 8544959899899956261}
+  m_RootOrder: 0
+  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: 410, y: 140}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7688311221096608520
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8456282574075911248}
+  m_CullTransparentMesh: 1
+--- !u!114 &4330575902001390280
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8456282574075911248}
+  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: d31beeb35b3681349b7acd4c50b328da, 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 &8459859627758116939
 GameObject:
   m_ObjectHideFlags: 0
@@ -1255,6 +1423,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7196191407207068651}
+  - {fileID: 8544959899899956261}
   m_Father: {fileID: 8857762179482184235}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 98 - 20
Assets/Prefab/FieldPermanentCard.prefab

@@ -31,7 +31,7 @@ Transform:
   - {fileID: 9035984395792137301}
   - {fileID: 8421186410680037055}
   m_Father: {fileID: 1328592280217377389}
-  m_RootOrder: 11
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &294951820492146254
 GameObject:
@@ -64,7 +64,7 @@ Transform:
   - {fileID: 6029157311506101984}
   - {fileID: 8001544085524755595}
   m_Father: {fileID: 1328592280217377389}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &318510059220149854
 GameObject:
@@ -304,7 +304,7 @@ Transform:
   - {fileID: 525311292421081592}
   - {fileID: 525311292421048760}
   m_Father: {fileID: 1328592280217377389}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 80, y: 0, z: 0}
 --- !u!198 &525311292406949872
 ParticleSystem:
@@ -10074,7 +10074,7 @@ Transform:
   - {fileID: 2104079957368907959}
   - {fileID: 8380388874825695540}
   m_Father: {fileID: 1328592280217377389}
-  m_RootOrder: 13
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &649682817835020130
 GameObject:
@@ -12091,7 +12091,7 @@ Transform:
   - {fileID: 5845795113992664770}
   - {fileID: 436240767566597934}
   m_Father: {fileID: 1328592280217377389}
-  m_RootOrder: 12
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2723462147788418096
 GameObject:
@@ -12668,7 +12668,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1856671696117204050
 RectTransform:
   m_ObjectHideFlags: 0
@@ -12933,7 +12933,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2868062790699068669
 RectTransform:
   m_ObjectHideFlags: 0
@@ -13194,7 +13194,7 @@ RectTransform:
   m_Children:
   - {fileID: 4217996184327941701}
   m_Father: {fileID: 1328592280217377389}
-  m_RootOrder: 10
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -13271,7 +13271,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1328592280217377389}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -13514,7 +13514,7 @@ RectTransform:
   - {fileID: 8759670045046311849}
   - {fileID: 1174407048966754959}
   m_Father: {fileID: 1328592280217377389}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -14482,7 +14482,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1328592280217377389}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -15411,7 +15411,7 @@ RectTransform:
   m_Children:
   - {fileID: 7836597674142952899}
   m_Father: {fileID: 1328592280217377389}
-  m_RootOrder: 9
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -15508,7 +15508,6 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3830428523626426344}
-  - {fileID: 7887069501642103711}
   - {fileID: 2943868691849599935}
   - {fileID: 5372350319648457834}
   - {fileID: 393804494211063232}
@@ -15522,6 +15521,7 @@ Transform:
   - {fileID: 8730218604327220830}
   - {fileID: 8368728273749513853}
   - {fileID: 6255546028225101534}
+  - {fileID: 7887069501642103711}
   - {fileID: 8387490347028970810}
   - {fileID: 9172091816141783860}
   - {fileID: 7787591342068329364}
@@ -16430,7 +16430,7 @@ RectTransform:
   - {fileID: 2655681794709095092}
   - {fileID: 164726633318854078}
   m_Father: {fileID: 1328592280217377389}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -16910,13 +16910,14 @@ RectTransform:
   m_Children:
   - {fileID: 2868062790699068669}
   - {fileID: 1856671696117204050}
+  - {fileID: 2278467786580614886}
   m_Father: {fileID: 1328592280217377389}
-  m_RootOrder: 1
+  m_RootOrder: 14
   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: 86.8, y: 56.8}
-  m_SizeDelta: {x: 100, y: 100}
+  m_AnchoredPosition: {x: 35, y: -12}
+  m_SizeDelta: {x: 53, y: 53}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7419170817971568005
 GameObject:
@@ -17776,7 +17777,7 @@ RectTransform:
   - {fileID: 8849154406048527291}
   - {fileID: 6423607905640078997}
   m_Father: {fileID: 1328592280217377389}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -18239,7 +18240,8 @@ MonoBehaviour:
   EvoRootCountText: {fileID: 4661699799995034945}
   EvoRootCountBackground: {fileID: 1712106131061476983}
   LevelText: {fileID: 5413509685045449317}
-  LinkedDPText: {fileID: 3015209766018844723}
+  LinkedObject: {fileID: 7307836182358109457}
+  LinkIcon: {fileID: 7403626368954187051}
   Parent: {fileID: 5460087358433802513}
   UsingSkillEffect: {fileID: 525311292421340442}
   addDigivolutionCardsEffect: {fileID: 875370635274675907}
@@ -18268,6 +18270,82 @@ MonoBehaviour:
     material: {fileID: 2100000, guid: 9ff105d4d142d7e4ba9dec182232cf74, type: 2}
   - cardColor: 6
     material: {fileID: 2100000, guid: f1c9814b55a6afc4fa66ad3742a2f528, type: 2}
+--- !u!1 &8875841833613669289
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2278467786580614886}
+  - component: {fileID: 6515241066390170788}
+  - component: {fileID: 7403626368954187051}
+  m_Layer: 7
+  m_Name: Link Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2278467786580614886
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8875841833613669289}
+  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: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7887069501642103711}
+  m_RootOrder: 2
+  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: 53, y: 53}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6515241066390170788
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8875841833613669289}
+  m_CullTransparentMesh: 1
+--- !u!114 &7403626368954187051
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8875841833613669289}
+  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: de845ea9b55857d4e9f76095ec270166, 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 &8914136566955620042
 GameObject:
   m_ObjectHideFlags: 0
@@ -18302,7 +18380,7 @@ RectTransform:
   - {fileID: 1749102974648084778}
   - {fileID: 5606136466184280358}
   m_Father: {fileID: 1328592280217377389}
-  m_RootOrder: 14
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}

+ 1 - 1
Assets/Scripts/CardEffectFactory/KeyWordEffects/Link.cs

@@ -62,7 +62,7 @@ public partial class CardEffectFactory
         IEnumerator ActivateCoroutine(Hashtable _hashtable)
         {
 
-            yield return ContinuousController.instance.StartCoroutine(card.Owner.AddMemory(card.linkCondition.cost, activateClass));
+            yield return ContinuousController.instance.StartCoroutine(card.Owner.AddMemory(-card.linkCondition.cost, activateClass));
 
             Permanent selectedPermanent = null;
 

+ 9 - 1
Assets/Scripts/CardInfo.cs

@@ -9,6 +9,7 @@ public class CardInfo : MonoBehaviour
 {
     [Header("BackGround")]
     public List<Image> BackGrounds = new List<Image>();
+    public GameObject LinkBackground;
 
     [Header("CardImage")]
     public Image CardImage;
@@ -61,7 +62,11 @@ public class CardInfo : MonoBehaviour
                     {
                         InheritedEffectText.font = InheritedEffectFont_ENG;
                         InheritedEffectText.fontSharedMaterial = InheritedEffectMaterial;
-                        InheritedEffectText.text = cardSource.InheritedEffectDiscription_ENG;
+
+                        if(!cardSource.IsLinked)
+                            InheritedEffectText.text = cardSource.InheritedEffectDiscription_ENG;
+                        else
+                            InheritedEffectText.text = cardSource.LinkEffectDiscription;
                     }
 
                     else
@@ -104,6 +109,9 @@ public class CardInfo : MonoBehaviour
                     BackGrounds[i].gameObject.SetActive(false);
                 }
             }
+
+            //Link
+            LinkBackground.SetActive(cardSource.IsLinked);
         }
 
         else

+ 14 - 0
Assets/Scripts/CardSource.cs

@@ -2323,6 +2323,16 @@ public class CardSource : MonoBehaviour
 
     #endregion
 
+    #region whether this card is linked
+    public bool IsLinked
+    {
+        get
+        {
+            return PermanentOfThisCard().LinkedCards.Contains(this);
+        }
+    }
+    #endregion
+
     #region DigiXros requirement
     public DigiXrosCondition digiXrosCondition
     {
@@ -2754,6 +2764,10 @@ public class CardSource : MonoBehaviour
     public string InheritedEffectDiscription_JPN => DataBase.ReplaceToASCII(_cEntity_Base.InheritedEffectDiscription_JPN);
     #endregion
 
+    #region Link Effects
+    public string LinkEffectDiscription => DataBase.ReplaceToASCII(_cEntity_Base.LinkEffect);
+    #endregion
+
     #region Card Sprite
     public Sprite CardSprite => _cEntity_Base.CardSprite;
     public async Task<Sprite> GetCardSprite()

+ 18 - 9
Assets/Scripts/FieldPermanentCard.cs

@@ -50,8 +50,9 @@ public class FieldPermanentCard : MonoBehaviour
     [Header("レベルテキスト")]
     public TextMeshProUGUI LevelText;
 
-    [Header("Linked Text")]
-    public Text LinkedDPText;
+    [Header("Link Elements")]
+    public GameObject LinkedObject;
+    public Image LinkIcon;
 
     [Header("表示親")]
     public GameObject Parent;
@@ -122,9 +123,9 @@ public class FieldPermanentCard : MonoBehaviour
             EvoRootCountText.transform.parent.gameObject.SetActive(false);
         }
 
-        if (LinkedDPText != null)
+        if (LinkedObject != null)
         {
-            LinkedDPText.transform.parent.gameObject.SetActive(false);
+            LinkedObject.SetActive(false);
         }
 
         if (DirectStrikeText != null)
@@ -502,6 +503,7 @@ public class FieldPermanentCard : MonoBehaviour
                 LevelText.transform.parent.gameObject.SetActive(false);
             }
 
+            //Digivolution Count
             if (EvoRootCountText != null)
             {
                 if (ThisPermanent.DigivolutionCards.Count >= 1)
@@ -521,22 +523,28 @@ public class FieldPermanentCard : MonoBehaviour
                 }
             }
 
-            if (LinkedDPText != null)
+            //Links
+            if (LinkedObject != null)
             {
                 if (ThisPermanent.LinkedCards.Count > 0)
                 {
-                    LinkedDPText.transform.parent.gameObject.SetActive(true);
+                    LinkedObject.SetActive(true);
 
-                    if (LinkedDPText.text != $"+{ThisPermanent.LinkedDP}")
-                        LinkedDPText.text = $"+{ThisPermanent.LinkedDP}";
+                    //if (LinkedDPText.text != $"+{ThisPermanent.LinkedDP}")
+                    //    LinkedDPText.text = $"+{ThisPermanent.LinkedDP}";
+
+                    if (LinkIcon.color != DataBase.CardColor_ColorLightDictionary[ThisPermanent.TopCard.CardColors[0]])
+                        LinkIcon.color = DataBase.CardColor_ColorLightDictionary[ThisPermanent.TopCard.CardColors[0]];
+                    
                 }
 
                 else
                 {
-                    LinkedDPText.transform.parent.gameObject.SetActive(false);
+                    LinkedObject.SetActive(false);
                 }
             }
 
+            //Summoning Sickness
             if (SummonSicknessObject != null)
             {
                 bool isActive = false;
@@ -559,6 +567,7 @@ public class FieldPermanentCard : MonoBehaviour
                 SummonSicknessObject.SetActive(isActive);
             }
 
+            //Blocker
             if (BlockerEffect != null)
             {
                 bool isActive = false;

+ 1 - 1
Assets/Scripts/Permanent.cs

@@ -631,7 +631,7 @@ public class Permanent
     #endregion
 
     #region Digivolution Cards
-    public List<CardSource> DigivolutionCards => cardSources.Filter(cardSource => cardSource != TopCard || LinkedCards.Contains(cardSource));
+    public List<CardSource> DigivolutionCards => cardSources.Filter(cardSource => cardSource != TopCard && !LinkedCards.Contains(cardSource));
     #endregion
 
     #region Linked Cards

+ 12 - 2
Assets/Scripts/PermanentDetail.cs

@@ -293,9 +293,19 @@ public class PermanentDetail : MonoBehaviour
             Destroy(pokemonScroll.content.GetChild(i).gameObject);
         }
 
-        List<CardSource> cardSources = permanent.cardSources.Clone();
+        //Adds Top card to stack
+        CardInfo topCardInfo = Instantiate(cardInfoPrefab, pokemonScroll.content);
+        topCardInfo.SetUpCardInfo(permanent.TopCard);
 
-        foreach (CardSource cardSource in cardSources)
+        //Adds Digivolution Cards
+        foreach (CardSource cardSource in permanent.DigivolutionCards.Clone())
+        {
+            CardInfo cardInfo = Instantiate(cardInfoPrefab, pokemonScroll.content);
+            cardInfo.SetUpCardInfo(cardSource);
+        }
+
+        //Adds Linked Cards
+        foreach (CardSource cardSource in permanent.LinkedCards.Clone())
         {
             CardInfo cardInfo = Instantiate(cardInfoPrefab, pokemonScroll.content);
             cardInfo.SetUpCardInfo(cardSource);