summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2022-04-22 20:38:40 +0800
committerchai <chaifix@163.com>2022-04-22 20:38:40 +0800
commitedaeb4b7c681cc1654745e5a9be531a71088d1af (patch)
treea3dd1b1a2fc43caaec5cd3775bdf0f3423b39d97
parentded822e98e8eda49618d17e53407b0df1896e539 (diff)
*rename folder
-rw-r--r--SurvivalTest/Assets/Resources/shaders.meta (renamed from SurvivalTest/Assets/Resources/Shader.meta)0
-rw-r--r--SurvivalTest/Assets/Resources/shaders/custom_project.shader (renamed from SurvivalTest/Assets/Resources/Shader/custom_project.shader)0
-rw-r--r--SurvivalTest/Assets/Resources/shaders/custom_project.shader.meta (renamed from SurvivalTest/Assets/Resources/Shader/custom_project.shader.meta)0
-rw-r--r--SurvivalTest/Assets/Scripts/Resources.meta8
-rw-r--r--SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs9
-rw-r--r--SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs.meta11
-rw-r--r--SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs9
7 files changed, 34 insertions, 3 deletions
diff --git a/SurvivalTest/Assets/Resources/Shader.meta b/SurvivalTest/Assets/Resources/shaders.meta
index d21736c..d21736c 100644
--- a/SurvivalTest/Assets/Resources/Shader.meta
+++ b/SurvivalTest/Assets/Resources/shaders.meta
diff --git a/SurvivalTest/Assets/Resources/Shader/custom_project.shader b/SurvivalTest/Assets/Resources/shaders/custom_project.shader
index 857510f..857510f 100644
--- a/SurvivalTest/Assets/Resources/Shader/custom_project.shader
+++ b/SurvivalTest/Assets/Resources/shaders/custom_project.shader
diff --git a/SurvivalTest/Assets/Resources/Shader/custom_project.shader.meta b/SurvivalTest/Assets/Resources/shaders/custom_project.shader.meta
index bc91ff1..bc91ff1 100644
--- a/SurvivalTest/Assets/Resources/Shader/custom_project.shader.meta
+++ b/SurvivalTest/Assets/Resources/shaders/custom_project.shader.meta
diff --git a/SurvivalTest/Assets/Scripts/Resources.meta b/SurvivalTest/Assets/Scripts/Resources.meta
new file mode 100644
index 0000000..c816cb5
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 15372b99a90c9cd4bbc1ac76c420b72a
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs b/SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs
new file mode 100644
index 0000000..0b23d68
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs
@@ -0,0 +1,9 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ResourceManager : Singleton<ResourceManager>
+{
+
+
+}
diff --git a/SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs.meta b/SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs.meta
new file mode 100644
index 0000000..3b7e27c
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c7f322e5e74d79a46b0dfa5d2680e707
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs
index 11f76ba..6432354 100644
--- a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs
+++ b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs
@@ -237,11 +237,14 @@ public class TestPeaceMaker : MonoBehaviour
{
while (true)
{
+ CreateBullet(TestMathHelper.Rotate(m_AimDirection, -10 * Mathf.Deg2Rad), 12f, 2f);
+ yield return new WaitForSeconds(interval / 3f);
+
CreateBullet(m_AimDirection, 12f, 2f);
- //CreateBullet(TestMathHelper.Rotate(m_AimDirection, 10 * Mathf.Deg2Rad), 12f, 2f);
- //CreateBullet(TestMathHelper.Rotate(m_AimDirection, -10 * Mathf.Deg2Rad), 12f, 2f);
+ yield return new WaitForSeconds(interval / 3f);
- yield return new WaitForSeconds(interval);
+ CreateBullet(TestMathHelper.Rotate(m_AimDirection, 10 * Mathf.Deg2Rad), 12f, 2f);
+ yield return new WaitForSeconds(interval / 3f);
}
}