diff --git a/OshimaServers/Service/FunGameService.cs b/OshimaServers/Service/FunGameService.cs index b3044f6..c082040 100644 --- a/OshimaServers/Service/FunGameService.cs +++ b/OshimaServers/Service/FunGameService.cs @@ -3401,7 +3401,17 @@ namespace Oshima.FunGame.OshimaServers.Service // 开始战斗 Team team1 = new($"{user.Username}的小队", squad); - Team team2 = new($"{General.GameplayEquilibriumConstant.InGameCurrency}秘境", enemys); + string team2Name = type switch + { + InstanceType.Currency => General.GameplayEquilibriumConstant.InGameCurrency, + InstanceType.Material => General.GameplayEquilibriumConstant.InGameMaterial, + InstanceType.EXP => "经验值/经验书", + InstanceType.RegionItem => "地区锻造材料", + InstanceType.CharacterLevelBreak => "角色等阶突破材料", + InstanceType.SkillLevelUp => "技能等级升级材料", + _ => "" + } + "秘境"; + Team team2 = new(team2Name, enemys); FunGameActionQueue actionQueue = new(); List msgs = await actionQueue.StartTeamGame([team1, team2], showAllRound: true); if (msgs.Count > 2) diff --git a/OshimaWebAPI/Controllers/FunGameController.cs b/OshimaWebAPI/Controllers/FunGameController.cs index 34b5b25..e4bc158 100644 --- a/OshimaWebAPI/Controllers/FunGameController.cs +++ b/OshimaWebAPI/Controllers/FunGameController.cs @@ -5913,7 +5913,7 @@ namespace Oshima.FunGame.WebAPI.Controllers character.Recovery(); } - msg = $"感谢使用生命之泉服务!你已消费:{total} {General.GameplayEquilibriumConstant.InGameCurrency}。"; + msg = $"感谢使用生命之泉服务!你已消费:{total:0.##} {General.GameplayEquilibriumConstant.InGameCurrency}。"; user.LastTime = DateTime.Now; pc.Add("user", user); @@ -5921,7 +5921,7 @@ namespace Oshima.FunGame.WebAPI.Controllers } else { - msg = $"你的 {General.GameplayEquilibriumConstant.InGameCurrency} 不足 {total} 呢!无法饮用生命之泉!"; + msg = $"你的 {General.GameplayEquilibriumConstant.InGameCurrency} 不足 {total:0.##} 呢!无法饮用生命之泉!"; } msg += $"({dead} 个死亡角色,{halfdown} 个 50% 以下的角色,{halfup} 个 50% 以上的角色)\r\n" + @@ -5971,7 +5971,7 @@ namespace Oshima.FunGame.WebAPI.Controllers character.EP = 200; } - msg = $"欢迎来访酒馆,你的本次消费:{total} {General.GameplayEquilibriumConstant.InGameMaterial}。"; + msg = $"欢迎来访酒馆,你的本次消费:{total:0.##} {General.GameplayEquilibriumConstant.InGameMaterial}。"; user.LastTime = DateTime.Now; pc.Add("user", user); @@ -5979,7 +5979,7 @@ namespace Oshima.FunGame.WebAPI.Controllers } else { - msg = $"你的 {General.GameplayEquilibriumConstant.InGameMaterial} 不足 {total} 呢!无法为你上酒!"; + msg = $"你的 {General.GameplayEquilibriumConstant.InGameMaterial} 不足 {total:0.##} 呢!无法为你上酒!"; } msg += $"({zero} 个 0 点能量值的角色,{less100} 个 100 点能量值以下的角色,{less200} 个 200 点能量值以下的角色)\r\n" +