Skip to content
Snippets Groups Projects
Commit 1eba3ff1 authored by GIRAULT COLIN's avatar GIRAULT COLIN
Browse files

Merge branch 'main' into 'main'

Resize_UI

See merge request !52
parents 2a65fdf8 dddcfff9
1 merge request!52Resize_UI
......@@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 1630539906574674970}
- component: {fileID: 1630539906574675045}
- component: {fileID: 1630539906574675044}
- component: {fileID: 1630539906574675047}
- component: {fileID: 2281164828910455384}
- component: {fileID: 1630539906574675046}
m_Layer: 5
m_Name: 'strong_obj '
......@@ -88,7 +88,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
canvas: {fileID: 0}
--- !u!114 &1630539906574675047
--- !u!114 &2281164828910455384
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -97,7 +97,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1630539906574675040}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 643478a71ee34d54f80bf90d40e00823, type: 3}
m_Script: {fileID: 11500000, guid: c47ceb5600e99564d8b1369275c62d23, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!225 &1630539906574675046
......
This diff is collapsed.
......@@ -17,7 +17,7 @@ public class Ui : MonoBehaviour
private void Start()
{
Instantiate(prefab, prefab.transform, parent);
// Instantiate(prefab, prefab.transform, parent);
}
}
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
public class strongObj : MonoBehaviour
public class strongObj : MonoBehaviour, IDropHandler
{
private GameObject go;
......
This diff is collapsed.
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