diff --git a/.gitignore b/.gitignore index 4b0c2628272dc793bb0a887f8303edcf2c5e713b..5e7bb616c06cb4e5889373b0a9cad5353aada763 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ **/.vs/ **/bin/ **/Library/ -**/obj/ \ No newline at end of file +**/obj/ +SunriseGame/Assembly-CSharp.csproj +**/Temp/ +*.csproj diff --git a/SunriseGame/Assets/Prefabs.meta b/SunriseGame/Assets/Prefabs.meta new file mode 100644 index 0000000000000000000000000000000000000000..083154011e7bcc34c32541ec62dc18beaa168fb6 --- /dev/null +++ b/SunriseGame/Assets/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4106d72e7f9a8e8439d463a84a32ce68 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SunriseGame/Assets/Prefabs/Johny.meta b/SunriseGame/Assets/Prefabs/Johny.meta new file mode 100644 index 0000000000000000000000000000000000000000..43062cd05cd688eef0f17411fac67b3072529425 --- /dev/null +++ b/SunriseGame/Assets/Prefabs/Johny.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8266f81422145e047ab9bba3af3288cf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SunriseGame/Assets/Prefabs/Johny/Animations.meta b/SunriseGame/Assets/Prefabs/Johny/Animations.meta new file mode 100644 index 0000000000000000000000000000000000000000..6ff9143e9f165bb401c41b98134cb827ab4fb455 --- /dev/null +++ b/SunriseGame/Assets/Prefabs/Johny/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 52c2a20b9f689ae43a47d586aa73da0c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SunriseGame/Assets/Prefabs/Johny/Animations/filler.meta b/SunriseGame/Assets/Prefabs/Johny/Animations/filler.meta new file mode 100644 index 0000000000000000000000000000000000000000..4fe7a82c9a19e3a0fb366796ef181a70cc14f005 --- /dev/null +++ b/SunriseGame/Assets/Prefabs/Johny/Animations/filler.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b2a521ccde4e8b141be4a0bda5a1f867 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SunriseGame/Assets/Prefabs/Johny/Textures.meta b/SunriseGame/Assets/Prefabs/Johny/Textures.meta new file mode 100644 index 0000000000000000000000000000000000000000..0015f6f86b9de02af2c4ade9426900baecc867f8 --- /dev/null +++ b/SunriseGame/Assets/Prefabs/Johny/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f53768e405485054fa415bd6c73d7b79 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SunriseGame/Assets/Prefabs/Johny/Textures/filler.meta b/SunriseGame/Assets/Prefabs/Johny/Textures/filler.meta new file mode 100644 index 0000000000000000000000000000000000000000..71936725e2adfc6fc9376c41610770e48e85ae8f --- /dev/null +++ b/SunriseGame/Assets/Prefabs/Johny/Textures/filler.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7f379b6a51abc8f42b99ac50ddfec97a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SunriseGame/Assets/Prefabs/filler.meta b/SunriseGame/Assets/Prefabs/filler.meta new file mode 100644 index 0000000000000000000000000000000000000000..d569d2c1e00a72e93be4cf55381fd1a6def7c28c --- /dev/null +++ b/SunriseGame/Assets/Prefabs/filler.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4b7d5e0904a8e0646995afae3d93d543 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SunriseGame/Assets/Scripts/Input/InputController.cs b/SunriseGame/Assets/Scripts/Input/InputController.cs index da0fe2ffb2a20cfca1201f9c9775f1b4037c7fee..9ed6cd37c4e11b0a0f1d90d27650db5ec408de0e 100644 --- a/SunriseGame/Assets/Scripts/Input/InputController.cs +++ b/SunriseGame/Assets/Scripts/Input/InputController.cs @@ -28,6 +28,10 @@ public class InputController : MonoBehaviour } if (click) - TouchController.Instance.SendTouchSignal(camera.ScreenToWorldPoint(CursorPosition)); + { + BackgroundController.Instance.StartAnimation(Color.HSVToRGB(hue, 0.7f, 1), CursorPosition); + hue = (hue + 0.6f) % 1; + //TouchController.Instance.SendTouchSignal(camera.ScreenToWorldPoint(CursorPosition)); + } } } diff --git a/SunriseGame/Assets/Scripts/Input/TouchController.cs b/SunriseGame/Assets/Scripts/Input/TouchController.cs index 9d4425743f8959f4ca34822a6a0ed9487f12e734..8c8794a61f1fbd430da5edc1e2f8b13b6d8544d4 100644 --- a/SunriseGame/Assets/Scripts/Input/TouchController.cs +++ b/SunriseGame/Assets/Scripts/Input/TouchController.cs @@ -27,7 +27,7 @@ public class TouchController : MonoBehaviour if (collider != lastCollider) { target = collider.GetComponent<TouchTarget>(); - lastCollider = collider + lastCollider = collider; } else target = lastTouchTarget; diff --git a/SunriseGame/Assets/Scripts/Input/TouchTarget.cs b/SunriseGame/Assets/Scripts/Input/TouchTarget.cs index eff1227d3fc2654f54843aa3b9dacf405113f123..5bb01bded15e79faf76ecc321db3a5d93d7893d6 100644 --- a/SunriseGame/Assets/Scripts/Input/TouchTarget.cs +++ b/SunriseGame/Assets/Scripts/Input/TouchTarget.cs @@ -4,15 +4,5 @@ using UnityEngine; public class TouchTarget : MonoBehaviour { - // Start is called before the first frame update - void Start() - { - - } - // Update is called once per frame - void Update() - { - - } }