Merge branch 'main' into YK-Opti-v2
This commit is contained in:
@@ -295,7 +295,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: 0, y: 176}
|
||||
m_AnchoredPosition: {x: 0, y: 314}
|
||||
m_SizeDelta: {x: 800, y: 2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &74466215
|
||||
@@ -433,43 +433,55 @@ MonoBehaviour:
|
||||
InitialScale: {x: 0, y: 0, z: 0}
|
||||
_settings:
|
||||
Space: 0
|
||||
Type: 0
|
||||
Type: 3
|
||||
Balance: 1
|
||||
Curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0.012500763
|
||||
value: 0.9956665
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
time: 0.04888071
|
||||
value: -0.0025501102
|
||||
inSlope: 0.9618244
|
||||
outSlope: 0.9618244
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
outWeight: 0.16666658
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
inSlope: 1.4518068
|
||||
outSlope: 1.4518068
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
inWeight: 0.09166671
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
PlayOnAwake: 1
|
||||
Duration: 60
|
||||
Duration: 40
|
||||
TimeOffset: 0
|
||||
RandomOffset: 0
|
||||
Translation: {x: 0, y: 5000, z: 0}
|
||||
Translation: {x: 0, y: 5500, z: 0}
|
||||
Rotation: {x: 0, y: 0, z: 0}
|
||||
Scale: {x: 0, y: 0, z: 0}
|
||||
_events:
|
||||
OnAnimationEnded:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 579661352}
|
||||
m_TargetAssemblyTypeName: OctoCore.Navigation.OctoSceneTrigger, OctoCore.Runtime
|
||||
m_MethodName: LoadScene
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!1 &138241830
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -594,7 +606,7 @@ MonoBehaviour:
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 280.30487, z: 0, w: 971.9161}
|
||||
m_margin: {x: 0, y: -27.191696, z: 0, w: 971.9161}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
@@ -741,9 +753,14 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "Luc JOURNOT - Art Director & Lead Artist\n\nKenan ANSELME - Principal
|
||||
Artist\n\nFleur VELASCO - 2D/3D Artist\n\nSamson BERNARD - 2D/3D Artist\n\nLili
|
||||
KRUG-SZAB\xD3 - 2D Artist"
|
||||
m_text: 'Hugo LE BOLLOC''H - Audio Director
|
||||
|
||||
|
||||
Solal "Selhoa" MALLEMONT - Music
|
||||
Composer
|
||||
|
||||
|
||||
Alexandre CHARLIER - Sound Designer'
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: d5dd43cfa59c82841a5110cf1c54cfd6, type: 2}
|
||||
m_sharedMaterial: {fileID: -6377444306501196819, guid: d5dd43cfa59c82841a5110cf1c54cfd6, type: 2}
|
||||
@@ -809,7 +826,7 @@ MonoBehaviour:
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: -371.03607, z: 0, w: 892.1781}
|
||||
m_margin: {x: 0, y: -554.28644, z: 0, w: 892.1781}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
@@ -832,7 +849,6 @@ GameObject:
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 426439773}
|
||||
- component: {fileID: 426439772}
|
||||
m_Layer: 0
|
||||
m_Name: ///MANAGERS
|
||||
m_TagString: Untagged
|
||||
@@ -840,24 +856,6 @@ GameObject:
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &426439772
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 426439771}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2316e64f670a6bc4cbacd94afda36404, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Navigation.OctoMainMenu
|
||||
_firstSceneData: {fileID: 11400000, guid: a996cfbfd3cdcf94fbcc944840699825, type: 2}
|
||||
_optionalPanel: {fileID: 0}
|
||||
_loadingScreen: {fileID: 0}
|
||||
_loadingWheel: {fileID: 0}
|
||||
_optionalPanelFirstButton: {fileID: 0}
|
||||
_mainPanelDefaultButton: {fileID: 0}
|
||||
--- !u!4 &426439773
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -874,6 +872,51 @@ Transform:
|
||||
- {fileID: 1835744495}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &579661350
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 579661351}
|
||||
- component: {fileID: 579661352}
|
||||
m_Layer: 0
|
||||
m_Name: Trigger
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &579661351
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 579661350}
|
||||
serializedVersion: 2
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1348335418}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &579661352
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 579661350}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 67296e1c23d8b3645add1d503a4b3a3f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Navigation.OctoSceneTrigger
|
||||
_sceneData: {fileID: 11400000, guid: b09fa30cf6bafad46a041153b0bdb17e, type: 2}
|
||||
--- !u!1 &621238402
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1107,7 +1150,7 @@ MonoBehaviour:
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: -109.40309, z: 0, w: 971.9161}
|
||||
m_margin: {x: 0, y: -313.51407, z: 0, w: 971.9161}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
@@ -1522,7 +1565,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: 0, y: 325}
|
||||
m_AnchoredPosition: {x: 0, y: 449}
|
||||
m_SizeDelta: {x: 800, y: 2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &796251831
|
||||
@@ -2203,6 +2246,38 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1191122412}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1348335417
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1348335418}
|
||||
m_Layer: 0
|
||||
m_Name: ///GAMEPLAY
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1348335418
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1348335417}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 12.05001, y: -54.14194, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 579661351}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1350933212
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2429,7 +2504,7 @@ MonoBehaviour:
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: -350.70175, z: 0, w: 747.8482}
|
||||
m_margin: {x: 0, y: -350.70175, z: 0, w: 949.06714}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
@@ -3517,3 +3592,4 @@ SceneRoots:
|
||||
- {fileID: 426439773}
|
||||
- {fileID: 621238403}
|
||||
- {fileID: 1457286709}
|
||||
- {fileID: 1348335418}
|
||||
|
||||
Reference in New Issue
Block a user