From d2c519d99148086452d2199743327469857864d4 Mon Sep 17 00:00:00 2001
From: Freddy <freddy.v@windowslive.com>
Date: Mon, 2 Nov 2020 16:34:22 +0100
Subject: [PATCH] BugFix
---
.gitignore | 5 ++++-
SunriseGame/Assets/Prefabs.meta | 8 ++++++++
SunriseGame/Assets/Prefabs/Johny.meta | 8 ++++++++
SunriseGame/Assets/Prefabs/Johny/Animations.meta | 8 ++++++++
.../Assets/Prefabs/Johny/Animations/filler.meta | 7 +++++++
SunriseGame/Assets/Prefabs/Johny/Textures.meta | 8 ++++++++
SunriseGame/Assets/Prefabs/Johny/Textures/filler.meta | 7 +++++++
SunriseGame/Assets/Prefabs/filler.meta | 7 +++++++
SunriseGame/Assets/Scripts/Input/InputController.cs | 6 +++++-
SunriseGame/Assets/Scripts/Input/TouchController.cs | 2 +-
SunriseGame/Assets/Scripts/Input/TouchTarget.cs | 10 ----------
11 files changed, 63 insertions(+), 13 deletions(-)
create mode 100644 SunriseGame/Assets/Prefabs.meta
create mode 100644 SunriseGame/Assets/Prefabs/Johny.meta
create mode 100644 SunriseGame/Assets/Prefabs/Johny/Animations.meta
create mode 100644 SunriseGame/Assets/Prefabs/Johny/Animations/filler.meta
create mode 100644 SunriseGame/Assets/Prefabs/Johny/Textures.meta
create mode 100644 SunriseGame/Assets/Prefabs/Johny/Textures/filler.meta
create mode 100644 SunriseGame/Assets/Prefabs/filler.meta
diff --git a/.gitignore b/.gitignore
index 4b0c262..5e7bb61 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 0000000..0831540
--- /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 0000000..43062cd
--- /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 0000000..6ff9143
--- /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 0000000..4fe7a82
--- /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 0000000..0015f6f
--- /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 0000000..7193672
--- /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 0000000..d569d2c
--- /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 da0fe2f..9ed6cd3 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 9d44257..8c8794a 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 eff1227..5bb01bd 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()
- {
-
- }
}
--
GitLab