Merge branch 'main' of http://192.168.10.102:30008/dal4segno/Northbound

2026-01-30 13:43:00 +09:00
parent 6f358a4aef 94c43153e4
commit 6df3e5d396
22 changed files with 292 additions and 2 deletions
--- a/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row1.asset
+++ b/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row1.asset
@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: eb34e2098ca7d654a81d495ad6e6f21b, type: 3}
+  m_Name: Data_Row1
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterMasterData
+  monsterId: 101
+  memo: "Grunt(\uAE30\uBCF8)"
+  moveSpeed: 2.6
+  maxHp: 30
+  atkRange: 1
+  atkDamage: 3
+  atkIntervalSec: 1.2
+  prefabPath: Assets/Prefabs/EnemyTest
--- a/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row1.asset.meta
+++ b/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row1.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a7b8bd34df6e81441afcbac36c0a1340
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row2.asset
+++ b/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row2.asset
@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: eb34e2098ca7d654a81d495ad6e6f21b, type: 3}
+  m_Name: Data_Row2
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterMasterData
+  monsterId: 102
+  memo: "Fast(\uBE60\uB984/\uC57D\uD568)"
+  moveSpeed: 3.4
+  maxHp: 18
+  atkRange: 1
+  atkDamage: 2
+  atkIntervalSec: 1
+  prefabPath: Assets/Prefabs/MonsterTest
--- a/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row2.asset.meta
+++ b/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row2.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0dc5ffa309a736b4a95faeb0ba9a9870
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row3.asset
+++ b/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row3.asset
@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: eb34e2098ca7d654a81d495ad6e6f21b, type: 3}
+  m_Name: Data_Row3
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterMasterData
+  monsterId: 103
+  memo: "Tank(\uB290\uB9BC/\uB2E8\uB2E8)"
+  moveSpeed: 2
+  maxHp: 70
+  atkRange: 1
+  atkDamage: 4
+  atkIntervalSec: 1.5
+  prefabPath: Assets/Prefabs/Core
--- a/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row3.asset.meta
+++ b/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row3.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e003d9bc04014834b8d4e6bead723568
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row4.asset
+++ b/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row4.asset
@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: eb34e2098ca7d654a81d495ad6e6f21b, type: 3}
+  m_Name: Data_Row4
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterMasterData
+  monsterId: 104
+  memo: "Ranged(\uC6D0\uAC70\uB9AC/\uC57D\uD568)"
+  moveSpeed: 2.4
+  maxHp: 22
+  atkRange: 5
+  atkDamage: 2
+  atkIntervalSec: 1.4
+  prefabPath: Assets/Prefabs/Resource
--- a/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row4.asset.meta
+++ b/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row4.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4566aa20a775cd04bac99329bb560b07
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row5.asset
+++ b/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row5.asset
@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: eb34e2098ca7d654a81d495ad6e6f21b, type: 3}
+  m_Name: Data_Row5
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterMasterData
+  monsterId: 105
+  memo: "Elite(\uC18C\uC218 \uC815\uC608)"
+  moveSpeed: 2.8
+  maxHp: 120
+  atkRange: 1
+  atkDamage: 7
+  atkIntervalSec: 1.3
+  prefabPath: Assets/Prefabs/ResourcePickup
--- a/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row5.asset.meta
+++ b/Assets/Data/ScriptableObjects/MonsterMaster/Data_Row5.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5b634a7c580ad824381bcbcaaa1d7047
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/WaveMaster/Data_Row1.asset
+++ b/Assets/Data/ScriptableObjects/WaveMaster/Data_Row1.asset
@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b0f6af2548b6a6049b54c1d50e7a6c53, type: 3}
+  m_Name: Data_Row1
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.WaveMasterData
+  waveId: 1
+  waveKey: WAVE_001
+  memo: 
+  durationSec: 90
+  monsterIdList: 101
+  monsterCountList: 10
--- a/Assets/Data/ScriptableObjects/WaveMaster/Data_Row1.asset.meta
+++ b/Assets/Data/ScriptableObjects/WaveMaster/Data_Row1.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 916cc5c2dde7f79408a2ec3a8830f1f6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/WaveMaster/Data_Row2.asset
+++ b/Assets/Data/ScriptableObjects/WaveMaster/Data_Row2.asset
@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b0f6af2548b6a6049b54c1d50e7a6c53, type: 3}
+  m_Name: Data_Row2
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.WaveMasterData
+  waveId: 2
+  waveKey: WAVE_002
+  memo: 
+  durationSec: 90
+  monsterIdList: 102
+  monsterCountList: 20
--- a/Assets/Data/ScriptableObjects/WaveMaster/Data_Row2.asset.meta
+++ b/Assets/Data/ScriptableObjects/WaveMaster/Data_Row2.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0d5315e12bb9dc440ae593ab703891d6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/WaveMaster/Data_Row3.asset
+++ b/Assets/Data/ScriptableObjects/WaveMaster/Data_Row3.asset
@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b0f6af2548b6a6049b54c1d50e7a6c53, type: 3}
+  m_Name: Data_Row3
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.WaveMasterData
+  waveId: 3
+  waveKey: WAVE_003
+  memo: 
+  durationSec: 90
+  monsterIdList: 103
+  monsterCountList: 5
--- a/Assets/Data/ScriptableObjects/WaveMaster/Data_Row3.asset.meta
+++ b/Assets/Data/ScriptableObjects/WaveMaster/Data_Row3.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 97dc48f8cf531c847942d3eef6dc615c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/WaveMaster/Data_Row4.asset
+++ b/Assets/Data/ScriptableObjects/WaveMaster/Data_Row4.asset
@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b0f6af2548b6a6049b54c1d50e7a6c53, type: 3}
+  m_Name: Data_Row4
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.WaveMasterData
+  waveId: 4
+  waveKey: WAVE_004
+  memo: 
+  durationSec: 90
+  monsterIdList: 104
+  monsterCountList: 3
--- a/Assets/Data/ScriptableObjects/WaveMaster/Data_Row4.asset.meta
+++ b/Assets/Data/ScriptableObjects/WaveMaster/Data_Row4.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f555b6db60f636d40b24efeb999fd200
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/WaveMaster/Data_Row5.asset
+++ b/Assets/Data/ScriptableObjects/WaveMaster/Data_Row5.asset
@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b0f6af2548b6a6049b54c1d50e7a6c53, type: 3}
+  m_Name: Data_Row5
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.WaveMasterData
+  waveId: 5
+  waveKey: WAVE_005
+  memo: 
+  durationSec: 90
+  monsterIdList: 105
+  monsterCountList: 2
--- a/Assets/Data/ScriptableObjects/WaveMaster/Data_Row5.asset.meta
+++ b/Assets/Data/ScriptableObjects/WaveMaster/Data_Row5.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 820652adf90840e45a832fd8985615b9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/Scripts/DataClasses/MonsterMasterData.cs
+++ b/Assets/Data/Scripts/DataClasses/MonsterMasterData.cs
@@ -3,7 +3,7 @@

 using UnityEngine;

-namespace DigAndDefend.Data
+namespace Northbound.Data
 {
    [CreateAssetMenu(fileName = "MonsterMasterData", menuName = "DigAndDefend/MonsterMaster Data")]
    public class MonsterMasterData : ScriptableObject
--- a/Assets/Data/Scripts/DataClasses/WaveMasterData.cs
+++ b/Assets/Data/Scripts/DataClasses/WaveMasterData.cs
@@ -3,7 +3,7 @@

 using UnityEngine;

-namespace DigAndDefend.Data
+namespace Northbound.Data
 {
    [CreateAssetMenu(fileName = "WaveMasterData", menuName = "DigAndDefend/WaveMaster Data")]
    public class WaveMasterData : ScriptableObject