This commit is contained in:
CortexCore
2025-03-10 22:42:42 +08:00
parent ad7065fa02
commit d83387500d
16 changed files with 233 additions and 39 deletions

View File

@@ -5,6 +5,7 @@ using BITKit.UX.Settings;
using Cysharp.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Net.BITKit.Localization;
using Net.Like.Xue.Tokyo.UX;
using Net.Project.B.UX;
using Project.B.Player;
@@ -61,6 +62,9 @@ namespace Net.Like.Xue.Tokyo
//获取服务提供者
await using var serviceProvider = BITApp.ServiceProvider = serviceCollection.BuildServiceProvider();
serviceProvider.GetRequiredService<CsvLocalizationService>().Url =
@"http://server.bitfall.icu:21982/net.like.xue.tokyo/net.like.xue.tokyo.localization.csv";
await global::Project.B.Program.BuildServiceProvider(serviceProvider,destroyCancellationToken);
var uxService = serviceProvider.GetRequiredService<IUXService>();
@@ -75,7 +79,7 @@ namespace Net.Like.Xue.Tokyo
serviceProvider.GetRequiredService<IUXHud>();
serviceProvider.GetRequiredService<IUXDialogue>();
serviceProvider.GetRequiredService<IUXDialogue>().SubtitleLanguage="zh-CN";
serviceProvider.GetRequiredService<IUXLoadingMap>();
@@ -85,6 +89,8 @@ namespace Net.Like.Xue.Tokyo
serviceProvider.GetRequiredService<IUXBuyStation>();
serviceProvider.GetRequiredService<UXEscMenu>();
serviceProvider.GetRequiredKeyedService<IUXMap>(nameof(IUXHud));
serviceProvider.GetRequiredKeyedService<IUXMap>(nameof(IUXMap));

View File

@@ -13,12 +13,18 @@ using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.UIElements;
using System.Linq;
using BITKit.Entities;
using BITKit.Mod;
using Net.BITKit.Localization;
using YooAsset;
using IUXDialogue = Net.Project.B.UX.IUXDialogue;
namespace Net.Like.Xue.Tokyo.UX
{
public class UXEscMenu : UIToolKitPanel,IDisposable
{
private readonly IEntitiesService _entitiesService;
private readonly ILocalizationService _localizationService;
private readonly IDialogueService _dialogueService;
private readonly IGameMapService _gameMapService;
private readonly IUXDialogue _uxDialogue;
@@ -29,35 +35,90 @@ namespace Net.Like.Xue.Tokyo.UX
private readonly IUXKeyMap<InputAction> _uxKeyMap;
private readonly ConcurrentDictionary<int, IDialogueData> _dialogues = new();
[UXBindPath("dialogue-container")]
private VisualElement _dialogueContainer;
[UXBindPath("return-button")]
private Button _returnButton;
[UXBindPath("exit-button")]
private Button _exitButton;
[UXBindPath("log-label")]
private Label _logLabel;
private VisualTreeAsset _template;
public UXEscMenu(IUXService uxService, IUXDialogue uxDialogue, IGameMapService gameMapService, IUXKeyMap<InputAction> uxKeyMap, IDialogueService dialogueService) : base(uxService)
public UXEscMenu(IUXService uxService, IUXDialogue uxDialogue, IGameMapService gameMapService, IUXKeyMap<InputAction> uxKeyMap, IDialogueService dialogueService, ILocalizationService localizationService, IEntitiesService entitiesService) : base(uxService)
{
_uxDialogue = uxDialogue;
_gameMapService = gameMapService;
_uxKeyMap = uxKeyMap;
_dialogueService = dialogueService;
_localizationService = localizationService;
_entitiesService = entitiesService;
_uxDialogue.OnSubtitle += OnSubtitle;
OnInitiated += Initiated;
OnInitiatedAsync += InitiatedAsync;
_dialogueService.OnDialogueStart += OnDialogueStart;
}
private async UniTask InitiatedAsync()
{
_template =await ModService.LoadAsset<VisualTreeAsset>("ui_esc_menu_dialogue-template");
_dialogueContainer.Clear();
}
private UniTask OnDialogueStart(IDialogueData arg)
{
_dialogues.TryAdd(arg.Identity, arg);
_logLabel.text = string.Join("\n", _dialogues.Values.Select(x => x.Text));
var actorName = arg.ActorIdentity.ToString();
try
{
if (arg.ActorIdentity != 0)
{
foreach (var idComponent in _entitiesService.QueryComponents<IdComponent>())
{
if (idComponent.Id == arg.ActorIdentity)
{
actorName = idComponent.Name;
throw new OperationCanceledException();
}
}
}
actorName = _entitiesService.QueryComponents<IdComponent, LocalPlayerComponent>()[0].Item1.Name;
}
catch (OperationCanceledException)
{
}
var container = _dialogueContainer.Create(_template);
container.Get<Label>().text = actorName;
container = container.Get<VisualElement>();
container.Clear();
foreach (var dictionary in _localizationService.LocalizedStrings.Values)
{
if (dictionary.TryGetValue(arg.Text, out var text))
{
container.Create<Label>().text = text;
}
else
{
container.Create<Label>().text = arg.Text;
}
}
return UniTask.CompletedTask;
}

View File

@@ -17,7 +17,7 @@ namespace Net.Like.Xue.Tokyo.UX
{
private readonly IGameMapService _gameMapService;
private readonly IEntitiesService _entitiesService;
public UXLevel(IUXService uxService, IGameMapService gameMapService, IEntitiesService entitiesService) : base(uxService)
{
_gameMapService = gameMapService;