From bebe2a5523a952582ac65351dc733f41c530ae4e Mon Sep 17 00:00:00 2001 From: lightyears Date: Mon, 20 Feb 2023 11:19:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=203D=20=E5=BC=95=E6=93=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Entities/Characters.cs | 7 ++++ {Entities => Models}/BattleCharacter.cs | 0 {Entities => Models}/BattleCharacter.tscn | 4 +- {Entities => Models}/BattleField.cs | 0 {Entities => Models}/BattleFieldPosition.cs | 0 {Entities => Models}/Character.cs | 8 +--- Scenes/BattleScene.cs | 2 +- Scenes/BattleScene.tscn | 44 ++++++++++++++++----- 8 files changed, 45 insertions(+), 20 deletions(-) create mode 100644 Entities/Characters.cs rename {Entities => Models}/BattleCharacter.cs (100%) rename {Entities => Models}/BattleCharacter.tscn (86%) rename {Entities => Models}/BattleField.cs (100%) rename {Entities => Models}/BattleFieldPosition.cs (100%) rename {Entities => Models}/Character.cs (62%) diff --git a/Entities/Characters.cs b/Entities/Characters.cs new file mode 100644 index 0000000..0f4348c --- /dev/null +++ b/Entities/Characters.cs @@ -0,0 +1,7 @@ +namespace CMSGame +{ + public class Characters + { + + } +} diff --git a/Entities/BattleCharacter.cs b/Models/BattleCharacter.cs similarity index 100% rename from Entities/BattleCharacter.cs rename to Models/BattleCharacter.cs diff --git a/Entities/BattleCharacter.tscn b/Models/BattleCharacter.tscn similarity index 86% rename from Entities/BattleCharacter.tscn rename to Models/BattleCharacter.tscn index a5764b0..125bf25 100644 --- a/Entities/BattleCharacter.tscn +++ b/Models/BattleCharacter.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=3 format=3 uid="uid://d08cohfp183wp"] +[gd_scene load_steps=3 format=3] [ext_resource type="Texture2D" uid="uid://cnilysgmgw8n4" path="res://Temp/Characters/1_19.png" id="1_o3tjt"] -[ext_resource type="Script" path="res://Entities/BattleCharacter.cs" id="2_vbdi8"] +[ext_resource type="Script" path="res://Models/BattleCharacter.cs" id="2_vbdi8"] [node name="BattleCharacter" type="Node2D"] script = ExtResource("2_vbdi8") diff --git a/Entities/BattleField.cs b/Models/BattleField.cs similarity index 100% rename from Entities/BattleField.cs rename to Models/BattleField.cs diff --git a/Entities/BattleFieldPosition.cs b/Models/BattleFieldPosition.cs similarity index 100% rename from Entities/BattleFieldPosition.cs rename to Models/BattleFieldPosition.cs diff --git a/Entities/Character.cs b/Models/Character.cs similarity index 62% rename from Entities/Character.cs rename to Models/Character.cs index e31ae9e..303de73 100644 --- a/Entities/Character.cs +++ b/Models/Character.cs @@ -2,13 +2,7 @@ namespace CMSGame { public partial class Character : Node { - private int _hp; - - public int Hp - { - get => _hp; - set => _hp = value; - } + public int HP; public override void _Ready() { diff --git a/Scenes/BattleScene.cs b/Scenes/BattleScene.cs index 57eff22..2d0428c 100644 --- a/Scenes/BattleScene.cs +++ b/Scenes/BattleScene.cs @@ -1,6 +1,6 @@ namespace CMSGame { - public partial class BattleScene : Node2D + public partial class BattleScene : Node3D { public Label BattleTimeLabel; diff --git a/Scenes/BattleScene.tscn b/Scenes/BattleScene.tscn index d73b1a6..c505b49 100644 --- a/Scenes/BattleScene.tscn +++ b/Scenes/BattleScene.tscn @@ -1,19 +1,37 @@ -[gd_scene load_steps=2 format=3 uid="uid://cx6yq8awwkqv3"] +[gd_scene load_steps=6 format=3 uid="uid://cx6yq8awwkqv3"] [ext_resource type="Script" path="res://Scenes/BattleScene.cs" id="1_n6bn7"] -[node name="BattleScene" type="Node2D"] +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_vrgig"] +sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) +ground_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) + +[sub_resource type="Sky" id="Sky_26whx"] +sky_material = SubResource("ProceduralSkyMaterial_vrgig") + +[sub_resource type="Environment" id="Environment_hv4sx"] +background_mode = 2 +sky = SubResource("Sky_26whx") +tonemap_mode = 2 +glow_enabled = true + +[sub_resource type="BoxMesh" id="BoxMesh_7g2up"] + +[node name="BattleScene" type="Node3D"] script = ExtResource("1_n6bn7") -[node name="Camera2D" type="Camera2D" parent="."] +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_hv4sx") -[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="Camera2D"] +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 0.93328, 0.35915, 0, -0.35915, 0.93328, 0, 1.08667, 0) -[node name="Characters" type="Node2D" parent="."] +[node name="Camera3D" type="Camera3D" parent="."] +transform = Transform3D(0.944216, -0.122152, 0.305836, 0, 0.928667, 0.370914, -0.329328, -0.350223, 0.876862, 1.24593, 0.913904, 0) -[node name="CanvasLayer" type="CanvasLayer" parent="."] +[node name="CanvasLayer" type="CanvasLayer" parent="Camera3D"] -[node name="HUD" type="Control" parent="CanvasLayer"] +[node name="HUD" type="Control" parent="Camera3D/CanvasLayer"] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -21,7 +39,7 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -[node name="BattleTimeLabel" type="Label" parent="CanvasLayer/HUD"] +[node name="BattleTimeLabel" type="Label" parent="Camera3D/CanvasLayer/HUD"] unique_name_in_owner = true layout_mode = 1 offset_right = 41.0 @@ -29,7 +47,7 @@ offset_bottom = 26.0 text = "00:00" metadata/_edit_use_anchors_ = true -[node name="PauseBattleButton" type="Button" parent="CanvasLayer/HUD"] +[node name="PauseBattleButton" type="Button" parent="Camera3D/CanvasLayer/HUD"] layout_mode = 1 anchors_preset = 7 anchor_left = 0.5 @@ -44,4 +62,10 @@ grow_vertical = 0 focus_mode = 0 text = "按下 Space 暂停时间" -[connection signal="pressed" from="CanvasLayer/HUD/PauseBattleButton" to="." method="On_PauseBattleButton_Pressed"] +[node name="Characters" type="Node3D" parent="."] + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Characters"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.36628) +mesh = SubResource("BoxMesh_7g2up") + +[connection signal="pressed" from="Camera3D/CanvasLayer/HUD/PauseBattleButton" to="." method="On_PauseBattleButton_Pressed"]