diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
index 128a0f6..e4b4f57 100644
--- a/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
+++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
@@ -217,11 +217,11 @@
///
public bool ShowOutline
{
- get => _blendShaderMaterial.GetShaderParameter(_shader_show_outline).AsBool();
+ get => _blendShaderMaterial == null ? false : _blendShaderMaterial.GetShaderParameter(_shader_show_outline).AsBool();
set
{
- _blendShaderMaterial.SetShaderParameter(_shader_show_outline, value);
- _shadowBlendShaderMaterial.SetShaderParameter(_shader_show_outline, value);
+ _blendShaderMaterial?.SetShaderParameter(_shader_show_outline, value);
+ _shadowBlendShaderMaterial?.SetShaderParameter(_shader_show_outline, value);
}
}
@@ -230,8 +230,8 @@
///
public Color OutlineColor
{
- get => _blendShaderMaterial.GetShaderParameter(_shader_outline_color).AsColor();
- set => _blendShaderMaterial.SetShaderParameter(_shader_outline_color, value);
+ get => _blendShaderMaterial == null ? Colors.Black : _blendShaderMaterial.GetShaderParameter(_shader_outline_color).AsColor();
+ set => _blendShaderMaterial?.SetShaderParameter(_shader_outline_color, value);
}
///
@@ -239,8 +239,8 @@
///
public float Grey
{
- get => _blendShaderMaterial.GetShaderParameter(_shader_grey).AsSingle();
- set => _blendShaderMaterial.SetShaderParameter(_shader_grey, value);
+ get => _blendShaderMaterial == null ? 0 : _blendShaderMaterial.GetShaderParameter(_shader_grey).AsSingle();
+ set => _blendShaderMaterial?.SetShaderParameter(_shader_grey, value);
}
// --------------------------------------------------------------------------------
diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject_EditorTool.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject_EditorTool.cs
index 69f87b8..b1a033d 100644
--- a/DungeonShooting_Godot/src/framework/activity/ActivityObject_EditorTool.cs
+++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject_EditorTool.cs
@@ -29,6 +29,7 @@
{
var material =
ResourceManager.Load(ResourcePath.resource_material_Blend_tres, false);
+ material.ResourceLocalToScene = true;
material.SetShaderParameter("blend", new Color(0, 0, 0, 0.47058824F));
material.SetShaderParameter("schedule", 1);
material.SetShaderParameter("modulate", new Color(1, 1, 1, 1));
@@ -43,6 +44,7 @@
{
var material =
ResourceManager.Load(ResourcePath.resource_material_Blend_tres, false);
+ material.ResourceLocalToScene = true;
material.SetShaderParameter("blend", new Color(1, 1, 1, 1));
material.SetShaderParameter("schedule", 0);
material.SetShaderParameter("modulate", new Color(1, 1, 1, 1));