Skip to content

Commit f867999

Browse files
author
pengqihe
committed
fix
1 parent c12c036 commit f867999

File tree

139 files changed

+4699
-772
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+4699
-772
lines changed

‎Assets/Addons/Spine Examples/Spine Skeletons/Dragon/dragon_Atlas.asset‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
--- !u!114 &11400000
44
MonoBehaviour:
55
m_ObjectHideFlags: 0
6-
m_PrefabParentObject: {fileID: 0}
7-
m_PrefabInternal: {fileID: 0}
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
89
m_GameObject: {fileID: 0}
910
m_Enabled: 1
1011
m_EditorHideFlags: 0

‎Assets/Addons/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: dragon_dragon
1011
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
1112
m_ShaderKeywords:
@@ -35,3 +36,4 @@ Material:
3536
- _Use8Neighbourhood: 1
3637
m_Colors:
3738
- _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
39+
m_BuildTextureStacks: []

‎Assets/Addons/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: dragon_dragon2
1011
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
1112
m_ShaderKeywords:
@@ -35,3 +36,4 @@ Material:
3536
- _Use8Neighbourhood: 1
3637
m_Colors:
3738
- _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
39+
m_BuildTextureStacks: []

‎Assets/Addons/Spine Examples/Spine Skeletons/Eyes/eyes_Atlas.asset‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
--- !u!114 &11400000
44
MonoBehaviour:
55
m_ObjectHideFlags: 0
6-
m_PrefabParentObject: {fileID: 0}
7-
m_PrefabInternal: {fileID: 0}
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
89
m_GameObject: {fileID: 0}
910
m_Enabled: 1
1011
m_EditorHideFlags: 0

‎Assets/Addons/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: eyes_Material
1011
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
1112
m_ShaderKeywords:
@@ -35,3 +36,4 @@ Material:
3536
- _Use8Neighbourhood: 1
3637
m_Colors:
3738
- _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
39+
m_BuildTextureStacks: []

‎Assets/Addons/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Atlas.asset‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
--- !u!114 &11400000
44
MonoBehaviour:
55
m_ObjectHideFlags: 0
6-
m_PrefabParentObject: {fileID: 0}
7-
m_PrefabInternal: {fileID: 0}
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
89
m_GameObject: {fileID: 0}
910
m_Enabled: 1
1011
m_EditorHideFlags: 0

‎Assets/Addons/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Material.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: Equipment_Material
1011
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
1112
m_ShaderKeywords:
@@ -35,3 +36,4 @@ Material:
3536
- _Use8Neighbourhood: 1
3637
m_Colors:
3738
- _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
39+
m_BuildTextureStacks: []

‎Assets/Addons/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Atlas.asset‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
--- !u!114 &11400000
44
MonoBehaviour:
55
m_ObjectHideFlags: 0
6-
m_PrefabParentObject: {fileID: 0}
7-
m_PrefabInternal: {fileID: 0}
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
89
m_GameObject: {fileID: 0}
910
m_Enabled: 1
1011
m_EditorHideFlags: 0

‎Assets/Addons/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Material.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: FS_White_Material
1011
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
1112
m_ShaderKeywords:
@@ -35,3 +36,4 @@ Material:
3536
- _Use8Neighbourhood: 1
3637
m_Colors:
3738
- _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
39+
m_BuildTextureStacks: []

‎Assets/Addons/Spine Examples/Spine Skeletons/Gauge/Gauge_Atlas.asset‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
--- !u!114 &11400000
44
MonoBehaviour:
55
m_ObjectHideFlags: 0
6-
m_PrefabParentObject: {fileID: 0}
7-
m_PrefabInternal: {fileID: 0}
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
89
m_GameObject: {fileID: 0}
910
m_Enabled: 1
1011
m_EditorHideFlags: 0

0 commit comments

Comments
 (0)