Skip to content

Commit 79ac253

Browse files
authored
feat: add loading docs scene (#17)
1 parent f80d836 commit 79ac253

File tree

158 files changed

+49855
-4423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+49855
-4423
lines changed

.github/workflows/activation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
id: getManualLicenseFile
1111
uses: game-ci/unity-request-activation-file@v2
1212
with:
13-
unityVersion: 2021.3.25f1
13+
unityVersion: 2022.3.6f1
1414
- name: Expose as artifact
1515
uses: actions/upload-artifact@v2
1616
with:
1717
name: ${{ steps.getManualLicenseFile.outputs.filePath }}
18-
path: ${{ steps.getManualLicenseFile.outputs.filePath }}
18+
path: ${{ steps.getManualLicenseFile.outputs.filePath }}

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ jobs:
3636
const tag = '${{ steps.changelog.outputs.tag }}';
3737
const version = '${{ steps.changelog.outputs.version }}';
3838
const body = `${{ steps.changelog.outputs.clean_changelog }}`;
39-
39+
4040
if (skipped !== 'false') {
4141
core.setFailed('No changes to publish.');
4242
return;
4343
}
44-
44+
4545
const release = await github.rest.repos.createRelease({
4646
owner: context.repo.owner,
4747
repo: context.repo.repo,
4848
tag_name: tag,
4949
name: tag,
5050
body,
5151
});
52-
52+
5353
core.setOutput('version', version);
5454
core.setOutput('release', release.data.id);
5555
fmod:
@@ -94,7 +94,7 @@ jobs:
9494
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
9595
with:
9696
gitPrivateToken: ${{ secrets.PACKAGES_TOKEN }}
97-
unityVersion: 2021.3.25f1
97+
unityVersion: 2022.3.6f1
9898
targetPlatform: ${{ matrix.targetPlatform }}
9999
versioning: Custom
100100
version: ${{ needs.release.outputs.version }}
@@ -108,7 +108,7 @@ jobs:
108108
script: |
109109
const release_id = `${{ needs.release.outputs.release }}`;
110110
const name = `Build-${{ matrix.targetPlatform }}.zip`;
111-
111+
112112
await github.rest.repos.uploadReleaseAsset({
113113
owner: context.repo.owner,
114114
repo: context.repo.repo,

.github/workflows/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
4848
with:
4949
gitPrivateToken: ${{ secrets.PACKAGES_TOKEN }}
50-
unityVersion: 2021.3.25f1
50+
unityVersion: 2022.3.6f1
5151
targetPlatform: ${{ matrix.targetPlatform }}
5252
versioning: Tag
5353
- uses: actions/upload-artifact@v3

Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/AddressableAssetsData/AssetGroups/Localization-Locales.asset

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Editor/Typewriter/ChoiceEntryDescriptor.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
1-
using System.Collections.Generic;
2-
using System.Linq;
3-
using Aarthificial.Typewriter.Common;
4-
using Aarthificial.Typewriter.Editor.Common;
5-
using Aarthificial.Typewriter.Editor.Descriptors;
6-
using Aarthificial.Typewriter.Entries;
1+
using Aarthificial.Typewriter.Editor.Descriptors;
72
using Typewriter;
8-
using UnityEditor;
9-
using UnityEditor.Localization;
10-
using UnityEngine.Localization;
113

124
namespace Editor.Typewriter
135
{

Assets/Editor/Typewriter/CsvConverter.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using Aarthificial.Typewriter.Blackboards;
2-
using Aarthificial.Typewriter.Common;
1+
using Aarthificial.Typewriter;
2+
using Aarthificial.Typewriter.Blackboards;
33
using Aarthificial.Typewriter.Editor.Common;
4+
using Aarthificial.Typewriter.Editor.Localization;
45
using Aarthificial.Typewriter.Entries;
56
using Aarthificial.Typewriter.References;
6-
using Aarthificial.Typewriter.Tools;
77
using Interactions;
88
using System;
99
using System.Collections.Generic;
@@ -47,7 +47,7 @@ public ParsingException(string message, ParsingContext context) : base(
4747

4848
private static readonly Dictionary<string, EntryReference> _lookup = new();
4949
private static readonly List<EntryReference> _triggers = new();
50-
private static readonly List<TypewriterEvent.Dispatcher> _events = new();
50+
private static readonly List<RuleEntry.Dispatcher> _events = new();
5151
private static readonly List<BlackboardCriterion> _criteria = new();
5252
private static readonly List<BlackboardModification> _modifications = new();
5353
private static readonly HashSet<int> _convertedIds = new();
@@ -225,7 +225,6 @@ BaseEntry previous
225225
var entry = _lookup[cells.Key()].GetEntry() as DialogueEntry;
226226
BeginConversion(entry, cells, previous);
227227

228-
entry.IsCancellable = cells.Cancel();
229228
if (_lookup.TryGetValue(cells.Speaker(), out var speaker)) {
230229
entry.Speaker = speaker;
231230
if (speaker != InteractionContext.CurrentSpeaker) {
@@ -250,11 +249,11 @@ BaseEntry previous
250249
var sharedEntry = _collection.SharedData.AddKey(entry.Key);
251250
textId = sharedEntry.Id;
252251
_collection.StringTables[0].AddEntry(textId, cells.Text());
253-
TypewriterUtils.RaiseTableEntryAdded(_collection, sharedEntry);
252+
LocalizationEvents.RaiseTableEntryAdded(_collection, sharedEntry);
254253
} else {
255254
textId = textEntry.KeyId;
256255
textEntry.Value = cells.Text();
257-
TypewriterUtils.RaiseTableEntryModified(
256+
LocalizationEvents.RaiseTableEntryModified(
258257
_collection.SharedData.GetEntry(textId)
259258
);
260259
}
@@ -267,9 +266,9 @@ BaseEntry previous
267266
if (cells.Actions() != "") {
268267
_events.Clear();
269268
foreach (var fact in ParseReferences(cells.Actions())) {
270-
_events.Add(new TypewriterEvent.Dispatcher { Reference = fact });
269+
_events.Add(new RuleEntry.Dispatcher { Reference = fact });
271270
}
272-
entry.OnEnd = _events.ToArray();
271+
entry.OnApply = _events.ToArray();
273272
}
274273

275274
EndConversion(entry);

Assets/Editor/Typewriter/CsvImporter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Aarthificial.Typewriter.Common;
1+
using Aarthificial.Typewriter;
22
using UnityEditor.AssetImporters;
33
using UnityEngine;
44

Assets/Editor/Typewriter/CsvImporterEditor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Aarthificial.Typewriter.Common;
1+
using Aarthificial.Typewriter;
22
using System.IO;
33
using UnityEditor;
44
using UnityEditor.AssetImporters;

0 commit comments

Comments
 (0)