From edaeb4b7c681cc1654745e5a9be531a71088d1af Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 22 Apr 2022 20:38:40 +0800 Subject: *rename folder --- SurvivalTest/Assets/Resources/Shader.meta | 8 --- .../Assets/Resources/Shader/custom_project.shader | 71 ---------------------- .../Resources/Shader/custom_project.shader.meta | 10 --- SurvivalTest/Assets/Resources/shaders.meta | 8 +++ .../Assets/Resources/shaders/custom_project.shader | 71 ++++++++++++++++++++++ .../Resources/shaders/custom_project.shader.meta | 10 +++ SurvivalTest/Assets/Scripts/Resources.meta | 8 +++ .../Assets/Scripts/Resources/ResourceManager.cs | 9 +++ .../Scripts/Resources/ResourceManager.cs.meta | 11 ++++ SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs | 9 ++- 10 files changed, 123 insertions(+), 92 deletions(-) delete mode 100644 SurvivalTest/Assets/Resources/Shader.meta delete mode 100644 SurvivalTest/Assets/Resources/Shader/custom_project.shader delete mode 100644 SurvivalTest/Assets/Resources/Shader/custom_project.shader.meta create mode 100644 SurvivalTest/Assets/Resources/shaders.meta create mode 100644 SurvivalTest/Assets/Resources/shaders/custom_project.shader create mode 100644 SurvivalTest/Assets/Resources/shaders/custom_project.shader.meta create mode 100644 SurvivalTest/Assets/Scripts/Resources.meta create mode 100644 SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs create mode 100644 SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs.meta (limited to 'SurvivalTest/Assets') diff --git a/SurvivalTest/Assets/Resources/Shader.meta b/SurvivalTest/Assets/Resources/Shader.meta deleted file mode 100644 index d21736c..0000000 --- a/SurvivalTest/Assets/Resources/Shader.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f366b989b37a37f4489af980dd5ae78b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Shader/custom_project.shader b/SurvivalTest/Assets/Resources/Shader/custom_project.shader deleted file mode 100644 index 857510f..0000000 --- a/SurvivalTest/Assets/Resources/Shader/custom_project.shader +++ /dev/null @@ -1,71 +0,0 @@ -Shader "Unlit/custom_project" -{ - Properties - { - _MainTex ("Texture", 2D) = "white" {} - } - SubShader - { - Tags { "RenderType"="Opaque" } - LOD 100 - - Blend SrcAlpha OneMinusSrcAlpha - - Pass - { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - // make fog work - #pragma multi_compile_fog - - #include "UnityCG.cginc" - - struct appdata - { - float4 vertex : POSITION; - float2 uv : TEXCOORD0; - }; - - struct v2f - { - float2 uv : TEXCOORD0; - UNITY_FOG_COORDS(1) - fixed4 color: TEXCOORD2; - float4 vertex : SV_POSITION; - }; - - sampler2D _MainTex; - float4 _MainTex_ST; - - fixed _IsSceneView; - - fixed4 _Color; - - v2f vert (appdata v) - { - v2f o; - o.vertex = UnityObjectToClipPos(v.vertex); -#ifndef SCENE_VIEW - // o.vertex.y *= 1.414; -#endif - if(_IsSceneView == 0){ - o.vertex.y *= 1.414; - } - o.uv = TRANSFORM_TEX(v.uv, _MainTex); - UNITY_TRANSFER_FOG(o,o.vertex); - return o; - } - - fixed4 frag (v2f i) : SV_Target - { - // sample the texture - fixed4 col = tex2D(_MainTex, i.uv); - // apply fog - UNITY_APPLY_FOG(i.fogCoord, col); - return col; - } - ENDCG - } - } -} diff --git a/SurvivalTest/Assets/Resources/Shader/custom_project.shader.meta b/SurvivalTest/Assets/Resources/Shader/custom_project.shader.meta deleted file mode 100644 index bc91ff1..0000000 --- a/SurvivalTest/Assets/Resources/Shader/custom_project.shader.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 8ef4eb49d4654b64d95159eef3f0f427 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - preprocessorOverride: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/shaders.meta b/SurvivalTest/Assets/Resources/shaders.meta new file mode 100644 index 0000000..d21736c --- /dev/null +++ b/SurvivalTest/Assets/Resources/shaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f366b989b37a37f4489af980dd5ae78b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/shaders/custom_project.shader b/SurvivalTest/Assets/Resources/shaders/custom_project.shader new file mode 100644 index 0000000..857510f --- /dev/null +++ b/SurvivalTest/Assets/Resources/shaders/custom_project.shader @@ -0,0 +1,71 @@ +Shader "Unlit/custom_project" +{ + Properties + { + _MainTex ("Texture", 2D) = "white" {} + } + SubShader + { + Tags { "RenderType"="Opaque" } + LOD 100 + + Blend SrcAlpha OneMinusSrcAlpha + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + // make fog work + #pragma multi_compile_fog + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f + { + float2 uv : TEXCOORD0; + UNITY_FOG_COORDS(1) + fixed4 color: TEXCOORD2; + float4 vertex : SV_POSITION; + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + + fixed _IsSceneView; + + fixed4 _Color; + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); +#ifndef SCENE_VIEW + // o.vertex.y *= 1.414; +#endif + if(_IsSceneView == 0){ + o.vertex.y *= 1.414; + } + o.uv = TRANSFORM_TEX(v.uv, _MainTex); + UNITY_TRANSFER_FOG(o,o.vertex); + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + // sample the texture + fixed4 col = tex2D(_MainTex, i.uv); + // apply fog + UNITY_APPLY_FOG(i.fogCoord, col); + return col; + } + ENDCG + } + } +} diff --git a/SurvivalTest/Assets/Resources/shaders/custom_project.shader.meta b/SurvivalTest/Assets/Resources/shaders/custom_project.shader.meta new file mode 100644 index 0000000..bc91ff1 --- /dev/null +++ b/SurvivalTest/Assets/Resources/shaders/custom_project.shader.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8ef4eb49d4654b64d95159eef3f0f427 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + preprocessorOverride: 0 + userData: + assetBundleName: + assetBundleVariant: 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 +{ + + +} 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); } } -- cgit v1.1-26-g67d0