diff --git a/Assets/Resources/Games/monkeyWatch.prefab b/Assets/Resources/Games/monkeyWatch.prefab index 4cc51eb21..d23257d3e 100644 --- a/Assets/Resources/Games/monkeyWatch.prefab +++ b/Assets/Resources/Games/monkeyWatch.prefab @@ -179,7 +179,7 @@ GameObject: - component: {fileID: 6735250992240119410} - component: {fileID: 7608272421746937287} m_Layer: 0 - m_Name: YellowMonkey_28 + m_Name: ClickerBase m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -194,11 +194,11 @@ Transform: m_GameObject: {fileID: 592800256640762048} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.5385705, y: 1.5385705, z: 2.6126} + m_LocalScale: {x: 1.5385704, y: 1.5385704, z: 2.6126} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1686621416582726728} - m_RootOrder: 5 + m_Father: {fileID: 609139906039373078} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7608272421746937287 SpriteRenderer: @@ -501,7 +501,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: -2092694573, guid: ece735d14a3649247bd5b86a66019d14, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.90588236, b: 0, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -527,7 +527,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &8933410290365592961 Transform: m_ObjectHideFlags: 0 @@ -583,9 +583,9 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -30 + m_SortingOrder: 958 m_Sprite: {fileID: 21300000, guid: 6faa141b7341553458d3535e756576c3, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.4862745} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -620,7 +620,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1372373552151859811} m_LocalRotation: {x: 0, y: 0, z: -0.258819, w: 0.9659259} - m_LocalPosition: {x: 14.61, y: -3.86, z: 0} + m_LocalPosition: {x: 14.667799, y: -3.86, z: 0} m_LocalScale: {x: 1.6764871, y: 1.6764871, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -788,7 +788,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1699875125704667383} m_LocalRotation: {x: 0, y: 0, z: 0.49242353, w: 0.8703557} - m_LocalPosition: {x: 3.94, y: 15.02, z: 0} + m_LocalPosition: {x: 3.9977992, y: 15.02, z: 0} m_LocalScale: {x: 1.6764871, y: 1.6764871, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -877,6 +877,7 @@ Transform: m_Children: - {fileID: 6271887630250502503} - {fileID: 5993038953420681816} + - {fileID: 6735250992240119410} m_Father: {fileID: 6857749598573628903} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -989,7 +990,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2334397362798718387} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.008, y: 4.6706, z: 0} + m_LocalPosition: {x: 0, y: 4.7194, z: 0} m_LocalScale: {x: 1.6697088, y: 1.669709, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1042,10 +1043,10 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 2 - m_Size: {x: 0.19224708, y: 5.595429} + m_Size: {x: 1.3577065, y: 5.6538534} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &2367820749231898468 @@ -1073,8 +1074,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2367820749231898468} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 11.8794, z: 0} - m_LocalScale: {x: 1.7178042, y: 1.7481207, z: 1} + m_LocalPosition: {x: 0, y: 7.2349, z: 0} + m_LocalScale: {x: 1.7000002, y: 1.75, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 609139906039373078} @@ -1125,8 +1126,8 @@ SpriteRenderer: m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.41, y: 3.56} + m_DrawMode: 2 + m_Size: {x: 1.3632327, y: 8.265193} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1241,7 +1242,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2852617849116252196} m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} - m_LocalPosition: {x: 4.03, y: -14.88, z: 0} + m_LocalPosition: {x: 4.087799, y: -14.88, z: 0} m_LocalScale: {x: 1.6764871, y: 1.6764871, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1500,7 +1501,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3225414514179263087} m_LocalRotation: {x: 0, y: 0, z: -0.4969739, w: 0.8677655} - m_LocalPosition: {x: 10.7, y: -10.88, z: 0} + m_LocalPosition: {x: 10.757799, y: -10.88, z: 0} m_LocalScale: {x: 1.6764871, y: 1.6764871, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1774,7 +1775,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 100 m_Sprite: {fileID: 440706406, guid: ece735d14a3649247bd5b86a66019d14, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.90588236, b: 0, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -1865,7 +1866,7 @@ SpriteRenderer: m_Size: {x: 0.3, y: 4.72} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &5309379439585438575 @@ -1977,8 +1978,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5556294075952713679} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.0976, y: 0.10059997, z: 0} - m_LocalScale: {x: 13.808507, y: 14.212714, z: 1} + m_LocalPosition: {x: 0.01, y: 0.0608, z: 0} + m_LocalScale: {x: 9.227934, y: 9.471468, z: 0.6690409} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5742479390175277464} @@ -2025,12 +2026,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: -5000 - m_Sprite: {fileID: -2015266458, guid: d68c7b31d1e251444875fd4ecee66b41, type: 3} + m_Sprite: {fileID: 1072064100, guid: d68c7b31d1e251444875fd4ecee66b41, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 9.1, y: 4.26} + m_Size: {x: 13.6475, y: 6.379096} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2137,7 +2138,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &3710552613722404842 Transform: m_ObjectHideFlags: 0 @@ -2349,7 +2350,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5977093605341259449} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 14.52, y: 4.3556, z: 0} + m_LocalPosition: {x: 14.5778, y: 4.3556, z: 0} m_LocalScale: {x: 1.6764871, y: 1.6764871, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2433,7 +2434,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6040918047024662796} m_LocalRotation: {x: 0, y: 0, z: 0.23514214, w: 0.971961} - m_LocalPosition: {x: 10.935, y: 10.775, z: 0} + m_LocalPosition: {x: 10.9928, y: 10.775, z: 0} m_LocalScale: {x: 1.6764871, y: 1.6764871, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2610,7 +2611,6 @@ Transform: - {fileID: 5742479390175277464} - {fileID: 6857749598573628903} - {fileID: 3735448262030941676} - - {fileID: 6735250992240119410} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2650,7 +2650,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1350481687627359037 Transform: m_ObjectHideFlags: 0 @@ -2792,7 +2792,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 300 m_Sprite: {fileID: -1233933164, guid: ece735d14a3649247bd5b86a66019d14, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.96862745, b: 0.7764706, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -3188,7 +3188,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 150 m_Sprite: {fileID: -479455839, guid: ece735d14a3649247bd5b86a66019d14, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.90588236, b: 0, a: 1} m_FlipX: 1 m_FlipY: 1 m_DrawMode: 0 @@ -3919,7 +3919,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 8.54 + value: 8.573999 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -3981,7 +3981,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 7.117 + value: 7.151 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -4043,7 +4043,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 6.484 + value: 6.5179996 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -4167,7 +4167,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 9.043 + value: 9.077 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -4229,7 +4229,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 8.152 + value: 8.186 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -4291,7 +4291,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 9.144 + value: 9.1779995 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -4477,7 +4477,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 4.969 + value: 5.0029993 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -4539,7 +4539,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 4.136 + value: 4.17 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -4663,7 +4663,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 2.371 + value: 2.4049997 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -4725,7 +4725,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 7.08 + value: 7.1139994 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -4787,7 +4787,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 5.77 + value: 5.804 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -4911,11 +4911,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: -0.48 + value: -0.49 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y - value: 9.45 + value: 9.426 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.z @@ -5035,7 +5035,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 8.159 + value: 8.193 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -5221,7 +5221,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 7.64 + value: 7.674 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -5345,7 +5345,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 6.46 + value: 6.4939995 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -5469,7 +5469,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 0.49399996 + value: 0.5279996 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -5655,11 +5655,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 0.48 + value: 0.49 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y - value: 9.45 + value: 9.426 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.z @@ -5717,7 +5717,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 8.836 + value: 8.87 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -5841,7 +5841,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 1.43 + value: 1.4639995 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -6089,7 +6089,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 9.143 + value: 9.176999 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -6151,7 +6151,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 9.033 + value: 9.066999 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -6275,7 +6275,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 2.36 + value: 2.3939996 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -6461,7 +6461,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 7.684 + value: 7.7179995 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -6523,7 +6523,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 3.285 + value: 3.3189998 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -6709,7 +6709,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 1.437 + value: 1.4709997 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -6771,7 +6771,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 3.272 + value: 3.3059998 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -6833,7 +6833,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 4.956 + value: 4.99 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -6895,7 +6895,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 8.54 + value: 8.573999 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -7143,7 +7143,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 5.731 + value: 5.7649994 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -7267,7 +7267,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 4.159 + value: 4.193 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y @@ -7577,7 +7577,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.x - value: 8.8 + value: 8.834 objectReference: {fileID: 0} - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/Resources/Prefabs/Games/MonkeyWatch/YellowMonkey.prefab b/Assets/Resources/Prefabs/Games/MonkeyWatch/YellowMonkey.prefab index ab5f93945..51c521dd8 100644 --- a/Assets/Resources/Prefabs/Games/MonkeyWatch/YellowMonkey.prefab +++ b/Assets/Resources/Prefabs/Games/MonkeyWatch/YellowMonkey.prefab @@ -30,7 +30,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7591110402097765485} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 11} --- !u!212 &4757259206305383986 SpriteRenderer: @@ -74,11 +74,11 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 500 m_Sprite: {fileID: 2081031743, guid: ece735d14a3649247bd5b86a66019d14, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.9686275, b: 0.77647066, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.24, y: 0.22} + m_Size: {x: 0.23143685, y: 0.21215044} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -112,98 +112,14 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6142637501679039689} - {fileID: 578644443856048843} - {fileID: 3003040404107589154} - {fileID: 3455820221676178794} - {fileID: 8968149438632956816} + - {fileID: 2533611777952458582} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4089771232471752769 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5265099234145244097} - - component: {fileID: 2366047461711923922} - m_Layer: 0 - m_Name: inwatch_start - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &5265099234145244097 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4089771232471752769} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.42, y: -1.274, z: 0} - m_LocalScale: {x: 0.8336579, y: 0.8336579, z: 0.8336579} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6142637501679039689} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2366047461711923922 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4089771232471752769} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 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: 200 - m_Sprite: {fileID: 21300000, guid: 6faa141b7341553458d3535e756576c3, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 9.65, y: 5.43} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &4387843619350040913 GameObject: m_ObjectHideFlags: 0 @@ -229,12 +145,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4387843619350040913} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.14, z: 0} + m_LocalPosition: {x: 0, y: -0.129, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7591110402097765485} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3314755753380406275 SpriteRenderer: @@ -278,17 +194,17 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 100 m_Sprite: {fileID: -1651821594, guid: ece735d14a3649247bd5b86a66019d14, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.9058824, b: 0, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.3, y: 0.4} + m_Size: {x: 0.28929606, y: 0.38572806} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 1 m_SpriteSortPoint: 0 ---- !u!1 &5844243359413133821 +--- !u!1 &4844877592706620044 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -296,31 +212,81 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6142637501679039689} + - component: {fileID: 2533611777952458582} + - component: {fileID: 2824558868062598211} m_Layer: 0 - m_Name: TEMPORARY (REFERENCE) + m_Name: Mask m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6142637501679039689 +--- !u!4 &2533611777952458582 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5844243359413133821} + m_GameObject: {fileID: 4844877592706620044} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0.109, z: 0} + m_LocalScale: {x: 0.30017, y: 0.30017, z: 0.30017} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3166995515749266788} - - {fileID: 5265099234145244097} + m_Children: [] m_Father: {fileID: 7591110402097765485} - m_RootOrder: 0 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!331 &2824558868062598211 +SpriteMask: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4844877592706620044} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10758, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 62b0551b4a0b9b443b13eccde717298b, type: 3} + m_MaskAlphaCutoff: 0.709 + m_FrontSortingLayerID: 0 + m_BackSortingLayerID: 0 + m_FrontSortingLayer: 0 + m_BackSortingLayer: 0 + m_FrontSortingOrder: 0 + m_BackSortingOrder: 0 + m_IsCustomRangeActive: 0 + m_SpriteSortPoint: 0 --- !u!1 &6243094713370705484 GameObject: m_ObjectHideFlags: 0 @@ -346,12 +312,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6243094713370705484} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.2, z: 0} + m_LocalPosition: {x: 0, y: 0.21, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7591110402097765485} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &454223507615240516 SpriteRenderer: @@ -399,7 +365,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.8, y: 0.46} + m_Size: {x: 0.7714561, y: 0.44358727} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -435,7 +401,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7591110402097765485} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -11} --- !u!212 &6250790891827607859 SpriteRenderer: @@ -479,111 +445,13 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 500 m_Sprite: {fileID: 2081031743, guid: ece735d14a3649247bd5b86a66019d14, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.9686275, b: 0.77647066, a: 1} m_FlipX: 1 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.24, y: 0.22} + m_Size: {x: 0.23143685, y: 0.21215044} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &1149232180709785067 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 6142637501679039689} - m_Modifications: - - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6362594358788386174, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7751086263875728498, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_MaskAlphaCutoff - value: 0.709 - objectReference: {fileID: 0} - - target: {fileID: 7875178042088495766, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7875178042088495766, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7875178042088495766, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7875178042088495766, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7875178042088495766, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7875178042088495766, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8325540476350084961, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_Name - value: watchHole - objectReference: {fileID: 0} - - target: {fileID: 8325540476350084961, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} ---- !u!4 &3166995515749266788 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2594505700513810575, guid: 7f787a2d660a6f6478223be4ec231249, type: 3} - m_PrefabInstance: {fileID: 1149232180709785067} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefabs/Games/MonkeyWatch/watchHole.prefab b/Assets/Resources/Prefabs/Games/MonkeyWatch/watchHole.prefab index 50a2e4584..a3e5ff151 100644 --- a/Assets/Resources/Prefabs/Games/MonkeyWatch/watchHole.prefab +++ b/Assets/Resources/Prefabs/Games/MonkeyWatch/watchHole.prefab @@ -78,7 +78,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.66, y: 0.66} + m_Size: {x: 0.6364513, y: 0.6364513} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -109,7 +109,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3089487638190135553} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.3, z: 0} + m_LocalPosition: {x: 0, y: 0.28642, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -162,95 +162,12 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.66, y: 0.66} + m_Size: {x: 0.6364513, y: 0.6364513} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &6362594358788386174 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5230661092118125212} - - component: {fileID: 7751086263875728498} - m_Layer: 0 - m_Name: Mask - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &5230661092118125212 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6362594358788386174} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.0969, z: 0} - m_LocalScale: {x: 0.3001723, y: 0.3001723, z: 0.3001723} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2594505700513810575} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!331 &7751086263875728498 -SpriteMask: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6362594358788386174} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10758, 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: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 62b0551b4a0b9b443b13eccde717298b, type: 3} - m_MaskAlphaCutoff: 0.2 - m_FrontSortingLayerID: 0 - m_BackSortingLayerID: 0 - m_FrontSortingLayer: 0 - m_BackSortingLayer: 0 - m_FrontSortingOrder: 0 - m_BackSortingOrder: 0 - m_IsCustomRangeActive: 0 - m_SpriteSortPoint: 0 --- !u!1 &8325540476350084961 GameObject: m_ObjectHideFlags: 0 @@ -282,7 +199,6 @@ Transform: m_Children: - {fileID: 8053705018061448386} - {fileID: 7875178042088495766} - - {fileID: 5230661092118125212} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHole/HoleOpen.anim b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHole/HoleOpen.anim index d8675596a..63cf24107 100644 --- a/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHole/HoleOpen.anim +++ b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/WatchHole/HoleOpen.anim @@ -21,15 +21,15 @@ AnimationClip: time: 0 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 674.99994, y: 0, z: 0} + outSlope: {x: 1080, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.26666668 + time: 0.16666667 value: {x: 180, y: 0, z: 0} - inSlope: {x: 674.99994, y: 0, z: 0} + inSlope: {x: 1080, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -46,7 +46,7 @@ AnimationClip: - curve: - time: 0 value: {fileID: 1429406580, guid: ece735d14a3649247bd5b86a66019d14, type: 3} - - time: 0.13333334 + - time: 0.1 value: {fileID: -70320958, guid: ece735d14a3649247bd5b86a66019d14, type: 3} attribute: m_Sprite path: Cover @@ -81,7 +81,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.26666668 + m_StopTime: 0.16666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -104,15 +104,15 @@ AnimationClip: time: 0 value: 0 inSlope: 0 - outSlope: 674.99994 + outSlope: 1080 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.26666668 + time: 0.16666667 value: 180 - inSlope: 674.99994 + inSlope: 1080 outSlope: 0 tangentMode: 69 weightedMode: 0 diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/MonkeyMask.png.meta b/Assets/Resources/Sprites/Games/MonkeyWatch/MonkeyMask.png.meta index 524642c1f..aab306e0b 100644 --- a/Assets/Resources/Sprites/Games/MonkeyWatch/MonkeyMask.png.meta +++ b/Assets/Resources/Sprites/Games/MonkeyWatch/MonkeyMask.png.meta @@ -119,5 +119,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: rvlwatch/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/MonkeyWatch.png b/Assets/Resources/Sprites/Games/MonkeyWatch/MonkeyWatch.png index bea89e505..77bc77828 100644 Binary files a/Assets/Resources/Sprites/Games/MonkeyWatch/MonkeyWatch.png and b/Assets/Resources/Sprites/Games/MonkeyWatch/MonkeyWatch.png differ diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/MonkeyWatch.png.meta b/Assets/Resources/Sprites/Games/MonkeyWatch/MonkeyWatch.png.meta index d69d76e6b..8d9670e3b 100644 --- a/Assets/Resources/Sprites/Games/MonkeyWatch/MonkeyWatch.png.meta +++ b/Assets/Resources/Sprites/Games/MonkeyWatch/MonkeyWatch.png.meta @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 400 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -108,19 +108,19 @@ TextureImporter: name: MonkeyWatch_0 rect: serializedVersion: 2 - x: 25 - y: 578 - width: 910 - height: 426 + x: 79 + y: 255 + width: 5459 + height: 2551 alignment: 9 - pivot: {x: 0.48175627, y: 0.5350789} + pivot: {x: 0.48187697, y: 0.53442585} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: bb1d1650d1ee39047a36ebebfd680bd6 - internalID: -2015266458 + spriteID: 6ce67e92a17a26b4c9c78459cd6c0b41 + internalID: 1072064100 vertices: [] indices: edges: [] @@ -129,10 +129,10 @@ TextureImporter: name: MonkeyWatch_1 rect: serializedVersion: 2 - x: 1000 - y: 0 - width: 24 - height: 24 + x: 5645 + y: 11 + width: 244 + height: 2850 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -140,8 +140,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 1e256cac20b8d1845a7360561b9cc887 - internalID: 805309695 + spriteID: c0207d307ec81804eb0da99b292b2cef + internalID: -1453325025 vertices: [] indices: edges: [] @@ -150,10 +150,10 @@ TextureImporter: name: MonkeyWatch_2 rect: serializedVersion: 2 - x: 747 - y: 515 - width: 42 - height: 26 + x: 5919 + y: 2656 + width: 256 + height: 162 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -161,8 +161,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 08397edce1eac0d4a931471bfb5a3b13 - internalID: 1761689939 + spriteID: 3c99daa7167b4864399d71f7b880eff4 + internalID: 2007507506 vertices: [] indices: edges: [] @@ -171,10 +171,10 @@ TextureImporter: name: MonkeyWatch_3 rect: serializedVersion: 2 - x: 811 - y: 515 - width: 42 - height: 26 + x: 6236 + y: 2647 + width: 256 + height: 171 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -182,8 +182,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 272ac36182ba8124c92190a83c0adc57 - internalID: -1346082451 + spriteID: e940a04b91e772f4da5d298108630bbe + internalID: 2012457510 vertices: [] indices: edges: [] @@ -192,10 +192,10 @@ TextureImporter: name: MonkeyWatch_4 rect: serializedVersion: 2 - x: 811 - y: 449 - width: 42 - height: 28 + x: 6553 + y: 2656 + width: 256 + height: 162 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -203,8 +203,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 8260b25501b15a44eb1f16297b4ab8bf - internalID: 924833913 + spriteID: fe8e715b5c4a7d049b00d2fab2ab6e4f + internalID: 1591378944 vertices: [] indices: edges: [] @@ -213,10 +213,10 @@ TextureImporter: name: MonkeyWatch_5 rect: serializedVersion: 2 - x: 297 - y: 516 - width: 155 - height: 24 + x: 6946 + y: 2789 + width: 137 + height: 38 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -224,8 +224,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 82ea44d637e8d314cbdd98b163a476bc - internalID: 1522608017 + spriteID: 54ac1f6cc5cb23e49a277444f35d7315 + internalID: 1629202287 vertices: [] indices: edges: [] @@ -234,10 +234,10 @@ TextureImporter: name: MonkeyWatch_6 rect: serializedVersion: 2 - x: 510 - y: 480 - width: 60 - height: 62 + x: 7237 + y: 2416 + width: 77 + height: 437 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -245,8 +245,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 0aaa8030c14e4da4ba384967d716c347 - internalID: -1229511802 + spriteID: f6f818bbae291724289d2d3b7c76bce1 + internalID: 1882058124 vertices: [] indices: edges: [] @@ -255,10 +255,10 @@ TextureImporter: name: MonkeyWatch_7 rect: serializedVersion: 2 - x: 286 - y: 442 - width: 181 - height: 40 + x: 7396 + y: 1470 + width: 1361 + height: 1361 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -266,8 +266,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 1a797dc6bf70b15408e01c65ab662009 - internalID: -1628023556 + spriteID: 28b553707c7f6204d9fd104e05d62d09 + internalID: -1429985532 vertices: [] indices: edges: [] @@ -276,10 +276,10 @@ TextureImporter: name: MonkeyWatch_8 rect: serializedVersion: 2 - x: 298 - y: 398 - width: 191 - height: 21 + x: 6874 + y: 2669 + width: 51 + height: 111 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -287,8 +287,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 63380c6f53f451043a36b4077f903525 - internalID: 1472412363 + spriteID: ae0a1a3e165a3fe4aaf347976e0b2660 + internalID: 387254095 vertices: [] indices: edges: [] @@ -297,10 +297,10 @@ TextureImporter: name: MonkeyWatch_9 rect: serializedVersion: 2 - x: 289 - y: 295 - width: 220 - height: 80 + x: 7118 + y: 2677 + width: 74 + height: 107 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -308,8 +308,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: b4cb45d218591d44c9d5ec7a4665431c - internalID: 1703462278 + spriteID: 2dafd5f42afa2ad45915de023d7940ab + internalID: -213037430 vertices: [] indices: edges: [] @@ -318,10 +318,10 @@ TextureImporter: name: MonkeyWatch_10 rect: serializedVersion: 2 - x: 674 - y: 510 - width: 53 - height: 36 + x: 6951 + y: 2613 + width: 158 + height: 56 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -329,8 +329,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: cf9fcec3cacb5a44cab53e6350183ab0 - internalID: 1783564505 + spriteID: 78595f47840d19944a06ade1cb38dc95 + internalID: -1738514037 vertices: [] indices: edges: [] @@ -339,10 +339,10 @@ TextureImporter: name: MonkeyWatch_11 rect: serializedVersion: 2 - x: 882 - y: 472 - width: 12 - height: 70 + x: 5906 + y: 1971 + width: 86 + height: 398 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -350,8 +350,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 879813c2cde1c8649bab6213ceb21e07 - internalID: -923058555 + spriteID: 15c26eda2b1db8c4599aa1ac25e917df + internalID: -344685140 vertices: [] indices: edges: [] @@ -360,10 +360,10 @@ TextureImporter: name: MonkeyWatch_12 rect: serializedVersion: 2 - x: 930 - y: 471 - width: 14 - height: 66 + x: 6043 + y: 2213 + width: 1152 + height: 130 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -371,8 +371,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 9b56b845aa583db40a3a3f5e1810dd9b - internalID: -507889466 + spriteID: 2e57c9c2e96612643b5c7bf0cc0a1974 + internalID: -1966378057 vertices: [] indices: edges: [] @@ -381,10 +381,10 @@ TextureImporter: name: MonkeyWatch_13 rect: serializedVersion: 2 - x: 977 - y: 536 - width: 30 - height: 472 + x: 5953 + y: 1436 + width: 1327 + height: 484 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -392,8 +392,71 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: ce8c8900ba51c2e47ac661c8f5e3876e - internalID: -1643845245 + spriteID: 8e2f1b862fe959c4c9be6ce6d7d45cd2 + internalID: -466331413 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: MonkeyWatch_14 + rect: + serializedVersion: 2 + x: 5940 + y: 1038 + width: 1096 + height: 252 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1db03a6d91c6af24897520290e2015ca + internalID: -112909732 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: MonkeyWatch_15 + rect: + serializedVersion: 2 + x: 5945 + y: 752 + width: 941 + height: 149 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 145753b281145e34caf60b5f8bda9338 + internalID: -2102552351 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: MonkeyWatch_16 + rect: + serializedVersion: 2 + x: 6968 + y: 567 + width: 364 + height: 385 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b0d744d6d014f824a8a7ed3855b590b6 + internalID: 307813381 vertices: [] indices: edges: [] @@ -409,20 +472,23 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: - MonkeyWatch_0: -2015266458 - MonkeyWatch_1: 805309695 - MonkeyWatch_10: 1783564505 - MonkeyWatch_11: -923058555 - MonkeyWatch_12: -507889466 - MonkeyWatch_13: -1643845245 - MonkeyWatch_2: 1761689939 - MonkeyWatch_3: -1346082451 - MonkeyWatch_4: 924833913 - MonkeyWatch_5: 1522608017 - MonkeyWatch_6: -1229511802 - MonkeyWatch_7: -1628023556 - MonkeyWatch_8: 1472412363 - MonkeyWatch_9: 1703462278 + MonkeyWatch_0: 1072064100 + MonkeyWatch_1: -1453325025 + MonkeyWatch_10: -1738514037 + MonkeyWatch_11: -344685140 + MonkeyWatch_12: -1966378057 + MonkeyWatch_13: -466331413 + MonkeyWatch_14: -112909732 + MonkeyWatch_15: -2102552351 + MonkeyWatch_16: 307813381 + MonkeyWatch_2: 2007507506 + MonkeyWatch_3: 2012457510 + MonkeyWatch_4: 1591378944 + MonkeyWatch_5: 1629202287 + MonkeyWatch_6: 1882058124 + MonkeyWatch_7: -1429985532 + MonkeyWatch_8: 387254095 + MonkeyWatch_9: -213037430 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/WatchMonkeys.png b/Assets/Resources/Sprites/Games/MonkeyWatch/WatchMonkeys.png new file mode 100644 index 000000000..f442b8d41 Binary files /dev/null and b/Assets/Resources/Sprites/Games/MonkeyWatch/WatchMonkeys.png differ diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/YellowMonkeyOld.png.meta b/Assets/Resources/Sprites/Games/MonkeyWatch/WatchMonkeys.png.meta similarity index 67% rename from Assets/Resources/Sprites/Games/MonkeyWatch/YellowMonkeyOld.png.meta rename to Assets/Resources/Sprites/Games/MonkeyWatch/WatchMonkeys.png.meta index 212d120ee..9396b7976 100644 --- a/Assets/Resources/Sprites/Games/MonkeyWatch/YellowMonkeyOld.png.meta +++ b/Assets/Resources/Sprites/Games/MonkeyWatch/WatchMonkeys.png.meta @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 103.7 + spritePixelsToUnits: 414.8 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -108,18 +108,18 @@ TextureImporter: name: YellowMonkey_0 rect: serializedVersion: 2 - x: 24 - y: 942 - width: 80 - height: 46 + x: 96 + y: 3768 + width: 320 + height: 184 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 4a45f2a37836f7f4ca4b20bd9f735ea9 + spriteID: 6a78c893000000000800000000000000 internalID: 965511078 vertices: [] indices: @@ -129,18 +129,18 @@ TextureImporter: name: YellowMonkey_1 rect: serializedVersion: 2 - x: 152 - y: 942 - width: 80 - height: 46 + x: 608 + y: 3768 + width: 320 + height: 184 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 603016014bd55ad4ab6ae911cb774019 + spriteID: 4d9d2334000000000800000000000000 internalID: 1127406036 vertices: [] indices: @@ -150,18 +150,18 @@ TextureImporter: name: YellowMonkey_2 rect: serializedVersion: 2 - x: 280 - y: 942 - width: 80 - height: 46 + x: 1120 + y: 3768 + width: 320 + height: 184 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: ba6c41776c2ca0f44bffd3d5748344c5 + spriteID: aa56077cffffffff0800000000000000 internalID: -948935254 vertices: [] indices: @@ -171,18 +171,18 @@ TextureImporter: name: YellowMonkey_3 rect: serializedVersion: 2 - x: 408 - y: 942 - width: 80 - height: 46 + x: 1632 + y: 3768 + width: 320 + height: 184 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 002d447945ad45c4693ed3ba699151c4 + spriteID: c3b72da9ffffffff0800000000000000 internalID: -1697481924 vertices: [] indices: @@ -192,18 +192,18 @@ TextureImporter: name: YellowMonkey_4 rect: serializedVersion: 2 - x: 540 - y: 944 - width: 72 - height: 46 + x: 2160 + y: 3776 + width: 288 + height: 184 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: d4574077dd95a2543a6868c0f005ca49 + spriteID: 45be44d6000000000800000000000000 internalID: 1833233236 vertices: [] indices: @@ -213,18 +213,18 @@ TextureImporter: name: YellowMonkey_5 rect: serializedVersion: 2 - x: 676 - y: 944 - width: 56 - height: 46 + x: 2704 + y: 3776 + width: 224 + height: 184 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 93a3146cb19b1bc4c8a17d7ed688b058 + spriteID: f826c89dffffffff0800000000000000 internalID: -645111153 vertices: [] indices: @@ -234,18 +234,18 @@ TextureImporter: name: YellowMonkey_6 rect: serializedVersion: 2 - x: 799 - y: 944 - width: 66 - height: 46 + x: 3196 + y: 3776 + width: 264 + height: 184 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 5125a909ef309cf4cbcd53d4fda29eab + spriteID: c45a222fffffffff0800000000000000 internalID: -232610484 vertices: [] indices: @@ -255,18 +255,18 @@ TextureImporter: name: YellowMonkey_7 rect: serializedVersion: 2 - x: 919 - y: 946 - width: 82 - height: 46 + x: 3676 + y: 3784 + width: 328 + height: 184 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 69e17edac0be8fe4aaebc1d79056a1d7 + spriteID: 9c7cf4efffffffff0800000000000000 internalID: -28325943 vertices: [] indices: @@ -276,18 +276,18 @@ TextureImporter: name: YellowMonkey_8 rect: serializedVersion: 2 - x: 23 - y: 850 - width: 82 - height: 46 + x: 92 + y: 3400 + width: 328 + height: 184 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 5450b01f79f2ede44b679096b3e4302d + spriteID: 9182a1f8ffffffff0800000000000000 internalID: -1894111207 vertices: [] indices: @@ -297,102 +297,39 @@ TextureImporter: name: YellowMonkey_9 rect: serializedVersion: 2 - x: 156 - y: 852 - width: 72 - height: 46 + x: 624 + y: 3408 + width: 288 + height: 184 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: d69604ec5c876834b88beedd1dc4a830 + spriteID: abb95c10000000000800000000000000 internalID: 29727674 vertices: [] indices: edges: [] weights: [] - - serializedVersion: 2 - name: YellowMonkey_10 - rect: - serializedVersion: 2 - x: 273 - y: 875 - width: 46 - height: 21 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 87efbda62c025674f933486160f98854 - internalID: 1750096047 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: YellowMonkey_11 - rect: - serializedVersion: 2 - x: 349 - y: 872 - width: 62 - height: 36 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 01214aa328b6ca9488c8958ee8e6f13b - internalID: 552770996 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: YellowMonkey_12 - rect: - serializedVersion: 2 - x: 439 - y: 866 - width: 66 - height: 46 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: c21729b16a974da48800079fe5847082 - internalID: 1193611724 - vertices: [] - indices: - edges: [] - weights: [] - serializedVersion: 2 name: YellowMonkey_13 rect: serializedVersion: 2 - x: 627 - y: 843 - width: 66 - height: 66 + x: 2508 + y: 3372 + width: 264 + height: 264 alignment: 9 pivot: {x: 0.5, y: 0.95} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 1853e8ba75b9811439f2f1a09f0a12af + spriteID: 47303355000000000800000000000000 internalID: 1429406580 vertices: [] indices: @@ -402,18 +339,18 @@ TextureImporter: name: YellowMonkey_14 rect: serializedVersion: 2 - x: 731 - y: 843 - width: 66 - height: 66 + x: 2924 + y: 3372 + width: 264 + height: 264 alignment: 9 pivot: {x: 0.5, y: 0.985} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: f73588f233ef1814c947fe05e68e98af + spriteID: 2ccfecbfffffffff0800000000000000 internalID: -70320958 vertices: [] indices: @@ -423,18 +360,18 @@ TextureImporter: name: YellowMonkey_15 rect: serializedVersion: 2 - x: 835 - y: 843 - width: 66 - height: 66 + x: 3340 + y: 3372 + width: 264 + height: 264 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 8130cb1ad15b2854c9ced9595a5bea5f + spriteID: cf7a98a5000000000800000000000000 internalID: 1518970876 vertices: [] indices: @@ -444,18 +381,18 @@ TextureImporter: name: YellowMonkey_16 rect: serializedVersion: 2 - x: 531 - y: 786 - width: 26 - height: 29 + x: 2124 + y: 3144 + width: 104 + height: 116 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 4cb040953d1be4744b527f5eb855e3c8 + spriteID: 886036d3000000000800000000000000 internalID: 1029899912 vertices: [] indices: @@ -465,18 +402,18 @@ TextureImporter: name: YellowMonkey_17 rect: serializedVersion: 2 - x: 943 - y: 843 - width: 58 - height: 18 + x: 3772 + y: 3372 + width: 232 + height: 72 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: eb1daaf1a72fa2545962bf20dfd67c9f + spriteID: 81fe193affffffff0800000000000000 internalID: -1550717160 vertices: [] indices: @@ -486,18 +423,18 @@ TextureImporter: name: YellowMonkey_18 rect: serializedVersion: 2 - x: 20 - y: 785 - width: 24 - height: 30 + x: 80 + y: 3140 + width: 96 + height: 120 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 817b1d3dbe6e99044aea1d6b36e1bbf2 + spriteID: 49ca376bffffffff0800000000000000 internalID: -1233933164 vertices: [] indices: @@ -507,18 +444,18 @@ TextureImporter: name: YellowMonkey_19 rect: serializedVersion: 2 - x: 83 - y: 785 - width: 26 - height: 30 + x: 332 + y: 3140 + width: 104 + height: 120 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 8bb46f940e6e5ea41908eab233efd497 + spriteID: 6843b521000000000800000000000000 internalID: 307967110 vertices: [] indices: @@ -528,18 +465,18 @@ TextureImporter: name: YellowMonkey_20 rect: serializedVersion: 2 - x: 148 - y: 789 - width: 24 - height: 22 + x: 592 + y: 3156 + width: 96 + height: 88 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: f1f3fb1886c9e4b49834798018b9db82 + spriteID: f360a0c7000000000800000000000000 internalID: 2081031743 vertices: [] indices: @@ -549,18 +486,18 @@ TextureImporter: name: YellowMonkey_21 rect: serializedVersion: 2 - x: 208 - y: 786 - width: 99 - height: 30 + x: 832 + y: 3144 + width: 396 + height: 120 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 18c7fc0028401204487e3a29c1b06334 + spriteID: 70b3e84affffffff0800000000000000 internalID: -1534182649 vertices: [] indices: @@ -570,18 +507,18 @@ TextureImporter: name: YellowMonkey_22 rect: serializedVersion: 2 - x: 340 - y: 785 - width: 24 - height: 30 + x: 1360 + y: 3140 + width: 96 + height: 120 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: b090197c6f5805e42ad14ae9c74549c1 + spriteID: 721aeaa8ffffffff0800000000000000 internalID: -1968266969 vertices: [] indices: @@ -591,18 +528,18 @@ TextureImporter: name: YellowMonkey_23 rect: serializedVersion: 2 - x: 404 - y: 785 - width: 23 - height: 30 + x: 1616 + y: 3140 + width: 92 + height: 120 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: d0bdd2d32528d8c40a682d7ed1b7e46e + spriteID: e02b3d15000000000800000000000000 internalID: 1372828174 vertices: [] indices: @@ -612,18 +549,18 @@ TextureImporter: name: YellowMonkey_24 rect: serializedVersion: 2 - x: 470 - y: 784 - width: 21 - height: 32 + x: 1880 + y: 3136 + width: 84 + height: 128 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 01b0c601212659a41b4022d22f6bf383 + spriteID: d1c813ffffffffff0800000000000000 internalID: -13530083 vertices: [] indices: @@ -633,18 +570,18 @@ TextureImporter: name: YellowMonkey_25 rect: serializedVersion: 2 - x: 591 - y: 780 - width: 25 - height: 31 + x: 2364 + y: 3120 + width: 100 + height: 124 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: dc1ff4d2952e79842ae3dfd81135ded0 + spriteID: b3e29693000000000800000000000000 internalID: 963194427 vertices: [] indices: @@ -654,18 +591,18 @@ TextureImporter: name: YellowMonkey_26 rect: serializedVersion: 2 - x: 644 - y: 768 - width: 24 - height: 42 + x: 2576 + y: 3072 + width: 96 + height: 168 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 934574e7d7910a648a4b4a857090f4c0 + spriteID: 75082e00000000000800000000000000 internalID: 14843991 vertices: [] indices: @@ -675,18 +612,18 @@ TextureImporter: name: YellowMonkey_27 rect: serializedVersion: 2 - x: 698 - y: 762 - width: 44 - height: 44 + x: 2792 + y: 3048 + width: 176 + height: 176 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 8f820281374a15c44beae0e02da44a93 + spriteID: d4befd5fffffffff0800000000000000 internalID: -169874611 vertices: [] indices: @@ -696,18 +633,18 @@ TextureImporter: name: YellowMonkey_28 rect: serializedVersion: 2 - x: 775 - y: 759 - width: 50 - height: 50 + x: 3097 + y: 3031 + width: 208 + height: 210 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 7113e7ade5c48064791ce1eba810f3c5 + spriteID: 4ad57b82000000000800000000000000 internalID: 683105700 vertices: [] indices: @@ -717,18 +654,18 @@ TextureImporter: name: YellowMonkey_29 rect: serializedVersion: 2 - x: 861 - y: 498 - width: 141 - height: 305 + x: 3445 + y: 1805 + width: 566 + height: 1408 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} + border: {x: 0, y: 31, z: 0, w: 1080} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 4fac620168b74644da652dc2357d1289 + spriteID: 837665edffffffff0800000000000000 internalID: -564762824 vertices: [] indices: @@ -738,18 +675,18 @@ TextureImporter: name: YellowMonkey_30 rect: serializedVersion: 2 - x: 19 - y: 709 - width: 34 - height: 37 + x: 76 + y: 2836 + width: 136 + height: 148 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 43fba5fcb425dce40ae1d6c0037a6ca2 + spriteID: 7964f3d8ffffffff0800000000000000 internalID: -1925233001 vertices: [] indices: @@ -759,18 +696,18 @@ TextureImporter: name: YellowMonkey_31 rect: serializedVersion: 2 - x: 89 - y: 710 - width: 38 - height: 36 + x: 356 + y: 2840 + width: 152 + height: 144 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: d053af1bc68f1d848a698a5dba106fe2 + spriteID: eb1f4970000000000800000000000000 internalID: 127201726 vertices: [] indices: @@ -780,18 +717,18 @@ TextureImporter: name: YellowMonkey_32 rect: serializedVersion: 2 - x: 161 - y: 707 - width: 38 - height: 42 + x: 644 + y: 2828 + width: 152 + height: 168 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 3e36c3f085f6dbd4d9af5b320dd86f70 + spriteID: 6a1c25c5000000000800000000000000 internalID: 1548927398 vertices: [] indices: @@ -801,18 +738,18 @@ TextureImporter: name: YellowMonkey_33 rect: serializedVersion: 2 - x: 242 - y: 706 - width: 32 - height: 38 + x: 968 + y: 2824 + width: 128 + height: 152 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: e0bfe0e5032d56644ae308517011bcf0 + spriteID: 56a70d8bffffffff0800000000000000 internalID: -1194296731 vertices: [] indices: @@ -822,18 +759,18 @@ TextureImporter: name: YellowMonkey_34 rect: serializedVersion: 2 - x: 307 - y: 707 - width: 34 - height: 42 + x: 1228 + y: 2828 + width: 136 + height: 168 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: a6d87c9f52214944daffd1a6bfd0e71a + spriteID: 5cd4f4d7000000000800000000000000 internalID: 2102349253 vertices: [] indices: @@ -843,18 +780,18 @@ TextureImporter: name: YellowMonkey_35 rect: serializedVersion: 2 - x: 381 - y: 708 - width: 30 - height: 40 + x: 1524 + y: 2832 + width: 120 + height: 160 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 4b04c35ffd0f3804f8ec667c61538107 + spriteID: 6e33b8d9ffffffff0800000000000000 internalID: -1651821594 vertices: [] indices: @@ -864,18 +801,18 @@ TextureImporter: name: YellowMonkey_36 rect: serializedVersion: 2 - x: 454 - y: 707 - width: 28 - height: 42 + x: 1816 + y: 2828 + width: 112 + height: 168 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 3aa3a8d4d8f266b4580bcca9fe6c4938 + spriteID: 4f770a6affffffff0800000000000000 internalID: -1499432972 vertices: [] indices: @@ -885,18 +822,18 @@ TextureImporter: name: YellowMonkey_37 rect: serializedVersion: 2 - x: 522 - y: 708 - width: 44 - height: 40 + x: 2088 + y: 2832 + width: 176 + height: 160 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: d616ab401ff7f474fb8c164b016c2b98 + spriteID: b6378110000000000800000000000000 internalID: 18379627 vertices: [] indices: @@ -906,18 +843,18 @@ TextureImporter: name: YellowMonkey_38 rect: serializedVersion: 2 - x: 599 - y: 709 - width: 34 - height: 37 + x: 2396 + y: 2836 + width: 136 + height: 148 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 3df80423cf67bd441b34e3e62e45251f + spriteID: 48013959ffffffff0800000000000000 internalID: -1785524092 vertices: [] indices: @@ -927,18 +864,18 @@ TextureImporter: name: YellowMonkey_39 rect: serializedVersion: 2 - x: 670 - y: 697 - width: 44 - height: 38 + x: 2680 + y: 2788 + width: 176 + height: 152 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: b65346353ec3eca43a2f94048620dba9 + spriteID: bdda5b16000000000800000000000000 internalID: 1639296475 vertices: [] indices: @@ -948,18 +885,18 @@ TextureImporter: name: YellowMonkey_40 rect: serializedVersion: 2 - x: 771 - y: 603 - width: 10 - height: 122 + x: 3084 + y: 2412 + width: 40 + height: 488 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: af5ad1fe9cedae64ea5141ec633c42f2 + spriteID: b68be772000000000800000000000000 internalID: 662616171 vertices: [] indices: @@ -969,18 +906,18 @@ TextureImporter: name: YellowMonkey_41 rect: serializedVersion: 2 - x: 804 - y: 576 - width: 24 - height: 152 + x: 3216 + y: 2304 + width: 96 + height: 608 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 914d76f534a105e478a0792e2127a74d + spriteID: 72012779ffffffff0800000000000000 internalID: -1754132441 vertices: [] indices: @@ -990,18 +927,18 @@ TextureImporter: name: YellowMonkey_42 rect: serializedVersion: 2 - x: 15 - y: 655 - width: 58 - height: 18 + x: 60 + y: 2620 + width: 232 + height: 72 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: b215a3d024f314541993d62c014daaec + spriteID: 8277af11000000000800000000000000 internalID: 301627176 vertices: [] indices: @@ -1011,18 +948,18 @@ TextureImporter: name: YellowMonkey_43 rect: serializedVersion: 2 - x: 103 - y: 656 - width: 47 - height: 16 + x: 412 + y: 2624 + width: 188 + height: 64 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 4c07a84cabfba304ba55eae6e80bcbb4 + spriteID: 7b905cddffffffff0800000000000000 internalID: -574289481 vertices: [] indices: @@ -1032,18 +969,18 @@ TextureImporter: name: YellowMonkey_44 rect: serializedVersion: 2 - x: 191 - y: 655 - width: 26 - height: 18 + x: 764 + y: 2620 + width: 104 + height: 72 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: d28702c1711a47346bbb4dda59b9e5b7 + spriteID: 5ac9427bffffffff0800000000000000 internalID: -1222337371 vertices: [] indices: @@ -1053,18 +990,18 @@ TextureImporter: name: YellowMonkey_45 rect: serializedVersion: 2 - x: 245 - y: 649 - width: 30 - height: 29 + x: 980 + y: 2596 + width: 120 + height: 116 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: ecda1d0ac0997334d921fb21904f6f73 + spriteID: a638ac9cffffffff0800000000000000 internalID: -909474966 vertices: [] indices: @@ -1074,18 +1011,18 @@ TextureImporter: name: YellowMonkey_46 rect: serializedVersion: 2 - x: 304 - y: 657 - width: 56 - height: 14 + x: 1216 + y: 2628 + width: 224 + height: 56 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 603675e3118ef0e408412afff80cc5e1 + spriteID: 8bab4c31000000000800000000000000 internalID: 331659960 vertices: [] indices: @@ -1095,18 +1032,18 @@ TextureImporter: name: YellowMonkey_47 rect: serializedVersion: 2 - x: 398 - y: 627 - width: 28 - height: 42 + x: 1592 + y: 2508 + width: 112 + height: 168 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 6ecfd86c0b5848c44aad32876e6dcb2c + spriteID: c53255f1000000000800000000000000 internalID: 525673308 vertices: [] indices: @@ -1116,18 +1053,18 @@ TextureImporter: name: YellowMonkey_48 rect: serializedVersion: 2 - x: 468 - y: 627 - width: 32 - height: 42 + x: 1872 + y: 2508 + width: 128 + height: 168 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 601d2e923872c9c47941ab73776a911b + spriteID: 11faeb8bffffffff0800000000000000 internalID: -1195462895 vertices: [] indices: @@ -1137,18 +1074,18 @@ TextureImporter: name: YellowMonkey_49 rect: serializedVersion: 2 - x: 539 - y: 627 - width: 34 - height: 42 + x: 2156 + y: 2508 + width: 136 + height: 168 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 262f7eef7c2b6db42a547ca243fbfb16 + spriteID: b44d9178ffffffff0800000000000000 internalID: -2028350389 vertices: [] indices: @@ -1158,18 +1095,18 @@ TextureImporter: name: YellowMonkey_50 rect: serializedVersion: 2 - x: 606 - y: 627 - width: 45 - height: 42 + x: 2424 + y: 2508 + width: 180 + height: 168 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: e7bb6bff6a2b5ef40914582e6719a00d + spriteID: 665a44a1000000000800000000000000 internalID: 440706406 vertices: [] indices: @@ -1179,18 +1116,18 @@ TextureImporter: name: YellowMonkey_51 rect: serializedVersion: 2 - x: 678 - y: 628 - width: 44 - height: 40 + x: 2712 + y: 2512 + width: 176 + height: 160 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 46f5afe17302b1241b5d9501826efd4c + spriteID: 654c6bafffffffff0800000000000000 internalID: -88685482 vertices: [] indices: @@ -1200,18 +1137,18 @@ TextureImporter: name: YellowMonkey_52 rect: serializedVersion: 2 - x: 266 - y: 613 - width: 68 - height: 14 + x: 1064 + y: 2452 + width: 272 + height: 56 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 9086e6af339109a4dbfd88010e45f08b + spriteID: 771faf29ffffffff0800000000000000 internalID: -1829047945 vertices: [] indices: @@ -1221,18 +1158,18 @@ TextureImporter: name: YellowMonkey_53 rect: serializedVersion: 2 - x: 34 - y: 562 - width: 60 - height: 47 + x: 136 + y: 2248 + width: 240 + height: 188 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: fe051e6dafff2ab408ffca983fac52a1 + spriteID: 2b075aa8ffffffff0800000000000000 internalID: -1968869198 vertices: [] indices: @@ -1242,18 +1179,18 @@ TextureImporter: name: YellowMonkey_54 rect: serializedVersion: 2 - x: 164 - y: 562 - width: 56 - height: 47 + x: 656 + y: 2248 + width: 224 + height: 188 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 9a87b7160a297104c89bbfb56c1c15a2 + spriteID: f56c246affffffff0800000000000000 internalID: -1505573281 vertices: [] indices: @@ -1263,18 +1200,18 @@ TextureImporter: name: YellowMonkey_55 rect: serializedVersion: 2 - x: 269 - y: 560 - width: 62 - height: 29 + x: 1076 + y: 2240 + width: 248 + height: 116 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 16abf413e7400b846bc08aef93394bc4 + spriteID: 47f4b082000000000800000000000000 internalID: 671829876 vertices: [] indices: @@ -1284,18 +1221,18 @@ TextureImporter: name: YellowMonkey_56 rect: serializedVersion: 2 - x: 361 - y: 572 - width: 54 - height: 24 + x: 1444 + y: 2288 + width: 216 + height: 96 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 6feff5442363da040af567f408008c14 + spriteID: cc588bcdffffffff0800000000000000 internalID: -591886900 vertices: [] indices: @@ -1305,18 +1242,18 @@ TextureImporter: name: YellowMonkey_57 rect: serializedVersion: 2 - x: 448 - y: 564 - width: 48 - height: 32 + x: 1792 + y: 2256 + width: 192 + height: 128 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 8ef2f797b8ce3a14dbd7c876cdf66bd2 + spriteID: e4c722f9ffffffff0800000000000000 internalID: -1625129906 vertices: [] indices: @@ -1326,18 +1263,18 @@ TextureImporter: name: YellowMonkey_58 rect: serializedVersion: 2 - x: 525 - y: 552 - width: 46 - height: 45 + x: 2100 + y: 2208 + width: 184 + height: 180 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: cfbe63661e9b54f41b5e9f980c5196dd + spriteID: 8dbb84e6000000000800000000000000 internalID: 1850260440 vertices: [] indices: @@ -1347,18 +1284,18 @@ TextureImporter: name: YellowMonkey_59 rect: serializedVersion: 2 - x: 595 - y: 561 - width: 42 - height: 38 + x: 2380 + y: 2244 + width: 168 + height: 152 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 5e2db94ebe975e44e8a2bcd6f84850cf + spriteID: 3d304438ffffffff0800000000000000 internalID: -2092694573 vertices: [] indices: @@ -1368,165 +1305,81 @@ TextureImporter: name: YellowMonkey_60 rect: serializedVersion: 2 - x: 664 - y: 575 - width: 56 - height: 18 + x: 2656 + y: 2300 + width: 224 + height: 72 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 244032cbb78143d429909ee429900ec2 + spriteID: 1a51c63effffffff0800000000000000 internalID: -479455839 vertices: [] indices: edges: [] weights: [] - - serializedVersion: 2 - name: YellowMonkey_61 - rect: - serializedVersion: 2 - x: 17 - y: 164 - width: 230 - height: 284 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: fd136f7788050954ead6050e7ce87408 - internalID: 1500831418 - vertices: [] - indices: - edges: [] - weights: [] - serializedVersion: 2 name: YellowMonkey_62 rect: serializedVersion: 2 - x: 38 - y: 464 - width: 52 - height: 47 + x: 152 + y: 1856 + width: 208 + height: 188 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 97882fa1e7a3a4a46896adaeee93d66c + spriteID: b2ad1794000000000800000000000000 internalID: 1232198187 vertices: [] indices: edges: [] weights: [] - - serializedVersion: 2 - name: YellowMonkey_63 - rect: - serializedVersion: 2 - x: 294 - y: 157 - width: 244 - height: 358 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 9fd7471ac9d3a214590415ac08fd7e20 - internalID: -1589668304 - vertices: [] - indices: - edges: [] - weights: [] - serializedVersion: 2 name: YellowMonkey_64 rect: serializedVersion: 2 - x: 585 - y: 468 - width: 126 - height: 64 + x: 2340 + y: 1872 + width: 504 + height: 256 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 41a7800f5fd321f448c4cdd1e39f6aa7 + spriteID: b588eae1000000000800000000000000 internalID: 514754651 vertices: [] indices: edges: [] weights: [] - - serializedVersion: 2 - name: YellowMonkey_65 - rect: - serializedVersion: 2 - x: 739 - y: 459 - width: 90 - height: 90 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 9055bc9e1f40c3f45a37c48a84e68b50 - internalID: -649944683 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: YellowMonkey_66 - rect: - serializedVersion: 2 - x: 643 - y: 347 - width: 90 - height: 90 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 254f76ca10a69e9438e8f3d7c858c5a6 - internalID: -1219023696 - vertices: [] - indices: - edges: [] - weights: [] - serializedVersion: 2 name: YellowMonkey_67 rect: serializedVersion: 2 - x: 757 - y: 305 - width: 14 - height: 126 + x: 3028 + y: 1220 + width: 56 + height: 504 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 18b485c869d009e438dacb8458d72a43 + spriteID: 9a58bb01000000000800000000000000 internalID: 280724905 vertices: [] indices: @@ -1536,18 +1389,18 @@ TextureImporter: name: YellowMonkey_68 rect: serializedVersion: 2 - x: 798 - y: 278 - width: 28 - height: 156 + x: 3192 + y: 1112 + width: 112 + height: 624 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 17cbd1f5bf6646048ae59b5d07e7f366 + spriteID: e15fe2c6000000000800000000000000 internalID: 1815016734 vertices: [] indices: @@ -1557,18 +1410,18 @@ TextureImporter: name: YellowMonkey_69 rect: serializedVersion: 2 - x: 863 - y: 122 - width: 138 - height: 303 + x: 3452 + y: 488 + width: 552 + height: 1212 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 940a0508b7510ad4da9242df1d274e18 + spriteID: ecc31a69ffffffff0800000000000000 internalID: -1767818034 vertices: [] indices: @@ -1578,18 +1431,18 @@ TextureImporter: name: YellowMonkey_70 rect: serializedVersion: 2 - x: 709 - y: 301 - width: 22 - height: 21 + x: 2836 + y: 1204 + width: 88 + height: 84 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 52d70949329c5534daad5dc7f4d29dc1 + spriteID: 44f7413affffffff0800000000000000 internalID: -1558937788 vertices: [] indices: @@ -1599,18 +1452,18 @@ TextureImporter: name: YellowMonkey_71 rect: serializedVersion: 2 - x: 15 - y: 17 - width: 113 - height: 83 + x: 60 + y: 68 + width: 452 + height: 332 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 282c40c585fba934ca2ff53f5d99acaf + spriteID: b2183852000000000800000000000000 internalID: 629375275 vertices: [] indices: @@ -1620,18 +1473,18 @@ TextureImporter: name: YellowMonkey_72 rect: serializedVersion: 2 - x: 161 - y: 17 - width: 110 - height: 83 + x: 644 + y: 68 + width: 440 + height: 332 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 584f8d8c741686d4e918723ac262dea7 + spriteID: cb923982000000000800000000000000 internalID: 680733116 vertices: [] indices: @@ -1641,18 +1494,18 @@ TextureImporter: name: YellowMonkey_73 rect: serializedVersion: 2 - x: 304 - y: 17 - width: 112 - height: 83 + x: 1216 + y: 68 + width: 448 + height: 332 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 2fee081bf507c4945bba870fda240fa2 + spriteID: 973a3591000000000800000000000000 internalID: 424911737 vertices: [] indices: @@ -1662,18 +1515,18 @@ TextureImporter: name: YellowMonkey_74 rect: serializedVersion: 2 - x: 446 - y: 86 - width: 108 - height: 20 + x: 1784 + y: 344 + width: 432 + height: 80 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: f878802ec29f78c4fa8f21f79250959b + spriteID: 5b820003000000000800000000000000 internalID: 805316789 vertices: [] indices: @@ -1683,44 +1536,23 @@ TextureImporter: name: YellowMonkey_75 rect: serializedVersion: 2 - x: 923 - y: 72 - width: 18 - height: 45 + x: 3692 + y: 288 + width: 72 + height: 180 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 9, z: 0, w: 0} + border: {x: 0, y: 36, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: ee2b24a45ecbdfa41ba521a706fd9784 + spriteID: e4c020caffffffff0800000000000000 internalID: -1409151922 vertices: [] indices: edges: [] weights: [] - - serializedVersion: 2 - name: YellowMonkey_76 - rect: - serializedVersion: 2 - x: 922 - y: 452 - width: 20 - height: 39 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 7, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 1d8310691fa2374448786c71ddc129d6 - internalID: -523591808 - vertices: [] - indices: - edges: [] - weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/YellowMonkeyOld.png b/Assets/Resources/Sprites/Games/MonkeyWatch/YellowMonkeyOld.png deleted file mode 100644 index 8cb67e033..000000000 Binary files a/Assets/Resources/Sprites/Games/MonkeyWatch/YellowMonkeyOld.png and /dev/null differ diff --git a/Assets/Scripts/Games/MonkeyWatch/MonkeyClicker.cs b/Assets/Scripts/Games/MonkeyWatch/MonkeyClicker.cs index d2e9c4d9c..64af8b3f2 100644 --- a/Assets/Scripts/Games/MonkeyWatch/MonkeyClicker.cs +++ b/Assets/Scripts/Games/MonkeyWatch/MonkeyClicker.cs @@ -35,7 +35,7 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch // animation event public void UpdateRotation() { - gameObject.transform.localRotation = new Quaternion(0, 0, (gameObject.transform.localRotation.z - rotation), 0); + //var rot = gameObject.transform; } private void Miss(PlayerActionEvent caller) diff --git a/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs b/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs index 262440df4..13738cc42 100644 --- a/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs +++ b/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs @@ -45,6 +45,7 @@ namespace HeavenStudio.Games.Loaders }, new GameAction("customMonkey", "Custom Monkey") { + function = delegate { var e = eventCaller.currentEntity; MonkeyWatch.instance.CustomMonkeySFX(e.beat, e["sfx"]); }, defaultLength = 0.5f, parameters = new List() { @@ -132,8 +133,8 @@ namespace HeavenStudio.Games if (offbeatEvents[i]["custom"]) { for (int j = 0; j < customEvents.Count; j++) { - if (customEvents[j].beat > offbeatBeat+2 - && customEvents[j].beat < offbeatBeat+offbeatEvents[i].length) + if (customEvents[j].beat >= offbeatBeat+2 + && customEvents[j].beat <= offbeatBeat+offbeatEvents[i].length) { tempMonkeys.Add(new CustomMonkey{ beat = customEvents[j].beat, @@ -246,23 +247,8 @@ namespace HeavenStudio.Games public static void PurpleMonkeySFX(double beat, float length, bool mute, CustomMonkey[] monkeys = null) { - var tempMonkeys = new List(); - if (monkeys == null) { - for (int i = 2; i < length; i++) { - tempMonkeys.Add(new CustomMonkey{beat = beat + 0.5f + i, sfx = (i % 2 == 0 ? 1 : 2)}); - } - } - monkeys = tempMonkeys.ToArray(); - var sfx = new List(); - for (int i = 0; i < monkeys.Length; i++) - { - sfx.AddRange(new MultiSound.Sound[] { - new MultiSound.Sound($"monkeyWatch/voiceKi{monkeys[i].sfx}", monkeys[i].beat ), - new MultiSound.Sound($"monkeyWatch/voiceKi{monkeys[i].sfx}Echo1", monkeys[i].beat + 0.25), - }); - } if (!mute) { sfx.AddRange(new MultiSound.Sound[] { new MultiSound.Sound("monkeyWatch/voiceUki1", beat ), @@ -273,16 +259,30 @@ namespace HeavenStudio.Games new MultiSound.Sound("monkeyWatch/voiceUki3Echo1", beat + 2.25), }); } + + if (monkeys == null) { + for (int i = 2; i < length; i++) { + sfx.AddRange(new MultiSound.Sound[] { + new MultiSound.Sound($"monkeyWatch/voiceKi{(i % 2 == 0 ? 1 : 2)}", beat + i + 0.5 ), + new MultiSound.Sound($"monkeyWatch/voiceKi{(i % 2 == 0 ? 1 : 2)}Echo1", beat + i + 0.75), + }); + } + } + MultiSound.Play(sfx.ToArray(), forcePlay: true); } public void PurpleMonkeys(double beat, float length, bool mute, CustomMonkey[] monkeys = null) { - if (monkeys == null) - monkeys = new CustomMonkey[] { - new CustomMonkey{beat = beat + 2.5f, sfx = 1}, - new CustomMonkey{beat = beat + 3.5f, sfx = 2}, - }; + var tempMonkeys = new List(); + if (monkeys == null) { + for (int i = 2; i < length; i++) { + tempMonkeys.Add(new CustomMonkey{beat = beat + 0.5f + i, sfx = (i % 2 == 0 ? 1 : 2)}); + } + monkeys = tempMonkeys.ToArray(); + } + + for (int i = 0; i < monkeys.Length; i++) { @@ -290,6 +290,14 @@ namespace HeavenStudio.Games } } + public void CustomMonkeySFX(double beat, int sfx) + { + MultiSound.Play(new MultiSound.Sound[] { + new MultiSound.Sound($"monkeyWatch/voiceKi{sfx}", beat ), + new MultiSound.Sound($"monkeyWatch/voiceKi{sfx}Echo1", beat + 0.25), + }); + } + public void JustYellow(PlayerActionEvent caller, float state) { Just(state, true); @@ -303,7 +311,7 @@ namespace HeavenStudio.Games void Just(float state, bool isYellow) { lastMonkeyClapped++; - monkeyPlayer.anim.DoScaledAnimationAsync("Clap", 0.5f); + monkeyPlayer.UpdateRotation(); if (state >= 1f || state <= -1f) { SoundByte.PlayOneShot("miss"); } else {