Skip to content

Commit

Permalink
Commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@KakooGame
KakooGame committed Dec 25, 2024
1 parent 75492f3 commit 2331244
Show file tree
Hide file tree
Showing 8 changed files with 281 additions and 19 deletions.
4 changes: 4 additions & 0 deletions Assets/ECM2/Examples/Side Scrolling/Scripts/SideScrollingCharacter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
using System.Collections.Generic;
using UnityEngine;



namespace ECM2.Examples.SideScrolling
{
/// <summary>
Expand Down Expand Up @@ -86,5 +88,7 @@ private IEnumerator ResetPlatformCollision(Collider platformCollider, float dela
// 恢复碰撞
IgnoreCollision(platformCollider, false);
}


}
}
69 changes: 69 additions & 0 deletions Assets/Scenes/GameScene/2.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ GameObject:
m_Component:
- component: {fileID: 866629893}
- component: {fileID: 866629892}
- component: {fileID: 866629894}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
Expand Down Expand Up @@ -216,6 +217,29 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!114 &866629894
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 866629891}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 3
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_LightLayerMask: 1
m_RenderingLayers: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
m_ShadowRenderingLayers: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
--- !u!1 &1646860250
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -227,6 +251,7 @@ GameObject:
- component: {fileID: 1646860253}
- component: {fileID: 1646860252}
- component: {fileID: 1646860251}
- component: {fileID: 1646860254}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
Expand Down Expand Up @@ -308,6 +333,50 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1646860254
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1646860250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RenderShadows: 1
m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_Cameras: []
m_RendererIndex: -1
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 0
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0
m_ClearDepth: 1
m_AllowXRRendering: 1
m_AllowHDROutput: 1
m_UseScreenCoordOverride: 0
m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
m_TaaSettings:
m_Quality: 3
m_FrameInfluence: 0.1
m_JitterScale: 1
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
Expand Down
162 changes: 155 additions & 7 deletions Assets/Scenes/功能实现关.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,16 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 358544422}
m_TransformParent: {fileID: 1150975107}
m_Modifications:
- target: {fileID: 1768606788610258, guid: 2e23bb932cf4ec7498eb4b727d9113fa, type: 3}
propertyPath: m_Name
value: SM_Buildings_Floor_5x5_01 (2)
objectReference: {fileID: 0}
- target: {fileID: 1768606788610258, guid: 2e23bb932cf4ec7498eb4b727d9113fa, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 4855193289971172, guid: 2e23bb932cf4ec7498eb4b727d9113fa, type: 3}
propertyPath: m_LocalPosition.x
value: -14.14
Expand Down Expand Up @@ -279,6 +283,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 23430031505414554, guid: 2e23bb932cf4ec7498eb4b727d9113fa, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 6968e89851431104b8f931c37d69356b, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Expand Down Expand Up @@ -549,10 +557,10 @@ Transform:
m_Children:
- {fileID: 707286949}
- {fileID: 862077823}
- {fileID: 108714188}
- {fileID: 1478807610}
- {fileID: 1150975107}
- {fileID: 161387152}
- {fileID: 108776066}
- {fileID: 1606116739}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &402485016
Expand Down Expand Up @@ -1077,6 +1085,76 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1.0000002, y: 2, z: 1.0000004}
m_Center: {x: 0.00000005960465, y: 0, z: -0.00000008940698}
--- !u!1 &1150975106
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1150975107}
- component: {fileID: 1150975108}
- component: {fileID: 1150975109}
m_Layer: 6
m_Name: Blue
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1150975107
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1150975106}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 108714188}
- {fileID: 1478807610}
m_Father: {fileID: 358544422}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1150975108
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1150975106}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 9.068487, y: 0.17426375, z: 4.956049}
m_Center: {x: -9.56648, y: -0.46284664, z: -6.6656055}
--- !u!114 &1150975109
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1150975106}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b24d3a835c0b4164bb390792ea76563d, type: 3}
m_Name:
m_EditorClassIdentifier:
currentState: 1
currentColor: 1
--- !u!1001 &1202637514
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1371,15 +1449,19 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 358544422}
m_TransformParent: {fileID: 1150975107}
m_Modifications:
- target: {fileID: 1768606788610258, guid: 2e23bb932cf4ec7498eb4b727d9113fa, type: 3}
propertyPath: m_Name
value: SM_Buildings_Floor_5x5_01 (3)
objectReference: {fileID: 0}
- target: {fileID: 1768606788610258, guid: 2e23bb932cf4ec7498eb4b727d9113fa, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 4855193289971172, guid: 2e23bb932cf4ec7498eb4b727d9113fa, type: 3}
propertyPath: m_LocalPosition.x
value: -9.849999
value: -9.99
objectReference: {fileID: 0}
- target: {fileID: 4855193289971172, guid: 2e23bb932cf4ec7498eb4b727d9113fa, type: 3}
propertyPath: m_LocalPosition.y
Expand Down Expand Up @@ -1417,6 +1499,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 23430031505414554, guid: 2e23bb932cf4ec7498eb4b727d9113fa, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 6968e89851431104b8f931c37d69356b, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Expand Down Expand Up @@ -1586,7 +1672,7 @@ MonoBehaviour:
_useFlatBaseForGroundChecks: 1
_collisionLayers:
serializedVersion: 2
m_Bits: 9
m_Bits: 73
_triggerInteraction: 1
_advanced:
minMoveDistance: 0
Expand Down Expand Up @@ -1795,6 +1881,68 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1548702693}
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &1606116738
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 358544422}
m_Modifications:
- target: {fileID: 1346524299210880, guid: fcc4229f634be704aa0dd336ad33c2b5, type: 3}
propertyPath: m_Name
value: SM_Buildings_Block_1x1_01 (1)
objectReference: {fileID: 0}
- target: {fileID: 4084504788478774, guid: fcc4229f634be704aa0dd336ad33c2b5, type: 3}
propertyPath: m_LocalPosition.x
value: -12.21
objectReference: {fileID: 0}
- target: {fileID: 4084504788478774, guid: fcc4229f634be704aa0dd336ad33c2b5, type: 3}
propertyPath: m_LocalPosition.y
value: -0.4132061
objectReference: {fileID: 0}
- target: {fileID: 4084504788478774, guid: fcc4229f634be704aa0dd336ad33c2b5, type: 3}
propertyPath: m_LocalPosition.z
value: -6.91
objectReference: {fileID: 0}
- target: {fileID: 4084504788478774, guid: fcc4229f634be704aa0dd336ad33c2b5, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4084504788478774, guid: fcc4229f634be704aa0dd336ad33c2b5, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4084504788478774, guid: fcc4229f634be704aa0dd336ad33c2b5, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4084504788478774, guid: fcc4229f634be704aa0dd336ad33c2b5, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4084504788478774, guid: fcc4229f634be704aa0dd336ad33c2b5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4084504788478774, guid: fcc4229f634be704aa0dd336ad33c2b5, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4084504788478774, guid: fcc4229f634be704aa0dd336ad33c2b5, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fcc4229f634be704aa0dd336ad33c2b5, type: 3}
--- !u!4 &1606116739 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4084504788478774, guid: fcc4229f634be704aa0dd336ad33c2b5, type: 3}
m_PrefabInstance: {fileID: 1606116738}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1692170726
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1870,7 +2018,7 @@ Transform:
m_GameObject: {fileID: 1692170726}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.53, y: 0.016, z: -6.36}
m_LocalPosition: {x: -5.04, y: -0.1, z: -6.36}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down
Loading

0 comments on commit 2331244

Please sign in to comment.