Skip to content

Commit 132bcaa

Browse files
author
haoguo
committed
update
1 parent c2af43b commit 132bcaa

File tree

721 files changed

+60315
-556
lines changed

Some content is hidden

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

721 files changed

+60315
-556
lines changed

Assembly-CSharp-firstpass.csproj

Lines changed: 678 additions & 0 deletions
Large diffs are not rendered by default.

Assembly-CSharp.csproj

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<DebugType>full</DebugType>
2727
<Optimize>false</Optimize>
2828
<OutputPath>Temp\bin\Debug\</OutputPath>
29-
<DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_3_0;UNITY_2018_3;UNITY_2018;UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_WEBGL;UNITY_WEBGL;UNITY_WEBGL_API;UNITY_DISABLE_WEB_VERIFICATION;UNITY_GFX_USE_PLATFORM_VSYNC;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_VR;ENABLE_SPATIALTRACKING;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_LINUX;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
29+
<DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_3_0;UNITY_2018_3;UNITY_2018;UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_WEBGL;UNITY_WEBGL;UNITY_WEBGL_API;UNITY_DISABLE_WEB_VERIFICATION;UNITY_GFX_USE_PLATFORM_VSYNC;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_VR;ENABLE_SPATIALTRACKING;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_LINUX;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;UIWidgets_DEBUG;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
3030
<ErrorReport>prompt</ErrorReport>
3131
<WarningLevel>4</WarningLevel>
3232
<NoWarn>0169</NoWarn>
@@ -60,13 +60,17 @@
6060
<Compile Include="Assets\Scripts\Bridge.cs" />
6161
<Compile Include="Assets\Scripts\Components\Banner.cs" />
6262
<Compile Include="Assets\Scripts\Components\Breadcrumb.cs" />
63+
<Compile Include="Assets\Scripts\Components\Button.cs" />
64+
<Compile Include="Assets\Scripts\Components\CheckBox.cs" />
65+
<Compile Include="Assets\Scripts\Components\CheckBox.State.cs" />
6366
<Compile Include="Assets\Scripts\Components\Content.cs" />
6467
<Compile Include="Assets\Scripts\Components\EditButton.cs" />
6568
<Compile Include="Assets\Scripts\Components\Footer.cs" />
6669
<Compile Include="Assets\Scripts\Components\Header.cs" />
6770
<Compile Include="Assets\Scripts\Components\LanguageSelection.cs" />
6871
<Compile Include="Assets\Scripts\Components\Markdown.cs" />
6972
<Compile Include="Assets\Scripts\Components\MarkdownContent.cs" />
73+
<Compile Include="Assets\Scripts\Components\MarkdownContent.Process.cs" />
7074
<Compile Include="Assets\Scripts\Components\MarkdownTitleRow.cs" />
7175
<Compile Include="Assets\Scripts\Components\Menu.cs" />
7276
<Compile Include="Assets\Scripts\Components\MetaFields.cs" />
@@ -75,11 +79,14 @@
7579
<Compile Include="Assets\Scripts\Components\SearchBar.cs" />
7680
<Compile Include="Assets\Scripts\Components\SearchFilter.cs" />
7781
<Compile Include="Assets\Scripts\DocCNApp.cs" />
78-
<Compile Include="Assets\Scripts\ExampleCanvas.cs" />
79-
<Compile Include="Assets\Scripts\Markdown\Token.cs" />
82+
<Compile Include="Assets\Scripts\Models\Menu.cs" />
83+
<Compile Include="Assets\Scripts\Models\Token.cs" />
84+
<Compile Include="Assets\Scripts\Page\404.cs" />
8085
<Compile Include="Assets\Scripts\Page\DocumentPage.cs" />
8186
<Compile Include="Assets\Scripts\Page\LandingPage.cs" />
8287
<Compile Include="Assets\Scripts\Page\SearchPage.cs" />
88+
<Compile Include="Assets\Scripts\PageCanvas.cs" />
89+
<Compile Include="Assets\Scripts\Reactive.cs" />
8390
<Compile Include="Assets\Scripts\ScrollListener.cs" />
8491
<Compile Include="Assets\Scripts\Style\Icons.cs" />
8592
<Reference Include="Unity.TextMeshPro.Editor">
@@ -663,6 +670,14 @@
663670
</Reference>
664671
</ItemGroup>
665672
<ItemGroup>
673+
<ProjectReference Include="UIWidgetsGallery.csproj">
674+
<Project>{0D3AC704-A2FF-AAC5-E327-DB3B6FFB160C}</Project>
675+
<Name>UIWidgetsGallery</Name>
676+
</ProjectReference>
677+
<ProjectReference Include="UniRx.csproj">
678+
<Project>{0E2C7A78-00FC-F50F-5D92-DC5017FBE744}</Project>
679+
<Name>UniRx</Name>
680+
</ProjectReference>
666681
<ProjectReference Include="Unity.UIWidgets.Editor.csproj">
667682
<Project>{801CB4BB-CBB5-1BD9-D905-B25029E9E4C2}</Project>
668683
<Name>Unity.UIWidgets.Editor</Name>
@@ -675,6 +690,14 @@
675690
<Project>{DF5F0DD4-B25A-7DD9-F5BB-A55C208045B4}</Project>
676691
<Name>UIWidgetsSample</Name>
677692
</ProjectReference>
693+
<ProjectReference Include="UniRx.Async.csproj">
694+
<Project>{A1243529-6536-5B80-75A9-2B768FB97D57}</Project>
695+
<Name>UniRx.Async</Name>
696+
</ProjectReference>
697+
<ProjectReference Include="UniRx.Async.Editor.csproj">
698+
<Project>{A09EA727-B7FD-B6DC-E339-528FFD2B5F6B}</Project>
699+
<Name>UniRx.Async.Editor</Name>
700+
</ProjectReference>
678701
</ItemGroup>
679702
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
680703
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

Assets/Packages/Newtonsoft.Json.dll

100644100755
-43 KB
Binary file not shown.

Assets/Packages/Newtonsoft.Json.dll.meta

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

Assets/Plugins/UniRx.meta

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

Assets/Plugins/UniRx/Scripts.meta

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

Assets/Plugins/UniRx/Scripts/Async.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
2+
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or
3+
4+
using System;
5+
6+
namespace UniRx.Async
7+
{
8+
public struct AsyncUnit : IEquatable<AsyncUnit>
9+
{
10+
public static readonly AsyncUnit Default = new AsyncUnit();
11+
12+
public override int GetHashCode()
13+
{
14+
return 0;
15+
}
16+
17+
public bool Equals(AsyncUnit other)
18+
{
19+
return true;
20+
}
21+
22+
public override string ToString()
23+
{
24+
return "()";
25+
}
26+
}
27+
}
28+
#endif

Assets/Plugins/UniRx/Scripts/Async/AsyncUnit.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
2+
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
3+
4+
using System.Collections.Generic;
5+
using System.Threading;
6+
7+
namespace UniRx.Async
8+
{
9+
public class CancellationTokenEqualityComparer : IEqualityComparer<CancellationToken>
10+
{
11+
public static readonly IEqualityComparer<CancellationToken> Default = new CancellationTokenEqualityComparer();
12+
13+
public bool Equals(CancellationToken x, CancellationToken y)
14+
{
15+
return x.Equals(y);
16+
}
17+
18+
public int GetHashCode(CancellationToken obj)
19+
{
20+
return obj.GetHashCode();
21+
}
22+
}
23+
}
24+
25+
#endif

Assets/Plugins/UniRx/Scripts/Async/CancellationTokenEqualityComparer.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
2+
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
3+
4+
using System;
5+
using System.Threading;
6+
7+
namespace UniRx.Async
8+
{
9+
public static class CancellationTokenExtensions
10+
{
11+
static readonly Action<object> cancellationTokenCallback = Callback;
12+
13+
public static (UniTask, CancellationTokenRegistration) ToUniTask(this CancellationToken cts)
14+
{
15+
if (cts.IsCancellationRequested)
16+
{
17+
return (UniTask.FromCanceled(cts), default(CancellationTokenRegistration));
18+
}
19+
20+
var promise = new UniTaskCompletionSource<AsyncUnit>();
21+
return (promise.Task, cts.RegisterWithoutCaptureExecutionContext(cancellationTokenCallback, promise));
22+
}
23+
24+
static void Callback(object state)
25+
{
26+
var promise = (UniTaskCompletionSource<AsyncUnit>)state;
27+
promise.TrySetResult(AsyncUnit.Default);
28+
}
29+
30+
public static CancellationTokenRegistration RegisterWithoutCaptureExecutionContext(this CancellationToken cancellationToken, Action callback)
31+
{
32+
var restoreFlow = false;
33+
if (!ExecutionContext.IsFlowSuppressed())
34+
{
35+
ExecutionContext.SuppressFlow();
36+
restoreFlow = true;
37+
}
38+
39+
try
40+
{
41+
return cancellationToken.Register(callback, false);
42+
}
43+
finally
44+
{
45+
if (restoreFlow)
46+
{
47+
ExecutionContext.RestoreFlow();
48+
}
49+
}
50+
}
51+
52+
public static CancellationTokenRegistration RegisterWithoutCaptureExecutionContext(this CancellationToken cancellationToken, Action<object> callback, object state)
53+
{
54+
var restoreFlow = false;
55+
if (!ExecutionContext.IsFlowSuppressed())
56+
{
57+
ExecutionContext.SuppressFlow();
58+
restoreFlow = true;
59+
}
60+
61+
try
62+
{
63+
return cancellationToken.Register(callback, state, false);
64+
}
65+
finally
66+
{
67+
if (restoreFlow)
68+
{
69+
ExecutionContext.RestoreFlow();
70+
}
71+
}
72+
}
73+
}
74+
}
75+
76+
#endif

Assets/Plugins/UniRx/Scripts/Async/CancellationTokenExtensions.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
2+
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
3+
4+
using System.Threading;
5+
using UnityEngine;
6+
using UniRx.Async.Triggers;
7+
using System;
8+
9+
namespace UniRx.Async
10+
{
11+
public static class CancellationTokenSourceExtensions
12+
{
13+
public static void CancelAfterSlim(this CancellationTokenSource cts, int millisecondsDelay, bool ignoreTimeScale = false, PlayerLoopTiming delayTiming = PlayerLoopTiming.Update)
14+
{
15+
var delay = UniTask.Delay(millisecondsDelay, ignoreTimeScale, delayTiming, cts.Token);
16+
CancelAfterCore(cts, delay).Forget();
17+
}
18+
19+
public static void CancelAfterSlim(this CancellationTokenSource cts, TimeSpan delayTimeSpan, bool ignoreTimeScale = false, PlayerLoopTiming delayTiming = PlayerLoopTiming.Update)
20+
{
21+
var delay = UniTask.Delay(delayTimeSpan, ignoreTimeScale, delayTiming, cts.Token);
22+
CancelAfterCore(cts, delay).Forget();
23+
}
24+
25+
static async UniTaskVoid CancelAfterCore(CancellationTokenSource cts, UniTask delayTask)
26+
{
27+
var alreadyCanceled = await delayTask.SuppressCancellationThrow();
28+
if (!alreadyCanceled)
29+
{
30+
cts.Cancel();
31+
cts.Dispose();
32+
}
33+
}
34+
35+
public static void RegisterRaiseCancelOnDestroy(this CancellationTokenSource cts, Component component)
36+
{
37+
RegisterRaiseCancelOnDestroy(cts, component.gameObject);
38+
}
39+
40+
public static void RegisterRaiseCancelOnDestroy(this CancellationTokenSource cts, GameObject gameObject)
41+
{
42+
var trigger = gameObject.GetAsyncDestroyTrigger();
43+
trigger.AddCancellationTriggerOnDestory(cts);
44+
}
45+
}
46+
}
47+
48+
#endif

Assets/Plugins/UniRx/Scripts/Async/CancellationTokenSourceExtensions.cs.meta

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

Assets/Plugins/UniRx/Scripts/Async/CompilerServices.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
2+
3+
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
4+
5+
namespace System.Runtime.CompilerServices
6+
{
7+
public sealed class AsyncMethodBuilderAttribute : Attribute
8+
{
9+
public Type BuilderType { get; }
10+
11+
public AsyncMethodBuilderAttribute(Type builderType)
12+
{
13+
BuilderType = builderType;
14+
}
15+
}
16+
}
17+
18+
#endif

Assets/Plugins/UniRx/Scripts/Async/CompilerServices/AsyncMethodBuilderAttribute.cs.meta

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

0 commit comments

Comments
 (0)