Merge branch 'skia' of github.com:Unity-Technologies/com.unity.uiwidgets into merge_latest_skia_changes
# Conflicts: # Samples/UIWidgetsSamples_2019_4/Assets/Script/TextTest.cs # com.unity.uiwidgets/Runtime/foundation/assertions.cs # com.unity.uiwidgets/Runtime/painting/binding.cs # com.unity.uiwidgets/Runtime/painting/image_provider.cs # com.unity.uiwidgets/Runtime/widgets/framework.cs # com.unity.uiwidgets/Runtime/widgets/table.cs
This commit is contained in:
xingweizhu
Коммит
3c9f507f92
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e18dd30e208165141b608bdabb7d8599
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,537 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!29 &1
|
||||
OcclusionCullingSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_OcclusionBakeSettings:
|
||||
smallestOccluder: 5
|
||||
smallestHole: 0.25
|
||||
backfaceThreshold: 100
|
||||
m_SceneGUID: 00000000000000000000000000000000
|
||||
m_OcclusionCullingData: {fileID: 0}
|
||||
--- !u!104 &2
|
||||
RenderSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 9
|
||||
m_Fog: 0
|
||||
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
|
||||
m_FogMode: 3
|
||||
m_FogDensity: 0.01
|
||||
m_LinearFogStart: 0
|
||||
m_LinearFogEnd: 300
|
||||
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
|
||||
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
|
||||
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
|
||||
m_AmbientIntensity: 1
|
||||
m_AmbientMode: 0
|
||||
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
|
||||
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_HaloStrength: 0.5
|
||||
m_FlareStrength: 1
|
||||
m_FlareFadeSpeed: 3
|
||||
m_HaloTexture: {fileID: 0}
|
||||
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_DefaultReflectionMode: 0
|
||||
m_DefaultReflectionResolution: 128
|
||||
m_ReflectionBounces: 1
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 11
|
||||
m_GIWorkflowMode: 1
|
||||
m_GISettings:
|
||||
serializedVersion: 2
|
||||
m_BounceScale: 1
|
||||
m_IndirectOutputScale: 1
|
||||
m_AlbedoBoost: 1
|
||||
m_EnvironmentLightingMode: 0
|
||||
m_EnableBakedLightmaps: 1
|
||||
m_EnableRealtimeLightmaps: 0
|
||||
m_LightmapEditorSettings:
|
||||
serializedVersion: 12
|
||||
m_Resolution: 2
|
||||
m_BakeResolution: 40
|
||||
m_AtlasSize: 1024
|
||||
m_AO: 0
|
||||
m_AOMaxDistance: 1
|
||||
m_CompAOExponent: 1
|
||||
m_CompAOExponentDirect: 0
|
||||
m_ExtractAmbientOcclusion: 0
|
||||
m_Padding: 2
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_LightmapsBakeMode: 1
|
||||
m_TextureCompression: 1
|
||||
m_FinalGather: 0
|
||||
m_FinalGatherFiltering: 1
|
||||
m_FinalGatherRayCount: 256
|
||||
m_ReflectionCompression: 2
|
||||
m_MixedBakeMode: 2
|
||||
m_BakeBackend: 1
|
||||
m_PVRSampling: 1
|
||||
m_PVRDirectSampleCount: 32
|
||||
m_PVRSampleCount: 512
|
||||
m_PVRBounces: 2
|
||||
m_PVREnvironmentSampleCount: 256
|
||||
m_PVREnvironmentReferencePointCount: 2048
|
||||
m_PVRFilteringMode: 1
|
||||
m_PVRDenoiserTypeDirect: 1
|
||||
m_PVRDenoiserTypeIndirect: 1
|
||||
m_PVRDenoiserTypeAO: 1
|
||||
m_PVRFilterTypeDirect: 0
|
||||
m_PVRFilterTypeIndirect: 0
|
||||
m_PVRFilterTypeAO: 0
|
||||
m_PVREnvironmentMIS: 1
|
||||
m_PVRCulling: 1
|
||||
m_PVRFilteringGaussRadiusDirect: 1
|
||||
m_PVRFilteringGaussRadiusIndirect: 5
|
||||
m_PVRFilteringGaussRadiusAO: 2
|
||||
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
|
||||
m_PVRFilteringAtrousPositionSigmaIndirect: 2
|
||||
m_PVRFilteringAtrousPositionSigmaAO: 1
|
||||
m_ExportTrainingData: 0
|
||||
m_TrainingDataDestination: TrainingData
|
||||
m_LightProbeSampleCountMultiplier: 4
|
||||
m_LightingDataAsset: {fileID: 0}
|
||||
m_UseShadowmask: 1
|
||||
--- !u!196 &4
|
||||
NavMeshSettings:
|
||||
serializedVersion: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_BuildSettings:
|
||||
serializedVersion: 2
|
||||
agentTypeID: 0
|
||||
agentRadius: 0.5
|
||||
agentHeight: 2
|
||||
agentSlope: 45
|
||||
agentClimb: 0.4
|
||||
ledgeDropHeight: 0
|
||||
maxJumpAcrossDistance: 0
|
||||
minRegionArea: 2
|
||||
manualCellSize: 0
|
||||
cellSize: 0.16666667
|
||||
manualTileSize: 0
|
||||
tileSize: 256
|
||||
accuratePlacement: 0
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1 &764046566
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 764046568}
|
||||
- component: {fileID: 764046567}
|
||||
m_Layer: 0
|
||||
m_Name: Directional Light
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!108 &764046567
|
||||
Light:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 764046566}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 10
|
||||
m_Type: 1
|
||||
m_Shape: 0
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Intensity: 1
|
||||
m_Range: 10
|
||||
m_SpotAngle: 30
|
||||
m_InnerSpotAngle: 21.80208
|
||||
m_CookieSize: 10
|
||||
m_Shadows:
|
||||
m_Type: 2
|
||||
m_Resolution: -1
|
||||
m_CustomResolution: -1
|
||||
m_Strength: 1
|
||||
m_Bias: 0.05
|
||||
m_NormalBias: 0.4
|
||||
m_NearPlane: 0.2
|
||||
m_CullingMatrixOverride:
|
||||
e00: 1
|
||||
e01: 0
|
||||
e02: 0
|
||||
e03: 0
|
||||
e10: 0
|
||||
e11: 1
|
||||
e12: 0
|
||||
e13: 0
|
||||
e20: 0
|
||||
e21: 0
|
||||
e22: 1
|
||||
e23: 0
|
||||
e30: 0
|
||||
e31: 0
|
||||
e32: 0
|
||||
e33: 1
|
||||
m_UseCullingMatrixOverride: 0
|
||||
m_Cookie: {fileID: 0}
|
||||
m_DrawHalo: 0
|
||||
m_Flare: {fileID: 0}
|
||||
m_RenderMode: 0
|
||||
m_CullingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_RenderingLayerMask: 1
|
||||
m_Lightmapping: 4
|
||||
m_LightShadowCasterMode: 0
|
||||
m_AreaSize: {x: 1, y: 1}
|
||||
m_BounceIntensity: 1
|
||||
m_ColorTemperature: 6570
|
||||
m_UseColorTemperature: 0
|
||||
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_UseBoundingSphereOverride: 0
|
||||
m_ShadowRadius: 0
|
||||
m_ShadowAngle: 0
|
||||
--- !u!4 &764046568
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 764046566}
|
||||
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
|
||||
m_LocalPosition: {x: 0, y: 3, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
|
||||
--- !u!1 &847097468
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 847097469}
|
||||
- component: {fileID: 847097471}
|
||||
- component: {fileID: 847097470}
|
||||
m_Layer: 5
|
||||
m_Name: RawImage
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &847097469
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 847097468}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2122288190}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &847097470
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 847097468}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 169ec79ce040653478e1a7725f34bbe1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Texture: {fileID: 0}
|
||||
m_UVRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
fonts: []
|
||||
devicePixelRatioOverride: 0
|
||||
hardwareAntiAliasing: 0
|
||||
--- !u!222 &847097471
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 847097468}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &1548023132
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1548023135}
|
||||
- component: {fileID: 1548023134}
|
||||
- component: {fileID: 1548023133}
|
||||
m_Layer: 0
|
||||
m_Name: Main Camera
|
||||
m_TagString: MainCamera
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!81 &1548023133
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1548023132}
|
||||
m_Enabled: 1
|
||||
--- !u!20 &1548023134
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1548023132}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_ClearFlags: 1
|
||||
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
|
||||
m_projectionMatrixMode: 1
|
||||
m_GateFitMode: 2
|
||||
m_FOVAxisMode: 0
|
||||
m_SensorSize: {x: 36, y: 24}
|
||||
m_LensShift: {x: 0, y: 0}
|
||||
m_FocalLength: 50
|
||||
m_NormalizedViewPortRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
near clip plane: 0.3
|
||||
far clip plane: 1000
|
||||
field of view: 60
|
||||
orthographic: 1
|
||||
orthographic size: 5.6
|
||||
m_Depth: -1
|
||||
m_CullingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_RenderingPath: -1
|
||||
m_TargetTexture: {fileID: 0}
|
||||
m_TargetDisplay: 0
|
||||
m_TargetEye: 3
|
||||
m_HDR: 1
|
||||
m_AllowMSAA: 1
|
||||
m_AllowDynamicResolution: 0
|
||||
m_ForceIntoRT: 0
|
||||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
--- !u!4 &1548023135
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1548023132}
|
||||
m_LocalRotation: {x: 0, y: 0.7071068, z: -0.7071068, w: 0}
|
||||
m_LocalPosition: {x: 0, y: 1, z: 0.32}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 90, y: 180, z: 0}
|
||||
--- !u!1 &1900497009
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1900497012}
|
||||
- component: {fileID: 1900497011}
|
||||
- component: {fileID: 1900497010}
|
||||
m_Layer: 0
|
||||
m_Name: EventSystem
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1900497010
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1900497009}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalAxis: Horizontal
|
||||
m_VerticalAxis: Vertical
|
||||
m_SubmitButton: Submit
|
||||
m_CancelButton: Cancel
|
||||
m_InputActionsPerSecond: 10
|
||||
m_RepeatDelay: 0.5
|
||||
m_ForceModuleActive: 0
|
||||
--- !u!114 &1900497011
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1900497009}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_FirstSelected: {fileID: 0}
|
||||
m_sendNavigationEvents: 1
|
||||
m_DragThreshold: 10
|
||||
--- !u!4 &1900497012
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1900497009}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2122288186
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2122288190}
|
||||
- component: {fileID: 2122288189}
|
||||
- component: {fileID: 2122288188}
|
||||
- component: {fileID: 2122288187}
|
||||
m_Layer: 5
|
||||
m_Name: Canvas
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &2122288187
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2122288186}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!114 &2122288188
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2122288186}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
--- !u!223 &2122288189
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2122288186}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 0
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_AdditionalShaderChannelsFlag: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!224 &2122288190
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2122288186}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_Children:
|
||||
- {fileID: 847097469}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ac26747b511ae1e42b7ee598ca4fc76d
|
||||
guid: 8314c7a04efc72842be6810d12b192ae
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
|
@ -0,0 +1,537 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!29 &1
|
||||
OcclusionCullingSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_OcclusionBakeSettings:
|
||||
smallestOccluder: 5
|
||||
smallestHole: 0.25
|
||||
backfaceThreshold: 100
|
||||
m_SceneGUID: 00000000000000000000000000000000
|
||||
m_OcclusionCullingData: {fileID: 0}
|
||||
--- !u!104 &2
|
||||
RenderSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 9
|
||||
m_Fog: 0
|
||||
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
|
||||
m_FogMode: 3
|
||||
m_FogDensity: 0.01
|
||||
m_LinearFogStart: 0
|
||||
m_LinearFogEnd: 300
|
||||
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
|
||||
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
|
||||
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
|
||||
m_AmbientIntensity: 1
|
||||
m_AmbientMode: 0
|
||||
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
|
||||
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_HaloStrength: 0.5
|
||||
m_FlareStrength: 1
|
||||
m_FlareFadeSpeed: 3
|
||||
m_HaloTexture: {fileID: 0}
|
||||
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_DefaultReflectionMode: 0
|
||||
m_DefaultReflectionResolution: 128
|
||||
m_ReflectionBounces: 1
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 11
|
||||
m_GIWorkflowMode: 1
|
||||
m_GISettings:
|
||||
serializedVersion: 2
|
||||
m_BounceScale: 1
|
||||
m_IndirectOutputScale: 1
|
||||
m_AlbedoBoost: 1
|
||||
m_EnvironmentLightingMode: 0
|
||||
m_EnableBakedLightmaps: 1
|
||||
m_EnableRealtimeLightmaps: 0
|
||||
m_LightmapEditorSettings:
|
||||
serializedVersion: 12
|
||||
m_Resolution: 2
|
||||
m_BakeResolution: 40
|
||||
m_AtlasSize: 1024
|
||||
m_AO: 0
|
||||
m_AOMaxDistance: 1
|
||||
m_CompAOExponent: 1
|
||||
m_CompAOExponentDirect: 0
|
||||
m_ExtractAmbientOcclusion: 0
|
||||
m_Padding: 2
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_LightmapsBakeMode: 1
|
||||
m_TextureCompression: 1
|
||||
m_FinalGather: 0
|
||||
m_FinalGatherFiltering: 1
|
||||
m_FinalGatherRayCount: 256
|
||||
m_ReflectionCompression: 2
|
||||
m_MixedBakeMode: 2
|
||||
m_BakeBackend: 1
|
||||
m_PVRSampling: 1
|
||||
m_PVRDirectSampleCount: 32
|
||||
m_PVRSampleCount: 512
|
||||
m_PVRBounces: 2
|
||||
m_PVREnvironmentSampleCount: 256
|
||||
m_PVREnvironmentReferencePointCount: 2048
|
||||
m_PVRFilteringMode: 1
|
||||
m_PVRDenoiserTypeDirect: 1
|
||||
m_PVRDenoiserTypeIndirect: 1
|
||||
m_PVRDenoiserTypeAO: 1
|
||||
m_PVRFilterTypeDirect: 0
|
||||
m_PVRFilterTypeIndirect: 0
|
||||
m_PVRFilterTypeAO: 0
|
||||
m_PVREnvironmentMIS: 1
|
||||
m_PVRCulling: 1
|
||||
m_PVRFilteringGaussRadiusDirect: 1
|
||||
m_PVRFilteringGaussRadiusIndirect: 5
|
||||
m_PVRFilteringGaussRadiusAO: 2
|
||||
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
|
||||
m_PVRFilteringAtrousPositionSigmaIndirect: 2
|
||||
m_PVRFilteringAtrousPositionSigmaAO: 1
|
||||
m_ExportTrainingData: 0
|
||||
m_TrainingDataDestination: TrainingData
|
||||
m_LightProbeSampleCountMultiplier: 4
|
||||
m_LightingDataAsset: {fileID: 0}
|
||||
m_UseShadowmask: 1
|
||||
--- !u!196 &4
|
||||
NavMeshSettings:
|
||||
serializedVersion: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_BuildSettings:
|
||||
serializedVersion: 2
|
||||
agentTypeID: 0
|
||||
agentRadius: 0.5
|
||||
agentHeight: 2
|
||||
agentSlope: 45
|
||||
agentClimb: 0.4
|
||||
ledgeDropHeight: 0
|
||||
maxJumpAcrossDistance: 0
|
||||
minRegionArea: 2
|
||||
manualCellSize: 0
|
||||
cellSize: 0.16666667
|
||||
manualTileSize: 0
|
||||
tileSize: 256
|
||||
accuratePlacement: 0
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1 &764046566
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 764046568}
|
||||
- component: {fileID: 764046567}
|
||||
m_Layer: 0
|
||||
m_Name: Directional Light
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!108 &764046567
|
||||
Light:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 764046566}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 10
|
||||
m_Type: 1
|
||||
m_Shape: 0
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Intensity: 1
|
||||
m_Range: 10
|
||||
m_SpotAngle: 30
|
||||
m_InnerSpotAngle: 21.80208
|
||||
m_CookieSize: 10
|
||||
m_Shadows:
|
||||
m_Type: 2
|
||||
m_Resolution: -1
|
||||
m_CustomResolution: -1
|
||||
m_Strength: 1
|
||||
m_Bias: 0.05
|
||||
m_NormalBias: 0.4
|
||||
m_NearPlane: 0.2
|
||||
m_CullingMatrixOverride:
|
||||
e00: 1
|
||||
e01: 0
|
||||
e02: 0
|
||||
e03: 0
|
||||
e10: 0
|
||||
e11: 1
|
||||
e12: 0
|
||||
e13: 0
|
||||
e20: 0
|
||||
e21: 0
|
||||
e22: 1
|
||||
e23: 0
|
||||
e30: 0
|
||||
e31: 0
|
||||
e32: 0
|
||||
e33: 1
|
||||
m_UseCullingMatrixOverride: 0
|
||||
m_Cookie: {fileID: 0}
|
||||
m_DrawHalo: 0
|
||||
m_Flare: {fileID: 0}
|
||||
m_RenderMode: 0
|
||||
m_CullingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_RenderingLayerMask: 1
|
||||
m_Lightmapping: 4
|
||||
m_LightShadowCasterMode: 0
|
||||
m_AreaSize: {x: 1, y: 1}
|
||||
m_BounceIntensity: 1
|
||||
m_ColorTemperature: 6570
|
||||
m_UseColorTemperature: 0
|
||||
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_UseBoundingSphereOverride: 0
|
||||
m_ShadowRadius: 0
|
||||
m_ShadowAngle: 0
|
||||
--- !u!4 &764046568
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 764046566}
|
||||
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
|
||||
m_LocalPosition: {x: 0, y: 3, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
|
||||
--- !u!1 &847097468
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 847097469}
|
||||
- component: {fileID: 847097471}
|
||||
- component: {fileID: 847097470}
|
||||
m_Layer: 5
|
||||
m_Name: RawImage
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &847097469
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 847097468}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2122288190}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &847097470
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 847097468}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f34989adbb4345fda4362c56f72ae791, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Texture: {fileID: 0}
|
||||
m_UVRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
fonts: []
|
||||
devicePixelRatioOverride: 0
|
||||
hardwareAntiAliasing: 0
|
||||
--- !u!222 &847097471
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 847097468}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &1548023132
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1548023135}
|
||||
- component: {fileID: 1548023134}
|
||||
- component: {fileID: 1548023133}
|
||||
m_Layer: 0
|
||||
m_Name: Main Camera
|
||||
m_TagString: MainCamera
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!81 &1548023133
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1548023132}
|
||||
m_Enabled: 1
|
||||
--- !u!20 &1548023134
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1548023132}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_ClearFlags: 1
|
||||
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
|
||||
m_projectionMatrixMode: 1
|
||||
m_GateFitMode: 2
|
||||
m_FOVAxisMode: 0
|
||||
m_SensorSize: {x: 36, y: 24}
|
||||
m_LensShift: {x: 0, y: 0}
|
||||
m_FocalLength: 50
|
||||
m_NormalizedViewPortRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
near clip plane: 0.3
|
||||
far clip plane: 1000
|
||||
field of view: 60
|
||||
orthographic: 1
|
||||
orthographic size: 5.6
|
||||
m_Depth: -1
|
||||
m_CullingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_RenderingPath: -1
|
||||
m_TargetTexture: {fileID: 0}
|
||||
m_TargetDisplay: 0
|
||||
m_TargetEye: 3
|
||||
m_HDR: 1
|
||||
m_AllowMSAA: 1
|
||||
m_AllowDynamicResolution: 0
|
||||
m_ForceIntoRT: 0
|
||||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
--- !u!4 &1548023135
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1548023132}
|
||||
m_LocalRotation: {x: 0, y: 0.7071068, z: -0.7071068, w: 0}
|
||||
m_LocalPosition: {x: 0, y: 1, z: 0.32}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 90, y: 180, z: 0}
|
||||
--- !u!1 &1900497009
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1900497012}
|
||||
- component: {fileID: 1900497011}
|
||||
- component: {fileID: 1900497010}
|
||||
m_Layer: 0
|
||||
m_Name: EventSystem
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1900497010
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1900497009}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalAxis: Horizontal
|
||||
m_VerticalAxis: Vertical
|
||||
m_SubmitButton: Submit
|
||||
m_CancelButton: Cancel
|
||||
m_InputActionsPerSecond: 10
|
||||
m_RepeatDelay: 0.5
|
||||
m_ForceModuleActive: 0
|
||||
--- !u!114 &1900497011
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1900497009}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_FirstSelected: {fileID: 0}
|
||||
m_sendNavigationEvents: 1
|
||||
m_DragThreshold: 10
|
||||
--- !u!4 &1900497012
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1900497009}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2122288186
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2122288190}
|
||||
- component: {fileID: 2122288189}
|
||||
- component: {fileID: 2122288188}
|
||||
- component: {fileID: 2122288187}
|
||||
m_Layer: 5
|
||||
m_Name: Canvas
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &2122288187
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2122288186}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!114 &2122288188
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2122288186}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
--- !u!223 &2122288189
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2122288186}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 0
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_AdditionalShaderChannelsFlag: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!224 &2122288190
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2122288186}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_Children:
|
||||
- {fileID: 847097469}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 306ce4c6ff7164648ba07e7f7157db6f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -223,7 +223,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 847097469}
|
||||
- component: {fileID: 847097471}
|
||||
- component: {fileID: 847097472}
|
||||
- component: {fileID: 847097470}
|
||||
m_Layer: 5
|
||||
m_Name: RawImage
|
||||
m_TagString: Untagged
|
||||
|
|
@ -250,15 +250,7 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &847097471
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 847097468}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &847097472
|
||||
--- !u!114 &847097470
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -267,7 +259,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 847097468}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 169ec79ce040653478e1a7725f34bbe1, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: b7e1083a82b756840b36958a76a3e6f3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
|
|
@ -285,26 +277,20 @@ MonoBehaviour:
|
|||
width: 1
|
||||
height: 1
|
||||
fonts:
|
||||
- family: racher
|
||||
fonts:
|
||||
- asset: Ranchers-Regular.ttf
|
||||
weight: 0
|
||||
- family: roboto
|
||||
fonts:
|
||||
- asset: Roboto-Italic.ttf
|
||||
weight: 0
|
||||
- asset: Roboto-BlackItalic.ttf
|
||||
weight: 900
|
||||
- family: CupertinoIcons
|
||||
fonts:
|
||||
- asset: CupertinoIcons.ttf
|
||||
weight: 0
|
||||
- family: robotox
|
||||
fonts:
|
||||
- asset: Roboto-Italic.ttf
|
||||
weight: 0
|
||||
devicePixelRatioOverride: 0
|
||||
hardwareAntiAliasing: 0
|
||||
--- !u!222 &847097471
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 847097468}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &1548023132
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: db95daae641c0db4caacccc865af16c8
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,89 @@
|
|||
using System.Collections.Generic;
|
||||
using Unity.UIWidgets.animation;
|
||||
using Unity.UIWidgets.engine2;
|
||||
using Unity.UIWidgets.foundation;
|
||||
using Unity.UIWidgets.painting;
|
||||
using Unity.UIWidgets.ui;
|
||||
using Unity.UIWidgets.widgets;
|
||||
using FontStyle = Unity.UIWidgets.ui.FontStyle;
|
||||
using Image = Unity.UIWidgets.widgets.Image;
|
||||
using TextStyle = Unity.UIWidgets.painting.TextStyle;
|
||||
using ui_ = Unity.UIWidgets.widgets.ui_;
|
||||
|
||||
namespace UIWidgetsSample
|
||||
{
|
||||
public class CountTest : UIWidgetsPanel
|
||||
{
|
||||
protected void OnEnable()
|
||||
{
|
||||
base.OnEnable();
|
||||
}
|
||||
|
||||
protected override void main()
|
||||
{
|
||||
ui_.runApp(new MyApp());
|
||||
}
|
||||
|
||||
class MyApp : StatelessWidget
|
||||
{
|
||||
public override Widget build(BuildContext context)
|
||||
{
|
||||
return new WidgetsApp(
|
||||
home: new ExampleApp(),
|
||||
pageRouteBuilder: (settings, builder) =>
|
||||
new PageRouteBuilder(
|
||||
settings: settings,
|
||||
pageBuilder: (Buildcontext, animation, secondaryAnimation) => builder(context)
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class ExampleApp : StatefulWidget
|
||||
{
|
||||
public ExampleApp(Key key = null) : base(key)
|
||||
{
|
||||
}
|
||||
|
||||
public override State createState()
|
||||
{
|
||||
return new ExampleState();
|
||||
}
|
||||
}
|
||||
|
||||
class ExampleState : State<ExampleApp>
|
||||
{
|
||||
int counter;
|
||||
|
||||
public override Widget build(BuildContext context)
|
||||
{
|
||||
return new Container(
|
||||
color: Color.black,
|
||||
child: new Column(
|
||||
children: new List<Widget>
|
||||
{
|
||||
new Text("Counter: " + counter,
|
||||
style: new TextStyle(fontSize: 18, fontWeight: FontWeight.w100)),
|
||||
|
||||
new GestureDetector(
|
||||
onTap: () =>
|
||||
{
|
||||
setState(() =>
|
||||
{
|
||||
counter++;
|
||||
});
|
||||
},
|
||||
child: new Container(
|
||||
padding: EdgeInsets.symmetric(20, 20),
|
||||
color: counter % 2 == 0 ? Color.white : Color.black,
|
||||
child: new Text("Click Me",
|
||||
style: new TextStyle(fontFamily: "racher", fontWeight: FontWeight.w100))
|
||||
)
|
||||
)
|
||||
}
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
using System.Collections.Generic;
|
||||
using Unity.UIWidgets.animation;
|
||||
using Unity.UIWidgets.engine2;
|
||||
using Unity.UIWidgets.foundation;
|
||||
using Unity.UIWidgets.painting;
|
||||
using Unity.UIWidgets.ui;
|
||||
using Unity.UIWidgets.widgets;
|
||||
using FontStyle = Unity.UIWidgets.ui.FontStyle;
|
||||
using Image = Unity.UIWidgets.widgets.Image;
|
||||
using TextStyle = Unity.UIWidgets.painting.TextStyle;
|
||||
using ui_ = Unity.UIWidgets.widgets.ui_;
|
||||
|
||||
namespace UIWidgetsSample
|
||||
{
|
||||
public class ImageTest : UIWidgetsPanel
|
||||
{
|
||||
protected void OnEnable()
|
||||
{
|
||||
base.OnEnable();
|
||||
}
|
||||
|
||||
protected override void main()
|
||||
{
|
||||
ui_.runApp(new MyApp());
|
||||
}
|
||||
|
||||
class MyApp : StatelessWidget
|
||||
{
|
||||
public override Widget build(BuildContext context)
|
||||
{
|
||||
return new WidgetsApp(
|
||||
home: new ExampleApp(),
|
||||
pageRouteBuilder: (settings, builder) =>
|
||||
new PageRouteBuilder(
|
||||
settings: settings,
|
||||
pageBuilder: (Buildcontext, animation, secondaryAnimation) => builder(context)
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class ExampleApp : StatefulWidget
|
||||
{
|
||||
public ExampleApp(Key key = null) : base(key)
|
||||
{
|
||||
}
|
||||
|
||||
public override State createState()
|
||||
{
|
||||
return new ExampleState();
|
||||
}
|
||||
}
|
||||
|
||||
class ExampleState : State<ExampleApp>
|
||||
{
|
||||
private float frame = 0;
|
||||
|
||||
public override Widget build(BuildContext context)
|
||||
{
|
||||
return new Container(
|
||||
color: Color.black,
|
||||
child: new Column(
|
||||
children: new List<Widget>
|
||||
{
|
||||
AnimatedLottie.file("wine.json", frame: frame, curve: Curves.linear),
|
||||
new Container(
|
||||
width: 100,
|
||||
height: 100,
|
||||
decoration: new BoxDecoration(
|
||||
borderRadius: BorderRadius.all(Radius.circular(8))
|
||||
),
|
||||
child: Image.file("test.gif", gaplessPlayback: true)
|
||||
),
|
||||
new Container(
|
||||
width: 200,
|
||||
height: 100,
|
||||
decoration: new BoxDecoration(
|
||||
borderRadius: BorderRadius.all(Radius.circular(8))
|
||||
),
|
||||
child: Image.network(
|
||||
"https://unity-cn-cms-prd-1254078910.cos.ap-shanghai.myqcloud.com/assetstore-cms-media/img-7dfe215f-0075-4f9c-9b5a-be5ee88b866b",
|
||||
gaplessPlayback: true)
|
||||
),
|
||||
new GestureDetector(
|
||||
onTap: () => { setState(() => { frame += 1; }); },
|
||||
child: new Container(
|
||||
padding: EdgeInsets.symmetric(20, 20),
|
||||
color: Color.white,
|
||||
child: new Text("Click Me",
|
||||
style: new TextStyle(fontWeight: FontWeight.w100))
|
||||
)
|
||||
)
|
||||
}
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f34989adbb4345fda4362c56f72ae791
|
||||
timeCreated: 1607399515
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b7e1083a82b756840b36958a76a3e6f3
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -19,10 +19,7 @@ namespace Unity.UIWidgets.Editor {
|
|||
EditorGUILayout.PropertyField(pixelRatioProperty);
|
||||
EditorGUILayout.PropertyField(antiAliasingProperty);
|
||||
UIWidgetsPanel panel = (UIWidgetsPanel)target;
|
||||
|
||||
if (GUILayout.Button("Take Screenshot")) {
|
||||
panel.TakeScreenshot();
|
||||
}
|
||||
|
||||
serializedObject.ApplyModifiedProperties();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@ namespace Unity.UIWidgets.async2 {
|
|||
future.then((object value) => {
|
||||
remaining--;
|
||||
if (values != null) {
|
||||
values[pos] = (T) value;
|
||||
values.Insert(pos, (T)value);
|
||||
if (remaining == 0) {
|
||||
result._completeWithValue(values);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -108,11 +108,13 @@ namespace Unity.UIWidgets.async2 {
|
|||
}
|
||||
}
|
||||
|
||||
const long MILLI_TO_NANO = 1000000L;
|
||||
|
||||
void _enqueue() {
|
||||
Isolate.ensureExists();
|
||||
|
||||
GCHandle callabackHandle = GCHandle.Alloc(this);
|
||||
UIMonoState_postTaskForTime(_postTaskForTime, (IntPtr) callabackHandle, _wakeupTime * 1000L);
|
||||
UIMonoState_postTaskForTime(_postTaskForTime, (IntPtr) callabackHandle, _wakeupTime * MILLI_TO_NANO);
|
||||
}
|
||||
|
||||
[MonoPInvokeCallback(typeof(UIMonoState_postTaskForTimeCallback))]
|
||||
|
|
|
|||
|
|
@ -12,17 +12,17 @@ using NativeBindings = Unity.UIWidgets.ui.NativeBindings;
|
|||
|
||||
namespace Unity.UIWidgets.engine2 {
|
||||
public partial class UIWidgetsPanel : RawImage {
|
||||
[Serializable]
|
||||
public struct TextFont {
|
||||
public string family;
|
||||
[SerializeField] public Font[] fonts;
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public struct Font {
|
||||
public string asset;
|
||||
public int weight;
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public struct TextFont {
|
||||
public string family;
|
||||
[SerializeField] public Font[] fonts;
|
||||
}
|
||||
|
||||
public TextFont[] fonts;
|
||||
|
||||
|
|
@ -106,12 +106,15 @@ namespace Unity.UIWidgets.engine2 {
|
|||
|
||||
_ptr = UIWidgetsPanel_constructor((IntPtr) _handle, UIWidgetsPanel_entrypoint);
|
||||
var settings = new Dictionary<string, object>();
|
||||
settings.Add("fonts", fontsToObject(fonts));
|
||||
if (fonts != null && fonts.Length > 0) {
|
||||
settings.Add("fonts", fontsToObject(fonts));
|
||||
}
|
||||
UIWidgetsPanel_onEnable(_ptr, _renderTexture.GetNativeTexturePtr(),
|
||||
_width, _height, _devicePixelRatio, Application.streamingAssetsPath,
|
||||
JSONMessageCodec.instance.toJson(settings));
|
||||
|
||||
Input_OnEnable();
|
||||
NativeConsole.OnEnable();
|
||||
}
|
||||
|
||||
protected virtual void main() {
|
||||
|
|
@ -347,11 +350,7 @@ namespace Unity.UIWidgets.engine2 {
|
|||
_isEntered = false;
|
||||
UIWidgetsPanel_onMouseLeave(_ptr);
|
||||
}
|
||||
|
||||
public void TakeScreenshot() {
|
||||
UIWidgetsPanel_takeScreenShot(_ptr);
|
||||
}
|
||||
|
||||
|
||||
public void OnDrag(PointerEventData eventData) {
|
||||
var pos = _getPointerPosition(Input.mousePosition);
|
||||
if (pos == null) {
|
||||
|
|
@ -381,8 +380,5 @@ namespace Unity.UIWidgets.engine2 {
|
|||
|
||||
[DllImport(NativeBindings.dllName)]
|
||||
static extern void UIWidgetsPanel_onMouseLeave(IntPtr ptr);
|
||||
|
||||
[DllImport(NativeBindings.dllName)]
|
||||
static extern void UIWidgetsPanel_takeScreenShot(IntPtr ptr);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
using UnityEngine;
|
||||
using AOT;
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
using NativeBindings = Unity.UIWidgets.ui.NativeBindings;
|
||||
|
||||
public static class NativeConsole {
|
||||
internal delegate void LogDelegate(IntPtr message, int iSize);
|
||||
|
||||
[DllImport(NativeBindings.dllName)]
|
||||
internal static extern void InitNativeConsoleDelegate(LogDelegate log);
|
||||
|
||||
[MonoPInvokeCallback(typeof(LogDelegate))]
|
||||
internal static void LogMessageFromCpp(IntPtr message, int iSize) {
|
||||
Debug.Log(Marshal.PtrToStringAnsi(message, iSize));
|
||||
}
|
||||
|
||||
public static void OnEnable()
|
||||
{
|
||||
InitNativeConsoleDelegate(LogMessageFromCpp);
|
||||
}
|
||||
}
|
||||
|
|
@ -702,10 +702,10 @@ namespace Unity.UIWidgets.painting {
|
|||
|
||||
public EdgeInsets clamp(EdgeInsets min, EdgeInsets max) {
|
||||
return fromLTRB(
|
||||
left.clamp(min.left, min.left),
|
||||
top.clamp(min.top, min.top),
|
||||
right.clamp(min.right, min.right),
|
||||
bottom.clamp(min.bottom, min.bottom)
|
||||
left.clamp(min.left, max.left),
|
||||
top.clamp(min.top, max.top),
|
||||
right.clamp(min.right, max.right),
|
||||
bottom.clamp(min.bottom, max.bottom)
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ using Codec = Unity.UIWidgets.ui.Codec;
|
|||
using Image = Unity.UIWidgets.ui.Image;
|
||||
using Locale = Unity.UIWidgets.ui.Locale;
|
||||
using Object = UnityEngine.Object;
|
||||
using Path = System.IO.Path;
|
||||
using TextDirection = Unity.UIWidgets.ui.TextDirection;
|
||||
using Window = Unity.UIWidgets.ui.Window;
|
||||
|
||||
|
|
@ -197,29 +198,31 @@ namespace Unity.UIWidgets.painting {
|
|||
resolveStreamForKey(configuration, stream, successKey, (Exception e) => errorHandler(e));
|
||||
},
|
||||
(T key, Exception exception) => {
|
||||
// await null; // wait an event turn in case a listener has been added to the image stream.
|
||||
_ErrorImageCompleter imageCompleter = new _ErrorImageCompleter();
|
||||
stream.setCompleter(imageCompleter);
|
||||
InformationCollector collector = null;
|
||||
D.assert(() => {
|
||||
IEnumerable<DiagnosticsNode> infoCollector() {
|
||||
yield return new DiagnosticsProperty<ImageProvider>("Image provider", this);
|
||||
yield return new DiagnosticsProperty<ImageConfiguration>("Image configuration",
|
||||
configuration);
|
||||
yield return new DiagnosticsProperty<T>("Image key", key, defaultValue: null);
|
||||
}
|
||||
Timer.run(() => {
|
||||
_ErrorImageCompleter imageCompleter = new _ErrorImageCompleter();
|
||||
stream.setCompleter(imageCompleter);
|
||||
InformationCollector collector = null;
|
||||
D.assert(() => {
|
||||
IEnumerable<DiagnosticsNode> infoCollector() {
|
||||
yield return new DiagnosticsProperty<ImageProvider>("Image provider", this);
|
||||
yield return new DiagnosticsProperty<ImageConfiguration>("Image configuration",
|
||||
configuration);
|
||||
yield return new DiagnosticsProperty<T>("Image key", key, defaultValue: null);
|
||||
}
|
||||
|
||||
collector = infoCollector;
|
||||
return true;
|
||||
collector = infoCollector;
|
||||
return true;
|
||||
});
|
||||
imageCompleter.setError(
|
||||
exception: exception,
|
||||
stack: exception.StackTrace,
|
||||
context: new ErrorDescription("while resolving an image"),
|
||||
silent: true, // could be a network error or whatnot
|
||||
informationCollector: collector
|
||||
);
|
||||
return null;
|
||||
});
|
||||
imageCompleter.setError(
|
||||
exception: exception,
|
||||
stack: exception.StackTrace,
|
||||
context: new ErrorDescription("while resolving an image"),
|
||||
silent: true, // could be a network error or whatnot
|
||||
informationCollector: collector
|
||||
);
|
||||
return Future.value();
|
||||
return null;
|
||||
}
|
||||
);
|
||||
|
||||
|
|
@ -228,9 +231,7 @@ namespace Unity.UIWidgets.painting {
|
|||
|
||||
void resolveStreamForKey(ImageConfiguration configuration, ImageStream stream, T key,
|
||||
ImageErrorListener handleError) {
|
||||
// This is an unusual edge case where someone has told us that they found
|
||||
// the image we want before getting to this method. We should avoid calling
|
||||
// load again, but still update the image cache with LRU information.
|
||||
|
||||
if (stream.completer != null) {
|
||||
ImageStreamCompleter completerEdge = PaintingBinding.instance.imageCache.putIfAbsent(
|
||||
key,
|
||||
|
|
@ -282,14 +283,6 @@ namespace Unity.UIWidgets.painting {
|
|||
didError = true;
|
||||
};
|
||||
|
||||
// If an error is added to a synchronous completer before a listener has been
|
||||
// added, it can throw an error both into the zone and up the stack. Thus, it
|
||||
// looks like the error has been caught, but it is in fact also bubbling to the
|
||||
// zone. Since we cannot prevent all usage of Completer.sync here, or rather
|
||||
// that changing them would be too breaking, we instead hook into the same
|
||||
// zone mechanism to intercept the uncaught error and deliver it to the
|
||||
// image stream's error handler. Note that these errors may be duplicated,
|
||||
// hence the need for the `didError` flag.
|
||||
Zone dangerZone = Zone.current.fork(
|
||||
specification: new ZoneSpecification(
|
||||
handleUncaughtError: (Zone self, ZoneDelegate parent, Zone zone, Exception error) => {
|
||||
|
|
@ -638,7 +631,7 @@ namespace Unity.UIWidgets.painting {
|
|||
}
|
||||
|
||||
Future<Codec> _loadAsync(FileImage key, DecoderCallback decode) {
|
||||
byte[] bytes = File.ReadAllBytes("Assets/StreamingAssets/" + key.file);
|
||||
byte[] bytes = File.ReadAllBytes(Path.Combine(Application.streamingAssetsPath, key.file));
|
||||
if (bytes != null && bytes.Length > 0 ) {
|
||||
return decode(bytes);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Unity.UIWidgets.foundation;
|
||||
using Unity.UIWidgets.service;
|
||||
using Unity.UIWidgets.ui;
|
||||
|
|
@ -254,7 +253,7 @@ namespace Unity.UIWidgets.painting {
|
|||
}
|
||||
|
||||
void setPlaceholderDimensions(List<PlaceholderDimensions> value) {
|
||||
if (value == null || value.isEmpty() || value.SequenceEqual(_placeholderDimensions)) {
|
||||
if (value == null || value.isEmpty() || value.equalsList(_placeholderDimensions)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1589,13 +1589,11 @@ namespace Unity.UIWidgets.rendering {
|
|||
public void rotateX(float degrees) {
|
||||
_transform.rotateX(degrees);
|
||||
markNeedsPaint();
|
||||
//2D, do nothing
|
||||
}
|
||||
|
||||
public void rotateY(float degrees) {
|
||||
_transform.rotateY(degrees);
|
||||
markNeedsPaint();
|
||||
//2D, do nothing
|
||||
}
|
||||
|
||||
public void rotateZ(float degrees) {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ using Unity.UIWidgets.engine2;
|
|||
using Unity.UIWidgets.foundation;
|
||||
using Unity.UIWidgets.ui;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace Unity.UIWidgets.ui {
|
||||
public delegate void VoidCallback();
|
||||
|
|
@ -310,9 +311,26 @@ namespace Unity.UIWidgets.ui {
|
|||
}
|
||||
}
|
||||
|
||||
protected float queryDevicePixelRatio() {
|
||||
return _panel.devicePixelRatioOverride;
|
||||
}
|
||||
|
||||
public Offset windowPosToScreenPos(Offset offset) {
|
||||
D.assert(false, () => "window.windowPosToScreenPos is not implemented yet!");
|
||||
return offset;
|
||||
Camera camera = null;
|
||||
var canvas = _panel.canvas;
|
||||
if (canvas.renderMode != RenderMode.ScreenSpaceCamera) {
|
||||
camera = canvas.GetComponent<GraphicRaycaster>().eventCamera;
|
||||
}
|
||||
|
||||
var pos = new Vector2(offset.dx, offset.dy);
|
||||
pos = pos * queryDevicePixelRatio() / _panel.canvas.scaleFactor;
|
||||
var rectTransform = _panel.rectTransform;
|
||||
var rect = rectTransform.rect;
|
||||
pos.x += rect.min.x;
|
||||
pos.y = rect.max.y - pos.y;
|
||||
var worldPos = rectTransform.TransformPoint(new Vector2(pos.x, pos.y));
|
||||
var screenPos = RectTransformUtility.WorldToScreenPoint(camera, worldPos);
|
||||
return new Offset(screenPos.x, Screen.height - screenPos.y);
|
||||
}
|
||||
|
||||
public void run(Action callback) {
|
||||
|
|
|
|||
|
|
@ -65,10 +65,10 @@ namespace Unity.UIWidgets.widgets {
|
|||
base.initInstances();
|
||||
instance = this;
|
||||
|
||||
// D.assert(() => {
|
||||
// _debugAddStackFilters();
|
||||
// return true;
|
||||
// }());
|
||||
D.assert(() => {
|
||||
// _debugAddStackFilters();
|
||||
return true;
|
||||
});
|
||||
|
||||
_buildOwner = new BuildOwner();
|
||||
buildOwner.onBuildScheduled = _handleBuildScheduled;
|
||||
|
|
|
|||
|
|
@ -2414,7 +2414,7 @@ namespace Unity.UIWidgets.widgets {
|
|||
static Widget _defaultErrorWidgetBuilder(UIWidgetsErrorDetails details) {
|
||||
string message = "";
|
||||
D.assert(() => {
|
||||
message = _stringify(details.exception) + "\nSee also: https://flutter.dev/docs/testing/errors";
|
||||
message = _stringify(details.exception);
|
||||
return true;
|
||||
});
|
||||
object exception = details.exception;
|
||||
|
|
@ -2436,7 +2436,6 @@ namespace Unity.UIWidgets.widgets {
|
|||
readonly UIWidgetsError _uiWidgetsError;
|
||||
|
||||
public override RenderObject createRenderObject(BuildContext context) {
|
||||
//return null;
|
||||
return new RenderErrorBox(message);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,4 +3,5 @@
|
|||
artifacts
|
||||
build
|
||||
obj
|
||||
*.gen.*
|
||||
*.gen.*
|
||||
third_party/skia
|
||||
|
|
@ -310,6 +310,8 @@ class Build
|
|||
"src/shell/platform/unity/unity_surface_manager.h",
|
||||
"src/shell/platform/unity/win32_task_runner.cc",
|
||||
"src/shell/platform/unity/win32_task_runner.h",
|
||||
"src/shell/platform/unity/unity_console.cc",
|
||||
"src/shell/platform/unity/unity_console.h",
|
||||
|
||||
"src/shell/version/version.cc",
|
||||
"src/shell/version/version.h",
|
||||
|
|
|
|||
|
|
@ -15,21 +15,22 @@ git clone 'https://chromium.googlesource.com/chromium/tools/depot_tools.git'
|
|||
Add ${PWD}/depot_tools to PATH
|
||||
|
||||
2. Clone the skia Repo
|
||||
|
||||
```
|
||||
git clone https://skia.googlesource.com/skia.git
|
||||
cd skia
|
||||
git checkout chrome/m85
|
||||
python2 tools/git-sync-deps
|
||||
```
|
||||
|
||||
3. Install LLVM
|
||||
|
||||
https://clang.llvm.org/get_started.html
|
||||
|
||||
4. Build skia
|
||||
|
||||
```
|
||||
bin/gn gen out/Debug
|
||||
```
|
||||
|
||||
Update out/Debug/args.gn with the following content:
|
||||
```
|
||||
clang_win = "C:\Program Files\LLVM"
|
||||
|
|
@ -112,4 +113,4 @@ header file in flutter engine, instead of headers in skia repo.
|
|||
## How to Build Engine
|
||||
```
|
||||
bee
|
||||
```
|
||||
```
|
||||
|
|
|
|||
|
|
@ -417,25 +417,6 @@ void UIWidgetsPanel::OnMouseLeave() {
|
|||
}
|
||||
}
|
||||
|
||||
void UIWidgetsPanel::TakeScreenShot() {
|
||||
if (process_events_) {
|
||||
auto* engine = reinterpret_cast<EmbedderEngine*>(engine_);
|
||||
Rasterizer::Screenshot screenshot = engine->GetShell().Screenshot(
|
||||
Rasterizer::ScreenshotType::SkiaPicture, true);
|
||||
const char* screenshot_char =
|
||||
static_cast<const char*>(screenshot.data->data());
|
||||
int size = screenshot.data->size();
|
||||
SkBase64 temp;
|
||||
temp.decode(screenshot_char, screenshot.data->size());
|
||||
char* decoded = temp.getData();
|
||||
|
||||
std::ofstream myfile;
|
||||
myfile.open("example.txt");
|
||||
myfile.write(decoded, temp.getDataSize());
|
||||
myfile.close();
|
||||
}
|
||||
}
|
||||
|
||||
UIWIDGETS_API(UIWidgetsPanel*)
|
||||
UIWidgetsPanel_constructor(
|
||||
Mono_Handle handle,
|
||||
|
|
@ -497,9 +478,4 @@ UIWidgetsPanel_onMouseMove(UIWidgetsPanel* panel, float x, float y) {
|
|||
|
||||
UIWIDGETS_API(void)
|
||||
UIWidgetsPanel_onMouseLeave(UIWidgetsPanel* panel) { panel->OnMouseLeave(); }
|
||||
|
||||
UIWIDGETS_API(void)
|
||||
UIWidgetsPanel_takeScreenShot(UIWidgetsPanel* panel) {
|
||||
panel->TakeScreenShot();
|
||||
}
|
||||
} // namespace uiwidgets
|
||||
|
|
@ -27,7 +27,8 @@ class UIWidgetsPanel : public fml::RefCountedThreadSafe<UIWidgetsPanel> {
|
|||
~UIWidgetsPanel();
|
||||
|
||||
void OnEnable(void* native_texture_ptr, size_t width, size_t height,
|
||||
float device_pixel_ratio, const char* streaming_assets_path, const char* settings);
|
||||
float device_pixel_ratio, const char* streaming_assets_path,
|
||||
const char* settings);
|
||||
|
||||
void MonoEntrypoint();
|
||||
|
||||
|
|
@ -54,7 +55,6 @@ class UIWidgetsPanel : public fml::RefCountedThreadSafe<UIWidgetsPanel> {
|
|||
|
||||
void OnMouseLeave();
|
||||
|
||||
void TakeScreenShot();
|
||||
private:
|
||||
UIWidgetsPanel(Mono_Handle handle, EntrypointCallback entrypoint_callback);
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
#include "unity_console.h"
|
||||
#include <stdarg.h>
|
||||
|
||||
namespace uiwidgets {
|
||||
|
||||
void UnityConsole::WriteLine(const char* fmt, ...) {
|
||||
char log_str[512] = { 0 };
|
||||
va_list ap;
|
||||
va_start(ap, fmt);
|
||||
vsprintf(log_str, fmt, ap);
|
||||
_log(log_str, strlen(log_str));
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
LogDelegate UnityConsole::_log;
|
||||
|
||||
UIWIDGETS_API(void)
|
||||
InitNativeConsoleDelegate(LogDelegate Log) {
|
||||
UnityConsole::_log = Log;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
#pragma once
|
||||
#include "runtime/mono_api.h"
|
||||
|
||||
namespace uiwidgets {
|
||||
|
||||
typedef void (*LogDelegate)(char* message, int iSize);
|
||||
|
||||
|
||||
class UnityConsole{
|
||||
public:
|
||||
static LogDelegate _log;
|
||||
|
||||
/**
|
||||
output the log to unity editor console window
|
||||
@param fmt log format
|
||||
@param ... log args
|
||||
@return null
|
||||
|
||||
example:
|
||||
UnityConsole::WriteLine("output log without fmt param");
|
||||
UnityConsole::WriteLine("%s: %d + %d = %d","output log with param", 1, 2, 3);
|
||||
*/
|
||||
static void WriteLine(const char* fmt, ...);
|
||||
};
|
||||
|
||||
} // namespace uiwidgets
|
||||
Загрузка…
Ссылка в новой задаче