Skip to content

Commit fbc7762

Browse files
authored
Merge pull request #25 from TORISOUP/change_new_nicolive
ニコ生の新仕様(2024/8/5~)に対応
2 parents 6d0a3c5 + 333b9ea commit fbc7762

27 files changed

+3950
-8063
lines changed

Assets/TORISOUP/NicoliveClient/Example/Console/NicoliveSampleScene.unity

+3,835-7,066
Large diffs are not rendered by default.

Assets/TORISOUP/NicoliveClient/Example/Console/Scripts/MainPanel/CommentPanel.meta

-10
This file was deleted.

Assets/TORISOUP/NicoliveClient/Example/Console/Scripts/MainPanel/CommentPanel/CommentPanel.cs

-164
This file was deleted.

Assets/TORISOUP/NicoliveClient/Example/Console/Scripts/MainPanel/CommentPanel/CommentPanel.cs.meta

-13
This file was deleted.

Assets/TORISOUP/NicoliveClient/Example/Console/Scripts/MainPanel/CommentRenderPanel.meta

-10
This file was deleted.

Assets/TORISOUP/NicoliveClient/Example/Console/Scripts/MainPanel/CommentRenderPanel/CommentRenderPanel.cs

-38
This file was deleted.

Assets/TORISOUP/NicoliveClient/Example/Console/Scripts/MainPanel/CommentRenderPanel/CommentRenderPanel.cs.meta

-13
This file was deleted.

Assets/TORISOUP/NicoliveClient/Example/Console/Scripts/MainPanel/ProgramIdPanel/ProgramIdPanel.cs

+2-27
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
using System;
2-
using System.Linq;
3-
using Cysharp.Threading.Tasks;
4-
using Cysharp.Threading.Tasks.Linq;
1+
using Cysharp.Threading.Tasks;
52
using R3;
63
using UnityEngine;
74
using UnityEngine.UI;
@@ -16,35 +13,13 @@ public class ProgramIdPanel : MonoBehaviour
1613
[SerializeField] private NicoliveSampleManager _manager;
1714

1815
[SerializeField] private InputField _programIdInputField;
19-
[SerializeField] private Button _getCurrentProgramIdButton;
2016
[SerializeField] private Button _setProgramIdButton;
2117
[SerializeField] private Text _currentProgramIdText;
2218

2319
void Start()
2420
{
2521
var ct = this.GetCancellationTokenOnDestroy();
26-
_getCurrentProgramIdButton.OnClickAsAsyncEnumerable(ct)
27-
.ForEachAwaitWithCancellationAsync(async (_, c) =>
28-
{
29-
try
30-
{
31-
//取得したIDは一旦UIに反映
32-
var programs = await _manager.GetCurrentProgramIdAsync(c);
33-
if (programs.Length == 0)
34-
{
35-
Debug.LogError("番組IDが取得できませんでした");
36-
_programIdInputField.text = "";
37-
return;
38-
}
39-
_programIdInputField.text = programs.Last();
40-
}
41-
catch (Exception e) when (e is not OperationCanceledException)
42-
{
43-
Debug.LogError(e);
44-
}
45-
}, cancellationToken: ct)
46-
.Forget();
47-
22+
4823
//設定ボタンが押されたらUIの値を反映する
4924
_setProgramIdButton.OnClickAsObservable()
5025
.Subscribe(_ => _manager.SetTargetProgramId(_programIdInputField.text))

Assets/TORISOUP/NicoliveClient/Example/Console/Scripts/MainPanel/ProgramInfoPanel/ProgramInfoPanel.cs

+2-5
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,11 @@ void Start()
3434
builder.Append("room count:" + programInfo.Rooms.Length + "\n");
3535
builder.Append("status:" + programInfo.Status.ToString() + "\n");
3636
_programInfoLabel.text = builder.ToString();
37-
37+
3838
//部屋一覧を登録する
3939
foreach (var room in programInfo.Rooms)
4040
{
41-
if (!_manager.CurrentRooms.ContainsKey(room.Id))
42-
{
43-
_manager.CurrentRooms[room.Id] = room;
44-
}
41+
_manager.CurrentRooms.TryAdd(room.ViewUri, room);
4542
}
4643
}
4744
catch (Exception e) when (e is not OperationCanceledException)

Assets/TORISOUP/NicoliveClient/Example/Console/Scripts/MainPanel/ScheduledProgramPanel.meta

-10
This file was deleted.

Assets/TORISOUP/NicoliveClient/Example/Console/Scripts/MainPanel/ScheduledProgramPanel/ScheduledProgramPanel.cs

-52
This file was deleted.

Assets/TORISOUP/NicoliveClient/Example/Console/Scripts/MainPanel/ScheduledProgramPanel/ScheduledProgramPanel.cs.meta

-13
This file was deleted.

0 commit comments

Comments
 (0)