Skip to content

B
BoomMaster
Commit 7d003070 authored by wanqing's avatar wanqing
Browse files
Options

第二关卡逻辑

parent 689d0d7d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 12281 additions and 1412 deletions
BoomMaster/Assembly-CSharp.csproj
View file @ 7d003070
......@@ -65,6 +65,7 @@
<ItemGroup>
<Compile Include="Assets\#A2_Scripts\Battle\BattleCtrl.cs" />
<Compile Include="Assets\#A2_Scripts\Battle\Collision\GroundCollision.cs" />
<Compile Include="Assets\#A2_Scripts\Battle\Collision\SecondLevelCollison.cs" />
<Compile Include="Assets\#A2_Scripts\Battle\Collision\ThirdLevelBoxCollision.cs" />
<Compile Include="Assets\#A2_Scripts\Battle\Collision\ThirdLevelBoxTarget.cs" />
<Compile Include="Assets\#A2_Scripts\Battle\Empty4Raycast.cs" />
......
BoomMaster/Assets/#A1_Scenes/DemoScenes.unity
View file @ 7d003070
......@@ -166,6 +166,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
levelPrefs:
- {fileID: 2494662193881588615, guid: b9647a9897cab0e47bfde2ad326aa1d8, type: 3}
- {fileID: 5028949788655245685, guid: 4113057419613f040a18e7baa685fa8f, type: 3}
--- !u!1 &543166196
GameObject:
m_ObjectHideFlags: 0
......@@ -384,10 +385,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 141872500, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: 7d6fba3e77762b54e83cfd3e497562dc, type: 2}
- target: {fileID: 6064464677632144689, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_Name
......@@ -498,10 +495,5 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677660112696, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: bb389cc2efde9ef4ba6b88a34ad44400, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
BoomMaster/Assets/#A2_Scripts/Battle/Collision/SecondLevelCollison.cs 0 → 100644
View file @ 7d003070
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class SecondLevelCollison : MonoBehaviour
{
private bool m_bCollider = true;
private void OnCollisionEnter(Collision other)
{
if (other.collider.gameObject.CompareTag("Player") && transform.localScale.x == 1 && m_bCollider)
{
m_bCollider = false;
BattleCtrl.instance.OnBattleFail();
}
}
}
BoomMaster/Assets/#A2_Scripts/Battle/Collision/SecondLevelCollison.cs.meta 0 → 100644
View file @ 7d003070
fileFormatVersion: 2
guid: 4db578a755ba29a44bf06e0394f71b59
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#A2_Scripts/Battle/Trigger/SecondLevelTrigger.cs
View file @ 7d003070
......@@ -4,18 +4,40 @@ using UnityEngine;
public class SecondLevelTrigger : MonoBehaviour
{
public Transform m_targetTrans;
private Vector3 m_pos = new Vector3(0.09f, 1.3f, -0.54f);
private Quaternion m_rotation = Quaternion.Euler(-15,256, -2.594f);
//public Transform m_targetTrans;
//private Vector3 m_pos = new Vector3(0.09f, 1.3f, -0.54f);
//private Quaternion m_rotation = Quaternion.Euler(-15,256, -2.594f);
//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_playerTrans;
private bool m_bControl = true;
private float m_speed = 1.0f;
private void OnTriggerEnter(Collider other)
{
if (other.gameObject.CompareTag("Target"))
if (other.gameObject.CompareTag("Player") && m_bControl)
{
BattleCtrl.instance.levelManager.curLevel.chainRopeView.CatchObjEnterTarget();
m_bControl = false;
BattleCtrl.instance.OnBattleWin();
m_targetTrans.localPosition = m_pos;
m_targetTrans.localRotation = m_rotation;
}
}
private void Update()
{
if(BattleCtrl.instance.isEndBattle)
{
return;
}
if(BattleCtrl.instance.battleUI.IsLeftEmtryBomb && !BattleCtrl.instance.battleUI.IsBombButtonCanInteractable)
{
m_playerTrans.Translate(Vector3.forward * Time.deltaTime * m_speed, Space.Self);
}
}
}
BoomMaster/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
View file @ 7d003070
......@@ -49,6 +49,8 @@ public class BattleUI : MonoBehaviour
private int m_mouseIndex = 0;//点击次数
private bool m_bIsShowMouse = true;//是否显示手指图标
private int m_bombIndex = 0;//炸弹计数
public bool IsLeftEmtryBomb { get { return m_bombIndex >= 3; } }//是否不剩炸弹了
public bool IsBombButtonCanInteractable { get { return m_boomBtn.interactable; } }
void Awake()
{
m_dragBtn.onClick.AddListener(SetDragMode);
......@@ -205,7 +207,7 @@ public class BattleUI : MonoBehaviour
//{
// GameServices.audioServices.PlayBgm(GameServices.configService.audioConfig.GameBgm);
//});
GameServices.audioServices.PlayAudio(GameServices.configService.audioConfig.Success);
//GameServices.audioServices.PlayAudio(GameServices.configService.audioConfig.Success);
}
//失败
public void OnBattleFail()
......
BoomMaster/Assets/#A2_Scripts/Battle/View/BombView.cs
View file @ 7d003070
......@@ -13,9 +13,20 @@ public class BombView : MonoBehaviour
//设置炸弹
void SetBomb(RayfireBomb rayfireBomb)
{
m_bombParticleObj?.SetActive(false);
if(m_bombParticleObj)
{
m_bombParticleObj.SetActive(false);
}
m_curBomb = rayfireBomb;
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{
m_curBomb.range = 0.5f;
}
else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
{
m_curBomb.range = 1.5f;
}
m_bCanBePlace = false;
}
//设置放置状态
......
BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
View file @ 7d003070
......@@ -49,7 +49,7 @@ Animator:
m_GameObject: {fileID: 141872498}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 7d6fba3e77762b54e83cfd3e497562dc, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
......@@ -2169,7 +2169,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 4
m_Text: '?'
--- !u!1 &2347244091049526850
GameObject:
m_ObjectHideFlags: 0
......@@ -2569,7 +2569,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2347244091241080694
RectTransform:
m_ObjectHideFlags: 0
......@@ -3615,7 +3615,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 3
m_Text: '?'
--- !u!1 &2347244091852835720
GameObject:
m_ObjectHideFlags: 0
......@@ -4393,7 +4393,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2347244092060906316
RectTransform:
m_ObjectHideFlags: 0
......@@ -5049,7 +5049,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 6
m_Text: '?'
--- !u!1 &2347244092387710222
GameObject:
m_ObjectHideFlags: 0
......@@ -5275,7 +5275,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 7
m_Text: '?'
--- !u!1 &2347244092484654563
GameObject:
m_ObjectHideFlags: 0
......@@ -5427,7 +5427,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 5
m_Text: '?'
--- !u!1 &2347244092514737476
GameObject:
m_ObjectHideFlags: 0
......@@ -6209,7 +6209,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2347244092771967611
RectTransform:
m_ObjectHideFlags: 0
......@@ -6439,7 +6439,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2347244092896141821
RectTransform:
m_ObjectHideFlags: 0
......@@ -6739,7 +6739,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2347244092983598579
RectTransform:
m_ObjectHideFlags: 0
......@@ -10490,7 +10490,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3}
m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -10507,7 +10507,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677159922112}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
......@@ -10561,7 +10561,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677159922112}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
m_Name:
......@@ -10823,7 +10823,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3}
m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -10840,7 +10840,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677418123800}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
m_Name:
......@@ -10854,7 +10854,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677418123800}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
......@@ -11091,7 +11091,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3}
m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -11108,7 +11108,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677571250785}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
m_Name:
......@@ -11122,7 +11122,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677571250785}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
......@@ -11394,7 +11394,7 @@ Animator:
m_GameObject: {fileID: 6064464677660112694}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000, guid: bb389cc2efde9ef4ba6b88a34ad44400, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
......@@ -11593,7 +11593,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3}
m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -11610,7 +11610,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677866441003}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
......@@ -11664,7 +11664,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677866441003}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
m_Name:
......@@ -11742,7 +11742,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3}
m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -11759,7 +11759,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677995419504}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
m_Name:
......@@ -11773,7 +11773,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677995419504}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
......
BoomMaster/Assets/#A3_Prefabs/Bomb.prefab
View file @ 7d003070
......@@ -55,7 +55,6 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -80,7 +79,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &7079061562166580387
GameObject:
m_ObjectHideFlags: 0
......
BoomMaster/Assets/Res/Prefabs/Levels/Level02.prefab 0 → 100644
View file @ 7d003070
This diff is collapsed.
BoomMaster/Assets/Res/Prefabs/Levels/Level02.prefab.meta 0 → 100644
View file @ 7d003070
fileFormatVersion: 2
guid: 4113057419613f040a18e7baa685fa8f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/ProjectSettings/GraphicsSettings.asset
View file @ 7d003070
......@@ -3,7 +3,7 @@
--- !u!30 &1
GraphicsSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
serializedVersion: 13
m_Deferred:
m_Mode: 1
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
......@@ -36,6 +36,10 @@ GraphicsSettings:
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
......@@ -61,3 +65,4 @@ GraphicsSettings:
m_LightsUseLinearIntensity: 0
m_LightsUseColorTemperature: 0
m_LogWhenShaderIsCompiled: 0
m_AllowEnlightenSupportForUpgradedProject: 1
BoomMaster/ProjectSettings/ProjectSettings.asset
View file @ 7d003070
......@@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: Dyspace
productName: "\u7206\u7834\u5927\u5E08"
productName: Boom Master 3D
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
......@@ -49,8 +49,6 @@ PlayerSettings:
m_StereoRenderingPath: 0
m_ActiveColorSpace: 0
m_MTRendering: 1
mipStripping: 0
numberOfMipsStripped: 0
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
iosShowActivityIndicatorOnLoading: -1
androidShowActivityIndicatorOnLoading: -1
......@@ -113,8 +111,6 @@ PlayerSettings:
switchNVNShaderPoolsGranularity: 33554432
switchNVNDefaultPoolsGranularity: 16777216
switchNVNOtherPoolsGranularity: 16777216
stadiaPresentMode: 0
stadiaTargetFramerate: 0
vulkanNumSwapchainBuffers: 3
vulkanEnableSetSRGBWrite: 0
m_SupportedAspectRatios:
......@@ -167,10 +163,10 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
Android: com.dyspace.boom
Android: com.Dyspace.BoomMaster3D
buildNumber: {}
AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 22
AndroidMinSdkVersion: 19
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1
aotOptions:
......@@ -260,9 +256,6 @@ PlayerSettings:
height: 180
banner: {fileID: 0}
androidGamepadSupportLevel: 0
AndroidMinifyWithR8: 0
AndroidMinifyRelease: 0
AndroidMinifyDebug: 0
AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150
m_BuildTargetIcons: []
......@@ -413,14 +406,12 @@ PlayerSettings:
cameraUsageDescription:
locationUsageDescription:
microphoneUsageDescription:
switchNMETAOverride:
switchNetLibKey:
switchSocketMemoryPoolSize: 6144
switchSocketAllocatorPoolSize: 128
switchSocketConcurrencyLimit: 14
switchScreenResolutionBehavior: 2
switchUseCPUProfiler: 0
switchUseGOLDLinker: 0
switchApplicationID: 0x01004b9000490000
switchNSODependencies:
switchTitleNames_0:
......@@ -632,10 +623,9 @@ PlayerSettings:
webGLAnalyzeBuildSize: 0
webGLUseEmbeddedResources: 0
webGLCompressionFormat: 1
webGLWasmArithmeticExceptions: 0
webGLLinkerTarget: 1
webGLThreadsSupport: 0
webGLDecompressionFallback: 0
webGLWasmStreaming: 0
scriptingDefineSymbols:
1: CROSS_PLATFORM_INPUT
4: CROSS_PLATFORM_INPUT;MOBILE_INPUT
......@@ -648,7 +638,6 @@ PlayerSettings:
managedStrippingLevel: {}
incrementalIl2cppBuild: {}
allowUnsafeCode: 0
useDeterministicCompilation: 1
additionalIl2CppArgs:
scriptingRuntimeVersion: 1
gcIncremental: 0
......@@ -735,4 +724,3 @@ PlayerSettings:
enableNativePlatformBackendsForNewInputSystem: 0
disableOldInputManagerSupport: 0
legacyClampBlendShapeWeights: 0
virtualTexturingSupportEnabled: 0
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