Merge pull request #126 from pknu-wap/feature/munbin/#125

보스 처치시 복귀 포탈 생성 구현 feature/munbin/#125
pknu-wap · Dec 1, 2023 · ccddb64 · ccddb64
2 parents 6ccd959 + 3f9bc12
commit ccddb64
Show file tree

Hide file tree

Showing 10 changed files with 347 additions and 714 deletions.
diff --git a/Unity/Assets/MapGenerator/Resources/RetPortal.prefab b/Unity/Assets/MapGenerator/Resources/RetPortal.prefab
@@ -14,7 +14,7 @@ GameObject:
   - component: {fileID: -4963905584451247549}
   m_Layer: 0
   m_Name: RetPortal
-  m_TagString: Untagged
+  m_TagString: RetPortal
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0

diff --git a/Unity/Assets/Monster/Giant/Giant.prefab b/Unity/Assets/Monster/Giant/Giant.prefab
@@ -1656,7 +1656,7 @@ PrefabInstance:
     - target: {fileID: 442247492029501132, guid: 1ad092788dd8a8c46906b9c2ff809f90, type: 3}
       propertyPath: selectedEditorNode
       value: 
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 969495621991419598}
     - target: {fileID: 1098669232314767702, guid: 1ad092788dd8a8c46906b9c2ff809f90, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0
@@ -1893,6 +1893,9 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: 160128256648817209, guid: 1ad092788dd8a8c46906b9c2ff809f90, type: 3}
       insertIndex: -1
       addedObject: {fileID: 2036674394921321500}
+    - targetCorrespondingSourceObject: {fileID: 160128256648817209, guid: 1ad092788dd8a8c46906b9c2ff809f90, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 969495621991419598}
   m_SourcePrefab: {fileID: 100100000, guid: 1ad092788dd8a8c46906b9c2ff809f90, type: 3}
 --- !u!114 &2274291000685839222 stripped
 MonoBehaviour:
@@ -2054,6 +2057,7 @@ MonoBehaviour:
   children:
   - {fileID: 2036674394921321500}
   - {fileID: 7973041714465759256}
+  - {fileID: 969495621991419598}
   behaviourTree: {fileID: 0}
   runtimePriority: 0
   breakpoint: 0
@@ -2107,3 +2111,28 @@ MonoBehaviour:
   behaviourTree: {fileID: 0}
   runtimePriority: 0
   breakpoint: 0
+--- !u!114 &969495621991419598
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6902224715957730115}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2d4309172d3bef7489e2a77834271789, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  title: ReturnMap
+  rect:
+    serializedVersion: 2
+    x: 260
+    y: 360
+    width: 160
+    height: 44
+  parent: {fileID: 5789106774320476550}
+  children: []
+  behaviourTree: {fileID: 0}
+  runtimePriority: 0
+  breakpoint: 0
+  newGameObject: {fileID: 2175497092943187397, guid: be223d04f29489f468f041beafd55b91, type: 3}
diff --git a/Unity/Assets/Monster/Knight/Knight.prefab b/Unity/Assets/Monster/Knight/Knight.prefab
@@ -1671,7 +1671,7 @@ PrefabInstance:
     - target: {fileID: 442247492029501132, guid: 1ad092788dd8a8c46906b9c2ff809f90, type: 3}
       propertyPath: selectedEditorNode
       value: 
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 2906729193268439286}
     - target: {fileID: 1710393109640347201, guid: 1ad092788dd8a8c46906b9c2ff809f90, type: 3}
       propertyPath: m_LocalPosition.x
       value: 47.63
@@ -1716,6 +1716,10 @@ PrefabInstance:
       propertyPath: m_PresetInfoIsWorld
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4018982553719588997, guid: 1ad092788dd8a8c46906b9c2ff809f90, type: 3}
+      propertyPath: maxHealth
+      value: 1000
+      objectReference: {fileID: 0}
     - target: {fileID: 4791448060018659852, guid: 1ad092788dd8a8c46906b9c2ff809f90, type: 3}
       propertyPath: rect.x
       value: 320
@@ -1864,6 +1868,12 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: 160128256648817209, guid: 1ad092788dd8a8c46906b9c2ff809f90, type: 3}
       insertIndex: -1
       addedObject: {fileID: 407996449360938722}
+    - targetCorrespondingSourceObject: {fileID: 160128256648817209, guid: 1ad092788dd8a8c46906b9c2ff809f90, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 9106088311278495016}
+    - targetCorrespondingSourceObject: {fileID: 160128256648817209, guid: 1ad092788dd8a8c46906b9c2ff809f90, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 2906729193268439286}
   m_SourcePrefab: {fileID: 100100000, guid: 1ad092788dd8a8c46906b9c2ff809f90, type: 3}
 --- !u!114 &3534114275532776079 stripped
 MonoBehaviour:
@@ -2012,7 +2022,7 @@ MonoBehaviour:
     height: 44
   parent: {fileID: 5985374351147142762}
   children:
-  - {fileID: 407996449360938722}
+  - {fileID: 9106088311278495016}
   - {fileID: 4646152942762072922}
   - {fileID: 1783112433615486597}
   - {fileID: 4028682523045633669}
@@ -2137,11 +2147,62 @@ MonoBehaviour:
   title: CheckMonsterDead
   rect:
     serializedVersion: 2
-    x: -0
-    y: 240
+    x: -160
+    y: 280
+    width: 160
+    height: 44
+  parent: {fileID: 9106088311278495016}
+  children: []
+  behaviourTree: {fileID: 0}
+  runtimePriority: 0
+  breakpoint: 0
+--- !u!114 &9106088311278495016
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8164451523530529466}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4c78c7da6b00e1b46bad07949050f82f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  title: Sequence
+  rect:
+    serializedVersion: 2
+    x: -40
+    y: 200
     width: 160
     height: 44
   parent: {fileID: 1772531170030906082}
+  children:
+  - {fileID: 407996449360938722}
+  - {fileID: 2906729193268439286}
+  behaviourTree: {fileID: 0}
+  runtimePriority: 0
+  breakpoint: 0
+  random: 0
+--- !u!114 &2906729193268439286
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8164451523530529466}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2d4309172d3bef7489e2a77834271789, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  title: ReturnMap
+  rect:
+    serializedVersion: 2
+    x: 34
+    y: 274.8
+    width: 160
+    height: 44
+  parent: {fileID: 9106088311278495016}
   children: []
   behaviourTree: {fileID: 0}
   runtimePriority: 0

diff --git a/Unity/Assets/Monster/Nodes/ReturnMap.cs b/Unity/Assets/Monster/Nodes/ReturnMap.cs
@@ -0,0 +1,32 @@
+using MBT;
+using UnityEngine;
+
+namespace Monster.Nodes
+{
+    [AddComponentMenu("")]
+    [MBTNode(name = "Monster/ReturnMap")]
+    public class ReturnMap : Leaf
+    {
+        private SpriteRenderer _sprite;
+        private CapsuleCollider2D _collider;
+        private bool _created;
+
+        private void Start()
+        {
+            var gameObj = GameObject.FindGameObjectWithTag("RetPortal");
+            _sprite = gameObj.GetComponent<SpriteRenderer>();
+            _collider = gameObj.GetComponent<CapsuleCollider2D>();
+        }
+
+        public override NodeResult Execute()
+        {
+            if (_created) return NodeResult.success;
+
+            _created = true;
+            _sprite.enabled = true;
+            _collider.enabled = true;
+
+            return NodeResult.success;
+        }
+    }
+}
diff --git a/Unity/Assets/Monster/Nodes/ReturnMap.cs.meta b/Unity/Assets/Monster/Nodes/ReturnMap.cs.meta
diff --git a/Unity/Assets/Scenes/BossMap/BossMap1.unity b/Unity/Assets/Scenes/BossMap/BossMap1.unity
@@ -818,6 +818,71 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1001 &1171240942
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 151607671467519266, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2175497092943187397, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_Name
+      value: RetPortal
+      objectReference: {fileID: 0}
+    - target: {fileID: 2253340507670832968, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 33.10634
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.9341903
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: be223d04f29489f468f041beafd55b91, type: 3}
 --- !u!1 &1668772986
 GameObject:
   m_ObjectHideFlags: 0
@@ -10661,3 +10726,4 @@ SceneRoots:
   - {fileID: 450909735380989077}
   - {fileID: 1722061543}
   - {fileID: 788605532}
+  - {fileID: 1171240942}
diff --git a/Unity/Assets/Scenes/BossMap/BossMap2.unity b/Unity/Assets/Scenes/BossMap/BossMap2.unity
@@ -818,6 +818,71 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1001 &913910928
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 151607671467519266, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2175497092943187397, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_Name
+      value: RetPortal
+      objectReference: {fileID: 0}
+    - target: {fileID: 2253340507670832968, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 33.10634
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.9341903
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2354017587311172297, guid: be223d04f29489f468f041beafd55b91, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: be223d04f29489f468f041beafd55b91, type: 3}
 --- !u!1 &1668772986
 GameObject:
   m_ObjectHideFlags: 0
@@ -10661,3 +10726,4 @@ SceneRoots:
   - {fileID: 450909735380989077}
   - {fileID: 1722061543}
   - {fileID: 788605532}
+  - {fileID: 913910928}