diff --git a/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx b/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx index 60de234..8c505f0 100644 --- a/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/Sound.xlsx b/DungeonShooting_Godot/excel/excelFile/Sound.xlsx index 9fa99b3..11ed22b 100644 --- a/DungeonShooting_Godot/excel/excelFile/Sound.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/Sound.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx b/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx index e885d51..b7e8df3 100644 --- a/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx Binary files differ diff --git a/DungeonShooting_Godot/resource/config/Weapon.json b/DungeonShooting_Godot/resource/config/Weapon.json index afa027f..1c00f54 100644 --- a/DungeonShooting_Godot/resource/config/Weapon.json +++ b/DungeonShooting_Godot/resource/config/Weapon.json @@ -319,8 +319,8 @@ "MaxFireBulletCount": 1, "DelayedTime": 0, "StartScatteringRange": 5, - "FinalScatteringRange": 60, - "ScatteringRangeAddValue": 8, + "FinalScatteringRange": 35, + "ScatteringRangeAddValue": 4, "ScatteringRangeBackSpeed": 40, "ScatteringRangeBackDelayTime": 0.5, "MinBacklash": 3, @@ -391,8 +391,8 @@ "MaxFireBulletCount": 1, "DelayedTime": 0, "StartScatteringRange": 5, - "FinalScatteringRange": 60, - "ScatteringRangeAddValue": 8, + "FinalScatteringRange": 35, + "ScatteringRangeAddValue": 4, "ScatteringRangeBackSpeed": 40, "ScatteringRangeBackDelayTime": 0.5, "MinBacklash": 3, diff --git a/DungeonShooting_Godot/resource/material/Blend.tres b/DungeonShooting_Godot/resource/material/Blend.tres index 02c6b22..bfdddeb 100644 --- a/DungeonShooting_Godot/resource/material/Blend.tres +++ b/DungeonShooting_Godot/resource/material/Blend.tres @@ -1,11 +1,10 @@ -[gd_resource type="ShaderMaterial" load_steps=2 format=3] +[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://cces3bhds7jyi"] [ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="1"] - [resource] resource_local_to_scene = true -render_priority = 4 -shader = ExtResource( 1 ) -shader_param/blend = Color( 0, 0, 0, 0.470588 ) -shader_param/schedule = 1 +shader = ExtResource("1") +shader_parameter/blend = Color(0, 0, 0, 0.470588) +shader_parameter/schedule = 0.0 +shader_parameter/alpha = 0.0