From 4b756a53215fc543eac3460a2f6d88eb12dea565 Mon Sep 17 00:00:00 2001 From: Ader Alisma 01 Date: Sun, 11 Jun 2023 19:37:29 -0400 Subject: [PATCH] =?UTF-8?q?Corrig=C3=A9=20conflit=20du=20merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ajout de YieldTile dans la scène de TestDragAndDrop Ajout de Meat pour le yield de nourriture afin de séparer Farm Ajusté ResourceTile pour toujours produire des ressources à moins que YieldSpeed est égal à 0 --- Assets/Scenes/TestDragAndDrop.unity | 184 +++++++++++++++++++++++++++ Assets/Scripts/Tiles/ResourceTile.cs | 2 +- Assets/Tiles/Farm.asset | 6 +- Assets/Tiles/Meat.asset | 19 +++ Assets/Tiles/Meat.asset.meta | 8 ++ 5 files changed, 215 insertions(+), 4 deletions(-) create mode 100644 Assets/Tiles/Meat.asset create mode 100644 Assets/Tiles/Meat.asset.meta diff --git a/Assets/Scenes/TestDragAndDrop.unity b/Assets/Scenes/TestDragAndDrop.unity index 7c8d833..67fd459 100644 --- a/Assets/Scenes/TestDragAndDrop.unity +++ b/Assets/Scenes/TestDragAndDrop.unity @@ -134,6 +134,7 @@ GameObject: - component: {fileID: 85245388} - component: {fileID: 85245387} - component: {fileID: 85245386} + - component: {fileID: 85245389} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -207,6 +208,39 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &85245389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 85245385} + 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_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &240774883 GameObject: m_ObjectHideFlags: 0 @@ -566,6 +600,155 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: tile: {fileID: 11400000, guid: 7568f730b2ba3754297a7612452482e2, type: 2} +--- !u!1 &454853570 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 454853571} + - component: {fileID: 454853574} + - component: {fileID: 454853573} + - component: {fileID: 454853572} + m_Layer: 5 + m_Name: YieldTile + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &454853571 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 454853570} + 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: 1216531426} + 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: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &454853572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 454853570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f3b5cc0d246c3b459ddf4ed75c4fa16, type: 3} + m_Name: + m_EditorClassIdentifier: + tile: {fileID: 11400000, guid: e0d57b3c128ba1447920637cdb289530, type: 2} +--- !u!114 &454853573 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 454853570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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: Yield tile + 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: 1 + m_VerticalAlignment: 256 + 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: 1 + 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: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &454853574 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 454853570} + m_CullTransparentMesh: 1 --- !u!1 &1195238450 GameObject: m_ObjectHideFlags: 0 @@ -665,6 +848,7 @@ RectTransform: m_Children: - {fileID: 240774884} - {fileID: 391777831} + - {fileID: 454853571} m_Father: {fileID: 2091724718} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/Tiles/ResourceTile.cs b/Assets/Scripts/Tiles/ResourceTile.cs index cdf9adc..0f1e7f1 100644 --- a/Assets/Scripts/Tiles/ResourceTile.cs +++ b/Assets/Scripts/Tiles/ResourceTile.cs @@ -21,7 +21,7 @@ public class ResourceTile : LevelTile public override void LevelUpdate() { - //if (!Occupied) return; + //if (!Occupied) return; Uncomment once tile occupation exists _yieldCounter += Time.deltaTime * _yieldSpeed; diff --git a/Assets/Tiles/Farm.asset b/Assets/Tiles/Farm.asset index 5316fdb..168d2ed 100644 --- a/Assets/Tiles/Farm.asset +++ b/Assets/Tiles/Farm.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Farm m_EditorClassIdentifier: _sprite: {fileID: 21300000, guid: ccca3e050cb082b45af0a099790463f6, type: 3} - _isCollidable: 1 - _yieldPrefab: {fileID: 6962989255644195630, guid: a2dc5d9672c10074fa9c35c12f6339c1, type: 3} - _yieldSpeed: 0.5 + _isCollidable: 0 + _yieldPrefab: {fileID: 0} + _yieldSpeed: 0 _randomPositionConfig: 0.5 diff --git a/Assets/Tiles/Meat.asset b/Assets/Tiles/Meat.asset new file mode 100644 index 0000000..41adbe1 --- /dev/null +++ b/Assets/Tiles/Meat.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84b05f2a26f63da46a1028488482d079, type: 3} + m_Name: Meat + m_EditorClassIdentifier: + _sprite: {fileID: 21300000, guid: b1e6b8ebeb2e25f4f8c5de93a31dd6a2, type: 3} + _isCollidable: 0 + _yieldPrefab: {fileID: 6962989255644195630, guid: a2dc5d9672c10074fa9c35c12f6339c1, type: 3} + _yieldSpeed: 0.5 + _randomPositionConfig: 0.5 diff --git a/Assets/Tiles/Meat.asset.meta b/Assets/Tiles/Meat.asset.meta new file mode 100644 index 0000000..50829fc --- /dev/null +++ b/Assets/Tiles/Meat.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a19b3b6859986b449aac7484e064097a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: