Skip to content

Commit bc50082

Browse files
author
haoguo
committed
fix
1 parent b2015b2 commit bc50082

10 files changed

+1303
-1299
lines changed

‎Assembly-CSharp-Editor.csproj

+580-578
Large diffs are not rendered by default.

‎Assembly-CSharp.csproj

+648-649
Large diffs are not rendered by default.

‎Assets/Scripts/Components/MarkdownContent/MarkdownContent.Positions.cs

+14-36
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ private class MetaFields : StatelessWidget
2020
public MetaFields(
2121
List<PositionRecord> items,
2222
ScrollController controller,
23-
string githubLink)
23+
string githubLink = null)
2424
{
2525
_items = items;
2626
_controller = controller;
@@ -45,18 +45,6 @@ public override Widget build(BuildContext context)
4545
{
4646
var children = new List<Widget>
4747
{
48-
new Container(
49-
margin: EdgeInsets.only(top: 24f, bottom: 16.0f),
50-
child: new Text(
51-
"文章导览",
52-
style: ItemStyle.merge(
53-
new TextStyle(
54-
fontWeight: FontWeight.w500,
55-
color: new Color(0xff212121)
56-
)
57-
)
58-
)
59-
)
6048
};
6149
children.AddRange(
6250
_items.Select<PositionRecord, Widget>(
@@ -91,35 +79,25 @@ public override Widget build(BuildContext context)
9179
padding: EdgeInsets.only(bottom: 8.0f),
9280
child: new Align(
9381
alignment: Alignment.bottomLeft,
94-
child: new Clickable(
95-
onTap: () => LocationUtil.HrefTo(_githubLink),
96-
child: new Row(
97-
children: new List<Widget>
98-
{
99-
new Container(
100-
margin: EdgeInsets.only(right: 8),
101-
child: new Icon(
102-
Icons.BrandsGithub,
103-
color: new Color(0xff000000),
104-
size: 24f
105-
)
106-
),
107-
new Text(
108-
"在Github上编辑本文",
109-
style: new TextStyle(
110-
fontSize: 16,
111-
decoration: TextDecoration.underline,
112-
color: new Color(0xff2196f3)
113-
)
82+
child: new Row(
83+
children: new List<Widget>
84+
{
85+
new Text(
86+
"文章导览",
87+
style: new TextStyle(
88+
fontSize: 16,
89+
fontWeight: FontWeight.w500,
90+
color: new Color(0xff212121)
11491
)
115-
}
116-
)
92+
)
93+
}
11794
)
11895
)
11996
),
12097
new Container(
12198
height: 1f,
122-
color: DividerColor
99+
color: DividerColor,
100+
margin: EdgeInsets.only(bottom: 24f)
123101
),
124102
new Column(
125103
crossAxisAlignment: CrossAxisAlignment.start,

‎Assets/Scripts/Components/MarkdownContent/MarkdownContent.State.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,10 @@ public override Widget build(BuildContext buildContext)
265265
}
266266
)
267267
),
268+
268269
new MetaFields(
269270
markdownBuildCtx.PositionRecords,
270-
_scrollController,
271-
$"https://github.com/UnityTech/documentation-cn/blob/{version.unity_version}/Manual/md/{widget._title}.md"
271+
_scrollController
272272
)
273273
}
274274
);

‎Assets/Scripts/Components/Scripting/ScriptingContent.State.cs

-10
Original file line numberDiff line numberDiff line change
@@ -282,16 +282,6 @@ public override Widget build(BuildContext context)
282282
fontWeight: FontWeight.w500
283283
)
284284
)
285-
),
286-
new HyperLink(
287-
text: "在Github上编辑本文",
288-
style: new TextStyle(
289-
fontSize: 16,
290-
decoration: TextDecoration.underline,
291-
color: new Color(0xff2196f3)
292-
),
293-
link:
294-
$"https://github.com/UnityTech/documentation-cn/blob/2018.1/ScriptingAPI/xml/{widget._title}.xml"
295285
)
296286
}
297287
)

‎Assets/Scripts/Components/WealthyText/SelectableWealthyText.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public override void initState() {
7575

7676

7777
public override void didUpdateWidget(StatefulWidget old) {
78-
SelectableText oldWidget = (SelectableText) old;
78+
SelectableWealthyText oldWidget = (SelectableWealthyText) old;
7979
base.didUpdateWidget(oldWidget);
8080

8181
if (oldWidget.focusNode != this.widget.focusNode) {

‎Assets/Scripts/PageWindow.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#if UNITY_EDITOR
2+
13
using Unity.DocZh.Components;
24
using Unity.DocZh.Style;
35
using Unity.UIWidgets.editor;
@@ -46,4 +48,6 @@ protected override Widget createWidget()
4648
);
4749
}
4850
}
49-
}
51+
}
52+
53+
#endif

‎DocCN.sln

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
Microsoft Visual Studio Solution File, Format Version 11.00
1+
2+
Microsoft Visual Studio Solution File, Format Version 11.00
23
# Visual Studio 2010
34
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.UIWidgets", "Unity.UIWidgets.csproj", "{5D73621B-F02A-41D7-BF66-14C3031AE347}"
45
EndProject

‎ProjectSettings/ProjectSettings.asset

+50-20
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!129 &1
44
PlayerSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 16
6+
serializedVersion: 20
77
productGUID: f877bdfdd3ee901cbb7d8db161f5894c
88
AndroidProfiler: 0
99
AndroidFilterTouchesWhenObscured: 0
@@ -52,8 +52,7 @@ PlayerSettings:
5252
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
5353
iosShowActivityIndicatorOnLoading: -1
5454
androidShowActivityIndicatorOnLoading: -1
55-
iosAppInBackgroundBehavior: 0
56-
displayResolutionDialog: 1
55+
iosUseCustomAppBackgroundBehavior: 0
5756
iosAllowHTTPDownload: 1
5857
allowedAutorotateToPortrait: 1
5958
allowedAutorotateToPortraitUpsideDown: 1
@@ -65,6 +64,7 @@ PlayerSettings:
6564
disableDepthAndStencilBuffers: 0
6665
androidStartInFullscreen: 1
6766
androidRenderOutsideSafeArea: 0
67+
androidUseSwappy: 0
6868
androidBlitType: 0
6969
defaultIsNativeResolution: 1
7070
macRetinaSupport: 1
@@ -84,15 +84,13 @@ PlayerSettings:
8484
useMacAppStoreValidation: 0
8585
macAppStoreCategory: public.app-category.games
8686
gpuSkinning: 1
87-
graphicsJobs: 0
8887
xboxPIXTextureCapture: 0
8988
xboxEnableAvatar: 0
9089
xboxEnableKinect: 0
9190
xboxEnableKinectAutoTracking: 0
9291
xboxEnableFitness: 0
9392
visibleInBackground: 1
9493
allowFullscreenSwitch: 1
95-
graphicsJobMode: 0
9694
fullscreenMode: 1
9795
xboxSpeechDB: 0
9896
xboxEnableHeadOrientation: 0
@@ -112,6 +110,7 @@ PlayerSettings:
112110
switchNVNShaderPoolsGranularity: 33554432
113111
switchNVNDefaultPoolsGranularity: 16777216
114112
switchNVNOtherPoolsGranularity: 16777216
113+
vulkanNumSwapchainBuffers: 3
115114
vulkanEnableSetSRGBWrite: 0
116115
m_SupportedAspectRatios:
117116
4:3: 1
@@ -149,11 +148,14 @@ PlayerSettings:
149148
oculus:
150149
sharedDepthBuffer: 1
151150
dashSupport: 1
151+
lowOverheadMode: 0
152+
protectedContext: 0
153+
v2Signing: 1
152154
enable360StereoCapture: 0
153155
isWsaHolographicRemotingEnabled: 0
154-
protectGraphicsMemory: 0
155156
enableFrameTimingStats: 0
156157
useHDRDisplay: 0
158+
D3DHDRBitDepth: 0
157159
m_ColorGamuts: 00000000
158160
targetPixelDensity: 30
159161
resolutionScalingMode: 0
@@ -162,7 +164,7 @@ PlayerSettings:
162164
applicationIdentifier: {}
163165
buildNumber: {}
164166
AndroidBundleVersionCode: 1
165-
AndroidMinSdkVersion: 16
167+
AndroidMinSdkVersion: 19
166168
AndroidTargetSdkVersion: 0
167169
AndroidPreferredInstallLocation: 1
168170
aotOptions:
@@ -177,10 +179,10 @@ PlayerSettings:
177179
StripUnusedMeshComponents: 1
178180
VertexChannelCompressionMask: 4054
179181
iPhoneSdkVersion: 988
180-
iOSTargetOSVersionString: 9.0
182+
iOSTargetOSVersionString: 10.0
181183
tvOSSdkVersion: 0
182184
tvOSRequireExtendedGameController: 0
183-
tvOSTargetOSVersionString: 9.0
185+
tvOSTargetOSVersionString: 10.0
184186
uIPrerenderedIcon: 0
185187
uIRequiresPersistentWiFi: 0
186188
uIRequiresFullScreen: 1
@@ -268,7 +270,8 @@ PlayerSettings:
268270
height: 180
269271
banner: {fileID: 0}
270272
androidGamepadSupportLevel: 0
271-
resolutionDialogBanner: {fileID: 0}
273+
AndroidValidateAppBundleSize: 1
274+
AndroidAppBundleSizeToValidate: 150
272275
m_BuildTargetIcons: []
273276
m_BuildTargetPlatformIcons: []
274277
m_BuildTargetBatching:
@@ -287,6 +290,38 @@ PlayerSettings:
287290
- m_BuildTarget: WebGL
288291
m_StaticBatching: 0
289292
m_DynamicBatching: 0
293+
m_BuildTargetGraphicsJobs:
294+
- m_BuildTarget: MacStandaloneSupport
295+
m_GraphicsJobs: 0
296+
- m_BuildTarget: Switch
297+
m_GraphicsJobs: 0
298+
- m_BuildTarget: MetroSupport
299+
m_GraphicsJobs: 0
300+
- m_BuildTarget: AppleTVSupport
301+
m_GraphicsJobs: 0
302+
- m_BuildTarget: BJMSupport
303+
m_GraphicsJobs: 0
304+
- m_BuildTarget: LinuxStandaloneSupport
305+
m_GraphicsJobs: 0
306+
- m_BuildTarget: PS4Player
307+
m_GraphicsJobs: 0
308+
- m_BuildTarget: iOSSupport
309+
m_GraphicsJobs: 0
310+
- m_BuildTarget: WindowsStandaloneSupport
311+
m_GraphicsJobs: 0
312+
- m_BuildTarget: XboxOnePlayer
313+
m_GraphicsJobs: 0
314+
- m_BuildTarget: LuminSupport
315+
m_GraphicsJobs: 0
316+
- m_BuildTarget: AndroidPlayer
317+
m_GraphicsJobs: 0
318+
- m_BuildTarget: WebGLSupport
319+
m_GraphicsJobs: 0
320+
m_BuildTargetGraphicsJobMode:
321+
- m_BuildTarget: PS4Player
322+
m_GraphicsJobMode: 0
323+
- m_BuildTarget: XboxOnePlayer
324+
m_GraphicsJobMode: 0
290325
m_BuildTargetGraphicsAPIs:
291326
- m_BuildTarget: AndroidPlayer
292327
m_APIs: 0b00000008000000
@@ -306,7 +341,6 @@ PlayerSettings:
306341
m_Devices:
307342
- Oculus
308343
- OpenVR
309-
m_BuildTargetEnableVuforiaSettings: []
310344
openGLRequireES31: 0
311345
openGLRequireES31AEP: 0
312346
openGLRequireES32: 0
@@ -425,6 +459,7 @@ PlayerSettings:
425459
switchRatingsInt_9: 0
426460
switchRatingsInt_10: 0
427461
switchRatingsInt_11: 0
462+
switchRatingsInt_12: 0
428463
switchLocalCommunicationIds_0:
429464
switchLocalCommunicationIds_1:
430465
switchLocalCommunicationIds_2:
@@ -524,9 +559,11 @@ PlayerSettings:
524559
ps4contentSearchFeaturesUsed: 0
525560
ps4attribEyeToEyeDistanceSettingVR: 0
526561
ps4IncludedModules: []
562+
ps4attribVROutputEnabled: 0
527563
monoEnv:
528564
splashScreenBackgroundSourceLandscape: {fileID: 0}
529565
splashScreenBackgroundSourcePortrait: {fileID: 0}
566+
blurSplashScreenBackground: 1
530567
spritePackerPolicy:
531568
webGLMemorySize: 1024
532569
webGLExceptionSupport: 1
@@ -544,7 +581,8 @@ PlayerSettings:
544581
webGLWasmStreaming: 0
545582
scriptingDefineSymbols:
546583
1:
547-
13:
584+
7:
585+
13: DOC_BUILD_PRD
548586
platformArchitecture: {}
549587
scriptingBackend: {}
550588
il2cppCompilerConfiguration: {}
@@ -609,7 +647,6 @@ PlayerSettings:
609647
XboxOneAllowedProductIds: []
610648
XboxOnePersistentLocalStorageSize: 0
611649
XboxOneXTitleMemory: 8
612-
xboxOneScriptCompiler: 1
613650
XboxOneOverrideIdentityName:
614651
vrEditorSettings:
615652
daydream:
@@ -628,13 +665,6 @@ PlayerSettings:
628665
luminVersion:
629666
m_VersionCode: 1
630667
m_VersionName:
631-
facebookSdkVersion: 7.9.4
632-
facebookAppId:
633-
facebookCookies: 1
634-
facebookLogging: 1
635-
facebookStatus: 1
636-
facebookXfbml: 0
637-
facebookFrictionlessRequests: 1
638668
apiCompatibilityLevel: 6
639669
cloudProjectId:
640670
framebufferDepthMemorylessMode: 0

‎ProjectSettings/UnityConnectSettings.asset

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
UnityConnectSettings:
55
m_ObjectHideFlags: 0
66
serializedVersion: 1
7-
m_Enabled: 1
7+
m_Enabled: 0
88
m_TestMode: 0
99
m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
1010
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events

0 commit comments

Comments
 (0)