diff --git a/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs b/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs
index 6c245d3..a0abde7 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs
@@ -173,6 +173,16 @@
///
public WeaponAttribute Clone()
{
+ var attr = _Clone();
+ if (AiUseAttribute != null)
+ {
+ attr.AiUseAttribute = AiUseAttribute._Clone();
+ }
+ return attr;
+ }
+
+ private WeaponAttribute _Clone()
+ {
var attr = new WeaponAttribute();
attr.Name = Name;
attr.WeaponPrefab = WeaponPrefab;
diff --git a/DungeonShooting_Godot/src/game/manager/InputManager.cs b/DungeonShooting_Godot/src/game/manager/InputManager.cs
index 679df29..fae7fc0 100644
--- a/DungeonShooting_Godot/src/game/manager/InputManager.cs
+++ b/DungeonShooting_Godot/src/game/manager/InputManager.cs
@@ -12,7 +12,7 @@
public static Vector2 GetViewportMousePosition()
{
var application = GameApplication.Instance;
- return application.GlobalToViewPosition(application.GetGlobalMousePosition() - new Vector2(25, 25));
+ return application.GlobalToViewPosition(application.GetGlobalMousePosition());
}
///
diff --git a/DungeonShooting_Godot/src/game/room/RoomManager.cs b/DungeonShooting_Godot/src/game/room/RoomManager.cs
index 01005a8..2c295b4 100644
--- a/DungeonShooting_Godot/src/game/room/RoomManager.cs
+++ b/DungeonShooting_Godot/src/game/room/RoomManager.cs
@@ -81,26 +81,26 @@
Player.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0004"));
Player.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0003"));
- // var enemy1 = new Enemy();
- // enemy1.PutDown(new Vector2(160, 160), RoomLayerEnum.YSortLayer);
- // enemy1.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0001"));
+ var enemy1 = ActivityObject.Create(ActivityIdPrefix.Enemy + "0001");
+ enemy1.PutDown(new Vector2(160, 160), RoomLayerEnum.YSortLayer);
+ enemy1.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0001"));
// for (int i = 0; i < 10; i++)
// {
- // var enemyTemp = new Enemy();
+ // var enemyTemp = ActivityObject.Create(ActivityIdPrefix.Enemy + "0001");
// enemyTemp.PutDown(new Vector2(30 + (i + 1) * 20, 30), RoomLayerEnum.YSortLayer);
// // enemyTemp.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0003"));
// // enemyTemp.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0001"));
// }
- // var enemy2 = new Enemy();
+ // var enemy2 = ActivityObject.Create(ActivityIdPrefix.Enemy + "0001");
// enemy2.Name = "Enemy2";
// enemy2.PutDown(new Vector2(120, 100));
// enemy2.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0002"));
// //enemy2.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0004"));
// //enemy2.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0003"));
//
- // var enemy3 = new Enemy();
+ // var enemy3 = ActivityObject.Create(ActivityIdPrefix.Enemy + "0001");
// enemy3.Name = "Enemy3";
// enemy3.PutDown(new Vector2(100, 120));
// enemy3.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0003"));