Skip to content

B
BoomMaster
Commit 8ec69cb0 authored by wanqing's avatar wanqing
Browse files
Options

爆破关卡逻辑整理

parent aff84cda
Show whitespace changes
Inline Side-by-side
Showing with 7738 additions and 334 deletions
BoomMaster/Assembly-CSharp-Editor.csproj
View file @ 8ec69cb0
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath> <OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_2019_3_14;UNITY_2019_3;UNITY_2019;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CROSS_PLATFORM_INPUT;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants> <DefineConstants>DEBUG;TRACE;UNITY_2019_3_14;UNITY_2019_3;UNITY_2019;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_RUNTIME_PERMISSIONS;ENABLE_ENGINE_CODE_STRIPPING;ENABLE_ONSCREEN_KEYBOARD;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;ENABLE_VIDEO;PLATFORM_ANDROID;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;UNITY_HAS_GOOGLEVR;UNITY_HAS_TANGO;ENABLE_SPATIALTRACKING;UNITY_ASTC_ONLY_DECOMPRESS;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CROSS_PLATFORM_INPUT;MOBILE_INPUT;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn> <NoWarn>0169</NoWarn>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<UnityProjectGenerator>Unity/VSTU</UnityProjectGenerator> <UnityProjectGenerator>Unity/VSTU</UnityProjectGenerator>
<UnityProjectType>Editor:5</UnityProjectType> <UnityProjectType>Editor:5</UnityProjectType>
<UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget> <UnityBuildTarget>Android:13</UnityBuildTarget>
<UnityVersion>2019.3.14f1</UnityVersion> <UnityVersion>2019.3.14f1</UnityVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
BoomMaster/Assembly-CSharp-firstpass.csproj
View file @ 8ec69cb0
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath> <OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_2019_3_14;UNITY_2019_3;UNITY_2019;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CROSS_PLATFORM_INPUT;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants> <DefineConstants>DEBUG;TRACE;UNITY_2019_3_14;UNITY_2019_3;UNITY_2019;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_RUNTIME_PERMISSIONS;ENABLE_ENGINE_CODE_STRIPPING;ENABLE_ONSCREEN_KEYBOARD;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;ENABLE_VIDEO;PLATFORM_ANDROID;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;UNITY_HAS_GOOGLEVR;UNITY_HAS_TANGO;ENABLE_SPATIALTRACKING;UNITY_ASTC_ONLY_DECOMPRESS;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CROSS_PLATFORM_INPUT;MOBILE_INPUT;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn> <NoWarn>0169</NoWarn>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<UnityProjectGenerator>Unity/VSTU</UnityProjectGenerator> <UnityProjectGenerator>Unity/VSTU</UnityProjectGenerator>
<UnityProjectType>GamePlugins:3</UnityProjectType> <UnityProjectType>GamePlugins:3</UnityProjectType>
<UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget> <UnityBuildTarget>Android:13</UnityBuildTarget>
<UnityVersion>2019.3.14f1</UnityVersion> <UnityVersion>2019.3.14f1</UnityVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
...@@ -98,12 +98,6 @@ ...@@ -98,12 +98,6 @@
<Reference Include="UnityEngine.ClothModule"> <Reference Include="UnityEngine.ClothModule">
<HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll</HintPath> <HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll</HintPath>
</Reference> </Reference>
<Reference Include="UnityEngine.ClusterInputModule">
<HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.ClusterRendererModule">
<HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.CoreModule"> <Reference Include="UnityEngine.CoreModule">
<HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll</HintPath> <HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll</HintPath>
</Reference> </Reference>
......
BoomMaster/Assembly-CSharp.csproj
View file @ 8ec69cb0
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath> <OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_2019_3_14;UNITY_2019_3;UNITY_2019;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CROSS_PLATFORM_INPUT;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants> <DefineConstants>DEBUG;TRACE;UNITY_2019_3_14;UNITY_2019_3;UNITY_2019;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_RUNTIME_PERMISSIONS;ENABLE_ENGINE_CODE_STRIPPING;ENABLE_ONSCREEN_KEYBOARD;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;ENABLE_VIDEO;PLATFORM_ANDROID;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;UNITY_HAS_GOOGLEVR;UNITY_HAS_TANGO;ENABLE_SPATIALTRACKING;UNITY_ASTC_ONLY_DECOMPRESS;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CROSS_PLATFORM_INPUT;MOBILE_INPUT;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn> <NoWarn>0169</NoWarn>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<UnityProjectGenerator>Unity/VSTU</UnityProjectGenerator> <UnityProjectGenerator>Unity/VSTU</UnityProjectGenerator>
<UnityProjectType>Game:1</UnityProjectType> <UnityProjectType>Game:1</UnityProjectType>
<UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget> <UnityBuildTarget>Android:13</UnityBuildTarget>
<UnityVersion>2019.3.14f1</UnityVersion> <UnityVersion>2019.3.14f1</UnityVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
...@@ -103,6 +103,8 @@ ...@@ -103,6 +103,8 @@
<Compile Include="Assets\#A2_Scripts\Manager\PassLevelChecker.cs" /> <Compile Include="Assets\#A2_Scripts\Manager\PassLevelChecker.cs" />
<Compile Include="Assets\#A2_Scripts\Manager\SurfacePoint.cs" /> <Compile Include="Assets\#A2_Scripts\Manager\SurfacePoint.cs" />
<Compile Include="Assets\#A2_Scripts\PlayerPrefs\LocalRecord.cs" /> <Compile Include="Assets\#A2_Scripts\PlayerPrefs\LocalRecord.cs" />
<Compile Include="Assets\#A2_Scripts\Pool\Pool.cs" />
<Compile Include="Assets\#A2_Scripts\Pool\PoolManager.cs" />
<Compile Include="Assets\#A2_Scripts\Projector\SetProjectorToShader.cs" /> <Compile Include="Assets\#A2_Scripts\Projector\SetProjectorToShader.cs" />
<Compile Include="Assets\#A2_Scripts\Projector\UpdateProjectorRT.cs" /> <Compile Include="Assets\#A2_Scripts\Projector\UpdateProjectorRT.cs" />
<Compile Include="Assets\#A2_Scripts\Services\AudioServices.cs" /> <Compile Include="Assets\#A2_Scripts\Services\AudioServices.cs" />
...@@ -215,12 +217,6 @@ ...@@ -215,12 +217,6 @@
<Reference Include="UnityEngine.ClothModule"> <Reference Include="UnityEngine.ClothModule">
<HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll</HintPath> <HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll</HintPath>
</Reference> </Reference>
<Reference Include="UnityEngine.ClusterInputModule">
<HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.ClusterRendererModule">
<HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.CoreModule"> <Reference Include="UnityEngine.CoreModule">
<HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll</HintPath> <HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll</HintPath>
</Reference> </Reference>
......
BoomMaster/Assets/#A1_Scenes/DemoScenes.unity
View file @ 8ec69cb0
...@@ -14,7 +14,7 @@ OcclusionCullingSettings: ...@@ -14,7 +14,7 @@ OcclusionCullingSettings:
RenderSettings: RenderSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 9 serializedVersion: 9
m_Fog: 1 m_Fog: 0
m_FogColor: {r: 0.31163225, g: 0.3791211, b: 0.4433962, a: 1} m_FogColor: {r: 0.31163225, g: 0.3791211, b: 0.4433962, a: 1}
m_FogMode: 1 m_FogMode: 1
m_FogDensity: 0.01 m_FogDensity: 0.01
...@@ -26,7 +26,7 @@ RenderSettings: ...@@ -26,7 +26,7 @@ RenderSettings:
m_AmbientIntensity: 1 m_AmbientIntensity: 1
m_AmbientMode: 0 m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 0} m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5 m_HaloStrength: 0.5
m_FlareStrength: 1 m_FlareStrength: 1
m_FlareFadeSpeed: 3 m_FlareFadeSpeed: 3
...@@ -38,7 +38,7 @@ RenderSettings: ...@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_IndirectSpecularColor: {r: 0.37311926, g: 0.38073996, b: 0.35872698, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &4 --- !u!157 &4
LightmapSettings: LightmapSettings:
...@@ -71,22 +71,22 @@ LightmapSettings: ...@@ -71,22 +71,22 @@ LightmapSettings:
m_FinalGatherFiltering: 1 m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 1024 m_FinalGatherRayCount: 1024
m_ReflectionCompression: 2 m_ReflectionCompression: 2
m_MixedBakeMode: 1 m_MixedBakeMode: 2
m_BakeBackend: 0 m_BakeBackend: 1
m_PVRSampling: 1 m_PVRSampling: 1
m_PVRDirectSampleCount: 32 m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500 m_PVRSampleCount: 512
m_PVRBounces: 2 m_PVRBounces: 2
m_PVREnvironmentSampleCount: 500 m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048 m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 2 m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 0 m_PVRDenoiserTypeDirect: 0
m_PVRDenoiserTypeIndirect: 0 m_PVRDenoiserTypeIndirect: 0
m_PVRDenoiserTypeAO: 0 m_PVRDenoiserTypeAO: 0
m_PVRFilterTypeDirect: 0 m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0 m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 0 m_PVREnvironmentMIS: 1
m_PVRCulling: 1 m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5 m_PVRFilteringGaussRadiusIndirect: 5
...@@ -98,7 +98,7 @@ LightmapSettings: ...@@ -98,7 +98,7 @@ LightmapSettings:
m_TrainingDataDestination: TrainingData m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4 m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0} m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 0 m_UseShadowmask: 1
--- !u!196 &5 --- !u!196 &5
NavMeshSettings: NavMeshSettings:
serializedVersion: 2 serializedVersion: 2
...@@ -164,7 +164,74 @@ MonoBehaviour: ...@@ -164,7 +164,74 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 78ec671e966834f46834ab26e598bb0b, type: 3} m_Script: {fileID: 11500000, guid: 78ec671e966834f46834ab26e598bb0b, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
levelPrefs: [] levelPrefs:
- {fileID: 2494662193881588615, guid: b9647a9897cab0e47bfde2ad326aa1d8, type: 3}
--- !u!1 &543166196
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 543166199}
- component: {fileID: 543166198}
- component: {fileID: 543166197}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &543166197
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 543166196}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &543166198
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 543166196}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &543166199
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 543166196}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &707446923 --- !u!1 &707446923
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
BoomMaster/Assets/#A2_Scripts/Battle/Trigger/FirstLevelTrigger.cs
View file @ 8ec69cb0
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using DG.Tweening;
public class FirstLevelTrigger : MonoBehaviour public class FirstLevelTrigger : MonoBehaviour
{ {
public Transform m_targetTrans; //public Transform m_targetTrans;
private Vector3 m_pos = new Vector3(0, 5.2f, 0); //private Vector3 m_pos = new Vector3(0, 5.2f, 0);
private Quaternion m_rotation = Quaternion.identity; //private Quaternion m_rotation = Quaternion.identity;
//private void OnTriggerEnter(Collider other)
//{
// if (other.gameObject.CompareTag("Target"))
// {
// BattleCtrl.instance.levelManager.curLevel.chainRopeView.CatchObjEnterTarget();
// BattleCtrl.instance.OnBattleWin();
// m_targetTrans.localPosition = m_pos;
// m_targetTrans.localRotation = m_rotation;
// }
//}
public Transform m_carTrans;
public GameObject m_yellowBodyObj;
public Transform m_playerTrans;
private bool m_bControl = true;
private bool m_bControlPass = true;
private GameObject m_cubeObj;
private void Awake()
{
m_cubeObj = m_playerTrans.Find("Cube").gameObject;
}
private void OnTriggerEnter(Collider other) private void OnTriggerEnter(Collider other)
{ {
if (other.gameObject.CompareTag("Target")) if (other.tag == "Final" && m_bControlPass)
{
m_bControlPass = false;
m_yellowBodyObj.gameObject.SetActive(false);
Invoke("PassLevelAnimation", 3);
}
}
void PassLevelAnimation()
{ {
BattleCtrl.instance.levelManager.curLevel.chainRopeView.CatchObjEnterTarget(); m_carTrans.DOLocalMoveZ(9, 2).SetEase(Ease.Linear).OnComplete(() => {
BattleCtrl.instance.OnBattleWin(); BattleCtrl.instance.OnBattleWin();
m_targetTrans.localPosition = m_pos; });
m_targetTrans.localRotation = m_rotation; }
// Update is called once per frame
void Update()
{
if (m_bControl && m_playerTrans.position.y < 5.4f)
{
m_cubeObj.SetActive(false);
m_bControl = false;
} }
} }
} }
BoomMaster/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
View file @ 8ec69cb0
...@@ -35,6 +35,8 @@ public class BattleUI : MonoBehaviour ...@@ -35,6 +35,8 @@ public class BattleUI : MonoBehaviour
public GameObject m_successResultMaskObj;//胜利结算maskobj public GameObject m_successResultMaskObj;//胜利结算maskobj
public GameObject m_ShowMouseObj;//显示手指图标obj public GameObject m_ShowMouseObj;//显示手指图标obj
public GameObject m_HideMouseObj;//隐藏手指图标obj public GameObject m_HideMouseObj;//隐藏手指图标obj
public GameObject[] m_boomUIS;//爆炸Ui
public Button m_boomBtn;//炸弹按钮
public Action onStartBtn; public Action onStartBtn;
public Action onPosUpBtn; public Action onPosUpBtn;
public Action onPosDownBtn; public Action onPosDownBtn;
...@@ -46,6 +48,7 @@ public class BattleUI : MonoBehaviour ...@@ -46,6 +48,7 @@ public class BattleUI : MonoBehaviour
//private Text m_ShowOrHideMouseText;//显示或隐藏手指text //private Text m_ShowOrHideMouseText;//显示或隐藏手指text
private int m_mouseIndex = 0;//点击次数 private int m_mouseIndex = 0;//点击次数
private bool m_bIsShowMouse = true;//是否显示手指图标 private bool m_bIsShowMouse = true;//是否显示手指图标
private int m_bombIndex = 0;//炸弹计数
void Awake() void Awake()
{ {
m_dragBtn.onClick.AddListener(SetDragMode); m_dragBtn.onClick.AddListener(SetDragMode);
...@@ -64,6 +67,10 @@ public class BattleUI : MonoBehaviour ...@@ -64,6 +67,10 @@ public class BattleUI : MonoBehaviour
GameServices.audioServices.PlayBgm(GameServices.configService.audioConfig.GameBgm); GameServices.audioServices.PlayBgm(GameServices.configService.audioConfig.GameBgm);
GameServices.configService.playerConfig.ClawMoveSpeed = 0.4f;//开始默认值 GameServices.configService.playerConfig.ClawMoveSpeed = 0.4f;//开始默认值
} }
private void Start()
{
m_boomBtn.interactable = false;
}
void SetDragMode() void SetDragMode()
{ {
BattleCtrl.instance.levelManager.curLevel.chainView.SetDragMode(true); BattleCtrl.instance.levelManager.curLevel.chainView.SetDragMode(true);
...@@ -223,6 +230,13 @@ public class BattleUI : MonoBehaviour ...@@ -223,6 +230,13 @@ public class BattleUI : MonoBehaviour
/// 加载关卡后调用 /// 加载关卡后调用
public void OnAfterLoadLevel() public void OnAfterLoadLevel()
{ {
//重置状态
m_bombIndex = 0;
for(int i = 0;i<m_boomUIS.Length;i++)
{
m_boomUIS[i].SetActive(true);
}
m_levelText.text = string.Format("Level {0:D}", BattleCtrl.instance.levelManager.CurLevelIndex + 1); m_levelText.text = string.Format("Level {0:D}", BattleCtrl.instance.levelManager.CurLevelIndex + 1);
Camera varCam = BattleCtrl.instance.levelManager.curLevel.cam; Camera varCam = BattleCtrl.instance.levelManager.curLevel.cam;
...@@ -269,4 +283,22 @@ public class BattleUI : MonoBehaviour ...@@ -269,4 +283,22 @@ public class BattleUI : MonoBehaviour
m_HideMouseObj.SetActive(false); m_HideMouseObj.SetActive(false);
m_bIsShowMouse = false; m_bIsShowMouse = false;
} }
//设置炸弹
public void SetBomb()
{
if (m_bombIndex >= 3)
return;
m_boomBtn.interactable = true;
m_boomUIS[m_bombIndex].SetActive(false);
m_bombIndex++;
}
//点击爆破按钮
public void OnClickBoomBtn()
{
BattleCtrl.instance.levelManager.curLevel.bombView.StartBomb();
m_boomBtn.interactable = false;
BattleCtrl.instance.levelManager.curLevel.bombView.SetPlaceState(m_bombIndex < 3);
}
} }
BoomMaster/Assets/#A2_Scripts/Battle/View/BombView.cs
View file @ 8ec69cb0
...@@ -6,18 +6,45 @@ using RayFire; ...@@ -6,18 +6,45 @@ using RayFire;
public class BombView : MonoBehaviour public class BombView : MonoBehaviour
{ {
public GameObject m_bombParticleObj;//炸弹粒子 public GameObject m_bombParticleObj;//炸弹粒子
private RayfireBomb m_rayfireBomb;//炸弹预设 public GameObject m_bombEffectObj;//炸弹特效
public RayfireBomb m_rayfireBomb;//炸弹预设
private RayfireBomb m_curBomb;//当前的炸弹 private RayfireBomb m_curBomb;//当前的炸弹
private bool m_bCanBePlace = true;//是否能放置炸弹
//设置炸弹
void SetBomb(RayfireBomb rayfireBomb) void SetBomb(RayfireBomb rayfireBomb)
{ {
m_bombParticleObj?.SetActive(false); m_bombParticleObj?.SetActive(false);
m_curBomb = rayfireBomb; m_curBomb = rayfireBomb;
m_bCanBePlace = false;
}
//设置放置状态
public void SetPlaceState(bool value)
{
m_bCanBePlace = value;
}
//开始炸
public void StartBomb()
{
GameObject fx = PoolManager.Instance.GetObjectFromPool(m_bombEffectObj);
fx.transform.position = m_curBomb.transform.position;
m_curBomb?.Explode(0);
m_curBomb.gameObject.SetActive(false);
//回收
PoolManager.Instance.ReturnObjectToPool(m_curBomb.gameObject);
GameServices.timerServices.Push(this, 1.0f, delegate
{
PoolManager.Instance.ReturnObjectToPool(fx);
});
} }
private void Update() private void Update()
{ {
if (!BattleCtrl.instance.isStartBattle)
{
return;
}
if (Input.GetMouseButtonDown(0)) if (Input.GetMouseButtonDown(0))
{ {
Clicked(); Clicked();
...@@ -32,11 +59,12 @@ public class BombView : MonoBehaviour ...@@ -32,11 +59,12 @@ public class BombView : MonoBehaviour
if (Physics.Raycast(ray, out hit)) if (Physics.Raycast(ray, out hit))
{ {
if (hit.collider.tag == "Target" && GameManager.Instance.canBePlace) if (hit.collider.tag == "Target" && m_bCanBePlace)
{ {
GameObject go = Instantiate(m_rayfireBomb.gameObject) as GameObject; GameObject go = PoolManager.Instance.GetObjectFromPool(m_rayfireBomb.gameObject);
go.transform.position = hit.point; go.transform.position = hit.point;
SetBomb(go.GetComponent<RayfireBomb>()); SetBomb(go.GetComponent<RayfireBomb>());
BattleCtrl.instance.battleUI.SetBomb();
} }
} }
} }
......
BoomMaster/Assets/#A2_Scripts/Pool.meta 0 → 100644
View file @ 8ec69cb0
fileFormatVersion: 2
guid: c22d7907eb9bced4f97e4b45511cecdb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#A2_Scripts/Pool/Pool.cs 0 → 100644
View file @ 8ec69cb0
using UnityEngine;
using System;
using System.Collections;
using System.Collections.Generic;
class Pool
{
private Stack<GameObject> m_objStack = new Stack<GameObject>();
private List<GameObject> m_objList = new List<GameObject>();
//the root obj for unused obj
private GameObject m_rootObj;
private float lastUsedTime = -1;
//private PoolInflationType inflationType;
private string poolName;
private string prefabPath;
private GameObject m_instanceObj;
//private int objectsInUse = 0;
//public int GetObjectsInUse { get { return objectsInUse; } }
public Pool(GameObject go)
{
lastUsedTime = Time.time;
m_instanceObj = go;
this.poolName = go.name;
//this.inflationType = type;
m_rootObj = new GameObject(poolName + "Pool");
m_rootObj.transform.SetParent(PoolManager.Instance.transform);
}
public GameObject GetPoolObject()
{
GameObject varGo = null;
if (m_objStack.Count > 0)
{
varGo = m_objStack.Pop();
}
else
{
varGo = GameObject.Instantiate(m_instanceObj);
varGo.name = varGo.name.Replace("(Clone)", "");
m_objList.Add(varGo);
}
varGo.SetActive(true);
varGo.transform.SetParent(m_rootObj.transform);
return varGo;
}
//o(1)
public void ReturnObjectToPool(GameObject go)
{
if (go)
{
m_objStack.Push(go);
go.SetActive(false);
}
}
public void DestroyObj()
{
GameObject.Destroy(m_rootObj);
m_rootObj = null;
m_objList.Clear();
m_objList = null;
m_objStack = null;
}
}
\ No newline at end of file
BoomMaster/Assets/#A2_Scripts/Pool/Pool.cs.meta 0 → 100644
View file @ 8ec69cb0
fileFormatVersion: 2
guid: 92f577fd159b5de4c816b1fa4fe8b773
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#A2_Scripts/Pool/PoolManager.cs 0 → 100644
View file @ 8ec69cb0
using UnityEngine;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
public class PoolManager : MonoBehaviour
{
//obj pool
private Dictionary<string, Pool> m_poolDict = new Dictionary<string, Pool>();
private static PoolManager m_instance = null;
public static PoolManager Instance
{
get
{
if (m_instance == null)
{
GameObject GO = new GameObject("ResourceManager", typeof(PoolManager));
// Kanglai: if we have `GO.hideFlags |= HideFlags.DontSave;`, we will encounter Destroy problem when exit playing
// However we should keep using this in Play mode only!
m_instance = GO.GetComponent<PoolManager>();
if (Application.isPlaying)
{
//DontDestroyOnLoad(mInstance.gameObject);
}
else
{
Debug.LogWarning("[ResourceManager] You'd better ignore ResourceManager in Editor mode");
}
}
return m_instance;
}
}
private Pool GetPool(GameObject go)
{
if (!m_poolDict.ContainsKey(go.name))
{
m_poolDict[go.name] = new Pool(go);
}
return m_poolDict[go.name];
}
/// <summary>
/// Returns an available object from the pool
/// OR null in case the pool does not have any object available & can grow size is false.
/// </summary>
/// <param name="poolName"></param>
/// <returns></returns>
public GameObject GetObjectFromPool(GameObject go)
{
GameObject varGo = null;
Pool pool = GetPool(go);
if (pool != null)
{
varGo = pool.GetPoolObject();
}
return varGo;
}
/// <summary>
/// Return obj to the pool
/// </summary>
/// <param name="go"></param>
public void ReturnObjectToPool(GameObject go)
{
//PoolObject po = go.GetComponent<PoolObject>();
if (go != null)
{
Pool pool = null;
if (m_poolDict.TryGetValue(go.name, out pool))
{
pool.ReturnObjectToPool(go);
}
}
}
void OnDestroy()
{
for (int i = 0; i < m_poolDict.Count; i++)
{
var item = m_poolDict.ElementAt(i);
if(item.Value != null)
{
item.Value.DestroyObj();
}
}
m_poolDict.Clear();
m_poolDict = null;
}
}
\ No newline at end of file
BoomMaster/Assets/#A2_Scripts/Pool/PoolManager.cs.meta 0 → 100644
View file @ 8ec69cb0
fileFormatVersion: 2
guid: 3fa94291cbdb37f44bf84f0ce51b9af5
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
View file @ 8ec69cb0
...@@ -7647,6 +7647,135 @@ MonoBehaviour: ...@@ -7647,6 +7647,135 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
--- !u!1 &3457795603069500219
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6109125632920290557}
- component: {fileID: 951297746038294140}
- component: {fileID: 8059696551496187685}
- component: {fileID: 3314642096669198153}
m_Layer: 5
m_Name: BombBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6109125632920290557
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3457795603069500219}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6064464676328073067}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -160, y: 160}
m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &951297746038294140
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3457795603069500219}
m_CullTransparentMesh: 0
--- !u!114 &8059696551496187685
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3457795603069500219}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: dc7e6c9c41c0d95468b41bb84069d5b8, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &3314642096669198153
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3457795603069500219}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 8059696551496187685}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 6064464677632144694}
m_MethodName: OnClickBoomBtn
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &3500866432276939876 --- !u!1 &3500866432276939876
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -7991,6 +8120,80 @@ MonoBehaviour: ...@@ -7991,6 +8120,80 @@ MonoBehaviour:
m_Text: 'BGM m_Text: 'BGM
' '
--- !u!1 &4698874706327749044
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7419191014459570039}
- component: {fileID: 2807491979616511007}
- component: {fileID: 9113327105145651264}
m_Layer: 5
m_Name: bomb3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7419191014459570039
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4698874706327749044}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 9107797946881246061}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 300, y: -40}
m_SizeDelta: {x: 80, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2807491979616511007
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4698874706327749044}
m_CullTransparentMesh: 0
--- !u!114 &9113327105145651264
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4698874706327749044}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f7edbefa5a0697b4da549f381fce76d9, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &4985180868707322160 --- !u!1 &4985180868707322160
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -8069,6 +8272,70 @@ MonoBehaviour: ...@@ -8069,6 +8272,70 @@ MonoBehaviour:
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: far m_Text: far
--- !u!1 &5156541820109564448
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9107797946881246061}
- component: {fileID: 535294663762069454}
m_Layer: 5
m_Name: BombGroup
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &9107797946881246061
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5156541820109564448}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 364733381667414348}
- {fileID: 7225537164275052467}
- {fileID: 7419191014459570039}
m_Father: {fileID: 6064464676328073067}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -240}
m_SizeDelta: {x: 360, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &535294663762069454
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5156541820109564448}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 1
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &5294123617797888695 --- !u!1 &5294123617797888695
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -8790,6 +9057,80 @@ MonoBehaviour: ...@@ -8790,6 +9057,80 @@ MonoBehaviour:
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: VIBRATION m_Text: VIBRATION
--- !u!1 &5669112702353908132
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 364733381667414348}
- component: {fileID: 3412340078870130166}
- component: {fileID: 1607165170203477681}
m_Layer: 5
m_Name: bomb1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &364733381667414348
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5669112702353908132}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 9107797946881246061}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 60, y: -40}
m_SizeDelta: {x: 80, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3412340078870130166
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5669112702353908132}
m_CullTransparentMesh: 0
--- !u!114 &1607165170203477681
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5669112702353908132}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f7edbefa5a0697b4da549f381fce76d9, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5810719589242085212 --- !u!1 &5810719589242085212
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -9026,6 +9367,8 @@ RectTransform: ...@@ -9026,6 +9367,8 @@ RectTransform:
- {fileID: 2474524826504723085} - {fileID: 2474524826504723085}
- {fileID: 2824622350015635226} - {fileID: 2824622350015635226}
- {fileID: 7990636835775695375} - {fileID: 7990636835775695375}
- {fileID: 9107797946881246061}
- {fileID: 6109125632920290557}
m_Father: {fileID: 6064464677632144690} m_Father: {fileID: 6064464677632144690}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -10979,6 +11322,11 @@ MonoBehaviour: ...@@ -10979,6 +11322,11 @@ MonoBehaviour:
m_successResultMaskObj: {fileID: 5927221786089016403} m_successResultMaskObj: {fileID: 5927221786089016403}
m_ShowMouseObj: {fileID: 647498885} m_ShowMouseObj: {fileID: 647498885}
m_HideMouseObj: {fileID: 8052859672645981793} m_HideMouseObj: {fileID: 8052859672645981793}
m_boomUIS:
- {fileID: 5669112702353908132}
- {fileID: 9114938694515689495}
- {fileID: 4698874706327749044}
m_boomBtn: {fileID: 3314642096669198153}
--- !u!114 &1995691973 --- !u!114 &1995691973
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -13401,3 +13749,77 @@ MonoBehaviour: ...@@ -13401,3 +13749,77 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!1 &9114938694515689495
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7225537164275052467}
- component: {fileID: 4299381711561854257}
- component: {fileID: 7024120598979725587}
m_Layer: 5
m_Name: bomb2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7225537164275052467
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9114938694515689495}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 9107797946881246061}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 180, y: -40}
m_SizeDelta: {x: 80, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4299381711561854257
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9114938694515689495}
m_CullTransparentMesh: 0
--- !u!114 &7024120598979725587
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9114938694515689495}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f7edbefa5a0697b4da549f381fce76d9, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
BoomMaster/Assets/#A3_Prefabs/Fx.prefab
View file @ 8ec69cb0
...@@ -2133,62 +2133,6 @@ ParticleSystem: ...@@ -2133,62 +2133,6 @@ ParticleSystem:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
LifetimeByEmitterSpeedModule:
enabled: 0
m_Curve:
serializedVersion: 2
minMaxState: 1
scalar: 1
minScalar: 1
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: -0.8
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.2
inSlope: -0.8
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_Range: {x: 0, y: 1}
ForceModule: ForceModule:
enabled: 0 enabled: 0
x: x:
...@@ -4770,11 +4714,11 @@ ParticleSystemRenderer: ...@@ -4770,11 +4714,11 @@ ParticleSystemRenderer:
m_LightProbeUsage: 1 m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: e7912d15146fcf145afaaedec646b781, type: 2} - {fileID: 2100000, guid: e7912d15146fcf145afaaedec646b781, type: 2}
- {fileID: 0}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -4812,8 +4756,6 @@ ParticleSystemRenderer: ...@@ -4812,8 +4756,6 @@ ParticleSystemRenderer:
m_EnableGPUInstancing: 0 m_EnableGPUInstancing: 0
m_ApplyActiveColorSpace: 0 m_ApplyActiveColorSpace: 0
m_AllowRoll: 1 m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_VertexStreams: 0001030405 m_VertexStreams: 0001030405
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0} m_Mesh1: {fileID: 0}
...@@ -6931,62 +6873,6 @@ ParticleSystem: ...@@ -6931,62 +6873,6 @@ ParticleSystem:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
LifetimeByEmitterSpeedModule:
enabled: 0
m_Curve:
serializedVersion: 2
minMaxState: 1
scalar: 1
minScalar: 1
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: -0.8
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.2
inSlope: -0.8
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_Range: {x: 0, y: 1}
ForceModule: ForceModule:
enabled: 0 enabled: 0
x: x:
...@@ -9568,11 +9454,11 @@ ParticleSystemRenderer: ...@@ -9568,11 +9454,11 @@ ParticleSystemRenderer:
m_LightProbeUsage: 1 m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: e653836c30661fe419b8992e230ca189, type: 2} - {fileID: 2100000, guid: e653836c30661fe419b8992e230ca189, type: 2}
- {fileID: 0}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -9610,8 +9496,6 @@ ParticleSystemRenderer: ...@@ -9610,8 +9496,6 @@ ParticleSystemRenderer:
m_EnableGPUInstancing: 0 m_EnableGPUInstancing: 0
m_ApplyActiveColorSpace: 0 m_ApplyActiveColorSpace: 0
m_AllowRoll: 1 m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_VertexStreams: 0001030405 m_VertexStreams: 0001030405
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0} m_Mesh1: {fileID: 0}
...@@ -11711,62 +11595,6 @@ ParticleSystem: ...@@ -11711,62 +11595,6 @@ ParticleSystem:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
LifetimeByEmitterSpeedModule:
enabled: 0
m_Curve:
serializedVersion: 2
minMaxState: 1
scalar: 1
minScalar: 1
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: -0.8
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.2
inSlope: -0.8
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_Range: {x: 0, y: 1}
ForceModule: ForceModule:
enabled: 0 enabled: 0
x: x:
...@@ -14348,11 +14176,11 @@ ParticleSystemRenderer: ...@@ -14348,11 +14176,11 @@ ParticleSystemRenderer:
m_LightProbeUsage: 1 m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: d386c5d9fb941e845b73fe6da5491ef2, type: 2} - {fileID: 2100000, guid: d386c5d9fb941e845b73fe6da5491ef2, type: 2}
- {fileID: 0}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -14390,8 +14218,6 @@ ParticleSystemRenderer: ...@@ -14390,8 +14218,6 @@ ParticleSystemRenderer:
m_EnableGPUInstancing: 0 m_EnableGPUInstancing: 0
m_ApplyActiveColorSpace: 0 m_ApplyActiveColorSpace: 0
m_AllowRoll: 1 m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_VertexStreams: 0001030405 m_VertexStreams: 0001030405
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0} m_Mesh1: {fileID: 0}
...@@ -16554,62 +16380,6 @@ ParticleSystem: ...@@ -16554,62 +16380,6 @@ ParticleSystem:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
LifetimeByEmitterSpeedModule:
enabled: 0
m_Curve:
serializedVersion: 2
minMaxState: 1
scalar: 1
minScalar: 1
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: -0.8
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.2
inSlope: -0.8
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_Range: {x: 0, y: 1}
ForceModule: ForceModule:
enabled: 0 enabled: 0
x: x:
...@@ -19191,11 +18961,11 @@ ParticleSystemRenderer: ...@@ -19191,11 +18961,11 @@ ParticleSystemRenderer:
m_LightProbeUsage: 1 m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: 150aee38b5d848b42b75593618992bb7, type: 2} - {fileID: 2100000, guid: 150aee38b5d848b42b75593618992bb7, type: 2}
- {fileID: 0}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -19233,8 +19003,6 @@ ParticleSystemRenderer: ...@@ -19233,8 +19003,6 @@ ParticleSystemRenderer:
m_EnableGPUInstancing: 0 m_EnableGPUInstancing: 0
m_ApplyActiveColorSpace: 0 m_ApplyActiveColorSpace: 0
m_AllowRoll: 1 m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_VertexStreams: 0001030405 m_VertexStreams: 0001030405
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0} m_Mesh1: {fileID: 0}
...@@ -21361,62 +21129,6 @@ ParticleSystem: ...@@ -21361,62 +21129,6 @@ ParticleSystem:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
LifetimeByEmitterSpeedModule:
enabled: 0
m_Curve:
serializedVersion: 2
minMaxState: 1
scalar: 1
minScalar: 1
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: -0.8
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.2
inSlope: -0.8
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_Range: {x: 0, y: 1}
ForceModule: ForceModule:
enabled: 0 enabled: 0
x: x:
...@@ -23998,11 +23710,11 @@ ParticleSystemRenderer: ...@@ -23998,11 +23710,11 @@ ParticleSystemRenderer:
m_LightProbeUsage: 1 m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: 7d02299296a2a9843981fe2199b208f1, type: 2} - {fileID: 2100000, guid: 7d02299296a2a9843981fe2199b208f1, type: 2}
- {fileID: 0}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -24040,8 +23752,6 @@ ParticleSystemRenderer: ...@@ -24040,8 +23752,6 @@ ParticleSystemRenderer:
m_EnableGPUInstancing: 0 m_EnableGPUInstancing: 0
m_ApplyActiveColorSpace: 0 m_ApplyActiveColorSpace: 0
m_AllowRoll: 1 m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_VertexStreams: 0001030405 m_VertexStreams: 0001030405
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0} m_Mesh1: {fileID: 0}
......
BoomMaster/Assets/Res.meta 0 → 100644
View file @ 8ec69cb0
fileFormatVersion: 2
guid: 3ff999a22f4fd794390453ef5a13576d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/Res/Prefabs.meta 0 → 100644
View file @ 8ec69cb0
fileFormatVersion: 2
guid: c10494c0cb33b774fb80595d738f490a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/Res/Prefabs/Levels.meta 0 → 100644
View file @ 8ec69cb0
fileFormatVersion: 2
guid: 77fee005587cf7846b6277437d6b147e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/Res/Prefabs/Levels/Level01.prefab 0 → 100644
View file @ 8ec69cb0
This source diff could not be displayed because it is too large. You can view the blob instead.
BoomMaster/Assets/Res/Prefabs/Levels/Level01.prefab.meta 0 → 100644
View file @ 8ec69cb0
fileFormatVersion: 2
guid: b9647a9897cab0e47bfde2ad326aa1d8
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment