diff --git a/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx b/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx index d929d56..02068be 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 f8dd720..e8367a2 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 dd5760f..cdb1b1f 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/ActivityObject.json b/DungeonShooting_Godot/resource/config/ActivityObject.json index 69732fb..55a8baf 100644 --- a/DungeonShooting_Godot/resource/config/ActivityObject.json +++ b/DungeonShooting_Godot/resource/config/ActivityObject.json @@ -2,153 +2,134 @@ { "Id": "role0001", "Type": 3, - "Prefab": "res://prefab/role/Role0001.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "\u73A9\u5BB6" + "Name": "", + "Remark": "\u73A9\u5BB6", + "Prefab": "res://prefab/role/Role0001.tscn" }, { "Id": "enemy0001", "Type": 4, - "Prefab": "res://prefab/role/Enemy0001.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "\u654C\u4EBA" + "Name": "", + "Remark": "\u654C\u4EBA", + "Prefab": "res://prefab/role/Enemy0001.tscn" }, { "Id": "weapon0001", "Type": 5, - "Prefab": "res://prefab/weapon/Weapon0001.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "" + "Name": "\u6B65\u67AA", + "Remark": "", + "Prefab": "res://prefab/weapon/Weapon0001.tscn" }, { "Id": "weapon0002", "Type": 5, - "Prefab": "res://prefab/weapon/Weapon0002.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "" + "Name": "\u9730\u5F39\u67AA", + "Remark": "", + "Prefab": "res://prefab/weapon/Weapon0002.tscn" }, { "Id": "weapon0003", "Type": 5, - "Prefab": "res://prefab/weapon/Weapon0003.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "" + "Name": "\u624B\u67AA", + "Remark": "", + "Prefab": "res://prefab/weapon/Weapon0003.tscn" }, { "Id": "weapon0004", "Type": 5, - "Prefab": "res://prefab/weapon/Weapon0004.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "" + "Name": "\u5200", + "Remark": "", + "Prefab": "res://prefab/weapon/Weapon0004.tscn" }, { "Id": "weapon0005", "Type": 5, - "Prefab": "res://prefab/weapon/Weapon0005.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "" + "Name": "\u72D9\u51FB\u67AA", + "Remark": "", + "Prefab": "res://prefab/weapon/Weapon0005.tscn" }, { "Id": "weapon0006", "Type": 5, - "Prefab": "res://prefab/weapon/Weapon0006.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "" + "Name": "\u51B2\u950B\u67AA", + "Remark": "", + "Prefab": "res://prefab/weapon/Weapon0006.tscn" }, { "Id": "bullet0001", "Type": 6, - "Prefab": "res://prefab/bullet/Bullet0001.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "" + "Name": "", + "Remark": "", + "Prefab": "res://prefab/bullet/Bullet0001.tscn" }, { "Id": "bullet0002", "Type": 6, - "Prefab": "res://prefab/bullet/Bullet0002.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "" + "Name": "", + "Remark": "", + "Prefab": "res://prefab/bullet/Bullet0002.tscn" }, { "Id": "shell0001", "Type": 7, - "Prefab": "res://prefab/shell/Shell0001.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "" + "Name": "", + "Remark": "", + "Prefab": "res://prefab/shell/Shell0001.tscn" }, { "Id": "shell0002", "Type": 7, - "Prefab": "res://prefab/shell/Shell0002.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "" + "Name": "", + "Remark": "", + "Prefab": "res://prefab/shell/Shell0002.tscn" }, { "Id": "shell0003", "Type": 7, - "Prefab": "res://prefab/shell/Shell0003.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "" + "Name": "", + "Remark": "", + "Prefab": "res://prefab/shell/Shell0003.tscn" }, { "Id": "effect0001", "Type": 8, - "Prefab": "res://prefab/effect/activityObject/Effect0001.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "\u654C\u4EBA\u6B7B\u4EA1\u788E\u7247" + "Name": "", + "Remark": "\u654C\u4EBA\u6B7B\u4EA1\u788E\u7247", + "Prefab": "res://prefab/effect/activityObject/Effect0001.tscn" }, { "Id": "prop0001", "Type": 9, - "Prefab": "res://prefab/prop/buff/Prop0001.tscn", - "ItemName": "\u978B\u5B50", - "ItemDescription": "\u589E\u52A0\u79FB\u52A8\u901F\u5EA6", - "Remark": "\u589E\u52A0\u79FB\u901F\u7684buff" + "Name": "\u978B\u5B50", + "Remark": "\u589E\u52A0\u79FB\u901F\u7684buff", + "Prefab": "res://prefab/prop/buff/Prop0001.tscn" }, { "Id": "other_door_e", "Type": 99, - "Prefab": "res://prefab/map/RoomDoor_E.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "\u5730\u7262\u623F\u95F4\u7684\u95E8(\u4E1C\u4FA7)" + "Name": "", + "Remark": "\u5730\u7262\u623F\u95F4\u7684\u95E8(\u4E1C\u4FA7)", + "Prefab": "res://prefab/map/RoomDoor_E.tscn" }, { "Id": "other_door_w", "Type": 99, - "Prefab": "res://prefab/map/RoomDoor_W.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "\u5730\u7262\u623F\u95F4\u7684\u95E8(\u897F\u4FA7)" + "Name": "", + "Remark": "\u5730\u7262\u623F\u95F4\u7684\u95E8(\u897F\u4FA7)", + "Prefab": "res://prefab/map/RoomDoor_W.tscn" }, { "Id": "other_door_s", "Type": 99, - "Prefab": "res://prefab/map/RoomDoor_S.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "\u5730\u7262\u623F\u95F4\u7684\u95E8(\u5357\u4FA7)" + "Name": "", + "Remark": "\u5730\u7262\u623F\u95F4\u7684\u95E8(\u5357\u4FA7)", + "Prefab": "res://prefab/map/RoomDoor_S.tscn" }, { "Id": "other_door_n", "Type": 99, - "Prefab": "res://prefab/map/RoomDoor_N.tscn", - "ItemName": "", - "ItemDescription": "", - "Remark": "\u5730\u7262\u623F\u95F4\u7684\u95E8(\u5317\u4FA7)" + "Name": "", + "Remark": "\u5730\u7262\u623F\u95F4\u7684\u95E8(\u5317\u4FA7)", + "Prefab": "res://prefab/map/RoomDoor_N.tscn" } ] \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/config/Weapon.json b/DungeonShooting_Godot/resource/config/Weapon.json index 1c00f54..6d690fc 100644 --- a/DungeonShooting_Godot/resource/config/Weapon.json +++ b/DungeonShooting_Godot/resource/config/Weapon.json @@ -2,7 +2,7 @@ { "Id": "0001", "WeaponId": "weapon0001", - "Name": "\u6B65\u67AA", + "Remark": "\u6B65\u67AA", "Icon": "res://resource/sprite/gun/gun4.png", "Weight": 40, "WeightType": 2, @@ -18,7 +18,8 @@ "AloneReloadCanShoot": false, "LooseShoot": false, "MinChargeTime": 0, - "AutoBeLoaded": true, + "ManualBeLoaded": false, + "AutoManualBeLoaded": false, "BeLoadedTime": 0, "MinContinuousCount": 1, "MaxContinuousCount": 1, @@ -74,7 +75,7 @@ { "Id": "0002", "WeaponId": "", - "Name": "\u6B65\u67AA", + "Remark": "\u6B65\u67AA", "Icon": "res://resource/sprite/gun/gun4.png", "Weight": 40, "WeightType": 2, @@ -90,7 +91,8 @@ "AloneReloadCanShoot": false, "LooseShoot": false, "MinChargeTime": 0, - "AutoBeLoaded": true, + "ManualBeLoaded": false, + "AutoManualBeLoaded": false, "BeLoadedTime": 0, "MinContinuousCount": 3, "MaxContinuousCount": 3, @@ -146,7 +148,7 @@ { "Id": "0003", "WeaponId": "weapon0002", - "Name": "\u9730\u5F39\u67AA", + "Remark": "\u9730\u5F39\u67AA", "Icon": "res://resource/sprite/gun/gun4.png", "Weight": 40, "WeightType": 2, @@ -162,7 +164,8 @@ "AloneReloadCanShoot": true, "LooseShoot": false, "MinChargeTime": 0, - "AutoBeLoaded": true, + "ManualBeLoaded": true, + "AutoManualBeLoaded": true, "BeLoadedTime": 0.6, "MinContinuousCount": 1, "MaxContinuousCount": 1, @@ -218,7 +221,7 @@ { "Id": "0004", "WeaponId": "", - "Name": "\u9730\u5F39\u67AA", + "Remark": "\u9730\u5F39\u67AA", "Icon": "res://resource/sprite/gun/gun4.png", "Weight": 40, "WeightType": 2, @@ -234,7 +237,8 @@ "AloneReloadCanShoot": true, "LooseShoot": false, "MinChargeTime": 0, - "AutoBeLoaded": true, + "ManualBeLoaded": true, + "AutoManualBeLoaded": true, "BeLoadedTime": 0.6, "MinContinuousCount": 1, "MaxContinuousCount": 1, @@ -290,7 +294,7 @@ { "Id": "0005", "WeaponId": "weapon0003", - "Name": "\u624B\u67AA", + "Remark": "\u624B\u67AA", "Icon": "res://resource/sprite/gun/gun4.png", "Weight": 20, "WeightType": 1, @@ -306,7 +310,8 @@ "AloneReloadCanShoot": false, "LooseShoot": false, "MinChargeTime": 0, - "AutoBeLoaded": true, + "ManualBeLoaded": false, + "AutoManualBeLoaded": false, "BeLoadedTime": 0.05, "MinContinuousCount": 1, "MaxContinuousCount": 1, @@ -362,7 +367,7 @@ { "Id": "0006", "WeaponId": "", - "Name": "\u624B\u67AA", + "Remark": "\u624B\u67AA", "Icon": "res://resource/sprite/gun/gun4.png", "Weight": 20, "WeightType": 1, @@ -378,7 +383,8 @@ "AloneReloadCanShoot": false, "LooseShoot": false, "MinChargeTime": 0, - "AutoBeLoaded": true, + "ManualBeLoaded": false, + "AutoManualBeLoaded": false, "BeLoadedTime": 0.05, "MinContinuousCount": 1, "MaxContinuousCount": 1, @@ -434,7 +440,7 @@ { "Id": "0007", "WeaponId": "weapon0004", - "Name": "\u5200", + "Remark": "\u5200", "Icon": "res://resource/sprite/gun/gun4.png", "Weight": 40, "WeightType": 2, @@ -450,7 +456,8 @@ "AloneReloadCanShoot": false, "LooseShoot": true, "MinChargeTime": 0, - "AutoBeLoaded": true, + "ManualBeLoaded": false, + "AutoManualBeLoaded": false, "BeLoadedTime": 0, "MinContinuousCount": 1, "MaxContinuousCount": 1, @@ -506,7 +513,7 @@ { "Id": "0008", "WeaponId": "", - "Name": "\u5200", + "Remark": "\u5200", "Icon": "res://resource/sprite/gun/gun4.png", "Weight": 40, "WeightType": 2, @@ -522,7 +529,8 @@ "AloneReloadCanShoot": false, "LooseShoot": true, "MinChargeTime": 0, - "AutoBeLoaded": true, + "ManualBeLoaded": false, + "AutoManualBeLoaded": false, "BeLoadedTime": 0, "MinContinuousCount": 1, "MaxContinuousCount": 1, @@ -578,7 +586,7 @@ { "Id": "0009", "WeaponId": "weapon0005", - "Name": "\u72D9\u51FB\u67AA", + "Remark": "\u72D9\u51FB\u67AA", "Icon": "res://resource/sprite/gun/gun4.png", "Weight": 50, "WeightType": 2, @@ -594,7 +602,8 @@ "AloneReloadCanShoot": false, "LooseShoot": false, "MinChargeTime": 0, - "AutoBeLoaded": false, + "ManualBeLoaded": true, + "AutoManualBeLoaded": false, "BeLoadedTime": 0.9, "MinContinuousCount": 1, "MaxContinuousCount": 1, @@ -650,7 +659,7 @@ { "Id": "0010", "WeaponId": "", - "Name": "\u72D9\u51FB\u67AA", + "Remark": "\u72D9\u51FB\u67AA", "Icon": "res://resource/sprite/gun/gun4.png", "Weight": 50, "WeightType": 2, @@ -666,7 +675,8 @@ "AloneReloadCanShoot": false, "LooseShoot": false, "MinChargeTime": 0, - "AutoBeLoaded": false, + "ManualBeLoaded": true, + "AutoManualBeLoaded": false, "BeLoadedTime": 0.9, "MinContinuousCount": 1, "MaxContinuousCount": 1, @@ -722,7 +732,7 @@ { "Id": "0011", "WeaponId": "weapon0006", - "Name": "\u51B2\u950B\u67AA", + "Remark": "\u51B2\u950B\u67AA", "Icon": "res://resource/sprite/gun/gun4.png", "Weight": 30, "WeightType": 2, @@ -738,7 +748,8 @@ "AloneReloadCanShoot": false, "LooseShoot": false, "MinChargeTime": 0, - "AutoBeLoaded": true, + "ManualBeLoaded": false, + "AutoManualBeLoaded": false, "BeLoadedTime": 0, "MinContinuousCount": 1, "MaxContinuousCount": 1, @@ -794,7 +805,7 @@ { "Id": "0012", "WeaponId": "", - "Name": "\u51B2\u950B\u67AA", + "Remark": "\u51B2\u950B\u67AA", "Icon": "res://resource/sprite/gun/gun4.png", "Weight": 30, "WeightType": 2, @@ -810,8 +821,9 @@ "AloneReloadCanShoot": false, "LooseShoot": false, "MinChargeTime": 0, - "AutoBeLoaded": true, - "BeLoadedTime": 0.05, + "ManualBeLoaded": false, + "AutoManualBeLoaded": false, + "BeLoadedTime": 0, "MinContinuousCount": 5, "MaxContinuousCount": 5, "TriggerInterval": 3.5, diff --git a/DungeonShooting_Godot/src/config/ExcelConfig_ActivityObject.cs b/DungeonShooting_Godot/src/config/ExcelConfig_ActivityObject.cs index 4c2bcc5..9234b19 100644 --- a/DungeonShooting_Godot/src/config/ExcelConfig_ActivityObject.cs +++ b/DungeonShooting_Godot/src/config/ExcelConfig_ActivityObject.cs @@ -29,22 +29,10 @@ public int Type; /// - /// 物体预制场景路径, 场景根节点必须是ActivityObject子类 - /// - [JsonInclude] - public string Prefab; - - /// /// 物体名称 /// [JsonInclude] - public string ItemName; - - /// - /// 物体描述 - /// - [JsonInclude] - public string ItemDescription; + public string Name; /// /// 物体备注 @@ -53,6 +41,12 @@ public string Remark; /// + /// 物体预制场景路径, 场景根节点必须是ActivityObject子类 + /// + [JsonInclude] + public string Prefab; + + /// /// 返回浅拷贝出的新对象 /// public ActivityObject Clone() @@ -60,10 +54,9 @@ var inst = new ActivityObject(); inst.Id = Id; inst.Type = Type; - inst.Prefab = Prefab; - inst.ItemName = ItemName; - inst.ItemDescription = ItemDescription; + inst.Name = Name; inst.Remark = Remark; + inst.Prefab = Prefab; return inst; } } diff --git a/DungeonShooting_Godot/src/config/ExcelConfig_Weapon.cs b/DungeonShooting_Godot/src/config/ExcelConfig_Weapon.cs index 4b20145..22bf390 100644 --- a/DungeonShooting_Godot/src/config/ExcelConfig_Weapon.cs +++ b/DungeonShooting_Godot/src/config/ExcelConfig_Weapon.cs @@ -20,10 +20,10 @@ public string WeaponId; /// - /// 武器显示的名称 + /// 备注 /// [JsonInclude] - public string Name; + public string Remark; /// /// 武器的图标 @@ -119,13 +119,19 @@ public float MinChargeTime; /// - /// 单次射击后是否自动执行上膛操作, 必须将 'ContinuousShoot' 设置为 false + /// 单次射击后是否需要手动上膛动作, 必须将 'ContinuousShoot' 设置为 false /// [JsonInclude] - public bool AutoBeLoaded; + public bool ManualBeLoaded; /// - /// 上膛时间, 如果时间为0, 则不会播放上膛动画和音效, 可以视为没有上膛动作, 必须将 'ContinuousShoot' 设置为 false + /// 手动上膛模式下, 单次射击后是否自动执行上膛操作, 必须将 'ManualBeLoaded' 设置为 true + /// + [JsonInclude] + public bool AutoManualBeLoaded; + + /// + /// 上膛时间, 如果时间为0, 则不会播放上膛动画和音效, 可以视为没有上膛动作, 必须将 'ManualBeLoaded' 设置为 true /// [JsonInclude] public float BeLoadedTime; @@ -421,7 +427,7 @@ var inst = new Weapon(); inst.Id = Id; inst.WeaponId = WeaponId; - inst.Name = Name; + inst.Remark = Remark; inst.Icon = Icon; inst.Weight = Weight; inst.WeightType = WeightType; @@ -437,7 +443,8 @@ inst.AloneReloadCanShoot = AloneReloadCanShoot; inst.LooseShoot = LooseShoot; inst.MinChargeTime = MinChargeTime; - inst.AutoBeLoaded = AutoBeLoaded; + inst.ManualBeLoaded = ManualBeLoaded; + inst.AutoManualBeLoaded = AutoManualBeLoaded; inst.BeLoadedTime = BeLoadedTime; inst.MinContinuousCount = MinContinuousCount; inst.MaxContinuousCount = MaxContinuousCount; diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs index de9bda7..78a9f49 100644 --- a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs +++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs @@ -21,32 +21,32 @@ /// public const string Id_enemy0001 = "enemy0001"; /// - /// 名称:
+ /// 名称: 步枪
/// 备注: /// public const string Id_weapon0001 = "weapon0001"; /// - /// 名称:
+ /// 名称: 霰弹枪
/// 备注: /// public const string Id_weapon0002 = "weapon0002"; /// - /// 名称:
+ /// 名称: 手枪
/// 备注: /// public const string Id_weapon0003 = "weapon0003"; /// - /// 名称:
+ /// 名称: 刀
/// 备注: /// public const string Id_weapon0004 = "weapon0004"; /// - /// 名称:
+ /// 名称: 狙击枪
/// 备注: /// public const string Id_weapon0005 = "weapon0005"; /// - /// 名称:
+ /// 名称: 冲锋枪
/// 备注: /// public const string Id_weapon0006 = "weapon0006"; diff --git a/DungeonShooting_Godot/src/framework/activity/components/MoveController.cs b/DungeonShooting_Godot/src/framework/activity/components/MoveController.cs index 9e7c149..6df946e 100644 --- a/DungeonShooting_Godot/src/framework/activity/components/MoveController.cs +++ b/DungeonShooting_Godot/src/framework/activity/components/MoveController.cs @@ -45,7 +45,7 @@ } /// - /// 给当前控制器添加指定外力速率, 并且平均分配给基础速率和外力速率 + /// 给当前控制器添加指定外力速率, 并且平均分配给所有外力速率 /// public void AddVelocity(Vector2 velocity) { @@ -54,12 +54,11 @@ var forceCount = GetForceCount(); if (forceCount == 0) { - _basisVelocity += velocity; + AddForce(velocity); } else { - var tempV = velocity / (forceCount + 1); - _basisVelocity += tempV; + var tempV = velocity / forceCount; for (var i = 0; i < _forceList.Count; i++) { _forceList[i].Velocity += tempV; diff --git a/DungeonShooting_Godot/src/framework/generator/ExcelGenerator.cs b/DungeonShooting_Godot/src/framework/generator/ExcelGenerator.cs index 86f1516..2fb744f 100644 --- a/DungeonShooting_Godot/src/framework/generator/ExcelGenerator.cs +++ b/DungeonShooting_Godot/src/framework/generator/ExcelGenerator.cs @@ -43,7 +43,7 @@ foreach (var item in array) { var id = item["Id"]; - var name = item["ItemName"] + ""; + var name = item["Name"] + ""; var remark = item["Remark"] + ""; code1 += $" /// \n"; code1 += $" /// 名称: {name}
\n"; diff --git a/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs b/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs index a2541d1..d2fa00a 100644 --- a/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs +++ b/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs @@ -610,7 +610,7 @@ //连发开火 TriggerFire(); //连发最后一发打完了 - if (_continuousCount <= 0) + if (Attribute.ManualBeLoaded && _continuousCount <= 0) { //执行上膛逻辑 RunBeLoaded(); @@ -773,7 +773,7 @@ TriggerFire(); //非连射模式 - if (!Attribute.ContinuousShoot && _continuousCount <= 0) + if (!Attribute.ContinuousShoot && Attribute.ManualBeLoaded && _continuousCount <= 0) { //执行上膛逻辑 RunBeLoaded(); @@ -850,7 +850,7 @@ { TriggerFire(); //非连射模式 - if (!Attribute.ContinuousShoot && _continuousCount <= 0) + if (!Attribute.ContinuousShoot && Attribute.ManualBeLoaded && _continuousCount <= 0) { //执行上膛逻辑 RunBeLoaded(); @@ -910,7 +910,7 @@ PlayShootSound(); //抛弹 - if (Attribute.ContinuousShoot && Attribute.ShellId != null) + if ((Attribute.ContinuousShoot || !Attribute.ManualBeLoaded) && Attribute.ShellId != null) { ThrowShellHandler(1f); } @@ -1164,7 +1164,7 @@ //执行上膛逻辑 private void RunBeLoaded() { - if (Attribute.AutoBeLoaded) + if (Attribute.AutoManualBeLoaded) { if (_attackTimer <= 0) { @@ -1398,7 +1398,7 @@ { //可以互动拾起弹药 result.CanInteractive = true; - result.Message = Attribute.Name; + result.Message = ItemConfig.Name; result.ShowIcon = ResourcePath.resource_sprite_ui_icon_icon_bullet_png; return result; } @@ -1410,7 +1410,7 @@ { //可以互动, 拾起武器 result.CanInteractive = true; - result.Message = Attribute.Name; + result.Message = ItemConfig.Name; result.ShowIcon = ResourcePath.resource_sprite_ui_icon_icon_pickup_png; return result; } @@ -1418,7 +1418,7 @@ { //可以互动, 切换武器 result.CanInteractive = true; - result.Message = Attribute.Name; + result.Message = ItemConfig.Name; result.ShowIcon = ResourcePath.resource_sprite_ui_icon_icon_replace_png; return result; } @@ -1520,15 +1520,15 @@ var rotation = master.MountPoint.GlobalRotation; GlobalRotation = rotation; - - //继承role的移动速度 - InheritVelocity(master); startPosition -= GripPoint.Position.Rotated(rotation); var startHeight = -master.MountPoint.Position.Y; var velocity = new Vector2(20, 0).Rotated(rotation); var yf = Utils.RandomRangeInt(50, 70); Throw(startPosition, startHeight, yf, velocity, 0); + + //继承role的移动速度 + InheritVelocity(master); } protected override void OnThrowStart() @@ -1632,8 +1632,8 @@ var rotate = Utils.RandomRangeInt((int)(-720 * speedScale), (int)(720 * speedScale)); var shell = Create(shellId); shell.Rotation = (Master != null ? Master.MountPoint.RealRotation : Rotation); - shell.InheritVelocity(Master != null ? Master : this); shell.Throw(startPos, startHeight, verticalSpeed, velocity, rotate); + shell.InheritVelocity(Master != null ? Master : this); if (Master == null) { AffiliationArea.InsertItem(shell);