테스트 데이터 업로드

Gameton-06/Assets/Gameton/Resources/GameData/player.json

@@ -1,10 +1,43 @@
-[
+{
-  {
+    "items": [
-    "id": 0,
+        {
-    "type": "w",
+            "id": 0,
-    "name": "lulu",
+            "type": "w",
-    "health": 100,
+            "name": "lulu",
-    "score": 20000,
+            "level": 1,
-    "chance": 3
+            "experience": 0,
-  }
+            "hp": 100,
-]
+            "mp": 100,
+            "attackPower": 50,
+            "defensivePower": 30,
+            "speed": 100,
+            "critical": 30
+        },
+        {
+            "id": 1,
+            "type": "w",
+            "name": "hicat",
+            "level": 1,
+            "experience": 0,
+            "hp": 100,
+            "mp": 100,
+            "attackPower": 50,
+            "defensivePower": 30,
+            "speed": 100,
+            "critical": 30
+        },
+        {
+            "id": 2,
+            "type": "b",
+            "name": "blac",
+            "level": 1,
+            "experience": 0,
+            "hp": 100,
+            "mp": 100,
+            "attackPower": 50,
+            "defensivePower": 30,
+            "speed": 100,
+            "critical": 30
+        }
+    ]
+}

Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_jinjoo/Edit_Ingame.unity

@@ -201,7 +201,7 @@ Transform:
   m_GameObject: {fileID: 116971769}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -5.65, y: -4.02, z: 0}
+  m_LocalPosition: {x: -5.65, y: -4, z: 0}
   m_LocalScale: {x: 140.32188, y: 18.625, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -413,6 +413,63 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &569623939
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4230657145152933587, guid: ab2e507b20e5dc844a1ea24b5619f656, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4230657145152933587, guid: ab2e507b20e5dc844a1ea24b5619f656, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4230657145152933587, guid: ab2e507b20e5dc844a1ea24b5619f656, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4230657145152933587, guid: ab2e507b20e5dc844a1ea24b5619f656, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4230657145152933587, guid: ab2e507b20e5dc844a1ea24b5619f656, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4230657145152933587, guid: ab2e507b20e5dc844a1ea24b5619f656, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4230657145152933587, guid: ab2e507b20e5dc844a1ea24b5619f656, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4230657145152933587, guid: ab2e507b20e5dc844a1ea24b5619f656, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4230657145152933587, guid: ab2e507b20e5dc844a1ea24b5619f656, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4230657145152933587, guid: ab2e507b20e5dc844a1ea24b5619f656, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6504236090121797777, guid: ab2e507b20e5dc844a1ea24b5619f656, type: 3}
+      propertyPath: m_Name
+      value: TON.ObjectPoolSystem
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: ab2e507b20e5dc844a1ea24b5619f656, type: 3}
 --- !u!1 &718284630
 GameObject:
   m_ObjectHideFlags: 0
@@ -691,83 +748,69 @@ Transform:
   m_GameObject: {fileID: 1268941402}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 9.15, y: -4.08, z: 0}
+  m_LocalPosition: {x: 9.15, y: -4, z: 0}
   m_LocalScale: {x: 67.625, y: 18.625, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1631563207 stripped
+--- !u!1001 &1939957610
-GameObject:
+PrefabInstance:
-  m_CorrespondingSourceObject: {fileID: 3727900396484012880, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-  m_PrefabInstance: {fileID: 8468278365748754255}
-  m_PrefabAsset: {fileID: 0}
---- !u!95 &1631563214
-Animator:
-  serializedVersion: 5
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1631563207}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: bf82660a78e45fa4393fd75bbd7940a6, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
---- !u!61 &1631563221
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1631563207}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_ForceSendLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ForceReceiveLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ContactCaptureLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_CallbackLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: -0.015000001, y: 0.13}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.6, y: -0.21052632}
-    oldSize: {x: 0.15, y: 0.19}
-    newSize: {x: 0.2, y: 0.2}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 0.13, y: 0.18}
+  m_Modification:
-  m_EdgeRadius: 0
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3656570700648378249, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
+      propertyPath: m_Name
+      value: TON.Player_B
+      objectReference: {fileID: 0}
+    - target: {fileID: 8528093570479225059, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -6.17
+      objectReference: {fileID: 0}
+    - target: {fileID: 8528093570479225059, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.8467308
+      objectReference: {fileID: 0}
+    - target: {fileID: 8528093570479225059, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8528093570479225059, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8528093570479225059, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8528093570479225059, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8528093570479225059, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8528093570479225059, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8528093570479225059, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8528093570479225059, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
 --- !u!1 &1986734010
 GameObject:
   m_ObjectHideFlags: 0
@@ -894,103 +937,12 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
---- !u!1001 &8468278365748754255
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 1540208527192873109, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -2.36
-      objectReference: {fileID: 0}
-    - target: {fileID: 1540208527192873109, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -1.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1540208527192873109, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1540208527192873109, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1540208527192873109, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1540208527192873109, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1540208527192873109, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1540208527192873109, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1540208527192873109, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1540208527192873109, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3727900396484012880, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_Name
-      value: TON.Player
-      objectReference: {fileID: 0}
-    - target: {fileID: 4492421443313798052, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_Constraints
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 6673825390847085769, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: jumpForce
-      value: 8
-      objectReference: {fileID: 0}
-    - target: {fileID: 7924180024803085435, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: -6513873517692269184, guid: a62f562755ff88847ad41a3451bf7182, type: 3}
-    - target: {fileID: 8127942116504678838, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_Size.x
-      value: 0.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 8127942116504678838, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_Size.y
-      value: 0.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 8127942116504678838, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_Offset.x
-      value: -0.01
-      objectReference: {fileID: 0}
-    - target: {fileID: 8127942116504678838, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      propertyPath: m_Offset.y
-      value: 0.13
-      objectReference: {fileID: 0}
-    m_RemovedComponents:
-    - {fileID: 8127942116504678838, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 3727900396484012880, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      insertIndex: 2
-      addedObject: {fileID: 1631563214}
-    - targetCorrespondingSourceObject: {fileID: 3727900396484012880, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
-      insertIndex: 3
-      addedObject: {fileID: 1631563221}
-  m_SourcePrefab: {fileID: 100100000, guid: a44eee8bbac0660468d7a047fdcecbb9, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
   m_Roots:
   - {fileID: 1986734011}
+  - {fileID: 569623939}
   - {fileID: 718284631}
   - {fileID: 2135657552}
   - {fileID: 535565209}
@@ -998,4 +950,4 @@ SceneRoots:
   - {fileID: 555333276}
   - {fileID: 1268941405}
   - {fileID: 1128113573}
-  - {fileID: 8468278365748754255}
+  - {fileID: 1939957610}

Gameton-06/Assets/Gameton/Scripts/Character/Skill/DarknessBall.cs

@@ -28,6 +28,7 @@ namespace TON
         {
             if (collision.CompareTag("Monster")) // 적과 충돌 시 제거
             {
+                // collision.gameObject.Damage();
                 ReleaseObject();
             }
         }

Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs

@@ -43,8 +43,10 @@ namespace TON
             Main.Singleton.Initialize();
 
             // TODO : Custom Order After System Load
-            UIManager.Show<IngameUI>(UIList.IngameUI);
+            // UIManager.Show<IngameUI>(UIList.IngameUI);
             UIManager.Show<ControllerUI>(UIList.ControllerUI);
+            // UIManager.Show<CharaterSelectUI>(UIList.CharaterSelectUI);
+
             // UIManager.Show<TitleUI>(UIList.TitleUI);
         }
     }