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/prefab/ui/RoomUI.tscn b/DungeonShooting_Godot/prefab/ui/RoomUI.tscn index 8a8bc45..e0a86af 100644 --- a/DungeonShooting_Godot/prefab/ui/RoomUI.tscn +++ b/DungeonShooting_Godot/prefab/ui/RoomUI.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=22 format=3 uid="uid://bvpmtfupny8iu"] +[gd_scene load_steps=23 format=3 uid="uid://bvpmtfupny8iu"] [ext_resource type="Script" path="res://src/game/ui/roomUI/RoomUIPanel.cs" id="1_tfcrp"] [ext_resource type="Texture2D" uid="uid://b67i86mtqrn32" path="res://resource/sprite/ui/roomUI/icon_bullet.png" id="2_ruc0p"] @@ -17,6 +17,7 @@ [ext_resource type="Texture2D" uid="uid://dwysndc5ffski" path="res://resource/sprite/ui/roomUI/ChargeProgressBar.png" id="13_6w7qi"] [ext_resource type="Texture2D" uid="uid://ck0w7at3oat5" path="res://resource/sprite/ui/roomUI/ChargeProgress.png" id="13_vuglj"] [ext_resource type="PackedScene" uid="uid://bmj3p25gwpqpn" path="res://prefab/ui/RoomMap.tscn" id="16_rp3sg"] +[ext_resource type="PackedScene" uid="uid://dbjpknb3d5gfw" path="res://prefab/ui/WeaponRoulette.tscn" id="17_ydc4r"] [sub_resource type="Gradient" id="1"] colors = PackedColorArray(0.4, 0.498039, 1, 1, 0.4, 0.498039, 1, 0.313726) @@ -364,6 +365,10 @@ horizontal_alignment = 2 vertical_alignment = 1 +[node name="WeaponRoulette" parent="." instance=ExtResource("17_ydc4r")] +layout_mode = 1 +metadata/_edit_lock_ = true + [node name="RoomMap" parent="." instance=ExtResource("16_rp3sg")] layout_mode = 1 metadata/_edit_lock_ = true diff --git a/DungeonShooting_Godot/prefab/ui/WeaponRoulette.tscn b/DungeonShooting_Godot/prefab/ui/WeaponRoulette.tscn new file mode 100644 index 0000000..8850c5a --- /dev/null +++ b/DungeonShooting_Godot/prefab/ui/WeaponRoulette.tscn @@ -0,0 +1,97 @@ +[gd_scene load_steps=7 format=3 uid="uid://dbjpknb3d5gfw"] + +[ext_resource type="Script" path="res://src/game/ui/weaponRoulette/WeaponRoulettePanel.cs" id="1_1uvbk"] +[ext_resource type="Texture2D" uid="uid://e6krxgte01j3" path="res://resource/sprite/ui/roulette/RouletteBg.png" id="2_k6gjh"] +[ext_resource type="Script" path="res://src/game/ui/weaponRoulette/WeaponSlot.cs" id="3_8v011"] +[ext_resource type="Shader" path="res://resource/material/Outline.gdshader" id="4_p348k"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_i1wmw"] +resource_local_to_scene = true +shader = ExtResource("4_p348k") +shader_parameter/outline_color = Color(0, 0, 0, 1) + +[sub_resource type="CircleShape2D" id="CircleShape2D_snfa8"] +radius = 2.0 + +[node name="WeaponRoulette" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +script = ExtResource("1_1uvbk") + +[node name="Bg" type="ColorRect" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +color = Color(0, 0, 0, 0.588235) + +[node name="Control" type="Control" parent="."] +layout_mode = 1 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -0.5 +offset_top = -20.0 +offset_right = 0.5 +offset_bottom = -19.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="RouletteBg" type="Sprite2D" parent="Control"] +position = Vector2(32.5, -27) +scale = Vector2(4, 4) +texture = ExtResource("2_k6gjh") + +[node name="WeaponSlotNode" type="Node2D" parent="Control/RouletteBg"] +script = ExtResource("3_8v011") + +[node name="Control" type="Control" parent="Control/RouletteBg/WeaponSlotNode"] +layout_mode = 3 +anchors_preset = 0 +offset_left = 65.25 +offset_right = 66.25 +offset_bottom = 1.0 + +[node name="WeaponIcon" type="Sprite2D" parent="Control/RouletteBg/WeaponSlotNode/Control"] +material = SubResource("ShaderMaterial_i1wmw") + +[node name="AmmoLabel" type="Label" parent="Control/RouletteBg/WeaponSlotNode/Control"] +layout_mode = 1 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -15.25 +offset_top = 4.5 +offset_right = 104.75 +offset_bottom = 44.5 +grow_horizontal = 2 +grow_vertical = 2 +scale = Vector2(0.25, 0.25) +text = "0/0" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="SlotAreaNode" type="Area2D" parent="Control/RouletteBg/WeaponSlotNode"] +collision_layer = 0 +collision_mask = 8192 +monitorable = false + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Control/RouletteBg/WeaponSlotNode/SlotAreaNode"] + +[node name="MouseArea" type="Area2D" parent="."] +collision_layer = 8192 +collision_mask = 0 +monitoring = false + +[node name="CollisionShape2D" type="CollisionShape2D" parent="MouseArea"] +shape = SubResource("CircleShape2D_snfa8") diff --git a/DungeonShooting_Godot/project.godot b/DungeonShooting_Godot/project.godot index 340b52c..7c6559c 100644 --- a/DungeonShooting_Godot/project.godot +++ b/DungeonShooting_Godot/project.godot @@ -234,6 +234,11 @@ "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":2,"position":Vector2(304, 18),"global_position":Vector2(308, 59),"factor":1.0,"button_index":2,"canceled":false,"pressed":true,"double_click":false,"script":null) ] } +roulette={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194306,"key_label":0,"unicode":0,"echo":false,"script":null) +] +} [layer_names] @@ -247,6 +252,7 @@ 2d_physics/layer_8="debris" 2d_physics/layer_9="throwing" 2d_physics/layer_10="obstacle" +2d_physics/layer_14="ui_mouse" [mono] 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/Light.png b/DungeonShooting_Godot/resource/sprite/Light.png new file mode 100644 index 0000000..e5d1fcd --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/Light.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/Light.png.import b/DungeonShooting_Godot/resource/sprite/Light.png.import new file mode 100644 index 0000000..22630da --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/Light.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d0c6oc02hkp4i" +path="res://.godot/imported/Light.png-9ee16c293926cdacc658fb283472a574.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/Light.png" +dest_files=["res://.godot/imported/Light.png-9ee16c293926cdacc658fb283472a574.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 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/resource/sprite/item/hall_b/chuanlian.png b/DungeonShooting_Godot/resource/sprite/item/hall_b/chuanlian.png index c052bb3..3ee24a1 100644 --- a/DungeonShooting_Godot/resource/sprite/item/hall_b/chuanlian.png +++ b/DungeonShooting_Godot/resource/sprite/item/hall_b/chuanlian.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/item/hall_b/huatan.png b/DungeonShooting_Godot/resource/sprite/item/hall_b/huatan.png index 5c1efe0..c7f687e 100644 --- a/DungeonShooting_Godot/resource/sprite/item/hall_b/huatan.png +++ b/DungeonShooting_Godot/resource/sprite/item/hall_b/huatan.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/item/hall_c/item _01.png b/DungeonShooting_Godot/resource/sprite/item/hall_c/item _01.png index 0ef9a58..3743732 100644 --- a/DungeonShooting_Godot/resource/sprite/item/hall_c/item _01.png +++ b/DungeonShooting_Godot/resource/sprite/item/hall_c/item _01.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/item/hall_c/item _36.png b/DungeonShooting_Godot/resource/sprite/item/hall_c/item _36.png index e986f8f..8cf4d6c 100644 --- a/DungeonShooting_Godot/resource/sprite/item/hall_c/item _36.png +++ b/DungeonShooting_Godot/resource/sprite/item/hall_c/item _36.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/ui/roulette/RouletteBg.png b/DungeonShooting_Godot/resource/sprite/ui/roulette/RouletteBg.png new file mode 100644 index 0000000..3518e20 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/ui/roulette/RouletteBg.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/ui/roulette/RouletteBg.png.import b/DungeonShooting_Godot/resource/sprite/ui/roulette/RouletteBg.png.import new file mode 100644 index 0000000..91d39df --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/ui/roulette/RouletteBg.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://e6krxgte01j3" +path="res://.godot/imported/RouletteBg.png-a8e0ab7b49cd64da4b7f4e5bab210d71.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/ui/roulette/RouletteBg.png" +dest_files=["res://.godot/imported/RouletteBg.png-a8e0ab7b49cd64da4b7f4e5bab210d71.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/DungeonShooting_Godot/scene/Hall.tscn b/DungeonShooting_Godot/scene/Hall.tscn index 6f11da4..74d77e5 100644 --- a/DungeonShooting_Godot/scene/Hall.tscn +++ b/DungeonShooting_Godot/scene/Hall.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=39 format=3 uid="uid://c2hynqudkykxl"] +[gd_scene load_steps=44 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"] @@ -16,6 +16,8 @@ [ext_resource type="Texture2D" uid="uid://dwstu11dix0nq" path="res://resource/sprite/item/hall_b/zhishi.png" id="12_agfji"] [ext_resource type="Texture2D" uid="uid://idax7j3m365m" path="res://resource/sprite/item/hall_b/ditan.png" id="13_swsmq"] [ext_resource type="Texture2D" uid="uid://d08oi1tvpcd3p" path="res://resource/sprite/item/hall_b/yuguang.png" id="13_unnpl"] +[ext_resource type="Shader" path="res://resource/material/GodRays.gdshader" id="14_8vfgi"] +[ext_resource type="Texture2D" uid="uid://uhhfgdhpk7i4" path="res://icon.png" id="15_1xqxd"] [ext_resource type="Texture2D" uid="uid://iqj44lyknjr2" path="res://resource/sprite/item/hall_a/Slice_04.png" id="15_h7524"] [ext_resource type="Texture2D" uid="uid://cwn5vf7flupa1" path="res://resource/sprite/item/hall_a/Slice_41.png" id="16_hx0q7"] [ext_resource type="Texture2D" uid="uid://bm8xcx73s83ku" path="res://resource/sprite/item/hall_a/Slice_47.png" id="16_xj0e1"] @@ -33,9 +35,11 @@ [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"] +[ext_resource type="Texture2D" uid="uid://b7dxbpdj5hdmd" path="res://resource/sprite/item/hall_c/item _01.png" id="37_5rb67"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_ru8u4"] -size = Vector2(66, 32) +size = Vector2(19, 10) [sub_resource type="RectangleShape2D" id="RectangleShape2D_l0mok"] size = Vector2(91, 434) @@ -49,6 +53,22 @@ [sub_resource type="RectangleShape2D" id="RectangleShape2D_o0n0h"] size = Vector2(1023, 110) +[sub_resource type="ShaderMaterial" id="ShaderMaterial_i7git"] +shader = ExtResource("14_8vfgi") +shader_parameter/angle = 0.25 +shader_parameter/position = 0.2 +shader_parameter/spread = 0.5 +shader_parameter/cutoff = 0.1 +shader_parameter/falloff = 1.0 +shader_parameter/edge_fade = 0.247 +shader_parameter/speed = 4.0 +shader_parameter/ray1_density = 8.0 +shader_parameter/ray2_density = 30.0 +shader_parameter/ray2_intensity = 0.3 +shader_parameter/color = Color(1, 0.9, 0.65, 0.8) +shader_parameter/hdr = false +shader_parameter/seed = 5.0 + [node name="Hall" node_paths=PackedStringArray("BirthMark", "BgSprite") instance=ExtResource("1_31od0")] script = ExtResource("2_43fdu") BirthMark = NodePath("BirthMark") @@ -72,17 +92,20 @@ position = Vector2(536, 310) [node name="DungeonEntrance" type="Area2D" parent="." index="4"] -z_index = 1 -position = Vector2(537, 209) +z_index = 15 +position = Vector2(461, 209) collision_layer = 0 collision_mask = 8 monitorable = false script = ExtResource("3_t3my6") [node name="CollisionShape2D" type="CollisionShape2D" parent="DungeonEntrance" index="0"] +visible = false +position = Vector2(0.5, 0) shape = SubResource("RectangleShape2D_ru8u4") [node name="StaticBody2D" type="StaticBody2D" parent="." index="5"] +visible = false collision_mask = 0 [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D" index="0"] @@ -125,7 +148,7 @@ ShowOffset = Vector2(2.08165e-12, 2) CollisionVisible = false -[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0006" index="1"] +[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0006" index="0"] position = Vector2(-10, -7) texture = ExtResource("7_30qwa") @@ -137,7 +160,7 @@ ShowOffset = Vector2(2.08165e-12, 2) CollisionVisible = false -[node name="ActivityInstance" type="Node2D" parent="ItemRoot/Item0008" index="1"] +[node name="ActivityInstance" type="Node2D" parent="ItemRoot/Item0008" index="0"] position = Vector2(2.5, -12) script = ExtResource("5_lowqi") Id = "item_0031" @@ -153,7 +176,7 @@ ShowOffset = Vector2(2.08165e-12, 2) CollisionVisible = false -[node name="Item26" type="Sprite2D" parent="ItemRoot/Item0013" index="1"] +[node name="Item26" type="Sprite2D" parent="ItemRoot/Item0013" index="0"] position = Vector2(18, -2) texture = ExtResource("8_61dkg") @@ -173,19 +196,19 @@ ShowOffset = Vector2(2.08165e-12, 2) CollisionVisible = false -[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0017" index="1"] +[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0017" index="0"] position = Vector2(-3, -16) texture = ExtResource("8_u3vry") -[node name="Sprite2D2" type="Sprite2D" parent="ItemRoot/Item0017" index="2"] +[node name="Sprite2D2" type="Sprite2D" parent="ItemRoot/Item0017" index="1"] position = Vector2(18, -11) texture = ExtResource("9_lhdr8") -[node name="Sprite2D3" type="Sprite2D" parent="ItemRoot/Item0017" index="3"] +[node name="Sprite2D3" type="Sprite2D" parent="ItemRoot/Item0017" index="2"] position = Vector2(-16, -8) texture = ExtResource("10_4eqn0") -[node name="Sprite2D4" type="Sprite2D" parent="ItemRoot/Item0017" index="4"] +[node name="Sprite2D4" type="Sprite2D" parent="ItemRoot/Item0017" index="3"] position = Vector2(10, -7) texture = ExtResource("11_tg3jo") @@ -198,7 +221,7 @@ CollisionVisible = false [node name="Weapon" type="Node2D" parent="ItemRoot" index="7"] -position = Vector2(252, 302) +position = Vector2(346, 267) script = ExtResource("5_lowqi") Id = "weapon0002" CollisionVisible = false @@ -217,10 +240,16 @@ DefaultLayer = 1 CollisionVisible = false -[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0002" index="1"] +[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0002" index="0"] position = Vector2(32, -2) texture = ExtResource("12_agfji") +[node name="Sprite2D2" type="Sprite2D" parent="ItemRoot/Item0002" index="1"] +material = SubResource("ShaderMaterial_i7git") +position = Vector2(0, -18) +scale = Vector2(1, -1) +texture = ExtResource("15_1xqxd") + [node name="Item0003" type="Node2D" parent="ItemRoot" index="10"] position = Vector2(600, 211) script = ExtResource("5_lowqi") @@ -233,7 +262,7 @@ Id = "item_0004" DefaultLayer = 1 -[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0004" index="1"] +[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0004" index="0"] position = Vector2(0, -17) texture = ExtResource("13_unnpl") @@ -244,7 +273,7 @@ DefaultLayer = 1 [node name="Item0036" type="Node2D" parent="ItemRoot" index="13"] -position = Vector2(941, 313) +position = Vector2(946, 314) script = ExtResource("5_lowqi") Id = "item_0036" DefaultLayer = 1 @@ -267,6 +296,18 @@ Id = "item_0009" DefaultLayer = 1 +[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0009" index="0"] +position = Vector2(-24, -10) +texture = ExtResource("15_h7524") + +[node name="Sprite2D2" type="Sprite2D" parent="ItemRoot/Item0009" index="1"] +position = Vector2(1, -10) +texture = ExtResource("15_h7524") + +[node name="Sprite2D3" type="Sprite2D" parent="ItemRoot/Item0009" index="2"] +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") @@ -297,7 +338,7 @@ Id = "item_0015" DefaultLayer = 1 -[node name="Slice04" type="Sprite2D" parent="ItemRoot/Item0015" index="1"] +[node name="Slice04" type="Sprite2D" parent="ItemRoot/Item0015" index="0"] position = Vector2(16, -9) texture = ExtResource("15_h7524") @@ -319,11 +360,11 @@ Id = "item_0019" DefaultLayer = 1 -[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0019" index="1"] +[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0019" index="0"] position = Vector2(-23, -7) texture = ExtResource("16_xj0e1") -[node name="Sprite2D2" type="Sprite2D" parent="ItemRoot/Item0019" index="2"] +[node name="Sprite2D2" type="Sprite2D" parent="ItemRoot/Item0019" index="1"] position = Vector2(24, -8) texture = ExtResource("17_gwwce") @@ -380,6 +421,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) @@ -447,3 +494,21 @@ [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") + +[node name="Item01" type="Sprite2D" parent="." index="24"] +position = Vector2(888, 332.5) +scale = Vector2(1.0625, 1.0375) +texture = ExtResource("37_5rb67") + +[node name="Item01" type="Sprite2D" parent="Item01" index="0"] +position = Vector2(888, 332.5) +scale = Vector2(1.0625, 1.0375) +texture = ExtResource("37_5rb67") + +[node name="Item06" type="Sprite2D" parent="." index="25"] +position = Vector2(838, 362) +texture = ExtResource("7_42rdc") 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"; + /// /// 名称: 台灯
/// 简介: ///
diff --git a/DungeonShooting_Godot/src/game/activity/role/player/Player.cs b/DungeonShooting_Godot/src/game/activity/role/player/Player.cs index 91eb784..0fb400d 100644 --- a/DungeonShooting_Godot/src/game/activity/role/player/Player.cs +++ b/DungeonShooting_Godot/src/game/activity/role/player/Player.cs @@ -207,7 +207,11 @@ } } - if (InputManager.UseActiveProp) //使用道具 + if (InputManager.Roulette) //打开武器轮盘 + { + //UiManager.Open_WeaponRoulette(); + } + else if (InputManager.UseActiveProp) //使用道具 { UseActiveProp(); } diff --git a/DungeonShooting_Godot/src/game/data/property/InputAction.cs b/DungeonShooting_Godot/src/game/data/property/InputAction.cs index 66ad19e..4b4da09 100644 --- a/DungeonShooting_Godot/src/game/data/property/InputAction.cs +++ b/DungeonShooting_Godot/src/game/data/property/InputAction.cs @@ -35,4 +35,5 @@ public static readonly StringName RemoveProp = "removeProp"; public static readonly StringName Map = "map"; public static readonly StringName Menu = "menu"; + public static readonly StringName Roulette = "roulette"; } \ No newline at end of file diff --git a/DungeonShooting_Godot/src/game/hall/Hall.cs b/DungeonShooting_Godot/src/game/hall/Hall.cs index e8ffde4..6b9bbe0 100644 --- a/DungeonShooting_Godot/src/game/hall/Hall.cs +++ b/DungeonShooting_Godot/src/game/hall/Hall.cs @@ -1,4 +1,4 @@ - + using Godot; /// @@ -6,17 +6,17 @@ /// public partial class Hall : World { - /// - /// 玩家出生标记 - /// - [Export] - public Marker2D BirthMark; + /// + /// 玩家出生标记 + /// + [Export] + public Marker2D BirthMark; - [Export] - public Sprite2D BgSprite; - - /// - /// 房间数据, 该数据时虚拟出来的, 并不是配置文件读取出来的 - /// - public RoomInfo RoomInfo { get; set; } -} \ No newline at end of file + [Export] + public Sprite2D BgSprite; + + /// + /// 房间数据, 该数据时虚拟出来的, 并不是配置文件读取出来的 + /// + public RoomInfo RoomInfo { get; set; } +} diff --git a/DungeonShooting_Godot/src/game/manager/InputManager.cs b/DungeonShooting_Godot/src/game/manager/InputManager.cs index 0025645..60d54ee 100644 --- a/DungeonShooting_Godot/src/game/manager/InputManager.cs +++ b/DungeonShooting_Godot/src/game/manager/InputManager.cs @@ -105,5 +105,6 @@ ExchangeProp = Input.IsActionJustPressed(InputAction.ExchangeProp); Map = Input.IsActionPressed(InputAction.Map); Menu = Input.IsActionJustPressed(InputAction.Menu); + Roulette = Input.IsActionPressed(InputAction.Roulette); } } \ No newline at end of file diff --git a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs index a0d22d2..9bc8e79 100644 --- a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs +++ b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs @@ -26,6 +26,7 @@ public const string prefab_ui_EditorForm_tscn = "res://prefab/ui/EditorForm.tscn"; public const string prefab_ui_Setting_tscn = "res://prefab/ui/Setting.tscn"; public const string prefab_ui_Loading_tscn = "res://prefab/ui/Loading.tscn"; + public const string prefab_ui_WeaponRoulette_tscn = "res://prefab/ui/WeaponRoulette.tscn"; public const string prefab_ui_MapEditorTools_tscn = "res://prefab/ui/MapEditorTools.tscn"; public const string prefab_ui_TileSetEditor_tscn = "res://prefab/ui/TileSetEditor.tscn"; public const string prefab_ui_EditorWindow_tscn = "res://prefab/ui/EditorWindow.tscn"; @@ -105,6 +106,36 @@ public const string prefab_map_RoomDoor_E_tscn = "res://prefab/map/RoomDoor_E.tscn"; public const string prefab_map_RoomDoor_W_tscn = "res://prefab/map/RoomDoor_W.tscn"; public const string prefab_map_RoomDoor_N_tscn = "res://prefab/map/RoomDoor_N.tscn"; + public const string prefab_item_Item0057_tscn = "res://prefab/item/Item0057.tscn"; + public const string prefab_item_Item0016_tscn = "res://prefab/item/Item0016.tscn"; + public const string prefab_item_Item0036_tscn = "res://prefab/item/Item0036.tscn"; + public const string prefab_item_Item0020_tscn = "res://prefab/item/Item0020.tscn"; + public const string prefab_item_Item0021_tscn = "res://prefab/item/Item0021.tscn"; + public const string prefab_item_Item0017_tscn = "res://prefab/item/Item0017.tscn"; + public const string prefab_item_Item0056_tscn = "res://prefab/item/Item0056.tscn"; + public const string prefab_item_Item0001_tscn = "res://prefab/item/Item0001.tscn"; + public const string prefab_item_Item0006_tscn = "res://prefab/item/Item0006.tscn"; + public const string prefab_item_Item0010_tscn = "res://prefab/item/Item0010.tscn"; + public const string prefab_item_Item0011_tscn = "res://prefab/item/Item0011.tscn"; + public const string prefab_item_Item0007_tscn = "res://prefab/item/Item0007.tscn"; + public const string prefab_item_Item0031_tscn = "res://prefab/item/Item0031.tscn"; + public const string prefab_item_Item0024_tscn = "res://prefab/item/Item0024.tscn"; + public const string prefab_item_Item0008_tscn = "res://prefab/item/Item0008.tscn"; + public const string prefab_item_Item0012_tscn = "res://prefab/item/Item0012.tscn"; + public const string prefab_item_Item0004_tscn = "res://prefab/item/Item0004.tscn"; + public const string prefab_item_Item0005_tscn = "res://prefab/item/Item0005.tscn"; + public const string prefab_item_Item0013_tscn = "res://prefab/item/Item0013.tscn"; + public const string prefab_item_Item0009_tscn = "res://prefab/item/Item0009.tscn"; + public const string prefab_item_Item0025_tscn = "res://prefab/item/Item0025.tscn"; + public const string prefab_item_Item0014_tscn = "res://prefab/item/Item0014.tscn"; + public const string prefab_item_Item0002_tscn = "res://prefab/item/Item0002.tscn"; + public const string prefab_item_Item0022_tscn = "res://prefab/item/Item0022.tscn"; + public const string prefab_item_Item0018_tscn = "res://prefab/item/Item0018.tscn"; + public const string prefab_item_Item0019_tscn = "res://prefab/item/Item0019.tscn"; + public const string prefab_item_Item0023_tscn = "res://prefab/item/Item0023.tscn"; + public const string prefab_item_Item0003_tscn = "res://prefab/item/Item0003.tscn"; + public const string prefab_item_Item0054_tscn = "res://prefab/item/Item0054.tscn"; + public const string prefab_item_Item0015_tscn = "res://prefab/item/Item0015.tscn"; public const string prefab_bullet_laser_Laser0001_tscn = "res://prefab/bullet/laser/Laser0001.tscn"; public const string prefab_bullet_laser_Laser0002_tscn = "res://prefab/bullet/laser/Laser0002.tscn"; public const string prefab_bullet_normal_Bullet0006_tscn = "res://prefab/bullet/normal/Bullet0006.tscn"; @@ -121,6 +152,65 @@ public const string prefab_currency_GoldTemplate_tscn = "res://prefab/currency/GoldTemplate.tscn"; public const string prefab_currency_Gold10_tscn = "res://prefab/currency/Gold10.tscn"; public const string prefab_currency_Gold5_tscn = "res://prefab/currency/Gold5.tscn"; + public const string build_windows_data_DungeonShooting_windows_x86_64_DungeonShooting_runtimeconfig_json = "res://build/windows/data_DungeonShooting_windows_x86_64/DungeonShooting.runtimeconfig.json"; + public const string build_windows_data_DungeonShooting_windows_x86_64_DungeonShooting_deps_json = "res://build/windows/data_DungeonShooting_windows_x86_64/DungeonShooting.deps.json"; + public const string build_windows_resource_map_tileMaps_GroupConfig_json = "res://build/windows/resource/map/tileMaps/GroupConfig.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle5_Preview_png = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle5/Preview.png"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle5_TileInfo_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle5/TileInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle5_RoomInfo_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle5/RoomInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle5_Preinstall_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle5/Preinstall.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle2_Preview_png = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle2/Preview.png"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle2_TileInfo_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle2/TileInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle2_RoomInfo_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle2/RoomInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle2_Preinstall_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle2/Preinstall.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle3_Preview_png = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle3/Preview.png"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle3_TileInfo_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle3/TileInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle3_RoomInfo_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle3/RoomInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle3_Preinstall_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle3/Preinstall.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle4_Preview_png = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle4/Preview.png"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle4_TileInfo_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle4/TileInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle4_RoomInfo_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle4/RoomInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle4_Preinstall_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle4/Preinstall.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle1_Preview_png = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle1/Preview.png"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle1_TileInfo_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle1/TileInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle1_RoomInfo_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle1/RoomInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle1_Preinstall_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle1/Preinstall.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle6_Preview_png = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle6/Preview.png"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle6_TileInfo_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle6/TileInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle6_RoomInfo_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle6/RoomInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_battle_Battle6_Preinstall_json = "res://build/windows/resource/map/tileMaps/Test1/battle/Battle6/Preinstall.json"; + public const string build_windows_resource_map_tileMaps_Test1_shop_Shop1_Preview_png = "res://build/windows/resource/map/tileMaps/Test1/shop/Shop1/Preview.png"; + public const string build_windows_resource_map_tileMaps_Test1_shop_Shop1_TileInfo_json = "res://build/windows/resource/map/tileMaps/Test1/shop/Shop1/TileInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_shop_Shop1_RoomInfo_json = "res://build/windows/resource/map/tileMaps/Test1/shop/Shop1/RoomInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_shop_Shop1_Preinstall_json = "res://build/windows/resource/map/tileMaps/Test1/shop/Shop1/Preinstall.json"; + public const string build_windows_resource_map_tileMaps_Test1_boss_Boss1_Preview_png = "res://build/windows/resource/map/tileMaps/Test1/boss/Boss1/Preview.png"; + public const string build_windows_resource_map_tileMaps_Test1_boss_Boss1_TileInfo_json = "res://build/windows/resource/map/tileMaps/Test1/boss/Boss1/TileInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_boss_Boss1_RoomInfo_json = "res://build/windows/resource/map/tileMaps/Test1/boss/Boss1/RoomInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_boss_Boss1_Preinstall_json = "res://build/windows/resource/map/tileMaps/Test1/boss/Boss1/Preinstall.json"; + public const string build_windows_resource_map_tileMaps_Test1_outlet_End1_Preview_png = "res://build/windows/resource/map/tileMaps/Test1/outlet/End1/Preview.png"; + public const string build_windows_resource_map_tileMaps_Test1_outlet_End1_TileInfo_json = "res://build/windows/resource/map/tileMaps/Test1/outlet/End1/TileInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_outlet_End1_RoomInfo_json = "res://build/windows/resource/map/tileMaps/Test1/outlet/End1/RoomInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_outlet_End1_Preinstall_json = "res://build/windows/resource/map/tileMaps/Test1/outlet/End1/Preinstall.json"; + public const string build_windows_resource_map_tileMaps_Test1_inlet_Start_Preview_png = "res://build/windows/resource/map/tileMaps/Test1/inlet/Start/Preview.png"; + public const string build_windows_resource_map_tileMaps_Test1_inlet_Start_TileInfo_json = "res://build/windows/resource/map/tileMaps/Test1/inlet/Start/TileInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_inlet_Start_RoomInfo_json = "res://build/windows/resource/map/tileMaps/Test1/inlet/Start/RoomInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_inlet_Start_Preinstall_json = "res://build/windows/resource/map/tileMaps/Test1/inlet/Start/Preinstall.json"; + public const string build_windows_resource_map_tileMaps_Test1_reward_Award1_Preview_png = "res://build/windows/resource/map/tileMaps/Test1/reward/Award1/Preview.png"; + public const string build_windows_resource_map_tileMaps_Test1_reward_Award1_TileInfo_json = "res://build/windows/resource/map/tileMaps/Test1/reward/Award1/TileInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_reward_Award1_RoomInfo_json = "res://build/windows/resource/map/tileMaps/Test1/reward/Award1/RoomInfo.json"; + public const string build_windows_resource_map_tileMaps_Test1_reward_Award1_Preinstall_json = "res://build/windows/resource/map/tileMaps/Test1/reward/Award1/Preinstall.json"; + public const string build_windows_resource_map_tileMaps_test2_battle_1_TileInfo_json = "res://build/windows/resource/map/tileMaps/test2/battle/1/TileInfo.json"; + public const string build_windows_resource_map_tileMaps_test2_battle_1_RoomInfo_json = "res://build/windows/resource/map/tileMaps/test2/battle/1/RoomInfo.json"; + public const string build_windows_resource_map_tileMaps_test2_battle_1_Preinstall_json = "res://build/windows/resource/map/tileMaps/test2/battle/1/Preinstall.json"; + public const string build_windows_resource_map_tileSet_TileSetConfig_json = "res://build/windows/resource/map/tileSet/TileSetConfig.json"; + public const string build_windows_resource_map_tileSet_TileSet2_Main_png = "res://build/windows/resource/map/tileSet/TileSet2/Main.png"; + public const string build_windows_resource_map_tileSet_TileSet2_TileSet_json = "res://build/windows/resource/map/tileSet/TileSet2/TileSet.json"; + public const string build_windows_resource_map_tileSet_TileSet2_Test2_png = "res://build/windows/resource/map/tileSet/TileSet2/Test2.png"; + public const string build_windows_resource_map_tileSet_TileSet1_Main_png = "res://build/windows/resource/map/tileSet/TileSet1/Main.png"; + public const string build_windows_resource_map_tileSet_TileSet1_TileSet_json = "res://build/windows/resource/map/tileSet/TileSet1/TileSet.json"; + public const string build_windows_resource_map_tileSet_TileSet1_Test1_png = "res://build/windows/resource/map/tileSet/TileSet1/Test1.png"; + public const string build_windows_resource_map_tileSet_TileSet1_Test3_png = "res://build/windows/resource/map/tileSet/TileSet1/Test3.png"; + public const string build_windows_resource_map_tileSet_TileSet1_Test2_png = "res://build/windows/resource/map/tileSet/TileSet1/Test2.png"; public const string scene_Main_tscn = "res://scene/Main.tscn"; public const string scene_Hall_tscn = "res://scene/Hall.tscn"; public const string scene_Dungeon_tscn = "res://scene/Dungeon.tscn"; @@ -429,67 +519,158 @@ public const string resource_sprite_map_door_close_png = "res://resource/sprite/map/door_close.png"; public const string resource_sprite_map_PreviewTransition4_png = "res://resource/sprite/map/PreviewTransition4.png"; public const string resource_sprite_map_PreviewTransition5_png = "res://resource/sprite/map/PreviewTransition5.png"; - public const string resource_sprite_item_item_99_png = "res://resource/sprite/item/item _99.png"; - public const string resource_sprite_item_item_58_png = "res://resource/sprite/item/item _58.png"; - public const string resource_sprite_item_item_59_png = "res://resource/sprite/item/item _59.png"; - public const string resource_sprite_item_item_49_png = "res://resource/sprite/item/item _49.png"; - public const string resource_sprite_item_item_48_png = "res://resource/sprite/item/item _48.png"; - public const string resource_sprite_item_item_04_png = "res://resource/sprite/item/item _04.png"; - public const string resource_sprite_item_item_10_png = "res://resource/sprite/item/item _10.png"; - public const string resource_sprite_item_item_38_png = "res://resource/sprite/item/item _38.png"; - public const string resource_sprite_item_item_39_png = "res://resource/sprite/item/item _39.png"; - public const string resource_sprite_item_item_11_png = "res://resource/sprite/item/item _11.png"; - public const string resource_sprite_item_item_05_png = "res://resource/sprite/item/item _05.png"; - public const string resource_sprite_item_item_13_png = "res://resource/sprite/item/item _13.png"; - public const string resource_sprite_item_item_07_png = "res://resource/sprite/item/item _07.png"; - public const string resource_sprite_item_item_06_png = "res://resource/sprite/item/item _06.png"; - public const string resource_sprite_item_item_12_png = "res://resource/sprite/item/item _12.png"; - public const string resource_sprite_item_item_16_png = "res://resource/sprite/item/item _16.png"; - public const string resource_sprite_item_item_02_png = "res://resource/sprite/item/item _02.png"; - public const string resource_sprite_item_item_03_png = "res://resource/sprite/item/item _03.png"; - public const string resource_sprite_item_item_17_png = "res://resource/sprite/item/item _17.png"; - public const string resource_sprite_item_item_29_png = "res://resource/sprite/item/item _29.png"; - public const string resource_sprite_item_item_01_png = "res://resource/sprite/item/item _01.png"; - public const string resource_sprite_item_item_15_png = "res://resource/sprite/item/item _15.png"; - public const string resource_sprite_item_item_14_png = "res://resource/sprite/item/item _14.png"; - public const string resource_sprite_item_item_00_png = "res://resource/sprite/item/item _00.png"; - public const string resource_sprite_item_item_28_png = "res://resource/sprite/item/item _28.png"; - public const string resource_sprite_item_item_25_png = "res://resource/sprite/item/item _25.png"; - public const string resource_sprite_item_item_31_png = "res://resource/sprite/item/item _31.png"; - public const string resource_sprite_item_item_19_png = "res://resource/sprite/item/item _19.png"; - public const string resource_sprite_item_item_18_png = "res://resource/sprite/item/item _18.png"; - public const string resource_sprite_item_item_30_png = "res://resource/sprite/item/item _30.png"; - public const string resource_sprite_item_item_24_png = "res://resource/sprite/item/item _24.png"; - public const string resource_sprite_item_item_32_png = "res://resource/sprite/item/item _32.png"; - public const string resource_sprite_item_item_26_png = "res://resource/sprite/item/item _26.png"; - public const string resource_sprite_item_item_27_png = "res://resource/sprite/item/item _27.png"; - public const string resource_sprite_item_item_33_png = "res://resource/sprite/item/item _33.png"; - public const string resource_sprite_item_item_37_png = "res://resource/sprite/item/item _37.png"; - public const string resource_sprite_item_item_23_png = "res://resource/sprite/item/item _23.png"; - public const string resource_sprite_item_item_22_png = "res://resource/sprite/item/item _22.png"; - public const string resource_sprite_item_item_36_png = "res://resource/sprite/item/item _36.png"; - public const string resource_sprite_item_item_08_png = "res://resource/sprite/item/item _08.png"; - public const string resource_sprite_item_item_20_png = "res://resource/sprite/item/item _20.png"; - public const string resource_sprite_item_item_34_png = "res://resource/sprite/item/item _34.png"; - public const string resource_sprite_item_item_35_png = "res://resource/sprite/item/item _35.png"; - public const string resource_sprite_item_item_21_png = "res://resource/sprite/item/item _21.png"; - public const string resource_sprite_item_item_09_png = "res://resource/sprite/item/item _09.png"; - public const string resource_sprite_item_item_46_png = "res://resource/sprite/item/item _46.png"; - public const string resource_sprite_item_item_52_png = "res://resource/sprite/item/item _52.png"; - public const string resource_sprite_item_item_53_png = "res://resource/sprite/item/item _53.png"; - public const string resource_sprite_item_item_47_png = "res://resource/sprite/item/item _47.png"; - public const string resource_sprite_item_item_51_png = "res://resource/sprite/item/item _51.png"; - public const string resource_sprite_item_item_45_png = "res://resource/sprite/item/item _45.png"; - public const string resource_sprite_item_item_44_png = "res://resource/sprite/item/item _44.png"; - public const string resource_sprite_item_item_50_png = "res://resource/sprite/item/item _50.png"; - public const string resource_sprite_item_item_54_png = "res://resource/sprite/item/item _54.png"; - public const string resource_sprite_item_item_40_png = "res://resource/sprite/item/item _40.png"; - public const string resource_sprite_item_item_41_png = "res://resource/sprite/item/item _41.png"; - public const string resource_sprite_item_item_55_png = "res://resource/sprite/item/item _55.png"; - public const string resource_sprite_item_item_43_png = "res://resource/sprite/item/item _43.png"; - public const string resource_sprite_item_item_57_png = "res://resource/sprite/item/item _57.png"; - public const string resource_sprite_item_item_56_png = "res://resource/sprite/item/item _56.png"; - public const string resource_sprite_item_item_42_png = "res://resource/sprite/item/item _42.png"; + public const string resource_sprite_item_hall_a_Slice_46_png = "res://resource/sprite/item/hall_a/Slice_46.png"; + public const string resource_sprite_item_hall_a_Slice_52_png = "res://resource/sprite/item/hall_a/Slice_52.png"; + public const string resource_sprite_item_hall_a_Slice_53_png = "res://resource/sprite/item/hall_a/Slice_53.png"; + public const string resource_sprite_item_hall_a_Slice_47_png = "res://resource/sprite/item/hall_a/Slice_47.png"; + public const string resource_sprite_item_hall_a_Slice_51_png = "res://resource/sprite/item/hall_a/Slice_51.png"; + public const string resource_sprite_item_hall_a_Slice_45_png = "res://resource/sprite/item/hall_a/Slice_45.png"; + public const string resource_sprite_item_hall_a_Slice_44_png = "res://resource/sprite/item/hall_a/Slice_44.png"; + public const string resource_sprite_item_hall_a_Slice_50_png = "res://resource/sprite/item/hall_a/Slice_50.png"; + public const string resource_sprite_item_hall_a_Slice_54_png = "res://resource/sprite/item/hall_a/Slice_54.png"; + public const string resource_sprite_item_hall_a_Slice_40_png = "res://resource/sprite/item/hall_a/Slice_40.png"; + public const string resource_sprite_item_hall_a_Slice_41_png = "res://resource/sprite/item/hall_a/Slice_41.png"; + public const string resource_sprite_item_hall_a_Slice_55_png = "res://resource/sprite/item/hall_a/Slice_55.png"; + public const string resource_sprite_item_hall_a_Slice_43_png = "res://resource/sprite/item/hall_a/Slice_43.png"; + public const string resource_sprite_item_hall_a_Slice_42_png = "res://resource/sprite/item/hall_a/Slice_42.png"; + public const string resource_sprite_item_hall_a_Slice_25_png = "res://resource/sprite/item/hall_a/Slice_25.png"; + public const string resource_sprite_item_hall_a_Slice_31_png = "res://resource/sprite/item/hall_a/Slice_31.png"; + public const string resource_sprite_item_hall_a_Slice_19_png = "res://resource/sprite/item/hall_a/Slice_19.png"; + public const string resource_sprite_item_hall_a_Slice_18_png = "res://resource/sprite/item/hall_a/Slice_18.png"; + public const string resource_sprite_item_hall_a_Slice_30_png = "res://resource/sprite/item/hall_a/Slice_30.png"; + public const string resource_sprite_item_hall_a_Slice_24_png = "res://resource/sprite/item/hall_a/Slice_24.png"; + public const string resource_sprite_item_hall_a_Slice_32_png = "res://resource/sprite/item/hall_a/Slice_32.png"; + public const string resource_sprite_item_hall_a_Slice_26_png = "res://resource/sprite/item/hall_a/Slice_26.png"; + public const string resource_sprite_item_hall_a_Slice_27_png = "res://resource/sprite/item/hall_a/Slice_27.png"; + public const string resource_sprite_item_hall_a_Slice_33_png = "res://resource/sprite/item/hall_a/Slice_33.png"; + public const string resource_sprite_item_hall_a_Slice_37_png = "res://resource/sprite/item/hall_a/Slice_37.png"; + public const string resource_sprite_item_hall_a_Slice_23_png = "res://resource/sprite/item/hall_a/Slice_23.png"; + public const string resource_sprite_item_hall_a_Slice_22_png = "res://resource/sprite/item/hall_a/Slice_22.png"; + public const string resource_sprite_item_hall_a_Slice_36_png = "res://resource/sprite/item/hall_a/Slice_36.png"; + public const string resource_sprite_item_hall_a_Slice_08_png = "res://resource/sprite/item/hall_a/Slice_08.png"; + public const string resource_sprite_item_hall_a_Slice_20_png = "res://resource/sprite/item/hall_a/Slice_20.png"; + public const string resource_sprite_item_hall_a_Slice_34_png = "res://resource/sprite/item/hall_a/Slice_34.png"; + public const string resource_sprite_item_hall_a_Slice_35_png = "res://resource/sprite/item/hall_a/Slice_35.png"; + public const string resource_sprite_item_hall_a_Slice_21_png = "res://resource/sprite/item/hall_a/Slice_21.png"; + public const string resource_sprite_item_hall_a_Slice_09_png = "res://resource/sprite/item/hall_a/Slice_09.png"; + public const string resource_sprite_item_hall_a_Slice_04_png = "res://resource/sprite/item/hall_a/Slice_04.png"; + public const string resource_sprite_item_hall_a_Slice_10_png = "res://resource/sprite/item/hall_a/Slice_10.png"; + public const string resource_sprite_item_hall_a_Slice_38_png = "res://resource/sprite/item/hall_a/Slice_38.png"; + public const string resource_sprite_item_hall_a_Slice_39_png = "res://resource/sprite/item/hall_a/Slice_39.png"; + public const string resource_sprite_item_hall_a_Slice_11_png = "res://resource/sprite/item/hall_a/Slice_11.png"; + public const string resource_sprite_item_hall_a_Slice_05_png = "res://resource/sprite/item/hall_a/Slice_05.png"; + public const string resource_sprite_item_hall_a_Slice_13_png = "res://resource/sprite/item/hall_a/Slice_13.png"; + public const string resource_sprite_item_hall_a_Slice_07_png = "res://resource/sprite/item/hall_a/Slice_07.png"; + public const string resource_sprite_item_hall_a_Slice_06_png = "res://resource/sprite/item/hall_a/Slice_06.png"; + public const string resource_sprite_item_hall_a_Slice_12_png = "res://resource/sprite/item/hall_a/Slice_12.png"; + public const string resource_sprite_item_hall_a_Slice_16_png = "res://resource/sprite/item/hall_a/Slice_16.png"; + public const string resource_sprite_item_hall_a_Slice_02_png = "res://resource/sprite/item/hall_a/Slice_02.png"; + public const string resource_sprite_item_hall_a_Slice_03_png = "res://resource/sprite/item/hall_a/Slice_03.png"; + public const string resource_sprite_item_hall_a_Slice_17_png = "res://resource/sprite/item/hall_a/Slice_17.png"; + public const string resource_sprite_item_hall_a_Slice_29_png = "res://resource/sprite/item/hall_a/Slice_29.png"; + public const string resource_sprite_item_hall_a_Slice_01_png = "res://resource/sprite/item/hall_a/Slice_01.png"; + public const string resource_sprite_item_hall_a_Slice_15_png = "res://resource/sprite/item/hall_a/Slice_15.png"; + public const string resource_sprite_item_hall_a_Slice_14_png = "res://resource/sprite/item/hall_a/Slice_14.png"; + public const string resource_sprite_item_hall_a_Slice_28_png = "res://resource/sprite/item/hall_a/Slice_28.png"; + public const string resource_sprite_item_hall_a_Slice_49_png = "res://resource/sprite/item/hall_a/Slice_49.png"; + public const string resource_sprite_item_hall_a_Slice_48_png = "res://resource/sprite/item/hall_a/Slice_48.png"; + public const string resource_sprite_item_hall_b_huapen_png = "res://resource/sprite/item/hall_b/huapen.png"; + public const string resource_sprite_item_hall_b_shuihu_png = "res://resource/sprite/item/hall_b/shuihu.png"; + public const string resource_sprite_item_hall_b_jieshouqi_png = "res://resource/sprite/item/hall_b/jieshouqi.png"; + public const string resource_sprite_item_hall_b_ditan_png = "res://resource/sprite/item/hall_b/ditan.png"; + public const string resource_sprite_item_hall_b_传送带_png = "res://resource/sprite/item/hall_b/传送带.png"; + public const string resource_sprite_item_hall_b_saoba_png = "res://resource/sprite/item/hall_b/saoba.png"; + public const string resource_sprite_item_hall_b_bingxiang01_png = "res://resource/sprite/item/hall_b/bingxiang01.png"; + public const string resource_sprite_item_hall_b_zhishi_png = "res://resource/sprite/item/hall_b/zhishi.png"; + public const string resource_sprite_item_hall_b_wall1_png = "res://resource/sprite/item/hall_b/wall1.png"; + public const string resource_sprite_item_hall_b_wall3_png = "res://resource/sprite/item/hall_b/wall3.png"; + public const string resource_sprite_item_hall_b_ditan01_png = "res://resource/sprite/item/hall_b/ditan01.png"; + public const string resource_sprite_item_hall_b_wall2_png = "res://resource/sprite/item/hall_b/wall2.png"; + public const string resource_sprite_item_hall_b_fuhuo_png = "res://resource/sprite/item/hall_b/fuhuo.png"; + public const string resource_sprite_item_hall_b_kouzi_png = "res://resource/sprite/item/hall_b/kouzi.png"; + public const string resource_sprite_item_hall_b_pingmu_png = "res://resource/sprite/item/hall_b/pingmu.png"; + public const string resource_sprite_item_hall_b_shuiguan02_png = "res://resource/sprite/item/hall_b/shuiguan02.png"; + public const string resource_sprite_item_hall_b_shuiguan01_png = "res://resource/sprite/item/hall_b/shuiguan01.png"; + public const string resource_sprite_item_hall_b_mao_png = "res://resource/sprite/item/hall_b/mao.png"; + public const string resource_sprite_item_hall_b_mugui_png = "res://resource/sprite/item/hall_b/mugui.png"; + public const string resource_sprite_item_hall_b_zhuozi01_png = "res://resource/sprite/item/hall_b/zhuozi01.png"; + public const string resource_sprite_item_hall_b_传送带图标_png = "res://resource/sprite/item/hall_b/传送带图标.png"; + public const string resource_sprite_item_hall_b_yuguang_png = "res://resource/sprite/item/hall_b/yuguang.png"; + public const string resource_sprite_item_hall_b_椅子_png = "res://resource/sprite/item/hall_b/椅子.png"; + public const string resource_sprite_item_hall_b_zhuozi02_png = "res://resource/sprite/item/hall_b/zhuozi02.png"; + public const string resource_sprite_item_hall_b_xiangzi_png = "res://resource/sprite/item/hall_b/xiangzi.png"; + public const string resource_sprite_item_hall_b_huatan_png = "res://resource/sprite/item/hall_b/huatan.png"; + public const string resource_sprite_item_hall_b_baoxiangui_png = "res://resource/sprite/item/hall_b/baoxiangui.png"; + public const string resource_sprite_item_hall_b_shuimu_png = "res://resource/sprite/item/hall_b/shuimu.png"; + public const string resource_sprite_item_hall_b_huatan02_png = "res://resource/sprite/item/hall_b/huatan02.png"; + public const string resource_sprite_item_hall_b_dimian3_png = "res://resource/sprite/item/hall_b/dimian3.png"; + public const string resource_sprite_item_hall_b_fengjing_png = "res://resource/sprite/item/hall_b/fengjing.png"; + public const string resource_sprite_item_hall_b_dimian2_png = "res://resource/sprite/item/hall_b/dimian2.png"; + public const string resource_sprite_item_hall_b_dimian_png = "res://resource/sprite/item/hall_b/dimian.png"; + public const string resource_sprite_item_hall_b_chuanlian_png = "res://resource/sprite/item/hall_b/chuanlian.png"; + public const string resource_sprite_item_hall_b_玻璃块_png = "res://resource/sprite/item/hall_b/玻璃块.png"; + public const string resource_sprite_item_hall_b_dimian4_png = "res://resource/sprite/item/hall_b/dimian4.png"; + public const string resource_sprite_item_hall_c_item_99_png = "res://resource/sprite/item/hall_c/item _99.png"; + public const string resource_sprite_item_hall_c_item_58_png = "res://resource/sprite/item/hall_c/item _58.png"; + public const string resource_sprite_item_hall_c_item_59_png = "res://resource/sprite/item/hall_c/item _59.png"; + public const string resource_sprite_item_hall_c_item_49_png = "res://resource/sprite/item/hall_c/item _49.png"; + public const string resource_sprite_item_hall_c_item_48_png = "res://resource/sprite/item/hall_c/item _48.png"; + public const string resource_sprite_item_hall_c_item_04_png = "res://resource/sprite/item/hall_c/item _04.png"; + public const string resource_sprite_item_hall_c_item_10_png = "res://resource/sprite/item/hall_c/item _10.png"; + public const string resource_sprite_item_hall_c_item_38_png = "res://resource/sprite/item/hall_c/item _38.png"; + public const string resource_sprite_item_hall_c_item_39_png = "res://resource/sprite/item/hall_c/item _39.png"; + public const string resource_sprite_item_hall_c_item_11_png = "res://resource/sprite/item/hall_c/item _11.png"; + public const string resource_sprite_item_hall_c_item_05_png = "res://resource/sprite/item/hall_c/item _05.png"; + public const string resource_sprite_item_hall_c_item_13_png = "res://resource/sprite/item/hall_c/item _13.png"; + public const string resource_sprite_item_hall_c_item_07_png = "res://resource/sprite/item/hall_c/item _07.png"; + public const string resource_sprite_item_hall_c_item_06_png = "res://resource/sprite/item/hall_c/item _06.png"; + public const string resource_sprite_item_hall_c_item_12_png = "res://resource/sprite/item/hall_c/item _12.png"; + public const string resource_sprite_item_hall_c_item_16_png = "res://resource/sprite/item/hall_c/item _16.png"; + public const string resource_sprite_item_hall_c_item_02_png = "res://resource/sprite/item/hall_c/item _02.png"; + public const string resource_sprite_item_hall_c_item_03_png = "res://resource/sprite/item/hall_c/item _03.png"; + public const string resource_sprite_item_hall_c_item_17_png = "res://resource/sprite/item/hall_c/item _17.png"; + public const string resource_sprite_item_hall_c_item_29_png = "res://resource/sprite/item/hall_c/item _29.png"; + public const string resource_sprite_item_hall_c_item_01_png = "res://resource/sprite/item/hall_c/item _01.png"; + public const string resource_sprite_item_hall_c_item_15_png = "res://resource/sprite/item/hall_c/item _15.png"; + public const string resource_sprite_item_hall_c_item_14_png = "res://resource/sprite/item/hall_c/item _14.png"; + public const string resource_sprite_item_hall_c_item_00_png = "res://resource/sprite/item/hall_c/item _00.png"; + public const string resource_sprite_item_hall_c_item_28_png = "res://resource/sprite/item/hall_c/item _28.png"; + public const string resource_sprite_item_hall_c_item_25_png = "res://resource/sprite/item/hall_c/item _25.png"; + public const string resource_sprite_item_hall_c_item_31_png = "res://resource/sprite/item/hall_c/item _31.png"; + public const string resource_sprite_item_hall_c_item_19_png = "res://resource/sprite/item/hall_c/item _19.png"; + public const string resource_sprite_item_hall_c_item_18_png = "res://resource/sprite/item/hall_c/item _18.png"; + public const string resource_sprite_item_hall_c_item_30_png = "res://resource/sprite/item/hall_c/item _30.png"; + public const string resource_sprite_item_hall_c_item_24_png = "res://resource/sprite/item/hall_c/item _24.png"; + public const string resource_sprite_item_hall_c_item_32_png = "res://resource/sprite/item/hall_c/item _32.png"; + public const string resource_sprite_item_hall_c_item_26_png = "res://resource/sprite/item/hall_c/item _26.png"; + public const string resource_sprite_item_hall_c_item_27_png = "res://resource/sprite/item/hall_c/item _27.png"; + public const string resource_sprite_item_hall_c_item_33_png = "res://resource/sprite/item/hall_c/item _33.png"; + public const string resource_sprite_item_hall_c_item_37_png = "res://resource/sprite/item/hall_c/item _37.png"; + public const string resource_sprite_item_hall_c_item_23_png = "res://resource/sprite/item/hall_c/item _23.png"; + public const string resource_sprite_item_hall_c_item_22_png = "res://resource/sprite/item/hall_c/item _22.png"; + public const string resource_sprite_item_hall_c_item_36_png = "res://resource/sprite/item/hall_c/item _36.png"; + public const string resource_sprite_item_hall_c_item_08_png = "res://resource/sprite/item/hall_c/item _08.png"; + public const string resource_sprite_item_hall_c_item_20_png = "res://resource/sprite/item/hall_c/item _20.png"; + public const string resource_sprite_item_hall_c_item_34_png = "res://resource/sprite/item/hall_c/item _34.png"; + public const string resource_sprite_item_hall_c_item_35_png = "res://resource/sprite/item/hall_c/item _35.png"; + public const string resource_sprite_item_hall_c_item_21_png = "res://resource/sprite/item/hall_c/item _21.png"; + public const string resource_sprite_item_hall_c_item_09_png = "res://resource/sprite/item/hall_c/item _09.png"; + public const string resource_sprite_item_hall_c_item_46_png = "res://resource/sprite/item/hall_c/item _46.png"; + public const string resource_sprite_item_hall_c_item_52_png = "res://resource/sprite/item/hall_c/item _52.png"; + public const string resource_sprite_item_hall_c_item_53_png = "res://resource/sprite/item/hall_c/item _53.png"; + public const string resource_sprite_item_hall_c_item_47_png = "res://resource/sprite/item/hall_c/item _47.png"; + public const string resource_sprite_item_hall_c_item_51_png = "res://resource/sprite/item/hall_c/item _51.png"; + public const string resource_sprite_item_hall_c_item_45_png = "res://resource/sprite/item/hall_c/item _45.png"; + public const string resource_sprite_item_hall_c_item_44_png = "res://resource/sprite/item/hall_c/item _44.png"; + public const string resource_sprite_item_hall_c_item_50_png = "res://resource/sprite/item/hall_c/item _50.png"; + public const string resource_sprite_item_hall_c_item_54_png = "res://resource/sprite/item/hall_c/item _54.png"; + public const string resource_sprite_item_hall_c_item_40_png = "res://resource/sprite/item/hall_c/item _40.png"; + public const string resource_sprite_item_hall_c_item_41_png = "res://resource/sprite/item/hall_c/item _41.png"; + public const string resource_sprite_item_hall_c_item_55_png = "res://resource/sprite/item/hall_c/item _55.png"; + public const string resource_sprite_item_hall_c_item_43_png = "res://resource/sprite/item/hall_c/item _43.png"; + public const string resource_sprite_item_hall_c_item_57_png = "res://resource/sprite/item/hall_c/item _57.png"; + public const string resource_sprite_item_hall_c_item_56_png = "res://resource/sprite/item/hall_c/item _56.png"; + public const string resource_sprite_item_hall_c_item_42_png = "res://resource/sprite/item/hall_c/item _42.png"; public const string resource_sprite_bullet_laser_Laser0001_png = "res://resource/sprite/bullet/laser/Laser0001.png"; public const string resource_sprite_bullet_normal_bullet0009_png = "res://resource/sprite/bullet/normal/bullet0009.png"; public const string resource_sprite_bullet_normal_bullet0008_png = "res://resource/sprite/bullet/normal/bullet0008.png"; diff --git a/DungeonShooting_Godot/src/game/manager/UiManager_Methods.cs b/DungeonShooting_Godot/src/game/manager/UiManager_Methods.cs index 750f5a7..6b450e8 100644 --- a/DungeonShooting_Godot/src/game/manager/UiManager_Methods.cs +++ b/DungeonShooting_Godot/src/game/manager/UiManager_Methods.cs @@ -5,65 +5,66 @@ public static class UiNames { - public const string BottomTips = "BottomTips"; - public const string Debugger = "Debugger"; - public const string EditorColorPicker = "EditorColorPicker"; - public const string EditorDungeonGroup = "EditorDungeonGroup"; - public const string EditorForm = "EditorForm"; + public const string Main = "Main"; + public const string TileSetEditorCombination = "TileSetEditorCombination"; + public const string MapEditorMapTile = "MapEditorMapTile"; + public const string MapEditorMapLayer = "MapEditorMapLayer"; + public const string MapEditor = "MapEditor"; + public const string PauseMenu = "PauseMenu"; + public const string MapEditorMapMark = "MapEditorMapMark"; + public const string MapEditorCreateMark = "MapEditorCreateMark"; + public const string MapEditorCreateRoom = "MapEditorCreateRoom"; public const string EditorImportCombination = "EditorImportCombination"; public const string EditorInfo = "EditorInfo"; - public const string EditorInput = "EditorInput"; - public const string EditorManager = "EditorManager"; - public const string EditorTileImage = "EditorTileImage"; - public const string EditorTips = "EditorTips"; - public const string EditorTools = "EditorTools"; - public const string EditorWindow = "EditorWindow"; - public const string Loading = "Loading"; - public const string Main = "Main"; - public const string MapEditor = "MapEditor"; - public const string MapEditorCreateMark = "MapEditorCreateMark"; + public const string Debugger = "Debugger"; public const string MapEditorCreatePreinstall = "MapEditorCreatePreinstall"; - public const string MapEditorCreateRoom = "MapEditorCreateRoom"; - public const string MapEditorMapLayer = "MapEditorMapLayer"; - public const string MapEditorMapMark = "MapEditorMapMark"; - public const string MapEditorMapTile = "MapEditorMapTile"; - public const string MapEditorProject = "MapEditorProject"; - public const string MapEditorSelectObject = "MapEditorSelectObject"; - public const string MapEditorTools = "MapEditorTools"; - public const string PauseMenu = "PauseMenu"; - public const string RoomMap = "RoomMap"; - public const string RoomUI = "RoomUI"; + public const string BottomTips = "BottomTips"; + public const string EditorTileImage = "EditorTileImage"; + public const string EditorDungeonGroup = "EditorDungeonGroup"; + public const string EditorForm = "EditorForm"; public const string Setting = "Setting"; - public const string Settlement = "Settlement"; + public const string Loading = "Loading"; + public const string WeaponRoulette = "WeaponRoulette"; + public const string MapEditorTools = "MapEditorTools"; public const string TileSetEditor = "TileSetEditor"; - public const string TileSetEditorCombination = "TileSetEditorCombination"; + public const string EditorWindow = "EditorWindow"; + public const string EditorInput = "EditorInput"; + public const string RoomMap = "RoomMap"; + public const string EditorTools = "EditorTools"; public const string TileSetEditorImport = "TileSetEditorImport"; + public const string MapEditorSelectObject = "MapEditorSelectObject"; + public const string Settlement = "Settlement"; + public const string MapEditorProject = "MapEditorProject"; public const string TileSetEditorProject = "TileSetEditorProject"; + public const string EditorManager = "EditorManager"; + public const string EditorTips = "EditorTips"; public const string TileSetEditorTerrain = "TileSetEditorTerrain"; + public const string EditorColorPicker = "EditorColorPicker"; + public const string RoomUI = "RoomUI"; } /// - /// 创建 BottomTips, 并返回UI实例, 该函数不会打开 Ui + /// 创建 Main, 并返回UI实例, 该函数不会打开 Ui /// - public static UI.BottomTips.BottomTipsPanel Create_BottomTips() + public static UI.Main.MainPanel Create_Main() { - return CreateUi(UiNames.BottomTips); + return CreateUi(UiNames.Main); } /// - /// 打开 BottomTips, 并返回UI实例 + /// 打开 Main, 并返回UI实例 /// - public static UI.BottomTips.BottomTipsPanel Open_BottomTips() + public static UI.Main.MainPanel Open_Main() { - return OpenUi(UiNames.BottomTips); + return OpenUi(UiNames.Main); } /// - /// 隐藏 BottomTips 的所有实例 + /// 隐藏 Main 的所有实例 /// - public static void Hide_BottomTips() + public static void Hide_Main() { - var uiInstance = Get_BottomTips_Instance(); + var uiInstance = Get_Main_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.HideUi(); @@ -71,11 +72,11 @@ } /// - /// 销毁 BottomTips 的所有实例 + /// 销毁 Main 的所有实例 /// - public static void Destroy_BottomTips() + public static void Destroy_Main() { - var uiInstance = Get_BottomTips_Instance(); + var uiInstance = Get_Main_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.Destroy(); @@ -83,35 +84,35 @@ } /// - /// 获取所有 BottomTips 的实例, 如果没有实例, 则返回一个空数组 + /// 获取所有 Main 的实例, 如果没有实例, 则返回一个空数组 /// - public static UI.BottomTips.BottomTipsPanel[] Get_BottomTips_Instance() + public static UI.Main.MainPanel[] Get_Main_Instance() { - return GetUiInstance(nameof(UI.BottomTips.BottomTips)); + return GetUiInstance(nameof(UI.Main.Main)); } /// - /// 创建 Debugger, 并返回UI实例, 该函数不会打开 Ui + /// 创建 TileSetEditorCombination, 并返回UI实例, 该函数不会打开 Ui /// - public static UI.Debugger.DebuggerPanel Create_Debugger() + public static UI.TileSetEditorCombination.TileSetEditorCombinationPanel Create_TileSetEditorCombination() { - return CreateUi(UiNames.Debugger); + return CreateUi(UiNames.TileSetEditorCombination); } /// - /// 打开 Debugger, 并返回UI实例 + /// 打开 TileSetEditorCombination, 并返回UI实例 /// - public static UI.Debugger.DebuggerPanel Open_Debugger() + public static UI.TileSetEditorCombination.TileSetEditorCombinationPanel Open_TileSetEditorCombination() { - return OpenUi(UiNames.Debugger); + return OpenUi(UiNames.TileSetEditorCombination); } /// - /// 隐藏 Debugger 的所有实例 + /// 隐藏 TileSetEditorCombination 的所有实例 /// - public static void Hide_Debugger() + public static void Hide_TileSetEditorCombination() { - var uiInstance = Get_Debugger_Instance(); + var uiInstance = Get_TileSetEditorCombination_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.HideUi(); @@ -119,11 +120,11 @@ } /// - /// 销毁 Debugger 的所有实例 + /// 销毁 TileSetEditorCombination 的所有实例 /// - public static void Destroy_Debugger() + public static void Destroy_TileSetEditorCombination() { - var uiInstance = Get_Debugger_Instance(); + var uiInstance = Get_TileSetEditorCombination_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.Destroy(); @@ -131,35 +132,35 @@ } /// - /// 获取所有 Debugger 的实例, 如果没有实例, 则返回一个空数组 + /// 获取所有 TileSetEditorCombination 的实例, 如果没有实例, 则返回一个空数组 /// - public static UI.Debugger.DebuggerPanel[] Get_Debugger_Instance() + public static UI.TileSetEditorCombination.TileSetEditorCombinationPanel[] Get_TileSetEditorCombination_Instance() { - return GetUiInstance(nameof(UI.Debugger.Debugger)); + return GetUiInstance(nameof(UI.TileSetEditorCombination.TileSetEditorCombination)); } /// - /// 创建 EditorColorPicker, 并返回UI实例, 该函数不会打开 Ui + /// 创建 MapEditorMapTile, 并返回UI实例, 该函数不会打开 Ui /// - public static UI.EditorColorPicker.EditorColorPickerPanel Create_EditorColorPicker() + public static UI.MapEditorMapTile.MapEditorMapTilePanel Create_MapEditorMapTile() { - return CreateUi(UiNames.EditorColorPicker); + return CreateUi(UiNames.MapEditorMapTile); } /// - /// 打开 EditorColorPicker, 并返回UI实例 + /// 打开 MapEditorMapTile, 并返回UI实例 /// - public static UI.EditorColorPicker.EditorColorPickerPanel Open_EditorColorPicker() + public static UI.MapEditorMapTile.MapEditorMapTilePanel Open_MapEditorMapTile() { - return OpenUi(UiNames.EditorColorPicker); + return OpenUi(UiNames.MapEditorMapTile); } /// - /// 隐藏 EditorColorPicker 的所有实例 + /// 隐藏 MapEditorMapTile 的所有实例 /// - public static void Hide_EditorColorPicker() + public static void Hide_MapEditorMapTile() { - var uiInstance = Get_EditorColorPicker_Instance(); + var uiInstance = Get_MapEditorMapTile_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.HideUi(); @@ -167,11 +168,11 @@ } /// - /// 销毁 EditorColorPicker 的所有实例 + /// 销毁 MapEditorMapTile 的所有实例 /// - public static void Destroy_EditorColorPicker() + public static void Destroy_MapEditorMapTile() { - var uiInstance = Get_EditorColorPicker_Instance(); + var uiInstance = Get_MapEditorMapTile_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.Destroy(); @@ -179,35 +180,35 @@ } /// - /// 获取所有 EditorColorPicker 的实例, 如果没有实例, 则返回一个空数组 + /// 获取所有 MapEditorMapTile 的实例, 如果没有实例, 则返回一个空数组 /// - public static UI.EditorColorPicker.EditorColorPickerPanel[] Get_EditorColorPicker_Instance() + public static UI.MapEditorMapTile.MapEditorMapTilePanel[] Get_MapEditorMapTile_Instance() { - return GetUiInstance(nameof(UI.EditorColorPicker.EditorColorPicker)); + return GetUiInstance(nameof(UI.MapEditorMapTile.MapEditorMapTile)); } /// - /// 创建 EditorDungeonGroup, 并返回UI实例, 该函数不会打开 Ui + /// 创建 MapEditorMapLayer, 并返回UI实例, 该函数不会打开 Ui /// - public static UI.EditorDungeonGroup.EditorDungeonGroupPanel Create_EditorDungeonGroup() + public static UI.MapEditorMapLayer.MapEditorMapLayerPanel Create_MapEditorMapLayer() { - return CreateUi(UiNames.EditorDungeonGroup); + return CreateUi(UiNames.MapEditorMapLayer); } /// - /// 打开 EditorDungeonGroup, 并返回UI实例 + /// 打开 MapEditorMapLayer, 并返回UI实例 /// - public static UI.EditorDungeonGroup.EditorDungeonGroupPanel Open_EditorDungeonGroup() + public static UI.MapEditorMapLayer.MapEditorMapLayerPanel Open_MapEditorMapLayer() { - return OpenUi(UiNames.EditorDungeonGroup); + return OpenUi(UiNames.MapEditorMapLayer); } /// - /// 隐藏 EditorDungeonGroup 的所有实例 + /// 隐藏 MapEditorMapLayer 的所有实例 /// - public static void Hide_EditorDungeonGroup() + public static void Hide_MapEditorMapLayer() { - var uiInstance = Get_EditorDungeonGroup_Instance(); + var uiInstance = Get_MapEditorMapLayer_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.HideUi(); @@ -215,11 +216,11 @@ } /// - /// 销毁 EditorDungeonGroup 的所有实例 + /// 销毁 MapEditorMapLayer 的所有实例 /// - public static void Destroy_EditorDungeonGroup() + public static void Destroy_MapEditorMapLayer() { - var uiInstance = Get_EditorDungeonGroup_Instance(); + var uiInstance = Get_MapEditorMapLayer_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.Destroy(); @@ -227,35 +228,35 @@ } /// - /// 获取所有 EditorDungeonGroup 的实例, 如果没有实例, 则返回一个空数组 + /// 获取所有 MapEditorMapLayer 的实例, 如果没有实例, 则返回一个空数组 /// - public static UI.EditorDungeonGroup.EditorDungeonGroupPanel[] Get_EditorDungeonGroup_Instance() + public static UI.MapEditorMapLayer.MapEditorMapLayerPanel[] Get_MapEditorMapLayer_Instance() { - return GetUiInstance(nameof(UI.EditorDungeonGroup.EditorDungeonGroup)); + return GetUiInstance(nameof(UI.MapEditorMapLayer.MapEditorMapLayer)); } /// - /// 创建 EditorForm, 并返回UI实例, 该函数不会打开 Ui + /// 创建 MapEditor, 并返回UI实例, 该函数不会打开 Ui /// - public static UI.EditorForm.EditorFormPanel Create_EditorForm() + public static UI.MapEditor.MapEditorPanel Create_MapEditor() { - return CreateUi(UiNames.EditorForm); + return CreateUi(UiNames.MapEditor); } /// - /// 打开 EditorForm, 并返回UI实例 + /// 打开 MapEditor, 并返回UI实例 /// - public static UI.EditorForm.EditorFormPanel Open_EditorForm() + public static UI.MapEditor.MapEditorPanel Open_MapEditor() { - return OpenUi(UiNames.EditorForm); + return OpenUi(UiNames.MapEditor); } /// - /// 隐藏 EditorForm 的所有实例 + /// 隐藏 MapEditor 的所有实例 /// - public static void Hide_EditorForm() + public static void Hide_MapEditor() { - var uiInstance = Get_EditorForm_Instance(); + var uiInstance = Get_MapEditor_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.HideUi(); @@ -263,11 +264,11 @@ } /// - /// 销毁 EditorForm 的所有实例 + /// 销毁 MapEditor 的所有实例 /// - public static void Destroy_EditorForm() + public static void Destroy_MapEditor() { - var uiInstance = Get_EditorForm_Instance(); + var uiInstance = Get_MapEditor_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.Destroy(); @@ -275,11 +276,203 @@ } /// - /// 获取所有 EditorForm 的实例, 如果没有实例, 则返回一个空数组 + /// 获取所有 MapEditor 的实例, 如果没有实例, 则返回一个空数组 /// - public static UI.EditorForm.EditorFormPanel[] Get_EditorForm_Instance() + public static UI.MapEditor.MapEditorPanel[] Get_MapEditor_Instance() { - return GetUiInstance(nameof(UI.EditorForm.EditorForm)); + return GetUiInstance(nameof(UI.MapEditor.MapEditor)); + } + + /// + /// 创建 PauseMenu, 并返回UI实例, 该函数不会打开 Ui + /// + public static UI.PauseMenu.PauseMenuPanel Create_PauseMenu() + { + return CreateUi(UiNames.PauseMenu); + } + + /// + /// 打开 PauseMenu, 并返回UI实例 + /// + public static UI.PauseMenu.PauseMenuPanel Open_PauseMenu() + { + return OpenUi(UiNames.PauseMenu); + } + + /// + /// 隐藏 PauseMenu 的所有实例 + /// + public static void Hide_PauseMenu() + { + var uiInstance = Get_PauseMenu_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.HideUi(); + } + } + + /// + /// 销毁 PauseMenu 的所有实例 + /// + public static void Destroy_PauseMenu() + { + var uiInstance = Get_PauseMenu_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.Destroy(); + } + } + + /// + /// 获取所有 PauseMenu 的实例, 如果没有实例, 则返回一个空数组 + /// + public static UI.PauseMenu.PauseMenuPanel[] Get_PauseMenu_Instance() + { + return GetUiInstance(nameof(UI.PauseMenu.PauseMenu)); + } + + /// + /// 创建 MapEditorMapMark, 并返回UI实例, 该函数不会打开 Ui + /// + public static UI.MapEditorMapMark.MapEditorMapMarkPanel Create_MapEditorMapMark() + { + return CreateUi(UiNames.MapEditorMapMark); + } + + /// + /// 打开 MapEditorMapMark, 并返回UI实例 + /// + public static UI.MapEditorMapMark.MapEditorMapMarkPanel Open_MapEditorMapMark() + { + return OpenUi(UiNames.MapEditorMapMark); + } + + /// + /// 隐藏 MapEditorMapMark 的所有实例 + /// + public static void Hide_MapEditorMapMark() + { + var uiInstance = Get_MapEditorMapMark_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.HideUi(); + } + } + + /// + /// 销毁 MapEditorMapMark 的所有实例 + /// + public static void Destroy_MapEditorMapMark() + { + var uiInstance = Get_MapEditorMapMark_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.Destroy(); + } + } + + /// + /// 获取所有 MapEditorMapMark 的实例, 如果没有实例, 则返回一个空数组 + /// + public static UI.MapEditorMapMark.MapEditorMapMarkPanel[] Get_MapEditorMapMark_Instance() + { + return GetUiInstance(nameof(UI.MapEditorMapMark.MapEditorMapMark)); + } + + /// + /// 创建 MapEditorCreateMark, 并返回UI实例, 该函数不会打开 Ui + /// + public static UI.MapEditorCreateMark.MapEditorCreateMarkPanel Create_MapEditorCreateMark() + { + return CreateUi(UiNames.MapEditorCreateMark); + } + + /// + /// 打开 MapEditorCreateMark, 并返回UI实例 + /// + public static UI.MapEditorCreateMark.MapEditorCreateMarkPanel Open_MapEditorCreateMark() + { + return OpenUi(UiNames.MapEditorCreateMark); + } + + /// + /// 隐藏 MapEditorCreateMark 的所有实例 + /// + public static void Hide_MapEditorCreateMark() + { + var uiInstance = Get_MapEditorCreateMark_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.HideUi(); + } + } + + /// + /// 销毁 MapEditorCreateMark 的所有实例 + /// + public static void Destroy_MapEditorCreateMark() + { + var uiInstance = Get_MapEditorCreateMark_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.Destroy(); + } + } + + /// + /// 获取所有 MapEditorCreateMark 的实例, 如果没有实例, 则返回一个空数组 + /// + public static UI.MapEditorCreateMark.MapEditorCreateMarkPanel[] Get_MapEditorCreateMark_Instance() + { + return GetUiInstance(nameof(UI.MapEditorCreateMark.MapEditorCreateMark)); + } + + /// + /// 创建 MapEditorCreateRoom, 并返回UI实例, 该函数不会打开 Ui + /// + public static UI.MapEditorCreateRoom.MapEditorCreateRoomPanel Create_MapEditorCreateRoom() + { + return CreateUi(UiNames.MapEditorCreateRoom); + } + + /// + /// 打开 MapEditorCreateRoom, 并返回UI实例 + /// + public static UI.MapEditorCreateRoom.MapEditorCreateRoomPanel Open_MapEditorCreateRoom() + { + return OpenUi(UiNames.MapEditorCreateRoom); + } + + /// + /// 隐藏 MapEditorCreateRoom 的所有实例 + /// + public static void Hide_MapEditorCreateRoom() + { + var uiInstance = Get_MapEditorCreateRoom_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.HideUi(); + } + } + + /// + /// 销毁 MapEditorCreateRoom 的所有实例 + /// + public static void Destroy_MapEditorCreateRoom() + { + var uiInstance = Get_MapEditorCreateRoom_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.Destroy(); + } + } + + /// + /// 获取所有 MapEditorCreateRoom 的实例, 如果没有实例, 则返回一个空数组 + /// + public static UI.MapEditorCreateRoom.MapEditorCreateRoomPanel[] Get_MapEditorCreateRoom_Instance() + { + return GetUiInstance(nameof(UI.MapEditorCreateRoom.MapEditorCreateRoom)); } /// @@ -379,27 +572,27 @@ } /// - /// 创建 EditorInput, 并返回UI实例, 该函数不会打开 Ui + /// 创建 Debugger, 并返回UI实例, 该函数不会打开 Ui /// - public static UI.EditorInput.EditorInputPanel Create_EditorInput() + public static UI.Debugger.DebuggerPanel Create_Debugger() { - return CreateUi(UiNames.EditorInput); + return CreateUi(UiNames.Debugger); } /// - /// 打开 EditorInput, 并返回UI实例 + /// 打开 Debugger, 并返回UI实例 /// - public static UI.EditorInput.EditorInputPanel Open_EditorInput() + public static UI.Debugger.DebuggerPanel Open_Debugger() { - return OpenUi(UiNames.EditorInput); + return OpenUi(UiNames.Debugger); } /// - /// 隐藏 EditorInput 的所有实例 + /// 隐藏 Debugger 的所有实例 /// - public static void Hide_EditorInput() + public static void Hide_Debugger() { - var uiInstance = Get_EditorInput_Instance(); + var uiInstance = Get_Debugger_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.HideUi(); @@ -407,11 +600,11 @@ } /// - /// 销毁 EditorInput 的所有实例 + /// 销毁 Debugger 的所有实例 /// - public static void Destroy_EditorInput() + public static void Destroy_Debugger() { - var uiInstance = Get_EditorInput_Instance(); + var uiInstance = Get_Debugger_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.Destroy(); @@ -419,443 +612,11 @@ } /// - /// 获取所有 EditorInput 的实例, 如果没有实例, 则返回一个空数组 + /// 获取所有 Debugger 的实例, 如果没有实例, 则返回一个空数组 /// - public static UI.EditorInput.EditorInputPanel[] Get_EditorInput_Instance() + public static UI.Debugger.DebuggerPanel[] Get_Debugger_Instance() { - return GetUiInstance(nameof(UI.EditorInput.EditorInput)); - } - - /// - /// 创建 EditorManager, 并返回UI实例, 该函数不会打开 Ui - /// - public static UI.EditorManager.EditorManagerPanel Create_EditorManager() - { - return CreateUi(UiNames.EditorManager); - } - - /// - /// 打开 EditorManager, 并返回UI实例 - /// - public static UI.EditorManager.EditorManagerPanel Open_EditorManager() - { - return OpenUi(UiNames.EditorManager); - } - - /// - /// 隐藏 EditorManager 的所有实例 - /// - public static void Hide_EditorManager() - { - var uiInstance = Get_EditorManager_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.HideUi(); - } - } - - /// - /// 销毁 EditorManager 的所有实例 - /// - public static void Destroy_EditorManager() - { - var uiInstance = Get_EditorManager_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.Destroy(); - } - } - - /// - /// 获取所有 EditorManager 的实例, 如果没有实例, 则返回一个空数组 - /// - public static UI.EditorManager.EditorManagerPanel[] Get_EditorManager_Instance() - { - return GetUiInstance(nameof(UI.EditorManager.EditorManager)); - } - - /// - /// 创建 EditorTileImage, 并返回UI实例, 该函数不会打开 Ui - /// - public static UI.EditorTileImage.EditorTileImagePanel Create_EditorTileImage() - { - return CreateUi(UiNames.EditorTileImage); - } - - /// - /// 打开 EditorTileImage, 并返回UI实例 - /// - public static UI.EditorTileImage.EditorTileImagePanel Open_EditorTileImage() - { - return OpenUi(UiNames.EditorTileImage); - } - - /// - /// 隐藏 EditorTileImage 的所有实例 - /// - public static void Hide_EditorTileImage() - { - var uiInstance = Get_EditorTileImage_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.HideUi(); - } - } - - /// - /// 销毁 EditorTileImage 的所有实例 - /// - public static void Destroy_EditorTileImage() - { - var uiInstance = Get_EditorTileImage_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.Destroy(); - } - } - - /// - /// 获取所有 EditorTileImage 的实例, 如果没有实例, 则返回一个空数组 - /// - public static UI.EditorTileImage.EditorTileImagePanel[] Get_EditorTileImage_Instance() - { - return GetUiInstance(nameof(UI.EditorTileImage.EditorTileImage)); - } - - /// - /// 创建 EditorTips, 并返回UI实例, 该函数不会打开 Ui - /// - public static UI.EditorTips.EditorTipsPanel Create_EditorTips() - { - return CreateUi(UiNames.EditorTips); - } - - /// - /// 打开 EditorTips, 并返回UI实例 - /// - public static UI.EditorTips.EditorTipsPanel Open_EditorTips() - { - return OpenUi(UiNames.EditorTips); - } - - /// - /// 隐藏 EditorTips 的所有实例 - /// - public static void Hide_EditorTips() - { - var uiInstance = Get_EditorTips_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.HideUi(); - } - } - - /// - /// 销毁 EditorTips 的所有实例 - /// - public static void Destroy_EditorTips() - { - var uiInstance = Get_EditorTips_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.Destroy(); - } - } - - /// - /// 获取所有 EditorTips 的实例, 如果没有实例, 则返回一个空数组 - /// - public static UI.EditorTips.EditorTipsPanel[] Get_EditorTips_Instance() - { - return GetUiInstance(nameof(UI.EditorTips.EditorTips)); - } - - /// - /// 创建 EditorTools, 并返回UI实例, 该函数不会打开 Ui - /// - public static UI.EditorTools.EditorToolsPanel Create_EditorTools() - { - return CreateUi(UiNames.EditorTools); - } - - /// - /// 打开 EditorTools, 并返回UI实例 - /// - public static UI.EditorTools.EditorToolsPanel Open_EditorTools() - { - return OpenUi(UiNames.EditorTools); - } - - /// - /// 隐藏 EditorTools 的所有实例 - /// - public static void Hide_EditorTools() - { - var uiInstance = Get_EditorTools_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.HideUi(); - } - } - - /// - /// 销毁 EditorTools 的所有实例 - /// - public static void Destroy_EditorTools() - { - var uiInstance = Get_EditorTools_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.Destroy(); - } - } - - /// - /// 获取所有 EditorTools 的实例, 如果没有实例, 则返回一个空数组 - /// - public static UI.EditorTools.EditorToolsPanel[] Get_EditorTools_Instance() - { - return GetUiInstance(nameof(UI.EditorTools.EditorTools)); - } - - /// - /// 创建 EditorWindow, 并返回UI实例, 该函数不会打开 Ui - /// - public static UI.EditorWindow.EditorWindowPanel Create_EditorWindow() - { - return CreateUi(UiNames.EditorWindow); - } - - /// - /// 打开 EditorWindow, 并返回UI实例 - /// - public static UI.EditorWindow.EditorWindowPanel Open_EditorWindow() - { - return OpenUi(UiNames.EditorWindow); - } - - /// - /// 隐藏 EditorWindow 的所有实例 - /// - public static void Hide_EditorWindow() - { - var uiInstance = Get_EditorWindow_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.HideUi(); - } - } - - /// - /// 销毁 EditorWindow 的所有实例 - /// - public static void Destroy_EditorWindow() - { - var uiInstance = Get_EditorWindow_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.Destroy(); - } - } - - /// - /// 获取所有 EditorWindow 的实例, 如果没有实例, 则返回一个空数组 - /// - public static UI.EditorWindow.EditorWindowPanel[] Get_EditorWindow_Instance() - { - return GetUiInstance(nameof(UI.EditorWindow.EditorWindow)); - } - - /// - /// 创建 Loading, 并返回UI实例, 该函数不会打开 Ui - /// - public static UI.Loading.LoadingPanel Create_Loading() - { - return CreateUi(UiNames.Loading); - } - - /// - /// 打开 Loading, 并返回UI实例 - /// - public static UI.Loading.LoadingPanel Open_Loading() - { - return OpenUi(UiNames.Loading); - } - - /// - /// 隐藏 Loading 的所有实例 - /// - public static void Hide_Loading() - { - var uiInstance = Get_Loading_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.HideUi(); - } - } - - /// - /// 销毁 Loading 的所有实例 - /// - public static void Destroy_Loading() - { - var uiInstance = Get_Loading_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.Destroy(); - } - } - - /// - /// 获取所有 Loading 的实例, 如果没有实例, 则返回一个空数组 - /// - public static UI.Loading.LoadingPanel[] Get_Loading_Instance() - { - return GetUiInstance(nameof(UI.Loading.Loading)); - } - - /// - /// 创建 Main, 并返回UI实例, 该函数不会打开 Ui - /// - public static UI.Main.MainPanel Create_Main() - { - return CreateUi(UiNames.Main); - } - - /// - /// 打开 Main, 并返回UI实例 - /// - public static UI.Main.MainPanel Open_Main() - { - return OpenUi(UiNames.Main); - } - - /// - /// 隐藏 Main 的所有实例 - /// - public static void Hide_Main() - { - var uiInstance = Get_Main_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.HideUi(); - } - } - - /// - /// 销毁 Main 的所有实例 - /// - public static void Destroy_Main() - { - var uiInstance = Get_Main_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.Destroy(); - } - } - - /// - /// 获取所有 Main 的实例, 如果没有实例, 则返回一个空数组 - /// - public static UI.Main.MainPanel[] Get_Main_Instance() - { - return GetUiInstance(nameof(UI.Main.Main)); - } - - /// - /// 创建 MapEditor, 并返回UI实例, 该函数不会打开 Ui - /// - public static UI.MapEditor.MapEditorPanel Create_MapEditor() - { - return CreateUi(UiNames.MapEditor); - } - - /// - /// 打开 MapEditor, 并返回UI实例 - /// - public static UI.MapEditor.MapEditorPanel Open_MapEditor() - { - return OpenUi(UiNames.MapEditor); - } - - /// - /// 隐藏 MapEditor 的所有实例 - /// - public static void Hide_MapEditor() - { - var uiInstance = Get_MapEditor_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.HideUi(); - } - } - - /// - /// 销毁 MapEditor 的所有实例 - /// - public static void Destroy_MapEditor() - { - var uiInstance = Get_MapEditor_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.Destroy(); - } - } - - /// - /// 获取所有 MapEditor 的实例, 如果没有实例, 则返回一个空数组 - /// - public static UI.MapEditor.MapEditorPanel[] Get_MapEditor_Instance() - { - return GetUiInstance(nameof(UI.MapEditor.MapEditor)); - } - - /// - /// 创建 MapEditorCreateMark, 并返回UI实例, 该函数不会打开 Ui - /// - public static UI.MapEditorCreateMark.MapEditorCreateMarkPanel Create_MapEditorCreateMark() - { - return CreateUi(UiNames.MapEditorCreateMark); - } - - /// - /// 打开 MapEditorCreateMark, 并返回UI实例 - /// - public static UI.MapEditorCreateMark.MapEditorCreateMarkPanel Open_MapEditorCreateMark() - { - return OpenUi(UiNames.MapEditorCreateMark); - } - - /// - /// 隐藏 MapEditorCreateMark 的所有实例 - /// - public static void Hide_MapEditorCreateMark() - { - var uiInstance = Get_MapEditorCreateMark_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.HideUi(); - } - } - - /// - /// 销毁 MapEditorCreateMark 的所有实例 - /// - public static void Destroy_MapEditorCreateMark() - { - var uiInstance = Get_MapEditorCreateMark_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.Destroy(); - } - } - - /// - /// 获取所有 MapEditorCreateMark 的实例, 如果没有实例, 则返回一个空数组 - /// - public static UI.MapEditorCreateMark.MapEditorCreateMarkPanel[] Get_MapEditorCreateMark_Instance() - { - return GetUiInstance(nameof(UI.MapEditorCreateMark.MapEditorCreateMark)); + return GetUiInstance(nameof(UI.Debugger.Debugger)); } /// @@ -907,27 +668,27 @@ } /// - /// 创建 MapEditorCreateRoom, 并返回UI实例, 该函数不会打开 Ui + /// 创建 BottomTips, 并返回UI实例, 该函数不会打开 Ui /// - public static UI.MapEditorCreateRoom.MapEditorCreateRoomPanel Create_MapEditorCreateRoom() + public static UI.BottomTips.BottomTipsPanel Create_BottomTips() { - return CreateUi(UiNames.MapEditorCreateRoom); + return CreateUi(UiNames.BottomTips); } /// - /// 打开 MapEditorCreateRoom, 并返回UI实例 + /// 打开 BottomTips, 并返回UI实例 /// - public static UI.MapEditorCreateRoom.MapEditorCreateRoomPanel Open_MapEditorCreateRoom() + public static UI.BottomTips.BottomTipsPanel Open_BottomTips() { - return OpenUi(UiNames.MapEditorCreateRoom); + return OpenUi(UiNames.BottomTips); } /// - /// 隐藏 MapEditorCreateRoom 的所有实例 + /// 隐藏 BottomTips 的所有实例 /// - public static void Hide_MapEditorCreateRoom() + public static void Hide_BottomTips() { - var uiInstance = Get_MapEditorCreateRoom_Instance(); + var uiInstance = Get_BottomTips_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.HideUi(); @@ -935,11 +696,11 @@ } /// - /// 销毁 MapEditorCreateRoom 的所有实例 + /// 销毁 BottomTips 的所有实例 /// - public static void Destroy_MapEditorCreateRoom() + public static void Destroy_BottomTips() { - var uiInstance = Get_MapEditorCreateRoom_Instance(); + var uiInstance = Get_BottomTips_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.Destroy(); @@ -947,35 +708,35 @@ } /// - /// 获取所有 MapEditorCreateRoom 的实例, 如果没有实例, 则返回一个空数组 + /// 获取所有 BottomTips 的实例, 如果没有实例, 则返回一个空数组 /// - public static UI.MapEditorCreateRoom.MapEditorCreateRoomPanel[] Get_MapEditorCreateRoom_Instance() + public static UI.BottomTips.BottomTipsPanel[] Get_BottomTips_Instance() { - return GetUiInstance(nameof(UI.MapEditorCreateRoom.MapEditorCreateRoom)); + return GetUiInstance(nameof(UI.BottomTips.BottomTips)); } /// - /// 创建 MapEditorMapLayer, 并返回UI实例, 该函数不会打开 Ui + /// 创建 EditorTileImage, 并返回UI实例, 该函数不会打开 Ui /// - public static UI.MapEditorMapLayer.MapEditorMapLayerPanel Create_MapEditorMapLayer() + public static UI.EditorTileImage.EditorTileImagePanel Create_EditorTileImage() { - return CreateUi(UiNames.MapEditorMapLayer); + return CreateUi(UiNames.EditorTileImage); } /// - /// 打开 MapEditorMapLayer, 并返回UI实例 + /// 打开 EditorTileImage, 并返回UI实例 /// - public static UI.MapEditorMapLayer.MapEditorMapLayerPanel Open_MapEditorMapLayer() + public static UI.EditorTileImage.EditorTileImagePanel Open_EditorTileImage() { - return OpenUi(UiNames.MapEditorMapLayer); + return OpenUi(UiNames.EditorTileImage); } /// - /// 隐藏 MapEditorMapLayer 的所有实例 + /// 隐藏 EditorTileImage 的所有实例 /// - public static void Hide_MapEditorMapLayer() + public static void Hide_EditorTileImage() { - var uiInstance = Get_MapEditorMapLayer_Instance(); + var uiInstance = Get_EditorTileImage_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.HideUi(); @@ -983,11 +744,11 @@ } /// - /// 销毁 MapEditorMapLayer 的所有实例 + /// 销毁 EditorTileImage 的所有实例 /// - public static void Destroy_MapEditorMapLayer() + public static void Destroy_EditorTileImage() { - var uiInstance = Get_MapEditorMapLayer_Instance(); + var uiInstance = Get_EditorTileImage_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.Destroy(); @@ -995,35 +756,35 @@ } /// - /// 获取所有 MapEditorMapLayer 的实例, 如果没有实例, 则返回一个空数组 + /// 获取所有 EditorTileImage 的实例, 如果没有实例, 则返回一个空数组 /// - public static UI.MapEditorMapLayer.MapEditorMapLayerPanel[] Get_MapEditorMapLayer_Instance() + public static UI.EditorTileImage.EditorTileImagePanel[] Get_EditorTileImage_Instance() { - return GetUiInstance(nameof(UI.MapEditorMapLayer.MapEditorMapLayer)); + return GetUiInstance(nameof(UI.EditorTileImage.EditorTileImage)); } /// - /// 创建 MapEditorMapMark, 并返回UI实例, 该函数不会打开 Ui + /// 创建 EditorDungeonGroup, 并返回UI实例, 该函数不会打开 Ui /// - public static UI.MapEditorMapMark.MapEditorMapMarkPanel Create_MapEditorMapMark() + public static UI.EditorDungeonGroup.EditorDungeonGroupPanel Create_EditorDungeonGroup() { - return CreateUi(UiNames.MapEditorMapMark); + return CreateUi(UiNames.EditorDungeonGroup); } /// - /// 打开 MapEditorMapMark, 并返回UI实例 + /// 打开 EditorDungeonGroup, 并返回UI实例 /// - public static UI.MapEditorMapMark.MapEditorMapMarkPanel Open_MapEditorMapMark() + public static UI.EditorDungeonGroup.EditorDungeonGroupPanel Open_EditorDungeonGroup() { - return OpenUi(UiNames.MapEditorMapMark); + return OpenUi(UiNames.EditorDungeonGroup); } /// - /// 隐藏 MapEditorMapMark 的所有实例 + /// 隐藏 EditorDungeonGroup 的所有实例 /// - public static void Hide_MapEditorMapMark() + public static void Hide_EditorDungeonGroup() { - var uiInstance = Get_MapEditorMapMark_Instance(); + var uiInstance = Get_EditorDungeonGroup_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.HideUi(); @@ -1031,11 +792,11 @@ } /// - /// 销毁 MapEditorMapMark 的所有实例 + /// 销毁 EditorDungeonGroup 的所有实例 /// - public static void Destroy_MapEditorMapMark() + public static void Destroy_EditorDungeonGroup() { - var uiInstance = Get_MapEditorMapMark_Instance(); + var uiInstance = Get_EditorDungeonGroup_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.Destroy(); @@ -1043,35 +804,35 @@ } /// - /// 获取所有 MapEditorMapMark 的实例, 如果没有实例, 则返回一个空数组 + /// 获取所有 EditorDungeonGroup 的实例, 如果没有实例, 则返回一个空数组 /// - public static UI.MapEditorMapMark.MapEditorMapMarkPanel[] Get_MapEditorMapMark_Instance() + public static UI.EditorDungeonGroup.EditorDungeonGroupPanel[] Get_EditorDungeonGroup_Instance() { - return GetUiInstance(nameof(UI.MapEditorMapMark.MapEditorMapMark)); + return GetUiInstance(nameof(UI.EditorDungeonGroup.EditorDungeonGroup)); } /// - /// 创建 MapEditorMapTile, 并返回UI实例, 该函数不会打开 Ui + /// 创建 EditorForm, 并返回UI实例, 该函数不会打开 Ui /// - public static UI.MapEditorMapTile.MapEditorMapTilePanel Create_MapEditorMapTile() + public static UI.EditorForm.EditorFormPanel Create_EditorForm() { - return CreateUi(UiNames.MapEditorMapTile); + return CreateUi(UiNames.EditorForm); } /// - /// 打开 MapEditorMapTile, 并返回UI实例 + /// 打开 EditorForm, 并返回UI实例 /// - public static UI.MapEditorMapTile.MapEditorMapTilePanel Open_MapEditorMapTile() + public static UI.EditorForm.EditorFormPanel Open_EditorForm() { - return OpenUi(UiNames.MapEditorMapTile); + return OpenUi(UiNames.EditorForm); } /// - /// 隐藏 MapEditorMapTile 的所有实例 + /// 隐藏 EditorForm 的所有实例 /// - public static void Hide_MapEditorMapTile() + public static void Hide_EditorForm() { - var uiInstance = Get_MapEditorMapTile_Instance(); + var uiInstance = Get_EditorForm_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.HideUi(); @@ -1079,11 +840,11 @@ } /// - /// 销毁 MapEditorMapTile 的所有实例 + /// 销毁 EditorForm 的所有实例 /// - public static void Destroy_MapEditorMapTile() + public static void Destroy_EditorForm() { - var uiInstance = Get_MapEditorMapTile_Instance(); + var uiInstance = Get_EditorForm_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.Destroy(); @@ -1091,299 +852,11 @@ } /// - /// 获取所有 MapEditorMapTile 的实例, 如果没有实例, 则返回一个空数组 + /// 获取所有 EditorForm 的实例, 如果没有实例, 则返回一个空数组 /// - public static UI.MapEditorMapTile.MapEditorMapTilePanel[] Get_MapEditorMapTile_Instance() + public static UI.EditorForm.EditorFormPanel[] Get_EditorForm_Instance() { - return GetUiInstance(nameof(UI.MapEditorMapTile.MapEditorMapTile)); - } - - /// - /// 创建 MapEditorProject, 并返回UI实例, 该函数不会打开 Ui - /// - public static UI.MapEditorProject.MapEditorProjectPanel Create_MapEditorProject() - { - return CreateUi(UiNames.MapEditorProject); - } - - /// - /// 打开 MapEditorProject, 并返回UI实例 - /// - public static UI.MapEditorProject.MapEditorProjectPanel Open_MapEditorProject() - { - return OpenUi(UiNames.MapEditorProject); - } - - /// - /// 隐藏 MapEditorProject 的所有实例 - /// - public static void Hide_MapEditorProject() - { - var uiInstance = Get_MapEditorProject_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.HideUi(); - } - } - - /// - /// 销毁 MapEditorProject 的所有实例 - /// - public static void Destroy_MapEditorProject() - { - var uiInstance = Get_MapEditorProject_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.Destroy(); - } - } - - /// - /// 获取所有 MapEditorProject 的实例, 如果没有实例, 则返回一个空数组 - /// - public static UI.MapEditorProject.MapEditorProjectPanel[] Get_MapEditorProject_Instance() - { - return GetUiInstance(nameof(UI.MapEditorProject.MapEditorProject)); - } - - /// - /// 创建 MapEditorSelectObject, 并返回UI实例, 该函数不会打开 Ui - /// - public static UI.MapEditorSelectObject.MapEditorSelectObjectPanel Create_MapEditorSelectObject() - { - return CreateUi(UiNames.MapEditorSelectObject); - } - - /// - /// 打开 MapEditorSelectObject, 并返回UI实例 - /// - public static UI.MapEditorSelectObject.MapEditorSelectObjectPanel Open_MapEditorSelectObject() - { - return OpenUi(UiNames.MapEditorSelectObject); - } - - /// - /// 隐藏 MapEditorSelectObject 的所有实例 - /// - public static void Hide_MapEditorSelectObject() - { - var uiInstance = Get_MapEditorSelectObject_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.HideUi(); - } - } - - /// - /// 销毁 MapEditorSelectObject 的所有实例 - /// - public static void Destroy_MapEditorSelectObject() - { - var uiInstance = Get_MapEditorSelectObject_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.Destroy(); - } - } - - /// - /// 获取所有 MapEditorSelectObject 的实例, 如果没有实例, 则返回一个空数组 - /// - public static UI.MapEditorSelectObject.MapEditorSelectObjectPanel[] Get_MapEditorSelectObject_Instance() - { - return GetUiInstance(nameof(UI.MapEditorSelectObject.MapEditorSelectObject)); - } - - /// - /// 创建 MapEditorTools, 并返回UI实例, 该函数不会打开 Ui - /// - public static UI.MapEditorTools.MapEditorToolsPanel Create_MapEditorTools() - { - return CreateUi(UiNames.MapEditorTools); - } - - /// - /// 打开 MapEditorTools, 并返回UI实例 - /// - public static UI.MapEditorTools.MapEditorToolsPanel Open_MapEditorTools() - { - return OpenUi(UiNames.MapEditorTools); - } - - /// - /// 隐藏 MapEditorTools 的所有实例 - /// - public static void Hide_MapEditorTools() - { - var uiInstance = Get_MapEditorTools_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.HideUi(); - } - } - - /// - /// 销毁 MapEditorTools 的所有实例 - /// - public static void Destroy_MapEditorTools() - { - var uiInstance = Get_MapEditorTools_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.Destroy(); - } - } - - /// - /// 获取所有 MapEditorTools 的实例, 如果没有实例, 则返回一个空数组 - /// - public static UI.MapEditorTools.MapEditorToolsPanel[] Get_MapEditorTools_Instance() - { - return GetUiInstance(nameof(UI.MapEditorTools.MapEditorTools)); - } - - /// - /// 创建 PauseMenu, 并返回UI实例, 该函数不会打开 Ui - /// - public static UI.PauseMenu.PauseMenuPanel Create_PauseMenu() - { - return CreateUi(UiNames.PauseMenu); - } - - /// - /// 打开 PauseMenu, 并返回UI实例 - /// - public static UI.PauseMenu.PauseMenuPanel Open_PauseMenu() - { - return OpenUi(UiNames.PauseMenu); - } - - /// - /// 隐藏 PauseMenu 的所有实例 - /// - public static void Hide_PauseMenu() - { - var uiInstance = Get_PauseMenu_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.HideUi(); - } - } - - /// - /// 销毁 PauseMenu 的所有实例 - /// - public static void Destroy_PauseMenu() - { - var uiInstance = Get_PauseMenu_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.Destroy(); - } - } - - /// - /// 获取所有 PauseMenu 的实例, 如果没有实例, 则返回一个空数组 - /// - public static UI.PauseMenu.PauseMenuPanel[] Get_PauseMenu_Instance() - { - return GetUiInstance(nameof(UI.PauseMenu.PauseMenu)); - } - - /// - /// 创建 RoomMap, 并返回UI实例, 该函数不会打开 Ui - /// - public static UI.RoomMap.RoomMapPanel Create_RoomMap() - { - return CreateUi(UiNames.RoomMap); - } - - /// - /// 打开 RoomMap, 并返回UI实例 - /// - public static UI.RoomMap.RoomMapPanel Open_RoomMap() - { - return OpenUi(UiNames.RoomMap); - } - - /// - /// 隐藏 RoomMap 的所有实例 - /// - public static void Hide_RoomMap() - { - var uiInstance = Get_RoomMap_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.HideUi(); - } - } - - /// - /// 销毁 RoomMap 的所有实例 - /// - public static void Destroy_RoomMap() - { - var uiInstance = Get_RoomMap_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.Destroy(); - } - } - - /// - /// 获取所有 RoomMap 的实例, 如果没有实例, 则返回一个空数组 - /// - public static UI.RoomMap.RoomMapPanel[] Get_RoomMap_Instance() - { - return GetUiInstance(nameof(UI.RoomMap.RoomMap)); - } - - /// - /// 创建 RoomUI, 并返回UI实例, 该函数不会打开 Ui - /// - public static UI.RoomUI.RoomUIPanel Create_RoomUI() - { - return CreateUi(UiNames.RoomUI); - } - - /// - /// 打开 RoomUI, 并返回UI实例 - /// - public static UI.RoomUI.RoomUIPanel Open_RoomUI() - { - return OpenUi(UiNames.RoomUI); - } - - /// - /// 隐藏 RoomUI 的所有实例 - /// - public static void Hide_RoomUI() - { - var uiInstance = Get_RoomUI_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.HideUi(); - } - } - - /// - /// 销毁 RoomUI 的所有实例 - /// - public static void Destroy_RoomUI() - { - var uiInstance = Get_RoomUI_Instance(); - foreach (var uiPanel in uiInstance) - { - uiPanel.Destroy(); - } - } - - /// - /// 获取所有 RoomUI 的实例, 如果没有实例, 则返回一个空数组 - /// - public static UI.RoomUI.RoomUIPanel[] Get_RoomUI_Instance() - { - return GetUiInstance(nameof(UI.RoomUI.RoomUI)); + return GetUiInstance(nameof(UI.EditorForm.EditorForm)); } /// @@ -1435,27 +908,27 @@ } /// - /// 创建 Settlement, 并返回UI实例, 该函数不会打开 Ui + /// 创建 Loading, 并返回UI实例, 该函数不会打开 Ui /// - public static UI.Settlement.SettlementPanel Create_Settlement() + public static UI.Loading.LoadingPanel Create_Loading() { - return CreateUi(UiNames.Settlement); + return CreateUi(UiNames.Loading); } /// - /// 打开 Settlement, 并返回UI实例 + /// 打开 Loading, 并返回UI实例 /// - public static UI.Settlement.SettlementPanel Open_Settlement() + public static UI.Loading.LoadingPanel Open_Loading() { - return OpenUi(UiNames.Settlement); + return OpenUi(UiNames.Loading); } /// - /// 隐藏 Settlement 的所有实例 + /// 隐藏 Loading 的所有实例 /// - public static void Hide_Settlement() + public static void Hide_Loading() { - var uiInstance = Get_Settlement_Instance(); + var uiInstance = Get_Loading_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.HideUi(); @@ -1463,11 +936,11 @@ } /// - /// 销毁 Settlement 的所有实例 + /// 销毁 Loading 的所有实例 /// - public static void Destroy_Settlement() + public static void Destroy_Loading() { - var uiInstance = Get_Settlement_Instance(); + var uiInstance = Get_Loading_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.Destroy(); @@ -1475,11 +948,107 @@ } /// - /// 获取所有 Settlement 的实例, 如果没有实例, 则返回一个空数组 + /// 获取所有 Loading 的实例, 如果没有实例, 则返回一个空数组 /// - public static UI.Settlement.SettlementPanel[] Get_Settlement_Instance() + public static UI.Loading.LoadingPanel[] Get_Loading_Instance() { - return GetUiInstance(nameof(UI.Settlement.Settlement)); + return GetUiInstance(nameof(UI.Loading.Loading)); + } + + /// + /// 创建 WeaponRoulette, 并返回UI实例, 该函数不会打开 Ui + /// + public static UI.WeaponRoulette.WeaponRoulettePanel Create_WeaponRoulette() + { + return CreateUi(UiNames.WeaponRoulette); + } + + /// + /// 打开 WeaponRoulette, 并返回UI实例 + /// + public static UI.WeaponRoulette.WeaponRoulettePanel Open_WeaponRoulette() + { + return OpenUi(UiNames.WeaponRoulette); + } + + /// + /// 隐藏 WeaponRoulette 的所有实例 + /// + public static void Hide_WeaponRoulette() + { + var uiInstance = Get_WeaponRoulette_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.HideUi(); + } + } + + /// + /// 销毁 WeaponRoulette 的所有实例 + /// + public static void Destroy_WeaponRoulette() + { + var uiInstance = Get_WeaponRoulette_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.Destroy(); + } + } + + /// + /// 获取所有 WeaponRoulette 的实例, 如果没有实例, 则返回一个空数组 + /// + public static UI.WeaponRoulette.WeaponRoulettePanel[] Get_WeaponRoulette_Instance() + { + return GetUiInstance(nameof(UI.WeaponRoulette.WeaponRoulette)); + } + + /// + /// 创建 MapEditorTools, 并返回UI实例, 该函数不会打开 Ui + /// + public static UI.MapEditorTools.MapEditorToolsPanel Create_MapEditorTools() + { + return CreateUi(UiNames.MapEditorTools); + } + + /// + /// 打开 MapEditorTools, 并返回UI实例 + /// + public static UI.MapEditorTools.MapEditorToolsPanel Open_MapEditorTools() + { + return OpenUi(UiNames.MapEditorTools); + } + + /// + /// 隐藏 MapEditorTools 的所有实例 + /// + public static void Hide_MapEditorTools() + { + var uiInstance = Get_MapEditorTools_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.HideUi(); + } + } + + /// + /// 销毁 MapEditorTools 的所有实例 + /// + public static void Destroy_MapEditorTools() + { + var uiInstance = Get_MapEditorTools_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.Destroy(); + } + } + + /// + /// 获取所有 MapEditorTools 的实例, 如果没有实例, 则返回一个空数组 + /// + public static UI.MapEditorTools.MapEditorToolsPanel[] Get_MapEditorTools_Instance() + { + return GetUiInstance(nameof(UI.MapEditorTools.MapEditorTools)); } /// @@ -1531,27 +1100,27 @@ } /// - /// 创建 TileSetEditorCombination, 并返回UI实例, 该函数不会打开 Ui + /// 创建 EditorWindow, 并返回UI实例, 该函数不会打开 Ui /// - public static UI.TileSetEditorCombination.TileSetEditorCombinationPanel Create_TileSetEditorCombination() + public static UI.EditorWindow.EditorWindowPanel Create_EditorWindow() { - return CreateUi(UiNames.TileSetEditorCombination); + return CreateUi(UiNames.EditorWindow); } /// - /// 打开 TileSetEditorCombination, 并返回UI实例 + /// 打开 EditorWindow, 并返回UI实例 /// - public static UI.TileSetEditorCombination.TileSetEditorCombinationPanel Open_TileSetEditorCombination() + public static UI.EditorWindow.EditorWindowPanel Open_EditorWindow() { - return OpenUi(UiNames.TileSetEditorCombination); + return OpenUi(UiNames.EditorWindow); } /// - /// 隐藏 TileSetEditorCombination 的所有实例 + /// 隐藏 EditorWindow 的所有实例 /// - public static void Hide_TileSetEditorCombination() + public static void Hide_EditorWindow() { - var uiInstance = Get_TileSetEditorCombination_Instance(); + var uiInstance = Get_EditorWindow_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.HideUi(); @@ -1559,11 +1128,11 @@ } /// - /// 销毁 TileSetEditorCombination 的所有实例 + /// 销毁 EditorWindow 的所有实例 /// - public static void Destroy_TileSetEditorCombination() + public static void Destroy_EditorWindow() { - var uiInstance = Get_TileSetEditorCombination_Instance(); + var uiInstance = Get_EditorWindow_Instance(); foreach (var uiPanel in uiInstance) { uiPanel.Destroy(); @@ -1571,11 +1140,155 @@ } /// - /// 获取所有 TileSetEditorCombination 的实例, 如果没有实例, 则返回一个空数组 + /// 获取所有 EditorWindow 的实例, 如果没有实例, 则返回一个空数组 /// - public static UI.TileSetEditorCombination.TileSetEditorCombinationPanel[] Get_TileSetEditorCombination_Instance() + public static UI.EditorWindow.EditorWindowPanel[] Get_EditorWindow_Instance() { - return GetUiInstance(nameof(UI.TileSetEditorCombination.TileSetEditorCombination)); + return GetUiInstance(nameof(UI.EditorWindow.EditorWindow)); + } + + /// + /// 创建 EditorInput, 并返回UI实例, 该函数不会打开 Ui + /// + public static UI.EditorInput.EditorInputPanel Create_EditorInput() + { + return CreateUi(UiNames.EditorInput); + } + + /// + /// 打开 EditorInput, 并返回UI实例 + /// + public static UI.EditorInput.EditorInputPanel Open_EditorInput() + { + return OpenUi(UiNames.EditorInput); + } + + /// + /// 隐藏 EditorInput 的所有实例 + /// + public static void Hide_EditorInput() + { + var uiInstance = Get_EditorInput_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.HideUi(); + } + } + + /// + /// 销毁 EditorInput 的所有实例 + /// + public static void Destroy_EditorInput() + { + var uiInstance = Get_EditorInput_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.Destroy(); + } + } + + /// + /// 获取所有 EditorInput 的实例, 如果没有实例, 则返回一个空数组 + /// + public static UI.EditorInput.EditorInputPanel[] Get_EditorInput_Instance() + { + return GetUiInstance(nameof(UI.EditorInput.EditorInput)); + } + + /// + /// 创建 RoomMap, 并返回UI实例, 该函数不会打开 Ui + /// + public static UI.RoomMap.RoomMapPanel Create_RoomMap() + { + return CreateUi(UiNames.RoomMap); + } + + /// + /// 打开 RoomMap, 并返回UI实例 + /// + public static UI.RoomMap.RoomMapPanel Open_RoomMap() + { + return OpenUi(UiNames.RoomMap); + } + + /// + /// 隐藏 RoomMap 的所有实例 + /// + public static void Hide_RoomMap() + { + var uiInstance = Get_RoomMap_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.HideUi(); + } + } + + /// + /// 销毁 RoomMap 的所有实例 + /// + public static void Destroy_RoomMap() + { + var uiInstance = Get_RoomMap_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.Destroy(); + } + } + + /// + /// 获取所有 RoomMap 的实例, 如果没有实例, 则返回一个空数组 + /// + public static UI.RoomMap.RoomMapPanel[] Get_RoomMap_Instance() + { + return GetUiInstance(nameof(UI.RoomMap.RoomMap)); + } + + /// + /// 创建 EditorTools, 并返回UI实例, 该函数不会打开 Ui + /// + public static UI.EditorTools.EditorToolsPanel Create_EditorTools() + { + return CreateUi(UiNames.EditorTools); + } + + /// + /// 打开 EditorTools, 并返回UI实例 + /// + public static UI.EditorTools.EditorToolsPanel Open_EditorTools() + { + return OpenUi(UiNames.EditorTools); + } + + /// + /// 隐藏 EditorTools 的所有实例 + /// + public static void Hide_EditorTools() + { + var uiInstance = Get_EditorTools_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.HideUi(); + } + } + + /// + /// 销毁 EditorTools 的所有实例 + /// + public static void Destroy_EditorTools() + { + var uiInstance = Get_EditorTools_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.Destroy(); + } + } + + /// + /// 获取所有 EditorTools 的实例, 如果没有实例, 则返回一个空数组 + /// + public static UI.EditorTools.EditorToolsPanel[] Get_EditorTools_Instance() + { + return GetUiInstance(nameof(UI.EditorTools.EditorTools)); } /// @@ -1627,6 +1340,150 @@ } /// + /// 创建 MapEditorSelectObject, 并返回UI实例, 该函数不会打开 Ui + /// + public static UI.MapEditorSelectObject.MapEditorSelectObjectPanel Create_MapEditorSelectObject() + { + return CreateUi(UiNames.MapEditorSelectObject); + } + + /// + /// 打开 MapEditorSelectObject, 并返回UI实例 + /// + public static UI.MapEditorSelectObject.MapEditorSelectObjectPanel Open_MapEditorSelectObject() + { + return OpenUi(UiNames.MapEditorSelectObject); + } + + /// + /// 隐藏 MapEditorSelectObject 的所有实例 + /// + public static void Hide_MapEditorSelectObject() + { + var uiInstance = Get_MapEditorSelectObject_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.HideUi(); + } + } + + /// + /// 销毁 MapEditorSelectObject 的所有实例 + /// + public static void Destroy_MapEditorSelectObject() + { + var uiInstance = Get_MapEditorSelectObject_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.Destroy(); + } + } + + /// + /// 获取所有 MapEditorSelectObject 的实例, 如果没有实例, 则返回一个空数组 + /// + public static UI.MapEditorSelectObject.MapEditorSelectObjectPanel[] Get_MapEditorSelectObject_Instance() + { + return GetUiInstance(nameof(UI.MapEditorSelectObject.MapEditorSelectObject)); + } + + /// + /// 创建 Settlement, 并返回UI实例, 该函数不会打开 Ui + /// + public static UI.Settlement.SettlementPanel Create_Settlement() + { + return CreateUi(UiNames.Settlement); + } + + /// + /// 打开 Settlement, 并返回UI实例 + /// + public static UI.Settlement.SettlementPanel Open_Settlement() + { + return OpenUi(UiNames.Settlement); + } + + /// + /// 隐藏 Settlement 的所有实例 + /// + public static void Hide_Settlement() + { + var uiInstance = Get_Settlement_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.HideUi(); + } + } + + /// + /// 销毁 Settlement 的所有实例 + /// + public static void Destroy_Settlement() + { + var uiInstance = Get_Settlement_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.Destroy(); + } + } + + /// + /// 获取所有 Settlement 的实例, 如果没有实例, 则返回一个空数组 + /// + public static UI.Settlement.SettlementPanel[] Get_Settlement_Instance() + { + return GetUiInstance(nameof(UI.Settlement.Settlement)); + } + + /// + /// 创建 MapEditorProject, 并返回UI实例, 该函数不会打开 Ui + /// + public static UI.MapEditorProject.MapEditorProjectPanel Create_MapEditorProject() + { + return CreateUi(UiNames.MapEditorProject); + } + + /// + /// 打开 MapEditorProject, 并返回UI实例 + /// + public static UI.MapEditorProject.MapEditorProjectPanel Open_MapEditorProject() + { + return OpenUi(UiNames.MapEditorProject); + } + + /// + /// 隐藏 MapEditorProject 的所有实例 + /// + public static void Hide_MapEditorProject() + { + var uiInstance = Get_MapEditorProject_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.HideUi(); + } + } + + /// + /// 销毁 MapEditorProject 的所有实例 + /// + public static void Destroy_MapEditorProject() + { + var uiInstance = Get_MapEditorProject_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.Destroy(); + } + } + + /// + /// 获取所有 MapEditorProject 的实例, 如果没有实例, 则返回一个空数组 + /// + public static UI.MapEditorProject.MapEditorProjectPanel[] Get_MapEditorProject_Instance() + { + return GetUiInstance(nameof(UI.MapEditorProject.MapEditorProject)); + } + + /// /// 创建 TileSetEditorProject, 并返回UI实例, 该函数不会打开 Ui /// public static UI.TileSetEditorProject.TileSetEditorProjectPanel Create_TileSetEditorProject() @@ -1675,6 +1532,102 @@ } /// + /// 创建 EditorManager, 并返回UI实例, 该函数不会打开 Ui + /// + public static UI.EditorManager.EditorManagerPanel Create_EditorManager() + { + return CreateUi(UiNames.EditorManager); + } + + /// + /// 打开 EditorManager, 并返回UI实例 + /// + public static UI.EditorManager.EditorManagerPanel Open_EditorManager() + { + return OpenUi(UiNames.EditorManager); + } + + /// + /// 隐藏 EditorManager 的所有实例 + /// + public static void Hide_EditorManager() + { + var uiInstance = Get_EditorManager_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.HideUi(); + } + } + + /// + /// 销毁 EditorManager 的所有实例 + /// + public static void Destroy_EditorManager() + { + var uiInstance = Get_EditorManager_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.Destroy(); + } + } + + /// + /// 获取所有 EditorManager 的实例, 如果没有实例, 则返回一个空数组 + /// + public static UI.EditorManager.EditorManagerPanel[] Get_EditorManager_Instance() + { + return GetUiInstance(nameof(UI.EditorManager.EditorManager)); + } + + /// + /// 创建 EditorTips, 并返回UI实例, 该函数不会打开 Ui + /// + public static UI.EditorTips.EditorTipsPanel Create_EditorTips() + { + return CreateUi(UiNames.EditorTips); + } + + /// + /// 打开 EditorTips, 并返回UI实例 + /// + public static UI.EditorTips.EditorTipsPanel Open_EditorTips() + { + return OpenUi(UiNames.EditorTips); + } + + /// + /// 隐藏 EditorTips 的所有实例 + /// + public static void Hide_EditorTips() + { + var uiInstance = Get_EditorTips_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.HideUi(); + } + } + + /// + /// 销毁 EditorTips 的所有实例 + /// + public static void Destroy_EditorTips() + { + var uiInstance = Get_EditorTips_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.Destroy(); + } + } + + /// + /// 获取所有 EditorTips 的实例, 如果没有实例, 则返回一个空数组 + /// + public static UI.EditorTips.EditorTipsPanel[] Get_EditorTips_Instance() + { + return GetUiInstance(nameof(UI.EditorTips.EditorTips)); + } + + /// /// 创建 TileSetEditorTerrain, 并返回UI实例, 该函数不会打开 Ui /// public static UI.TileSetEditorTerrain.TileSetEditorTerrainPanel Create_TileSetEditorTerrain() @@ -1722,4 +1675,100 @@ return GetUiInstance(nameof(UI.TileSetEditorTerrain.TileSetEditorTerrain)); } + /// + /// 创建 EditorColorPicker, 并返回UI实例, 该函数不会打开 Ui + /// + public static UI.EditorColorPicker.EditorColorPickerPanel Create_EditorColorPicker() + { + return CreateUi(UiNames.EditorColorPicker); + } + + /// + /// 打开 EditorColorPicker, 并返回UI实例 + /// + public static UI.EditorColorPicker.EditorColorPickerPanel Open_EditorColorPicker() + { + return OpenUi(UiNames.EditorColorPicker); + } + + /// + /// 隐藏 EditorColorPicker 的所有实例 + /// + public static void Hide_EditorColorPicker() + { + var uiInstance = Get_EditorColorPicker_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.HideUi(); + } + } + + /// + /// 销毁 EditorColorPicker 的所有实例 + /// + public static void Destroy_EditorColorPicker() + { + var uiInstance = Get_EditorColorPicker_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.Destroy(); + } + } + + /// + /// 获取所有 EditorColorPicker 的实例, 如果没有实例, 则返回一个空数组 + /// + public static UI.EditorColorPicker.EditorColorPickerPanel[] Get_EditorColorPicker_Instance() + { + return GetUiInstance(nameof(UI.EditorColorPicker.EditorColorPicker)); + } + + /// + /// 创建 RoomUI, 并返回UI实例, 该函数不会打开 Ui + /// + public static UI.RoomUI.RoomUIPanel Create_RoomUI() + { + return CreateUi(UiNames.RoomUI); + } + + /// + /// 打开 RoomUI, 并返回UI实例 + /// + public static UI.RoomUI.RoomUIPanel Open_RoomUI() + { + return OpenUi(UiNames.RoomUI); + } + + /// + /// 隐藏 RoomUI 的所有实例 + /// + public static void Hide_RoomUI() + { + var uiInstance = Get_RoomUI_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.HideUi(); + } + } + + /// + /// 销毁 RoomUI 的所有实例 + /// + public static void Destroy_RoomUI() + { + var uiInstance = Get_RoomUI_Instance(); + foreach (var uiPanel in uiInstance) + { + uiPanel.Destroy(); + } + } + + /// + /// 获取所有 RoomUI 的实例, 如果没有实例, 则返回一个空数组 + /// + public static UI.RoomUI.RoomUIPanel[] Get_RoomUI_Instance() + { + return GetUiInstance(nameof(UI.RoomUI.RoomUI)); + } + } diff --git a/DungeonShooting_Godot/src/game/room/SceneManager.cs b/DungeonShooting_Godot/src/game/room/SceneManager.cs index 9ebf743..e8f359c 100644 --- a/DungeonShooting_Godot/src/game/room/SceneManager.cs +++ b/DungeonShooting_Godot/src/game/room/SceneManager.cs @@ -1,4 +1,4 @@ - + using Godot; /// @@ -6,14 +6,14 @@ /// public static class SceneManager { - - /// - /// 加载场景 - /// - /// 场景路径 - public static void LoadScene(string path) - { - //var packedScene = ResourceManager.Load(ResourcePath.scene_Room_tscn).Instantiate(); - //SceneRoot.AddChild(RoomManager); - } -} \ No newline at end of file + + /// + /// 加载场景 + /// + /// 场景路径 + public static void LoadScene(string path) + { + //var packedScene = ResourceManager.Load(ResourcePath.scene_Room_tscn).Instantiate(); + //SceneRoot.AddChild(RoomManager); + } +} diff --git a/DungeonShooting_Godot/src/game/ui/roomMap/RoomMapPanel.cs b/DungeonShooting_Godot/src/game/ui/roomMap/RoomMapPanel.cs index bc71185..3009e94 100644 --- a/DungeonShooting_Godot/src/game/ui/roomMap/RoomMapPanel.cs +++ b/DungeonShooting_Godot/src/game/ui/roomMap/RoomMapPanel.cs @@ -64,17 +64,12 @@ { if (UiManager.GetUiInstanceCount(UiManager.UiNames.PauseMenu) == 0) { - World.Current.Pause = true; - _pressMapFlag = true; - _isMagnifyMap = true; - MagnifyMap(); + ExpandMap(); } } else if (!InputManager.Map && _isMagnifyMap) //还原小地图 { - ResetMap(); - _isMagnifyMap = false; - World.Current.Pause = false; + ShrinkMap(); } } @@ -175,6 +170,27 @@ } } + /// + /// 执行展开地图 + /// + public void ExpandMap() + { + World.Current.Pause = true; + _pressMapFlag = true; + _isMagnifyMap = true; + MagnifyMap(); + } + + /// + /// 执行收起地图 + /// + public void ShrinkMap() + { + ResetMap(); + _isMagnifyMap = false; + World.Current.Pause = false; + } + private void OnDrawContainerResized() { S_Mark.Instance.Position = S_DrawContainer.Instance.Size / 2; diff --git a/DungeonShooting_Godot/src/game/ui/roomUI/RoomUI.cs b/DungeonShooting_Godot/src/game/ui/roomUI/RoomUI.cs index 1dfdf85..6af1137 100644 --- a/DungeonShooting_Godot/src/game/ui/roomUI/RoomUI.cs +++ b/DungeonShooting_Godot/src/game/ui/roomUI/RoomUI.cs @@ -45,6 +45,19 @@ private Control _L_Control; /// + /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: RoomUI.WeaponRoulette + /// + public WeaponRoulette L_WeaponRoulette + { + get + { + if (_L_WeaponRoulette == null) _L_WeaponRoulette = new WeaponRoulette((RoomUIPanel)this, GetNode("WeaponRoulette")); + return _L_WeaponRoulette; + } + } + private WeaponRoulette _L_WeaponRoulette; + + /// /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: RoomUI.RoomMap /// public RoomMap L_RoomMap @@ -79,9 +92,14 @@ { var inst1 = this; - RecordNestedUi(inst1.L_RoomMap.Instance, null, UiManager.RecordType.Open); - inst1.L_RoomMap.Instance.OnCreateUi(); - inst1.L_RoomMap.Instance.OnInitNestedUi(); + RecordNestedUi(inst1.L_WeaponRoulette.Instance, null, UiManager.RecordType.Open); + inst1.L_WeaponRoulette.Instance.OnCreateUi(); + inst1.L_WeaponRoulette.Instance.OnInitNestedUi(); + + var inst2 = this; + RecordNestedUi(inst2.L_RoomMap.Instance, null, UiManager.RecordType.Open); + inst2.L_RoomMap.Instance.OnCreateUi(); + inst2.L_RoomMap.Instance.OnInitNestedUi(); } @@ -641,6 +659,22 @@ } /// + /// 类型: , 路径: RoomUI.WeaponRoulette + /// + public class WeaponRoulette : UiNode + { + public WeaponRoulette(RoomUIPanel uiPanel, UI.WeaponRoulette.WeaponRoulettePanel node) : base(uiPanel, node) { } + public override WeaponRoulette Clone() + { + var uiNode = new WeaponRoulette(UiPanel, (UI.WeaponRoulette.WeaponRoulettePanel)Instance.Duplicate()); + UiPanel.RecordNestedUi(uiNode.Instance, this, UiManager.RecordType.Open); + uiNode.Instance.OnCreateUi(); + uiNode.Instance.OnInitNestedUi(); + return uiNode; + } + } + + /// /// 类型: , 路径: RoomUI.RoomMap /// public class RoomMap : UiNode @@ -802,6 +836,11 @@ public Control S_Control => L_Control; /// + /// 场景中唯一名称的节点, 节点类型: , 节点路径: RoomUI.WeaponRoulette + /// + public WeaponRoulette S_WeaponRoulette => L_WeaponRoulette; + + /// /// 场景中唯一名称的节点, 节点类型: , 节点路径: RoomUI.RoomMap /// public RoomMap S_RoomMap => L_RoomMap; diff --git a/DungeonShooting_Godot/src/game/ui/roomUI/RoomUIPanel.cs b/DungeonShooting_Godot/src/game/ui/roomUI/RoomUIPanel.cs index 70dfb0d..466618c 100644 --- a/DungeonShooting_Godot/src/game/ui/roomUI/RoomUIPanel.cs +++ b/DungeonShooting_Godot/src/game/ui/roomUI/RoomUIPanel.cs @@ -16,6 +16,8 @@ private EventFactory _factory; + private bool _showMap = false; + public override void OnCreateUi() { _reloadBar = new ReloadBarHandler(L_ReloadBar); @@ -64,6 +66,8 @@ _weaponBar.Process(delta); _activePropBar.Process(delta); _lifeBar.Process(delta); + + } //玩家拾起道具, 弹出提示 diff --git a/DungeonShooting_Godot/src/game/ui/weaponRoulette/WeaponRoulette.cs b/DungeonShooting_Godot/src/game/ui/weaponRoulette/WeaponRoulette.cs new file mode 100644 index 0000000..a078918 --- /dev/null +++ b/DungeonShooting_Godot/src/game/ui/weaponRoulette/WeaponRoulette.cs @@ -0,0 +1,307 @@ +namespace UI.WeaponRoulette; + +/// +/// Ui代码, 该类是根据ui场景自动生成的, 请不要手动编辑该类, 以免造成代码丢失 +/// +public abstract partial class WeaponRoulette : UiBase +{ + /// + /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: WeaponRoulette.Bg + /// + public Bg L_Bg + { + get + { + if (_L_Bg == null) _L_Bg = new Bg((WeaponRoulettePanel)this, GetNode("Bg")); + return _L_Bg; + } + } + private Bg _L_Bg; + + /// + /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: WeaponRoulette.Control + /// + public Control L_Control + { + get + { + if (_L_Control == null) _L_Control = new Control((WeaponRoulettePanel)this, GetNode("Control")); + return _L_Control; + } + } + private Control _L_Control; + + /// + /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: WeaponRoulette.MouseArea + /// + public MouseArea L_MouseArea + { + get + { + if (_L_MouseArea == null) _L_MouseArea = new MouseArea((WeaponRoulettePanel)this, GetNode("MouseArea")); + return _L_MouseArea; + } + } + private MouseArea _L_MouseArea; + + + public WeaponRoulette() : base(nameof(WeaponRoulette)) + { + } + + public sealed override void OnInitNestedUi() + { + _ = L_Control.L_RouletteBg.L_WeaponSlotNode; + + } + + /// + /// 类型: , 路径: WeaponRoulette.Bg + /// + public class Bg : UiNode + { + public Bg(WeaponRoulettePanel uiPanel, Godot.ColorRect node) : base(uiPanel, node) { } + public override Bg Clone() => new (UiPanel, (Godot.ColorRect)Instance.Duplicate()); + } + + /// + /// 类型: , 路径: WeaponRoulette.Control.RouletteBg.WeaponSlotNode.Control.WeaponIcon + /// + public class WeaponIcon : UiNode + { + public WeaponIcon(WeaponRoulettePanel uiPanel, Godot.Sprite2D node) : base(uiPanel, node) { } + public override WeaponIcon Clone() => new (UiPanel, (Godot.Sprite2D)Instance.Duplicate()); + } + + /// + /// 类型: , 路径: WeaponRoulette.Control.RouletteBg.WeaponSlotNode.Control.AmmoLabel + /// + public class AmmoLabel : UiNode + { + public AmmoLabel(WeaponRoulettePanel uiPanel, Godot.Label node) : base(uiPanel, node) { } + public override AmmoLabel Clone() => new (UiPanel, (Godot.Label)Instance.Duplicate()); + } + + /// + /// 类型: , 路径: WeaponRoulette.Control.RouletteBg.WeaponSlotNode.Control + /// + public class Control_1 : UiNode + { + /// + /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: WeaponRoulette.Control.RouletteBg.WeaponSlotNode.WeaponIcon + /// + public WeaponIcon L_WeaponIcon + { + get + { + if (_L_WeaponIcon == null) _L_WeaponIcon = new WeaponIcon(UiPanel, Instance.GetNode("WeaponIcon")); + return _L_WeaponIcon; + } + } + private WeaponIcon _L_WeaponIcon; + + /// + /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: WeaponRoulette.Control.RouletteBg.WeaponSlotNode.AmmoLabel + /// + public AmmoLabel L_AmmoLabel + { + get + { + if (_L_AmmoLabel == null) _L_AmmoLabel = new AmmoLabel(UiPanel, Instance.GetNode("AmmoLabel")); + return _L_AmmoLabel; + } + } + private AmmoLabel _L_AmmoLabel; + + public Control_1(WeaponRoulettePanel uiPanel, Godot.Control node) : base(uiPanel, node) { } + public override Control_1 Clone() => new (UiPanel, (Godot.Control)Instance.Duplicate()); + } + + /// + /// 类型: , 路径: WeaponRoulette.Control.RouletteBg.WeaponSlotNode.SlotAreaNode.CollisionPolygon2D + /// + public class CollisionPolygon2D : UiNode + { + public CollisionPolygon2D(WeaponRoulettePanel uiPanel, Godot.CollisionPolygon2D node) : base(uiPanel, node) { } + public override CollisionPolygon2D Clone() => new (UiPanel, (Godot.CollisionPolygon2D)Instance.Duplicate()); + } + + /// + /// 类型: , 路径: WeaponRoulette.Control.RouletteBg.WeaponSlotNode.SlotAreaNode + /// + public class SlotAreaNode : UiNode + { + /// + /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: WeaponRoulette.Control.RouletteBg.WeaponSlotNode.CollisionPolygon2D + /// + public CollisionPolygon2D L_CollisionPolygon2D + { + get + { + if (_L_CollisionPolygon2D == null) _L_CollisionPolygon2D = new CollisionPolygon2D(UiPanel, Instance.GetNode("CollisionPolygon2D")); + return _L_CollisionPolygon2D; + } + } + private CollisionPolygon2D _L_CollisionPolygon2D; + + public SlotAreaNode(WeaponRoulettePanel uiPanel, Godot.Area2D node) : base(uiPanel, node) { } + public override SlotAreaNode Clone() => new (UiPanel, (Godot.Area2D)Instance.Duplicate()); + } + + /// + /// 类型: , 路径: WeaponRoulette.Control.RouletteBg.WeaponSlotNode + /// + public class WeaponSlotNode : UiNode + { + /// + /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: WeaponRoulette.Control.RouletteBg.Control + /// + public Control_1 L_Control + { + get + { + if (_L_Control == null) _L_Control = new Control_1(UiPanel, Instance.GetNode("Control")); + return _L_Control; + } + } + private Control_1 _L_Control; + + /// + /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: WeaponRoulette.Control.RouletteBg.SlotAreaNode + /// + public SlotAreaNode L_SlotAreaNode + { + get + { + if (_L_SlotAreaNode == null) _L_SlotAreaNode = new SlotAreaNode(UiPanel, Instance.GetNode("SlotAreaNode")); + return _L_SlotAreaNode; + } + } + private SlotAreaNode _L_SlotAreaNode; + + public WeaponSlotNode(WeaponRoulettePanel uiPanel, UI.WeaponRoulette.WeaponSlot node) : base(uiPanel, node) { } + public override WeaponSlotNode Clone() => new (UiPanel, (UI.WeaponRoulette.WeaponSlot)Instance.Duplicate()); + } + + /// + /// 类型: , 路径: WeaponRoulette.Control.RouletteBg + /// + public class RouletteBg : UiNode + { + /// + /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: WeaponRoulette.Control.WeaponSlotNode + /// + public WeaponSlotNode L_WeaponSlotNode + { + get + { + if (_L_WeaponSlotNode == null) _L_WeaponSlotNode = new WeaponSlotNode(UiPanel, Instance.GetNode("WeaponSlotNode")); + return _L_WeaponSlotNode; + } + } + private WeaponSlotNode _L_WeaponSlotNode; + + public RouletteBg(WeaponRoulettePanel uiPanel, Godot.Sprite2D node) : base(uiPanel, node) { } + public override RouletteBg Clone() => new (UiPanel, (Godot.Sprite2D)Instance.Duplicate()); + } + + /// + /// 类型: , 路径: WeaponRoulette.Control + /// + public class Control : UiNode + { + /// + /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: WeaponRoulette.RouletteBg + /// + public RouletteBg L_RouletteBg + { + get + { + if (_L_RouletteBg == null) _L_RouletteBg = new RouletteBg(UiPanel, Instance.GetNode("RouletteBg")); + return _L_RouletteBg; + } + } + private RouletteBg _L_RouletteBg; + + public Control(WeaponRoulettePanel uiPanel, Godot.Control node) : base(uiPanel, node) { } + public override Control Clone() => new (UiPanel, (Godot.Control)Instance.Duplicate()); + } + + /// + /// 类型: , 路径: WeaponRoulette.MouseArea.CollisionShape2D + /// + public class CollisionShape2D : UiNode + { + public CollisionShape2D(WeaponRoulettePanel uiPanel, Godot.CollisionShape2D node) : base(uiPanel, node) { } + public override CollisionShape2D Clone() => new (UiPanel, (Godot.CollisionShape2D)Instance.Duplicate()); + } + + /// + /// 类型: , 路径: WeaponRoulette.MouseArea + /// + public class MouseArea : UiNode + { + /// + /// 使用 Instance 属性获取当前节点实例对象, 节点类型: , 节点路径: WeaponRoulette.CollisionShape2D + /// + public CollisionShape2D L_CollisionShape2D + { + get + { + if (_L_CollisionShape2D == null) _L_CollisionShape2D = new CollisionShape2D(UiPanel, Instance.GetNode("CollisionShape2D")); + return _L_CollisionShape2D; + } + } + private CollisionShape2D _L_CollisionShape2D; + + public MouseArea(WeaponRoulettePanel uiPanel, Godot.Area2D node) : base(uiPanel, node) { } + public override MouseArea Clone() => new (UiPanel, (Godot.Area2D)Instance.Duplicate()); + } + + + /// + /// 场景中唯一名称的节点, 节点类型: , 节点路径: WeaponRoulette.Bg + /// + public Bg S_Bg => L_Bg; + + /// + /// 场景中唯一名称的节点, 节点类型: , 节点路径: WeaponRoulette.Control.RouletteBg.WeaponSlotNode.Control.WeaponIcon + /// + public WeaponIcon S_WeaponIcon => L_Control.L_RouletteBg.L_WeaponSlotNode.L_Control.L_WeaponIcon; + + /// + /// 场景中唯一名称的节点, 节点类型: , 节点路径: WeaponRoulette.Control.RouletteBg.WeaponSlotNode.Control.AmmoLabel + /// + public AmmoLabel S_AmmoLabel => L_Control.L_RouletteBg.L_WeaponSlotNode.L_Control.L_AmmoLabel; + + /// + /// 场景中唯一名称的节点, 节点类型: , 节点路径: WeaponRoulette.Control.RouletteBg.WeaponSlotNode.SlotAreaNode.CollisionPolygon2D + /// + public CollisionPolygon2D S_CollisionPolygon2D => L_Control.L_RouletteBg.L_WeaponSlotNode.L_SlotAreaNode.L_CollisionPolygon2D; + + /// + /// 场景中唯一名称的节点, 节点类型: , 节点路径: WeaponRoulette.Control.RouletteBg.WeaponSlotNode.SlotAreaNode + /// + public SlotAreaNode S_SlotAreaNode => L_Control.L_RouletteBg.L_WeaponSlotNode.L_SlotAreaNode; + + /// + /// 场景中唯一名称的节点, 节点类型: , 节点路径: WeaponRoulette.Control.RouletteBg.WeaponSlotNode + /// + public WeaponSlotNode S_WeaponSlotNode => L_Control.L_RouletteBg.L_WeaponSlotNode; + + /// + /// 场景中唯一名称的节点, 节点类型: , 节点路径: WeaponRoulette.Control.RouletteBg + /// + public RouletteBg S_RouletteBg => L_Control.L_RouletteBg; + + /// + /// 场景中唯一名称的节点, 节点类型: , 节点路径: WeaponRoulette.MouseArea.CollisionShape2D + /// + public CollisionShape2D S_CollisionShape2D => L_MouseArea.L_CollisionShape2D; + + /// + /// 场景中唯一名称的节点, 节点类型: , 节点路径: WeaponRoulette.MouseArea + /// + public MouseArea S_MouseArea => L_MouseArea; + +} diff --git a/DungeonShooting_Godot/src/game/ui/weaponRoulette/WeaponRoulettePanel.cs b/DungeonShooting_Godot/src/game/ui/weaponRoulette/WeaponRoulettePanel.cs new file mode 100644 index 0000000..165e43b --- /dev/null +++ b/DungeonShooting_Godot/src/game/ui/weaponRoulette/WeaponRoulettePanel.cs @@ -0,0 +1,150 @@ +using System.Collections.Generic; +using Godot; + +namespace UI.WeaponRoulette; + +/// +/// 武器轮盘 +/// +public partial class WeaponRoulettePanel : WeaponRoulette +{ + /// + /// 武器槽数量 + /// + public const int SlotCount = 6; + + //是否展开轮盘 + private bool _pressRouletteFlag = false; + private bool _isMagnifyRoulette = false; + //所有武器插槽 + private List _slotNodes = new List(); + + public override void OnCreateUi() + { + S_RouletteBg.Instance.Visible = false; + S_Bg.Instance.Visible = false; + + //创建武器插槽 + for (var i = 0; i < SlotCount; i++) + { + var angle = i * (360f / SlotCount); + var clone = S_WeaponSlotNode.CloneAndPut(); + var collisionPolygon2D = clone.L_SlotAreaNode.L_CollisionPolygon2D.Instance; + var sectorPolygon = Utils.CreateSectorPolygon(0, 100, 360f / SlotCount, 4); + collisionPolygon2D.Polygon = sectorPolygon; + clone.Instance.RotationDegrees = angle; + clone.L_Control.Instance.RotationDegrees = -angle; + clone.L_Control.L_WeaponIcon.Instance.Material = (Material)S_WeaponSlotNode.L_Control.L_WeaponIcon.Instance.Material.Duplicate(); + _slotNodes.Add(clone); + } + + S_WeaponSlotNode.QueueFree(); + + SetEnableSectorCollision(false); + } + + public override void OnDestroyUi() + { + + } + + public override void Process(float delta) + { + if (!InputManager.Roulette) + { + _pressRouletteFlag = false; + } + + //按下地图按键 + if (InputManager.Roulette && !_isMagnifyRoulette) //打开轮盘 + { + if (UiManager.GetUiInstanceCount(UiManager.UiNames.PauseMenu) == 0) + { + ExpandRoulette(); + } + } + else if (!InputManager.Roulette && _isMagnifyRoulette) //缩小轮盘 + { + ShrinkRoulette(); + } + + + if (InputManager.Roulette) + { + S_MouseArea.Instance.GlobalPosition = GetGlobalMousePosition(); + } + } + + private void ExpandRoulette() + { + World.Current.Pause = true; + _pressRouletteFlag = true; + _isMagnifyRoulette = true; + + S_RouletteBg.Instance.Visible = true; + S_Bg.Instance.Visible = true; + SetEnableSectorCollision(true); + RefreshWeapon(); + } + + private void ShrinkRoulette() + { + S_RouletteBg.Instance.Visible = false; + S_Bg.Instance.Visible = false; + + _isMagnifyRoulette = false; + World.Current.Pause = false; + SetEnableSectorCollision(false); + } + + //设置是否启用扇形碰撞检测 + private void SetEnableSectorCollision(bool enable) + { + S_MouseArea.Instance.Monitorable = enable; + foreach (var weaponSlotNode in _slotNodes) + { + weaponSlotNode.L_SlotAreaNode.Instance.Monitorable = enable; + } + } + + //更新显示的武器 + private void RefreshWeapon() + { + var current = Player.Current; + if (current == null) + { + foreach (var slotNode in _slotNodes) + { + slotNode.L_Control.Instance.Visible = false; + } + + return; + } + + var weapons = current.WeaponPack.ItemSlot; + for (var i = 0; i < _slotNodes.Count; i++) + { + var slotNode = _slotNodes[i]; + slotNode.L_Control.Instance.Visible = true; + if (weapons.Length > i) + { + var weapon = weapons[i]; + if (weapon != null) + { + slotNode.L_Control.Instance.Visible = true; + slotNode.L_Control.L_WeaponIcon.Instance.Texture = weapon.GetDefaultTexture(); + slotNode.L_Control.L_AmmoLabel.Instance.Text = + (weapon.CurrAmmo + weapon.ResidueAmmo).ToString() + "/" + weapon.Attribute.MaxAmmoCapacity; + } + else + { + slotNode.L_Control.Instance.Visible = false; + } + } + else + { + slotNode.L_Control.Instance.Visible = false; + } + } + } +} diff --git a/DungeonShooting_Godot/src/game/ui/weaponRoulette/WeaponSlot.cs b/DungeonShooting_Godot/src/game/ui/weaponRoulette/WeaponSlot.cs new file mode 100644 index 0000000..37922c1 --- /dev/null +++ b/DungeonShooting_Godot/src/game/ui/weaponRoulette/WeaponSlot.cs @@ -0,0 +1,30 @@ +using Godot; + +namespace UI.WeaponRoulette; + +public partial class WeaponSlot : Node2D, IUiNodeScript +{ + private WeaponRoulette.WeaponSlotNode _node; + public void SetUiNode(IUiNode uiNode) + { + _node = (WeaponRoulette.WeaponSlotNode)uiNode; + _node.L_SlotAreaNode.Instance.AreaEntered += OnAreaEntered; + _node.L_SlotAreaNode.Instance.AreaExited += OnAreaExited; + } + + public void OnDestroy() + { + } + + private void OnAreaEntered(Area2D other) + { + _node.Instance.Scale = new Vector2(1.1f, 1.1f); + _node.L_Control.L_WeaponIcon.Instance.Material.SetShaderMaterialParameter(ShaderParamNames.OutlineColor, Colors.White); + } + + private void OnAreaExited(Area2D other) + { + _node.Instance.Scale = Vector2.One; + _node.L_Control.L_WeaponIcon.Instance.Material.SetShaderMaterialParameter(ShaderParamNames.OutlineColor, Colors.Black); + } +} \ No newline at end of file diff --git a/DungeonShooting_Godot/src/test/TestPerfectPixelScene.cs b/DungeonShooting_Godot/src/test/TestPerfectPixelScene.cs index 1878e8a..583d4e1 100644 --- a/DungeonShooting_Godot/src/test/TestPerfectPixelScene.cs +++ b/DungeonShooting_Godot/src/test/TestPerfectPixelScene.cs @@ -3,79 +3,79 @@ public partial class TestPerfectPixelScene : Node2D { - public enum HandlerType - { - UnHandler, - NormalHandler, - OffsetHandler - } + public enum HandlerType + { + UnHandler, + NormalHandler, + OffsetHandler + } - [Export] - public CharacterBody2D Player; + [Export] + public CharacterBody2D Player; - [Export] - public Label FpsLabel; - - [Export] - public Camera2D Camera2D; + [Export] + public Label FpsLabel; + + [Export] + public Camera2D Camera2D; - [Export] - public float Speed = 50; + [Export] + public float Speed = 50; - [Export] - public float CameraRecoveryScale = 5; + [Export] + public float CameraRecoveryScale = 5; - [Export] - public SubViewportContainer SubViewportContainer; + [Export] + public SubViewportContainer SubViewportContainer; - [Export] - public HandlerType Type; - - private ShaderMaterial _shaderMaterial; - private Vector2 _cameraPos; + [Export] + public HandlerType Type; + + private ShaderMaterial _shaderMaterial; + private Vector2 _cameraPos; - public override void _Ready() - { - if (SubViewportContainer != null) - { - _shaderMaterial = (ShaderMaterial)SubViewportContainer.Material; - } - } + public override void _Ready() + { + if (SubViewportContainer != null) + { + _shaderMaterial = (ShaderMaterial)SubViewportContainer.Material; + } + } - public override void _Process(double delta) - { - InputManager.Update((float)delta); + public override void _Process(double delta) + { + InputManager.Update((float)delta); - - } + + } - public override void _PhysicsProcess(double delta) - { - FpsLabel.Text = "FPS: " + Engine.GetFramesPerSecond(); - Player.Velocity = InputManager.MoveAxis * Speed; - Player.MoveAndSlide(); + public override void _PhysicsProcess(double delta) + { + FpsLabel.Text = "FPS: " + Engine.GetFramesPerSecond(); + Player.Velocity = InputManager.MoveAxis * Speed; + Player.MoveAndSlide(); - var playerPos = Player.GlobalPosition; - //_cameraPos = playerPos; - _cameraPos = _cameraPos.MoveToward(playerPos, playerPos.DistanceTo(_cameraPos) * (float)delta * CameraRecoveryScale); + var playerPos = Player.GlobalPosition; + //_cameraPos = playerPos; + _cameraPos = _cameraPos.MoveToward(playerPos, playerPos.DistanceTo(_cameraPos) * (float)delta * CameraRecoveryScale); - if (Type == HandlerType.UnHandler) - { - Camera2D.GlobalPosition = _cameraPos; - } - else if (Type == HandlerType.NormalHandler) - { - Camera2D.GlobalPosition = _cameraPos.Round(); - } - else if (Type == HandlerType.OffsetHandler) - { - if (_shaderMaterial != null) - { - var cameraPosition = _cameraPos; - var offset = cameraPosition.Round() - cameraPosition; - _shaderMaterial.SetShaderParameter("offset", offset); - Camera2D.GlobalPosition = cameraPosition.Round(); - } - } - } + if (Type == HandlerType.UnHandler) + { + Camera2D.GlobalPosition = _cameraPos; + } + else if (Type == HandlerType.NormalHandler) + { + Camera2D.GlobalPosition = _cameraPos.Round(); + } + else if (Type == HandlerType.OffsetHandler) + { + if (_shaderMaterial != null) + { + var cameraPosition = _cameraPos; + var offset = cameraPosition.Round() - cameraPosition; + _shaderMaterial.SetShaderParameter("offset", offset); + Camera2D.GlobalPosition = cameraPosition.Round(); + } + } + } }