diff --git a/Assets/Resources/Games/clapTrap.prefab b/Assets/Resources/Games/clapTrap.prefab
index 8aacd2850..39ae8594f 100644
--- a/Assets/Resources/Games/clapTrap.prefab
+++ b/Assets/Resources/Games/clapTrap.prefab
@@ -81,7 +81,7 @@ SpriteRenderer:
m_Size: {x: 5.12, y: 5.12}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
+ m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &475607334542829873
@@ -114,8 +114,8 @@ Transform:
m_Children:
- {fileID: 6926759786062634162}
- {fileID: 6600922460911476347}
- - {fileID: 933194770163378234}
- {fileID: 8934034063788318527}
+ - {fileID: 933194770163378234}
m_Father: {fileID: 3661019275362709209}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -527,7 +527,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 0
+ m_SortingOrder: 5
m_Sprite: {fileID: -1525234973, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 1
@@ -550,7 +550,7 @@ GameObject:
- component: {fileID: 7751816704040611806}
- component: {fileID: 8803862954908386457}
m_Layer: 0
- m_Name: Background
+ m_Name: background
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -695,7 +695,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 6
+ m_SortingOrder: 12
m_Sprite: {fileID: -647882545, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -796,6 +796,7 @@ Transform:
- {fileID: 7751816704040611806}
- {fileID: 8716013488938394720}
- {fileID: 1536850935928157263}
+ - {fileID: 662059093651451178}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -821,6 +822,8 @@ MonoBehaviour:
stageRight: {fileID: 664923069293376002}
stageLeftRim: {fileID: 1183482181662273760}
stageRightRim: {fileID: 5448651794995354504}
+ spotlight: {fileID: 5647144016595332616}
+ spotlightMaterial: {fileID: 2100000, guid: f9b0a46270a30b749a1a102c764ff085, type: 2}
dollHead: {fileID: 5832940965353651887}
dollArms: {fileID: 2697103955869777452}
clapEffect: {fileID: 6051233720251957680}
@@ -896,7 +899,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 7
+ m_SortingOrder: 13
m_Sprite: {fileID: 1915325462, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_Color: {r: 0.9254902, g: 0.45490196, b: 0.05882353, a: 1}
m_FlipX: 1
@@ -980,8 +983,8 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 5
- m_Sprite: {fileID: -170304696, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
+ m_SortingOrder: 11
+ m_Sprite: {fileID: -734828188, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -1064,7 +1067,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 4
+ m_SortingOrder: 5
m_Sprite: {fileID: -1525234973, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1241,7 +1244,7 @@ SpriteRenderer:
m_Size: {x: 5.12, y: 5.12}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
+ m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &4804509745995456702
@@ -1349,7 +1352,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 4
+ m_SortingOrder: 10
m_Sprite: {fileID: 541726047, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1434,7 +1437,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 5
+ m_SortingOrder: 11
m_Sprite: {fileID: 2103109726, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_Color: {r: 0.0627451, g: 0.70980394, b: 0.90588236, a: 1}
m_FlipX: 0
@@ -1530,6 +1533,90 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &5647144016595332616
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 662059093651451178}
+ - component: {fileID: 5976414936812407424}
+ m_Layer: 0
+ m_Name: spotlight
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &662059093651451178
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5647144016595332616}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.01, y: 0.015, z: 0}
+ m_LocalScale: {x: 0.585, y: 0.585, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 3661019275362709209}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &5976414936812407424
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5647144016595332616}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 0
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: f9b0a46270a30b749a1a102c764ff085, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 0
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_Sprite: {fileID: 403009113, guid: 4ea0a1fb00846164aa3cb498bf8796b6, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 20.77, y: 21.77}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
--- !u!1 &6449529247030199511
GameObject:
m_ObjectHideFlags: 0
@@ -1602,7 +1689,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 6
+ m_SortingOrder: 12
m_Sprite: {fileID: 1155685882, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_Color: {r: 0.0627451, g: 0.70980394, b: 0.90588236, a: 1}
m_FlipX: 0
@@ -1645,7 +1732,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8716013488938394720}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -2}
--- !u!212 &2091304079968540627
SpriteRenderer:
@@ -1687,7 +1774,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 5
+ m_SortingOrder: 12
m_Sprite: {fileID: 1017522249, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_Color: {r: 1, g: 0, b: 0, a: 0}
m_FlipX: 0
@@ -1801,7 +1888,7 @@ SpriteRenderer:
m_Size: {x: 5.12, y: 5.12}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
+ m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &7106723294641942391
@@ -1878,7 +1965,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 3
+ m_SortingOrder: 9
m_Sprite: {fileID: -1527351341, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1922,7 +2009,7 @@ Transform:
- {fileID: 2455172150424334044}
- {fileID: 2519528767877045721}
m_Father: {fileID: 8716013488938394720}
- m_RootOrder: 3
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &2697103955869777452
Animator:
@@ -2101,7 +2188,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 8
+ m_SortingOrder: 12
m_Sprite: {fileID: -649951996, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -2186,7 +2273,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 8
+ m_SortingOrder: 14
m_Sprite: {fileID: -536314201, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_Color: {r: 0.9254902, g: 0.45490196, b: 0.05882353, a: 1}
m_FlipX: 0
@@ -2272,7 +2359,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 7
+ m_SortingOrder: 12
m_Sprite: {fileID: 231996571, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -2356,7 +2443,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 7
+ m_SortingOrder: 12
m_Sprite: {fileID: -649951996, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -2442,7 +2529,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 6
+ m_SortingOrder: 12
m_Sprite: {fileID: -1710095545, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/Animations/ArmsHit.anim b/Assets/Resources/Sprites/Games/ClapTrap/Animations/ArmsHit.anim
index c108476ec..1ceaae6eb 100644
--- a/Assets/Resources/Sprites/Games/ClapTrap/Animations/ArmsHit.anim
+++ b/Assets/Resources/Sprites/Games/ClapTrap/Animations/ArmsHit.anim
@@ -1463,16 +1463,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 4
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 0.8
- value: 4
+ value: 10
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -1481,7 +1472,7 @@ AnimationClip:
outWeight: 0
- serializedVersion: 3
time: 0.93333334
- value: 6
+ value: 11
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -1490,7 +1481,7 @@ AnimationClip:
outWeight: 0
- serializedVersion: 3
time: 1.1666666
- value: 6
+ value: 11
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -5875,16 +5866,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 4
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 0.8
- value: 4
+ value: 10
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -5893,7 +5875,7 @@ AnimationClip:
outWeight: 0
- serializedVersion: 3
time: 0.93333334
- value: 6
+ value: 11
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -5902,7 +5884,7 @@ AnimationClip:
outWeight: 0
- serializedVersion: 3
time: 1.1666666
- value: 6
+ value: 11
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/Animations/ArmsMiss.anim b/Assets/Resources/Sprites/Games/ClapTrap/Animations/ArmsMiss.anim
index 4d5e2e05e..9b97bfc03 100644
--- a/Assets/Resources/Sprites/Games/ClapTrap/Animations/ArmsMiss.anim
+++ b/Assets/Resources/Sprites/Games/ClapTrap/Animations/ArmsMiss.anim
@@ -1156,7 +1156,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 4
+ value: 10
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -1165,7 +1165,16 @@ AnimationClip:
outWeight: 0
- serializedVersion: 3
time: 0.56666666
- value: 6
+ value: 11
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.73333335
+ value: 11
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -4780,7 +4789,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 4
+ value: 10
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -4789,7 +4798,16 @@ AnimationClip:
outWeight: 0
- serializedVersion: 3
time: 0.56666666
- value: 6
+ value: 11
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.73333335
+ value: 11
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/Animations/ArmsWhiff.anim b/Assets/Resources/Sprites/Games/ClapTrap/Animations/ArmsWhiff.anim
index da28f0a35..fc9edddd3 100644
--- a/Assets/Resources/Sprites/Games/ClapTrap/Animations/ArmsWhiff.anim
+++ b/Assets/Resources/Sprites/Games/ClapTrap/Animations/ArmsWhiff.anim
@@ -1426,16 +1426,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 4
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 0.46666667
- value: 4
+ value: 10
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -1444,7 +1435,7 @@ AnimationClip:
outWeight: 0
- serializedVersion: 3
time: 0.6
- value: 6
+ value: 11
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -1453,7 +1444,7 @@ AnimationClip:
outWeight: 0
- serializedVersion: 3
time: 0.8333333
- value: 6
+ value: 11
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -5838,16 +5829,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 4
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 0.46666667
- value: 4
+ value: 10
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -5856,7 +5838,7 @@ AnimationClip:
outWeight: 0
- serializedVersion: 3
time: 0.6
- value: 6
+ value: 11
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -5865,7 +5847,7 @@ AnimationClip:
outWeight: 0
- serializedVersion: 3
time: 0.8333333
- value: 6
+ value: 11
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/Animations/HeadBreatheIn.anim b/Assets/Resources/Sprites/Games/ClapTrap/Animations/HeadBreatheIn.anim
index 468c0edea..1f31b4433 100644
--- a/Assets/Resources/Sprites/Games/ClapTrap/Animations/HeadBreatheIn.anim
+++ b/Assets/Resources/Sprites/Games/ClapTrap/Animations/HeadBreatheIn.anim
@@ -159,6 +159,13 @@ AnimationClip:
path: face
classID: 212
script: {fileID: 0}
+ - curve:
+ - time: 0
+ value: {fileID: -170304696, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
+ attribute: m_Sprite
+ path: head
+ classID: 212
+ script: {fileID: 0}
m_SampleRate: 15
m_WrapMode: 0
m_Bounds:
@@ -208,9 +215,17 @@ AnimationClip:
typeID: 212
customType: 23
isPPtrCurve: 1
+ - serializedVersion: 2
+ path: 2817783452
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 292540715, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
- {fileID: -1180233517, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
+ - {fileID: -170304696, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/Animations/HeadBreatheOut.anim b/Assets/Resources/Sprites/Games/ClapTrap/Animations/HeadBreatheOut.anim
index b6d27113b..7eb2ff6fd 100644
--- a/Assets/Resources/Sprites/Games/ClapTrap/Animations/HeadBreatheOut.anim
+++ b/Assets/Resources/Sprites/Games/ClapTrap/Animations/HeadBreatheOut.anim
@@ -250,6 +250,13 @@ AnimationClip:
path: mouth/air
classID: 212
script: {fileID: 0}
+ - curve:
+ - time: 0
+ value: {fileID: -170304696, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
+ attribute: m_Sprite
+ path: head
+ classID: 212
+ script: {fileID: 0}
m_SampleRate: 10
m_WrapMode: 0
m_Bounds:
@@ -306,6 +313,13 @@ AnimationClip:
typeID: 212
customType: 23
isPPtrCurve: 1
+ - serializedVersion: 2
+ path: 2817783452
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -541023496, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
- {fileID: -541023496, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
@@ -319,6 +333,7 @@ AnimationClip:
- {fileID: 1168501635, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
- {fileID: 1168501635, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
- {fileID: 1168501635, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
+ - {fileID: -170304696, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/ClapTrapTrapperLit.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/ClapTrapTrapperLit.png.meta
index c20d50015..1b7ba6e2d 100644
--- a/Assets/Resources/Sprites/Games/ClapTrap/ClapTrapTrapperLit.png.meta
+++ b/Assets/Resources/Sprites/Games/ClapTrap/ClapTrapTrapperLit.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 00ae8b84f8483824ebfee7f2cb63f803
+guid: 4ea0a1fb00846164aa3cb498bf8796b6
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -42,7 +42,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 1
+ spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -103,7 +103,427 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
- sprites: []
+ sprites:
+ - serializedVersion: 2
+ name: ClapTrapTrapper_0
+ rect:
+ serializedVersion: 2
+ x: 91
+ y: 3104
+ width: 326
+ height: 927
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: a19cf983e3d2a9c4b8ffdbe84529eea5
+ internalID: 541726047
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_1
+ rect:
+ serializedVersion: 2
+ x: 580
+ y: 3379
+ width: 200
+ height: 650
+ alignment: 9
+ pivot: {x: 0.69, y: 0.09}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 02fdd3a900ddb7d4cacffe542e9e166f
+ internalID: 466030590
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_2
+ rect:
+ serializedVersion: 2
+ x: 945
+ y: 3379
+ width: 200
+ height: 650
+ alignment: 9
+ pivot: {x: 0.55, y: 0.095}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 088cc9e84a50eae4db61ebb28fee97c1
+ internalID: -424248275
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_3
+ rect:
+ serializedVersion: 2
+ x: 1270
+ y: 3438
+ width: 500
+ height: 550
+ alignment: 9
+ pivot: {x: 0.79, y: 0.87}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: b7a6f3867c2e98f4db240ddc23aa8ebb
+ internalID: -1527351341
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_4
+ rect:
+ serializedVersion: 2
+ x: 1830
+ y: 3438
+ width: 500
+ height: 550
+ alignment: 9
+ pivot: {x: 0.145, y: 0.84}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 9d3156ed7f5d36f44bf82ffe1275187c
+ internalID: -1710095545
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_5
+ rect:
+ serializedVersion: 2
+ x: 326
+ y: 1717
+ width: 118
+ height: 206
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: d355b0fc68a49164194074b74c2fa8d6
+ internalID: 2103109726
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_6
+ rect:
+ serializedVersion: 2
+ x: 1137
+ y: 1797
+ width: 116
+ height: 206
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 9744f0c58715ef54a86f85394b4c0ebb
+ internalID: -648358493
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_7
+ rect:
+ serializedVersion: 2
+ x: 671
+ y: 1823
+ width: 106
+ height: 76
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: fbcd1a71a01038347ac4268cc4ac7cb4
+ internalID: 1963722646
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_8
+ rect:
+ serializedVersion: 2
+ x: 1562
+ y: 1807
+ width: 108
+ height: 78
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: e7101af5b9077d44f8fcec13abe3f012
+ internalID: 1739044964
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_10
+ rect:
+ serializedVersion: 2
+ x: 319
+ y: 1417
+ width: 120
+ height: 216
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 602beca402a7e6d4ea1b003e399fa2f5
+ internalID: -73386677
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_11
+ rect:
+ serializedVersion: 2
+ x: 1146
+ y: 1409
+ width: 118
+ height: 216
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 3033b3477d3df4043b06098b00bc74c9
+ internalID: -536314201
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_16
+ rect:
+ serializedVersion: 2
+ x: 654
+ y: 1461
+ width: 120
+ height: 70
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 4e219a418564cb14a9e840db4fff21d5
+ internalID: 1155685882
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_17
+ rect:
+ serializedVersion: 2
+ x: 1524
+ y: 1454
+ width: 120
+ height: 70
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: b2576eeabd0e3ef4f9fdc7219a3ebd5d
+ internalID: 1915325462
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_23
+ rect:
+ serializedVersion: 2
+ x: 580
+ y: 2948
+ width: 570
+ height: 350
+ alignment: 9
+ pivot: {x: 0.89, y: 0.215}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 3df445b381edb3e439a2dabeb97395ed
+ internalID: -966923221
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_24
+ rect:
+ serializedVersion: 2
+ x: 1280
+ y: 2948
+ width: 570
+ height: 350
+ alignment: 9
+ pivot: {x: 0.115, y: 0.215}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 390f4cf6557db6e44913cd9b92525089
+ internalID: 351434495
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_25
+ rect:
+ serializedVersion: 2
+ x: 1965
+ y: 2947
+ width: 292
+ height: 346
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 79db9ff9fce4c3349bae4eb8dac8f572
+ internalID: -734828188
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_26
+ rect:
+ serializedVersion: 2
+ x: 2349
+ y: 2947
+ width: 292
+ height: 346
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: d51c4cafcfdd87641a17be144f2ff95a
+ internalID: 1909556052
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_74
+ rect:
+ serializedVersion: 2
+ x: 973
+ y: 2275
+ width: 292
+ height: 346
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 1717e535d4c5e644288c90dc2c5407d7
+ internalID: -170304696
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapper_75
+ rect:
+ serializedVersion: 2
+ x: 1357
+ y: 2275
+ width: 290
+ height: 346
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: fc5d7d0b05ef8d548910c591f082efc0
+ internalID: -502560276
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: ClapTrapTrapperLit_0
+ rect:
+ serializedVersion: 2
+ x: 2019
+ y: 0
+ width: 2077
+ height: 2177
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 78f449d0e9da2ac438068f4fc4e758b0
+ internalID: 403009113
+ vertices: []
+ indices:
+ edges: []
+ weights: []
outline: []
physicsShape: []
bones: []
@@ -114,7 +534,112 @@ TextureImporter:
edges: []
weights: []
secondaryTextures: []
- nameFileIdTable: {}
+ nameFileIdTable:
+ ClapTrapTrapperLit_0: 403009113
+ ClapTrapTrapper_0: 541726047
+ ClapTrapTrapper_1: 466030590
+ ClapTrapTrapper_10: -73386677
+ ClapTrapTrapper_100: 1309379946
+ ClapTrapTrapper_101: 1225767785
+ ClapTrapTrapper_102: -679215742
+ ClapTrapTrapper_103: -1395100783
+ ClapTrapTrapper_11: -536314201
+ ClapTrapTrapper_12: -649951996
+ ClapTrapTrapper_13: -1214988655
+ ClapTrapTrapper_14: 1896064163
+ ClapTrapTrapper_15: -1571854476
+ ClapTrapTrapper_16: 1155685882
+ ClapTrapTrapper_17: 1915325462
+ ClapTrapTrapper_18: 231996571
+ ClapTrapTrapper_19: -1169963102
+ ClapTrapTrapper_2: -424248275
+ ClapTrapTrapper_20: -794266268
+ ClapTrapTrapper_21: 1102692816
+ ClapTrapTrapper_22: 466009175
+ ClapTrapTrapper_23: -966923221
+ ClapTrapTrapper_24: 351434495
+ ClapTrapTrapper_25: -734828188
+ ClapTrapTrapper_26: 1909556052
+ ClapTrapTrapper_27: -2042506200
+ ClapTrapTrapper_28: -1038260829
+ ClapTrapTrapper_29: 1476349550
+ ClapTrapTrapper_3: -1527351341
+ ClapTrapTrapper_30: -647882545
+ ClapTrapTrapper_31: -1934826576
+ ClapTrapTrapper_32: 504510680
+ ClapTrapTrapper_33: 1115435795
+ ClapTrapTrapper_34: -1847155627
+ ClapTrapTrapper_35: -1584212959
+ ClapTrapTrapper_36: 1869419347
+ ClapTrapTrapper_37: 1579706440
+ ClapTrapTrapper_38: 1675061591
+ ClapTrapTrapper_39: -1367144162
+ ClapTrapTrapper_4: -1710095545
+ ClapTrapTrapper_40: 148390833
+ ClapTrapTrapper_41: -204917516
+ ClapTrapTrapper_42: 956686504
+ ClapTrapTrapper_43: -614697003
+ ClapTrapTrapper_44: 25356025
+ ClapTrapTrapper_45: 1017522249
+ ClapTrapTrapper_46: 1527099510
+ ClapTrapTrapper_47: -1700129528
+ ClapTrapTrapper_48: -169484038
+ ClapTrapTrapper_49: -1801879101
+ ClapTrapTrapper_5: 2103109726
+ ClapTrapTrapper_50: 2116023073
+ ClapTrapTrapper_51: -1207431484
+ ClapTrapTrapper_52: 260761128
+ ClapTrapTrapper_53: 1539357983
+ ClapTrapTrapper_54: -49050051
+ ClapTrapTrapper_55: -666006217
+ ClapTrapTrapper_56: -1129542529
+ ClapTrapTrapper_57: -779357835
+ ClapTrapTrapper_58: 932763686
+ ClapTrapTrapper_59: 1157197629
+ ClapTrapTrapper_6: -648358493
+ ClapTrapTrapper_60: 1825193183
+ ClapTrapTrapper_61: -547587902
+ ClapTrapTrapper_62: -47579733
+ ClapTrapTrapper_63: -1112309881
+ ClapTrapTrapper_64: 1928679568
+ ClapTrapTrapper_65: -1180233517
+ ClapTrapTrapper_66: 1335097301
+ ClapTrapTrapper_67: -766881271
+ ClapTrapTrapper_68: -541023496
+ ClapTrapTrapper_69: 1553659262
+ ClapTrapTrapper_7: 1963722646
+ ClapTrapTrapper_70: -1420058675
+ ClapTrapTrapper_71: 1456940296
+ ClapTrapTrapper_72: -1117334768
+ ClapTrapTrapper_73: 511680797
+ ClapTrapTrapper_74: -170304696
+ ClapTrapTrapper_75: -502560276
+ ClapTrapTrapper_76: 1700197630
+ ClapTrapTrapper_77: -161388819
+ ClapTrapTrapper_78: -1136175470
+ ClapTrapTrapper_79: 135816032
+ ClapTrapTrapper_8: 1739044964
+ ClapTrapTrapper_80: 1168501635
+ ClapTrapTrapper_81: -619974239
+ ClapTrapTrapper_82: 278416857
+ ClapTrapTrapper_83: 170312224
+ ClapTrapTrapper_84: -2110256531
+ ClapTrapTrapper_85: -704411871
+ ClapTrapTrapper_86: -774339130
+ ClapTrapTrapper_87: 690477880
+ ClapTrapTrapper_88: -434088846
+ ClapTrapTrapper_89: 292540715
+ ClapTrapTrapper_9: -1525234973
+ ClapTrapTrapper_90: 971711575
+ ClapTrapTrapper_91: -490599621
+ ClapTrapTrapper_92: 1358027567
+ ClapTrapTrapper_93: 87175395
+ ClapTrapTrapper_94: 471986813
+ ClapTrapTrapper_95: 1123854499
+ ClapTrapTrapper_96: -1504696900
+ ClapTrapTrapper_97: -910882786
+ ClapTrapTrapper_98: -1801267346
+ ClapTrapTrapper_99: -296844743
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/SpotlightMaterial.mat b/Assets/Resources/Sprites/Games/ClapTrap/SpotlightMaterial.mat
new file mode 100644
index 000000000..6f12c67c7
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/ClapTrap/SpotlightMaterial.mat
@@ -0,0 +1,91 @@
+%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: SpotlightMaterial
+ m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3}
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ 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: 0}
+ 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}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _BumpScale: 1
+ - _ColorMask: 15
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ - _UVSec: 0
+ - _UseUIAlphaClip: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _AddColor: {r: 0, g: 0, b: 0, a: 0}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _ColorAlpha: {r: 1, g: 1, b: 1, a: 1}
+ - _ColorBravo: {r: 1, g: 1, b: 1, a: 1}
+ - _ColorDelta: {r: 1, g: 0.88235295, b: 0.09411765, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/SpotlightMaterial.mat.meta b/Assets/Resources/Sprites/Games/ClapTrap/SpotlightMaterial.mat.meta
new file mode 100644
index 000000000..4f51195d9
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/ClapTrap/SpotlightMaterial.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f9b0a46270a30b749a1a102c764ff085
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/body_miss.004.png b/Assets/Resources/Sprites/Games/ClapTrap/body_miss.004.png
deleted file mode 100644
index fc7cf544a..000000000
Binary files a/Assets/Resources/Sprites/Games/ClapTrap/body_miss.004.png and /dev/null differ
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/body_miss.004.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/body_miss.004.png.meta
deleted file mode 100644
index f718a0411..000000000
--- a/Assets/Resources/Sprites/Games/ClapTrap/body_miss.004.png.meta
+++ /dev/null
@@ -1,123 +0,0 @@
-fileFormatVersion: 2
-guid: 5461a585c5c3ec94eb62f27cad018276
-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: 1
- 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: 2048
- 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: 2048
- 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: 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: []
- outline: []
- physicsShape: []
- bones: []
- spriteID: 5e97eb03825dee720800000000000000
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- nameFileIdTable: {}
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/body_miss.005.png b/Assets/Resources/Sprites/Games/ClapTrap/body_miss.005.png
deleted file mode 100644
index 12835391f..000000000
Binary files a/Assets/Resources/Sprites/Games/ClapTrap/body_miss.005.png and /dev/null differ
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/body_miss.005.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/body_miss.005.png.meta
deleted file mode 100644
index 2fb95ad2e..000000000
--- a/Assets/Resources/Sprites/Games/ClapTrap/body_miss.005.png.meta
+++ /dev/null
@@ -1,123 +0,0 @@
-fileFormatVersion: 2
-guid: 70fab50f65d4dba46ac99115bf9eec2b
-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: 1
- 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: 2048
- 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: 2048
- 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: 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: []
- outline: []
- physicsShape: []
- bones: []
- spriteID: 5e97eb03825dee720800000000000000
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- nameFileIdTable: {}
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references.meta b/Assets/Resources/Sprites/Games/ClapTrap/references.meta
new file mode 100644
index 000000000..be154c785
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/ClapTrap/references.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 74b923cfa3d42e848990e0791a8ab086
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/face_just.000.000.png b/Assets/Resources/Sprites/Games/ClapTrap/references/face_just.000.000.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/face_just.000.000.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/face_just.000.000.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/face_just.000.000.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/face_just.000.000.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/face_just.000.000.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/face_just.000.000.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/face_miss.000.png b/Assets/Resources/Sprites/Games/ClapTrap/references/face_miss.000.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/face_miss.000.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/face_miss.000.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/face_miss.000.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/face_miss.000.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/face_miss.000.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/face_miss.000.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/face_miss.001.png b/Assets/Resources/Sprites/Games/ClapTrap/references/face_miss.001.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/face_miss.001.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/face_miss.001.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/face_miss.001.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/face_miss.001.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/face_miss.001.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/face_miss.001.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/face_miss.002.png b/Assets/Resources/Sprites/Games/ClapTrap/references/face_miss.002.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/face_miss.002.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/face_miss.002.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/face_miss.002.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/face_miss.002.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/face_miss.002.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/face_miss.002.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/face_talk.000.02.png b/Assets/Resources/Sprites/Games/ClapTrap/references/face_talk.000.02.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/face_talk.000.02.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/face_talk.000.02.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/face_talk.000.02.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/face_talk.000.02.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/face_talk.000.02.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/face_talk.000.02.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/face_talk.001.05.png b/Assets/Resources/Sprites/Games/ClapTrap/references/face_talk.001.05.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/face_talk.001.05.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/face_talk.001.05.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/face_talk.001.05.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/face_talk.001.05.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/face_talk.001.05.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/face_talk.001.05.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/face_talk.002.13.png b/Assets/Resources/Sprites/Games/ClapTrap/references/face_talk.002.13.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/face_talk.002.13.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/face_talk.002.13.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/face_talk.002.13.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/face_talk.002.13.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/face_talk.002.13.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/face_talk.002.13.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_l_block.000.png b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_block.000.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_l_block.000.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_block.000.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_l_block.000.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_block.000.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_l_block.000.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_block.000.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_l_block.002.png b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_block.002.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_l_block.002.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_block.002.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_l_block.002.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_block.002.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_l_block.002.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_block.002.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_l_block.008.png b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_block.008.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_l_block.008.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_block.008.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_l_block.008.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_block.008.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_l_block.008.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_block.008.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_l_block.009.png b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_block.009.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_l_block.009.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_block.009.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_l_block.009.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_block.009.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_l_block.009.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_block.009.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_l_break.000.png b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_break.000.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_l_break.000.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_break.000.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_l_break.000.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_break.000.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_l_break.000.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_break.000.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_l_break.001.png b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_break.001.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_l_break.001.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_break.001.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_l_break.001.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_break.001.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_l_break.001.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_l_break.001.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_r_block.000.png b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_block.000.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_r_block.000.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_block.000.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_r_block.000.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_block.000.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_r_block.000.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_block.000.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_r_block.002.png b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_block.002.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_r_block.002.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_block.002.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_r_block.002.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_block.002.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_r_block.002.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_block.002.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_r_block.008.png b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_block.008.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_r_block.008.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_block.008.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_r_block.008.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_block.008.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_r_block.008.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_block.008.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_r_block.009.png b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_block.009.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_r_block.009.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_block.009.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_r_block.009.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_block.009.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_r_block.009.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_block.009.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_r_break.0.png b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_break.0.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_r_break.0.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_break.0.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_r_break.0.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_break.0.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_r_break.0.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_break.0.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_r_break.000.png b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_break.000.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_r_break.000.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_break.000.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_r_break.000.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_break.000.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_r_break.000.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_break.000.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_r_break.001.png b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_break.001.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_r_break.001.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_break.001.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/hand_r_break.001.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_break.001.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/hand_r_break.001.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/hand_r_break.001.png.meta
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/refclaptrap.png b/Assets/Resources/Sprites/Games/ClapTrap/references/refclaptrap.png
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/refclaptrap.png
rename to Assets/Resources/Sprites/Games/ClapTrap/references/refclaptrap.png
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/refclaptrap.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/refclaptrap.png.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/ClapTrap/refclaptrap.png.meta
rename to Assets/Resources/Sprites/Games/ClapTrap/references/refclaptrap.png.meta
diff --git a/Assets/Scripts/Games/ClapTrap/ClapTrap.cs b/Assets/Scripts/Games/ClapTrap/ClapTrap.cs
index 86f3ad5a1..5040b72b8 100644
--- a/Assets/Scripts/Games/ClapTrap/ClapTrap.cs
+++ b/Assets/Scripts/Games/ClapTrap/ClapTrap.cs
@@ -14,40 +14,51 @@ namespace HeavenStudio.Games.Loaders
{
new GameAction("clap", "Clap")
{
- function = delegate {var e = eventCaller.currentEntity; ClapTrap.instance.Clap(eventCaller.currentEntity.beat, eventCaller.currentEntity.length, eventCaller.currentEntity["slapper"]);},
+ function = delegate {var e = eventCaller.currentEntity; ClapTrap.instance.Clap(eventCaller.currentEntity.beat, eventCaller.currentEntity.length, eventCaller.currentEntity["object"]);},
defaultLength = 1f,
resizable = true,
parameters = new List()
{
new Param("object", ClapTrap.ClapType.Hand, "Object", "The object attempting to hit the doll"),
//new Param("sighBeat", new EntityTypes.Float(2, 100), "Sigh Beat", "The slapper attempting to hit the doll"),
- new Param("spotlight", true, "Spotlight", "Whether or not there's a spotlight for the cue"),
+ // new Param("spotlight", true, "Spotlight", "Whether or not there's a spotlight for the cue"),
}
},
new GameAction("change background color", "Change Background Color")
{
- function = delegate { var e = eventCaller.currentEntity; ClapTrap.instance.FadeBackgroundColor(e["colorA"], e["colorB"], e.length); },
+ function = delegate { var e = eventCaller.currentEntity; ClapTrap.instance.FadeBackgroundColor(e["bgColorA"], e["bgColorB"], e.length); },
resizable = true,
parameters = new List()
{
- new Param("colorA", ClapTrap.defaultBgColor, "Start Color", "The starting color in the fade"),
- new Param("colorB", ClapTrap.defaultBgColor, "End Color", "The ending color in the fade")
+ new Param("bgColorA", ClapTrap.defaultBgColor, "Start Color", "The starting color in the fade"),
+ new Param("bgColorB", ClapTrap.defaultBgColor, "End Color", "The ending color in the fade")
},
},
new GameAction("change hand color", "Change Hand Colors")
{
function = delegate { var e = eventCaller.currentEntity; ClapTrap.instance.ChangeHandColor(e["stageLeftHandColor"], e["stageRightHandColor"]); },
- defaultLength = 1f,
+ defaultLength = 0.5f,
parameters = new List()
{
- new Param("stageLeftHandColor", ClapTrap.defaultLeftColor, "Stage Left Hand Color", "The color used on the dummy's hand (stage left)"),
- new Param("stageRightHandColor", ClapTrap.defaultRightColor, "Stage Right Hand Color", "The color used on the dummy's hand (stage right)")
+ new Param("stageLeftHandColor", ClapTrap.defaultLeftColor, "Left Hand Color", "The color used on the dummy's hand (stage left)"),
+ new Param("stageRightHandColor", ClapTrap.defaultRightColor, "Right Hand Color", "The color used on the dummy's hand (stage right)")
},
},
+ new GameAction("spotlight", "Change Spotlight Colors")
+ {
+ function = delegate { var e = eventCaller.currentEntity; ClapTrap.instance.ChangeSpotlightColor(e["spotlightTop"], e["spotlightBottom"], e["spotlightGlow"]); },
+ defaultLength = 0.5f,
+ parameters = new List()
+ {
+ new Param("spotlightBottom", ClapTrap.bottomSpotlight, "Bottom Color", "The color at the bottom of the spotlight"),
+ new Param("spotlightTop", ClapTrap.topSpotlight, "Top Color", "The color at the top of the spotlight"),
+ new Param("spotlightGlow", ClapTrap.glowSpotlight, "Glow Color", "The color that glows around the spotlight")
+ },
+ },
new GameAction("doll animations", "Doll Animations")
{
function = delegate {var e = eventCaller.currentEntity; ClapTrap.instance.DollAnimations(eventCaller.currentEntity.beat, eventCaller.currentEntity["animate"]);},
- defaultLength = 1f,
+ defaultLength = 0.5f,
parameters = new List()
{
new Param("animate", ClapTrap.DollAnim.Inhale, "Animation", "The animation that the doll will play"),
@@ -63,8 +74,23 @@ namespace HeavenStudio.Games
{
public partial class ClapTrap : Minigame
{
- [Header("Sprite Renderers")]
- [SerializeField] SpriteRenderer Background;
+ public enum ClapType
+ {
+ Hand,
+ Paw,
+ Leek,
+ Branch,
+ Random
+ }
+
+ public enum DollAnim
+ {
+ Idle,
+ Inhale,
+ Exhale,
+ Talk,
+
+ }
public static ClapTrap instance;
@@ -98,6 +124,39 @@ namespace HeavenStudio.Games
}
}
+ private static Color _topSpotlight;
+ public static Color topSpotlight
+ {
+ get
+ {
+ ColorUtility.TryParseHtmlString("#FFFFFF", out _topSpotlight);
+ return _topSpotlight;
+ }
+ }
+
+ private static Color _bottomSpotlight;
+ public static Color bottomSpotlight
+ {
+ get
+ {
+ ColorUtility.TryParseHtmlString("#FFE118", out _bottomSpotlight);
+ return _bottomSpotlight;
+ }
+ }
+
+ private static Color _glowSpotlight;
+ public static Color glowSpotlight
+ {
+ get
+ {
+ ColorUtility.TryParseHtmlString("#FFFFFF", out _glowSpotlight);
+ return _glowSpotlight;
+ }
+ }
+
+ [Header("Sprite Renderers")]
+ [SerializeField] SpriteRenderer Background;
+
[Header("Colors")]
public SpriteRenderer bg;
@@ -111,38 +170,29 @@ namespace HeavenStudio.Games
public SpriteRenderer stageRightRim;
- public enum ClapType
- {
- Hand,
- Paw,
- Leek,
- Branch,
- Random
- }
-
- public enum DollAnim
- {
- Idle,
- Inhale,
- Exhale,
- Talk,
-
- }
+ [Header("Spotlight")]
+ public GameObject spotlight;
+ public Material spotlightMaterial;
[Header("Animators")]
public Animator dollHead;
public Animator dollArms;
public Animator clapEffect;
- [Header("Can Clap")]
- // look at me go, I'm a boolean
- // wow now I'm an integer
- // aaaand back to a boolean
+ [Header("Values")]
private bool canClap = true;
+ private int currentClaps = 0;
+ private Color backgroundColor;
void Awake()
{
instance = this;
+
+ spotlightMaterial.SetColor("_ColorAlpha", topSpotlight);
+ spotlightMaterial.SetColor("_ColorBravo", glowSpotlight);
+ spotlightMaterial.SetColor("_ColorDelta", bottomSpotlight);
+
+ backgroundColor = defaultBgColor;
}
private void Update()
@@ -164,6 +214,16 @@ namespace HeavenStudio.Games
}
+ private void LateUpdate()
+ {
+ if (spotlight.activeSelf == true && currentClaps == 0)
+ {
+ spotlight.SetActive(false);
+ bg.color = backgroundColor;
+ }
+ print(currentClaps);
+ }
+
public void Clap(float beat, float length, int type)
{
@@ -176,6 +236,20 @@ namespace HeavenStudio.Games
}, forcePlay: true);
ScheduleInput(beat, length * 4, InputType.STANDARD_DOWN | InputType.DIRECTION_DOWN, Hit, Miss, Out);
+ currentClaps += 1;
+ BeatAction.New(instance.gameObject, new List()
+ {
+ new BeatAction.Action(beat + length * 4, delegate { currentClaps -= 1; })
+ });
+
+ spotlight.SetActive(true);
+
+ if (bg.color != Color.black)
+ {
+ backgroundColor = bg.color;
+ }
+ bg.color = Color.black;
+
}
@@ -252,12 +326,18 @@ namespace HeavenStudio.Games
{
bgColorTween = bg.DOColor(color, seconds);
}
+
+ backgroundColor = color;
+
+
}
public void FadeBackgroundColor(Color start, Color end, float beats)
{
ChangeBackgroundColor(start, 0f);
ChangeBackgroundColor(end, beats);
+
+
}
public void ChangeHandColor(Color stageLeftHandColor, Color stageRightHandColor)
@@ -268,6 +348,13 @@ namespace HeavenStudio.Games
stageRightRim.color = stageRightHandColor;
}
-
+ public void ChangeSpotlightColor(Color topSpotlightColor, Color bottomSpotlightColor, Color glowSpotlightColor)
+ {
+ spotlightMaterial.SetColor("_ColorAlpha", topSpotlightColor);
+ spotlightMaterial.SetColor("_ColorBravo", glowSpotlightColor);
+ spotlightMaterial.SetColor("_ColorDelta", bottomSpotlightColor);
+ }
+
+
}
}
\ No newline at end of file