diff --git a/Assets/Prefabs/PlouThunder.prefab b/Assets/Prefabs/PlouThunder.prefab
index a697c3f409ed6fa9d71acdaec6e216800a437463..706423a6c6e9593f5de9378d8106c33439c5c241 100644
--- a/Assets/Prefabs/PlouThunder.prefab
+++ b/Assets/Prefabs/PlouThunder.prefab
@@ -33,7 +33,7 @@ Transform:
m_GameObject: {fileID: 1635955774121567605}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.1, y: 0.1, z: 0.2}
+ m_LocalScale: {x: 0.1, y: 0.2, z: 0.1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@@ -223,7 +223,7 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
- m_Constraints: 0
+ m_Constraints: 80
m_CollisionDetection: 1
--- !u!114 &2881216723765597162
MonoBehaviour:
diff --git a/Assets/Prefabs/VeryTree.prefab b/Assets/Prefabs/VeryTree.prefab
index 792db2ecd68a17f24fb84067d6cc14e5d15b6c28..4b236c3aaee7c885ad58a9a668cc98e995c80377 100644
--- a/Assets/Prefabs/VeryTree.prefab
+++ b/Assets/Prefabs/VeryTree.prefab
@@ -197,7 +197,7 @@ BoxCollider:
m_GameObject: {fileID: 1289101488284263099}
m_Material: {fileID: 0}
m_IsTrigger: 0
- m_Enabled: 1
+ m_Enabled: 0
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
@@ -211,6 +211,7 @@ GameObject:
m_Component:
- component: {fileID: 1289101489244486471}
- component: {fileID: 3110289229246008363}
+ - component: {fileID: 3459414719236446010}
m_Layer: 0
m_Name: VeryTree
m_TagString: Tree
@@ -226,7 +227,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1289101489244486468}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0.79915, y: 0.8, z: -2.1075127}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1289101487297823918}
@@ -248,3 +249,16 @@ MonoBehaviour:
m_EditorClassIdentifier:
maxLife: 10
currentLife: 10
+--- !u!65 &3459414719236446010
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1289101489244486468}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 1
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 0.3, y: 0.6, z: 0.3}
+ m_Center: {x: 0, y: 0.1, z: 0}
diff --git a/Assets/Scenes/Demo/Demo_1.unity b/Assets/Scenes/Demo/Demo_1.unity
index 264dc8bc2ae74204d02951755371aaba1d64bb80..e8c163b8540b05957989069cfc9f2c5b350795bd 100644
--- a/Assets/Scenes/Demo/Demo_1.unity
+++ b/Assets/Scenes/Demo/Demo_1.unity
@@ -713,6 +713,210 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0}
+--- !u!1 &688335509
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 688335510}
+ - component: {fileID: 688335512}
+ - component: {fileID: 688335511}
+ m_Layer: 5
+ m_Name: Mana
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &688335510
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 688335509}
+ 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: 2062691533}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 1}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0.0000019073486, y: 0}
+ m_SizeDelta: {x: 10, y: 5}
+ m_Pivot: {x: 1, y: 1}
+--- !u!114 &688335511
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 688335509}
+ 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_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_text: 'Mana : 0'
+ 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_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_outlineColor:
+ serializedVersion: 2
+ rgba: 4278190080
+ m_fontSize: 2
+ m_fontSizeBase: 2
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_textAlignment: 513
+ 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_firstOverflowCharacterIndex: -1
+ m_linkedTextComponent: {fileID: 0}
+ m_isLinkedTextComponent: 0
+ m_isTextTruncated: 0
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_ignoreRectMaskCulling: 0
+ m_ignoreCulling: 1
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_VertexBufferAutoSizeReduction: 1
+ m_firstVisibleCharacter: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_textInfo:
+ textComponent: {fileID: 688335511}
+ characterCount: 8
+ spriteCount: 0
+ spaceCount: 2
+ wordCount: 2
+ linkCount: 0
+ lineCount: 1
+ pageCount: 1
+ materialCount: 1
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_spriteAnimator: {fileID: 0}
+ m_hasFontAssetChanged: 0
+ m_subTextObjects:
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &688335512
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 688335509}
+ m_CullTransparentMesh: 0
+--- !u!1 &716695860
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 716695862}
+ - component: {fileID: 716695861}
+ m_Layer: 0
+ m_Name: GameManager
+ m_TagString: GameManager
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &716695861
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 716695860}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: eba8931fb3bee35428dbe4131baff1f8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ trucaATuer: {fileID: 0}
+ manaAmount: 0
+ manaAmountText: {fileID: 688335511}
+ treesAmountText: {fileID: 1124147798}
+--- !u!4 &716695862
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 716695860}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -1.3989544, y: 0.9806371, z: -0.059011817}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 18
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &745113174
GameObject:
m_ObjectHideFlags: 0
@@ -875,6 +1079,163 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 20ad769ea5b470041823475c4e818dd4, type: 3}
+--- !u!1 &1124147796
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1124147797}
+ - component: {fileID: 1124147799}
+ - component: {fileID: 1124147798}
+ m_Layer: 5
+ m_Name: Trees
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1124147797
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1124147796}
+ 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: 2062691533}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 10, y: 10}
+ m_Pivot: {x: 0, y: 1}
+--- !u!114 &1124147798
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1124147796}
+ 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_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_text: 'Trees : 0'
+ 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_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_outlineColor:
+ serializedVersion: 2
+ rgba: 4278190080
+ m_fontSize: 2
+ m_fontSizeBase: 2
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_textAlignment: 513
+ 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_firstOverflowCharacterIndex: -1
+ m_linkedTextComponent: {fileID: 0}
+ m_isLinkedTextComponent: 0
+ m_isTextTruncated: 0
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_ignoreRectMaskCulling: 0
+ m_ignoreCulling: 1
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_VertexBufferAutoSizeReduction: 1
+ m_firstVisibleCharacter: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_textInfo:
+ textComponent: {fileID: 1124147798}
+ characterCount: 9
+ spriteCount: 0
+ spaceCount: 2
+ wordCount: 2
+ linkCount: 0
+ lineCount: 1
+ pageCount: 1
+ materialCount: 1
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_spriteAnimator: {fileID: 0}
+ m_hasFontAssetChanged: 0
+ m_subTextObjects:
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &1124147799
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1124147796}
+ m_CullTransparentMesh: 0
--- !u!1 &1295439235
GameObject:
m_ObjectHideFlags: 0
@@ -1487,6 +1848,106 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 20ad769ea5b470041823475c4e818dd4, type: 3}
+--- !u!1 &2062691529
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2062691533}
+ - component: {fileID: 2062691532}
+ - component: {fileID: 2062691531}
+ - component: {fileID: 2062691530}
+ m_Layer: 5
+ m_Name: Canvas
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &2062691530
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2062691529}
+ 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 &2062691531
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2062691529}
+ 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 &2062691532
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2062691529}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 2
+ m_Camera: {fileID: 2378845050949971729}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 25
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!224 &2062691533
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2062691529}
+ m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
+ m_LocalScale: {x: 0.35650623, y: 0.35650623, z: 0.35650623}
+ m_Children:
+ - {fileID: 688335510}
+ - {fileID: 1124147797}
+ m_Father: {fileID: 0}
+ m_RootOrder: 19
+ m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 7.23, y: 5.44}
+ m_SizeDelta: {x: 30, y: 10}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2106280632
GameObject:
m_ObjectHideFlags: 0
@@ -1748,6 +2209,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2378845050949971727}
m_PrefabAsset: {fileID: 0}
+--- !u!20 &2378845050949971729 stripped
+Camera:
+ m_CorrespondingSourceObject: {fileID: 8004411620620401727, guid: 5672944486a643c488b852f5cc818712,
+ type: 3}
+ m_PrefabInstance: {fileID: 2378845050949971727}
+ m_PrefabAsset: {fileID: 0}
--- !u!4 &5627487818956269604 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8006134201611470635, guid: 5672944486a643c488b852f5cc818712,
diff --git a/Assets/Scenes/Plou/Life_Scene.unity b/Assets/Scenes/Plou/Life_Scene.unity
index ef4fb04f783ea5652559d0884c64f33904e2fa70..6ea918e38ed2c962de5cfe54add47c8515d7f02c 100644
--- a/Assets/Scenes/Plou/Life_Scene.unity
+++ b/Assets/Scenes/Plou/Life_Scene.unity
@@ -376,36 +376,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 131711225}
m_CullTransparentMesh: 0
---- !u!1 &236687055
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 236687057}
- m_Layer: 0
- m_Name: Compteur
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &236687057
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 236687055}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -1.3989544, y: 0.9806371, z: -0.059011817}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 5
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &266143296
GameObject:
m_ObjectHideFlags: 0
@@ -470,7 +440,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &378948064
GameObject:
@@ -668,7 +638,7 @@ RectTransform:
- {fileID: 131711226}
- {fileID: 1568790156}
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -720,36 +690,6 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 6
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1205776284
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1205776285}
- m_Layer: 0
- m_Name: PlayerManager
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1205776285
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1205776284}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -1.3989544, y: 0.9806371, z: -0.059011817}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1280974250
diff --git a/Assets/Scripts/CustomOVRGrabber.cs b/Assets/Scripts/CustomOVRGrabber.cs
index ee43011fe8ae71bd5da18a841e0568e7ed8cab09..3b99cf4a610db1a5ae0bc2b73be7a46d7f8e9b04 100644
--- a/Assets/Scripts/CustomOVRGrabber.cs
+++ b/Assets/Scripts/CustomOVRGrabber.cs
@@ -79,6 +79,8 @@ public class CustomOVRGrabber : MonoBehaviour
protected Dictionary<CustomOVRGrabbable, int> m_grabCandidates = new Dictionary<CustomOVRGrabbable, int>();
protected bool m_operatingWithoutOVRCameraRig = true;
+ [SerializeField] private GameManager gameManager;
+
/// <summary>
/// The currently grabbed object.
/// </summary>
diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs
index 4310b63d1ac8f1aa726d4b6fd1f5ab0237fa70dd..3104f71a110fdcf8fd56066ca23370a49d0caa39 100644
--- a/Assets/Scripts/GameManager.cs
+++ b/Assets/Scripts/GameManager.cs
@@ -9,10 +9,12 @@ public class GameManager : MonoBehaviour
public GameObject trucaATuer;
- [SerializeField] private float manaAmount;
+ [SerializeField] private static float manaAmount;
[SerializeField] private TextMeshProUGUI manaAmountText;
[SerializeField] private TextMeshProUGUI treesAmountText;
+ public static float ManaAmount() => manaAmount;
+
// Start is called before the first frame update
void Start()
{
@@ -20,10 +22,9 @@ public class GameManager : MonoBehaviour
StartCoroutine(GenerateMana());
}
- public void AddMana(float m)
+ public static void AddMana(float m)
{
manaAmount += m;
- UpdateTextMana();
// Debug.Log("MANA UP : " + m + " // NEW MANA : " + manaAmount);
}
@@ -44,6 +45,7 @@ public class GameManager : MonoBehaviour
while (true)
{
UpdateTextTrees();
+ UpdateTextMana();
yield return new WaitForSeconds(0.5f);
}
}
diff --git a/Assets/Scripts/Lancable.cs b/Assets/Scripts/Lancable.cs
index cbc7392fea9ec95cb142d1989187841f58aeb2be..87ea85a6a2d1cf42a2102d88ba2ad90142b9ae5b 100644
--- a/Assets/Scripts/Lancable.cs
+++ b/Assets/Scripts/Lancable.cs
@@ -14,6 +14,8 @@ public class Lancable : MonoBehaviour
private Transform lanceurTransform;
+ [SerializeField] private static float coutEclair = 30f;
+
public void setLanceurTransform(Transform t)
{
lanceurTransform = t;
@@ -46,8 +48,11 @@ public class Lancable : MonoBehaviour
out hit, 100, layerAvecToutSaufCeluiAIgnorer))
{
GameObject trucSurLequelOnPose = hit.collider.gameObject;
- if (trucSurLequelOnPose.CompareTag("GameBoard"))
+ if (trucSurLequelOnPose.CompareTag("GameBoard") && GameManager.ManaAmount() >= coutEclair)
{
+ GameManager.AddMana(-coutEclair);
+ transform.localScale = new Vector3(1f, 10f, 1f);
+ transform.localRotation = new Quaternion();
gameObject.transform.position = new Vector3
(hit.point.x,//gameObject.transform.position.x,
hit.point.y + transform.localScale.y / 2,
@@ -55,6 +60,8 @@ public class Lancable : MonoBehaviour
hit.point.z); //gameObject.transform.position.z);
locked = true;
lineRenderPose.enabled = false;
+ StartCoroutine(ThunderFall());
+ ThunderHit(hit.point,0.5f,20f);
}
else
{
@@ -65,7 +72,23 @@ public class Lancable : MonoBehaviour
{
Destroy(gameObject);
}
+ }
+
+ private void ThunderHit(Vector3 centerSphere, float radius, float damage)
+ {
+ Collider[] hitColliders = Physics.OverlapSphere(centerSphere, radius);
+ int i = 0;
+ while (i < hitColliders.Length)
+ {
+ hitColliders[i].SendMessage("TakeDamage", 20f);
+ i++;
+ }
+ }
+ private IEnumerator ThunderFall()
+ {
+ yield return new WaitForSeconds(0.2f);
+ GameObject.Destroy(this.gameObject);
}
// Update is called once per frame
@@ -78,15 +101,15 @@ public class Lancable : MonoBehaviour
GameObject trucSurLequelOnPose = hit.collider.gameObject;
/*lineRenderPose.SetPosition(0, transform.position);
lineRenderPose.SetPosition(lineRenderPose.positionCount-1, hit.point );*/
- if (trucSurLequelOnPose.CompareTag("GameBoard"))
+ if (!trucSurLequelOnPose.CompareTag("GameBoard") || GameManager.ManaAmount() < coutEclair)
{
- lineRenderPose.startColor = Color.white;
- lineRenderPose.endColor = Color.white;
+ lineRenderPose.startColor = Color.red;
+ lineRenderPose.endColor = Color.red;
}
else
{
- lineRenderPose.startColor = Color.red;
- lineRenderPose.endColor = Color.red;
+ lineRenderPose.startColor = Color.white;
+ lineRenderPose.endColor = Color.white;
}
}
}
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index 6913f369f77a3dd24a5a47397f8f48d91428563b..b197373a74f07f5069e582b366559a4df8ba93a5 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -15,6 +15,7 @@ TagManager:
- Tree
- ThunderSpawner
- Eclair
+ - GameManager
layers:
- Default
- TransparentFX