diff --git a/Assets/Resources/Games/fillbots.prefab b/Assets/Resources/Games/fillbots.prefab
index 9709a5ac9..42e4d17bf 100644
--- a/Assets/Resources/Games/fillbots.prefab
+++ b/Assets/Resources/Games/fillbots.prefab
@@ -337,7 +337,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -40
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
- m_Color: {r: 0, g: 0, b: 0, a: 0.5529412}
+ m_Color: {r: 0, g: 0, b: 0, a: 0}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@@ -812,7 +812,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: -1700906063, guid: 4b169e5816c948044a7180609226f690, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 0.5019608}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@@ -969,6 +969,14 @@ MonoBehaviour:
- {fileID: 2903374454120539361}
- {fileID: 2735928072383733751}
- {fileID: 5524383942418047657}
+ metersFuel:
+ - {fileID: 2149424580017330275}
+ - {fileID: 1966799444816461203}
+ - {fileID: 3177063745848166584}
+ - {fileID: 4265019489589851108}
+ - {fileID: 3930876218364201202}
+ - {fileID: 6904074179371447724}
+ impactMaterial: {fileID: 2100000, guid: ab21c8af63622c646a685aa8b7c3c9a4, type: 2}
conveyerBelt: {fileID: 9075535989594452730}
--- !u!1 &7022196375650281210
GameObject:
@@ -1362,7 +1370,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: -1700906063, guid: 4b169e5816c948044a7180609226f690, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 0.5019608}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@@ -1475,6 +1483,11 @@ Animator:
m_CorrespondingSourceObject: {fileID: 1889225549270412632, guid: 672acf3ada15b4b44a8d1580bad1900c, type: 3}
m_PrefabInstance: {fileID: 1298767332955391950}
m_PrefabAsset: {fileID: 0}
+--- !u!212 &1966799444816461203 stripped
+SpriteRenderer:
+ m_CorrespondingSourceObject: {fileID: 670297123598137949, guid: 672acf3ada15b4b44a8d1580bad1900c, type: 3}
+ m_PrefabInstance: {fileID: 1298767332955391950}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1484241650340684350
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1542,6 +1555,11 @@ Animator:
m_CorrespondingSourceObject: {fileID: 1889225549270412632, guid: 672acf3ada15b4b44a8d1580bad1900c, type: 3}
m_PrefabInstance: {fileID: 1484241650340684350}
m_PrefabAsset: {fileID: 0}
+--- !u!212 &2149424580017330275 stripped
+SpriteRenderer:
+ m_CorrespondingSourceObject: {fileID: 670297123598137949, guid: 672acf3ada15b4b44a8d1580bad1900c, type: 3}
+ m_PrefabInstance: {fileID: 1484241650340684350}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &2691583618534683365
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1599,6 +1617,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 672acf3ada15b4b44a8d1580bad1900c, type: 3}
+--- !u!212 &3177063745848166584 stripped
+SpriteRenderer:
+ m_CorrespondingSourceObject: {fileID: 670297123598137949, guid: 672acf3ada15b4b44a8d1580bad1900c, type: 3}
+ m_PrefabInstance: {fileID: 2691583618534683365}
+ m_PrefabAsset: {fileID: 0}
--- !u!4 &3749244010494601458 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1251315264588323351, guid: 672acf3ada15b4b44a8d1580bad1900c, type: 3}
@@ -1676,6 +1699,11 @@ Animator:
m_CorrespondingSourceObject: {fileID: 1889225549270412632, guid: 672acf3ada15b4b44a8d1580bad1900c, type: 3}
m_PrefabInstance: {fileID: 3638129006627686841}
m_PrefabAsset: {fileID: 0}
+--- !u!212 &4265019489589851108 stripped
+SpriteRenderer:
+ m_CorrespondingSourceObject: {fileID: 670297123598137949, guid: 672acf3ada15b4b44a8d1580bad1900c, type: 3}
+ m_PrefabInstance: {fileID: 3638129006627686841}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &4593698792861692591
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1743,6 +1771,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1251315264588323351, guid: 672acf3ada15b4b44a8d1580bad1900c, type: 3}
m_PrefabInstance: {fileID: 4593698792861692591}
m_PrefabAsset: {fileID: 0}
+--- !u!212 &3930876218364201202 stripped
+SpriteRenderer:
+ m_CorrespondingSourceObject: {fileID: 670297123598137949, guid: 672acf3ada15b4b44a8d1580bad1900c, type: 3}
+ m_PrefabInstance: {fileID: 4593698792861692591}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &6241264839279890417
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1810,3 +1843,8 @@ Animator:
m_CorrespondingSourceObject: {fileID: 1889225549270412632, guid: 672acf3ada15b4b44a8d1580bad1900c, type: 3}
m_PrefabInstance: {fileID: 6241264839279890417}
m_PrefabAsset: {fileID: 0}
+--- !u!212 &6904074179371447724 stripped
+SpriteRenderer:
+ m_CorrespondingSourceObject: {fileID: 670297123598137949, guid: 672acf3ada15b4b44a8d1580bad1900c, type: 3}
+ m_PrefabInstance: {fileID: 6241264839279890417}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Resources/Prefabs/Games/Fillbots/BotLarge.prefab b/Assets/Resources/Prefabs/Games/Fillbots/BotLarge.prefab
index c3f7d4636..b922c7904 100644
--- a/Assets/Resources/Prefabs/Games/Fillbots/BotLarge.prefab
+++ b/Assets/Resources/Prefabs/Games/Fillbots/BotLarge.prefab
@@ -589,7 +589,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &7605662072637104455
Transform:
m_ObjectHideFlags: 0
@@ -700,6 +700,7 @@ MonoBehaviour:
- {fileID: -2072188992, guid: ff0af2701c231e3409f3d5a741e7bf1d, type: 3}
- {fileID: 2143473419, guid: ff0af2701c231e3409f3d5a741e7bf1d, type: 3}
- {fileID: -315477286, guid: ff0af2701c231e3409f3d5a741e7bf1d, type: 3}
+ fullBody: {fileID: 153391827222204876}
--- !u!1 &4318660971545812837
GameObject:
m_ObjectHideFlags: 0
@@ -869,10 +870,14 @@ MonoBehaviour:
size: 2
holdLength: 7
limbFallHeight: 15
+ fuelCorol: {r: 1, g: 0.385, b: 0.385, a: 1}
+ lampCorolOff: {r: 0.635, g: 0.635, b: 0.185, a: 1}
+ lampCorolOn: {r: 1, g: 1, b: 0.42, a: 1}
fullBody: {fileID: 7967358876063018519}
legs: {fileID: 7489285146181854031}
body: {fileID: 233663896046199226}
head: {fileID: 1555999227183591988}
+ fuelFill: {fileID: 1253665520920512372}
fillAnim: {fileID: 3960380650713155144}
--- !u!210 &755017336671867292
SortingGroup:
@@ -910,7 +915,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7716400162364290482}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0.46, z: 0}
+ m_LocalPosition: {x: 0, y: 0.32, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -994,7 +999,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7983486945364815282}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0.39, z: 0}
+ m_LocalPosition: {x: 0, y: 0.35, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
diff --git a/Assets/Resources/Prefabs/Games/Fillbots/BotMedium.prefab b/Assets/Resources/Prefabs/Games/Fillbots/BotMedium.prefab
index 070bf6348..43f6f2342 100644
--- a/Assets/Resources/Prefabs/Games/Fillbots/BotMedium.prefab
+++ b/Assets/Resources/Prefabs/Games/Fillbots/BotMedium.prefab
@@ -700,6 +700,7 @@ MonoBehaviour:
- {fileID: -507403067, guid: 40b431067104e8a4d9649906df585d74, type: 3}
- {fileID: 180657246, guid: 40b431067104e8a4d9649906df585d74, type: 3}
- {fileID: 980497348, guid: 40b431067104e8a4d9649906df585d74, type: 3}
+ fullBody: {fileID: 153391827222204876}
--- !u!1 &4318660971545812837
GameObject:
m_ObjectHideFlags: 0
@@ -869,10 +870,14 @@ MonoBehaviour:
size: 1
holdLength: 3
limbFallHeight: 15
+ fuelCorol: {r: 1, g: 0.385, b: 0.385, a: 1}
+ lampCorolOff: {r: 0.635, g: 0.635, b: 0.185, a: 1}
+ lampCorolOn: {r: 1, g: 1, b: 0.42, a: 1}
fullBody: {fileID: 7967358876063018519}
legs: {fileID: 7489285146181854031}
body: {fileID: 233663896046199226}
head: {fileID: 1555999227183591988}
+ fuelFill: {fileID: 1253665520920512372}
fillAnim: {fileID: 3960380650713155144}
--- !u!210 &755017336671867292
SortingGroup:
diff --git a/Assets/Resources/Prefabs/Games/Fillbots/BotSmall.prefab b/Assets/Resources/Prefabs/Games/Fillbots/BotSmall.prefab
index 31c9b0581..8e188673c 100644
--- a/Assets/Resources/Prefabs/Games/Fillbots/BotSmall.prefab
+++ b/Assets/Resources/Prefabs/Games/Fillbots/BotSmall.prefab
@@ -700,6 +700,7 @@ MonoBehaviour:
- {fileID: -2114185287, guid: da91cde4669b33145997bab54685c3a5, type: 3}
- {fileID: -1498448865, guid: da91cde4669b33145997bab54685c3a5, type: 3}
- {fileID: 2028413044, guid: da91cde4669b33145997bab54685c3a5, type: 3}
+ fullBody: {fileID: 153391827222204876}
--- !u!1 &4318660971545812837
GameObject:
m_ObjectHideFlags: 0
@@ -758,7 +759,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5669306600923038008}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 1.4, z: 0}
+ m_LocalPosition: {x: 0, y: 1.38, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -869,10 +870,14 @@ MonoBehaviour:
size: 0
holdLength: 1
limbFallHeight: 15
+ fuelCorol: {r: 1, g: 0.385, b: 0.385, a: 1}
+ lampCorolOff: {r: 0.635, g: 0.635, b: 0.185, a: 1}
+ lampCorolOn: {r: 1, g: 1, b: 0.42, a: 1}
fullBody: {fileID: 7967358876063018519}
legs: {fileID: 7489285146181854031}
body: {fileID: 233663896046199226}
head: {fileID: 1555999227183591988}
+ fuelFill: {fileID: 1253665520920512372}
fillAnim: {fileID: 3960380650713155144}
--- !u!210 &755017336671867292
SortingGroup:
@@ -910,7 +915,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7716400162364290482}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0.46, z: 0}
+ m_LocalPosition: {x: 0, y: 0.68, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -994,7 +999,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7983486945364815282}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0.39, z: 0}
+ m_LocalPosition: {x: 0, y: 1.25, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
diff --git a/Assets/Resources/Prefabs/Games/Fillbots/Meter.prefab b/Assets/Resources/Prefabs/Games/Fillbots/Meter.prefab
index fc5070edc..62b78307e 100644
--- a/Assets/Resources/Prefabs/Games/Fillbots/Meter.prefab
+++ b/Assets/Resources/Prefabs/Games/Fillbots/Meter.prefab
@@ -74,7 +74,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -53
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
- m_Color: {r: 1, g: 0.8784314, b: 0.8784314, a: 1}
+ m_Color: {r: 1, g: 0.88, b: 0.88, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Beyond.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Beyond.anim
index a4e1af360..02d3f81a8 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Beyond.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Beyond.anim
@@ -79,6 +79,13 @@ AnimationClip:
floatParameter: 0
intParameter: 0
messageOptions: 0
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
- time: 0.06666667
functionName: SetMask
data:
@@ -86,6 +93,13 @@ AnimationClip:
floatParameter: 0
intParameter: 3
messageOptions: 0
+ - time: 0.06666667
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
- time: 0.13333334
functionName: SetMask
data:
@@ -93,3 +107,10 @@ AnimationClip:
floatParameter: 0
intParameter: 4
messageOptions: 0
+ - time: 0.13333334
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 1
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Beyond2.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Beyond2.anim
index f507f5a67..855c95ca9 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Beyond2.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Beyond2.anim
@@ -189,3 +189,10 @@ AnimationClip:
floatParameter: 0
intParameter: 4
messageOptions: 0
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 1
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Dead.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Dead.anim
index c49c17c95..8254df8e4 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Dead.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Dead.anim
@@ -73,3 +73,10 @@ AnimationClip:
floatParameter: 0
intParameter: 0
messageOptions: 0
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Fly.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Fly.anim
index c8741bb3f..a751e7e35 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Fly.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Fly.anim
@@ -191,4 +191,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Hold.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Hold.anim
index c3a88fdc4..25d5bb2c1 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Hold.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Hold.anim
@@ -79,6 +79,13 @@ AnimationClip:
floatParameter: 0
intParameter: 1
messageOptions: 0
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
- time: 0.06666667
functionName: SetMask
data:
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/HoldBarely.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/HoldBarely.anim
index eac79e3a9..cde32f96f 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/HoldBarely.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/HoldBarely.anim
@@ -65,4 +65,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/HoldBeat.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/HoldBeat.anim
index b642cd22b..5cb09554f 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/HoldBeat.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/HoldBeat.anim
@@ -82,6 +82,13 @@ AnimationClip:
floatParameter: 0
intParameter: 3
messageOptions: 0
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
- time: 0.083333336
functionName: SetMask
data:
@@ -89,6 +96,13 @@ AnimationClip:
floatParameter: 0
intParameter: 4
messageOptions: 0
+ - time: 0.083333336
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 1
+ messageOptions: 0
- time: 0.16666667
functionName: SetMask
data:
@@ -96,6 +110,13 @@ AnimationClip:
floatParameter: 0
intParameter: 3
messageOptions: 0
+ - time: 0.16666667
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
- time: 0.23333333
functionName: SetMask
data:
@@ -103,3 +124,10 @@ AnimationClip:
floatParameter: 0
intParameter: 0
messageOptions: 0
+ - time: 0.23333333
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Release.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Release.anim
index 9a1a97884..f9f39b196 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Release.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Release.anim
@@ -116,4 +116,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/ReleaseEarly.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/ReleaseEarly.anim
index c3718ff9d..82bcdb87c 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/ReleaseEarly.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/ReleaseEarly.anim
@@ -394,4 +394,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/ReleaseLate.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/ReleaseLate.anim
index d667e9b06..b3f1cb7d8 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/ReleaseLate.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/ReleaseLate.anim
@@ -119,4 +119,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 1
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Success.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Success.anim
index ee7d6cf02..04dc7cfad 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Success.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Success.anim
@@ -116,4 +116,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Beyond.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Beyond.anim
index 4afd3ce05..432f7243f 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Beyond.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Beyond.anim
@@ -79,6 +79,13 @@ AnimationClip:
floatParameter: 0
intParameter: 0
messageOptions: 0
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
- time: 0.06666667
functionName: SetMask
data:
@@ -86,6 +93,13 @@ AnimationClip:
floatParameter: 0
intParameter: 3
messageOptions: 0
+ - time: 0.06666667
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
- time: 0.13333334
functionName: SetMask
data:
@@ -93,3 +107,10 @@ AnimationClip:
floatParameter: 0
intParameter: 4
messageOptions: 0
+ - time: 0.13333334
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 1
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Beyond2.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Beyond2.anim
index 4c0a9b7d7..419855b13 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Beyond2.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Beyond2.anim
@@ -189,3 +189,10 @@ AnimationClip:
floatParameter: 0
intParameter: 4
messageOptions: 0
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 1
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Dead.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Dead.anim
index 82182876d..5c8b0d2b5 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Dead.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Dead.anim
@@ -73,3 +73,10 @@ AnimationClip:
floatParameter: 0
intParameter: 0
messageOptions: 0
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Fly.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Fly.anim
index 24ef51346..b5bc3f22b 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Fly.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Fly.anim
@@ -191,4 +191,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Hold.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Hold.anim
index 72998045c..b484a1e1e 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Hold.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Hold.anim
@@ -79,6 +79,13 @@ AnimationClip:
floatParameter: 0
intParameter: 1
messageOptions: 0
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
- time: 0.06666667
functionName: SetMask
data:
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/HoldBarely.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/HoldBarely.anim
index 93ffc6c91..cabc21967 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/HoldBarely.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/HoldBarely.anim
@@ -65,4 +65,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/HoldBeat.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/HoldBeat.anim
index c7899c4d2..96df96a2a 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/HoldBeat.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/HoldBeat.anim
@@ -75,6 +75,13 @@ AnimationClip:
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
- time: 0
functionName: SetMask
data:
@@ -89,6 +96,13 @@ AnimationClip:
floatParameter: 0
intParameter: 4
messageOptions: 0
+ - time: 0.083333336
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 1
+ messageOptions: 0
- time: 0.16666667
functionName: SetMask
data:
@@ -96,6 +110,13 @@ AnimationClip:
floatParameter: 0
intParameter: 3
messageOptions: 0
+ - time: 0.16666667
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
- time: 0.23333333
functionName: SetMask
data:
@@ -103,3 +124,10 @@ AnimationClip:
floatParameter: 0
intParameter: 0
messageOptions: 0
+ - time: 0.23333333
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Release.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Release.anim
index 05961edc3..a0548d76b 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Release.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Release.anim
@@ -116,4 +116,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/ReleaseEarly.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/ReleaseEarly.anim
index 9ddbb235e..ecd41adfe 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/ReleaseEarly.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/ReleaseEarly.anim
@@ -394,4 +394,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/ReleaseLate.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/ReleaseLate.anim
index 88f51007f..2e28fb08d 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/ReleaseLate.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/ReleaseLate.anim
@@ -119,4 +119,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 1
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Success.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Success.anim
index 256b2417e..2fa6900d2 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Success.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Success.anim
@@ -116,4 +116,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Beyond.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Beyond.anim
index 47ead480d..f6178a569 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Beyond.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Beyond.anim
@@ -79,6 +79,13 @@ AnimationClip:
floatParameter: 0
intParameter: 0
messageOptions: 0
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
- time: 0.06666667
functionName: SetMask
data:
@@ -86,6 +93,13 @@ AnimationClip:
floatParameter: 0
intParameter: 3
messageOptions: 0
+ - time: 0.06666667
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
- time: 0.13333334
functionName: SetMask
data:
@@ -93,3 +107,10 @@ AnimationClip:
floatParameter: 0
intParameter: 4
messageOptions: 0
+ - time: 0.13333334
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 1
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Beyond2.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Beyond2.anim
index e3b2f1b08..67ff7828f 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Beyond2.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Beyond2.anim
@@ -189,3 +189,10 @@ AnimationClip:
floatParameter: 0
intParameter: 4
messageOptions: 0
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 1
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Dead.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Dead.anim
index 953d14158..04cd88121 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Dead.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Dead.anim
@@ -73,3 +73,10 @@ AnimationClip:
floatParameter: 0
intParameter: 0
messageOptions: 0
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Fly.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Fly.anim
index fff4255c9..47627e7bd 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Fly.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Fly.anim
@@ -191,4 +191,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Hold.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Hold.anim
index 2793144b5..4e8681388 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Hold.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Hold.anim
@@ -79,6 +79,13 @@ AnimationClip:
floatParameter: 0
intParameter: 1
messageOptions: 0
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
- time: 0.06666667
functionName: SetMask
data:
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/HoldBarely.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/HoldBarely.anim
index 6335d56d7..14b103a33 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/HoldBarely.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/HoldBarely.anim
@@ -65,4 +65,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/HoldBeat.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/HoldBeat.anim
index 30ec35945..c505a5321 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/HoldBeat.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/HoldBeat.anim
@@ -82,6 +82,20 @@ AnimationClip:
floatParameter: 0
intParameter: 3
messageOptions: 0
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
+ - time: 0.083333336
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 1
+ messageOptions: 0
- time: 0.083333336
functionName: SetMask
data:
@@ -96,6 +110,20 @@ AnimationClip:
floatParameter: 0
intParameter: 3
messageOptions: 0
+ - time: 0.16666667
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
+ - time: 0.23333333
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
- time: 0.23333333
functionName: SetMask
data:
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Release.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Release.anim
index a16493dfa..7e2dd3fc6 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Release.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Release.anim
@@ -116,4 +116,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/ReleaseEarly.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/ReleaseEarly.anim
index 2397588eb..818ef13b8 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/ReleaseEarly.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/ReleaseEarly.anim
@@ -618,4 +618,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/ReleaseLate.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/ReleaseLate.anim
index 737cc029e..70c7b2fa7 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/ReleaseLate.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/ReleaseLate.anim
@@ -119,4 +119,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 1
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Success.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Success.anim
index b0029fe4b..bda23da89 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Success.anim
+++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Success.anim
@@ -116,4 +116,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName: SetLamp
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Resources/Sprites/Games/Fillbots/impact_mat.mat b/Assets/Resources/Sprites/Games/Fillbots/impact_mat.mat
index dfd8f467b..8711e002a 100644
--- a/Assets/Resources/Sprites/Games/Fillbots/impact_mat.mat
+++ b/Assets/Resources/Sprites/Games/Fillbots/impact_mat.mat
@@ -84,7 +84,7 @@ Material:
m_Colors:
- _AddColor: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- - _ColorAlpha: {r: 1, g: 0.5882353, b: 0.007843138, a: 1}
+ - _ColorAlpha: {r: 1, g: 0.59, b: 0.01, a: 1}
- _ColorBravo: {r: 1, g: 1, b: 1, a: 1}
- _ColorDelta: {r: 1, g: 1, b: 1, a: 0.9843137}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Scripts/Games/Fillbots/FillMask.cs b/Assets/Scripts/Games/Fillbots/FillMask.cs
deleted file mode 100644
index 071e538f7..000000000
--- a/Assets/Scripts/Games/Fillbots/FillMask.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace HeavenStudio.Games.Scripts_Fillbots
-{
- public class FillMask : MonoBehaviour
- {
- [SerializeField] private SpriteMask mask;
-
- [SerializeField] private Sprite[] sprites;
-
- public void SetMask(int i)
- {
- mask.sprite = sprites[i];
- }
- }
-}
diff --git a/Assets/Scripts/Games/Fillbots/Fillbots.cs b/Assets/Scripts/Games/Fillbots/Fillbots.cs
index 0f71256f3..07e1e3bcf 100644
--- a/Assets/Scripts/Games/Fillbots/Fillbots.cs
+++ b/Assets/Scripts/Games/Fillbots/Fillbots.cs
@@ -22,24 +22,57 @@ namespace HeavenStudio.Games.Loaders
resizable = true,
parameters = new()
{
- new("toggle", false, "Bop"),
+ new("toggle", true, "Bop"),
new("auto", false, "Bop (Auto)")
}
},
new GameAction("medium", "Medium Bot")
{
- preFunction = delegate { Fillbots.PreSpawnFillbot(eventCaller.currentEntity.beat, 3, Scripts_Fillbots.BotSize.Medium); },
- defaultLength = 8f
+ preFunction = delegate {
+ var e = eventCaller.currentEntity;
+ Fillbots.PreSpawnFillbot(e.beat, 3, Scripts_Fillbots.BotSize.Medium, e["colorFuel"], e["colorLampOff"], e["colorLampOn"]);
+ },
+ defaultLength = 8f,
+ parameters = new List()
+ {
+ new Param("colorFuel", new Color(1f, 0.385f, 0.385f), "Fuel Color", "Set the color of the fuel."),
+ new Param("colorLampOff", new Color(0.635f, 0.635f, 0.185f), "Off Lamp Color", "Set the color of the off lamp."),
+ new Param("colorLampOn", new Color(1f, 1f, 0.42f), "On Lamp Color", "Set the color of the on lamp."),
+ }
},
new GameAction("large", "Large Bot")
{
- preFunction = delegate { Fillbots.PreSpawnFillbot(eventCaller.currentEntity.beat, 7, Scripts_Fillbots.BotSize.Large); },
- defaultLength = 12f
+ preFunction = delegate {
+ var e = eventCaller.currentEntity;
+ Fillbots.PreSpawnFillbot(e.beat, 7, Scripts_Fillbots.BotSize.Large, e["colorFuel"], e["colorLampOff"], e["colorLampOn"]);
+ },
+ defaultLength = 12f,
},
new GameAction("small", "Small Bot")
{
- preFunction = delegate { Fillbots.PreSpawnFillbot(eventCaller.currentEntity.beat, 1, Scripts_Fillbots.BotSize.Small); },
- defaultLength = 6f
+ preFunction = delegate {
+ var e = eventCaller.currentEntity;
+ Fillbots.PreSpawnFillbot(e.beat, 1, Scripts_Fillbots.BotSize.Small, e["colorFuel"], e["colorLampOff"], e["colorLampOn"]);
+ },
+ defaultLength = 6f,
+ },
+ new GameAction("background", "Background Appearance")
+ {
+ function = delegate {
+ var e = eventCaller.currentEntity;
+ Fillbots.instance.BackgroundColorSet(e["colorImpact"], e["colorMeter1"], e["colorMeter2"], e["colorMeter3"], e["colorMeter4"], e["colorMeter5"], e["colorMeter6"]);
+ },
+ defaultLength = 0.5f,
+ parameters = new List()
+ {
+ new Param("colorImpact", new Color(1f, 0.59f, 0.01f), "Impact Color", "Set the color of the impact."),
+ new Param("colorMeter1", new Color(1f, 0.88f, 0.88f), "1st Meter Color", "Set the color of the fuel in the meter."),
+ new Param("colorMeter2", new Color(1f, 0.88f, 0.88f), "2nd Meter Color", "Set the color of the fuel in the meter."),
+ new Param("colorMeter3", new Color(1f, 0.88f, 0.88f), "3rd Meter Color", "Set the color of the fuel in the meter."),
+ new Param("colorMeter4", new Color(1f, 0.88f, 0.88f), "4th Meter Color", "Set the color of the fuel in the meter."),
+ new Param("colorMeter5", new Color(1f, 0.88f, 0.88f), "5th Meter Color", "Set the color of the fuel in the meter."),
+ new Param("colorMeter6", new Color(1f, 0.88f, 0.88f), "6th Meter Color", "Set the color of the fuel in the meter."),
+ }
},
},
new List() {"ntr", "normal"},
@@ -63,6 +96,9 @@ namespace HeavenStudio.Games
public double beat;
public double holdLength;
public BotSize size;
+ public Color fuelColor;
+ public Color lampColorOff;
+ public Color lampColorOn;
}
private static List queuedBots = new List();
@@ -73,8 +109,11 @@ namespace HeavenStudio.Games
public Animator filler;
[SerializeField] private Transform[] gears;
[SerializeField] private Animator[] meters;
+ [SerializeField] private SpriteRenderer[] metersFuel;
+ [SerializeField] private Material impactMaterial;
[SerializeField] private Animator conveyerBelt;
+
public static Fillbots instance;
[NonSerialized] public List currentBots = new List();
@@ -113,7 +152,7 @@ namespace HeavenStudio.Games
{
foreach (var queuedBot in queuedBots)
{
- SpawnFillbot(queuedBot.beat, queuedBot.holdLength, queuedBot.size);
+ SpawnFillbot(queuedBot.beat, queuedBot.holdLength, queuedBot.size, queuedBot.fuelColor, queuedBot.lampColorOff, queuedBot.lampColorOn);
}
queuedBots.Clear();
}
@@ -125,7 +164,7 @@ namespace HeavenStudio.Games
if (PlayerInput.GetIsAction(InputAction_BasicRelease) && !IsExpectingInputNow(InputAction_BasicRelease))
{
filler.DoScaledAnimationAsync("ReleaseWhiff", 0.5f);
- // SoundByte.PlayOneShotGame("fillbots/armRetractionWhiff");
+ SoundByte.PlayOneShotGame("fillbots/armRetractionWhiff");
}
if (conveyerStartBeat >= 0)
@@ -173,11 +212,11 @@ namespace HeavenStudio.Games
}
}
- public static void PreSpawnFillbot(double beat, double holdLength, BotSize size)
+ public static void PreSpawnFillbot(double beat, double holdLength, BotSize size, Color fuelColor, Color lampColorOff, Color lampColorOn)
{
if (GameManager.instance.currentGame == "fillbots")
{
- instance.SpawnFillbot(beat, holdLength, size);
+ instance.SpawnFillbot(beat, holdLength, size, fuelColor, lampColorOff, lampColorOn);
}
else
{
@@ -186,11 +225,14 @@ namespace HeavenStudio.Games
beat = beat,
holdLength = holdLength,
size = size,
+ fuelColor = fuelColor,
+ lampColorOff = lampColorOff,
+ lampColorOn = lampColorOn,
});
}
}
- private void SpawnFillbot(double beat, double holdLength, BotSize size)
+ private void SpawnFillbot(double beat, double holdLength, BotSize size, Color fuelColor, Color lampColorOff, Color lampColorOn)
{
NtrFillbot Bot = size switch
{
@@ -204,6 +246,11 @@ namespace HeavenStudio.Games
{
spawnedBot.holdLength = holdLength;
}
+
+ spawnedBot.fuelColor = fuelColor;
+ spawnedBot.lampColorOff = lampColorOff;
+ spawnedBot.lampColorOn = lampColorOn;
+
spawnedBot.Init(beat);
BeatAction.New(instance, new List()
{
@@ -249,6 +296,18 @@ namespace HeavenStudio.Games
toggle ^= 1;
}
}
+
+ public void BackgroundColorSet(Color impact, Color meter1, Color meter2, Color meter3, Color meter4, Color meter5, Color meter6)
+ {
+ impactMaterial.SetColor("_ColorAlpha", impact);
+
+ var colors = new Color[] {meter1, meter2, meter3, meter4, meter5, meter6};
+ for (int i = 0; i < metersFuel.Length; i++)
+ {
+ metersFuel[i].color = colors[i];
+ }
+
+ }
}
}
diff --git a/Assets/Scripts/Games/Fillbots/FullBody.cs b/Assets/Scripts/Games/Fillbots/FullBody.cs
new file mode 100644
index 000000000..972718f4b
--- /dev/null
+++ b/Assets/Scripts/Games/Fillbots/FullBody.cs
@@ -0,0 +1,34 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace HeavenStudio.Games.Scripts_Fillbots
+{
+ public class FullBody : MonoBehaviour
+ {
+ [SerializeField] private SpriteMask mask;
+
+ [SerializeField] private Sprite[] sprites;
+
+ [SerializeField] private SpriteRenderer fullBody;
+ [System.NonSerialized] public Color lampColorOff;
+ [System.NonSerialized] public Color lampColorOn;
+
+ public enum LampState
+ {
+ Off,
+ On,
+ }
+
+ public void SetMask(int i)
+ {
+ mask.sprite = sprites[i];
+ }
+
+ public void SetLamp(LampState state)
+ {
+ if (state == LampState.On) fullBody.material.SetColor("_ColorAlpha", lampColorOn);
+ else fullBody.material.SetColor("_ColorAlpha", lampColorOff);
+ }
+ }
+}
diff --git a/Assets/Scripts/Games/Fillbots/FillMask.cs.meta b/Assets/Scripts/Games/Fillbots/FullBody.cs.meta
similarity index 100%
rename from Assets/Scripts/Games/Fillbots/FillMask.cs.meta
rename to Assets/Scripts/Games/Fillbots/FullBody.cs.meta
diff --git a/Assets/Scripts/Games/Fillbots/NtrFillbot.cs b/Assets/Scripts/Games/Fillbots/NtrFillbot.cs
index 6a2392b36..a7b2275db 100644
--- a/Assets/Scripts/Games/Fillbots/NtrFillbot.cs
+++ b/Assets/Scripts/Games/Fillbots/NtrFillbot.cs
@@ -18,15 +18,20 @@ namespace HeavenStudio.Games.Scripts_Fillbots
[SerializeField] private BotSize size;
public double holdLength = 4f;
[SerializeField] private float limbFallHeight = 15f;
+ public Color fuelColor;
+ public Color lampColorOff;
+ public Color lampColorOn;
[Header("Body Parts")]
[SerializeField] private Animator fullBody;
+ private Material fullBodyMaterial;
[SerializeField] private Animator legs;
private Transform legsTrans;
[SerializeField] private Animator body;
private Transform bodyTrans;
[SerializeField] private Animator head;
private Transform headTrans;
+ [SerializeField] private SpriteRenderer fuelFill;
[SerializeField] private Animator fillAnim;
@@ -66,16 +71,16 @@ namespace HeavenStudio.Games.Scripts_Fillbots
{
game = Fillbots.instance;
legsTrans = legs.GetComponent();
- headTrans = head.GetComponent();
bodyTrans = body.GetComponent();
+ headTrans = head.GetComponent();
legsPosY = legsTrans.position.y;
- headPosY = headTrans.position.y;
bodyPosY = bodyTrans.position.y;
+ headPosY = headTrans.position.y;
legsTrans.position = new Vector3(legsTrans.position.x, legsTrans.position.y + limbFallHeight);
- headTrans.position = new Vector3(headTrans.position.x, headTrans.position.y + limbFallHeight);
bodyTrans.position = new Vector3(bodyTrans.position.x, bodyTrans.position.y + limbFallHeight);
+ headTrans.position = new Vector3(headTrans.position.x, headTrans.position.y + limbFallHeight);
startPosX = transform.position.x;
@@ -109,6 +114,21 @@ namespace HeavenStudio.Games.Scripts_Fillbots
{
startBeat = beat;
+ fullBodyMaterial = fullBody.GetComponent().material;
+ fullBodyMaterial.SetColor("_ColorBravo", fuelColor);
+ fullBodyMaterial.SetColor("_ColorAlpha", lampColorOff);
+
+ Material botMaterial;
+
+ botMaterial = head.GetComponent().material;
+ botMaterial.SetColor("_ColorAlpha", lampColorOff);
+
+ fuelFill.color = fuelColor;
+
+ var full = fullBody.GetComponent();
+ full.lampColorOff = lampColorOff;
+ full.lampColorOn = lampColorOn;
+
BeatAction.New(game, new List()
{
new BeatAction.Action(beat, delegate { legs.Play("Impact", 0, 0); legsHaveFallen = true; legsTrans.position = new Vector3(legsTrans.position.x, legsPosY); }),