diff --git a/DungeonShooting_Godot/prefab/box/TreasureBox0001.tscn b/DungeonShooting_Godot/prefab/box/TreasureBox0001.tscn index 804110cd..71e3c5e8 100644 --- a/DungeonShooting_Godot/prefab/box/TreasureBox0001.tscn +++ b/DungeonShooting_Godot/prefab/box/TreasureBox0001.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=12 format=3 uid="uid://d2gj0yuup0gdb"] [ext_resource type="Script" path="res://src/game/activity/box/TreasureBox.cs" id="1_wxils"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_l4sas"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_l4sas"] [ext_resource type="Texture2D" uid="uid://dladvmgql1pwe" path="res://resource/sprite/box/TreasureBox0001.png" id="3_eed5t"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_1v1is"] resource_local_to_scene = true shader = ExtResource("2_l4sas") diff --git a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0001.tscn b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0001.tscn index e1ddde3b..750cb3a1 100644 --- a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0001.tscn +++ b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0001.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=7 format=3 uid="uid://bj4kmvt8jg1cf"] [ext_resource type="Script" path="res://src/game/activity/bullet/normal/Bullet.cs" id="1_3d3df"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_mxa72"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_mxa72"] [ext_resource type="SpriteFrames" uid="uid://baoxep7vami72" path="res://resource/spriteFrames/bullet/Bullet0001.tres" id="3_q4a0o"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_w5w0i"] resource_local_to_scene = true shader = ExtResource("2_mxa72") diff --git a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0002.tscn b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0002.tscn index 4441bc7d..6bfb5de7 100644 --- a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0002.tscn +++ b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0002.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://bqkj0rn72ppge"] [ext_resource type="Script" path="res://src/game/activity/bullet/normal/Bullet.cs" id="1_hepay"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_0n2yg"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_0n2yg"] [ext_resource type="SpriteFrames" uid="uid://bpeodjqiy3mil" path="res://resource/spriteFrames/bullet/Bullet0002.tres" id="3_ldd0h"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_v77gw"] resource_local_to_scene = true shader = ExtResource("2_0n2yg") diff --git a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0003.tscn b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0003.tscn index 88082d78..bc835d78 100644 --- a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0003.tscn +++ b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0003.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=7 format=3 uid="uid://ee24ocwk8snj"] [ext_resource type="Script" path="res://src/game/activity/bullet/normal/Bullet.cs" id="1_h6lfm"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_bteri"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_bteri"] [ext_resource type="SpriteFrames" uid="uid://bcnhyin0aufl1" path="res://resource/spriteFrames/bullet/Bullet0003.tres" id="3_qvo0u"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_v77gw"] resource_local_to_scene = true shader = ExtResource("2_bteri") diff --git a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0004.tscn b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0004.tscn index 57e55abf..8223206c 100644 --- a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0004.tscn +++ b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0004.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=12 format=3 uid="uid://d0h4xfi1oqf1l"] [ext_resource type="Script" path="res://src/game/activity/bullet/normal/BoomBullet.cs" id="1_1jbgr"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_w1qob"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_w1qob"] [ext_resource type="SpriteFrames" uid="uid://d3vma1qjo478l" path="res://resource/spriteFrames/bullet/Bullet0004.tres" id="3_bttus"] [ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/common/Smoke.png" id="3_ofn8c"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_v77gw"] resource_local_to_scene = true shader = ExtResource("2_w1qob") diff --git a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0005.tscn b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0005.tscn index a6a0493b..0585e3da 100644 --- a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0005.tscn +++ b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0005.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=12 format=3 uid="uid://cjgnw37tqiqh7"] [ext_resource type="Script" path="res://src/game/activity/bullet/normal/BrushBullet.cs" id="1_13wdl"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_v0al6"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_v0al6"] [ext_resource type="SpriteFrames" uid="uid://jj8oh76pi53j" path="res://resource/spriteFrames/bullet/Bullet0005.tres" id="3_mmvqn"] [ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/common/Smoke.png" id="4_esjg6"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_v77gw"] resource_local_to_scene = true shader = ExtResource("2_v0al6") diff --git a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0006.tscn b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0006.tscn index 9e58d27d..44656738 100644 --- a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0006.tscn +++ b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0006.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://c1fx7c1jwil26"] [ext_resource type="Script" path="res://src/game/activity/bullet/normal/TrailBullet.cs" id="1_b8pov"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_iolc6"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_iolc6"] [ext_resource type="SpriteFrames" uid="uid://dx4t45bq8ehhq" path="res://resource/spriteFrames/bullet/Bullet0006.tres" id="3_v2y7a"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_w5w0i"] resource_local_to_scene = true shader = ExtResource("2_iolc6") diff --git a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0007.tscn b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0007.tscn index 4dfced67..1693a687 100644 --- a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0007.tscn +++ b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0007.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://cybey66bhe4ro"] [ext_resource type="Script" path="res://src/game/activity/bullet/normal/Bullet.cs" id="1_h4tn7"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_fgeyt"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_fgeyt"] [ext_resource type="SpriteFrames" uid="uid://bkwoy70bnm74k" path="res://resource/spriteFrames/bullet/Bullet0007.tres" id="3_c1ec6"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_v77gw"] resource_local_to_scene = true shader = ExtResource("2_fgeyt") diff --git a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0008.tscn b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0008.tscn index 838ada7b..e648d196 100644 --- a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0008.tscn +++ b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0008.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://d3dcmte122p6t"] [ext_resource type="Script" path="res://src/game/activity/bullet/normal/ColorBullet.cs" id="1_qqm5l"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_t3qw6"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_t3qw6"] [ext_resource type="SpriteFrames" uid="uid://ubdvau75andr" path="res://resource/spriteFrames/bullet/Bullet0008.tres" id="3_aoni0"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_v77gw"] resource_local_to_scene = true shader = ExtResource("2_t3qw6") diff --git a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0009.tscn b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0009.tscn index 28311636..4e8291e9 100644 --- a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0009.tscn +++ b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0009.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://c4puxmnan51ds"] [ext_resource type="Script" path="res://src/game/activity/bullet/normal/Arrow.cs" id="1_eots7"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_tscmb"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_tscmb"] [ext_resource type="SpriteFrames" uid="uid://cyg3uvbakan08" path="res://resource/spriteFrames/bullet/Bullet0009.tres" id="3_l58ff"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_v77gw"] resource_local_to_scene = true shader = ExtResource("2_tscmb") diff --git a/DungeonShooting_Godot/prefab/currency/Gold1.tscn b/DungeonShooting_Godot/prefab/currency/Gold1.tscn index 5db5a1c2..57994a46 100644 --- a/DungeonShooting_Godot/prefab/currency/Gold1.tscn +++ b/DungeonShooting_Godot/prefab/currency/Gold1.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=24 format=3 uid="uid://bayga6rue4ldm"] [ext_resource type="PackedScene" uid="uid://c7i2q4mx5qp2h" path="res://prefab/currency/GoldTemplate.tscn" id="1_7anjj"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_p7xui"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_p7xui"] [ext_resource type="Texture2D" uid="uid://benn0iaclw8dk" path="res://resource/sprite/currency/Gold_1.png" id="3_lhsna"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_2tpx1"] resource_local_to_scene = true shader = ExtResource("2_p7xui") diff --git a/DungeonShooting_Godot/prefab/currency/Gold10.tscn b/DungeonShooting_Godot/prefab/currency/Gold10.tscn index e7236466..56543f71 100644 --- a/DungeonShooting_Godot/prefab/currency/Gold10.tscn +++ b/DungeonShooting_Godot/prefab/currency/Gold10.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=24 format=3 uid="uid://cpfeog5xk7frv"] [ext_resource type="PackedScene" uid="uid://c7i2q4mx5qp2h" path="res://prefab/currency/GoldTemplate.tscn" id="1_q6rqs"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_fwuy2"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_fwuy2"] [ext_resource type="Texture2D" uid="uid://7dy6itvggpwy" path="res://resource/sprite/currency/Gold_10.png" id="3_x42g4"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_2tpx1"] resource_local_to_scene = true shader = ExtResource("2_fwuy2") diff --git a/DungeonShooting_Godot/prefab/currency/Gold5.tscn b/DungeonShooting_Godot/prefab/currency/Gold5.tscn index 88de932b..5aa77fac 100644 --- a/DungeonShooting_Godot/prefab/currency/Gold5.tscn +++ b/DungeonShooting_Godot/prefab/currency/Gold5.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=24 format=3 uid="uid://dqeph6v1y3ycm"] [ext_resource type="PackedScene" uid="uid://c7i2q4mx5qp2h" path="res://prefab/currency/GoldTemplate.tscn" id="1_t3bsk"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_r5r64"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_r5r64"] [ext_resource type="Texture2D" uid="uid://bfpcqj2x8t2os" path="res://resource/sprite/currency/Gold_5.png" id="3_rf7nc"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_2tpx1"] resource_local_to_scene = true shader = ExtResource("2_r5r64") diff --git a/DungeonShooting_Godot/prefab/currency/GoldTemplate.tscn b/DungeonShooting_Godot/prefab/currency/GoldTemplate.tscn index a759eeb3..55c52e2a 100644 --- a/DungeonShooting_Godot/prefab/currency/GoldTemplate.tscn +++ b/DungeonShooting_Godot/prefab/currency/GoldTemplate.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=6 format=3 uid="uid://c7i2q4mx5qp2h"] [ext_resource type="Script" path="res://src/game/activity/currency/Gold.cs" id="1_p60kl"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_5nps8"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_5nps8"] [ext_resource type="Texture2D" uid="uid://cthwlbqve6i1l" path="res://resource/sprite/currency/Gold_shadow.png" id="3_6xm1s"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_qdjhs"] resource_local_to_scene = true shader = ExtResource("2_5nps8") diff --git a/DungeonShooting_Godot/prefab/effect/enemy/EnemyDead0001.tscn b/DungeonShooting_Godot/prefab/effect/enemy/EnemyDead0001.tscn index 488e2c55..b00a2349 100644 --- a/DungeonShooting_Godot/prefab/effect/enemy/EnemyDead0001.tscn +++ b/DungeonShooting_Godot/prefab/effect/enemy/EnemyDead0001.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=31 format=3 uid="uid://pr88a1phtxgb"] [ext_resource type="Script" path="res://src/game/effects/enemy/EnemyDead0001.cs" id="1_1re5v"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_s7bee"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_s7bee"] [ext_resource type="Texture2D" uid="uid://cn64eauvwx1uj" path="res://resource/sprite/role/enemy0001/enemy0001_Debris.png" id="3_uinig"] [ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/common/Smoke.png" id="4_t55wd"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_s1mj2"] resource_local_to_scene = true shader = ExtResource("2_s7bee") diff --git a/DungeonShooting_Godot/prefab/effect/enemy/EnemyDead0002.tscn b/DungeonShooting_Godot/prefab/effect/enemy/EnemyDead0002.tscn index 310d6fdd..30f4965f 100644 --- a/DungeonShooting_Godot/prefab/effect/enemy/EnemyDead0002.tscn +++ b/DungeonShooting_Godot/prefab/effect/enemy/EnemyDead0002.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=19 format=3 uid="uid://nfx3lhkdhv6a"] [ext_resource type="Script" path="res://src/game/effects/enemy/EnemyDead0002.cs" id="1_ghu6a"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_q163q"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_q163q"] [ext_resource type="Texture2D" uid="uid://x3tjqgdgp43n" path="res://resource/sprite/role/enemy0002/Enemy0002_dead.png" id="3_l0kbp"] [ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/common/Smoke.png" id="4_2wygu"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_s1mj2"] resource_local_to_scene = true shader = ExtResource("2_q163q") diff --git a/DungeonShooting_Godot/prefab/item/Item0001.tscn b/DungeonShooting_Godot/prefab/item/Item0001.tscn index f93433d3..58432f4b 100644 --- a/DungeonShooting_Godot/prefab/item/Item0001.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0001.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=8 format=3 uid="uid://dvvvi26mgoel"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_cilvq"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_1c01w"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_1c01w"] [ext_resource type="Texture2D" uid="uid://b74yx6c2jifyd" path="res://resource/sprite/item/hall_b/item-31.png" id="3_mua0g"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_1c01w") diff --git a/DungeonShooting_Godot/prefab/item/Item0002.tscn b/DungeonShooting_Godot/prefab/item/Item0002.tscn index 0db6d804..95169def 100644 --- a/DungeonShooting_Godot/prefab/item/Item0002.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0002.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=7 format=3 uid="uid://c5e11paqgc8y3"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_qi3y4"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_u3oiv"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_u3oiv"] [ext_resource type="Texture2D" uid="uid://dl15qkga1kc82" path="res://resource/sprite/item/hall_b/item-12.png" id="3_6b42f"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_u3oiv") diff --git a/DungeonShooting_Godot/prefab/item/Item0003.tscn b/DungeonShooting_Godot/prefab/item/Item0003.tscn index 7b242ecc..47997146 100644 --- a/DungeonShooting_Godot/prefab/item/Item0003.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0003.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=8 format=3 uid="uid://cdcpa4l71tkja"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_nuuf6"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_fbidd"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_fbidd"] [ext_resource type="Texture2D" uid="uid://dr2d6toqxxifv" path="res://resource/sprite/item/hall_b/item-32.png" id="3_4miy3"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_fbidd") diff --git a/DungeonShooting_Godot/prefab/item/Item0004.tscn b/DungeonShooting_Godot/prefab/item/Item0004.tscn index 83fec338..acc7fb7f 100644 --- a/DungeonShooting_Godot/prefab/item/Item0004.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0004.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=8 format=3 uid="uid://cjvmk415l1m7w"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_1qbhq"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_lp5ce"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_lp5ce"] [ext_resource type="Texture2D" uid="uid://belr22s50exy8" path="res://resource/sprite/item/hall_b/item-18.png" id="3_px2by"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_lp5ce") diff --git a/DungeonShooting_Godot/prefab/item/Item0005.tscn b/DungeonShooting_Godot/prefab/item/Item0005.tscn index 46425ec8..d18cf259 100644 --- a/DungeonShooting_Godot/prefab/item/Item0005.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0005.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=8 format=3 uid="uid://bxcsdgbhapf15"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_rrftl"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_fshwj"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_fshwj"] [ext_resource type="Texture2D" uid="uid://bijiqseh8y667" path="res://resource/sprite/item/hall_b/item-01.png" id="3_3isqs"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_fshwj") diff --git a/DungeonShooting_Godot/prefab/item/Item0006.tscn b/DungeonShooting_Godot/prefab/item/Item0006.tscn index 0e97ba70..2fa0579f 100644 --- a/DungeonShooting_Godot/prefab/item/Item0006.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0006.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://c7agqlb1d1glq"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_bnso1"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_7ta72"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_7ta72"] [ext_resource type="Texture2D" uid="uid://dim1k57cc7w53" path="res://resource/sprite/item/hall_c/item _06.png" id="3_xwbcy"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_7ta72") diff --git a/DungeonShooting_Godot/prefab/item/Item0007.tscn b/DungeonShooting_Godot/prefab/item/Item0007.tscn index c4d93017..37701de6 100644 --- a/DungeonShooting_Godot/prefab/item/Item0007.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0007.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://du3l8ekq5vcqr"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_33s8u"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_3qjg4"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_3qjg4"] [ext_resource type="Texture2D" uid="uid://c4in5w5wofmgv" path="res://resource/sprite/item/hall_a/Slice_48.png" id="3_oer44"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_3qjg4") diff --git a/DungeonShooting_Godot/prefab/item/Item0008.tscn b/DungeonShooting_Godot/prefab/item/Item0008.tscn index d9fa5f05..204c18fa 100644 --- a/DungeonShooting_Godot/prefab/item/Item0008.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0008.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://0amttjqbukwo"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_ncbpe"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_f8wfl"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_f8wfl"] [ext_resource type="Texture2D" uid="uid://dlhp210kvxqsw" path="res://resource/sprite/item/hall_c/item _08.png" id="3_5siud"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_f8wfl") diff --git a/DungeonShooting_Godot/prefab/item/Item0009.tscn b/DungeonShooting_Godot/prefab/item/Item0009.tscn index 0dc01a3f..ea170615 100644 --- a/DungeonShooting_Godot/prefab/item/Item0009.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0009.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=9 format=3 uid="uid://cemj288a6xd8m"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_100f5"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_xs4fm"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_xs4fm"] [ext_resource type="Texture2D" uid="uid://dduv45hy81atn" path="res://resource/sprite/item/hall_a/Slice_33.png" id="3_p8ykj"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_xs4fm") diff --git a/DungeonShooting_Godot/prefab/item/Item0010.tscn b/DungeonShooting_Godot/prefab/item/Item0010.tscn index a12c25e4..05a990df 100644 --- a/DungeonShooting_Godot/prefab/item/Item0010.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0010.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://dvle8ryfwpncx"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_1vaym"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_8sjd2"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_8sjd2"] [ext_resource type="Texture2D" uid="uid://ucsiiyagcsjl" path="res://resource/sprite/item/hall_a/Slice_54.png" id="3_rasn0"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_8sjd2") diff --git a/DungeonShooting_Godot/prefab/item/Item0011.tscn b/DungeonShooting_Godot/prefab/item/Item0011.tscn index 522a6069..5a2c23c7 100644 --- a/DungeonShooting_Godot/prefab/item/Item0011.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0011.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://ujdk13nr8pf0"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_8227x"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_4wa6q"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_4wa6q"] [ext_resource type="Texture2D" uid="uid://bld54p7gwlrd" path="res://resource/sprite/item/hall_a/Slice_28.png" id="3_yhv2x"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_4wa6q") diff --git a/DungeonShooting_Godot/prefab/item/Item0012.tscn b/DungeonShooting_Godot/prefab/item/Item0012.tscn index 9d032a9b..8cd7b642 100644 --- a/DungeonShooting_Godot/prefab/item/Item0012.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0012.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://cj43h3b0irhq8"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_8skba"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_lxtjp"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_lxtjp"] [ext_resource type="Texture2D" uid="uid://rrxkyras3kdw" path="res://resource/sprite/item/hall_c/item _12.png" id="3_sslpn"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_lxtjp") diff --git a/DungeonShooting_Godot/prefab/item/Item0013.tscn b/DungeonShooting_Godot/prefab/item/Item0013.tscn index 08acb317..802fbe47 100644 --- a/DungeonShooting_Godot/prefab/item/Item0013.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0013.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://je626022bg3t"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_awjys"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_3lobq"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_3lobq"] [ext_resource type="Texture2D" uid="uid://cnpxb0dsnfqn1" path="res://resource/sprite/item/hall_c/item _13.png" id="3_h48fx"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_3lobq") diff --git a/DungeonShooting_Godot/prefab/item/Item0014.tscn b/DungeonShooting_Godot/prefab/item/Item0014.tscn index 69924c10..596b157b 100644 --- a/DungeonShooting_Godot/prefab/item/Item0014.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0014.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://dvmflitcbpffa"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_r3jfj"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_8ndm7"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_8ndm7"] [ext_resource type="Texture2D" uid="uid://i1qpk06s6a4q" path="res://resource/sprite/item/hall_c/item _14.png" id="3_ttnc5"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_8ndm7") diff --git a/DungeonShooting_Godot/prefab/item/Item0015.tscn b/DungeonShooting_Godot/prefab/item/Item0015.tscn index 287bc5da..4ab97e2d 100644 --- a/DungeonShooting_Godot/prefab/item/Item0015.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0015.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://c6mr1q78r7fq"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_4enip"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_hr30a"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_hr30a"] [ext_resource type="Texture2D" uid="uid://daae1qo6hccxb" path="res://resource/sprite/item/hall_a/Slice_46.png" id="3_jgc28"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_hr30a") diff --git a/DungeonShooting_Godot/prefab/item/Item0016.tscn b/DungeonShooting_Godot/prefab/item/Item0016.tscn index a7dee2c9..08466119 100644 --- a/DungeonShooting_Godot/prefab/item/Item0016.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0016.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://b4r3hpil3we2s"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_go51e"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_ot0d2"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_ot0d2"] [ext_resource type="Texture2D" uid="uid://6mkb76o7ja47" path="res://resource/sprite/item/hall_a/Slice_03.png" id="3_bvm05"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_ot0d2") diff --git a/DungeonShooting_Godot/prefab/item/Item0017.tscn b/DungeonShooting_Godot/prefab/item/Item0017.tscn index 5bf250a1..ddff4985 100644 --- a/DungeonShooting_Godot/prefab/item/Item0017.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0017.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://dh4cenmpdj520"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_78dif"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_pybet"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_pybet"] [ext_resource type="Texture2D" uid="uid://cel2hojxm4fgj" path="res://resource/sprite/item/hall_c/item _17.png" id="3_jojl2"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_pybet") diff --git a/DungeonShooting_Godot/prefab/item/Item0018.tscn b/DungeonShooting_Godot/prefab/item/Item0018.tscn index 93174b0c..2a8a8c2a 100644 --- a/DungeonShooting_Godot/prefab/item/Item0018.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0018.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://bgndxlp47w88s"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_7wxee"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_a30jc"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_a30jc"] [ext_resource type="Texture2D" uid="uid://drxs2tol6j4yu" path="res://resource/sprite/item/hall_a/Slice_02.png" id="3_iuab1"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_a30jc") diff --git a/DungeonShooting_Godot/prefab/item/Item0019.tscn b/DungeonShooting_Godot/prefab/item/Item0019.tscn index 6380afa4..6aa43378 100644 --- a/DungeonShooting_Godot/prefab/item/Item0019.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0019.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://dpvwcpqvm0e5"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_j36vv"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_tlcne"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_tlcne"] [ext_resource type="Texture2D" uid="uid://dutmdqi3ygnt1" path="res://resource/sprite/item/hall_a/Slice_38.png" id="3_gwklf"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_tlcne") diff --git a/DungeonShooting_Godot/prefab/item/Item0020.tscn b/DungeonShooting_Godot/prefab/item/Item0020.tscn index 68d6ba5c..60f3c495 100644 --- a/DungeonShooting_Godot/prefab/item/Item0020.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0020.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://b2t1chmutscrc"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_a2uqr"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_pbqh6"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_pbqh6"] [ext_resource type="Texture2D" uid="uid://qbc428calfue" path="res://resource/sprite/item/hall_a/Slice_42.png" id="3_mkcwv"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_pbqh6") diff --git a/DungeonShooting_Godot/prefab/item/Item0021.tscn b/DungeonShooting_Godot/prefab/item/Item0021.tscn index b28b7e4c..4b153fbc 100644 --- a/DungeonShooting_Godot/prefab/item/Item0021.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0021.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://v32g2u0mm0gm"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_25f5i"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_0claj"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_0claj"] [ext_resource type="Texture2D" uid="uid://bt3rvgedbniwq" path="res://resource/sprite/item/hall_a/Slice_22.png" id="3_os210"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_0claj") diff --git a/DungeonShooting_Godot/prefab/item/Item0022.tscn b/DungeonShooting_Godot/prefab/item/Item0022.tscn index 6c71965b..9afa1f53 100644 --- a/DungeonShooting_Godot/prefab/item/Item0022.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0022.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://nhnikrjoc800"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_57gqj"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_a56xb"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_a56xb"] [ext_resource type="Texture2D" uid="uid://d3s00dfmrnt4" path="res://resource/sprite/item/hall_a/Slice_34.png" id="3_yv7yv"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_a56xb") diff --git a/DungeonShooting_Godot/prefab/item/Item0023.tscn b/DungeonShooting_Godot/prefab/item/Item0023.tscn index a7cf0e44..a282d32c 100644 --- a/DungeonShooting_Godot/prefab/item/Item0023.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0023.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://bwvw5mk32hia4"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_guouv"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_olbah"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_olbah"] [ext_resource type="Texture2D" uid="uid://bxgpi41yec4v0" path="res://resource/sprite/item/hall_a/Slice_40.png" id="3_573p0"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_olbah") diff --git a/DungeonShooting_Godot/prefab/item/Item0024.tscn b/DungeonShooting_Godot/prefab/item/Item0024.tscn index 3f0da7a1..0f23b7bd 100644 --- a/DungeonShooting_Godot/prefab/item/Item0024.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0024.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://dl72vryy7pu2s"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_ovsfp"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_424in"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_424in"] [ext_resource type="Texture2D" uid="uid://dsod7xnf66vfr" path="res://resource/sprite/item/hall_a/Slice_31.png" id="3_6jgg6"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_424in") diff --git a/DungeonShooting_Godot/prefab/item/Item0025.tscn b/DungeonShooting_Godot/prefab/item/Item0025.tscn index 77e193ba..315da553 100644 --- a/DungeonShooting_Godot/prefab/item/Item0025.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0025.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://k5ooobibugrh"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_4pwnq"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_ekpbo"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_ekpbo"] [ext_resource type="Texture2D" uid="uid://byjgmf7gf8yo4" path="res://resource/sprite/item/hall_c/item _55.png" id="3_n7ajr"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_ekpbo") diff --git a/DungeonShooting_Godot/prefab/item/Item0026.tscn b/DungeonShooting_Godot/prefab/item/Item0026.tscn index d3b0e2c3..b236c072 100644 --- a/DungeonShooting_Godot/prefab/item/Item0026.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0026.tscn @@ -1,9 +1,10 @@ [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="Shader" path="res://resource/shader/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") diff --git a/DungeonShooting_Godot/prefab/item/Item0031.tscn b/DungeonShooting_Godot/prefab/item/Item0031.tscn index 9789668c..a323976b 100644 --- a/DungeonShooting_Godot/prefab/item/Item0031.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0031.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://bhcqel0ylhti3"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_g24mc"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_05yhp"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_05yhp"] [ext_resource type="Texture2D" uid="uid://c45ffwqrk708i" path="res://resource/sprite/item/hall_c/item _31.png" id="3_7e6ju"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_05yhp") diff --git a/DungeonShooting_Godot/prefab/item/Item0036.tscn b/DungeonShooting_Godot/prefab/item/Item0036.tscn index 80cfacfb..c15168d6 100644 --- a/DungeonShooting_Godot/prefab/item/Item0036.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0036.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://bb8eqxcwl7qf6"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_j2ns6"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_ur1o2"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_ur1o2"] [ext_resource type="Texture2D" uid="uid://d3uyv5ubtig1n" path="res://resource/sprite/item/hall_c/item _36.png" id="3_e7nf3"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_ur1o2") diff --git a/DungeonShooting_Godot/prefab/item/Item0054.tscn b/DungeonShooting_Godot/prefab/item/Item0054.tscn index 7951390d..371e0e8c 100644 --- a/DungeonShooting_Godot/prefab/item/Item0054.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0054.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://gnsdqotyf0e8"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_palmb"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_d2qpb"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_d2qpb"] [ext_resource type="Texture2D" uid="uid://cbuxe012k3pfu" path="res://resource/sprite/item/hall_c/item _54.png" id="3_b15p3"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_d2qpb") diff --git a/DungeonShooting_Godot/prefab/item/Item0056.tscn b/DungeonShooting_Godot/prefab/item/Item0056.tscn index 69a275e6..22706970 100644 --- a/DungeonShooting_Godot/prefab/item/Item0056.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0056.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://bkxabig8chkv6"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_ebb3f"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_5sjig"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_5sjig"] [ext_resource type="Texture2D" uid="uid://u3ri36urv8xn" path="res://resource/sprite/item/hall_c/item _56.png" id="3_bkxin"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_5sjig") diff --git a/DungeonShooting_Godot/prefab/item/Item0057.tscn b/DungeonShooting_Godot/prefab/item/Item0057.tscn index 369a48eb..85ea6d1d 100644 --- a/DungeonShooting_Godot/prefab/item/Item0057.tscn +++ b/DungeonShooting_Godot/prefab/item/Item0057.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://bhwiakjbpjbsb"] [ext_resource type="Script" path="res://src/game/activity/item/ObstacleObject.cs" id="1_fsyqi"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_ot8r8"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_ot8r8"] [ext_resource type="Texture2D" uid="uid://ce4byqcoo2n05" path="res://resource/sprite/item/hall_c/item _57.png" id="3_2h0tv"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wh4b7"] resource_local_to_scene = true shader = ExtResource("2_ot8r8") diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn index e90e3fde..f3d96f04 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=8 format=3 uid="uid://yhewdkpru0up"] [ext_resource type="Script" path="res://src/game/room/RoomDoor.cs" id="1_4c6sw"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_lwx51"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_lwx51"] [ext_resource type="SpriteFrames" uid="uid://3ps6h2f54qa5" path="res://resource/spriteFrames/other/RoomDoor_E_Up.tres" id="3_pjvd8"] [ext_resource type="SpriteFrames" uid="uid://b34tddsmqnj8s" path="res://resource/spriteFrames/other/RoomDoor_E_Down.tres" id="4_ln8k4"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_yvwpk"] resource_local_to_scene = true shader = ExtResource("2_lwx51") diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn index 3f45c241..f52d942c 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=7 format=3 uid="uid://cbtj6bsaqqomt"] [ext_resource type="Script" path="res://src/game/room/RoomDoor.cs" id="1_220be"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_h5ru6"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_h5ru6"] [ext_resource type="SpriteFrames" uid="uid://xs72aopsgpg6" path="res://resource/spriteFrames/other/RoomDoor_N.tres" id="3_apluc"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_yvwpk"] resource_local_to_scene = true shader = ExtResource("2_h5ru6") diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn index 0c2f4ea9..11f0c9e9 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=7 format=3 uid="uid://bvfnnqo71knb"] [ext_resource type="Script" path="res://src/game/room/RoomDoor.cs" id="1_f3qbq"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_6vvcd"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_6vvcd"] [ext_resource type="SpriteFrames" uid="uid://xs72aopsgpg6" path="res://resource/spriteFrames/other/RoomDoor_N.tres" id="3_vbbxp"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_yvwpk"] resource_local_to_scene = true shader = ExtResource("2_6vvcd") diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn index 8b50dbab..f82236a4 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=8 format=3 uid="uid://wmedlesabvr3"] [ext_resource type="Script" path="res://src/game/room/RoomDoor.cs" id="1_agux2"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_wx2w3"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_wx2w3"] [ext_resource type="SpriteFrames" uid="uid://3ps6h2f54qa5" path="res://resource/spriteFrames/other/RoomDoor_E_Up.tres" id="3_jquy0"] [ext_resource type="SpriteFrames" uid="uid://b34tddsmqnj8s" path="res://resource/spriteFrames/other/RoomDoor_E_Down.tres" id="4_6gcqk"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_yvwpk"] resource_local_to_scene = true shader = ExtResource("2_wx2w3") diff --git a/DungeonShooting_Godot/prefab/prop/ActiveProp.tscn b/DungeonShooting_Godot/prefab/prop/ActiveProp.tscn index aa0946aa..e087fc10 100644 --- a/DungeonShooting_Godot/prefab/prop/ActiveProp.tscn +++ b/DungeonShooting_Godot/prefab/prop/ActiveProp.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=6 format=3 uid="uid://drjkrimgii1u0"] [ext_resource type="Script" path="res://src/game/activity/prop/ActiveProp.cs" id="1_n541c"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_75di4"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_75di4"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_mrkt4"] resource_local_to_scene = true diff --git a/DungeonShooting_Godot/prefab/prop/BuffProp.tscn b/DungeonShooting_Godot/prefab/prop/BuffProp.tscn index 331309b8..cbed4fb7 100644 --- a/DungeonShooting_Godot/prefab/prop/BuffProp.tscn +++ b/DungeonShooting_Godot/prefab/prop/BuffProp.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=6 format=3 uid="uid://dfpic4nubu7cf"] [ext_resource type="Script" path="res://src/game/activity/prop/BuffProp.cs" id="1_nlcp6"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_imicp"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_imicp"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_mrkt4"] resource_local_to_scene = true diff --git a/DungeonShooting_Godot/prefab/role/Enemy0001.tscn b/DungeonShooting_Godot/prefab/role/Enemy0001.tscn index 7d513971..95d8d9f0 100644 --- a/DungeonShooting_Godot/prefab/role/Enemy0001.tscn +++ b/DungeonShooting_Godot/prefab/role/Enemy0001.tscn @@ -2,13 +2,14 @@ [ext_resource type="PackedScene" uid="uid://dbrig6dq441wo" path="res://prefab/role/template/EnemyTemplate.tscn" id="1_2vqwe"] [ext_resource type="Script" path="res://src/game/activity/role/enemy/Enemy.cs" id="2_0pcq3"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="3_x8agd"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="3_x8agd"] [ext_resource type="SpriteFrames" uid="uid://cnctpyrn02rhd" path="res://resource/spriteFrames/role/Enemy0001.tres" id="4_qv8w5"] [ext_resource type="Animation" uid="uid://b4mgiysicdk2b" path="res://resource/animation/enemy/Enemy_reset.res" id="5_ffnft"] [ext_resource type="Animation" uid="uid://gvkkxspcdwrp" path="res://resource/animation/enemy/Enemy_astonished.res" id="5_jyt15"] [ext_resource type="Animation" uid="uid://16rxpnsgj5tl" path="res://resource/animation/enemy/Enemy_notify.res" id="6_x8gmo"] [ext_resource type="Animation" uid="uid://cmje7jsgrhgmx" path="res://resource/animation/enemy/Enemy_query.res" id="7_e37p2"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_3nkur"] resource_local_to_scene = true shader = ExtResource("3_x8agd") diff --git a/DungeonShooting_Godot/prefab/role/Enemy0002.tscn b/DungeonShooting_Godot/prefab/role/Enemy0002.tscn index bd2ff436..08c2957d 100644 --- a/DungeonShooting_Godot/prefab/role/Enemy0002.tscn +++ b/DungeonShooting_Godot/prefab/role/Enemy0002.tscn @@ -2,13 +2,14 @@ [ext_resource type="PackedScene" uid="uid://dbrig6dq441wo" path="res://prefab/role/template/EnemyTemplate.tscn" id="1_fanet"] [ext_resource type="Script" path="res://src/game/activity/role/enemy/NoWeaponEnemy.cs" id="2_3an4s"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_yunbp"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_yunbp"] [ext_resource type="SpriteFrames" uid="uid://ctpkpxgcwb583" path="res://resource/spriteFrames/role/Enemy0002.tres" id="3_hbsqi"] [ext_resource type="Animation" uid="uid://gvkkxspcdwrp" path="res://resource/animation/enemy/Enemy_astonished.res" id="5_p7gwr"] [ext_resource type="Animation" uid="uid://b4mgiysicdk2b" path="res://resource/animation/enemy/Enemy_reset.res" id="6_pt7v0"] [ext_resource type="Animation" uid="uid://cmje7jsgrhgmx" path="res://resource/animation/enemy/Enemy_query.res" id="7_h4cls"] [ext_resource type="Animation" uid="uid://16rxpnsgj5tl" path="res://resource/animation/enemy/Enemy_notify.res" id="8_0688j"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_y5nia"] resource_local_to_scene = true shader = ExtResource("2_yunbp") diff --git a/DungeonShooting_Godot/prefab/role/Role0001.tscn b/DungeonShooting_Godot/prefab/role/Role0001.tscn index cb1c9cb4..71e4939e 100644 --- a/DungeonShooting_Godot/prefab/role/Role0001.tscn +++ b/DungeonShooting_Godot/prefab/role/Role0001.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://cyrcv2jdgr8cf" path="res://prefab/role/template/RoleTemplate.tscn" id="1_10c2n"] [ext_resource type="Script" path="res://src/game/activity/role/player/Player.cs" id="2_6xwnt"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="3_rk4gg"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="3_rk4gg"] [ext_resource type="Texture2D" uid="uid://dn58ax3t6rf4x" path="res://resource/sprite/role/common/Role_shadow1.png" id="3_vx7tr"] [ext_resource type="SpriteFrames" uid="uid://n11thtali6es" path="res://resource/spriteFrames/role/Role0001.tres" id="4_galcc"] diff --git a/DungeonShooting_Godot/prefab/role/template/EnemyTemplate.tscn b/DungeonShooting_Godot/prefab/role/template/EnemyTemplate.tscn index ae33b4ae..1f91bec9 100644 --- a/DungeonShooting_Godot/prefab/role/template/EnemyTemplate.tscn +++ b/DungeonShooting_Godot/prefab/role/template/EnemyTemplate.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=5 format=3 uid="uid://dbrig6dq441wo"] [ext_resource type="PackedScene" uid="uid://cyrcv2jdgr8cf" path="res://prefab/role/template/RoleTemplate.tscn" id="1_5po38"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="3_x8agd"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="3_x8agd"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_k8mt5"] resource_local_to_scene = true diff --git a/DungeonShooting_Godot/prefab/role/template/RoleTemplate.tscn b/DungeonShooting_Godot/prefab/role/template/RoleTemplate.tscn index be6716b9..eee034cf 100644 --- a/DungeonShooting_Godot/prefab/role/template/RoleTemplate.tscn +++ b/DungeonShooting_Godot/prefab/role/template/RoleTemplate.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=9 format=3 uid="uid://cyrcv2jdgr8cf"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="1_xk5yk"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="1_xk5yk"] [ext_resource type="Script" path="res://src/game/activity/role/MountRotation.cs" id="2_5ddpw"] [ext_resource type="Script" path="res://src/framework/activity/hurt/HurtArea.cs" id="2_8jnvr"] [ext_resource type="SpriteFrames" uid="uid://c8h5svp76h3kw" path="res://resource/spriteFrames/role/Role_tip.tres" id="3_bo78w"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_yif6x"] resource_local_to_scene = true shader = ExtResource("1_xk5yk") diff --git a/DungeonShooting_Godot/prefab/shell/Shell0001.tscn b/DungeonShooting_Godot/prefab/shell/Shell0001.tscn index c1b25353..945ce6a9 100644 --- a/DungeonShooting_Godot/prefab/shell/Shell0001.tscn +++ b/DungeonShooting_Godot/prefab/shell/Shell0001.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=7 format=3 uid="uid://bj4yr6ru8nhwr"] [ext_resource type="Script" path="res://src/game/activity/common/AutoFreezeObject.cs" id="1_2g70c"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_tdny6"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_tdny6"] [ext_resource type="SpriteFrames" uid="uid://b8gksxl7auquc" path="res://resource/spriteFrames/shell/Shell0001.tres" id="3_ujn5y"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_px12l"] resource_local_to_scene = true shader = ExtResource("2_tdny6") diff --git a/DungeonShooting_Godot/prefab/shell/Shell0002.tscn b/DungeonShooting_Godot/prefab/shell/Shell0002.tscn index aa42706e..ba501b3d 100644 --- a/DungeonShooting_Godot/prefab/shell/Shell0002.tscn +++ b/DungeonShooting_Godot/prefab/shell/Shell0002.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=7 format=3 uid="uid://cdhinm8rnppxt"] [ext_resource type="Script" path="res://src/game/activity/common/AutoFreezeObject.cs" id="1_qi64y"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_s28nu"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_s28nu"] [ext_resource type="SpriteFrames" uid="uid://cj8psdl2pova6" path="res://resource/spriteFrames/shell/Shell0002.tres" id="3_r560h"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_px12l"] resource_local_to_scene = true shader = ExtResource("2_s28nu") diff --git a/DungeonShooting_Godot/prefab/shell/Shell0003.tscn b/DungeonShooting_Godot/prefab/shell/Shell0003.tscn index f50ef2f8..06c43db0 100644 --- a/DungeonShooting_Godot/prefab/shell/Shell0003.tscn +++ b/DungeonShooting_Godot/prefab/shell/Shell0003.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=7 format=3 uid="uid://ba5sxxjaappbj"] [ext_resource type="Script" path="res://src/game/activity/common/AutoFreezeObject.cs" id="1_5hfb2"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_586dn"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_586dn"] [ext_resource type="SpriteFrames" uid="uid://kc1jwvwdg660" path="res://resource/spriteFrames/shell/Shell0003.tres" id="3_j2kre"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_px12l"] resource_local_to_scene = true shader = ExtResource("2_586dn") diff --git a/DungeonShooting_Godot/prefab/shell/Shell0004.tscn b/DungeonShooting_Godot/prefab/shell/Shell0004.tscn index fc18f6bb..e1c4461a 100644 --- a/DungeonShooting_Godot/prefab/shell/Shell0004.tscn +++ b/DungeonShooting_Godot/prefab/shell/Shell0004.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=7 format=3 uid="uid://ycr5mjr25302"] [ext_resource type="Script" path="res://src/game/activity/common/AutoFreezeObject.cs" id="1_ridlp"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_guwkk"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_guwkk"] [ext_resource type="SpriteFrames" uid="uid://b8b0ye3iv1vwp" path="res://resource/spriteFrames/shell/Shell0004.tres" id="3_1s5f3"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_px12l"] resource_local_to_scene = true shader = ExtResource("2_guwkk") diff --git a/DungeonShooting_Godot/prefab/ui/Encyclopedia.tscn b/DungeonShooting_Godot/prefab/ui/Encyclopedia.tscn index 1a028c73..d51ed3f2 100644 --- a/DungeonShooting_Godot/prefab/ui/Encyclopedia.tscn +++ b/DungeonShooting_Godot/prefab/ui/Encyclopedia.tscn @@ -2,16 +2,17 @@ [ext_resource type="Script" path="res://src/game/ui/encyclopedia/EncyclopediaPanel.cs" id="1_hd86y"] [ext_resource type="Texture2D" uid="uid://c0st2iiql8igg" path="res://resource/sprite/ui/encyclopedia/TitleBg.png" id="3_gdtik"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="3_o1xl7"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="3_o1xl7"] [ext_resource type="Texture2D" uid="uid://dahib4qcevboo" path="res://resource/sprite/ui/encyclopedia/Panel2.png" id="4_21546"] [ext_resource type="Texture2D" uid="uid://jb73i5q1dv2a" path="res://resource/sprite/ui/encyclopedia/Tab.png" id="4_nm64b"] [ext_resource type="Texture2D" uid="uid://brevrlfdtllmk" path="res://resource/sprite/ui/encyclopedia/Select.png" id="5_f0anf"] [ext_resource type="Texture2D" uid="uid://cu5y32wfai4pn" path="res://resource/sprite/ui/encyclopedia/Item.png" id="5_niceh"] [ext_resource type="Texture2D" uid="uid://conjg6fw6670x" path="res://resource/sprite/ui/encyclopedia/Panel.png" id="7_hfdat"] -[ext_resource type="Shader" path="res://resource/material/Outline.gdshader" id="9_mmpq6"] +[ext_resource type="Shader" path="res://resource/shader/Outline.gdshader" id="9_mmpq6"] [ext_resource type="Texture2D" uid="uid://cuas0bdjlpmwb" path="res://resource/sprite/ui/encyclopedia/Close.png" id="10_jgsfw"] [ext_resource type="Texture2D" uid="uid://7x5b5ed7hk7w" path="res://resource/sprite/ui/encyclopedia/CloseSelect.png" id="11_247gy"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_gm0bl"] resource_local_to_scene = true shader = ExtResource("3_o1xl7") diff --git a/DungeonShooting_Godot/prefab/ui/MapEditorCreateMark.tscn b/DungeonShooting_Godot/prefab/ui/MapEditorCreateMark.tscn index 2cee601c..138aeef3 100644 --- a/DungeonShooting_Godot/prefab/ui/MapEditorCreateMark.tscn +++ b/DungeonShooting_Godot/prefab/ui/MapEditorCreateMark.tscn @@ -5,12 +5,13 @@ [ext_resource type="Material" uid="uid://cces3bhds7jyi" path="res://resource/material/Blend.tres" id="2_xb40b"] [ext_resource type="Texture2D" uid="uid://c5778ntk2rdon" path="res://resource/sprite/ui/commonIcon/Delete.png" id="3_7xihk"] [ext_resource type="Texture2D" uid="uid://dligpyhp72sg7" path="res://resource/sprite/ui/commonIcon/Right.png" id="3_v5clf"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="4_7uegb"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="4_7uegb"] [ext_resource type="Script" path="res://src/game/ui/mapEditorCreateMark/attribute/NumberAttribute.cs" id="6_1ym7l"] [ext_resource type="Script" path="res://src/game/ui/mapEditorCreateMark/attribute/ObjectAttribute.cs" id="7_516p2"] [ext_resource type="Script" path="res://src/game/ui/mapEditorCreateMark/attribute/OptionAttribute.cs" id="7_o1tg2"] [ext_resource type="Texture2D" uid="uid://dggb6p4sdmfry" path="res://resource/sprite/ui/commonIcon/Edit.png" id="7_yeuy4"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_ywcv8"] resource_local_to_scene = true shader = ExtResource("4_7uegb") diff --git a/DungeonShooting_Godot/prefab/ui/MapEditorMapMark.tscn b/DungeonShooting_Godot/prefab/ui/MapEditorMapMark.tscn index 6f07965b..c5db108e 100644 --- a/DungeonShooting_Godot/prefab/ui/MapEditorMapMark.tscn +++ b/DungeonShooting_Godot/prefab/ui/MapEditorMapMark.tscn @@ -6,9 +6,10 @@ [ext_resource type="Texture2D" uid="uid://c5778ntk2rdon" path="res://resource/sprite/ui/commonIcon/Delete.png" id="4_urq7y"] [ext_resource type="Texture2D" uid="uid://d4gduco55dqpk" path="res://resource/sprite/ui/commonIcon/Down.png" id="5_x5dpw"] [ext_resource type="Texture2D" uid="uid://bn47bmilcw4x0" path="res://resource/sprite/ui/commonIcon/Select2.png" id="6_jpt3y"] -[ext_resource type="Texture2D" uid="uid://dqvg18aacx6db" path="res://resource/sprite/ui/commonIcon/Visible.png" id="6_qiemx"] +[ext_resource type="Texture2D" uid="uid://cpjm2q4000an2" path="res://resource/sprite/ui/commonIcon/Visible.png" id="6_qiemx"] [ext_resource type="Texture2D" uid="uid://btetxb0hqoifk" path="res://resource/sprite/ui/commonIcon/MarkCell_placeholder.png" id="8_p8o70"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="9_vr0bo"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="9_vr0bo"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_xxv8l"] resource_local_to_scene = true diff --git a/DungeonShooting_Godot/prefab/ui/MapEditorSelectObject.tscn b/DungeonShooting_Godot/prefab/ui/MapEditorSelectObject.tscn index 04602561..318c3870 100644 --- a/DungeonShooting_Godot/prefab/ui/MapEditorSelectObject.tscn +++ b/DungeonShooting_Godot/prefab/ui/MapEditorSelectObject.tscn @@ -3,7 +3,8 @@ [ext_resource type="Script" path="res://src/game/ui/mapEditorSelectObject/MapEditorSelectObjectPanel.cs" id="1_hdfkd"] [ext_resource type="Texture2D" uid="uid://bn47bmilcw4x0" path="res://resource/sprite/ui/commonIcon/Select2.png" id="3_4nhjm"] [ext_resource type="Texture2D" uid="uid://blfvsup876agh" path="res://resource/sprite/ui/commonIcon/Search.png" id="3_laasd"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="4_uomdx"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="4_uomdx"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_8bgig"] resource_local_to_scene = true diff --git a/DungeonShooting_Godot/prefab/ui/MapEditorTools.tscn b/DungeonShooting_Godot/prefab/ui/MapEditorTools.tscn index 9805b0d2..ff372202 100644 --- a/DungeonShooting_Godot/prefab/ui/MapEditorTools.tscn +++ b/DungeonShooting_Godot/prefab/ui/MapEditorTools.tscn @@ -6,11 +6,12 @@ [ext_resource type="Script" path="res://src/game/ui/mapEditorTools/DoorDragArea.cs" id="3_3w0w6"] [ext_resource type="Script" path="res://src/game/ui/mapEditorTools/DoorDragButton.cs" id="3_45muq"] [ext_resource type="Texture2D" uid="uid://4wupcp53rrpi" path="res://resource/sprite/ui/mapEditorTools/DoorDragButton.png" id="3_trbb5"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="6_krtnu"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="6_krtnu"] [ext_resource type="Texture2D" uid="uid://dnty1a2tcawos" path="res://resource/sprite/ui/commonIcon/Mark.png" id="6_n7h3g"] [ext_resource type="Script" path="res://src/game/ui/mapEditorTools/MarkTool.cs" id="7_ekxcj"] [ext_resource type="Texture2D" uid="uid://cuntr7hec044f" path="res://resource/sprite/ui/commonIcon/Select.png" id="7_mqmd6"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_wxp5t"] resource_local_to_scene = true shader = ExtResource("6_krtnu") diff --git a/DungeonShooting_Godot/prefab/ui/RoomUI.tscn b/DungeonShooting_Godot/prefab/ui/RoomUI.tscn index b05ed704..aec2060d 100644 --- a/DungeonShooting_Godot/prefab/ui/RoomUI.tscn +++ b/DungeonShooting_Godot/prefab/ui/RoomUI.tscn @@ -13,7 +13,7 @@ [ext_resource type="Texture2D" uid="uid://0swkya4hn82c" path="res://resource/sprite/ui/roomUI/Panel.png" id="10_q3fs8"] [ext_resource type="Texture2D" uid="uid://504f1r0mi33n" path="res://resource/sprite/weapon/weapon0005/Weapon0005.png" id="11_lsai4"] [ext_resource type="Texture2D" uid="uid://bsu7re1lxnr72" path="res://resource/sprite/ui/roomUI/Cooldown.png" id="11_p0smc"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="12_fgyob"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="12_fgyob"] [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"] @@ -87,6 +87,7 @@ grow_vertical = 2 texture = ExtResource("2_ruc0p") [node name="InteractiveIcon" type="TextureRect" parent="InteractiveTipBar"] +visible = false layout_mode = 0 offset_top = -30.0 offset_bottom = -30.0 diff --git a/DungeonShooting_Godot/prefab/ui/WeaponRoulette.tscn b/DungeonShooting_Godot/prefab/ui/WeaponRoulette.tscn index ea763b48..9752ebfc 100644 --- a/DungeonShooting_Godot/prefab/ui/WeaponRoulette.tscn +++ b/DungeonShooting_Godot/prefab/ui/WeaponRoulette.tscn @@ -3,9 +3,10 @@ [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"] +[ext_resource type="Shader" path="res://resource/shader/Outline.gdshader" id="4_p348k"] [ext_resource type="Texture2D" uid="uid://dmm8jw06bhffh" path="res://resource/sprite/ui/commonIcon/Lock.png" id="6_7mog3"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_i1wmw"] resource_local_to_scene = true shader = ExtResource("4_p348k") diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0001.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0001.tscn index 503b43d1..65e0171c 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0001.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0001.tscn @@ -2,9 +2,10 @@ [ext_resource type="PackedScene" uid="uid://cxltmhhp4rbyk" path="res://prefab/weapon/WeaponTemplate.tscn" id="1_ykl0r"] [ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="2_t56pk"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="3_x1q03"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="3_x1q03"] [ext_resource type="SpriteFrames" uid="uid://5m0qs7m4er5u" path="res://resource/spriteFrames/weapon/Weapon0001.tres" id="4_d5c81"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_5bfqf"] resource_local_to_scene = true shader = ExtResource("3_x1q03") diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0002.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0002.tscn index 184f9496..a9050069 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0002.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0002.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="1_hgtyo"] [ext_resource type="PackedScene" uid="uid://cxltmhhp4rbyk" path="res://prefab/weapon/WeaponTemplate.tscn" id="1_r50xc"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_8nvny"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_8nvny"] [ext_resource type="SpriteFrames" uid="uid://domhmo4flmlt0" path="res://resource/spriteFrames/weapon/Weapon0002.tres" id="3_4h3je"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_bywvu"] diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0003.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0003.tscn index dee91f46..f41e58f9 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0003.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0003.tscn @@ -2,9 +2,10 @@ [ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="1_aeolk"] [ext_resource type="PackedScene" uid="uid://cxltmhhp4rbyk" path="res://prefab/weapon/WeaponTemplate.tscn" id="1_c17wt"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_4yjnk"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_4yjnk"] [ext_resource type="SpriteFrames" uid="uid://c7dt1uwdybn5" path="res://resource/spriteFrames/weapon/Weapon0003.tres" id="3_upkjt"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_c6pgc"] resource_local_to_scene = true shader = ExtResource("2_4yjnk") diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0004.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0004.tscn index 5fe50df1..d697d44d 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0004.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0004.tscn @@ -2,9 +2,10 @@ [ext_resource type="PackedScene" uid="uid://cxltmhhp4rbyk" path="res://prefab/weapon/WeaponTemplate.tscn" id="1_kg172"] [ext_resource type="Script" path="res://src/game/activity/weapon/knife/Knife.cs" id="2_v1wer"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="3_63s5g"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="3_63s5g"] [ext_resource type="SpriteFrames" uid="uid://k2tktysa7j86" path="res://resource/spriteFrames/weapon/Weapon0004.tres" id="4_uymcs"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_o5ytq"] resource_local_to_scene = true shader = ExtResource("3_63s5g") diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0005.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0005.tscn index aa2b854b..b76789c8 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0005.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0005.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=8 format=3 uid="uid://bwhi5e52wiiay"] [ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="1_3lu3r"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="1_466gw"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="1_466gw"] [ext_resource type="PackedScene" uid="uid://cxltmhhp4rbyk" path="res://prefab/weapon/WeaponTemplate.tscn" id="1_lyhyf"] [ext_resource type="SpriteFrames" uid="uid://djdvlmqsn8bie" path="res://resource/spriteFrames/weapon/Weapon0005.tres" id="2_m3plc"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_uftuv"] resource_local_to_scene = true shader = ExtResource("1_466gw") diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0006.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0006.tscn index 979066a6..1679421b 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0006.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0006.tscn @@ -2,9 +2,10 @@ [ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="1_5nx8j"] [ext_resource type="PackedScene" uid="uid://cxltmhhp4rbyk" path="res://prefab/weapon/WeaponTemplate.tscn" id="1_kx4jd"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="1_rp1bw"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="1_rp1bw"] [ext_resource type="SpriteFrames" uid="uid://dx1mjbx4acs3q" path="res://resource/spriteFrames/weapon/Weapon0006.tres" id="2_j3sji"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_m6bme"] resource_local_to_scene = true shader = ExtResource("1_rp1bw") diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0007.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0007.tscn index ab2e6a3e..51ac22de 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0007.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0007.tscn @@ -2,9 +2,10 @@ [ext_resource type="PackedScene" uid="uid://cxltmhhp4rbyk" path="res://prefab/weapon/WeaponTemplate.tscn" id="1_5xnlm"] [ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="1_exwbu"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_7rywx"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_7rywx"] [ext_resource type="SpriteFrames" uid="uid://xxyokrbt10xm" path="res://resource/spriteFrames/weapon/Weapon0007.tres" id="3_ms2gs"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_sy2aq"] resource_local_to_scene = true shader = ExtResource("2_7rywx") diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0008.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0008.tscn index d7de3097..39d69092 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0008.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0008.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=11 format=3 uid="uid://yt10i80hs3gt"] [ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="1_l63x2"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="1_mhoa7"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="1_mhoa7"] [ext_resource type="SpriteFrames" uid="uid://b2wpy40adyjs6" path="res://resource/spriteFrames/weapon/Weapon0008.tres" id="2_s0xbw"] [ext_resource type="Animation" uid="uid://v3dltmdstqad" path="res://resource/animation/weapon/Weapon_floodlight.res" id="4_p833u"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_cbiyh"] resource_local_to_scene = true shader = ExtResource("1_mhoa7") diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0009.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0009.tscn index 285a2fa7..b6e99f9f 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0009.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0009.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=11 format=3 uid="uid://2lb2h8qunqyu"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="1_6fbtx"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="1_6fbtx"] [ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="1_eprgt"] [ext_resource type="SpriteFrames" uid="uid://c0xwj3kpk02ua" path="res://resource/spriteFrames/weapon/Weapon0009.tres" id="2_4kxpd"] [ext_resource type="Animation" uid="uid://v3dltmdstqad" path="res://resource/animation/weapon/Weapon_floodlight.res" id="4_o2wqt"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_cbiyh"] resource_local_to_scene = true shader = ExtResource("1_6fbtx") diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0010.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0010.tscn index 571ff9f6..7a3fc74f 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0010.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0010.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=11 format=3 uid="uid://dhnrfqcojc367"] [ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="1_bw5v7"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_pht5a"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_pht5a"] [ext_resource type="SpriteFrames" uid="uid://cd7fhaqk587o2" path="res://resource/spriteFrames/weapon/Weapon0010.tres" id="3_nj0c6"] [ext_resource type="Animation" uid="uid://v3dltmdstqad" path="res://resource/animation/weapon/Weapon_floodlight.res" id="4_2cd01"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_cbiyh"] resource_local_to_scene = true shader = ExtResource("2_pht5a") diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0011.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0011.tscn index 278775a7..8666568d 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0011.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0011.tscn @@ -2,9 +2,10 @@ [ext_resource type="PackedScene" uid="uid://cxltmhhp4rbyk" path="res://prefab/weapon/WeaponTemplate.tscn" id="1_fgcwf"] [ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="2_m84k4"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="3_4rq0j"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="3_4rq0j"] [ext_resource type="SpriteFrames" uid="uid://xvfg1a0xj7ng" path="res://resource/spriteFrames/weapon/Weapon0011.tres" id="4_bnkqc"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_m6bme"] resource_local_to_scene = true shader = ExtResource("3_4rq0j") diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0013.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0013.tscn index c7c9280f..71c44fec 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0013.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0013.tscn @@ -2,9 +2,10 @@ [ext_resource type="PackedScene" uid="uid://cxltmhhp4rbyk" path="res://prefab/weapon/WeaponTemplate.tscn" id="1_f1h8o"] [ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="2_bpgfu"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="3_0l3ip"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="3_0l3ip"] [ext_resource type="SpriteFrames" uid="uid://cawsi08vaqfrn" path="res://resource/spriteFrames/weapon/Weapon0013.tres" id="4_w7ibl"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_sy2aq"] resource_local_to_scene = true shader = ExtResource("3_0l3ip") diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0014.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0014.tscn index b880d0d2..9f8bd62a 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0014.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0014.tscn @@ -2,9 +2,10 @@ [ext_resource type="PackedScene" uid="uid://cxltmhhp4rbyk" path="res://prefab/weapon/WeaponTemplate.tscn" id="1_3op5w"] [ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="2_toxwq"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="3_ch83c"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="3_ch83c"] [ext_resource type="SpriteFrames" uid="uid://taxfr2lcy0f3" path="res://resource/spriteFrames/weapon/Weapon0014.tres" id="4_xdmw2"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_sy2aq"] resource_local_to_scene = true shader = ExtResource("3_ch83c") diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0016.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0016.tscn index 3e1648bb..6e825c64 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0016.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0016.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=11 format=3 uid="uid://b7s3fvpkltk1d"] [ext_resource type="Script" path="res://src/game/activity/weapon/bow/Bow.cs" id="1_k4gvs"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="3_cui8l"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="3_cui8l"] [ext_resource type="SpriteFrames" uid="uid://ccrflh6pjmq7r" path="res://resource/spriteFrames/weapon/Weapon0016.tres" id="4_buwa4"] [ext_resource type="Animation" uid="uid://v3dltmdstqad" path="res://resource/animation/weapon/Weapon_floodlight.res" id="4_nl06y"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_sy2aq"] resource_local_to_scene = true shader = ExtResource("3_cui8l") diff --git a/DungeonShooting_Godot/resource/material/Blend.tres b/DungeonShooting_Godot/resource/material/Blend.tres index 707d8fae..5eb0079e 100644 --- a/DungeonShooting_Godot/resource/material/Blend.tres +++ b/DungeonShooting_Godot/resource/material/Blend.tres @@ -1,6 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://cces3bhds7jyi"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="1"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="1"] + [resource] resource_local_to_scene = true diff --git a/DungeonShooting_Godot/resource/material/Grid.tres b/DungeonShooting_Godot/resource/material/Grid.tres index 2b824d96..402ed518 100644 --- a/DungeonShooting_Godot/resource/material/Grid.tres +++ b/DungeonShooting_Godot/resource/material/Grid.tres @@ -1,6 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://chcpnatun8hlf"] -[ext_resource type="Shader" path="res://resource/material/Grid.gdshader" id="1_xhgfe"] +[ext_resource type="Shader" path="res://resource/shader/Grid.gdshader" id="1_xhgfe"] + [resource] resource_local_to_scene = true diff --git a/DungeonShooting_Godot/resource/material/Outline.tres b/DungeonShooting_Godot/resource/material/Outline.tres index c789b003..c644a629 100644 --- a/DungeonShooting_Godot/resource/material/Outline.tres +++ b/DungeonShooting_Godot/resource/material/Outline.tres @@ -1,6 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://j8t31iuumvhr"] -[ext_resource type="Shader" path="res://resource/material/Outline.gdshader" id="1_neih8"] +[ext_resource type="Shader" path="res://resource/shader/Outline.gdshader" id="1_neih8"] + [resource] resource_local_to_scene = true diff --git a/DungeonShooting_Godot/resource/material/Outline2.tres b/DungeonShooting_Godot/resource/material/Outline2.tres index dd8cdb5b..7cc7bf27 100644 --- a/DungeonShooting_Godot/resource/material/Outline2.tres +++ b/DungeonShooting_Godot/resource/material/Outline2.tres @@ -1,6 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://jywcy17le5fd"] -[ext_resource type="Shader" path="res://resource/material/Outline2.gdshader" id="1_skooq"] +[ext_resource type="Shader" path="res://resource/shader/Outline2.gdshader" id="1_skooq"] + [resource] resource_local_to_scene = true diff --git a/DungeonShooting_Godot/resource/material/RingOfPower.tres b/DungeonShooting_Godot/resource/material/RingOfPower.tres new file mode 100644 index 00000000..91cc9bc8 --- /dev/null +++ b/DungeonShooting_Godot/resource/material/RingOfPower.tres @@ -0,0 +1,13 @@ +[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://civgek3sgwh82"] + +[ext_resource type="Shader" path="res://resource/shader/RingOfPower.gdshader" id="1_skd47"] + +[resource] +shader = ExtResource("1_skd47") +shader_parameter/radius = 0.58 +shader_parameter/thickness = 0.2 +shader_parameter/color = Color(0.9, 0.4, 0.1, 1) +shader_parameter/brightness = 5.0 +shader_parameter/angular_speed = 2.5 +shader_parameter/radial_speed = 1.4 +shader_parameter/alpha = 0.5 diff --git a/DungeonShooting_Godot/resource/material/Sawtooth.tres b/DungeonShooting_Godot/resource/material/Sawtooth.tres index fc7553fb..73c31755 100644 --- a/DungeonShooting_Godot/resource/material/Sawtooth.tres +++ b/DungeonShooting_Godot/resource/material/Sawtooth.tres @@ -1,6 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://cca0ka64xmrrd"] -[ext_resource type="Shader" path="res://resource/material/Sawtooth.gdshader" id="1_nrhtr"] +[ext_resource type="Shader" path="res://resource/shader/Sawtooth.gdshader" id="1_nrhtr"] + [resource] shader = ExtResource("1_nrhtr") diff --git a/DungeonShooting_Godot/resource/material/Blend.gdshader b/DungeonShooting_Godot/resource/shader/Blend.gdshader similarity index 100% rename from DungeonShooting_Godot/resource/material/Blend.gdshader rename to DungeonShooting_Godot/resource/shader/Blend.gdshader diff --git a/DungeonShooting_Godot/resource/material/GodRays.gdshader b/DungeonShooting_Godot/resource/shader/GodRays.gdshader similarity index 100% rename from DungeonShooting_Godot/resource/material/GodRays.gdshader rename to DungeonShooting_Godot/resource/shader/GodRays.gdshader diff --git a/DungeonShooting_Godot/resource/material/Grid.gdshader b/DungeonShooting_Godot/resource/shader/Grid.gdshader similarity index 100% rename from DungeonShooting_Godot/resource/material/Grid.gdshader rename to DungeonShooting_Godot/resource/shader/Grid.gdshader diff --git a/DungeonShooting_Godot/resource/material/Mask.gdshader b/DungeonShooting_Godot/resource/shader/Mask.gdshader similarity index 100% rename from DungeonShooting_Godot/resource/material/Mask.gdshader rename to DungeonShooting_Godot/resource/shader/Mask.gdshader diff --git a/DungeonShooting_Godot/resource/material/OffsetVertex.gdshader b/DungeonShooting_Godot/resource/shader/OffsetVertex.gdshader similarity index 100% rename from DungeonShooting_Godot/resource/material/OffsetVertex.gdshader rename to DungeonShooting_Godot/resource/shader/OffsetVertex.gdshader diff --git a/DungeonShooting_Godot/resource/material/Outline.gdshader b/DungeonShooting_Godot/resource/shader/Outline.gdshader similarity index 100% rename from DungeonShooting_Godot/resource/material/Outline.gdshader rename to DungeonShooting_Godot/resource/shader/Outline.gdshader diff --git a/DungeonShooting_Godot/resource/material/Outline2.gdshader b/DungeonShooting_Godot/resource/shader/Outline2.gdshader similarity index 100% rename from DungeonShooting_Godot/resource/material/Outline2.gdshader rename to DungeonShooting_Godot/resource/shader/Outline2.gdshader diff --git a/DungeonShooting_Godot/resource/shader/RingOfPower.gdshader b/DungeonShooting_Godot/resource/shader/RingOfPower.gdshader new file mode 100644 index 00000000..07a6be9e --- /dev/null +++ b/DungeonShooting_Godot/resource/shader/RingOfPower.gdshader @@ -0,0 +1,23 @@ +shader_type canvas_item; +render_mode blend_add; + +uniform float radius : hint_range(0.0, 1.0, 0.01) = .7; +uniform float thickness : hint_range(0.0, 1.0, 0.01) = .2; +uniform vec4 color : source_color = vec4(0.9, 0.4, 0.1, 1.0); +uniform float brightness : hint_range(0.0, 15.0, 0.01) = 5.0; +uniform float angular_speed : hint_range(-5.0, 5.0, 0.01) = 2.5; +uniform float radial_speed : hint_range(-5.0, 5.0, 0.01) = 1.4; +uniform float alpha : hint_range(0.0, 1.0, 0.01) = .5; +uniform sampler2D noise; + +void fragment() { + vec2 v = vec2(.5) - UV; + float d = length(v) * 2.; + float angle = atan(v.y, v.x) + (TIME * angular_speed); + float thick_ratio = 1. - (abs(d - max(0., radius)) / max(.0001, thickness)); + vec2 polar = fract(vec2(angle / 6.28, d + (TIME * radial_speed))); + vec4 col = thick_ratio * brightness * color; + vec3 tex = texture(noise, polar).rgb; + col.a = (alpha * (tex.r + tex.g + tex.b) * clamp(thick_ratio, 0., 1.)) / 3.; + COLOR = col; +} \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/material/Sawtooth.gdshader b/DungeonShooting_Godot/resource/shader/Sawtooth.gdshader similarity index 100% rename from DungeonShooting_Godot/resource/material/Sawtooth.gdshader rename to DungeonShooting_Godot/resource/shader/Sawtooth.gdshader diff --git a/DungeonShooting_Godot/resource/sprite/noise/Noise0001.png b/DungeonShooting_Godot/resource/sprite/noise/Noise0001.png new file mode 100644 index 00000000..ce5c254e Binary files /dev/null and b/DungeonShooting_Godot/resource/sprite/noise/Noise0001.png differ diff --git a/DungeonShooting_Godot/resource/sprite/noise/Noise0001.png.import b/DungeonShooting_Godot/resource/sprite/noise/Noise0001.png.import new file mode 100644 index 00000000..42f901c4 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/noise/Noise0001.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bcca04qkcqpr6" +path="res://.godot/imported/Noise0001.png-f347b185a3f801652a2962595d57cd1d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/noise/Noise0001.png" +dest_files=["res://.godot/imported/Noise0001.png-f347b185a3f801652a2962595d57cd1d.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/noise/Noise0002.png b/DungeonShooting_Godot/resource/sprite/noise/Noise0002.png new file mode 100644 index 00000000..99915189 Binary files /dev/null and b/DungeonShooting_Godot/resource/sprite/noise/Noise0002.png differ diff --git a/DungeonShooting_Godot/resource/sprite/noise/Noise0002.png.import b/DungeonShooting_Godot/resource/sprite/noise/Noise0002.png.import new file mode 100644 index 00000000..94146ab9 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/noise/Noise0002.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ces7pvy62tufw" +path="res://.godot/imported/Noise0002.png-0473c04b472f8eaad80b32855fae62f6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/noise/Noise0002.png" +dest_files=["res://.godot/imported/Noise0002.png-0473c04b472f8eaad80b32855fae62f6.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 1f298e33..cd517b70 100644 --- a/DungeonShooting_Godot/scene/Hall.tscn +++ b/DungeonShooting_Godot/scene/Hall.tscn @@ -16,7 +16,7 @@ [ext_resource type="Texture2D" uid="uid://dwstu11dix0nq" path="res://resource/sprite/item/hall_b/item-30.png" id="12_agfji"] [ext_resource type="Texture2D" uid="uid://idax7j3m365m" path="res://resource/sprite/item/hall_b/item-010.png" id="13_swsmq"] [ext_resource type="Texture2D" uid="uid://d08oi1tvpcd3p" path="res://resource/sprite/item/hall_b/item-29.png" id="13_unnpl"] -[ext_resource type="Shader" path="res://resource/material/GodRays.gdshader" id="14_8vfgi"] +[ext_resource type="Shader" path="res://resource/shader/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://bm8xcx73s83ku" path="res://resource/sprite/item/hall_a/Slice_47.png" id="16_xj0e1"] @@ -49,6 +49,7 @@ [ext_resource type="Texture2D" uid="uid://ms8v1g1nhqv3" path="res://resource/sprite/item/hall_c/item _07.png" id="49_yocgq"] [ext_resource type="Texture2D" uid="uid://rrxkyras3kdw" path="res://resource/sprite/item/hall_c/item _12.png" id="52_1n1p3"] + [sub_resource type="RectangleShape2D" id="RectangleShape2D_ru8u4"] size = Vector2(19, 10) diff --git a/DungeonShooting_Godot/scene/Main.tscn b/DungeonShooting_Godot/scene/Main.tscn index b55999a2..96c4215e 100644 --- a/DungeonShooting_Godot/scene/Main.tscn +++ b/DungeonShooting_Godot/scene/Main.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://src/game/GameApplication.cs" id="1_mh1cq"] [ext_resource type="Script" path="res://src/game/camera/GameCamera.cs" id="2_2j367"] -[ext_resource type="Shader" path="res://resource/material/OffsetVertex.gdshader" id="2_fxoum"] +[ext_resource type="Shader" path="res://resource/shader/OffsetVertex.gdshader" id="2_fxoum"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_pjtkw"] shader = ExtResource("2_fxoum") diff --git a/DungeonShooting_Godot/scene/test/TestNewTerrain.tscn b/DungeonShooting_Godot/scene/test/TestNewTerrain.tscn index da3d648d..89d2a07b 100644 --- a/DungeonShooting_Godot/scene/test/TestNewTerrain.tscn +++ b/DungeonShooting_Godot/scene/test/TestNewTerrain.tscn @@ -2,11 +2,12 @@ [ext_resource type="Script" path="res://src/test/TestNewTerrain.cs" id="1_68mbo"] [ext_resource type="PackedScene" uid="uid://cxhrcytrx0kcf" path="res://prefab/role/Role0001.tscn" id="3_bo13a"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="4_iy0ux"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="4_iy0ux"] [ext_resource type="Texture2D" uid="uid://bda63puujv425" path="res://resource/sprite/role/common/Role_query.png" id="5_rv0km"] -[ext_resource type="Shader" path="res://resource/material/GodRays.gdshader" id="6_bcjt6"] +[ext_resource type="Shader" path="res://resource/shader/GodRays.gdshader" id="6_bcjt6"] [ext_resource type="Texture2D" uid="uid://uhhfgdhpk7i4" path="res://icon.png" id="7_34lsg"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_7va3f"] resource_local_to_scene = true shader = ExtResource("4_iy0ux") diff --git a/DungeonShooting_Godot/scene/test/TestOutline.tscn b/DungeonShooting_Godot/scene/test/TestOutline.tscn index bced176e..72158519 100644 --- a/DungeonShooting_Godot/scene/test/TestOutline.tscn +++ b/DungeonShooting_Godot/scene/test/TestOutline.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=4 format=3 uid="uid://bbwws7qlqlc0m"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="1_r82n1"] +[ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="1_r82n1"] [ext_resource type="Texture2D" uid="uid://bls55gj8h3mgv" path="res://resource/sprite/prop/buff/BuffProp0001.png" id="2_yce7u"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_lhoej"] shader = ExtResource("1_r82n1") shader_parameter/blend = Color(1, 1, 1, 1) diff --git a/DungeonShooting_Godot/scene/test/TestPerfectPixel.tscn b/DungeonShooting_Godot/scene/test/TestPerfectPixel.tscn index 5e7cd81b..2ace4f76 100644 --- a/DungeonShooting_Godot/scene/test/TestPerfectPixel.tscn +++ b/DungeonShooting_Godot/scene/test/TestPerfectPixel.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=4 format=3 uid="uid://x801hit8cj6w"] -[ext_resource type="Shader" path="res://resource/material/OffsetVertex.gdshader" id="1_8hyja"] +[ext_resource type="Shader" path="res://resource/shader/OffsetVertex.gdshader" id="1_8hyja"] [ext_resource type="PackedScene" uid="uid://b3ybffxcq0kkb" path="res://scene/test/TestPerfectPixelScene.tscn" id="1_l3du1"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_lm6np"] shader = ExtResource("1_8hyja") shader_parameter/offset = Vector2(0, 0) diff --git a/DungeonShooting_Godot/scene/test/TestShader.tscn b/DungeonShooting_Godot/scene/test/TestShader.tscn new file mode 100644 index 00000000..7b705105 --- /dev/null +++ b/DungeonShooting_Godot/scene/test/TestShader.tscn @@ -0,0 +1,33 @@ +[gd_scene load_steps=5 format=3 uid="uid://bnoa5mkbw6o0n"] + +[ext_resource type="Texture2D" uid="uid://uhhfgdhpk7i4" path="res://icon.png" id="1_5e1lv"] +[ext_resource type="Shader" path="res://resource/shader/RingOfPower.gdshader" id="2_cewpk"] +[ext_resource type="Texture2D" uid="uid://bcca04qkcqpr6" path="res://resource/sprite/noise/Noise0001.png" id="3_cnv2p"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_1pb8g"] +shader = ExtResource("2_cewpk") +shader_parameter/radius = 0.58 +shader_parameter/thickness = 0.34 +shader_parameter/color = Color(0.9, 0.4, 0.1, 1) +shader_parameter/brightness = 5.0 +shader_parameter/angular_speed = 2.5 +shader_parameter/radial_speed = 0.24 +shader_parameter/alpha = 0.5 +shader_parameter/noise = ExtResource("3_cnv2p") + +[node name="TestShader" type="Node2D"] + +[node name="Sprite2D" type="Sprite2D" parent="."] +position = Vector2(168, 115) +scale = Vector2(2.9375, 2.53125) +texture = ExtResource("1_5e1lv") + +[node name="Sprite2D2" type="Sprite2D" parent="."] +position = Vector2(1062, 627) +scale = Vector2(25.25, 14.5938) +texture = ExtResource("1_5e1lv") + +[node name="Sprite2D3" type="Sprite2D" parent="."] +material = SubResource("ShaderMaterial_1pb8g") +position = Vector2(314, 354) +texture = ExtResource("1_5e1lv")