diff --git a/Assets/Resources/Games/dogNinja.prefab b/Assets/Resources/Games/dogNinja.prefab
index cc419acc..8af53c63 100644
--- a/Assets/Resources/Games/dogNinja.prefab
+++ b/Assets/Resources/Games/dogNinja.prefab
@@ -71,7 +71,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 0
+ m_SortingOrder: -10
m_Sprite: {fileID: -2307065246004786754, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -108,10 +108,10 @@ MonoBehaviour:
triggersAutoplay: 1
startBeat: 0
type: 0
- spriteInt: 0
textObj: TacoBell
fromLeft: 0
- fromBoth: 0
+ fromRight: 0
+ direction: 0
curve: {fileID: 0}
barelyCurve: {fileID: 0}
BarelyLeftCurve: {fileID: 5959598018215963193}
@@ -129,13 +129,15 @@ MonoBehaviour:
- {fileID: 6441252700597445463, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
- {fileID: 8476709041252288888, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
- {fileID: -6223893393952614859, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
- - {fileID: -3347077256180618593, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: -4519072383536912777, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: -3132885281078556448, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: -7944245295668935948, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: 8606704304367512636, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: -5925680740112638021, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: 110770723945580571, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
+ - {fileID: -130797512336752496, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
+ - {fileID: -3347077256180618593, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
+ - {fileID: -7594402133338608887, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
objectRightHalves:
- {fileID: -1966485124414453226, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
- {fileID: -5461002889550892160, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
@@ -146,13 +148,15 @@ MonoBehaviour:
- {fileID: -2960375969769432221, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
- {fileID: -5759490930458033094, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
- {fileID: -874507558836862450, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
- - {fileID: -4417643877713306750, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: 6361375371497706966, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: 1971698216606203520, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: -1058871720487976607, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: 8659010476580760093, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: -5567381644477528568, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: 4129141875657070858, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
+ - {fileID: 8490305602720712907, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
+ - {fileID: -4417643877713306750, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
+ - {fileID: 3508372842914876614, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
--- !u!1 &127654075222335198
GameObject:
m_ObjectHideFlags: 0
@@ -340,7 +344,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: -5
+ m_SortingOrder: -100
m_Sprite: {fileID: -9220056470471798509, guid: 444fe02d3b82ac4488cd49e924016de7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -352,53 +356,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &526960103876290977
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6830320313942636319}
- - component: {fileID: 640213622963243577}
- m_Layer: 0
- m_Name: Point 0
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &6830320313942636319
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 526960103876290977}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -6.531197, y: -9.830946, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 2176462098296616665}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &640213622963243577
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 526960103876290977}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- curve: {fileID: 3952005353723229456}
- handleType: 0
- leftHandleLocalPosition: {x: 0.11326742, y: -4.2255297, z: -0}
- rightHandleLocalPosition: {x: -0.11326742, y: 4.2255297, z: 0}
--- !u!1 &804613436107147696
GameObject:
m_ObjectHideFlags: 0
@@ -469,7 +426,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: -10
+ m_SortingOrder: -500
m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
m_Color: {r: 0.33333334, g: 0.27058825, b: 0.5921569, a: 1}
m_FlipX: 0
@@ -481,61 +438,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &806212586653525193
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 2176462098296616665}
- - component: {fileID: 3952005353723229456}
- m_Layer: 0
- m_Name: LeftHalfCurveR
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &2176462098296616665
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 806212586653525193}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 13.010002, y: 0.54999995, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 0}
- m_Children:
- - {fileID: 6830320313942636319}
- - {fileID: 603303693810980979}
- - {fileID: 8939968843394283837}
- m_Father: {fileID: 7901373808662952237}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3952005353723229456
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 806212586653525193}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- curveColor: {r: 0, g: 1, b: 0, a: 1}
- startPointColor: {r: 1, g: 0, b: 0, a: 1}
- endPointColor: {r: 0, g: 0, b: 1, a: 1}
- sampling: 25
- keyPoints:
- - {fileID: 640213622963243577}
- - {fileID: 2576420443668423504}
- - {fileID: 82136330526362927}
- normalizedTime: 0.5
--- !u!1 &997672822965154321
GameObject:
m_ObjectHideFlags: 0
@@ -607,7 +509,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 1
+ m_SortingOrder: 180
m_Sprite: {fileID: -1966485124414453226, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -647,40 +549,8 @@ MonoBehaviour:
lefty: 0
rotSpeed: 140
fallLeftCurve: {fileID: 7764367815067799206}
- fallRightCurve: {fileID: 1952621253556122490}
+ fallRightCurve: {fileID: 7122240029612248645}
halvesParent: {fileID: 2078672318315355962}
---- !u!1 &1002248261038749467
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7901373808662952237}
- m_Layer: 0
- m_Name: FallRightCurves
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &7901373808662952237
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1002248261038749467}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: -0.73, z: 0}
- m_LocalScale: {x: -1, y: 1, z: 1}
- m_Children:
- - {fileID: 859204532752934649}
- - {fileID: 2176462098296616665}
- m_Father: {fileID: 8526352886943428752}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1203023033644261752
GameObject:
m_ObjectHideFlags: 0
@@ -751,7 +621,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: -10
+ m_SortingOrder: -400
m_Sprite: {fileID: 7349651895747566427, guid: 444fe02d3b82ac4488cd49e924016de7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -915,7 +785,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: -3
+ m_SortingOrder: -80
m_Sprite: {fileID: 6279726785370437129, guid: 444fe02d3b82ac4488cd49e924016de7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -960,7 +830,6 @@ Transform:
- {fileID: 2458549461439153931}
- {fileID: 3809734629619015499}
- {fileID: 4854341902159240752}
- - {fileID: 4679079189348654533}
- {fileID: 6380493845518260388}
m_Father: {fileID: 3661019275362709209}
m_RootOrder: 1
@@ -1072,7 +941,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1950281162595730128}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -14.498777, y: -16.571135, z: 0}
+ m_LocalPosition: {x: -12.8380575, y: -10.143763, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7533458038457786255}
@@ -1092,8 +961,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
curve: {fileID: 7191847337805905266}
handleType: 0
- leftHandleLocalPosition: {x: 0.35227108, y: 2.9546204, z: 0}
- rightHandleLocalPosition: {x: -0.35227108, y: -2.9546204, z: -0}
+ leftHandleLocalPosition: {x: 0.30874157, y: 3.5202599, z: 0}
+ rightHandleLocalPosition: {x: -0.30874157, y: -3.5202599, z: -0}
--- !u!1 &2036617222703689109
GameObject:
m_ObjectHideFlags: 0
@@ -1293,7 +1162,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: -1
+ m_SortingOrder: -50
m_Sprite: {fileID: -4388551628504022871, guid: 444fe02d3b82ac4488cd49e924016de7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1305,53 +1174,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &2066226783395069922
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6491708930860133762}
- - component: {fileID: 3513340042900118514}
- m_Layer: 0
- m_Name: Point 1
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &6491708930860133762
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2066226783395069922}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -7.5864434, y: 4.62, z: 0}
- m_LocalScale: {x: 1.1235956, y: 1.1235956, z: 1}
- m_Children: []
- m_Father: {fileID: 859204532752934649}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3513340042900118514
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2066226783395069922}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- curve: {fileID: 1952621253556122490}
- handleType: 0
- leftHandleLocalPosition: {x: 2.6498117, y: 0.019104965, z: 0}
- rightHandleLocalPosition: {x: -2.6498117, y: -0.019104965, z: -0}
--- !u!1 &2077183397172792248
GameObject:
m_ObjectHideFlags: 0
@@ -1465,6 +1287,61 @@ Transform:
m_Father: {fileID: 6570085815560366024}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2488711815545919274
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7794010570039865837}
+ - component: {fileID: 5028931464679965393}
+ m_Layer: 0
+ m_Name: LeftHalfCurveR
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &7794010570039865837
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2488711815545919274}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 13.030002, y: -0.67999995, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 0}
+ m_Children:
+ - {fileID: 2559293408959807264}
+ - {fileID: 3112852134986110348}
+ - {fileID: 3112011667709760013}
+ m_Father: {fileID: 616678555521767586}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5028931464679965393
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2488711815545919274}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ curveColor: {r: 0, g: 1, b: 0, a: 1}
+ startPointColor: {r: 1, g: 0, b: 0, a: 1}
+ endPointColor: {r: 0, g: 0, b: 1, a: 1}
+ sampling: 25
+ keyPoints:
+ - {fileID: 154361242173614911}
+ - {fileID: 9020204539912710894}
+ - {fileID: 4392175325198551550}
+ normalizedTime: 0.5
--- !u!1 &2509340608201538613
GameObject:
m_ObjectHideFlags: 0
@@ -1707,53 +1584,6 @@ Transform:
m_Father: {fileID: 8526352886943428752}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2890071956848882165
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4094900509287545554}
- - component: {fileID: 3602934361872329242}
- m_Layer: 0
- m_Name: Point 0
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &4094900509287545554
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2890071956848882165}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -4.3013372, y: -7.6573825, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 859204532752934649}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3602934361872329242
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2890071956848882165}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- curve: {fileID: 1952621253556122490}
- handleType: 0
- leftHandleLocalPosition: {x: 0.09075785, y: -1.9918385, z: -0}
- rightHandleLocalPosition: {x: -0.09075785, y: 1.9918385, z: 0}
--- !u!1 &2996162329579325789
GameObject:
m_ObjectHideFlags: 0
@@ -1854,18 +1684,64 @@ MonoBehaviour:
- {fileID: -6257565696736172525, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
- {fileID: 1079721184413091945, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
- {fileID: 8901904509101664804, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
- CustomObjects:
- - {fileID: -6292424158522327523, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: 6629254383551518635, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: 4583951367997794414, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: -7944245295668935948, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: 3685531665740603113, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: 8158683621920566786, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: 2661523571443289938, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
+ - {fileID: 2196219148037962045, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
+ - {fileID: -6292424158522327523, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- {fileID: 2053246660185171032, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
- - {fileID: -4323599147261721131, guid: 4e56f90ec52abea4ea8c4c7bb6df84d5, type: 3}
usesCustomObject: 0
needPrepare: 0
+--- !u!1 &3156757135167865752
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3302792511028605255}
+ - component: {fileID: 7051936509986659780}
+ m_Layer: 0
+ m_Name: Point 2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &3302792511028605255
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3156757135167865752}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -12.656196, y: -7.6399393, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 3243475171607270065}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7051936509986659780
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3156757135167865752}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ curve: {fileID: 7122240029612248645}
+ handleType: 0
+ leftHandleLocalPosition: {x: 0.3795538, y: 2.506566, z: 0}
+ rightHandleLocalPosition: {x: -0.3795538, y: -2.506566, z: -0}
--- !u!1 &3165026792835370398
GameObject:
m_ObjectHideFlags: 0
@@ -1891,7 +1767,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3165026792835370398}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -4.3013372, y: -7.6573825, z: 0}
+ m_LocalPosition: {x: -4.532079, y: -7.02791, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 273414665257742554}
@@ -1911,8 +1787,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
curve: {fileID: 7764367815067799206}
handleType: 0
- leftHandleLocalPosition: {x: 0.09075785, y: -1.9918385, z: -0}
- rightHandleLocalPosition: {x: -0.09075785, y: 1.9918385, z: 0}
+ leftHandleLocalPosition: {x: 0.12512398, y: -2.8163233, z: -0}
+ rightHandleLocalPosition: {x: -0.12512398, y: 2.8163233, z: 0}
--- !u!1 &3429172520704950774
GameObject:
m_ObjectHideFlags: 0
@@ -1938,7 +1814,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3429172520704950774}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -9.15, y: 3.22, z: 0}
+ m_LocalPosition: {x: -8.94, y: 3.36, z: 0}
m_LocalScale: {x: 1.1235956, y: 1.1235956, z: 0}
m_Children: []
m_Father: {fileID: 7533458038457786255}
@@ -2037,7 +1913,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3532650726890550422}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -6.531197, y: -9.830946, z: 0}
+ m_LocalPosition: {x: -6.2104216, y: -8.436971, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7533458038457786255}
@@ -2057,9 +1933,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
curve: {fileID: 7191847337805905266}
handleType: 0
- leftHandleLocalPosition: {x: 0.11326742, y: -4.2255297, z: -0}
- rightHandleLocalPosition: {x: -0.11326742, y: 4.2255297, z: 0}
---- !u!1 &3852811894756518937
+ leftHandleLocalPosition: {x: 0.113266945, y: -3.239089, z: -0}
+ rightHandleLocalPosition: {x: -0.113266945, y: 3.239089, z: 0}
+--- !u!1 &3645160475886178620
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -2067,80 +1943,53 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 4679079189348654533}
- - component: {fileID: 6300986255001639694}
+ - component: {fileID: 3243475171607270065}
+ - component: {fileID: 7122240029612248645}
m_Layer: 0
- m_Name: Tree_Right
+ m_Name: RightHalfCurveR
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &4679079189348654533
+ m_IsActive: 1
+--- !u!4 &3243475171607270065
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3852811894756518937}
+ m_GameObject: {fileID: 3645160475886178620}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 5.890477, y: 3.1709914, z: 0}
- m_LocalScale: {x: 1.1706378, y: 1.1706378, z: 1.1706378}
- m_Children: []
- m_Father: {fileID: 2552920471063393960}
- m_RootOrder: 6
+ m_LocalPosition: {x: 11.33, y: -1.42, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 0}
+ m_Children:
+ - {fileID: 5591757540497211147}
+ - {fileID: 1753326638425788482}
+ - {fileID: 3302792511028605255}
+ m_Father: {fileID: 616678555521767586}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &6300986255001639694
-SpriteRenderer:
+--- !u!114 &7122240029612248645
+MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3852811894756518937}
+ m_GameObject: {fileID: 3645160475886178620}
m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
- 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: -1
- m_Sprite: {fileID: -4345597197767406995, guid: 444fe02d3b82ac4488cd49e924016de7, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 5.63, y: 7.33}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ curveColor: {r: 0, g: 1, b: 0, a: 1}
+ startPointColor: {r: 1, g: 0, b: 0, a: 1}
+ endPointColor: {r: 0, g: 0, b: 1, a: 1}
+ sampling: 25
+ keyPoints:
+ - {fileID: 2206873450175327429}
+ - {fileID: 3875198055747721367}
+ - {fileID: 7051936509986659780}
+ normalizedTime: 0.5
--- !u!1 &3873105710432125205
GameObject:
m_ObjectHideFlags: 0
@@ -2188,6 +2037,38 @@ MonoBehaviour:
handleType: 0
leftHandleLocalPosition: {x: -5.7237043, y: -0.016559504, z: -0}
rightHandleLocalPosition: {x: 5.7237043, y: 0.016559504, z: 0}
+--- !u!1 &3931864572597260839
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 616678555521767586}
+ m_Layer: 0
+ m_Name: FallRightCurves
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &616678555521767586
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3931864572597260839}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: -0.73000014, z: 0}
+ m_LocalScale: {x: -1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 3243475171607270065}
+ - {fileID: 7794010570039865837}
+ m_Father: {fileID: 8526352886943428752}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3983977351169682692
GameObject:
m_ObjectHideFlags: 0
@@ -2360,7 +2241,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: -4
+ m_SortingOrder: -90
m_Sprite: {fileID: 5505678769135608673, guid: 444fe02d3b82ac4488cd49e924016de7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -2626,7 +2507,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: -2
+ m_SortingOrder: -60
m_Sprite: {fileID: -1016285062031190712, guid: 444fe02d3b82ac4488cd49e924016de7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -2755,7 +2636,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: -2
+ m_SortingOrder: -70
m_Sprite: {fileID: -7567829866506320893, guid: 444fe02d3b82ac4488cd49e924016de7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -2767,53 +2648,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &5379781252913823981
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8939968843394283837}
- - component: {fileID: 82136330526362927}
- m_Layer: 0
- m_Name: Point 2
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &8939968843394283837
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5379781252913823981}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -14.529176, y: -16.358423, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 2176462098296616665}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &82136330526362927
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5379781252913823981}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- curve: {fileID: 3952005353723229456}
- handleType: 0
- leftHandleLocalPosition: {x: 0.2610731, y: 3.2281065, z: 0}
- rightHandleLocalPosition: {x: -0.2610731, y: -3.2281065, z: -0}
--- !u!1 &5441481875736147362
GameObject:
m_ObjectHideFlags: 0
@@ -2839,7 +2673,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5441481875736147362}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 2.04, y: 0.54999995, z: 0}
+ m_LocalPosition: {x: 2.04, y: -0.67999995, z: 0}
m_LocalScale: {x: 1, y: 1, z: 0}
m_Children:
- {fileID: 2024227379699074830}
@@ -3068,7 +2902,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: -10
+ m_SortingOrder: -500
m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
m_Color: {r: 0.5372549, g: 0.45882353, b: 0.98039216, a: 1}
m_FlipX: 0
@@ -3111,7 +2945,7 @@ Transform:
- {fileID: 6329894575619393642}
- {fileID: 1671099869309974123}
- {fileID: 3070939060713267287}
- - {fileID: 7901373808662952237}
+ - {fileID: 616678555521767586}
- {fileID: 2078672318315355962}
- {fileID: 4580384114007305550}
- {fileID: 1920451417789570886}
@@ -3129,7 +2963,7 @@ GameObject:
- component: {fileID: 6380493845518260388}
- component: {fileID: 4840099039928843402}
m_Layer: 0
- m_Name: Tree_Right_Temp
+ m_Name: Tree_Right
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -3143,11 +2977,11 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6115570674712068635}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 6.39, y: 3.1709914, z: 0}
+ m_LocalPosition: {x: 6.19, y: 3.1709914, z: 0}
m_LocalScale: {x: 1.1706378, y: 1.1706378, z: 1.1706378}
m_Children: []
m_Father: {fileID: 2552920471063393960}
- m_RootOrder: 7
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4840099039928843402
SpriteRenderer:
@@ -3188,7 +3022,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: -1
+ m_SortingOrder: -50
m_Sprite: {fileID: -4345597197767406995, guid: 444fe02d3b82ac4488cd49e924016de7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -3200,61 +3034,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &6220934399480830046
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 859204532752934649}
- - component: {fileID: 1952621253556122490}
- m_Layer: 0
- m_Name: RightHalfCurveR
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &859204532752934649
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6220934399480830046}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 11.31, y: -0.19, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 0}
- m_Children:
- - {fileID: 4094900509287545554}
- - {fileID: 6491708930860133762}
- - {fileID: 3772208238198355482}
- m_Father: {fileID: 7901373808662952237}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1952621253556122490
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6220934399480830046}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- curveColor: {r: 0, g: 1, b: 0, a: 1}
- startPointColor: {r: 1, g: 0, b: 0, a: 1}
- endPointColor: {r: 0, g: 0, b: 1, a: 1}
- sampling: 25
- keyPoints:
- - {fileID: 3602934361872329242}
- - {fileID: 3513340042900118514}
- - {fileID: 5604007513671999945}
- normalizedTime: 0.5
--- !u!1 &6222118261888039499
GameObject:
m_ObjectHideFlags: 0
@@ -3337,6 +3116,53 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &6433517487852312833
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3112011667709760013}
+ - component: {fileID: 4392175325198551550}
+ m_Layer: 0
+ m_Name: Point 2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &3112011667709760013
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6433517487852312833}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -12.8380575, y: -10.143763, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 7794010570039865837}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4392175325198551550
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6433517487852312833}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ curve: {fileID: 5028931464679965393}
+ handleType: 0
+ leftHandleLocalPosition: {x: 0.30874157, y: 3.5202599, z: 0}
+ rightHandleLocalPosition: {x: -0.30874157, y: -3.5202599, z: -0}
--- !u!1 &6481100900170708930
GameObject:
m_ObjectHideFlags: 0
@@ -3419,6 +3245,100 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &6783103940935527619
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3112852134986110348}
+ - component: {fileID: 9020204539912710894}
+ m_Layer: 0
+ m_Name: Point 1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &3112852134986110348
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6783103940935527619}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -8.94, y: 3.36, z: 0}
+ m_LocalScale: {x: 1.1235956, y: 1.1235956, z: 0}
+ m_Children: []
+ m_Father: {fileID: 7794010570039865837}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &9020204539912710894
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6783103940935527619}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ curve: {fileID: 5028931464679965393}
+ handleType: 0
+ leftHandleLocalPosition: {x: 2.1649692, y: -0.034568284, z: 0}
+ rightHandleLocalPosition: {x: -2.1649692, y: 0.034568284, z: -0}
+--- !u!1 &6855905322300958617
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1753326638425788482}
+ - component: {fileID: 3875198055747721367}
+ m_Layer: 0
+ m_Name: Point 1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1753326638425788482
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6855905322300958617}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -7.5864434, y: 4.62, z: 0}
+ m_LocalScale: {x: 1.1235956, y: 1.1235956, z: 1}
+ m_Children: []
+ m_Father: {fileID: 3243475171607270065}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3875198055747721367
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6855905322300958617}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ curve: {fileID: 7122240029612248645}
+ handleType: 0
+ leftHandleLocalPosition: {x: 2.6498117, y: 0.019104965, z: 0}
+ rightHandleLocalPosition: {x: -2.6498117, y: -0.019104965, z: -0}
--- !u!1 &7029759971272808179
GameObject:
m_ObjectHideFlags: 0
@@ -3444,7 +3364,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7029759971272808179}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.33999994, y: -0.19, z: 0}
+ m_LocalPosition: {x: 0.33999994, y: -1.42, z: 0}
m_LocalScale: {x: 1, y: 1, z: 0}
m_Children:
- {fileID: 3764752037029567640}
@@ -3579,53 +3499,6 @@ MonoBehaviour:
handleType: 0
leftHandleLocalPosition: {x: -2.8413267, y: 4.4605327, z: 0}
rightHandleLocalPosition: {x: 2.8413267, y: -4.4605327, z: -0}
---- !u!1 &7364379401125960794
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 603303693810980979}
- - component: {fileID: 2576420443668423504}
- m_Layer: 0
- m_Name: Point 1
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &603303693810980979
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7364379401125960794}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -9.15, y: 3.22, z: 0}
- m_LocalScale: {x: 1.1235956, y: 1.1235956, z: 0}
- m_Children: []
- m_Father: {fileID: 2176462098296616665}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2576420443668423504
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7364379401125960794}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- curve: {fileID: 3952005353723229456}
- handleType: 0
- leftHandleLocalPosition: {x: 2.1649692, y: -0.034568284, z: 0}
- rightHandleLocalPosition: {x: -2.1649692, y: 0.034568284, z: -0}
--- !u!1 &7408113244883778572
GameObject:
m_ObjectHideFlags: 0
@@ -3651,7 +3524,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7408113244883778572}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -14.896925, y: -11.521174, z: 0}
+ m_LocalPosition: {x: -12.656196, y: -7.6399393, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 273414665257742554}
@@ -3671,8 +3544,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
curve: {fileID: 7764367815067799206}
handleType: 0
- leftHandleLocalPosition: {x: 0.56799126, y: 3.0997944, z: 0}
- rightHandleLocalPosition: {x: -0.56799126, y: -3.0997944, z: -0}
+ leftHandleLocalPosition: {x: 0.3795538, y: 2.506566, z: 0}
+ rightHandleLocalPosition: {x: -0.3795538, y: -2.506566, z: -0}
--- !u!1 &7703662344441078293
GameObject:
m_ObjectHideFlags: 0
@@ -3720,6 +3593,53 @@ MonoBehaviour:
handleType: 0
leftHandleLocalPosition: {x: 1, y: 0, z: 0}
rightHandleLocalPosition: {x: -1, y: -0, z: -0}
+--- !u!1 &7942069931454682923
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5591757540497211147}
+ - component: {fileID: 2206873450175327429}
+ m_Layer: 0
+ m_Name: Point 0
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &5591757540497211147
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7942069931454682923}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -4.532079, y: -7.02791, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 3243475171607270065}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2206873450175327429
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7942069931454682923}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ curve: {fileID: 7122240029612248645}
+ handleType: 0
+ leftHandleLocalPosition: {x: 0.12512398, y: -2.8163233, z: -0}
+ rightHandleLocalPosition: {x: -0.12512398, y: 2.8163233, z: 0}
--- !u!1 &7957996729328371862
GameObject:
m_ObjectHideFlags: 0
@@ -3928,7 +3848,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8169264026446442674}
m_CullTransparentMesh: 1
---- !u!1 &8301479065266073315
+--- !u!1 &8329549254214092205
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3936,45 +3856,45 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 3772208238198355482}
- - component: {fileID: 5604007513671999945}
+ - component: {fileID: 2559293408959807264}
+ - component: {fileID: 154361242173614911}
m_Layer: 0
- m_Name: Point 2
+ m_Name: Point 0
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &3772208238198355482
+--- !u!4 &2559293408959807264
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8301479065266073315}
+ m_GameObject: {fileID: 8329549254214092205}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -15.459536, y: -11.473226, z: 0}
+ m_LocalPosition: {x: -6.2104216, y: -8.436971, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 859204532752934649}
- m_RootOrder: 2
+ m_Father: {fileID: 7794010570039865837}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &5604007513671999945
+--- !u!114 &154361242173614911
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8301479065266073315}
+ m_GameObject: {fileID: 8329549254214092205}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3}
m_Name:
m_EditorClassIdentifier:
- curve: {fileID: 1952621253556122490}
+ curve: {fileID: 5028931464679965393}
handleType: 0
- leftHandleLocalPosition: {x: 0.5113182, y: 3.0982685, z: 0}
- rightHandleLocalPosition: {x: -0.5113182, y: -3.0982685, z: -0}
+ leftHandleLocalPosition: {x: 0.113266945, y: -3.239089, z: -0}
+ rightHandleLocalPosition: {x: -0.113266945, y: 3.239089, z: 0}
--- !u!1 &8374269071208543947
GameObject:
m_ObjectHideFlags: 0
@@ -4032,7 +3952,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8420216369808110984}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.54, y: 0.04, z: 0}
+ m_LocalPosition: {x: 1.25, y: -0.4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 0}
m_Children:
- {fileID: 4105870158783184291}
@@ -4133,7 +4053,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 2
+ m_SortingOrder: -10
m_Sprite: {fileID: -5050977528292827191, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -4173,7 +4093,7 @@ MonoBehaviour:
lefty: 1
rotSpeed: -140
fallLeftCurve: {fileID: 7191847337805905266}
- fallRightCurve: {fileID: 3952005353723229456}
+ fallRightCurve: {fileID: 5028931464679965393}
halvesParent: {fileID: 2078672318315355962}
--- !u!1 &8597163618617364548
GameObject:
@@ -4282,7 +4202,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8691542995859896262}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -11.5, y: 0.04, z: 0}
+ m_LocalPosition: {x: -12, y: -0.4, z: 0}
m_LocalScale: {x: -1, y: 1, z: 0}
m_Children:
- {fileID: 1664301961629353688}
diff --git a/Assets/Resources/Sfx/games/dogNinja/idol1.ogg b/Assets/Resources/Sfx/games/dogNinja/idol1.ogg
new file mode 100644
index 00000000..0c57c26c
Binary files /dev/null and b/Assets/Resources/Sfx/games/dogNinja/idol1.ogg differ
diff --git a/Assets/Resources/Sfx/games/dogNinja/idol1.ogg.meta b/Assets/Resources/Sfx/games/dogNinja/idol1.ogg.meta
new file mode 100644
index 00000000..1b38686c
--- /dev/null
+++ b/Assets/Resources/Sfx/games/dogNinja/idol1.ogg.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: e5077060a698afe4bb6389271baf668b
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/dogNinja/idol2.ogg b/Assets/Resources/Sfx/games/dogNinja/idol2.ogg
new file mode 100644
index 00000000..61b2dbc5
Binary files /dev/null and b/Assets/Resources/Sfx/games/dogNinja/idol2.ogg differ
diff --git a/Assets/Resources/Sfx/games/dogNinja/idol2.ogg.meta b/Assets/Resources/Sfx/games/dogNinja/idol2.ogg.meta
new file mode 100644
index 00000000..aacdfd2d
--- /dev/null
+++ b/Assets/Resources/Sfx/games/dogNinja/idol2.ogg.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 1fbe16fb932fffb4eb2df28a210fd24a
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/PrepareIdle.anim b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/PrepareIdle.anim
index b339f2ce..22cd4f10 100644
--- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/PrepareIdle.anim
+++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/PrepareIdle.anim
@@ -27,7 +27,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: {x: 0, y: 0, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -53,7 +53,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: {x: 0, y: -1.12, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -78,7 +78,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: {x: 0, y: -0.07, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -103,7 +103,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: {x: -9.18, y: -2.54, z: 20.748348}
inSlope: {x: Infinity, y: Infinity, z: 0}
outSlope: {x: Infinity, y: Infinity, z: 0}
@@ -128,7 +128,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: {x: -1.84, y: -1.93, z: 20.748348}
inSlope: {x: Infinity, y: Infinity, z: 0}
outSlope: {x: Infinity, y: Infinity, z: 0}
@@ -153,7 +153,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: {x: -5.5894957, y: -3.1524081, z: 20.748348}
inSlope: {x: Infinity, y: Infinity, z: 0}
outSlope: {x: Infinity, y: Infinity, z: 0}
@@ -178,7 +178,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: {x: -5.8489957, y: -3.078408, z: 20.748348}
inSlope: {x: Infinity, y: Infinity, z: 0}
outSlope: {x: Infinity, y: Infinity, z: 0}
@@ -203,7 +203,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: {x: -5.568996, y: -1.39, z: 20.748348}
inSlope: {x: Infinity, y: Infinity, z: 0}
outSlope: {x: Infinity, y: Infinity, z: 0}
@@ -230,7 +230,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: 2
inSlope: -0
outSlope: 0
@@ -249,7 +249,7 @@ AnimationClip:
- curve:
- time: 0
value: {fileID: -7602907453496852081, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
- - time: 1
+ - time: 20.166666
value: {fileID: -7602907453496852081, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
attribute: m_Sprite
path: DogBody/DogArmRight
@@ -258,7 +258,7 @@ AnimationClip:
- curve:
- time: 0
value: {fileID: 7849497092207798707, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
- - time: 1
+ - time: 20.166666
value: {fileID: 7849497092207798707, guid: 1c59b9cd0adef0941bc4bd4bde66a759, type: 3}
attribute: m_Sprite
path: DogBody/DogArmLeft
@@ -358,7 +358,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 1.0333333
+ m_StopTime: 20.199999
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -387,7 +387,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -415,7 +415,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: -1.12
inSlope: Infinity
outSlope: Infinity
@@ -443,7 +443,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -471,7 +471,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -499,7 +499,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: -0.07
inSlope: Infinity
outSlope: Infinity
@@ -527,7 +527,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -555,7 +555,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: -9.18
inSlope: Infinity
outSlope: Infinity
@@ -583,7 +583,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: -2.54
inSlope: Infinity
outSlope: Infinity
@@ -611,7 +611,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: 20.748348
inSlope: 0
outSlope: 0
@@ -639,7 +639,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: -1.84
inSlope: Infinity
outSlope: Infinity
@@ -667,7 +667,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: -1.93
inSlope: Infinity
outSlope: Infinity
@@ -695,7 +695,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: 20.748348
inSlope: 0
outSlope: 0
@@ -723,7 +723,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -751,7 +751,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -779,7 +779,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -807,7 +807,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: 2
inSlope: -0
outSlope: 0
@@ -835,7 +835,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: -5.5894957
inSlope: Infinity
outSlope: Infinity
@@ -863,7 +863,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: -3.1524081
inSlope: Infinity
outSlope: Infinity
@@ -891,7 +891,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: 20.748348
inSlope: 0
outSlope: 0
@@ -919,7 +919,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: -5.8489957
inSlope: Infinity
outSlope: Infinity
@@ -947,7 +947,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: -3.078408
inSlope: Infinity
outSlope: Infinity
@@ -975,7 +975,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: 20.748348
inSlope: 0
outSlope: 0
@@ -1003,7 +1003,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: -5.568996
inSlope: Infinity
outSlope: Infinity
@@ -1031,7 +1031,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: -1.39
inSlope: Infinity
outSlope: Infinity
@@ -1059,7 +1059,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 1
+ time: 20.166666
value: 20.748348
inSlope: 0
outSlope: 0
diff --git a/Assets/Resources/Sprites/Games/DogNinja/DogNinja_OtherObjects.png b/Assets/Resources/Sprites/Games/DogNinja/DogNinja_OtherObjects.png
index e77a41b2..da692282 100644
Binary files a/Assets/Resources/Sprites/Games/DogNinja/DogNinja_OtherObjects.png and b/Assets/Resources/Sprites/Games/DogNinja/DogNinja_OtherObjects.png differ
diff --git a/Assets/Resources/Sprites/Games/DogNinja/DogNinja_OtherObjects.png.meta b/Assets/Resources/Sprites/Games/DogNinja/DogNinja_OtherObjects.png.meta
index 5fdd767e..662f7a9c 100644
--- a/Assets/Resources/Sprites/Games/DogNinja/DogNinja_OtherObjects.png.meta
+++ b/Assets/Resources/Sprites/Games/DogNinja/DogNinja_OtherObjects.png.meta
@@ -11,6 +11,15 @@ TextureImporter:
- first:
213: -8501646544172160823
second: AmongUs_Right
+ - first:
+ 213: 2196219148037962045
+ second: Idol_Full
+ - first:
+ 213: -130797512336752496
+ second: Idol_Left
+ - first:
+ 213: 8490305602720712907
+ second: Idol_Right
externalObjects: {}
serializedVersion: 11
mipmaps:
@@ -657,6 +666,69 @@ TextureImporter:
indices:
edges: []
weights: []
+ - serializedVersion: 2
+ name: Idol_Full
+ rect:
+ serializedVersion: 2
+ x: 153
+ y: 1781
+ width: 110
+ height: 201
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: d39b6b7dda98a7e10800000000000000
+ internalID: 2196219148037962045
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Idol_Left
+ rect:
+ serializedVersion: 2
+ x: 165
+ y: 1516
+ width: 103
+ height: 198
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 090c9a30b505f2ef0800000000000000
+ internalID: -130797512336752496
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Idol_Right
+ rect:
+ serializedVersion: 2
+ x: 190
+ y: 1253
+ width: 78
+ height: 199
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: bc84dac46ff93d570800000000000000
+ internalID: 8490305602720712907
+ vertices: []
+ indices:
+ edges: []
+ weights: []
outline: []
physicsShape: []
bones: []
diff --git a/Assets/Scripts/Games/DogNinja/DogNinja.cs b/Assets/Scripts/Games/DogNinja/DogNinja.cs
index 81d4e669..56c821c1 100644
--- a/Assets/Scripts/Games/DogNinja/DogNinja.cs
+++ b/Assets/Scripts/Games/DogNinja/DogNinja.cs
@@ -27,49 +27,15 @@ namespace HeavenStudio.Games.Loaders
function = delegate { DogNinja.instance.Prepare(eventCaller.currentEntity.beat); },
defaultLength = 0.5f,
},
- /*
new GameAction("ThrowObject", "Throw Object")
{
- function = delegate { var e = eventCaller.currentEntity; DogNinja.instance.ThrowObject(e.beat, e["type"], e["text"], e["left"], false); },
+ function = delegate { var e = eventCaller.currentEntity; DogNinja.instance.ThrowObject(e.beat, e["direction"], e["typeL"], e["typeR"]); },
defaultLength = 2,
parameters = new List()
{
- new Param("type", DogNinja.ObjectType.Random, "Object", "The object to be thrown"),
- new Param("text", "", "Alt. Objects", "An alternative object; one that doesn't exist in the main menu"),
- new Param("left", true, "Throw from left?", "Whether the object should come from the left or right")
- }
- },
- */
- new GameAction("ThrowObjectLeft", "Throw Object Left")
- {
- function = delegate { var e = eventCaller.currentEntity; DogNinja.instance.ThrowObject(e.beat, e["type"], e["text"], true, false); },
- defaultLength = 2,
- parameters = new List()
- {
- new Param("type", DogNinja.ObjectType.Random, "Object", "The object to be thrown"),
- new Param("text", "", "Alt. Objects", "An alternative object; one that doesn't exist in the main menu"),
- }
- },
- new GameAction("ThrowObjectRight", "Throw Object Right")
- {
- function = delegate { var e = eventCaller.currentEntity; DogNinja.instance.ThrowObject(e.beat, e["type"], e["text"], false, false); },
- defaultLength = 2,
- parameters = new List()
- {
- new Param("type", DogNinja.ObjectType.Random, "Object", "The object to be thrown"),
- new Param("text", "", "Alt. Objects", "An alternative object; one that doesn't exist in the main menu"),
- }
- },
- new GameAction("ThrowObjectBoth", "Throw Object Left & Right")
- {
- function = delegate { var e = eventCaller.currentEntity; DogNinja.instance.ThrowBothObject(e.beat, e["type"], e["type2"], e["text"], e["text2"]); },
- defaultLength = 2,
- parameters = new List()
- {
- new Param("type", DogNinja.ObjectType.Random, "Left Object", "The object on the left to be thrown"),
- new Param("type2", DogNinja.ObjectType.Random, "Right Object", "The object on the right to be thrown"),
- new Param("text", "", "Left Alt. Object", "An alternative object on the left; one that doesn't exist in the main menu"),
- new Param("text2", "", "Right Alt. Object", "An alternative object on the right; one that doesn't exist in the main menu"),
+ new Param("direction", DogNinja.ObjectDirection.Left, "Which Side", "Whether the object should come from the left, right, or both sides"),
+ new Param("typeL", DogNinja.ObjectType.Random, "Left \nObject", "The object to be thrown from the left"),
+ new Param("typeR", DogNinja.ObjectType.Random, "Right Object", "The object to be thrown from the right"),
}
},
new GameAction("CutEverything", "Cut Everything!")
@@ -88,6 +54,39 @@ namespace HeavenStudio.Games.Loaders
defaultLength = 2,
inactiveFunction = delegate { DogNinja.HereWeGoInactive(eventCaller.currentEntity.beat); },
},
+
+ // these are still here for backwards-compatibility but are hidden in the editor
+ new GameAction("ThrowObjectLeft", "Throw Object Left")
+ {
+ function = delegate { var e = eventCaller.currentEntity; DogNinja.instance.ThrowObject(e.beat, 0, e["type"], 0); },
+ defaultLength = 2,
+ hidden = true,
+ parameters = new List()
+ {
+ new Param("type", DogNinja.ObjectType.Random, "Object", "The object to be thrown"),
+ }
+ },
+ new GameAction("ThrowObjectRight", "Throw Object Right")
+ {
+ function = delegate { var e = eventCaller.currentEntity; DogNinja.instance.ThrowObject(e.beat, 1, 0, e["type"]); },
+ defaultLength = 2,
+ hidden = true,
+ parameters = new List()
+ {
+ new Param("type", DogNinja.ObjectType.Random, "Object", "The object to be thrown"),
+ }
+ },
+ new GameAction("ThrowObjectBoth", "Throw Object Both")
+ {
+ function = delegate { var e = eventCaller.currentEntity; DogNinja.instance.ThrowBothObject(e.beat, e["typeL"], e["typeR"]); },
+ defaultLength = 2,
+ hidden = true,
+ parameters = new List()
+ {
+ new Param("typeL", DogNinja.ObjectType.Random, "Left Object", "The object on the left to be thrown"),
+ new Param("typeR", DogNinja.ObjectType.Random, "Right Object", "The object on the right to be thrown"),
+ }
+ },
});
}
}
@@ -117,7 +116,6 @@ namespace HeavenStudio.Games
[SerializeField] BezierCurve3D CurveFromRight;
[SerializeField] Sprite[] ObjectTypes;
- [SerializeField] Sprite[] CustomObjects;
private float lastReportedBeat = 0f;
private bool birdOnScreen = false;
@@ -128,6 +126,13 @@ namespace HeavenStudio.Games
public static DogNinja instance;
+ public enum ObjectDirection
+ {
+ Left,
+ Right,
+ Both,
+ }
+
public enum ObjectType
{
Random, // random fruit
@@ -140,10 +145,19 @@ namespace HeavenStudio.Games
Bone, // bone
Pan, // pan
Tire, // tire
- Custom, // directs to custom stuff
+ // custom objects that aren't in the og game
+ AirBatter,
+ Karateka,
+ IaiGiriGaiden,
+ ThumpFarm,
+ BattingShow,
+ MeatGrinder,
+ Idol,
+ TacoBell,
+ //YaseiNoIkiG3M4,
}
- // input these into the secret object box for custom objects
+ /*
public enum CustomObject
{
TacoBell,
@@ -157,11 +171,11 @@ namespace HeavenStudio.Games
//YaseiNoIkiG3M4,
//AmongUs,
}
+ */
private void Awake()
{
instance = this;
- cutEverythingCanvas.worldCamera = GameCamera.instance.camera;
}
private void Update()
@@ -170,7 +184,7 @@ namespace HeavenStudio.Games
{
DogAnim.DoScaledAnimationAsync("Prepare", 0.5f);
DogAnim.SetBool("needPrepare", true);
- };
+ }
if (PlayerInput.Pressed() && !IsExpectingInputNow(InputType.STANDARD_DOWN))
{
@@ -181,12 +195,12 @@ namespace HeavenStudio.Games
slice = "WhiffRight";
} else {
slice = "WhiffLeft";
- };
+ }
DogAnim.DoScaledAnimationAsync(slice, 0.5f);
Jukebox.PlayOneShotGame("dogNinja/whiff");
DogAnim.SetBool("needPrepare", false);
- };
+ }
}
private void LateUpdate()
@@ -194,7 +208,7 @@ namespace HeavenStudio.Games
if (Conductor.instance.ReportBeat(ref lastReportedBeat) && DogAnim.IsAnimationNotPlaying() && !dontBop)
{
DogAnim.DoScaledAnimationAsync("Bop", 0.5f);
- };
+ }
}
public void Bop(float beat, bool bop)
@@ -202,42 +216,49 @@ namespace HeavenStudio.Games
dontBop = !bop;
}
- public void SetCustomText(string text)
+ public void ThrowObject(float beat, int direction, int typeL, int typeR)
{
- cutEverythingText.text = text;
- }
-
- public void ThrowObject(float beat, int ObjType, string textObj, bool fromLeft, bool fromBoth)
- {
- int ObjSprite = ObjType;
- if (ObjType == 10) {
- // custom object code, uses the enum to turn the input string into integer to get the sprite
- Enum.TryParse(textObj, true, out CustomObject notIntObj);
- ObjSprite = (int) notIntObj;
- usesCustomObject = true;
- WhichObject.sprite = CustomObjects[ObjSprite];
- } else if (ObjType == 0) {
+ int ObjSprite = 1;
+ if ((typeL == 0 && direction == 0)
+ || (typeR == 0 && direction == 1)
+ || ((typeL == 0 || typeR == 0) && direction == 2)) {
// random object code. it makes a random number from 1-6 and sets that as the sprite
System.Random rd = new System.Random();
ObjSprite = rd.Next(1, 6);
WhichObject.sprite = ObjectTypes[ObjSprite];
- } else { WhichObject.sprite = ObjectTypes[ObjSprite]; };
+ typeL = ObjSprite;
+ typeR = ObjSprite;
+ }
// instantiate a game object and give it its variables
- ThrowObject Object = Instantiate(ObjectBase, ObjectHolder).GetComponent();
- Object.startBeat = beat;
- Object.curve = fromLeft ? CurveFromLeft : CurveFromRight;
- Object.fromLeft = fromLeft;
- Object.fromBoth = fromBoth;
- Object.textObj = textObj;
- Object.type = ObjType;
- Object.spriteInt = (ObjType == 10 ? ObjSprite + 10 : ObjSprite);
+ if (direction == 0 || direction == 2) {
+ WhichObject.sprite = ObjectTypes[typeL];
+ ThrowObject ObjectL = Instantiate(ObjectBase, ObjectHolder).GetComponent();
+ ObjectL.startBeat = beat;
+ ObjectL.curve = CurveFromLeft;
+ ObjectL.fromLeft = true;
+ ObjectL.direction = direction;
+ ObjectL.type = typeL;
+ ObjectL.textObj = Enum.GetName(typeof(ObjectType), typeL);
+ }
+
+ if (direction == 1 || direction == 2) {
+ WhichObject.sprite = ObjectTypes[typeR];
+ ThrowObject ObjectR = Instantiate(ObjectBase, ObjectHolder).GetComponent();
+ ObjectR.startBeat = beat;
+ ObjectR.curve = CurveFromRight;
+ ObjectR.fromLeft = false;
+ ObjectR.direction = direction;
+ ObjectR.type = typeR;
+ ObjectR.textObj = Enum.GetName(typeof(ObjectType), typeR);
+ }
}
- public void ThrowBothObject(float beat, int ObjType1, int ObjType2, string textObj1, string textObj2)
+ // only here for backwards compatibility
+ public void ThrowBothObject(float beat, int ObjType1, int ObjType2)
{
- ThrowObject(beat, ObjType1, textObj1, false, true);
- ThrowObject(beat, ObjType2, textObj2, true, true);
+ ThrowObject(beat, 0, ObjType1, 0);
+ ThrowObject(beat, 1, 0, ObjType2);
}
public void CutEverything(float beat, bool sound, string customText)
@@ -250,11 +271,11 @@ namespace HeavenStudio.Games
}
BirdAnim.Play("FlyIn", 0, 0);
birdOnScreen = true;
- SetCustomText(customText);
+ cutEverythingText.text = customText;
} else {
BirdAnim.Play("FlyOut", 0, 0);
birdOnScreen = false;
- };
+ }
}
public void Prepare(float beat)
diff --git a/Assets/Scripts/Games/DogNinja/SpawnHalves.cs b/Assets/Scripts/Games/DogNinja/SpawnHalves.cs
index 6dcd3d4a..7131afc8 100644
--- a/Assets/Scripts/Games/DogNinja/SpawnHalves.cs
+++ b/Assets/Scripts/Games/DogNinja/SpawnHalves.cs
@@ -41,8 +41,8 @@ namespace HeavenStudio.Games.Scripts_DogNinja
private void Update()
{
- float flyPosHalves = Conductor.instance.GetPositionFromBeat(songPos, 1f)+1f;
- flyPosHalves *= 0.25f;
+ float flyPosHalves = (Conductor.instance.GetPositionFromBeat(songPos, 3f)*(Conductor.instance.GetPositionFromBeat(songPos, 3f)))+Conductor.instance.GetPositionFromBeat(songPos, 1f);
+ flyPosHalves = (flyPosHalves*0.2f)+0.34f;
transform.position = curve.GetPoint(flyPosHalves)+objPos;
float rot = rotSpeed;
diff --git a/Assets/Scripts/Games/DogNinja/ThrowObject.cs b/Assets/Scripts/Games/DogNinja/ThrowObject.cs
index f21b8813..ea860023 100644
--- a/Assets/Scripts/Games/DogNinja/ThrowObject.cs
+++ b/Assets/Scripts/Games/DogNinja/ThrowObject.cs
@@ -12,10 +12,11 @@ namespace HeavenStudio.Games.Scripts_DogNinja
{
public float startBeat;
public int type;
- public int spriteInt;
public string textObj;
public bool fromLeft;
- public bool fromBoth = false;
+ public bool fromRight;
+ public int direction;
+
private Vector3 objPos;
private bool isActive = true;
private float barelyTime;
@@ -47,25 +48,9 @@ namespace HeavenStudio.Games.Scripts_DogNinja
{
barelyCurve = fromLeft ? BarelyRightCurve : BarelyLeftCurve;
- switch (type) {
- case 7:
- sfxNum += "bone";
- break;
- case 8:
- sfxNum += "pan";
- break;
- case 9:
- sfxNum += "tire";
- break;
- case 10:
- sfxNum += textObj;
- break;
- default:
- sfxNum += "fruit";
- break;
- };
+ sfxNum += type < 7 ? "fruit" : textObj;
- if (fromLeft && fromBoth) {} else { Jukebox.PlayOneShotGame(sfxNum+"1"); }
+ if (direction == 2 && fromLeft) {} else { Jukebox.PlayOneShotGame(sfxNum+"1"); }
game.ScheduleInput(startBeat, 1f, InputType.STANDARD_DOWN, Hit, Miss, Out);
@@ -83,39 +68,39 @@ namespace HeavenStudio.Games.Scripts_DogNinja
// destroy object when it's off-screen
if (flyPos > 1f) {
GameObject.Destroy(gameObject);
- };
+ }
} else {
flyPosBarely *= 0.3f;
- transform.position = barelyCurve.GetPoint(flyPosBarely) + (objPos/3);
+ transform.position = barelyCurve.GetPoint(flyPosBarely) + objPos;
float rot = fromLeft ? 200f : -200f;
transform.rotation = Quaternion.Euler(0, 0, transform.rotation.eulerAngles.z + (rot * Time.deltaTime));
if (flyPosBarely > 1f) {
GameObject.Destroy(gameObject);
- };
+ }
}
if ((!Conductor.instance.isPlaying && !Conductor.instance.isPaused)
|| GameManager.instance.currentGame != "dogNinja") {
GameObject.Destroy(gameObject);
- };
+ }
}
private void SuccessSlice()
{
string Slice = "Slice";
- if (!fromBoth && fromLeft) {
+ if (direction == 0) {
Slice += "Left";
- } else if (!fromBoth && !fromLeft) {
+ } else if (direction == 1) {
Slice += "Right";
} else {
Slice += "Both";
- };
+ }
DogAnim.DoScaledAnimationAsync(Slice, 0.5f);
- if (fromLeft && fromBoth) {} else { Jukebox.PlayOneShotGame(sfxNum+"2"); }
+ if (!(direction == 2 && fromLeft)) Jukebox.PlayOneShotGame(sfxNum+"2");
- game.WhichLeftHalf.sprite = objectLeftHalves[spriteInt-1];
- game.WhichRightHalf.sprite = objectRightHalves[spriteInt-1];
+ game.WhichLeftHalf.sprite = objectLeftHalves[type-1];
+ game.WhichRightHalf.sprite = objectRightHalves[type-1];
SpawnHalves LeftHalf = Instantiate(HalvesLeftBase).GetComponent();
LeftHalf.startBeat = startBeat;
@@ -132,27 +117,20 @@ namespace HeavenStudio.Games.Scripts_DogNinja
private void JustSlice()
{
- Debug.Log("brake point before small");
isActive = false;
barelyTime = Conductor.instance.songPositionInBeats;
- Debug.Log("brake point middle 1 small");
-
string Barely = "Barely";
- if (!fromBoth && fromLeft) {
+ if (direction == 0) {
Barely += "Left";
- } else if (!fromBoth && !fromLeft) {
+ } else if (direction == 1) {
Barely += "Right";
} else {
Barely += "Both";
- };
-
- Debug.Log("brake point middle 2 small");
+ }
DogAnim.DoScaledAnimationAsync(Barely, 0.5f);
Jukebox.PlayOneShotGame("dogNinja/barely");
-
- Debug.Log("brake point end small");
}
private void Hit(PlayerActionEvent caller, float state)