diff --git a/DungeonShooting_Godot/DungeonShooting.csproj b/DungeonShooting_Godot/DungeonShooting.csproj index a312223..e36028f 100644 --- a/DungeonShooting_Godot/DungeonShooting.csproj +++ b/DungeonShooting_Godot/DungeonShooting.csproj @@ -1,4 +1,4 @@ - + net7.0 true diff --git a/DungeonShooting_Godot/export_presets.cfg b/DungeonShooting_Godot/export_presets.cfg index 8683c0c..9730d1f 100644 --- a/DungeonShooting_Godot/export_presets.cfg +++ b/DungeonShooting_Godot/export_presets.cfg @@ -34,14 +34,14 @@ package/app_category=2 package/retain_data_on_uninstall=false package/exclude_from_recents=false +package/show_in_android_tv=false +package/show_in_app_library=true +package/show_as_launcher_app=false launcher_icons/main_192x192="" launcher_icons/adaptive_foreground_432x432="" launcher_icons/adaptive_background_432x432="" graphics/opengl_debug=false xr_features/xr_mode=0 -xr_features/hand_tracking=0 -xr_features/hand_tracking_frequency=0 -xr_features/passthrough=0 screen/immersive_mode=true screen/support_small=true screen/support_normal=true @@ -201,6 +201,10 @@ permissions/write_user_dictionary=false dotnet/include_scripts_content=false dotnet/include_debug_symbols=true +dotnet/embed_build_outputs=false +xr_features/hand_tracking=0 +xr_features/hand_tracking_frequency=0 +xr_features/passthrough=0 [preset.1] @@ -246,6 +250,7 @@ application/file_description="" application/copyright="" application/trademarks="" +application/export_angle=0 ssh_remote_deploy/enabled=false ssh_remote_deploy/host="user@host_ip" ssh_remote_deploy/port="22" @@ -265,78 +270,4 @@ Remove-Item -Recurse -Force '{temp_dir}'" dotnet/include_scripts_content=true dotnet/include_debug_symbols=true - -[preset.2] - -name="iOS" -platform="iOS" -runnable=true -dedicated_server=false -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="" -encryption_include_filters="" -encryption_exclude_filters="" -encrypt_pck=false -encrypt_directory=false - -[preset.2.options] - -custom_template/debug="" -custom_template/release="" -architectures/arm64=true -application/app_store_team_id="" -application/code_sign_identity_debug="" -application/export_method_debug=1 -application/code_sign_identity_release="" -application/export_method_release=0 -application/targeted_device_family=2 -application/bundle_identifier="" -application/signature="" -application/short_version="1.0" -application/version="1.0" -application/icon_interpolation=4 -application/launch_screens_interpolation=4 -capabilities/access_wifi=false -capabilities/push_notifications=false -user_data/accessible_from_files_app=false -user_data/accessible_from_itunes_sharing=false -privacy/camera_usage_description="" -privacy/camera_usage_description_localized={} -privacy/microphone_usage_description="" -privacy/microphone_usage_description_localized={} -privacy/photolibrary_usage_description="" -privacy/photolibrary_usage_description_localized={} -icons/iphone_120x120="" -icons/iphone_180x180="" -icons/ipad_76x76="" -icons/ipad_152x152="" -icons/ipad_167x167="" -icons/app_store_1024x1024="" -icons/spotlight_40x40="" -icons/spotlight_80x80="" -icons/settings_58x58="" -icons/settings_87x87="" -icons/notification_40x40="" -icons/notification_60x60="" -storyboard/use_launch_screen_storyboard=false -storyboard/image_scale_mode=0 -storyboard/custom_image@2x="" -storyboard/custom_image@3x="" -storyboard/use_custom_bg_color=false -storyboard/custom_bg_color=Color(0, 0, 0, 1) -landscape_launch_screens/iphone_2436x1125="" -landscape_launch_screens/iphone_2208x1242="" -landscape_launch_screens/ipad_1024x768="" -landscape_launch_screens/ipad_2048x1536="" -portrait_launch_screens/iphone_640x960="" -portrait_launch_screens/iphone_640x1136="" -portrait_launch_screens/iphone_750x1334="" -portrait_launch_screens/iphone_1125x2436="" -portrait_launch_screens/ipad_768x1024="" -portrait_launch_screens/ipad_1536x2048="" -portrait_launch_screens/iphone_1242x2208="" -dotnet/include_scripts_content=false -dotnet/include_debug_symbols=true +dotnet/embed_build_outputs=false diff --git a/DungeonShooting_Godot/prefab/bullet/Bullet0001.tscn b/DungeonShooting_Godot/prefab/bullet/Bullet0001.tscn index a1f4b70..0a44b2f 100644 --- a/DungeonShooting_Godot/prefab/bullet/Bullet0001.tscn +++ b/DungeonShooting_Godot/prefab/bullet/Bullet0001.tscn @@ -51,7 +51,7 @@ material = SubResource("ShaderMaterial_w5w0i") [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] -modulate = Color(1.8, 1.8, 1.8, 1) +modulate = Color(1.6, 1.6, 1.6, 1) material = SubResource("ShaderMaterial_qhkgc") sprite_frames = SubResource("SpriteFrames_5wvmf") diff --git a/DungeonShooting_Godot/prefab/bullet/Bullet0002.tscn b/DungeonShooting_Godot/prefab/bullet/Bullet0002.tscn index 6c97dc2..1cb086c 100644 --- a/DungeonShooting_Godot/prefab/bullet/Bullet0002.tscn +++ b/DungeonShooting_Godot/prefab/bullet/Bullet0002.tscn @@ -43,7 +43,7 @@ material = SubResource("ShaderMaterial_v77gw") [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] -modulate = Color(1.8, 1.8, 1.8, 1) +modulate = Color(1.6, 1.6, 1.6, 1) material = SubResource("ShaderMaterial_p0wfd") sprite_frames = ExtResource("3_uvuj8") diff --git a/DungeonShooting_Godot/prefab/bullet/Bullet0003.tscn b/DungeonShooting_Godot/prefab/bullet/Bullet0003.tscn index 18fab3e..605759f 100644 --- a/DungeonShooting_Godot/prefab/bullet/Bullet0003.tscn +++ b/DungeonShooting_Godot/prefab/bullet/Bullet0003.tscn @@ -40,7 +40,7 @@ material = SubResource("ShaderMaterial_v77gw") [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] -modulate = Color(1.8, 1.8, 1.8, 1) +modulate = Color(1.6, 1.6, 1.6, 1) material = SubResource("ShaderMaterial_p0wfd") sprite_frames = ExtResource("3_qvo0u") diff --git a/DungeonShooting_Godot/prefab/effect/weapon/BulletSmoke.tscn b/DungeonShooting_Godot/prefab/effect/weapon/BulletSmoke.tscn index 444e13a..d13cf17 100644 --- a/DungeonShooting_Godot/prefab/effect/weapon/BulletSmoke.tscn +++ b/DungeonShooting_Godot/prefab/effect/weapon/BulletSmoke.tscn @@ -2,8 +2,7 @@ [ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/effects/common/Smoke.png" id="1"] [ext_resource type="Texture2D" uid="uid://bs1lan5uwxyfg" path="res://resource/curve/Curve1.tres" id="1_8pe88"] -[ext_resource type="Texture2D" uid="uid://dwa4chrugc6b1" path="res://resource/sprite/effects/Collision.png" id="2"] - +[ext_resource type="Texture2D" uid="uid://dwa4chrugc6b1" path="res://resource/sprite/effects/weapon/Collision1.png" id="2"] [sub_resource type="CanvasItemMaterial" id="1"] particles_animation = true @@ -73,10 +72,10 @@ tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0, 0.05), +"transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [true] +"values": [true, false] } tracks/1/type = "method" tracks/1/imported = false @@ -140,7 +139,7 @@ hframes = 4 [node name="AnimationPlayer" type="AnimationPlayer" parent="."] -autoplay = "Smoke" libraries = { "": SubResource("AnimationLibrary_uuiu7") } +autoplay = "Smoke" diff --git a/DungeonShooting_Godot/src/game/activity/role/player/Player.cs b/DungeonShooting_Godot/src/game/activity/role/player/Player.cs index f9c24de..61ad2ec 100644 --- a/DungeonShooting_Godot/src/game/activity/role/player/Player.cs +++ b/DungeonShooting_Godot/src/game/activity/role/player/Player.cs @@ -48,11 +48,11 @@ Shield = 0; // debug用 - RoleState.Acceleration = 3000; - RoleState.Friction = 3000; - RoleState.MoveSpeed = 500; - CollisionLayer = 0; - CollisionMask = 0; + // RoleState.Acceleration = 3000; + // RoleState.Friction = 3000; + // RoleState.MoveSpeed = 500; + // CollisionLayer = 0; + // CollisionMask = 0; //GameCamera.Main.Zoom = new Vector2(0.2f, 0.2f); //GameCamera.Main.Zoom = new Vector2(0.5f, 0.5f); diff --git a/DungeonShooting_Godot/src/game/room/DungeonManager.cs b/DungeonShooting_Godot/src/game/room/DungeonManager.cs index 782302c..f5c1d78 100644 --- a/DungeonShooting_Godot/src/game/room/DungeonManager.cs +++ b/DungeonShooting_Godot/src/game/room/DungeonManager.cs @@ -429,7 +429,8 @@ private void CreateRoomFogMask(RoomInfo roomInfo) { var roomFog = new RoomFogMask(); - //roomFog.BlendMode = Light2D.BlendModeEnum.Mix; + // + roomFog.BlendMode = Light2D.BlendModeEnum.Mix; roomFog.Name = "FogMask" + roomFog.IsDestroyed; roomInfo.RoomFogMask = roomFog; roomFog.Init(roomInfo, new Rect2I( @@ -458,7 +459,8 @@ var image = Image.Create(calcRectSize.X, calcRectSize.Y, false, Image.Format.Rgba8); image.Fill(Colors.White); var sprite2D = new PointLight2D(); - //sprite2D.BlendMode = Light2D.BlendModeEnum.Mix; + // + sprite2D.BlendMode = Light2D.BlendModeEnum.Mix; sprite2D.Texture = ImageTexture.CreateFromImage(image); sprite2D.Position = calcRect.Position + calcRect.Size / 2; World.FogMaskRoot.AddChild(sprite2D);