diff --git a/Assets/Resources/Games/monkeyWatch.prefab b/Assets/Resources/Games/monkeyWatch.prefab index 0c180d81a..805afb285 100644 --- a/Assets/Resources/Games/monkeyWatch.prefab +++ b/Assets/Resources/Games/monkeyWatch.prefab @@ -342,7 +342,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -511,7 +511,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -847,7 +847,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1016,7 +1016,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1268,7 +1268,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1606,7 +1606,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1806,7 +1806,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1975,7 +1975,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -7185,7 +7185,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -7965,7 +7965,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -8218,7 +8218,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -8671,7 +8671,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -8923,7 +8923,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9007,7 +9007,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9261,7 +9261,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -10076,7 +10076,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -10328,7 +10328,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -10642,7 +10642,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -10726,7 +10726,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -10978,7 +10978,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -11364,7 +11364,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -16731,7 +16731,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -16815,7 +16815,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -17069,7 +17069,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -18166,7 +18166,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -18841,7 +18841,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19010,7 +19010,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19631,7 +19631,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -20053,7 +20053,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -20474,7 +20474,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -20757,7 +20757,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21062,7 +21062,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21146,7 +21146,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21230,7 +21230,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21314,7 +21314,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21624,7 +21624,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -22466,7 +22466,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -22550,7 +22550,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -22803,7 +22803,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -23269,7 +23269,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -23438,7 +23438,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -23522,7 +23522,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -23775,7 +23775,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -23859,7 +23859,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -24111,7 +24111,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -24215,6 +24215,8 @@ MonoBehaviour: playerMonkeyAnim: {fileID: 4873567491568184609} yellowClap: {fileID: 8899231323861109608} pinkClap: {fileID: 5162462144302245337} + shadowTrans: {fileID: 4357628429498402732} + shadowXRange: -0.5 --- !u!1 &7446072329631304920 GameObject: m_ObjectHideFlags: 0 @@ -29569,7 +29571,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -29816,7 +29818,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -29900,7 +29902,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -35028,7 +35030,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -35196,7 +35198,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -36168,7 +36170,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -36505,7 +36507,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cadc11b4164b3a64bb4695bf07a39c74, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/BG.mat b/Assets/Resources/Sprites/Games/MonkeyWatch/BG.mat new file mode 100644 index 000000000..35497cf15 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MonkeyWatch/BG.mat @@ -0,0 +1,89 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BG + m_Shader: {fileID: 4800000, guid: b4cada49e3bbaee4b96deed8a436d7fd, type: 3} + m_ValidKeywords: + - UNITY_UI_ALPHACLIP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 1 + - _ZWrite: 1 + m_Colors: + - _AddColor: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/BG.mat.meta b/Assets/Resources/Sprites/Games/MonkeyWatch/BG.mat.meta new file mode 100644 index 000000000..31126a67b --- /dev/null +++ b/Assets/Resources/Sprites/Games/MonkeyWatch/BG.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cadc11b4164b3a64bb4695bf07a39c74 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs b/Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs index 7b473b856..affb013bb 100644 --- a/Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs +++ b/Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs @@ -2,6 +2,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using HeavenStudio.Util; +using Starpelly; +using UnityEngine.UIElements; namespace HeavenStudio.Games.Scripts_MonkeyWatch { @@ -13,6 +15,9 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch [SerializeField] private Animator playerMonkeyAnim; [SerializeField] private ParticleSystem yellowClap; [SerializeField] private ParticleSystem pinkClap; + [SerializeField] private Transform shadowTrans; + [Header("Properties")] + [SerializeField] private float shadowXRange = 2f; private MonkeyWatch game; @@ -33,6 +38,30 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch { anchorRotateTransform.localEulerAngles = new Vector3(0, 0, anchorRotateTransform.localEulerAngles.z - 6); anim.DoScaledAnimationAsync("Click", 0.4f); + MoveShadow(); + } + + private void MoveShadow() + { + float realAngle = anchorRotateTransform.localEulerAngles.z % 360 - 360; + realAngle *= -1; + + float x; + + if (realAngle <= 180) + { + float normalizedAngle = Mathp.Normalize(realAngle, 0, 180); + Debug.Log("normalizedAngle: " + normalizedAngle); + x = Mathf.Lerp(0, shadowXRange, normalizedAngle); + } + else + { + float normalizedAngle = Mathp.Normalize(realAngle, 180, 360); + Debug.Log("normalizedAngle: " + normalizedAngle); + x = Mathf.Lerp(shadowXRange, 0, normalizedAngle); + } + Debug.Log("X: " + x); + shadowTrans.localPosition = new Vector3(x, 0); } public void MoveToAngle(float angle) diff --git a/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs b/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs index 1b0e469ab..d0259a376 100644 --- a/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs +++ b/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs @@ -179,9 +179,9 @@ namespace HeavenStudio.Games backgroundHandler.SetFade(beat, 0.25f, true, (TimeMode)timeMode, hours, minutes); BeatAction.New(instance.gameObject, new List() { - new BeatAction.Action(beat + length - 0.25, delegate + new BeatAction.Action(beat + length - 0.5, delegate { - backgroundHandler.SetFade(beat + length - 0.25, 0.25f, false, (TimeMode)timeMode, hours, minutes); + backgroundHandler.SetFade(beat + length - 0.5, 0.25f, false, (TimeMode)timeMode, hours, minutes); }) }); CameraUpdate();