WGL před 4 měsíci
rodič
revize
411a8cc67b

+ 81 - 1
ActionTowerDefense/Assets/Animations/Player/PlayerCollider_Run.anim

@@ -14,7 +14,23 @@ AnimationClip:
   m_RotationCurves: []
   m_CompressedRotationCurves: []
   m_EulerCurves: []
-  m_PositionCurves: []
+  m_PositionCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: -0.949, y: 0.983, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: WallTrigger
   m_ScaleCurves: []
   m_FloatCurves:
   - curve:
@@ -236,6 +252,13 @@ AnimationClip:
       typeID: 1
       customType: 0
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 1905146110
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 260020042
       attribute: 4197328169
@@ -497,6 +520,63 @@ AnimationClip:
     path: BodyCollider/BodyCollider (1)
     classID: 136
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.949
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.x
+    path: WallTrigger
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.983
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: WallTrigger
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.z
+    path: WallTrigger
+    classID: 4
+    script: {fileID: 0}
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0

+ 126 - 1
ActionTowerDefense/Assets/Animations/Player/PlayerCollider_Rush.anim

@@ -14,7 +14,23 @@ AnimationClip:
   m_RotationCurves: []
   m_CompressedRotationCurves: []
   m_EulerCurves: []
-  m_PositionCurves: []
+  m_PositionCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: -1.304, y: 0.791, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: WallTrigger
   m_ScaleCurves: []
   m_FloatCurves:
   - curve:
@@ -207,6 +223,25 @@ AnimationClip:
     path: BodyCollider/BodyCollider (1)
     classID: 136
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.83
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Size.y
+    path: WallTrigger
+    classID: 65
+    script: {fileID: 0}
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -229,6 +264,13 @@ AnimationClip:
       typeID: 1
       customType: 0
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 1905146110
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 260020042
       attribute: 4197328169
@@ -285,6 +327,13 @@ AnimationClip:
       typeID: 136
       customType: 0
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 1905146110
+      attribute: 2368279999
+      script: {fileID: 0}
+      typeID: 65
+      customType: 0
+      isPPtrCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -497,6 +546,82 @@ AnimationClip:
     path: BodyCollider/BodyCollider (1)
     classID: 136
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -1.304
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.x
+    path: WallTrigger
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.791
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: WallTrigger
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.z
+    path: WallTrigger
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.83
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Size.y
+    path: WallTrigger
+    classID: 65
+    script: {fileID: 0}
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0

+ 22 - 160
ActionTowerDefense/Assets/Resources/Prefab/Bg.prefab

@@ -39462,136 +39462,6 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
---- !u!1 &4066940278935102403
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1530361894024660474}
-  - component: {fileID: 8217649850831268153}
-  - component: {fileID: 7284826844971951015}
-  - component: {fileID: 2147991945525337834}
-  m_Layer: 0
-  m_Name: Wall
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1530361894024660474
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4066940278935102403}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -1.44, y: 1.5, z: 0}
-  m_LocalScale: {x: 0.5, y: 3, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 4165105313137743039}
-  m_Father: {fileID: 8077337916588925286}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &8217649850831268153
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4066940278935102403}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &7284826844971951015
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4066940278935102403}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!65 &2147991945525337834
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4066940278935102403}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
---- !u!1 &5885670107375920558
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8077337916588925286}
-  m_Layer: 0
-  m_Name: TestWall
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8077337916588925286
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5885670107375920558}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 174.8, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1530361894024660474}
-  m_Father: {fileID: 585662581}
-  m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &7247695190544158
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -41516,75 +41386,67 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 1723151111827507803, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   m_PrefabInstance: {fileID: 7247697074612516}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &4210450200162774128
+--- !u!1001 &2707310249585668159
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1530361894024660474}
+    m_TransformParent: {fileID: 585662581}
     m_Modifications:
-    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+    - target: {fileID: 6163796600528327001, guid: 0c3777163d8e23743a3abf230a38c8ce, type: 3}
       propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
+      value: 5
       objectReference: {fileID: 0}
-    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+    - target: {fileID: 6163796600528327001, guid: 0c3777163d8e23743a3abf230a38c8ce, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: 174.8
       objectReference: {fileID: 0}
-    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+    - target: {fileID: 6163796600528327001, guid: 0c3777163d8e23743a3abf230a38c8ce, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.474
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+    - target: {fileID: 6163796600528327001, guid: 0c3777163d8e23743a3abf230a38c8ce, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+    - target: {fileID: 6163796600528327001, guid: 0c3777163d8e23743a3abf230a38c8ce, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+    - target: {fileID: 6163796600528327001, guid: 0c3777163d8e23743a3abf230a38c8ce, type: 3}
       propertyPath: m_LocalRotation.x
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+    - target: {fileID: 6163796600528327001, guid: 0c3777163d8e23743a3abf230a38c8ce, type: 3}
       propertyPath: m_LocalRotation.y
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+    - target: {fileID: 6163796600528327001, guid: 0c3777163d8e23743a3abf230a38c8ce, type: 3}
       propertyPath: m_LocalRotation.z
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+    - target: {fileID: 6163796600528327001, guid: 0c3777163d8e23743a3abf230a38c8ce, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+    - target: {fileID: 6163796600528327001, guid: 0c3777163d8e23743a3abf230a38c8ce, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
+    - target: {fileID: 6163796600528327001, guid: 0c3777163d8e23743a3abf230a38c8ce, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1611437088567555043, guid: 12435a63399f44f4a919a57010981786, type: 3}
+    - target: {fileID: 8375663503630210449, guid: 0c3777163d8e23743a3abf230a38c8ce, type: 3}
       propertyPath: m_Name
-      value: Platform
-      objectReference: {fileID: 0}
-    - target: {fileID: 1742264126498941492, guid: 12435a63399f44f4a919a57010981786, type: 3}
-      propertyPath: m_Enabled
-      value: 0
+      value: TestWall
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 12435a63399f44f4a919a57010981786, type: 3}
---- !u!4 &4165105313137743039 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: 0c3777163d8e23743a3abf230a38c8ce, type: 3}
+--- !u!4 &8077337916588925286 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
-  m_PrefabInstance: {fileID: 4210450200162774128}
+  m_CorrespondingSourceObject: {fileID: 6163796600528327001, guid: 0c3777163d8e23743a3abf230a38c8ce, type: 3}
+  m_PrefabInstance: {fileID: 2707310249585668159}
   m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5401885715937351238
 PrefabInstance:

+ 35 - 3
ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -375,10 +375,10 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.32
+  m_Radius: 0.45272875
   m_Height: 1.7487905
   m_Direction: 1
-  m_Center: {x: 0, y: 0.89657795, z: 0}
+  m_Center: {x: 0.025416136, y: 0.89657795, z: 0}
 --- !u!1 &786042687208157319
 GameObject:
   m_ObjectHideFlags: 0
@@ -682,6 +682,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7020841768943764237}
+  - component: {fileID: 8600973991522598593}
+  - component: {fileID: 6725358484711746229}
   m_Layer: 6
   m_Name: WallTrigger
   m_TagString: Untagged
@@ -697,13 +699,41 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2206365098861668014}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -0.339, y: 1.096, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5205406772191310031}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &8600973991522598593
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2206365098861668014}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.3052922, y: 1.3501779, z: 1}
+  m_Center: {x: 0.019768089, y: -0.3106417, z: 0}
+--- !u!114 &6725358484711746229
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2206365098861668014}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9be8adeb61240654eae0daa11eaa8937, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  rb: {fileID: 0}
+  moveCharacter: {fileID: 0}
+  trigWallList: []
 --- !u!1 &2890838050838839166
 GameObject:
   m_ObjectHideFlags: 0
@@ -910,6 +940,7 @@ MonoBehaviour:
   uiMp: {fileID: 8465211090008398057}
   soulCollector: {fileID: 3739918129319493242}
   skeletonMecanim: {fileID: 6843453365888964567}
+  wallTrigger: {fileID: 6725358484711746229}
   mp: 0
   totalMp: 450
   totalMp_2Players: 450
@@ -1377,6 +1408,7 @@ MonoBehaviour:
   moveCharacter: {fileID: 0}
   haveGravity: 1
   trigGroundList: []
+  platform: {fileID: 0}
 --- !u!1 &4574901846507359337
 GameObject:
   m_ObjectHideFlags: 0

+ 131 - 0
ActionTowerDefense/Assets/Resources/Prefab/test/TestWall.prefab

@@ -0,0 +1,131 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2153530898131473404
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3507948259676108229}
+  - component: {fileID: 6311998647852931334}
+  - component: {fileID: 4650717825501729688}
+  - component: {fileID: 4061542183338241749}
+  m_Layer: 0
+  m_Name: Wall
+  m_TagString: Wall
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3507948259676108229
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2153530898131473404}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -1.44, y: 1.5, z: 0}
+  m_LocalScale: {x: 0.5, y: 9.78, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6163796600528327001}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &6311998647852931334
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2153530898131473404}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4650717825501729688
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2153530898131473404}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &4061542183338241749
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2153530898131473404}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &8375663503630210449
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6163796600528327001}
+  m_Layer: 0
+  m_Name: TestWall
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6163796600528327001
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8375663503630210449}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 174.8, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3507948259676108229}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 7 - 0
ActionTowerDefense/Assets/Resources/Prefab/test/TestWall.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0c3777163d8e23743a3abf230a38c8ce
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 56 - 16
ActionTowerDefense/Assets/Scripts/Characters/PlayerController.cs

@@ -21,11 +21,11 @@ public class PlayerController : MoveCharacter
     public bool canJump;
     public Animator aniCollider;
 
-    [Header("玩家组件")]
-    public UIHP uiMp;
+    [FoldoutGroup("组件", order:-1)] public UIHP uiMp;
+    [FoldoutGroup("组件")] public Collider soulCollector;
+    [FoldoutGroup("组件")] public SkeletonMecanim skeletonMecanim;
+    [FoldoutGroup("组件")] public WallTrigger wallTrigger;
     private Spirits spirits;
-    public Collider soulCollector;
-    public SkeletonMecanim skeletonMecanim;
     private SpiritSystem spiritSystem;
     private ScreenShake ss;
     private ConductController conductController;
@@ -962,6 +962,27 @@ public class PlayerController : MoveCharacter
         }
         CachedPlayerInput();
         Vector3 velocity = rb.velocity;
+        bool isToWall = false;
+        //撞墙了
+        if (wallTrigger.TrigWall)
+        {
+            if (bodyTrans.localScale.x > 0)
+            {
+                if (leftDir.x < 0)
+                {
+                    isToWall = true;
+                }
+            }
+            else
+            {
+                if (leftDir.x > 0)
+                {
+                    isToWall = true;
+                }
+            }
+
+        }
+
         switch (state)
         {
             case CharacterState.Idle:
@@ -973,7 +994,15 @@ public class PlayerController : MoveCharacter
                 {
                     transform.position = new Vector3(transform.position.x, platformY, transform.position.z);
                 }
-                velocity.x = velocityAddition;
+               
+                if (isToWall)
+                {
+                    velocity.x = 0;
+                }
+                else
+                {
+                    velocity.x = velocityAddition;
+                }
                 velocity.y = 0;
                 
                 rb.velocity = velocity;
@@ -985,9 +1014,9 @@ public class PlayerController : MoveCharacter
                     break;
                 }
                 CheckTurn();
-                if (canFly)
+                if (isToWall)
                 {
-                    rb.velocity = leftDir.normalized * moveSpeed;
+                    velocity.x = 0;
                 }
                 else
                 {
@@ -999,15 +1028,15 @@ public class PlayerController : MoveCharacter
                     {
                         velocity.x = -moveSpeed + velocityAddition;
                     }
-                    velocity.y = 0;
-                    if (!foot.haveGravity)
-                    {
-                        transform.position = new Vector3(transform.position.x, platformY, transform.position.z);
-                    }
-                        
-                    rb.velocity = velocity;
+                }
+                velocity.y = 0;
+                if (!foot.haveGravity)
+                {
+                    transform.position = new Vector3(transform.position.x, platformY, transform.position.z);
                 }
 
+                rb.velocity = velocity;
+
                 break;
             case CharacterState.Rise:
                 if (CheckSummon())
@@ -1028,7 +1057,12 @@ public class PlayerController : MoveCharacter
                         break;
                     }
                 }
-                rb.velocity = AirMove(rb.velocity);
+                velocity = AirMove(velocity);
+                if (isToWall)
+                {
+                    velocity.x = 0;
+                }
+                rb.velocity = velocity;
                 if (rb.velocity.y <= 0)
                 {
                     ChangeState(CharacterState.Fall);
@@ -1069,7 +1103,12 @@ public class PlayerController : MoveCharacter
                         }
                     }
                 }
-                rb.velocity = AirMove(rb.velocity);
+                velocity = AirMove(velocity);
+                if (isToWall)
+                {
+                    velocity.x = 0;
+                }
+                rb.velocity = velocity;
                 break;
             case CharacterState.Attack:
                 if (attackController.attackTime <= 0)
@@ -1667,6 +1706,7 @@ public class PlayerController : MoveCharacter
                 velocity += Vector3.up * extraFallGravity * Time.deltaTime;
             }
         }
+       
         return velocity;
     }
 

+ 42 - 0
ActionTowerDefense/Assets/Scripts/Characters/WallTrigger.cs

@@ -0,0 +1,42 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using Sirenix.OdinInspector;
+
+public class WallTrigger : MonoBehaviour
+{
+    [FoldoutGroup("×é¼þ")] public Rigidbody rb;
+    [FoldoutGroup("×é¼þ")] public MoveCharacter moveCharacter;
+    public bool TrigWall
+    {
+        get
+        {
+            return trigWallList.Count > 0;
+        }
+    }
+
+    public List<GameObject> trigWallList;
+
+    private void OnTriggerEnter(Collider other)
+    {
+        if (other.CompareTag("Wall"))
+        {
+            if (!trigWallList.Exists(t => t == other.gameObject))
+            {
+                trigWallList.Add(other.gameObject);
+            }
+        }
+    }
+
+    private void OnTriggerExit(Collider other)
+    {
+        for (int i = 0; i < trigWallList.Count; i++)
+        {
+            if (trigWallList[i] == other.gameObject)
+            {
+                trigWallList.RemoveAt(i);
+                i--;
+            }
+        }
+    }
+}

+ 11 - 0
ActionTowerDefense/Assets/Scripts/Characters/WallTrigger.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9be8adeb61240654eae0daa11eaa8937
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
ActionTowerDefense/ProjectSettings/TagManager.asset

@@ -13,6 +13,8 @@ TagManager:
   - Portal
   - Ground
   - Platform
+  - Plane
+  - Wall
   layers:
   - Default
   - TransparentFX