commit 807aa8c3c6e62c5d033064e3190ae432fb66db03 Merge: 34f74aa 3777d06 Author: Clement <clement@jo85.com> Date: Thu Jan 18 12:02:57 2024 +0100 Merge pull request 'add Atomes Factory' (#10) from feature/AtomesFactory into develop Reviewed-on: #10 Reviewed-by: Clement <clement@jo85.com> commit 3777d06a0ee942994fdfe90d71fc5056c37346d9 Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 12:00:00 2024 +0100 Rename Classname commit 16bd5bfb6cd51e253e22417ab8196a58e1726849 Merge: da9d57b 34f74aa Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 11:46:03 2024 +0100 Merge remote-tracking branch 'origin/develop' into feature/AtomesFactory commit da9d57b0bba34dbe24f5e7f744ce60f430832ff4 Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 11:44:22 2024 +0100 vue foria config commit 5346e596c8a0db7684b64920c328abee459926d9 Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 11:28:02 2024 +0100 [feature/AtomesFactory] - remove testing file commit f613217658cf2f1f48ceeeaa3183e515de857213 Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 10:38:59 2024 +0100 [feature/AtomesFactory] - Add json for atomes commit bc2b9e02fdb692d56937bd37cc3d821ffb717424 Author: Mathis <mathis.ragot@epitech.eu> Date: Fri Jan 12 15:37:09 2024 +0100 add Atomes Factory commit 34f74aa44366c6d5f9e0d647a7837704edbd5fad Merge: 8b6d07f f181fd9 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:50:43 2024 +0100 Merge pull request 'feature/multi_targets' (#7) from feature/multi_targets into develop Reviewed-on: #7 Reviewed-by: Clement <clement@jo85.com> commit f181fd993504c811a4546e56f83eb05ed62a625d Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:50:10 2024 +0100 fix du mauvais nom de scene dans le script ChangeScene.cs commit 1c76868eee12406d6c39fa64da8462e35019a39e Merge: f1ec062 8b6d07f Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:39:02 2024 +0100 Merge remote-tracking branch 'origin/develop' into feature/multi_targets commit f1ec062047ba68d48493b25273ba5893f42a890f Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:37:29 2024 +0100 ajout du font fallback commit 9c23975b204ceb09bd3ccc57b847cf0a8158fb95 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:36:49 2024 +0100 rajouts des fonts text mesh pro commit aff9df22cfbed9e8b317cafe4269fce891a5bbe5 Merge: a791273 73394e5 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:03:32 2024 +0100 Merge remote-tracking branch 'origin/develop' into feature/multi_targets commit a7912733e5fed60b9514c778fd9f40661dc66b64 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 10:54:51 2024 +0100 Ajout dans le canvas d'éléments UI (nom, description....) commit 0313fe28a1b718152015a401fda32069e94303c0 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 09:57:07 2024 +0100 Suppression du build de la CI commit 5237a32bb4759c43104e9397cb43b328a99b7c62 Author: Nicolas <nicolas.sansd@gmail.com> Date: Thu Jan 11 16:18:35 2024 +0100 ajout de la keystore de debug (user) + changement de la target version d'android commit afa265dd3141ef3fd96bff685ca655594453a876 Author: Nicolas <nicolas.sansd@gmail.com> Date: Thu Jan 11 11:26:53 2024 +0100 Affichage des molécules unitairement et en mode fusion commit 84136dcc5c3b00603ba8531901418125a832a255 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Dec 22 15:05:47 2023 +0100 MAJ du fichier d'action build.yaml commit ce3c95654431f25e22810481f3b10b24f158decd Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Dec 22 15:02:10 2023 +0100 MAJ du fichier d'action build.yaml commit 8f105732f7aaa41689894ab388675ae0b79f66f6 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Dec 22 14:36:52 2023 +0100 Ajout de la multitarget pour générer un préfab
327 lines
9.0 KiB
Plaintext
327 lines
9.0 KiB
Plaintext
%YAML 1.1
|
|
%TAG !u! tag:unity3d.com,2011:
|
|
--- !u!1 &1683695138672679726
|
|
GameObject:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
serializedVersion: 6
|
|
m_Component:
|
|
- component: {fileID: 7599450980285251936}
|
|
- component: {fileID: 6754407190314115967}
|
|
- component: {fileID: 4885826618136237812}
|
|
m_Layer: 0
|
|
m_Name: name
|
|
m_TagString: Untagged
|
|
m_Icon: {fileID: 0}
|
|
m_NavMeshLayer: 0
|
|
m_StaticEditorFlags: 0
|
|
m_IsActive: 1
|
|
--- !u!224 &7599450980285251936
|
|
RectTransform:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 1683695138672679726}
|
|
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: 1003776446609728999}
|
|
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: 7.99, y: 2.15}
|
|
m_SizeDelta: {x: 22.4, y: 5}
|
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
--- !u!23 &6754407190314115967
|
|
MeshRenderer:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 1683695138672679726}
|
|
m_Enabled: 1
|
|
m_CastShadows: 0
|
|
m_ReceiveShadows: 0
|
|
m_DynamicOccludee: 1
|
|
m_StaticShadowCaster: 0
|
|
m_MotionVectors: 1
|
|
m_LightProbeUsage: 1
|
|
m_ReflectionProbeUsage: 1
|
|
m_RayTracingMode: 2
|
|
m_RayTraceProcedural: 0
|
|
m_RenderingLayerMask: 1
|
|
m_RendererPriority: 0
|
|
m_Materials:
|
|
- {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
|
m_StaticBatchInfo:
|
|
firstSubMesh: 0
|
|
subMeshCount: 0
|
|
m_StaticBatchRoot: {fileID: 0}
|
|
m_ProbeAnchor: {fileID: 0}
|
|
m_LightProbeVolumeOverride: {fileID: 0}
|
|
m_ScaleInLightmap: 1
|
|
m_ReceiveGI: 1
|
|
m_PreserveUVs: 0
|
|
m_IgnoreNormalsForChartDetection: 0
|
|
m_ImportantGI: 0
|
|
m_StitchLightmapSeams: 1
|
|
m_SelectedEditorRenderState: 3
|
|
m_MinimumChartSize: 4
|
|
m_AutoUVMaxDistance: 0.5
|
|
m_AutoUVMaxAngle: 89
|
|
m_LightmapParameters: {fileID: 0}
|
|
m_SortingLayerID: 0
|
|
m_SortingLayer: 0
|
|
m_SortingOrder: 0
|
|
m_AdditionalVertexStreams: {fileID: 0}
|
|
--- !u!114 &4885826618136237812
|
|
MonoBehaviour:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 1683695138672679726}
|
|
m_Enabled: 1
|
|
m_EditorHideFlags: 0
|
|
m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
|
|
m_Name:
|
|
m_EditorClassIdentifier:
|
|
m_Material: {fileID: 0}
|
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
|
m_RaycastTarget: 1
|
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
m_Maskable: 1
|
|
m_OnCullStateChanged:
|
|
m_PersistentCalls:
|
|
m_Calls: []
|
|
m_text: H
|
|
m_isRightToLeft: 0
|
|
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
|
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
|
m_fontSharedMaterials: []
|
|
m_fontMaterial: {fileID: 0}
|
|
m_fontMaterials: []
|
|
m_fontColor32:
|
|
serializedVersion: 2
|
|
rgba: 4294967295
|
|
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
|
m_enableVertexGradient: 0
|
|
m_colorMode: 3
|
|
m_fontColorGradient:
|
|
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
|
topRight: {r: 1, g: 1, b: 1, a: 1}
|
|
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
|
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
|
m_fontColorGradientPreset: {fileID: 0}
|
|
m_spriteAsset: {fileID: 0}
|
|
m_tintAllSprites: 0
|
|
m_StyleSheet: {fileID: 0}
|
|
m_TextStyleHashCode: -1183493901
|
|
m_overrideHtmlColors: 0
|
|
m_faceColor:
|
|
serializedVersion: 2
|
|
rgba: 4294967295
|
|
m_fontSize: 36
|
|
m_fontSizeBase: 36
|
|
m_fontWeight: 400
|
|
m_enableAutoSizing: 0
|
|
m_fontSizeMin: 18
|
|
m_fontSizeMax: 72
|
|
m_fontStyle: 0
|
|
m_HorizontalAlignment: 2
|
|
m_VerticalAlignment: 512
|
|
m_textAlignment: 65535
|
|
m_characterSpacing: 0
|
|
m_wordSpacing: 0
|
|
m_lineSpacing: 0
|
|
m_lineSpacingMax: 0
|
|
m_paragraphSpacing: 0
|
|
m_charWidthMaxAdj: 0
|
|
m_enableWordWrapping: 1
|
|
m_wordWrappingRatios: 0.4
|
|
m_overflowMode: 0
|
|
m_linkedTextComponent: {fileID: 0}
|
|
parentLinkedComponent: {fileID: 0}
|
|
m_enableKerning: 1
|
|
m_enableExtraPadding: 0
|
|
checkPaddingRequired: 0
|
|
m_isRichText: 1
|
|
m_parseCtrlCharacters: 1
|
|
m_isOrthographic: 0
|
|
m_isCullingEnabled: 0
|
|
m_horizontalMapping: 0
|
|
m_verticalMapping: 0
|
|
m_uvLineOffset: 0
|
|
m_geometrySortingOrder: 0
|
|
m_IsTextObjectScaleStatic: 0
|
|
m_VertexBufferAutoSizeReduction: 0
|
|
m_useMaxVisibleDescender: 1
|
|
m_pageToDisplay: 1
|
|
m_margin: {x: 0, y: 0, z: 15.879433, w: 0}
|
|
m_isUsingLegacyAnimationComponent: 0
|
|
m_isVolumetricText: 0
|
|
_SortingLayer: 0
|
|
_SortingLayerID: 0
|
|
_SortingOrder: 0
|
|
m_hasFontAssetChanged: 0
|
|
m_renderer: {fileID: 6754407190314115967}
|
|
m_maskType: 0
|
|
--- !u!1 &1889830950887112821
|
|
GameObject:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
serializedVersion: 6
|
|
m_Component:
|
|
- component: {fileID: 1959176426720659806}
|
|
- component: {fileID: 4416029461301044561}
|
|
- component: {fileID: 5048234814704604343}
|
|
- component: {fileID: 4833430294603548320}
|
|
m_Layer: 0
|
|
m_Name: molecule
|
|
m_TagString: Untagged
|
|
m_Icon: {fileID: 0}
|
|
m_NavMeshLayer: 0
|
|
m_StaticEditorFlags: 0
|
|
m_IsActive: 1
|
|
--- !u!4 &1959176426720659806
|
|
Transform:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 1889830950887112821}
|
|
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: 1003776446609728999}
|
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
--- !u!33 &4416029461301044561
|
|
MeshFilter:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 1889830950887112821}
|
|
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
|
--- !u!23 &5048234814704604343
|
|
MeshRenderer:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 1889830950887112821}
|
|
m_Enabled: 1
|
|
m_CastShadows: 1
|
|
m_ReceiveShadows: 1
|
|
m_DynamicOccludee: 1
|
|
m_StaticShadowCaster: 0
|
|
m_MotionVectors: 1
|
|
m_LightProbeUsage: 1
|
|
m_ReflectionProbeUsage: 1
|
|
m_RayTracingMode: 2
|
|
m_RayTraceProcedural: 0
|
|
m_RenderingLayerMask: 1
|
|
m_RendererPriority: 0
|
|
m_Materials:
|
|
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
|
|
m_StaticBatchInfo:
|
|
firstSubMesh: 0
|
|
subMeshCount: 0
|
|
m_StaticBatchRoot: {fileID: 0}
|
|
m_ProbeAnchor: {fileID: 0}
|
|
m_LightProbeVolumeOverride: {fileID: 0}
|
|
m_ScaleInLightmap: 1
|
|
m_ReceiveGI: 1
|
|
m_PreserveUVs: 0
|
|
m_IgnoreNormalsForChartDetection: 0
|
|
m_ImportantGI: 0
|
|
m_StitchLightmapSeams: 1
|
|
m_SelectedEditorRenderState: 3
|
|
m_MinimumChartSize: 4
|
|
m_AutoUVMaxDistance: 0.5
|
|
m_AutoUVMaxAngle: 89
|
|
m_LightmapParameters: {fileID: 0}
|
|
m_SortingLayerID: 0
|
|
m_SortingLayer: 0
|
|
m_SortingOrder: 0
|
|
m_AdditionalVertexStreams: {fileID: 0}
|
|
--- !u!135 &4833430294603548320
|
|
SphereCollider:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 1889830950887112821}
|
|
m_Material: {fileID: 0}
|
|
m_IncludeLayers:
|
|
serializedVersion: 2
|
|
m_Bits: 0
|
|
m_ExcludeLayers:
|
|
serializedVersion: 2
|
|
m_Bits: 0
|
|
m_LayerOverridePriority: 0
|
|
m_IsTrigger: 0
|
|
m_ProvidesContacts: 0
|
|
m_Enabled: 1
|
|
serializedVersion: 3
|
|
m_Radius: 0.5
|
|
m_Center: {x: 0, y: 0, z: 0}
|
|
--- !u!1 &8195041149387314724
|
|
GameObject:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
serializedVersion: 6
|
|
m_Component:
|
|
- component: {fileID: 1003776446609728999}
|
|
- component: {fileID: -5265542751097283156}
|
|
m_Layer: 0
|
|
m_Name: SingleMolecule
|
|
m_TagString: Untagged
|
|
m_Icon: {fileID: 0}
|
|
m_NavMeshLayer: 0
|
|
m_StaticEditorFlags: 0
|
|
m_IsActive: 1
|
|
--- !u!4 &1003776446609728999
|
|
Transform:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 8195041149387314724}
|
|
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:
|
|
- {fileID: 1959176426720659806}
|
|
- {fileID: 7599450980285251936}
|
|
m_Father: {fileID: 0}
|
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
--- !u!114 &-5265542751097283156
|
|
MonoBehaviour:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 8195041149387314724}
|
|
m_Enabled: 1
|
|
m_EditorHideFlags: 0
|
|
m_Script: {fileID: 11500000, guid: 30e06cc42d3c8f64987e87ae87685758, type: 3}
|
|
m_Name:
|
|
m_EditorClassIdentifier:
|
|
name:
|
|
color:
|