DESKTOP-PG06IH1\Mr.AB 7 місяців тому
батько
коміт
c19fd5f583
26 змінених файлів з 68 додано та 377 видалено
  1. 19 3
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11001.prefab
  2. 3 3
      ActionTowerDefense/Assets/Resources/Spine/Enemy_Piggy/Enemy_Piggy.atlas.txt
  3. 0 0
      ActionTowerDefense/Assets/Resources/Spine/Enemy_Piggy/Enemy_Piggy.json
  4. BIN
      ActionTowerDefense/Assets/Resources/Spine/Enemy_Piggy/Enemy_Piggy.png
  5. BIN
      ActionTowerDefense/Assets/Resources/Spine/Enemy_Piggy/Enemy_Piggy.skel.bytes
  6. 1 1
      ActionTowerDefense/Assets/Resources/Spine/Enemy_Piggy/Enemy_Piggy.skel.bytes.meta
  7. 2 2
      ActionTowerDefense/Assets/Resources/Spine/Enemy_Piggy/Enemy_Piggy_SkeletonData.asset
  8. 37 38
      ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow.atlas.txt
  9. 0 0
      ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow.json
  10. BIN
      ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow.png
  11. 0 12
      ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow.png.meta
  12. BIN
      ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow.skel.bytes
  13. 1 1
      ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow.skel.bytes.meta
  14. 0 92
      ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow_Material_Outline 1.mat
  15. 0 8
      ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow_Material_Outline 1.mat.meta
  16. 0 92
      ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow_Material_Outline.mat
  17. 0 8
      ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow_Material_Outline.mat.meta
  18. 2 2
      ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow_SkeletonData.asset
  19. 0 0
      ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword.json
  20. 0 12
      ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword.png.meta
  21. 2 0
      ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword_Material.mat
  22. 0 43
      ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword_Material_Outline 1.mat
  23. 0 8
      ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword_Material_Outline 1.mat.meta
  24. 0 43
      ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword_Material_Outline.mat
  25. 0 8
      ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword_Material_Outline.mat.meta
  26. 1 1
      ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword_SkeletonData.asset

+ 19 - 3
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11001.prefab

@@ -229,9 +229,25 @@ MonoBehaviour:
   meshRenderer: {fileID: 2459340336965010942}
   ani: {fileID: 6496896669866891404}
   totalDieKeepTime: 1
-  totalAttack_summonTime: 1.8333
-  totalAttack_marchTime: 1.8333
-  attackKeys: []
+  totalAttack_summonTime: 1.8333334
+  totalAttack_marchTime: 1.8333334
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 1.1
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 1.3333334
+  - aniName: attack_summon
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 1.1
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 1.3333334
   dieKeepTime: 0
   rb: {fileID: 2437299196472462355}
   bodyTrans: {fileID: 5075820377452290163}

+ 3 - 3
ActionTowerDefense/Assets/Resources/Spine/Enemy_Piggy/Enemy_Piggy.atlas.txt

@@ -1,7 +1,7 @@
 Enemy_Piggy.png
-size:132,108
+size:145,119
 filter:Linear,Linear
 pma:true
-scale:0.9
 piggy
-bounds:2,2,128,104
+bounds:2,2,141,115
+offsets:1,0,142,116

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
ActionTowerDefense/Assets/Resources/Spine/Enemy_Piggy/Enemy_Piggy.json


BIN
ActionTowerDefense/Assets/Resources/Spine/Enemy_Piggy/Enemy_Piggy.png


BIN
ActionTowerDefense/Assets/Resources/Spine/Enemy_Piggy/Enemy_Piggy.skel.bytes


+ 1 - 1
ActionTowerDefense/Assets/Resources/Spine/Enemy_Piggy/Enemy_Piggy.json.meta → ActionTowerDefense/Assets/Resources/Spine/Enemy_Piggy/Enemy_Piggy.skel.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c1e231927d00938488bec496451b7c34
+guid: 8d5d93201d7a3c34f9f433e80a8e8084
 TextScriptImporter:
   externalObjects: {}
   userData: 

+ 2 - 2
ActionTowerDefense/Assets/Resources/Spine/Enemy_Piggy/Enemy_Piggy_SkeletonData.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   atlasAssets:
   - {fileID: 11400000, guid: 3479f36d1362cd848bf8b7698eb59825, type: 2}
   scale: 0.01
-  skeletonJSON: {fileID: 4900000, guid: c1e231927d00938488bec496451b7c34, type: 3}
+  skeletonJSON: {fileID: 4900000, guid: 8d5d93201d7a3c34f9f433e80a8e8084, type: 3}
   isUpgradingBlendModeMaterials: 0
   blendModeMaterials:
     requiresBlendModeMaterials: 0
@@ -28,4 +28,4 @@ MonoBehaviour:
   toAnimation: []
   duration: []
   defaultMix: 0.2
-  controller: {fileID: 9100000, guid: 43cdd0519d3bd8b4a87d185264324697, type: 2}
+  controller: {fileID: 0}

+ 37 - 38
ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow.atlas.txt

@@ -1,60 +1,59 @@
 demon_arrow.png
-size:404,526
+size:983,268
 filter:Linear,Linear
 pma:true
-scale:0.9
 X
-bounds:66,179,23,20
-rotate:90
+bounds:701,58,24,20
+offsets:1,1,26,22
 arm1
-bounds:2,10,63,166
-offsets:0,1,63,167
+bounds:388,83,70,184
+offsets:0,1,70,185
+rotate:90
 arm1_blue
-bounds:67,11,63,166
-offsets:0,1,63,167
+bounds:183,12,70,184
+offsets:0,1,70,185
+rotate:90
 body
-bounds:234,2,71,112
-offsets:0,0,72,113
+bounds:369,2,79,125
+offsets:0,0,80,126
 rotate:90
 body_blue
-bounds:311,248,71,112
-offsets:0,0,72,113
+bounds:496,2,79,125
+offsets:0,0,80,126
+rotate:90
 eye1
-bounds:348,40,54,64
-offsets:3,4,60,72
+bounds:922,130,59,72
+offsets:4,4,67,80
 face2
-bounds:145,217,123,81
-rotate:90
+bounds:623,80,135,88
+offsets:1,1,137,90
 face2_blue
-bounds:228,237,123,81
-rotate:90
+bounds:760,27,135,88
+offsets:1,1,137,90
 hair
-bounds:2,178,62,346
-hand
-bounds:322,177,69,66
-offsets:1,1,71,67
+bounds:2,197,69,384
 rotate:90
+hand
+bounds:623,6,76,72
+offsets:1,1,79,74
 hand_blue
-bounds:322,106,69,66
-offsets:1,1,71,67
+bounds:897,39,76,72
+offsets:1,1,79,74
 rotate:90
 head2
-bounds:226,362,161,162
-offsets:1,1,163,163
+bounds:2,16,179,179
+offsets:1,1,181,181
 leg1
-bounds:124,342,100,182
-offsets:0,0,100,183
+bounds:183,84,111,203
+rotate:90
 leg1_blue
-bounds:132,20,100,182
-offsets:0,0,100,183
-wing
-bounds:234,75,160,86
-offsets:0,0,161,86
+bounds:388,155,111,203
 rotate:90
+wing
+bounds:593,170,178,96
+offsets:0,0,179,96
 x_bow
-bounds:66,338,186,56
-offsets:1,1,188,58
-rotate:90
+bounds:773,204,206,62
+offsets:1,1,209,64
 x_bow1
-bounds:66,204,132,77
-rotate:90
+bounds:773,117,147,85

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow.json


BIN
ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow.png


+ 0 - 12
ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow.png.meta

@@ -125,18 +125,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

BIN
ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow.skel.bytes


+ 1 - 1
ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow.json.meta → ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow.skel.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a19c2539d8175414ebc7cf6c6fdba639
+guid: 1c5c8a8ab4276dd47a7cb8b9b07eed7f
 TextScriptImporter:
   externalObjects: {}
   userData: 

+ 0 - 92
ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow_Material_Outline 1.mat

@@ -1,92 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: demon_arrow_Material_Outline 1
-  m_Shader: {fileID: 4800000, guid: 28b5cf4804845fe4b868531fd0bb81d5, type: 3}
-  m_ValidKeywords:
-  - _USE8NEIGHBOURHOOD_ON
-  m_InvalidKeywords:
-  - _ALPHAPREMULTIPLY_VERTEX_ONLY
-  - _FULLRANGE_HARD_RAMP
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap:
-    AlphaDepth: true
-    IGNOREPROJECTOR: true
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BlendTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DiffuseRamp:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 6f86a7edb105351418724e872a39d646, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - PixelSnap: 0
-    - _BlendAmount: 0
-    - _Brightness: 1
-    - _BumpScale: 1
-    - _Cull: 0
-    - _CustomRenderQueue: 0
-    - _Cutoff: 0.1
-    - _DstBlend: 10
-    - _EmissionPower: 2
-    - _FillPhase: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _Hue: 0
-    - _Metallic: 0
-    - _OutlineMipLevel: 3
-    - _OutlineOpaqueAlpha: 1
-    - _OutlineReferenceTexWidth: 1024
-    - _OutlineSmoothness: 1
-    - _OutlineWidth: 8
-    - _RenderQueue: 0
-    - _RimPower: 2
-    - _Saturation: 1
-    - _ShadowAlphaCutoff: 0.1
-    - _SrcBlend: 1
-    - _StencilComp: 8
-    - _StencilRef: 1
-    - _StraightAlphaInput: 0
-    - _ThresholdEnd: 0.1
-    - _Use8Neighbourhood: 1
-    - _ZWrite: 0
-    m_Colors:
-    - _Color: {r: 1, g: 0.37169808, b: 0.37169808, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
-    - _FillColor: {r: 1, g: 1, b: 1, a: 1}
-    - _FixedNormal: {r: 0, g: 0, b: 1, a: 1}
-    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
-    - _OverlayColor: {r: 0, g: 0, b: 0, a: 0}
-    - _RimColor: {r: 1, g: 1, b: 1, a: 1}
-  m_BuildTextureStacks: []

+ 0 - 8
ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow_Material_Outline 1.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 916bb121eaeae3b43914636f946abdcd
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 92
ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow_Material_Outline.mat

@@ -1,92 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: demon_arrow_Material_Outline
-  m_Shader: {fileID: 4800000, guid: 28b5cf4804845fe4b868531fd0bb81d5, type: 3}
-  m_ValidKeywords:
-  - _USE8NEIGHBOURHOOD_ON
-  m_InvalidKeywords:
-  - _ALPHAPREMULTIPLY_VERTEX_ONLY
-  - _FULLRANGE_HARD_RAMP
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap:
-    AlphaDepth: true
-    IGNOREPROJECTOR: true
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BlendTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DiffuseRamp:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 6f86a7edb105351418724e872a39d646, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - PixelSnap: 0
-    - _BlendAmount: 0
-    - _Brightness: 1
-    - _BumpScale: 1
-    - _Cull: 0
-    - _CustomRenderQueue: 0
-    - _Cutoff: 0.1
-    - _DstBlend: 10
-    - _EmissionPower: 2
-    - _FillPhase: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _Hue: 0
-    - _Metallic: 0
-    - _OutlineMipLevel: 3
-    - _OutlineOpaqueAlpha: 1
-    - _OutlineReferenceTexWidth: 1024
-    - _OutlineSmoothness: 1
-    - _OutlineWidth: 8
-    - _RenderQueue: 0
-    - _RimPower: 2
-    - _Saturation: 1
-    - _ShadowAlphaCutoff: 0.1
-    - _SrcBlend: 1
-    - _StencilComp: 8
-    - _StencilRef: 1
-    - _StraightAlphaInput: 0
-    - _ThresholdEnd: 0.1
-    - _Use8Neighbourhood: 1
-    - _ZWrite: 0
-    m_Colors:
-    - _Color: {r: 1, g: 0.37169808, b: 0.37169808, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
-    - _FillColor: {r: 1, g: 1, b: 1, a: 1}
-    - _FixedNormal: {r: 0, g: 0, b: 1, a: 1}
-    - _OutlineColor: {r: 0, g: 0.9904895, b: 1, a: 1}
-    - _OverlayColor: {r: 0, g: 0, b: 0, a: 0}
-    - _RimColor: {r: 1, g: 1, b: 1, a: 1}
-  m_BuildTextureStacks: []

+ 0 - 8
ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow_Material_Outline.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b634d447d9a02a14abc964532eedfc35
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 2 - 2
ActionTowerDefense/Assets/Resources/Spine/demon_arrow/demon_arrow_SkeletonData.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   atlasAssets:
   - {fileID: 11400000, guid: 2401d6742a1c99248804ce1936103114, type: 2}
   scale: 0.01
-  skeletonJSON: {fileID: 4900000, guid: a19c2539d8175414ebc7cf6c6fdba639, type: 3}
+  skeletonJSON: {fileID: 4900000, guid: 1c5c8a8ab4276dd47a7cb8b9b07eed7f, type: 3}
   isUpgradingBlendModeMaterials: 0
   blendModeMaterials:
     requiresBlendModeMaterials: 0
@@ -28,4 +28,4 @@ MonoBehaviour:
   toAnimation: []
   duration: []
   defaultMix: 0.2
-  controller: {fileID: 9100000, guid: 2951b5820f17f3f4fb10e136bb42a4c6, type: 2}
+  controller: {fileID: 0}

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword.json


+ 0 - 12
ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword.png.meta

@@ -125,18 +125,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 2 - 0
ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword_Material.mat

@@ -28,6 +28,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -38,6 +39,7 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []

+ 0 - 43
ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword_Material_Outline 1.mat

@@ -1,43 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: demon_sword_Material_Outline 1
-  m_Shader: {fileID: 4800000, guid: 28b5cf4804845fe4b868531fd0bb81d5, type: 3}
-  m_ValidKeywords:
-  - _USE8NEIGHBOURHOOD_ON
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 94f9dc1dfd3e88945bfe4722926c933d, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _Cutoff: 0.1
-    - _OutlineMipLevel: 0
-    - _OutlineOpaqueAlpha: 1
-    - _OutlineReferenceTexWidth: 1024
-    - _OutlineSmoothness: 1
-    - _OutlineWidth: 8
-    - _StencilComp: 8
-    - _StencilRef: 1
-    - _StraightAlphaInput: 0
-    - _ThresholdEnd: 0.1
-    - _Use8Neighbourhood: 1
-    m_Colors:
-    - _OutlineColor: {r: 1, g: 1, b: 0, a: 0.003921569}
-  m_BuildTextureStacks: []

+ 0 - 8
ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword_Material_Outline 1.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 79dada70fee9fbc49a327168481d3def
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 43
ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword_Material_Outline.mat

@@ -1,43 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: demon_sword_Material_Outline
-  m_Shader: {fileID: 4800000, guid: 28b5cf4804845fe4b868531fd0bb81d5, type: 3}
-  m_ValidKeywords:
-  - _USE8NEIGHBOURHOOD_ON
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 94f9dc1dfd3e88945bfe4722926c933d, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _Cutoff: 0.1
-    - _OutlineMipLevel: 0
-    - _OutlineOpaqueAlpha: 1
-    - _OutlineReferenceTexWidth: 1024
-    - _OutlineSmoothness: 1
-    - _OutlineWidth: 8
-    - _StencilComp: 8
-    - _StencilRef: 1
-    - _StraightAlphaInput: 0
-    - _ThresholdEnd: 0.1
-    - _Use8Neighbourhood: 1
-    m_Colors:
-    - _OutlineColor: {r: 0, g: 0.99215686, b: 1, a: 0.003921569}
-  m_BuildTextureStacks: []

+ 0 - 8
ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword_Material_Outline.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7d50f910288e95b4285a5fb549c94fe6
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 1
ActionTowerDefense/Assets/Resources/Spine/demon_sword/demon_sword_SkeletonData.asset

@@ -28,4 +28,4 @@ MonoBehaviour:
   toAnimation: []
   duration: []
   defaultMix: 0.2
-  controller: {fileID: 9100000, guid: 31802b995138f5d4199103649c865f53, type: 2}
+  controller: {fileID: 0}

Деякі файли не було показано, через те що забагато файлів було змінено