Skip to content

L
ldefense
Commit 711b84d0 authored by Gavin An's avatar Gavin An
Browse files
Options

작업중

parent facbd426
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 252 deletions
src/core/main.tscn
View file @ 711b84d0
......@@ -5,6 +5,7 @@
[ext_resource type="Script" uid="uid://cq7r51whh6po" path="res://src/core/stage_manager.gd" id="2_stage_mgr"]
[ext_resource type="PackedScene" uid="uid://dimlohck6ebg7" path="res://src/entities/monsters/noble_man/noble_man_unit.tscn" id="3_base_monster"]
[ext_resource type="Script" uid="uid://dkplkt6q8e3b5" path="res://src/core/unit_controller.gd" id="4_unit_ctrl"]
[ext_resource type="PackedScene" uid="uid://dfsvswt2g4422" path="res://src/entities/monsters/zombie/zombie_unit.tscn" id="5_2uitn"]
[ext_resource type="PackedScene" uid="uid://bqga1rvcjyydy" path="res://src/ui/hud.tscn" id="5_hud"]
[sub_resource type="NavigationMesh" id="NavigationMesh_map"]
......@@ -44,7 +45,7 @@ script = ExtResource("1_rts_cam")
[node name="StageManager" type="Node" parent="." unique_id=132524356]
script = ExtResource("2_stage_mgr")
monster_scene = ExtResource("3_base_monster")
monster_scenes = Array[PackedScene]([ExtResource("3_base_monster"), ExtResource("5_2uitn")])
[node name="UnitController" type="Control" parent="." unique_id=552898295]
layout_mode = 3
......
src/core/stage_manager.gd
View file @ 711b84d0
......@@ -5,7 +5,7 @@ extends Node
signal stage_start_cooldown_started(duration: float)
signal stage_started(stage: int)
@export var monster_scene: PackedScene
@export var monster_scenes: Array[PackedScene] = []
@export var spawn_interval: float = 1.0
@export var monsters_per_stage: int = 100 # 빠른 테스트를 위해 기획보다 약간 낮추거나 15~30마리 수준 설정
......@@ -75,13 +75,20 @@ func _on_spawn_timer_timeout() -> void:
_spawn_timer.stop()
return
if not _path_node or not monster_scene:
push_error("StageManager: Path3D node or Monster scene is missing.")
if not _path_node or monster_scenes.is_empty():
push_error("StageManager: Path3D node or Monster scenes are missing.")
_spawn_timer.stop()
return
# 몬스터 생성 및 경로 배치
var monster_instance: Node = monster_scene.instantiate()
# 무작위 몬스터 씬 선택 후 생성 및 경로 배치
var random_index: int = randi() % monster_scenes.size()
var selected_scene: PackedScene = monster_scenes[random_index]
if not selected_scene:
push_error("StageManager: Selected monster scene is null.")
return
var monster_instance: Node = selected_scene.instantiate()
_path_node.add_child(monster_instance)
# 몬스터 초기화 (HP, 보상 골드 설정)
......
src/entities/monsters/base_monster.gd
View file @ 711b84d0
......@@ -22,7 +22,8 @@ func _ready() -> void:
loop = true
# 자식 노드 중 3D 모델(noble_man 등) 노드 자동 탐색 및 초기화 (base_unit.gd 매커니즘 준수)
var model_names: Array[String] = ["noble_man", "zombie"]
#var model_names: Array[String] = ["noble_man", "zombie"]
var model_names: Array[String] = ["zombie"]
var detected_model_node: Node3D = null
var detected_model_name: String = ""
......@@ -32,43 +33,45 @@ func _ready() -> void:
detected_model_node = node
detected_model_name = m_name
break
if detected_model_node:
_model_instance = detected_model_node
if not detected_model_node:
return
_model_instance = detected_model_node
#GridMap 타일 높이(Y=0.21)에 맞춰 모델 및 충돌 판정 영역 오프셋 보정
#_model_instance.position.y = 0
var monster_area = get_node_or_null("MonsterArea")
#if monster_area and monster_area is Node3D:
#monster_area.position.y = 0.71
if detected_model_name == "noble_man":
_apply_noble_man_skin(_model_instance)
elif detected_model_name == "zombie":
_apply_zombie_skin(_model_instance)
#GridMap 타일 높이(Y=0.21)에 맞춰 모델 및 충돌 판정 영역 오프셋 보정
#_model_instance.position.y = 0
var monster_area = get_node_or_null("MonsterArea")
#if monster_area and monster_area is Node3D:
#monster_area.position.y = 0.71
_model_anim_player = _find_animation_player(_model_instance)
if not _model_anim_player:
return
print("BaseMonster: Linked model AnimationPlayer: ", detected_model_name)
if detected_model_name == "noble_man":
_apply_noble_man_skin(_model_instance)
elif detected_model_name == "zombie":
_apply_zombie_skin(_model_instance)
_model_anim_player = _find_animation_player(_model_instance)
if _model_anim_player:
print("BaseMonster: Linked model AnimationPlayer: ", detected_model_name)
# 모델명_animations.tres 라이브러리를 동적으로 로드하여 등록 (base_unit.gd 방식 준수)
# 단, 씬 파일에서 이미 기본 라이브러리("")로 등록된 경우 중복 등록 방지
var anim_lib_path: String = "res://assets/models/monsters/" + detected_model_name + "/" + detected_model_name + "_animations.tres"
if ResourceLoader.exists(anim_lib_path):
var lib: AnimationLibrary = load(anim_lib_path) as AnimationLibrary
if lib and not _model_anim_player.has_animation_library(detected_model_name):
_model_anim_player.add_animation_library(detected_model_name, lib)
print("BaseMonster: Loaded and registered ", detected_model_name, " animations library successfully.")
else:
print("BaseMonster: Animation library already present (scene-bound or already added).")
# 모델명_animations.tres 또는 모델명_anims.tres 라이브러리를 동적으로 로드하여 등록 (base_unit.gd 방식 준수)
# 단, 씬 파일에서 이미 기본 라이브러리("")로 등록된 경우 중복 등록 방지
var anim_lib_path: String = "res://assets/models/monsters/" + detected_model_name + "/" + detected_model_name + "_animations.tres"
if anim_lib_path != "":
var lib: AnimationLibrary = load(anim_lib_path) as AnimationLibrary
if lib and not _model_anim_player.has_animation_library(detected_model_name):
_model_anim_player.add_animation_library(detected_model_name, lib)
print("BaseMonster: Loaded and registered ", detected_model_name, " animations library successfully.")
else:
print("BaseMonster: Animation library already present (scene-bound or already added).")
# 초기 Idle 애니메이션 재생 시도
# 탐색 순서: 기본 라이브러리("") -> 동적 등록(모델명/) -> FBX 내장
var init_idle: String = _resolve_anim_name(_model_anim_player, detected_model_name, "Idle")
if init_idle != "":
_model_anim_player.play(init_idle)
print("BaseMonster: Playing initial Idle: ", init_idle)
# 초기 Idle 애니메이션 재생 시도
# 탐색 순서: 기본 라이브러리("") -> 동적 등록(모델명/) -> FBX 내장
var init_idle: String = _resolve_anim_name(_model_anim_player, detected_model_name, "Idle")
if init_idle != "":
_model_anim_player.play(init_idle)
print("BaseMonster: Playing initial Idle: ", init_idle)
## 몬스터 자식 메쉬에 noble_man_0.png 텍스처를 입히는 재귀 함수
func _apply_noble_man_skin(node: Node) -> void:
if node is MeshInstance3D:
......
src/entities/monsters/noble_man/noble_man_unit.tscn
View file @ 711b84d0
......@@ -13,76 +13,77 @@ script = ExtResource("1_base_monster")
transform = Transform3D(-1, 0, 1.509958e-07, 0, 1, 0, -1.509958e-07, 0, -1, 0, 0, 0)
[node name="Skeleton3D" parent="noble_man/Armature" parent_id_path=PackedInt32Array(174344433, 789802200) index="0" unique_id=1272502782]
bones/0/rotation = Quaternion(0.61798733, -0.23847091, -0.29544434, 0.68843013)
bones/0/scale = Vector3(1.1764706, 1.1764706, 1.1764708)
bones/0/position = Vector3(-0.0020419173, -0.058207292, 1.0586033)
bones/0/rotation = Quaternion(0.70190245, 0.011034894, 0.00014947543, 0.71218765)
bones/0/scale = Vector3(0.99999994, 1, 0.99999994)
bones/1/position = Vector3(0.10183821, -0.10193097, -0.0022784735)
bones/1/rotation = Quaternion(0.948611, 0.16393991, -0.13692817, 0.23347755)
bones/1/rotation = Quaternion(0.9622586, 0.06553567, -0.15610032, 0.21306369)
bones/1/scale = Vector3(1.0000077, 1, 1)
bones/2/position = Vector3(8.925652e-09, 0.417691, -5.1505884e-09)
bones/2/rotation = Quaternion(0.45852306, 0.19937582, 0.07257126, 0.8629828)
bones/2/rotation = Quaternion(0.5536645, 0.116959944, 0.057919815, 0.8224484)
bones/2/scale = Vector3(1.0000001, 1.0000004, 1.0000002)
bones/3/position = Vector3(-2.5261881e-09, 0.42174494, 7.2241504e-11)
bones/3/rotation = Quaternion(-0.58492714, -0.06132251, 0.009246678, 0.8087116)
bones/3/rotation = Quaternion(-0.45563436, -0.06292275, -0.016682481, 0.8877837)
bones/3/scale = Vector3(1, 1, 1)
bones/4/position = Vector3(1.2221635e-08, 0.13995555, 2.1287123e-08)
bones/4/rotation = Quaternion(-0.36768854, -0.001687522, 0.01695024, 0.929793)
bones/4/rotation = Quaternion(-0.37498686, 0.01245499, -0.019623883, 0.9267388)
bones/4/scale = Vector3(0.9999998, 1, 0.9999998)
bones/5/position = Vector3(-0.099749625, -0.1055433, -0.00022072843)
bones/5/rotation = Quaternion(0.97120684, -0.17415474, 0.16172291, 0.016525293)
bones/5/rotation = Quaternion(0.9903288, -0.0092331655, 0.10971114, 0.084422834)
bones/5/scale = Vector3(1.000016, 0.99999976, 1.0000005)
bones/6/position = Vector3(-2.6841812e-08, 0.4172189, 1.4898632e-08)
bones/6/rotation = Quaternion(0.41857097, -0.0034188193, -0.012350971, 0.90809375)
bones/6/rotation = Quaternion(0.24538626, -0.08616291, -0.0015821799, 0.9655875)
bones/6/scale = Vector3(1.0000001, 1, 1.0000001)
bones/7/position = Vector3(-1.1679395e-08, 0.41914502, -1.1094577e-07)
bones/7/rotation = Quaternion(-0.6098559, 0.15362522, -0.09189053, 0.7720306)
bones/7/rotation = Quaternion(-0.46878454, 0.09844392, 0.044253245, 0.87669355)
bones/7/scale = Vector3(1, 1.0000001, 1)
bones/8/position = Vector3(5.047954e-10, 0.12296724, -2.2279302e-08)
bones/8/rotation = Quaternion(-0.41545272, 0.041144814, 0.034620646, 0.9080241)
bones/8/rotation = Quaternion(-0.39594132, 0.028365131, 0.040902868, 0.9169257)
bones/8/scale = Vector3(0.9999999, 0.9999999, 0.9999999)
bones/9/position = Vector3(-0.0020885684, 0.116008654, 0.0024992328)
bones/9/rotation = Quaternion(0.057457034, 0.05244976, 0.0038327165, 0.99696195)
bones/9/rotation = Quaternion(0.043750413, -0.0020669356, 0.00819689, 0.9990068)
bones/9/scale = Vector3(0.99999994, 0.9999998, 0.99999976)
bones/10/position = Vector3(-2.2647062e-09, 0.11605439, -9.138862e-09)
bones/10/rotation = Quaternion(0.09807169, 0.08359734, -0.014605932, 0.9915544)
bones/10/rotation = Quaternion(0.018322818, -0.022007098, 0.0087936465, 0.99955124)
bones/10/scale = Vector3(1.0000001, 1.0000002, 1.0000002)
bones/11/position = Vector3(5.6057953e-16, 0.11605399, -1.8735637e-09)
bones/11/rotation = Quaternion(0.04436318, 0.07711244, -0.0016378432, 0.9960336)
bones/11/rotation = Quaternion(-0.07043908, -0.026146572, 0.008986988, 0.99713284)
bones/11/scale = Vector3(0.9999999, 1, 1)
bones/12/position = Vector3(0.042316522, 0.018807229, -0.0012655992)
bones/12/rotation = Quaternion(0.56446123, 0.5134929, -0.49502933, 0.41551715)
bones/12/rotation = Quaternion(0.6535891, 0.46662202, -0.47374266, 0.3614596)
bones/12/scale = Vector3(1.0000001, 1.0000001, 1.0000002)
bones/13/position = Vector3(1.2083032e-07, 0.1687637, -1.5166692e-07)
bones/13/rotation = Quaternion(0.50597435, 0.2815535, 0.34607968, 0.73820496)
bones/13/rotation = Quaternion(0.26553997, 0.6469928, 0.20580651, 0.6844944)
bones/13/scale = Vector3(1.0000001, 1.0000001, 1)
bones/14/position = Vector3(7.0695954e-08, 0.28124455, -4.496629e-08)
bones/14/rotation = Quaternion(-0.34847364, 0.062623285, 0.18896937, 0.91593397)
bones/14/rotation = Quaternion(-0.11034532, -0.037103236, 0.011850772, 0.99312985)
bones/14/scale = Vector3(0.99999994, 1, 1)
bones/15/position = Vector3(5.1876157e-08, 0.2978702, 1.1475281e-07)
bones/15/rotation = Quaternion(0.04238946, 0.23705958, -0.05192386, 0.96918)
bones/15/rotation = Quaternion(0.19980764, 0.12052846, 0.13753434, 0.96261835)
bones/15/scale = Vector3(1, 0.99999994, 0.99999994)
bones/16/position = Vector3(-0.042962536, 0.012112379, -0.0065097106)
bones/16/rotation = Quaternion(-0.6090661, 0.47468537, -0.4630349, -0.4350989)
bones/16/rotation = Quaternion(-0.62357396, 0.49894008, -0.49325305, -0.34484175)
bones/16/scale = Vector3(0.9999999, 1, 1)
bones/17/position = Vector3(-1.3961997e-07, 0.17218974, -1.2206406e-06)
bones/17/rotation = Quaternion(0.6119551, -0.3172246, -0.11668171, 0.715028)
bones/17/rotation = Quaternion(0.17426653, -0.6359149, -0.20773616, 0.7225573)
bones/17/scale = Vector3(1.0000001, 1, 1.0000002)
bones/18/position = Vector3(4.2020838e-07, 0.26897195, 9.862248e-08)
bones/18/rotation = Quaternion(-0.31137317, 0.04883886, -0.2067891, 0.9262288)
bones/18/rotation = Quaternion(-0.21958746, 0.040991135, -0.06345784, 0.97266346)
bones/18/scale = Vector3(0.99999994, 1, 1)
bones/19/position = Vector3(-8.227692e-08, 0.2969355, 4.939664e-09)
bones/19/rotation = Quaternion(0.1326664, -0.22648887, -0.21849182, 0.9398743)
bones/19/rotation = Quaternion(0.17809258, -0.121117584, -0.13766451, 0.9667792)
bones/19/scale = Vector3(0.99999994, 0.9999998, 0.9999998)
bones/20/position = Vector3(0.00064602116, 0.07547628, 0.007775514)
bones/20/rotation = Quaternion(0.01384508, -0.0055730203, -0.0030556368, 0.999884)
bones/20/rotation = Quaternion(0.044769283, 0.022577364, -0.0023045582, 0.99873954)
bones/20/scale = Vector3(1, 1, 0.9999998)
bones/21/position = Vector3(-2.7577591e-09, 0.07526942, -1.1876011e-07)
bones/21/rotation = Quaternion(0.18938631, 0.16970475, -0.04936101, 0.96586573)
bones/21/rotation = Quaternion(0.22196482, 0.037162263, -0.020780204, 0.9741246)
bones/21/scale = Vector3(1, 1.0000001, 1.0000002)
bones/22/position = Vector3(-3.6878883e-10, 0.30715173, -0.13331519)
bones/22/rotation = Quaternion(-0.20926115, 0.001348063, 0.001918764, 0.977857)
bones/22/rotation = Quaternion(-0.21240355, 0.00014905656, 0.00010942089, 0.9771821)
bones/22/scale = Vector3(1, 1.0000001, 1)
bones/23/position = Vector3(3.687908e-10, 0.06441903, 0.13331476)
bones/23/rotation = Quaternion(0.53147227, 2.0621675e-07, -3.5311455e-08, 0.84707576)
bones/23/rotation = Quaternion(0.53147167, -6.369973e-08, -3.7991345e-08, 0.8470761)
bones/23/scale = Vector3(1, 1, 1.0000001)
[node name="MonsterArea" type="Area3D" parent="." unique_id=2000374352]
......
src/entities/monsters/zombie/zombie.tscn
View file @ 711b84d0
[gd_scene format=3]
[gd_scene format=3 uid="uid://ch8ds0n1bimx6"]
[ext_resource type="PackedScene" path="res://assets/models/monsters/zombie/zombie.fbx" id="1_fbx"]
[ext_resource type="AnimationLibrary" path="res://assets/models/monsters/zombie/zombie_animations.tres" id="2_anims"]
[ext_resource type="PackedScene" uid="uid://ccymf4oxw0n0o" path="res://assets/models/monsters/zombie/zombie.fbx" id="1_fbx"]
[ext_resource type="AnimationLibrary" uid="uid://dnyohfjpm84gs" path="res://assets/models/monsters/zombie/zombie_animations.tres" id="2_anims"]
[node name="zombie" instance=ExtResource("1_fbx")]
[node name="zombie" unique_id=809616895 instance=ExtResource("1_fbx")]
transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 0, 0)
[node name="AnimationPlayer" parent="." index="1"]
[node name="Skeleton3D" parent="Armature" parent_id_path=PackedInt32Array(1699210079) index="0" unique_id=1977283259]
bones/0/rotation = Quaternion(-0.32995245, 0.9391624, -0.09340268, -0.019529166)
bones/1/rotation = Quaternion(0.24882443, -0.54715633, -0.74767166, 0.28230026)
bones/2/rotation = Quaternion(0.22047514, 0.030673672, 0.023949342, 0.97461605)
bones/3/rotation = Quaternion(-0.38056934, -0.08306531, 0.023537284, 0.92071337)
bones/4/rotation = Quaternion(-0.4256098, -0.03850022, 0.045898147, 0.9029217)
bones/5/rotation = Quaternion(0.45339924, -0.42783907, -0.18902218, 0.7587184)
bones/6/rotation = Quaternion(0.20578255, -0.020173991, -0.011069942, 0.9783272)
bones/7/rotation = Quaternion(-0.47572345, 0.05599902, -0.09235138, 0.8729391)
bones/8/rotation = Quaternion(-0.40007043, 0.12373425, -0.039265968, 0.9072441)
bones/9/rotation = Quaternion(0.54769963, -0.3912539, 0.52867925, -0.51714957)
bones/10/rotation = Quaternion(0.07686116, 0.051961396, -0.0332967, 0.99513)
bones/11/rotation = Quaternion(0.010916772, -0.0006740055, -0.001780278, 0.9999386)
bones/12/rotation = Quaternion(0.5353334, 0.49094963, -0.34389165, 0.59508413)
bones/13/rotation = Quaternion(0.57996154, 0.042384986, -0.01868528, 0.8133259)
bones/14/rotation = Quaternion(-0.08390438, -0.09260649, 0.09156661, 0.98792696)
bones/15/rotation = Quaternion(0.14896756, 0.14028943, 0.059353665, 0.97703874)
bones/16/rotation = Quaternion(-0.5830522, 0.4495743, -0.36095113, -0.57240486)
bones/17/rotation = Quaternion(0.59526765, -0.039462034, 0.06776076, 0.79969233)
bones/18/rotation = Quaternion(-0.11385509, 0.11712405, -0.14280517, 0.9761791)
bones/19/rotation = Quaternion(-0.10965045, -0.5241241, -0.052751657, 0.84290457)
bones/20/rotation = Quaternion(0.020016624, 0.058039248, -0.023137912, 0.9978454)
bones/21/rotation = Quaternion(0.37782803, 0.12389757, -0.054608464, 0.9159221)
bones/22/rotation = Quaternion(-0.22971876, 3.971189e-08, -2.2487455e-08, 0.97325706)
bones/23/rotation = Quaternion(0.4136424, 1.0740841e-08, -5.7795948e-08, 0.91043943)
[node name="AnimationPlayer" parent="." index="1" unique_id=976025929]
libraries/ = ExtResource("2_anims")
src/entities/monsters/zombie/zombie_unit.tscn
View file @ 711b84d0
......@@ -11,6 +11,33 @@ script = ExtResource("1_base_monster")
[node name="zombie" parent="." unique_id=1315610678 instance=ExtResource("2_zombie")]
[node name="Skeleton3D" parent="zombie/Armature" parent_id_path=PackedInt32Array(1315610678, 1699210079) index="0" unique_id=1977283259]
bones/0/position = Vector3(0.009092478, 0.007782309, 0.8779003)
bones/0/rotation = Quaternion(-0.7846364, 0.604534, 0.027323367, 0.13467711)
bones/1/rotation = Quaternion(0.5109386, -0.529391, -0.5216251, 0.4319656)
bones/2/rotation = Quaternion(0.29439843, 0.026800731, 0.0183152, 0.9551314)
bones/3/rotation = Quaternion(-0.55084777, -0.08476266, 0.05868345, 0.82821393)
bones/4/rotation = Quaternion(-0.4978842, -0.0740358, 0.011037838, 0.86400706)
bones/5/rotation = Quaternion(0.308828, -0.31872505, -0.48996845, 0.7503137)
bones/6/rotation = Quaternion(0.46481228, -0.0045772674, 0.009375723, 0.8853478)
bones/7/rotation = Quaternion(-0.6152842, 0.14162558, -0.038143653, 0.7745403)
bones/8/rotation = Quaternion(-0.42210245, 0.07081132, 0.018737432, 0.90358406)
bones/9/rotation = Quaternion(0.6135895, -0.42441246, 0.4345755, -0.5045059)
bones/10/rotation = Quaternion(0.10215619, -0.032394588, 0.039824206, 0.9934429)
bones/11/rotation = Quaternion(0.009655368, -0.003393737, 0.005691154, 0.99993145)
bones/12/rotation = Quaternion(0.5727163, 0.47593898, -0.43085018, 0.50975126)
bones/13/rotation = Quaternion(0.44158056, 0.11991854, 0.16676167, 0.87339383)
bones/14/rotation = Quaternion(-0.08859871, -0.10876265, 0.17473589, 0.97457093)
bones/15/rotation = Quaternion(0.13107362, -0.006029836, -0.007100263, 0.9913289)
bones/16/rotation = Quaternion(-0.6146511, 0.43012804, -0.47462955, -0.46034846)
bones/17/rotation = Quaternion(0.44191, -0.18611735, -0.026173297, 0.87714934)
bones/18/rotation = Quaternion(-0.09152097, 0.0664298, 0.12363362, 0.98586303)
bones/19/rotation = Quaternion(0.17951933, -0.14812593, -0.10072649, 0.9673086)
bones/20/rotation = Quaternion(-0.17166202, 0.002392136, 0.046115115, 0.9840731)
bones/21/rotation = Quaternion(0.4208445, 0.03682069, 0.0015583516, 0.9063839)
bones/22/rotation = Quaternion(-0.22971876, 4.784574e-10, 1.7463663e-08, 0.97325706)
bones/23/rotation = Quaternion(0.4136424, 1.0229373e-08, -2.4550491e-08, 0.91043943)
[node name="MonsterArea" type="Area3D" parent="." unique_id=1682849627]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment