SZAND\msx_2 7 ヶ月 前
コミット
bf5551c751

+ 0 - 184
ActionTowerDefense/Assets/Resources/Prefab/EnemyRope.prefab

@@ -1,184 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &616841038056457886
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 616841038056457880}
-  - component: {fileID: 616841038056457887}
-  m_Layer: 0
-  m_Name: EnemyRope
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &616841038056457880
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 616841038056457886}
-  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: 6861667248871233757}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &616841038056457887
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 616841038056457886}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0140a0e2a0df33b469c9fb6a8b3c9b36, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  rope: {fileID: 6090005483338145464}
-  conn1: {fileID: 0}
-  conn2: {fileID: 0}
-  targetEnemy1: {fileID: 0}
-  targetEnemy2: {fileID: 0}
---- !u!1 &6260769195098966104
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6861667248871233757}
-  - component: {fileID: 6090005483338145464}
-  - component: {fileID: 1871241735560429474}
-  - component: {fileID: 5502267137512785186}
-  m_Layer: 0
-  m_Name: Rope
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!4 &6861667248871233757
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6260769195098966104}
-  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: []
-  m_Father: {fileID: 616841038056457880}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &6090005483338145464
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6260769195098966104}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 325b217b839086b4ca705834516bc0d5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  radius: 0.04
-  radialVertices: 6
-  isLoop: 0
-  material: {fileID: 2100000, guid: 85feedf64f0c16d4182fd4c33e342d2a, type: 2}
-  shadowMode: 1
-  customMesh:
-    mesh: {fileID: 4257529212018882713, guid: dc3ad6005b4f0514982b05eb88b9ed3f, type: 3}
-    rotation: 90
-    scale: {x: 1, y: 1, z: 1}
-    stretch: 1
-  spawnPoints: []
-  interpolation: 0
-  simulation:
-    enabled: 1
-    resolution: 10
-    massPerMeter: 0.25
-    stiffness: 1
-    energyLoss: 0.0025
-    lengthMultiplier: 1
-    gravityMultiplier: 1
-    useCustomGravity: 0
-    customGravity:
-      x: 0
-      y: -9.81
-      z: 0
-    substeps: 4
-    solverIterations: 5
-  collisions:
-    enabled: 0
-    influenceRigidbodies: 0
-    stride: 1
-    friction: 0.2
-    collisionMargin: 0.025
-    ignoreLayers:
-      serializedVersion: 2
-      m_Bits: 4
---- !u!114 &1871241735560429474
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6260769195098966104}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c7388c73173748148c4ba5f2ad6c713, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  type: 3
-  ropeLocation: 0
-  autoFindRopeLocation: 0
-  rigidbodySettings:
-    body: {fileID: 0}
-    stiffness: 0.15
-    damping: 0.05
-  transformSettings:
-    transform: {fileID: 0}
-  localConnectionPoint:
-    x: 0
-    y: 1
-    z: 0
---- !u!114 &5502267137512785186
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6260769195098966104}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c7388c73173748148c4ba5f2ad6c713, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  type: 3
-  ropeLocation: 1
-  autoFindRopeLocation: 0
-  rigidbodySettings:
-    body: {fileID: 0}
-    stiffness: 0.1
-    damping: 0.1
-  transformSettings:
-    transform: {fileID: 0}
-  localConnectionPoint:
-    x: 0
-    y: 1
-    z: 0

+ 1 - 62
ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -361,66 +361,6 @@ Transform:
   m_Father: {fileID: 5205406772191310031}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1270928763770490430
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 9098102129482079265}
-  - component: {fileID: 6835827572740498734}
-  - component: {fileID: 8878694457807976444}
-  m_Layer: 0
-  m_Name: EventTrigger
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &9098102129482079265
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1270928763770490430}
-  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: []
-  m_Father: {fileID: 5205406772191310031}
-  m_RootOrder: 11
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &6835827572740498734
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1270928763770490430}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 2, y: 2, z: 2}
-  m_Center: {x: 0, y: 0.9, z: 0}
---- !u!114 &8878694457807976444
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1270928763770490430}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 36129e804db4831409e920c2f3b6abfc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  owner: {fileID: 0}
-  triggedRivet: {fileID: 0}
 --- !u!1 &1367816017394770223
 GameObject:
   m_ObjectHideFlags: 0
@@ -521,7 +461,6 @@ Transform:
   - {fileID: 8692792125260174174}
   - {fileID: 5212359350877648398}
   - {fileID: 6678189523681876430}
-  - {fileID: 9098102129482079265}
   m_Father: {fileID: 2788556811231999033}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -803,6 +742,7 @@ MonoBehaviour:
   - {fileID: 4278110667860756949}
   - {fileID: 8692792125260174174}
   shootTrack: 1
+  shootAlwaysTrack: 0
   Attack_summonInfos: []
   Attack_marchInfos: []
   attackTriggers:
@@ -914,7 +854,6 @@ MonoBehaviour:
   rightDir: {x: 0, y: 0}
   uiMp: {fileID: 8465211090008398057}
   playerRope: {fileID: 112529840073562573, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-  eventTrigger: {fileID: 8878694457807976444}
   sprintLinkTrigger: {fileID: 2536450432252384432}
   soulCollector: {fileID: 3739918129319493242}
   skeletonMecanim: {fileID: 6843453365888964567}

+ 0 - 149
ActionTowerDefense/Assets/Resources/Prefab/PlayerRope.prefab

@@ -1,149 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &7712882736463803884
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6364039941502603542}
-  - component: {fileID: 8595468063941206585}
-  - component: {fileID: 112529840073562573}
-  m_Layer: 0
-  m_Name: PlayerRope
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6364039941502603542
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7712882736463803884}
-  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: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!120 &8595468063941206585
-LineRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7712882736463803884}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 0
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 0
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 8b16ac2666b457f4c82d744514e2d4ca, type: 2}
-  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_Positions:
-  - {x: 0, y: 0, z: 0}
-  - {x: 0, y: 0, z: 1}
-  m_Parameters:
-    serializedVersion: 3
-    widthMultiplier: 0.2
-    widthCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        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
-    colorGradient:
-      serializedVersion: 2
-      key0: {r: 1, g: 1, b: 1, a: 1}
-      key1: {r: 1, g: 1, b: 1, a: 1}
-      key2: {r: 0, g: 0, b: 0, a: 0}
-      key3: {r: 0, g: 0, b: 0, a: 0}
-      key4: {r: 0, g: 0, b: 0, a: 0}
-      key5: {r: 0, g: 0, b: 0, a: 0}
-      key6: {r: 0, g: 0, b: 0, a: 0}
-      key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 0
-      ctime1: 65535
-      ctime2: 0
-      ctime3: 0
-      ctime4: 0
-      ctime5: 0
-      ctime6: 0
-      ctime7: 0
-      atime0: 0
-      atime1: 65535
-      atime2: 0
-      atime3: 0
-      atime4: 0
-      atime5: 0
-      atime6: 0
-      atime7: 0
-      m_Mode: 0
-      m_NumColorKeys: 2
-      m_NumAlphaKeys: 2
-    numCornerVertices: 0
-    numCapVertices: 0
-    alignment: 0
-    textureMode: 0
-    shadowBias: 0.5
-    generateLightingData: 0
-  m_UseWorldSpace: 1
-  m_Loop: 0
---- !u!114 &112529840073562573
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7712882736463803884}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 105a87ba6cf66a240911fe4f462ca6c8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  line: {fileID: 8595468063941206585}
-  targetEnemy: {fileID: 0}
-  playerId: 0

+ 3 - 2
ActionTowerDefense/Assets/Resources/Prefab/EnemyRope.prefab.meta → ActionTowerDefense/Assets/Resources/Prefab/Skills.meta

@@ -1,6 +1,7 @@
 fileFormatVersion: 2
-guid: db20d049c85578a4db3cef14a52b0f7b
-PrefabImporter:
+guid: aa148d9d9ccb26045ab0dca33da036ed
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

+ 7 - 295
ActionTowerDefense/Assets/Scenes/Game.unity

@@ -833,150 +833,6 @@ MonoBehaviour:
   canDown: 1
   myBaGuaTrigger: {fileID: 0}
   baGuaTrigger: []
---- !u!1 &317380082
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 317380084}
-  - component: {fileID: 317380083}
-  - component: {fileID: 317380086}
-  - component: {fileID: 317380085}
-  m_Layer: 0
-  m_Name: Rivet
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &317380083
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 317380082}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 481b12dc18964dc4f879c5df3686f5fa, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mecanim: {fileID: 0}
-  meshRenderer: {fileID: 0}
-  ani: {fileID: 0}
-  totalDieKeepTime: 2
-  totalAttack_summonTime: 0.5
-  totalAttack_marchTime: 0.5
-  attackKeys: []
-  dieKeepTime: 0
-  rb: {fileID: 317380085}
-  bodyTrans: {fileID: 0}
-  beSearchTrigger: {fileID: 0}
-  searchTrigger: {fileID: 0}
-  bodyCollider: {fileID: 0}
-  uiHp: {fileID: 0}
-  beHitTrigger: {fileID: 0}
-  state: 0
-  totalHp: 100
-  hp: 0
-  isDie: 0
-  isRevive: 0
-  linked: 0
-  canNotAddForce: 0
-  canNotChangeHurt: 0
-  invincibleTime: 0
-  injuryNumText: {fileID: 0}
-  showInjuryNum: 0
-  canFly: 0
-  armor: 0
-  ls: {fileID: 0}
-  isInSoulTower: 0
-  canHitFly: 0
-  isNonAttack: 0
-  attackType: 0
-  bulletPrefab: {fileID: 0}
-  shootPos: []
-  shootTrack: 0
-  Attack_summonInfos: []
-  Attack_marchInfos: []
-  attackTriggers: []
-  addAttackEffect: {fileID: 0}
-  armorPiercing: 0
-  curDamage1: 
-  curDamage2: 
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  keyTimes: []
-  curKeyNum: 0
-  isAttackTriggerOn: 0
-  targetTypes: 
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
-  beTargetCharacter: []
-  getDistanceOffset: 0
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
-  joint: {fileID: 0}
-  rope: {fileID: 0}
-  beLarger: 0
-  toLargeSize: 0
-  cookEffect: {fileID: 0}
-  Attack_summonShootCanTransmit: 0
-  debugAttackFrom: 0
-  ropes: {fileID: 0}
-  ropePrefab: {fileID: 616841038056457886, guid: db20d049c85578a4db3cef14a52b0f7b, type: 3}
---- !u!4 &317380084
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 317380082}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 50, y: -0.5, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 514997753}
-  m_Father: {fileID: 0}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!54 &317380085
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 317380082}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 0
-  m_IsKinematic: 1
-  m_Interpolate: 0
-  m_Constraints: 0
-  m_CollisionDetection: 0
---- !u!65 &317380086
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 317380082}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 2, y: 2, z: 2}
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &363224841
 GameObject:
   m_ObjectHideFlags: 0
@@ -1589,89 +1445,6 @@ MonoBehaviour:
     y: 0
     width: 1
     height: 1
---- !u!1 &514997752
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 514997753}
-  - component: {fileID: 514997756}
-  - component: {fileID: 514997755}
-  m_Layer: 0
-  m_Name: Cube
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &514997753
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 514997752}
-  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: []
-  m_Father: {fileID: 317380084}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!23 &514997755
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 514997752}
-  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!33 &514997756
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 514997752}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &519420028
 GameObject:
   m_ObjectHideFlags: 0
@@ -1995,7 +1768,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &583626553
 GameObject:
@@ -6842,7 +6615,7 @@ Transform:
   - {fileID: 306030531}
   - {fileID: 811208338}
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &643173049
 GameObject:
@@ -17776,7 +17549,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &992338364
 GameObject:
@@ -17970,7 +17743,7 @@ Transform:
   - {fileID: 519420032}
   - {fileID: 467647573}
   m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!82 &1055802831
 AudioSource:
@@ -18544,67 +18317,6 @@ Transform:
   m_Father: {fileID: 1803098783}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1366036430
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 6364039941502603542, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-      propertyPath: m_RootOrder
-      value: 8
-      objectReference: {fileID: 0}
-    - target: {fileID: 6364039941502603542, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6364039941502603542, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6364039941502603542, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6364039941502603542, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6364039941502603542, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6364039941502603542, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6364039941502603542, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6364039941502603542, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6364039941502603542, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6364039941502603542, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7712882736463803884, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-      propertyPath: m_Name
-      value: PlayerRope
-      objectReference: {fileID: 0}
-    - target: {fileID: 7712882736463803884, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
 --- !u!1 &1418777080
 GameObject:
   m_ObjectHideFlags: 0
@@ -31209,7 +30921,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 693438331589553446, guid: 7718014a1b52a1741a361cac211579a3, type: 3}
       propertyPath: m_RootOrder
-      value: 9
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 693438331589553446, guid: 7718014a1b52a1741a361cac211579a3, type: 3}
       propertyPath: m_LocalPosition.x
@@ -31302,7 +31014,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6220511700128991423, guid: dd98f16e694849044b9b84d56d30cdb1, type: 3}
       propertyPath: m_RootOrder
-      value: 10
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 6220511700128991423, guid: dd98f16e694849044b9b84d56d30cdb1, type: 3}
       propertyPath: m_LocalPosition.x
@@ -32104,7 +31816,7 @@ RectTransform:
   - {fileID: 1512487595}
   - {fileID: 741372828}
   m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}

+ 0 - 15
ActionTowerDefense/Assets/Scripts/Character.cs

@@ -170,10 +170,6 @@ public class Character : MonoBehaviour
     [Header("血量上限增加类型")]
     public HpUpType hptp;
 
-    [Header("被铁链连着")]
-    public RopeJoint joint;
-    public CharacterRope rope;
-
     [Header("体型增大")]
     public bool beLarger = false;
     public float toLargeSize = 0;                   //变大程度
@@ -215,17 +211,6 @@ public class Character : MonoBehaviour
         }
         ChangeState(CharacterState.Idle);
 
-        //被链接状态重置
-        linked = false;
-        if (joint)
-        {
-            Destroy(joint);
-            joint = null;
-        }
-        if (rope)
-        {
-            rope = null;
-        }
         curDamage1 = new int[Attack_summonInfos.Count];
         for (int i = 0; i < Attack_summonInfos.Count; i++)
         {

+ 0 - 57
ActionTowerDefense/Assets/Scripts/CharacterRope.cs

@@ -1,57 +0,0 @@
-using RopeToolkit;
-using System.Collections;
-using System.Collections.Generic;
-using Unity.VisualScripting;
-using UnityEngine;
-using UnityEngine.TextCore.Text;
-
-public class CharacterRope : MonoBehaviour
-{
-    public Rope rope;
-    public RopeConnection conn1, conn2;
-
-    public Character target1;
-    public Character target2;
-
-    private void Awake()
-    {
-        RopeConnection[] conns = rope.GetComponents<RopeConnection>();
-        conn1 = conns[0];
-        conn2 = conns[1];
-    }
-
-    public void BeLink(Character character1, Character character2, bool addJoint = true)
-    {
-        transform.position = Vector3.zero;
-        target1 = character1;
-        target2 = character2;
-        conn1.transformSettings.transform = character1.transform;
-        conn2.transformSettings.transform = character2.transform;
-        conn1.rigidbodySettings.body = character1.GetComponent<Rigidbody>();
-        conn2.rigidbodySettings.body = character2.GetComponent<Rigidbody>();
-        rope.spawnPoints.Clear();
-        rope.spawnPoints.Add(character1.transform.position);
-        rope.spawnPoints.Add(character2.transform.position);
-        rope.gameObject.SetActive(true);
-        character1.linked = true;
-        if (addJoint)
-        {
-            if (!character1.joint)
-            {
-                character1.joint = character1.AddComponent<RopeJoint>();
-            }
-            character1.joint.rb = character1.rb;
-            character1.joint.connectedBody = character2.rb;
-            character1.joint.maxDistance = (character1.transform.position - character2.transform.position).magnitude;
-            character1.rope = this;
-        }
-    }
-
-    private void FixedUpdate()
-    {
-        if ((!target1 || target1.isDie) || (!target2 || target2.isDie))
-        {
-            gameObject.SetActive(false);
-        }
-    }
-}

+ 0 - 11
ActionTowerDefense/Assets/Scripts/CharacterRope.cs.meta

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

+ 0 - 5
ActionTowerDefense/Assets/Scripts/Enemy.cs

@@ -879,11 +879,6 @@ public class Enemy : MoveCharacter
                 isDie = true;
                 dieKeepTime = totalDieKeepTime;
                 DropSouls();
-                if (linked)
-                {
-                    PlayersInput.instance[0].sprintLinkTrigger.linkedEnemy.Remove(this);
-                    PlayersInput.instance[0].playerRope.gameObject.SetActive(false);
-                }
                 break;
             case CharacterState.Weak:
                 switch (oldState)

+ 0 - 31
ActionTowerDefense/Assets/Scripts/EventTrigger.cs

@@ -1,31 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.U2D;
-
-public class EventTrigger : MonoBehaviour
-{
-    public Character owner;
-    public Rivet triggedRivet;
-
-    private void Awake()
-    {
-        owner = GetComponentInParent<Character>();
-    }
-
-    private void OnTriggerEnter(Collider other)
-    {
-        if (other.GetComponent<Rivet>())
-        {
-            triggedRivet = other.GetComponent<Rivet>();
-        }
-    }
-
-    private void OnTriggerExit(Collider other)
-    {
-        if (other.GetComponent<Rivet>())
-        {
-            triggedRivet = null;
-        }
-    }
-}

+ 0 - 11
ActionTowerDefense/Assets/Scripts/EventTrigger.cs.meta

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

+ 0 - 13
ActionTowerDefense/Assets/Scripts/PlayerController.cs

@@ -51,9 +51,6 @@ public class PlayerController : MoveCharacter
 
     [Header("Íæ¼Ò×é¼þ")]
     public UIHP uiMp;
-    public PlayerRope playerRope;
-    public EventTrigger eventTrigger;
-    public SprintLinkTrigger sprintLinkTrigger;
     private Spirits spirits;
     public Collider soulCollector;
     public SkeletonMecanim skeletonMecanim;
@@ -418,8 +415,6 @@ public class PlayerController : MoveCharacter
         spirits = GetComponent<Spirits>();
         playerId = playerInput.playerIndex;
         transform.position = new Vector3(pos.x, pos.y, 0);
-        playerRope.playerId = playerId;
-        sprintLinkTrigger.playerID = playerId;
         switch (playerId)
         {
             case 0:
@@ -1041,14 +1036,6 @@ public class PlayerController : MoveCharacter
             //        return true;
             //    }
             //}
-            if (eventTrigger.triggedRivet && (btnNorthPress || cachePullRopeTime > 0))
-            {
-                if (sprintLinkTrigger.linkedEnemy.Count > 0)
-                {
-                    eventTrigger.triggedRivet.BindingRopes(sprintLinkTrigger.linkedEnemy);
-                }
-                //ChangeState(CharacterState.PullRope);
-            }
             if (excludeState != CharacterState.Summon || excludeState != CharacterState.Conduct)
             {
                 if (CheckSummon())

+ 0 - 39
ActionTowerDefense/Assets/Scripts/PlayerRope.cs

@@ -1,39 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using static UnityEngine.GraphicsBuffer;
-
-public class PlayerRope : MonoBehaviour
-{
-    public LineRenderer line;
-    public Enemy targetEnemy;
-
-    public int playerId;
-
-    public void BeLink(Enemy enemy)
-    {
-        targetEnemy = enemy;
-        gameObject.SetActive(true);
-    }
-
-    private void Update()
-    {
-        if (!targetEnemy)
-        {
-            Debug.LogError("NoTargetEnemy");
-            gameObject.SetActive(false);
-            return;
-        }
-        line.SetPosition(0, PlayersInput.instance[playerId].transform.position + Vector3.up);
-        line.SetPosition(1, targetEnemy.transform.position + Vector3.up);
-
-    }
-
-    private void FixedUpdate()
-    {
-        if (!targetEnemy || targetEnemy.isDie)
-        {
-            gameObject.SetActive(false);
-        }
-    }
-}

+ 0 - 11
ActionTowerDefense/Assets/Scripts/PlayerRope.cs.meta

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

+ 0 - 33
ActionTowerDefense/Assets/Scripts/Rivet.cs

@@ -1,33 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.TextCore.Text;
-using static UnityEditor.Progress;
-
-public class Rivet : Character
-{
-    public CharacterRope ropes;
-    public GameObject ropePrefab;
-
-    public void ShortenRopes()
-    {
-
-    }
-
-    public void BindingRopes(List<Enemy> enemies)
-    {
-        for (int i = 0; i < enemies.Count; i++)
-        {
-            if (enemies[i].rope)
-            {
-                enemies[i].rope.gameObject.SetActive(false);
-                enemies[i].rope = null;
-            }
-            GameObject ropeObj = PoolManager.Instantiate(ropePrefab);
-            CharacterRope rope = ropeObj.GetComponent<CharacterRope>();
-            rope.BeLink(enemies[i], this);
-        }
-        PlayersInput.instance[0].sprintLinkTrigger.linkedEnemyDic.Clear();
-        PlayersInput.instance[0].sprintLinkTrigger.linkedEnemy.Clear();
-    }
-}

+ 0 - 11
ActionTowerDefense/Assets/Scripts/Rivet.cs.meta

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

+ 0 - 37
ActionTowerDefense/Assets/Scripts/RopeJoint.cs

@@ -1,37 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class RopeJoint : MonoBehaviour
-{
-    public Rigidbody rb;
-    public Rigidbody connectedBody;
-    public float maxDistance;
-
-    private void FixedUpdate()
-    {
-        if ((transform.position - connectedBody.transform.position).magnitude > maxDistance)
-        {
-            Vector3 dir = (connectedBody.transform.position - transform.position).normalized;
-            float mag = (connectedBody.transform.position - transform.position).magnitude;
-            float changeValue = mag - maxDistance;
-            if (connectedBody.isKinematic && rb.isKinematic)
-            {
-                return;
-            }
-            else if (connectedBody.isKinematic)
-            {
-                transform.position += changeValue * dir;
-            }
-            else if (rb.isKinematic)
-            {
-                connectedBody.transform.position -= changeValue * dir;
-            }
-            else
-            {
-                transform.position += changeValue * rb.mass / (rb.mass + connectedBody.mass) * dir;
-                connectedBody.transform.position -= changeValue * connectedBody.mass / (rb.mass + connectedBody.mass) * dir;
-            }
-        }
-    }
-}

+ 0 - 11
ActionTowerDefense/Assets/Scripts/RopeJoint.cs.meta

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

+ 3 - 2
ActionTowerDefense/Assets/Resources/Prefab/PlayerRope.prefab.meta → ActionTowerDefense/Assets/Scripts/Skills.meta

@@ -1,6 +1,7 @@
 fileFormatVersion: 2
-guid: 2f24cd9614ae27e4e9525c04d7c7244f
-PrefabImporter:
+guid: 5acc73b1988bc58409ca5be4eff32885
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

+ 0 - 52
ActionTowerDefense/Assets/Scripts/SprintLinkTrigger.cs

@@ -1,52 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class SprintLinkTrigger : MonoBehaviour
-{
-    public GameObject enemyRopePrefab;
-    public GameObject playerRopePrefab;
-    public Dictionary<Enemy, bool> linkedEnemyDic;
-    public List<Enemy> linkedEnemy;
-
-    public int playerID;
-
-    private void Awake()
-    {
-        linkedEnemyDic = new Dictionary<Enemy, bool>();
-        linkedEnemy = new List<Enemy>();
-    }
-
-    private void OnTriggerEnter(Collider other)
-    {
-        BeSearchTrigger beSearchTrigger = other.GetComponent<BeSearchTrigger>();
-        if (!beSearchTrigger)
-        {
-            return;
-        }
-        Enemy enemy = other.GetComponentInParent<Enemy>();
-        if (!enemy || linkedEnemyDic.ContainsKey(enemy))
-        {
-            return;
-        }
-        if (linkedEnemy.Count > 0)
-        {
-            LinkEnemy(enemy, linkedEnemy[linkedEnemy.Count - 1]);
-        }
-        LinkPlayer(enemy);
-    }
-
-    public void LinkEnemy(Enemy enemy1, Enemy enemy2)
-    {
-        GameObject ropeObj = PoolManager.Instantiate(enemyRopePrefab);
-        CharacterRope rope = ropeObj.GetComponent<CharacterRope>();
-        rope.BeLink(enemy1, enemy2);
-    }
-
-    public void LinkPlayer(Enemy enemy)
-    {
-        linkedEnemyDic.Add(enemy, true);
-        linkedEnemy.Add(enemy);
-        PlayersInput.instance[playerID].playerRope.BeLink(enemy);
-    }
-}

+ 0 - 11
ActionTowerDefense/Assets/Scripts/SprintLinkTrigger.cs.meta

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