added temp invincibility, fixed spawning and camera view, music, and … · aqtoor/Unity3D@f20619e · GitHub
Skip to content

Commit f20619e

Browse files
huacyanghuacyang
committed
added temp invincibility, fixed spawning and camera view, music, and minor fixes
1 parent 95f48f2 commit f20619e

172 files changed

Lines changed: 146 additions & 699 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Assembly-CSharp-firstpass-vs.csproj‎

Lines changed: 1 addition & 4 deletions

‎Assembly-CSharp-firstpass.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<DebugType>full</DebugType>
1919
<Optimize>false</Optimize>
2020
<OutputPath>Temp\bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PHYSICS;ENABLE_TERRAIN;ENABLE_CACHING;ENABLE_SUBSTANCE;ENABLE_GENERICS;ENABLE_CLOTH;ENABLE_MOVIES;ENABLE_AUDIO;ENABLE_WWW;ENABLE_SHADOWS;ENABLE_DUCK_TYPING;UNITY_4_1_2;UNITY_4_1;ENABLE_PROFILER;UNITY_EDITOR</DefineConstants>
21+
<DefineConstants>DEBUG;TRACE;UNITY_WEBPLAYER;WEBPLUG;ENABLE_MICROPHONE;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;ENABLE_AUDIO_FMOD;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PHYSICS;ENABLE_TERRAIN;ENABLE_CACHING;ENABLE_SUBSTANCE;ENABLE_GENERICS;ENABLE_CLOTH;ENABLE_MOVIES;ENABLE_AUDIO;ENABLE_WWW;ENABLE_SHADOWS;ENABLE_DUCK_TYPING;UNITY_4_1_2;UNITY_4_1;ENABLE_PROFILER;UNITY_EDITOR</DefineConstants>
2222
<ErrorReport>prompt</ErrorReport>
2323
<WarningLevel>4</WarningLevel>
2424
<NoWarn>0169</NoWarn>
@@ -45,9 +45,6 @@
4545
</ItemGroup>
4646
<ItemGroup>
4747
<Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\MouseLook.cs" />
48-
<Compile Include="Assets\Standard Assets\Scripts\General Scripts\ActivateTrigger.cs" />
49-
<Compile Include="Assets\Standard Assets\Scripts\Utility Scripts\CombineChildren.cs" />
50-
<Compile Include="Assets\Standard Assets\Scripts\Utility Scripts\MeshCombineUtility.cs" />
5148
<None Include="Assets\Standard Assets\Particles\Sources\Shaders\Particle Alpha Blend (Queue +100).shader" />
5249
<None Include="Assets\Standard Assets\Skyboxes\_skybox info.txt" />
5350
</ItemGroup>

‎Assembly-CSharp-firstpass.pidb‎

23 Bytes
Binary file not shown.

‎Assembly-UnityScript-firstpass-vs.unityproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<DebugType>full</DebugType>
1919
<Optimize>false</Optimize>
2020
<OutputPath>Temp\bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PHYSICS;ENABLE_TERRAIN;ENABLE_CACHING;ENABLE_SUBSTANCE;ENABLE_GENERICS;ENABLE_CLOTH;ENABLE_MOVIES;ENABLE_AUDIO;ENABLE_WWW;ENABLE_SHADOWS;ENABLE_DUCK_TYPING;UNITY_4_1_2;UNITY_4_1;ENABLE_PROFILER;UNITY_EDITOR</DefineConstants>
21+
<DefineConstants>DEBUG;TRACE;UNITY_WEBPLAYER;WEBPLUG;ENABLE_MICROPHONE;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;ENABLE_AUDIO_FMOD;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PHYSICS;ENABLE_TERRAIN;ENABLE_CACHING;ENABLE_SUBSTANCE;ENABLE_GENERICS;ENABLE_CLOTH;ENABLE_MOVIES;ENABLE_AUDIO;ENABLE_WWW;ENABLE_SHADOWS;ENABLE_DUCK_TYPING;UNITY_4_1_2;UNITY_4_1;ENABLE_PROFILER;UNITY_EDITOR</DefineConstants>
2222
<ErrorReport>prompt</ErrorReport>
2323
<WarningLevel>4</WarningLevel>
2424
<NoWarn>0169</NoWarn>
@@ -50,10 +50,6 @@
5050
<Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\ThirdPersonCamera.js" />
5151
<Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\ThirdPersonController.js" />
5252
<Compile Include="Assets\Standard Assets\Particles\Legacy Particles\TimedObjectDestructor.js" />
53-
<Compile Include="Assets\Standard Assets\Scripts\Camera Scripts\MouseOrbit.js" />
54-
<Compile Include="Assets\Standard Assets\Scripts\Camera Scripts\SmoothFollow.js" />
55-
<Compile Include="Assets\Standard Assets\Scripts\Camera Scripts\SmoothLookAt.js" />
56-
<Compile Include="Assets\Standard Assets\Scripts\General Scripts\DragRigidbody.js" />
5753
<None Include="Assets\Standard Assets\Particles\Sources\Shaders\Particle Alpha Blend (Queue +100).shader" />
5854
<None Include="Assets\Standard Assets\Skyboxes\_skybox info.txt" />
5955
</ItemGroup>

‎Assembly-UnityScript-firstpass.pidb‎

149 Bytes
Binary file not shown.

‎Assembly-UnityScript-firstpass.unityproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<DebugType>full</DebugType>
1919
<Optimize>false</Optimize>
2020
<OutputPath>Temp\bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PHYSICS;ENABLE_TERRAIN;ENABLE_CACHING;ENABLE_SUBSTANCE;ENABLE_GENERICS;ENABLE_CLOTH;ENABLE_MOVIES;ENABLE_AUDIO;ENABLE_WWW;ENABLE_SHADOWS;ENABLE_DUCK_TYPING;UNITY_4_1_2;UNITY_4_1;ENABLE_PROFILER;UNITY_EDITOR</DefineConstants>
21+
<DefineConstants>DEBUG;TRACE;UNITY_WEBPLAYER;WEBPLUG;ENABLE_MICROPHONE;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;ENABLE_AUDIO_FMOD;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PHYSICS;ENABLE_TERRAIN;ENABLE_CACHING;ENABLE_SUBSTANCE;ENABLE_GENERICS;ENABLE_CLOTH;ENABLE_MOVIES;ENABLE_AUDIO;ENABLE_WWW;ENABLE_SHADOWS;ENABLE_DUCK_TYPING;UNITY_4_1_2;UNITY_4_1;ENABLE_PROFILER;UNITY_EDITOR</DefineConstants>
2222
<ErrorReport>prompt</ErrorReport>
2323
<WarningLevel>4</WarningLevel>
2424
<NoWarn>0169</NoWarn>
@@ -50,10 +50,6 @@
5050
<Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\ThirdPersonCamera.js" />
5151
<Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\ThirdPersonController.js" />
5252
<Compile Include="Assets\Standard Assets\Particles\Legacy Particles\TimedObjectDestructor.js" />
53-
<Compile Include="Assets\Standard Assets\Scripts\Camera Scripts\MouseOrbit.js" />
54-
<Compile Include="Assets\Standard Assets\Scripts\Camera Scripts\SmoothFollow.js" />
55-
<Compile Include="Assets\Standard Assets\Scripts\Camera Scripts\SmoothLookAt.js" />
56-
<Compile Include="Assets\Standard Assets\Scripts\General Scripts\DragRigidbody.js" />
5753
<None Include="Assets\Standard Assets\Particles\Sources\Shaders\Particle Alpha Blend (Queue +100).shader" />
5854
<None Include="Assets\Standard Assets\Skyboxes\_skybox info.txt" />
5955
</ItemGroup>

‎Assembly-UnityScript-vs.unityproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<DebugType>full</DebugType>
1919
<Optimize>false</Optimize>
2020
<OutputPath>Temp\bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PHYSICS;ENABLE_TERRAIN;ENABLE_CACHING;ENABLE_SUBSTANCE;ENABLE_GENERICS;ENABLE_CLOTH;ENABLE_MOVIES;ENABLE_AUDIO;ENABLE_WWW;ENABLE_SHADOWS;ENABLE_DUCK_TYPING;UNITY_4_1_2;UNITY_4_1;ENABLE_PROFILER;UNITY_EDITOR</DefineConstants>
21+
<DefineConstants>DEBUG;TRACE;UNITY_WEBPLAYER;WEBPLUG;ENABLE_MICROPHONE;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;ENABLE_AUDIO_FMOD;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PHYSICS;ENABLE_TERRAIN;ENABLE_CACHING;ENABLE_SUBSTANCE;ENABLE_GENERICS;ENABLE_CLOTH;ENABLE_MOVIES;ENABLE_AUDIO;ENABLE_WWW;ENABLE_SHADOWS;ENABLE_DUCK_TYPING;UNITY_4_1_2;UNITY_4_1;ENABLE_PROFILER;UNITY_EDITOR</DefineConstants>
2222
<ErrorReport>prompt</ErrorReport>
2323
<WarningLevel>4</WarningLevel>
2424
<NoWarn>0169</NoWarn>
@@ -45,12 +45,14 @@
4545
</ItemGroup>
4646
<ItemGroup>
4747
<Compile Include="Assets\Scripts\autoTargetPlayer.js" />
48+
<Compile Include="Assets\Scripts\bgMusic.js" />
4849
<Compile Include="Assets\Scripts\damageController.js" />
4950
<Compile Include="Assets\Scripts\deathZone.js" />
5051
<Compile Include="Assets\Scripts\fire.js" />
5152
<Compile Include="Assets\Scripts\gui.js" />
5253
<Compile Include="Assets\Scripts\health.js" />
5354
<Compile Include="Assets\Scripts\onCollision.js" />
55+
<Compile Include="Assets\Scripts\playAgain.js" />
5456
<Compile Include="Assets\Scripts\playerController.js" />
5557
<Compile Include="Assets\Scripts\playerFire.js" />
5658
<Compile Include="Assets\Scripts\randomSpawn.js" />

‎Assembly-UnityScript.pidb‎

1.92 KB
Binary file not shown.

‎Assembly-UnityScript.unityproj‎

Lines changed: 3 additions & 1 deletion

‎Assets/Audio/Bomb1.mp3‎

21.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)