SZAND\msx_2 преди 1 година
родител
ревизия
3fa5a67ebd
променени са 2 файла, в които са добавени 334 реда и са изтрити 30 реда
  1. 314 2
      ActionTowerDefense/Assets/Scenes/SampleScene.unity
  2. 20 28
      ActionTowerDefense/Assets/Scripts/Spirits/SpiritSystem.cs

+ 314 - 2
ActionTowerDefense/Assets/Scenes/SampleScene.unity

@@ -567,6 +567,82 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &465995542
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 465995543}
+  - component: {fileID: 465995545}
+  - component: {fileID: 465995544}
+  m_Layer: 5
+  m_Name: player2Orig
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &465995543
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 465995542}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 555234520}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 1185, y: 455.39383}
+  m_SizeDelta: {x: 436.444, y: 108.188}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &465995544
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 465995542}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.6661837, b: 0.2396226, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &465995545
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 465995542}
+  m_CullTransparentMesh: 1
 --- !u!1 &467647572
 GameObject:
   m_ObjectHideFlags: 0
@@ -975,6 +1051,10 @@ RectTransform:
   - {fileID: 225101631}
   - {fileID: 1010951729}
   - {fileID: 215313694}
+  - {fileID: 1281262645}
+  - {fileID: 465995543}
+  - {fileID: 1734364483}
+  - {fileID: 695318508}
   m_Father: {fileID: 0}
   m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -10672,6 +10752,82 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     vectorLabel1_3: W
+--- !u!1 &695318507
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 695318508}
+  - component: {fileID: 695318510}
+  - component: {fileID: 695318509}
+  m_Layer: 5
+  m_Name: player2To
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &695318508
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 695318507}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 555234520}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 756, y: 455.39383}
+  m_SizeDelta: {x: 436.444, y: 108.188}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &695318509
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 695318507}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.6661837, b: 0.2396226, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &695318510
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 695318507}
+  m_CullTransparentMesh: 1
 --- !u!1 &708739018
 GameObject:
   m_ObjectHideFlags: 0
@@ -16051,8 +16207,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 431526249e3a87f458b2eeb4cf583f15, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  player1UI: {fileID: 1010951728}
-  player2UI: {fileID: 215313693}
+  p1: {fileID: 1010951729}
+  p2: {fileID: 215313694}
+  p1Orig: {fileID: 1281262645}
+  p2Orig: {fileID: 465995543}
+  p1To: {fileID: 1734364483}
+  p2To: {fileID: 695318508}
   uiSpeed: 0.2
 --- !u!4 &970449925
 Transform:
@@ -16371,6 +16531,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1250426024}
   m_CullTransparentMesh: 1
+--- !u!1 &1281262644
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1281262645}
+  - component: {fileID: 1281262647}
+  - component: {fileID: 1281262646}
+  m_Layer: 5
+  m_Name: player1Orig
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1281262645
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1281262644}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 555234520}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -1185, y: 455.39383}
+  m_SizeDelta: {x: 436.444, y: 108.188}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1281262646
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1281262644}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.6661837, b: 0.2396226, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1281262647
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1281262644}
+  m_CullTransparentMesh: 1
 --- !u!1001 &1361503157
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -16811,6 +17047,82 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   created: 
+--- !u!1 &1734364482
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1734364483}
+  - component: {fileID: 1734364485}
+  - component: {fileID: 1734364484}
+  m_Layer: 5
+  m_Name: player1To
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1734364483
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1734364482}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 555234520}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -756, y: 455.39383}
+  m_SizeDelta: {x: 436.444, y: 108.188}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1734364484
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1734364482}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.6661837, b: 0.2396226, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1734364485
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1734364482}
+  m_CullTransparentMesh: 1
 --- !u!1 &1742263397
 GameObject:
   m_ObjectHideFlags: 0

+ 20 - 28
ActionTowerDefense/Assets/Scripts/Spirits/SpiritSystem.cs

@@ -4,13 +4,13 @@ using UnityEngine;
 
 public class SpiritSystem : MonoBehaviour
 {
-    public GameObject player1UI;
-    public GameObject player2UI;
+    public Transform p1;
+    public Transform p2;
+    public Transform p1Orig;
+    public Transform p2Orig;
+    public Transform p1To;
+    public Transform p2To;
     public float uiSpeed;
-    private Vector3 v1;
-    private Vector3 v2;
-    private Vector3 v11;
-    private Vector3 v21;
 
     private Vector3 re1 = Vector3.right;
     private Vector3 re2 = Vector3.left;
@@ -22,12 +22,8 @@ public class SpiritSystem : MonoBehaviour
 
     private void Start()
     {
-        v1 = player1UI.transform.position;
-        v2 = player2UI.transform.position;
-        v11 = v1 - new Vector3(160, 0, 0);
-        v21 = v2 + new Vector3(160, 0, 0);
-        player1UI.transform.position = v11;
-        player2UI.transform.position = v21;
+        p1.position = p1Orig.position;
+        p2.position = p2Orig.position;
     }
 
     private void playerUIout(int id)
@@ -35,20 +31,18 @@ public class SpiritSystem : MonoBehaviour
         switch (id)
         {
             case 0:
-                player1UI.transform.position = Vector3.SmoothDamp(player1UI.transform.position,
-                    v1, ref re1, uiSpeed);
-                if (v1.x - player1UI.transform.position.x <= 0.5f)
+                p1.position = Vector3.SmoothDamp(p1.position, p1To.position, ref re1, uiSpeed);
+                if (p1To.position.x - p1.position.x <= 0.5f)
                 {
-                    player1UI.transform.position = v1;
+                    p1.position = p1To.position;
                     isP1Out = false;
                 }
                 break;
             case 1:
-                player2UI.transform.position = Vector3.SmoothDamp(player2UI.transform.position,
-                    v2, ref re2, uiSpeed);
-                if (player2UI.transform.position.x - v2.x <= 0.5f)
+                p2.position = Vector3.SmoothDamp(p2.position, p2To.position, ref re2, uiSpeed);
+                if (p2.position.x - p2To.position.x <= 0.5f)
                 {
-                    player2UI.transform.position = v2;
+                    p2.position = p2To.position;
                     isP2Out = false;
                 }
                 break;
@@ -62,20 +56,18 @@ public class SpiritSystem : MonoBehaviour
         switch (id)
         {
             case 0:
-                player1UI.transform.position = Vector3.SmoothDamp(player1UI.transform.position,
-                    v11, ref re2, uiSpeed);
-                if (player1UI.transform.position.x - v11.x <= 0.5f)
+                p1.position = Vector3.SmoothDamp(p1.position, p1Orig.position, ref re2, uiSpeed);
+                if (p1.position.x - p1Orig.position.x <= 0.5f)
                 {
-                    player1UI.transform.position = v11;
+                    p1.position = p1Orig.position;
                     isP1In = false;
                 }
                 break;
             case 1:
-                player2UI.transform.position = Vector3.SmoothDamp(player2UI.transform.position,
-                    v21, ref re1, uiSpeed);
-                if (v21.x - player2UI.transform.position.x <= 0.5f)
+                p2.position = Vector3.SmoothDamp(p2.position, p2Orig.position, ref re1, uiSpeed);
+                if (p2Orig.position.x - p2.position.x <= 0.5f)
                 {
-                    player2UI.transform.position = v21;
+                    p2.position = p2Orig.position;
                     isP2In = false;
                 }
                 break;