Merge branch 'main' into variants

This commit is contained in:
2024-10-26 21:25:43 -07:00
9 changed files with 146 additions and 9 deletions

View File

@@ -130,6 +130,7 @@ GameObject:
- component: {fileID: 394755569}
- component: {fileID: 394755568}
- component: {fileID: 394755567}
- component: {fileID: 394755570}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@@ -211,6 +212,50 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &394755570
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 394755566}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RenderShadows: 1
m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_Cameras: []
m_RendererIndex: -1
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 0
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0
m_ClearDepth: 1
m_AllowXRRendering: 1
m_AllowHDROutput: 1
m_UseScreenCoordOverride: 0
m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
m_TaaSettings:
m_Quality: 3
m_FrameInfluence: 0.1
m_JitterScale: 1
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
--- !u!1 &535625290
GameObject:
m_ObjectHideFlags: 0
@@ -583,7 +628,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1000, y: 575}
m_AnchoredPosition: {x: -875, y: 500}
m_SizeDelta: {x: 150, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1166220272
@@ -726,8 +771,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -425}
m_SizeDelta: {x: 2000, y: 400}
m_AnchoredPosition: {x: 0, y: -375}
m_SizeDelta: {x: 1750, y: 350}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1275561241
MonoBehaviour:
@@ -776,8 +821,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 50
m_fontSizeBase: 50
m_fontSize: 40
m_fontSizeBase: 40
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@@ -856,14 +901,14 @@ RectTransform:
m_GameObject: {fileID: 1503348795}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 8.2, y: 8.2, z: 8.2}
m_LocalScale: {x: 7, y: 7, z: 7}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 535625294}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -500, y: 225}
m_AnchoredPosition: {x: -425, y: 200}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1503348797
@@ -991,14 +1036,14 @@ RectTransform:
m_GameObject: {fileID: 1943616460}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 8.2, y: 8.2, z: 8.1288}
m_LocalScale: {x: 7, y: 7, z: 7}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 535625294}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 500, y: 225}
m_AnchoredPosition: {x: 425, y: 200}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1943616462