From 4a083f2f3d8baf1c2630b3717d62904edcc8e24a Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Sat, 14 Nov 2020 10:32:27 +0800
Subject: [PATCH] 修改小怪,精灵塔改成2D Sprite

---
 Assets/Prefabs/Enemies/water 1.prefab |  158 ++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 127 insertions(+), 31 deletions(-)

diff --git a/Assets/Prefabs/Enemies/water 1.prefab b/Assets/Prefabs/Enemies/water 1.prefab
index 20518da..26fc020 100644
--- a/Assets/Prefabs/Enemies/water 1.prefab
+++ b/Assets/Prefabs/Enemies/water 1.prefab
@@ -1,5 +1,120 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6123337037556590143
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3049446194321265458}
+  - component: {fileID: 3595585190106554867}
+  - component: {fileID: 6678885540973173833}
+  - component: {fileID: 2865053420293408850}
+  m_Layer: 0
+  m_Name: Body
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3049446194321265458
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6123337037556590143}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8434816861478773449}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &3595585190106554867
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6123337037556590143}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, 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: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: c28adf2f621f65f4e91901405ae0756a, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 10.8, y: 10.8}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!95 &6678885540973173833
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6123337037556590143}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 03fc1ee7fdb64264088d182f73eb9f21, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &2865053420293408850
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6123337037556590143}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 70719dcea2b0be54580a41e62debeab1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &8434816860007424699
 GameObject:
   m_ObjectHideFlags: 0
@@ -28,7 +143,7 @@
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8434816861478773449}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8434816860064133391
 GameObject:
@@ -47,7 +162,7 @@
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &8434816860064133388
 Transform:
   m_ObjectHideFlags: 0
@@ -130,7 +245,6 @@
   - component: {fileID: 2476106126470318335}
   - component: {fileID: 652547545057790155}
   - component: {fileID: 2034107896435957072}
-  - component: {fileID: 3218667161569614965}
   m_Layer: 11
   m_Name: water 1
   m_TagString: Untagged
@@ -147,9 +261,10 @@
   m_GameObject: {fileID: 8434816861478773448}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0.2, z: 0}
-  m_LocalScale: {x: 4.5, y: 5, z: 4.5}
+  m_LocalScale: {x: 3.5, y: 3.5, z: 3.5}
   m_Children:
   - {fileID: 8434816860064133388}
+  - {fileID: 3049446194321265458}
   - {fileID: 8434816860007424696}
   - {fileID: 1277171420674534872}
   - {fileID: 9114815543095638400}
@@ -238,6 +353,7 @@
   appliedEffectScale: 0.08
   healthBar: {fileID: 9222104150701355608}
   spawnParticle: {fileID: 19892064, guid: 8c51d2af51854f148bba24c2904e2e63, type: 3}
+  ActionAnimator: {fileID: 6678885540973173833}
   bShowDebugNode: 0
 --- !u!54 &8434816861478773555
 Rigidbody:
@@ -343,26 +459,6 @@
   alignment:
     unityObjectReference: {fileID: 11400000, guid: 9dc4735bf52f547d59ebe1007e9a0e7f,
       type: 2}
---- !u!114 &3218667161569614965
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8434816861478773448}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b42fed56539b41a4e9341a05a177f826, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  matAttack_Self: {fileID: 2100000, guid: 873ccc92b6a48c645bf812755a268db8, type: 2}
-  matDie_Self: {fileID: 2100000, guid: f8bc9e73db173004a8efa9378780b91f, type: 2}
-  matGetHit_Self: {fileID: 2100000, guid: d36e39ed5879b3340ba072f0ed4c622b, type: 2}
-  matMove_Self: {fileID: 2100000, guid: 4fd1d148dbca5f14faec9294ef4d43dd, type: 2}
-  matAttack_Oppo: {fileID: 2100000, guid: 0424c244303ce004eac9097dde66cf11, type: 2}
-  matDie_Oppo: {fileID: 2100000, guid: 9714f5850e79bcd4ea93804eecf04954, type: 2}
-  matGetHit_Oppo: {fileID: 2100000, guid: dce678fabd04c4b40914386fefbfb9af, type: 2}
-  matMove_Oppo: {fileID: 2100000, guid: a9e578b9785099749ac4ee3c85eccea1, type: 2}
 --- !u!1 &8585545065585961043
 GameObject:
   m_ObjectHideFlags: 0
@@ -393,7 +489,7 @@
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8434816861478773449}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &7490226013430720439
 MonoBehaviour:
@@ -474,7 +570,7 @@
       objectReference: {fileID: 0}
     - target: {fileID: 4544219117696442, guid: ad121b684e3934947a2d412b4202d8fd, type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 4544219117696442, guid: ad121b684e3934947a2d412b4202d8fd, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -546,7 +642,7 @@
     - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
         type: 3}
       propertyPath: m_RootOrder
-      value: 7
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174,
         type: 3}
@@ -667,7 +763,7 @@
     - target: {fileID: 4916796871218370802, guid: 3d8c8419dca866149b46e4ab68d15496,
         type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 4916796871218370802, guid: 3d8c8419dca866149b46e4ab68d15496,
         type: 3}
@@ -769,7 +865,7 @@
     - target: {fileID: 1427824652297354268, guid: 1428e6b22c062b640bbe37b82f1ee655,
         type: 3}
       propertyPath: m_RootOrder
-      value: 6
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 1427824652297354268, guid: 1428e6b22c062b640bbe37b82f1ee655,
         type: 3}
@@ -915,7 +1011,7 @@
     - target: {fileID: 6024426988374568398, guid: da8892980c8b53042a412b759809e5e8,
         type: 3}
       propertyPath: m_RootOrder
-      value: 5
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 6024426988374568398, guid: da8892980c8b53042a412b759809e5e8,
         type: 3}
@@ -1066,7 +1162,7 @@
     - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
         type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 5188812776810247605, guid: ee054dd88b9be2340a0da4ce80a84f62,
         type: 3}

--
Gitblit v1.9.1