diff --git a/DungeonShooting_Godot/excel/ActivityBase.xlsx b/DungeonShooting_Godot/excel/ActivityBase.xlsx index 1f538f6..cf9f463 100644 --- a/DungeonShooting_Godot/excel/ActivityBase.xlsx +++ b/DungeonShooting_Godot/excel/ActivityBase.xlsx Binary files differ diff --git a/DungeonShooting_Godot/resource/config/ActivityBase.json b/DungeonShooting_Godot/resource/config/ActivityBase.json index f029543..78354b8 100644 --- a/DungeonShooting_Godot/resource/config/ActivityBase.json +++ b/DungeonShooting_Godot/resource/config/ActivityBase.json @@ -358,7 +358,7 @@ "Intro": "", "Details": "", "IsStatic": false, - "__Material": "0003", + "__Material": "", "Prefab": "res://prefab/bullet/normal/Bullet0009.tscn", "Icon": "", "ShowInMapEditor": false diff --git a/DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json b/DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json index f1a2f57..9b89740 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json +++ b/DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json @@ -28,10 +28,6 @@ { "ErrorType": 0, "Path": "resource/map/tileMaps/Test1/inlet/Start" - }, - { - "ErrorType": 1, - "Path": "resource/map/tileMaps/Test1/inlet/\u5927\u5385" } ], "OutletList": [ @@ -60,17 +56,5 @@ ], "EventList": [], "Remark": "" - }, - "\u521D\u59CB\u623F\u95F4": { - "GroupName": "\u521D\u59CB\u623F\u95F4", - "TileSet": "TileSet1", - "BattleList": [], - "InletList": [], - "OutletList": [], - "BossList": [], - "RewardList": [], - "ShopList": [], - "EventList": [], - "Remark": "" } } \ No newline at end of file diff --git "a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/Preinstall.json" "b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/Preinstall.json" deleted file mode 100644 index 7f4ab09..0000000 --- "a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/Preinstall.json" +++ /dev/null @@ -1 +0,0 @@ -[{"Name":"Preinstall1","Weight":100,"Remark":"","AutoFill":true,"WaveList":[[{"Position":{"X":0,"Y":0},"Size":{"X":0,"Y":0},"SpecialMarkType":1,"DelayTime":0,"MarkList":[]}]]}] \ No newline at end of file diff --git "a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/RoomInfo.json" "b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/RoomInfo.json" deleted file mode 100644 index 3487256..0000000 --- "a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/RoomInfo.json" +++ /dev/null @@ -1 +0,0 @@ -{"Position":{"X":0,"Y":0},"Size":{"X":0,"Y":0},"DoorAreaInfos":[],"GroupName":"Test1","RoomType":2,"RoomName":"\u5927\u5385","Weight":100,"Remark":""} \ No newline at end of file diff --git "a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/TileInfo.json" "b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/TileInfo.json" deleted file mode 100644 index a60a0b2..0000000 --- "a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/TileInfo.json" +++ /dev/null @@ -1 +0,0 @@ -{"NavigationVertices":[],"NavigationPolygon":[],"Floor":[],"Middle":[],"Top":[],"CustomFloor1":[],"CustomFloor2":[],"CustomFloor3":[],"CustomMiddle1":[],"CustomMiddle2":[],"CustomTop":[]} \ No newline at end of file diff --git a/DungeonShooting_Godot/src/game/activity/bullet/normal/Arrow.cs b/DungeonShooting_Godot/src/game/activity/bullet/normal/Arrow.cs index 3cd7b23..b4b70d3 100644 --- a/DungeonShooting_Godot/src/game/activity/bullet/normal/Arrow.cs +++ b/DungeonShooting_Godot/src/game/activity/bullet/normal/Arrow.cs @@ -6,7 +6,14 @@ { [Export, ExportFillNode] public AnimatedSprite2D HalfSprite { get; set; } - + + public override void InitData(BulletData data, uint attackLayer) + { + base.InitData(data, attackLayer); + EnableVerticalMotion = false; + DefaultLayer = RoomLayerEnum.NormalLayer; + } + public override void OnPlayDisappearEffect() { } @@ -28,26 +35,35 @@ public override void LogicalFinish() { SetEnableMovement(false); + var slideCollision = GetLastSlideCollision(); + if (slideCollision != null) + { + Position -= slideCollision.GetTravel(); + } } private void OnBindTarget(ActivityObject activityObject) { Altitude = -activityObject.ToLocal(GlobalPosition).Y; activityObject.BindMountObject(this); - AnimatedSprite.Play(AnimatorNames.HalfEnd); - HalfSprite.Visible = true; } public void OnMount(ActivityObject target) { Reparent(target); + AnimatedSprite.Play(AnimatorNames.HalfEnd); + HalfSprite.Visible = true; } public void OnUnmount(ActivityObject target) { + AnimatedSprite.Play(AnimatorNames.Default); + HalfSprite.Visible = false; SetEnableMovement(true); + EnableVerticalMotion = true; MoveController.ClearForce(); MoveController.BasisVelocity = Vector2.Zero; + ShadowOffset = new Vector2(0, 1); Throw(10, 60, new Vector2(20, 0), 0); } } \ No newline at end of file diff --git a/DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs b/DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs index 58d13ff..c926744 100644 --- a/DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs +++ b/DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs @@ -309,7 +309,7 @@ } } - private void OnBodyEntered(Node2D body) + protected virtual void OnBodyEntered(Node2D body) { if (IsDestroyed) { @@ -321,8 +321,8 @@ OnCollisionTarget(hurt); } } - - private void OnArea2dEntered(Area2D other) + + protected virtual void OnArea2dEntered(Area2D other) { if (IsDestroyed) { diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorProject/GroupButtonCell.cs b/DungeonShooting_Godot/src/game/ui/mapEditorProject/GroupButtonCell.cs index b9ab1ed..746e3b9 100644 --- a/DungeonShooting_Godot/src/game/ui/mapEditorProject/GroupButtonCell.cs +++ b/DungeonShooting_Godot/src/game/ui/mapEditorProject/GroupButtonCell.cs @@ -12,7 +12,7 @@ public override void OnSetData(DungeonRoomGroup info) { CellNode.Instance.Text = info.GroupName; - CellNode.Instance.TooltipText = "路径: " + MapProjectManager.CustomMapPath + "/" + info.GroupName; + CellNode.Instance.TooltipText = "路径: " + MapProjectManager.CustomMapPath + info.GroupName; } public override void OnRefreshIndex()