Skip to content
Snippets Groups Projects
Commit 665378a6 authored by NIEDERBERGER-VIALLE LEO's avatar NIEDERBERGER-VIALLE LEO
Browse files

Bon panel/canvas actif/désactif, petites corrections dans PlotEvent ajout d'un... 

Bon panel/canvas actif/désactif, petites corrections dans PlotEvent ajout d'un nouvel 'evenement' des slot items dans shop pour incrémenter la quantité et update l'affichage
parent 51773c14
Branches
1 merge request!78Shop v1
Hide whitespace changes
Inline Side-by-side
unity_project/Marsgriculteur/Assets/Scenes/Map.unity
+ 24
− 228
View file @ 665378a6
......@@ -8342,7 +8342,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &297146751
RectTransform:
m_ObjectHideFlags: 0
......@@ -32515,7 +32515,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 600634453}
m_RootOrder: 2
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
......@@ -32706,6 +32706,7 @@ GameObject:
- component: {fileID: 600634453}
- component: {fileID: 600634456}
- component: {fileID: 600634455}
- component: {fileID: 600634457}
m_Layer: 5
m_Name: PanelShop
m_TagString: Untagged
......@@ -32725,8 +32726,6 @@ RectTransform:
m_LocalScale: {x: 0.8, y: 0.8, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1693923594}
- {fileID: 655078251}
- {fileID: 572796445}
- {fileID: 1458743732}
m_Father: {fileID: 284338965}
......@@ -32775,6 +32774,21 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 600634452}
m_CullTransparentMesh: 1
--- !u!114 &600634457
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 600634452}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ef1928ec5e970f647a6f534661e18931, type: 3}
m_Name:
m_EditorClassIdentifier:
PanelInventory: {fileID: 600634452}
PanelNotif: {fileID: 335311817}
panelAvecInfos: {fileID: 0}
--- !u!1 &601989213
GameObject:
m_ObjectHideFlags: 0
......@@ -33465,123 +33479,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 644894742}
m_CullTransparentMesh: 1
--- !u!1 &655078250
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 655078251}
- component: {fileID: 655078255}
- component: {fileID: 655078254}
- component: {fileID: 655078253}
- component: {fileID: 655078252}
m_Layer: 5
m_Name: GridLayoutImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &655078251
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 655078250}
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: 600634453}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 1.3599854, y: -63.330017}
m_SizeDelta: {x: -34.82, y: -166.62}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &655078252
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 655078250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 01450dd1f00d9e24fa5b95cd2bccb0d7, type: 3}
m_Name:
m_EditorClassIdentifier:
nextDay: {fileID: 1655789386}
SlotNotif: {fileID: 6021430434831316145, guid: fa0e36dabf3d9a442a0d77d6576b1292, type: 3}
slotPanel: {fileID: 655078251}
--- !u!114 &655078253
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 655078250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 1
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 250, y: 250}
m_Spacing: {x: 5, y: 5}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!114 &655078254
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 655078250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.6784314, g: 0.52156866, b: 0.37647063, 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_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &655078255
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 655078250}
m_CullTransparentMesh: 1
--- !u!1 &694982625
GameObject:
m_ObjectHideFlags: 0
......@@ -41049,7 +40946,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1420803190
RectTransform:
m_ObjectHideFlags: 0
......@@ -41158,7 +41055,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 600634453}
m_RootOrder: 3
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
......@@ -41277,7 +41174,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &1466314732
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -42656,7 +42553,7 @@ MonoBehaviour:
dashTemplateX: {fileID: 29554705}
market: {fileID: 1331125616}
titre: {fileID: 3254609}
lastValueText: {fileID: 1976701649}
lastValueText: {fileID: 0}
cam: {fileID: 125168332}
camZoom: {fileID: 125168333}
--- !u!114 &1610291187
......@@ -42715,7 +42612,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1617607446
RectTransform:
m_ObjectHideFlags: 0
......@@ -43481,107 +43378,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: acac1c4090d197149848f4326730e287, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1693923593
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1693923594}
- component: {fileID: 1693923597}
- component: {fileID: 1693923596}
- component: {fileID: 1693923595}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1693923594
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1693923593}
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: 600634453}
m_RootOrder: 0
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.10001, y: -63.33}
m_SizeDelta: {x: 839.8, y: 277.38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1693923595
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1693923593}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 1
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 200, y: 200}
m_Spacing: {x: 5, y: 5}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!114 &1693923596
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1693923593}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1693923597
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1693923593}
m_CullTransparentMesh: 1
--- !u!1 &1701117870
GameObject:
m_ObjectHideFlags: 0
......@@ -45409,7 +45205,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &2006331162
MonoBehaviour:
m_ObjectHideFlags: 0
unity_project/Marsgriculteur/Assets/Script/HUD/ActivePanel.cs
+ 7
− 0
View file @ 665378a6
......@@ -70,6 +70,12 @@ namespace game
//getWeightStatus();
//PanelInventory.SetActive(false);
}
else if(this.name == "PanelShop")
{
gridBag.transform.SetParent(PanelInventory.transform);
gridBag.transform.localScale = new Vector3(0.7f, 0.7f, 0.7f);
gridBag.transform.localPosition = gridBag.transform.localPosition + new Vector3Int(0, -20);
}
}
public void OpenPanel()
......@@ -95,6 +101,7 @@ namespace game
//deux fonctions qui permettent d'afficher de deux façons differentes le meme inventory
public void Affiche()
{
Debug.Log("J'affiche !!!!");
panel.afficheInventory(CreateAllSeedPlant.mainInventory.getInventory());
}
......
unity_project/Marsgriculteur/Assets/Script/HUD/SlotInit.cs
+ 7
− 1
View file @ 665378a6
......@@ -19,7 +19,13 @@ namespace game
//check if item=seed, sinon pas possible de le planter
//seed = 1 a 100
if (item.getId() > 0 && item.getId() < 101)
if (this.transform.parent.parent.name == "PanelShop")
{
CreateAllSeedPlant.mainInventory.addToInventory(item, 10);
this.transform.parent.parent.GetComponent<ActivePanel>().Affiche();
Debug.Log("Tu es bien dans le shop connard !");
}
else if (item.getId() > 0 && item.getId() < 101)
panelInfosVente.GetComponent<GerePlant>().sendInfoClick(item, qttSlot);
else
Debug.Log("pas une seed");
......
unity_project/Marsgriculteur/Assets/Script/Map/PlotEvents.cs
+ 0
− 1
View file @ 665378a6
......@@ -122,7 +122,6 @@ public class PlotEvents : MonoBehaviour
{
return;
}
gerePlantDisplay.inverseAffichage();
if (growthStatus == growthTime)
recupPlante();
else if (!contientGraine)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment