Commit 38936ba6 authored by 16서원빈's avatar 16서원빈

Make SetSelect work with other scenes

parent e4dcc5d0
...@@ -173,10 +173,10 @@ RectTransform: ...@@ -173,10 +173,10 @@ RectTransform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 800, y: 150}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224919316165582960 --- !u!224 &224919316165582960
RectTransform: RectTransform:
......
This diff is collapsed.
fileFormatVersion: 2 fileFormatVersion: 2
guid: 866ad5cf59182c6429a792ff37fb4018 guid: 120e292a60259d6428b740a16df3abe5
timeCreated: 1503410215 timeCreated: 1502977158
licenseType: Free licenseType: Free
DefaultImporter: DefaultImporter:
userData: userData:
......
...@@ -42,7 +42,7 @@ RenderSettings: ...@@ -42,7 +42,7 @@ RenderSettings:
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 9 serializedVersion: 11
m_GIWorkflowMode: 1 m_GIWorkflowMode: 1
m_GISettings: m_GISettings:
serializedVersion: 2 serializedVersion: 2
...@@ -54,7 +54,7 @@ LightmapSettings: ...@@ -54,7 +54,7 @@ LightmapSettings:
m_EnableBakedLightmaps: 0 m_EnableBakedLightmaps: 0
m_EnableRealtimeLightmaps: 0 m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings: m_LightmapEditorSettings:
serializedVersion: 8 serializedVersion: 9
m_Resolution: 2 m_Resolution: 2
m_BakeResolution: 40 m_BakeResolution: 40
m_TextureWidth: 1024 m_TextureWidth: 1024
...@@ -71,7 +71,7 @@ LightmapSettings: ...@@ -71,7 +71,7 @@ LightmapSettings:
m_FinalGatherFiltering: 1 m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256 m_FinalGatherRayCount: 256
m_ReflectionCompression: 2 m_ReflectionCompression: 2
m_MixedBakeMode: 3 m_MixedBakeMode: 2
m_BakeBackend: 0 m_BakeBackend: 0
m_PVRSampling: 1 m_PVRSampling: 1
m_PVRDirectSampleCount: 32 m_PVRDirectSampleCount: 32
...@@ -87,7 +87,7 @@ LightmapSettings: ...@@ -87,7 +87,7 @@ LightmapSettings:
m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousNormalSigma: 1
m_PVRFilteringAtrousPositionSigma: 1 m_PVRFilteringAtrousPositionSigma: 1
m_LightingDataAsset: {fileID: 0} m_LightingDataAsset: {fileID: 0}
m_ShadowMaskMode: 2 m_UseShadowmask: 1
--- !u!196 &4 --- !u!196 &4
NavMeshSettings: NavMeshSettings:
serializedVersion: 2 serializedVersion: 2
...@@ -192,7 +192,7 @@ MonoBehaviour: ...@@ -192,7 +192,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0 m_IntArgument: 0
m_FloatArgument: 0 m_FloatArgument: 0
m_StringArgument: Tracks m_StringArgument: SetSelect
m_BoolArgument: 0 m_BoolArgument: 0
m_CallState: 1 m_CallState: 1
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
......
...@@ -35,7 +35,8 @@ public class TrackManager : MonoBehaviour { ...@@ -35,7 +35,8 @@ public class TrackManager : MonoBehaviour {
foreach (TrackInfo track in tracks) foreach (TrackInfo track in tracks)
{ {
var trackItem = Instantiate(trackItemPrefab, trackList.transform); var trackItem = Instantiate(trackItemPrefab);
trackItem.transform.SetParent(trackList.transform);
trackItem.AddComponent<TrackInfoHolder>().trackInfo = track; trackItem.AddComponent<TrackInfoHolder>().trackInfo = track;
......
...@@ -9,6 +9,9 @@ EditorBuildSettings: ...@@ -9,6 +9,9 @@ EditorBuildSettings:
path: Assets/Scene/Title.unity path: Assets/Scene/Title.unity
guid: 229b0e761145d9c4b83fb055b6f69b01 guid: 229b0e761145d9c4b83fb055b6f69b01
- enabled: 1 - enabled: 1
path: Assets/Scene/SetSelect.unity
guid: 120e292a60259d6428b740a16df3abe5
- enabled: 0
path: Assets/Scene/Tracks.unity path: Assets/Scene/Tracks.unity
guid: 50817a4992ad15d4dbca491aea54feed guid: 50817a4992ad15d4dbca491aea54feed
- enabled: 1 - enabled: 1
......
Markdown is supported
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