diff --git a/DungeonShooting_Godot/excel/ActivityBase.xlsx b/DungeonShooting_Godot/excel/ActivityBase.xlsx index db6ed7f..0eec9a2 100644 --- a/DungeonShooting_Godot/excel/ActivityBase.xlsx +++ b/DungeonShooting_Godot/excel/ActivityBase.xlsx Binary files differ diff --git a/DungeonShooting_Godot/prefab/item/Item0026.tscn b/DungeonShooting_Godot/prefab/item/Item0026.tscn new file mode 100644 index 0000000..d3b0e2c --- /dev/null +++ b/DungeonShooting_Godot/prefab/item/Item0026.tscn @@ -0,0 +1,64 @@ +[gd_scene load_steps=8 format=3 uid="uid://fxxcimm100wh"] + +[ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_0hlhe"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_43i86"] +[ext_resource type="Texture2D" uid="uid://bigva5som5fy5" path="res://resource/sprite/item/hall_a/Slice_14.png" id="3_qrjxc"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] +resource_local_to_scene = true +shader = ExtResource("2_43i86") +shader_parameter/blend = Color(0, 0, 0, 0.470588) +shader_parameter/schedule = 1.0 +shader_parameter/modulate = Color(1, 1, 1, 1) +shader_parameter/show_outline = true +shader_parameter/outline_color = Color(0, 0, 0, 1) +shader_parameter/outline_rainbow = false +shader_parameter/outline_use_blend = true +shader_parameter/grey = 0.0 + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_f7tsa"] +resource_local_to_scene = true +shader = ExtResource("2_43i86") +shader_parameter/blend = Color(1, 1, 1, 1) +shader_parameter/schedule = 0.0 +shader_parameter/modulate = Color(1, 1, 1, 1) +shader_parameter/show_outline = false +shader_parameter/outline_color = Color(0, 0, 0, 1) +shader_parameter/outline_rainbow = false +shader_parameter/outline_use_blend = true +shader_parameter/grey = 0.0 + +[sub_resource type="SpriteFrames" id="SpriteFrames_uqva1"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("3_qrjxc") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_kmpvc"] +size = Vector2(20, 11) + +[node name="Item0025" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")] +collision_layer = 512 +collision_mask = 0 +script = ExtResource("1_0hlhe") +ShadowSprite = NodePath("ShadowSprite") +AnimatedSprite = NodePath("AnimatedSprite") +Collision = NodePath("Collision") + +[node name="ShadowSprite" type="Sprite2D" parent="."] +z_index = -1 +material = SubResource("ShaderMaterial_wh4b7") + +[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] +material = SubResource("ShaderMaterial_f7tsa") +position = Vector2(0, -4) +sprite_frames = SubResource("SpriteFrames_uqva1") + +[node name="Collision" type="CollisionShape2D" parent="."] +position = Vector2(0, 4.5) +shape = SubResource("RectangleShape2D_kmpvc") diff --git a/DungeonShooting_Godot/resource/config/ActivityBase.json b/DungeonShooting_Godot/resource/config/ActivityBase.json index 5e19199..864f66b 100644 --- a/DungeonShooting_Godot/resource/config/ActivityBase.json +++ b/DungeonShooting_Godot/resource/config/ActivityBase.json @@ -1134,6 +1134,20 @@ "ShowInMapEditor": false }, { + "Id": "item_0026", + "Type": 99, + "Name": "\u544A\u793A\u7248", + "Quality": 0, + "Price": 0, + "Intro": "", + "Details": "", + "IsStatic": true, + "__Material": "", + "Prefab": "res://prefab/item/Item0026.tscn", + "Icon": "", + "ShowInMapEditor": false + }, + { "Id": "item_0031", "Type": 99, "Name": "\u53F0\u706F", diff --git a/DungeonShooting_Godot/resource/sprite/item/hall_a/Slice_14.png b/DungeonShooting_Godot/resource/sprite/item/hall_a/Slice_14.png index e126f19..9593dbc 100644 --- a/DungeonShooting_Godot/resource/sprite/item/hall_a/Slice_14.png +++ b/DungeonShooting_Godot/resource/sprite/item/hall_a/Slice_14.png Binary files differ diff --git a/DungeonShooting_Godot/scene/Hall.tscn b/DungeonShooting_Godot/scene/Hall.tscn index 2a0c5db..7119221 100644 --- a/DungeonShooting_Godot/scene/Hall.tscn +++ b/DungeonShooting_Godot/scene/Hall.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=42 format=3 uid="uid://c2hynqudkykxl"] +[gd_scene load_steps=43 format=3 uid="uid://c2hynqudkykxl"] -[ext_resource type="PackedScene" path="res://scene/Dungeon.tscn" id="1_31od0"] +[ext_resource type="PackedScene" uid="uid://bqf2vks5ggnsp" path="res://scene/Dungeon.tscn" id="1_31od0"] [ext_resource type="Script" path="res://src/game/hall/Hall.cs" id="2_43fdu"] [ext_resource type="Texture2D" uid="uid://b2j5mkqm3uv6w" path="res://resource/sprite/tile/HallBg.png" id="3_0g5wq"] [ext_resource type="Script" path="res://src/game/hall/DungeonEntrance.cs" id="3_t3my6"] @@ -35,6 +35,7 @@ [ext_resource type="Texture2D" uid="uid://cym4h4qndqmxl" path="res://resource/sprite/item/hall_c/item _16.png" id="28_1l3ls"] [ext_resource type="Texture2D" uid="uid://c5aieljuvuhld" path="res://resource/sprite/item/hall_c/item _59.png" id="29_4dx8t"] [ext_resource type="Texture2D" uid="uid://bgrroshvf4iyu" path="res://resource/sprite/item/hall_c/item _23.png" id="30_vfhiv"] +[ext_resource type="Texture2D" uid="uid://du12pb6w1c1n3" path="res://resource/sprite/item/hall_c/item _03.png" id="36_knh8x"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_ru8u4"] size = Vector2(19, 10) @@ -218,7 +219,7 @@ CollisionVisible = false [node name="Weapon" type="Node2D" parent="ItemRoot" index="7"] -position = Vector2(251, 306) +position = Vector2(346, 267) script = ExtResource("5_lowqi") Id = "weapon0002" CollisionVisible = false @@ -293,6 +294,18 @@ Id = "item_0009" DefaultLayer = 1 +[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0009" index="1"] +position = Vector2(-24, -10) +texture = ExtResource("15_h7524") + +[node name="Sprite2D2" type="Sprite2D" parent="ItemRoot/Item0009" index="2"] +position = Vector2(1, -10) +texture = ExtResource("15_h7524") + +[node name="Sprite2D3" type="Sprite2D" parent="ItemRoot/Item0009" index="3"] +position = Vector2(37, -10) +texture = ExtResource("15_h7524") + [node name="Item0010" type="Node2D" parent="ItemRoot" index="17"] position = Vector2(178, 235) script = ExtResource("5_lowqi") @@ -406,6 +419,12 @@ Id = "item_0056" DefaultLayer = 1 +[node name="Item0026" type="Node2D" parent="ItemRoot" index="34"] +position = Vector2(327, 234) +script = ExtResource("5_lowqi") +Id = "item_0026" +DefaultLayer = 1 + [node name="Item05" type="Sprite2D" parent="." index="7"] z_index = -4 position = Vector2(859, 383) @@ -473,3 +492,7 @@ [node name="Item23" type="Sprite2D" parent="." index="22"] position = Vector2(890, 402) texture = ExtResource("30_vfhiv") + +[node name="Item03" type="Sprite2D" parent="." index="23"] +position = Vector2(906, 159) +texture = ExtResource("36_knh8x") diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs index 41742d8..bbeec0f 100644 --- a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs +++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs @@ -414,6 +414,11 @@ /// public const string Id_item_0025 = "item_0025"; /// + /// 名称: 告示版
+ /// 简介: + ///
+ public const string Id_item_0026 = "item_0026"; + /// /// 名称: 台灯
/// 简介: ///