Sfoglia il codice sorgente

timeline对应相对怪物组的名字

USER-20250311WE\Administrator 7 mesi fa
parent
commit
deebc8897f

+ 32 - 344
ActionTowerDefense/Assets/GameLevelEditor/GAAWCITY/TimelineUI/Prefabs/Components/SwimlaneContentItem.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &3979719776402149444
+--- !u!1 &900215804136418805
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,23 +8,23 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 5585100724548736507}
-  - component: {fileID: 8082531279001508625}
-  - component: {fileID: 6133805582406667832}
+  - component: {fileID: 8454110287769659509}
+  - component: {fileID: 3410242545029712988}
+  - component: {fileID: 3139452052499818949}
   m_Layer: 5
-  m_Name: Text (TMP)
+  m_Name: Text (Legacy)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &5585100724548736507
+--- !u!224 &8454110287769659509
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3979719776402149444}
+  m_GameObject: {fileID: 900215804136418805}
   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}
@@ -35,106 +35,51 @@ RectTransform:
   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, y: -7.3791}
-  m_SizeDelta: {x: 100, y: 65}
+  m_AnchoredPosition: {x: 0.2, y: -7.3}
+  m_SizeDelta: {x: 95.39, y: 59.6}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8082531279001508625
+--- !u!222 &3410242545029712988
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3979719776402149444}
+  m_GameObject: {fileID: 900215804136418805}
   m_CullTransparentMesh: 1
---- !u!114 &6133805582406667832
+--- !u!114 &3139452052499818949
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3979719776402149444}
+  m_GameObject: {fileID: 900215804136418805}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: Orbital Transfer
-  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: 16
-  m_fontSizeBase: 16
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  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: 1
-  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}
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
 --- !u!1 &4258584099057219796
 GameObject:
   m_ObjectHideFlags: 0
@@ -165,8 +110,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4150374004349699129}
-  - {fileID: 5585100724548736507}
-  - {fileID: 4244616041638474969}
+  - {fileID: 8454110287769659509}
   m_Father: {fileID: 1421619708100555001}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -189,128 +133,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 1
   m_VerticalFit: 0
---- !u!1 &4643836811972102561
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4244616041638474969}
-  - component: {fileID: 6389887596544695708}
-  - component: {fileID: 9179695628572907584}
-  - component: {fileID: 923903644392781059}
-  m_Layer: 5
-  m_Name: Delete
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &4244616041638474969
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4643836811972102561}
-  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:
-  - {fileID: 1182834892603074930}
-  m_Father: {fileID: 1247470352076737925}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -40, y: -28.4}
-  m_SizeDelta: {x: 17.826, y: 15}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6389887596544695708
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4643836811972102561}
-  m_CullTransparentMesh: 1
---- !u!114 &9179695628572907584
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4643836811972102561}
-  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: 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_Sprite: {fileID: 10905, 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!114 &923903644392781059
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4643836811972102561}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 9179695628572907584}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &4839791358775097897
 GameObject:
   m_ObjectHideFlags: 0
@@ -362,144 +184,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   swimLaneBackground: {fileID: 6454160778053154895}
-  deleteButton: {fileID: 923903644392781059}
+  swimLaneForeground: {fileID: 0}
+  deleteButton: {fileID: 0}
   defaultColor: {r: 0.6509434, g: 0.405538, b: 0.18729973, a: 0.4627451}
   hoverColor: {r: 0.6037736, g: 0.12815951, b: 0.12815951, a: 0.78431374}
---- !u!1 &7755531989776458541
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1182834892603074930}
-  - component: {fileID: 266514084697446133}
-  - component: {fileID: 2350630971535483826}
-  m_Layer: 5
-  m_Name: Text (TMP)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1182834892603074930
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7755531989776458541}
-  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: 4244616041638474969}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &266514084697446133
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7755531989776458541}
-  m_CullTransparentMesh: 1
---- !u!114 &2350630971535483826
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7755531989776458541}
-  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: X
-  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: 4281479730
-  m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 10
-  m_fontSizeBase: 10
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  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!1 &8362708032257650920
 GameObject:
   m_ObjectHideFlags: 0

+ 85 - 143
ActionTowerDefense/Assets/GameLevelEditor/GAAWCITY/TimelineUI/Prefabs/Components/SwimlaneItemLabel.prefab

@@ -122,6 +122,86 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &6123487013608036043
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1963335552678825045}
+  - component: {fileID: 8313365288874288193}
+  - component: {fileID: 4714475030000873939}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1963335552678825045
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6123487013608036043}
+  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: 8895331781898981292}
+  m_RootOrder: 1
+  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, y: 0}
+  m_SizeDelta: {x: 179.66, y: 65.5}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8313365288874288193
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6123487013608036043}
+  m_CullTransparentMesh: 1
+--- !u!114 &4714475030000873939
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6123487013608036043}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 26
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 51
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
 --- !u!1 &6922039031810147469
 GameObject:
   m_ObjectHideFlags: 0
@@ -287,7 +367,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8895331781990997251}
-  - {fileID: 8895331781925061115}
+  - {fileID: 1963335552678825045}
   - {fileID: 136656260862266656}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -310,148 +390,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   swimLaneBackground: {fileID: 8895331781990997250}
-  swimLaneText: {fileID: 8895331781925061114}
-  deleteButton: {fileID: 527944530926153485}
-  defaultTextColor: {r: 1, g: 0, b: 0, a: 1}
-  defaultBackgroundColor: {r: 1, g: 0.74373466, b: 0.21226418, a: 1}
-  hoverTextColor: {r: 0.18828177, g: 1, b: 0, a: 1}
-  hoverBackgroundColor: {r: 0.09678713, g: 0.6727683, b: 0.7075472, a: 1}
+  swimLaneText: {fileID: 4714475030000873939}
+  defaultTextColor: {r: 1, g: 1, b: 1, a: 1}
+  defaultBackgroundColor: {r: 0, g: 0, b: 0, a: 1}
   swimLaneIndex: 0
---- !u!1 &8895331781925061092
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8895331781925061115}
-  - component: {fileID: 8895331781925061113}
-  - component: {fileID: 8895331781925061114}
-  m_Layer: 5
-  m_Name: Text (TMP)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8895331781925061115
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8895331781925061092}
-  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: 8895331781898981292}
-  m_RootOrder: 1
-  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.13899994, y: 0}
-  m_SizeDelta: {x: 183.72, y: 70}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8895331781925061113
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8895331781925061092}
-  m_CullTransparentMesh: 1
---- !u!114 &8895331781925061114
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8895331781925061092}
-  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: Asset Name
-  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: 30
-  m_fontSizeBase: 30
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  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!1 &8895331781990997260
 GameObject:
   m_ObjectHideFlags: 0
@@ -511,7 +453,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.11525454, g: 0.18200424, b: 0.6603774, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

+ 4 - 11
ActionTowerDefense/Assets/GameLevelEditor/GAAWCITY/TimelineUI/Scripts/ButtonTest.cs

@@ -9,11 +9,7 @@ public class ButtonTest : MonoBehaviour
 {
     [SerializeField] TimelineController timelineController;
 
-    [Header("Swimlane Controls")]
-    [SerializeField] TMP_InputField swimLaneName;
-
     [Header("Events Controls")]
-    [SerializeField] TMP_Dropdown swimlanes;
     [SerializeField] TMP_InputField title;
     [SerializeField] TMP_InputField month;
     [SerializeField] TMP_InputField day;
@@ -26,16 +22,13 @@ public class ButtonTest : MonoBehaviour
     [SerializeField] Transform swimLaneContainer;
 
 
-    public void AddSwimLane()
+    public void AddSwimLane(string text)
     {
-        timelineController.AddNewSwimlane(swimLaneName.text);
+        timelineController.AddNewSwimlane(text);
 
-        swimlanes.ClearOptions();
-        swimlanes.AddOptions(timelineController.SwimLaneController.CurrentSwimlanes
-                 .Select(p => new TMP_Dropdown.OptionData { text = p }).ToList());
     }
 
-    public void AddEventToTimeline()
+    public void AddEventToTimeline(int value)
     {
         var eventDate = new UnityDateTime();
 
@@ -46,7 +39,7 @@ public class ButtonTest : MonoBehaviour
 
         double length = double.Parse(eventLength.text);
 
-        int swimlaneIndex = swimlanes.value;
+        int swimlaneIndex = value;
 
         timelineController.AddEventToTimeline(swimlaneIndex, title.text, eventDate, length);
     }

+ 32 - 33
ActionTowerDefense/Assets/GameLevelEditor/GAAWCITY/TimelineUI/Scripts/SwimlaneItemLabel.cs

@@ -8,18 +8,17 @@ using UnityEngine.UI;
 
 namespace TimelineViewer
 {
-    public class SwimlaneItemLabel : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
+    public class SwimlaneItemLabel : MonoBehaviour
     {
         [HideInInspector]
         [SerializeField] Image swimLaneBackground;
-        [HideInInspector]
-        [SerializeField] TextMeshProUGUI swimLaneText;
-        [HideInInspector]
-        [SerializeField] Button deleteButton;
+        [SerializeField] Text swimLaneText;
+
+        //[SerializeField] Button deleteButton;
         [SerializeField] Color defaultTextColor;
         [SerializeField] Color defaultBackgroundColor;
-        [SerializeField] Color hoverTextColor;
-        [SerializeField] Color hoverBackgroundColor;
+        //[SerializeField] Color hoverTextColor;
+        //[SerializeField] Color hoverBackgroundColor;
 
         public string SwimlaneName { get { return swimLaneText.text; } }
 
@@ -29,36 +28,36 @@ namespace TimelineViewer
         // Start is called before the first frame update
         public void Awake()
         {
-            swimLaneBackground.color = new Color(defaultBackgroundColor.r, defaultBackgroundColor.g, defaultBackgroundColor.b, defaultBackgroundColor.a);
-            swimLaneText.color = new Color(defaultTextColor.r, defaultTextColor.g, defaultTextColor.b, defaultTextColor.a);
+            //swimLaneBackground.color = new Color(defaultBackgroundColor.r, defaultBackgroundColor.g, defaultBackgroundColor.b, defaultBackgroundColor.a);
+            //swimLaneText.color = new Color(defaultTextColor.r, defaultTextColor.g, defaultTextColor.b, defaultTextColor.a);
 
-            deleteButton.onClick.AddListener(delegate { DeleteSwimlane(); });
+            //deleteButton.onClick.AddListener(delegate { DeleteSwimlane(); });
 
             swimLaneIndex = TimelineSwimlaneController.SwimLaneCount;
         }
 
-        private void DeleteSwimlane()
-        {
-            TimelineSwimlaneController.DeleteSwimlane(swimLaneIndex);
-        }
-
-        private void OnDestroy()
-        {
-            deleteButton.onClick.RemoveAllListeners();
-        }
-
-        public void OnPointerEnter(PointerEventData eventData)
-        {
-            swimLaneBackground.color = new Color(hoverBackgroundColor.r, hoverBackgroundColor.g, hoverBackgroundColor.b, hoverBackgroundColor.a);
-            swimLaneText.color = new Color(hoverTextColor.r, hoverTextColor.g, hoverTextColor.b, hoverTextColor.a);
-            deleteButton.gameObject.SetActive(true);
-        }
-
-        public void OnPointerExit(PointerEventData eventData)
-        {
-            swimLaneBackground.color = new Color(defaultBackgroundColor.r, defaultBackgroundColor.g, defaultBackgroundColor.b, defaultBackgroundColor.a);
-            swimLaneText.color = new Color(defaultTextColor.r, defaultTextColor.g, defaultTextColor.b, defaultTextColor.a);
-            deleteButton.gameObject.SetActive(false);
-        }
+        //private void DeleteSwimlane()
+        //{
+        //    TimelineSwimlaneController.DeleteSwimlane(swimLaneIndex);
+        //}
+
+        //private void OnDestroy()
+        //{
+        //    deleteButton.onClick.RemoveAllListeners();
+        //}
+
+        //public void OnPointerEnter(PointerEventData eventData)
+        //{
+        //    swimLaneBackground.color = new Color(hoverBackgroundColor.r, hoverBackgroundColor.g, hoverBackgroundColor.b, hoverBackgroundColor.a);
+        //    swimLaneText.color = new Color(hoverTextColor.r, hoverTextColor.g, hoverTextColor.b, hoverTextColor.a);
+        //    //deleteButton.gameObject.SetActive(true);
+        //}
+
+        //public void OnPointerExit(PointerEventData eventData)
+        //{
+        //    swimLaneBackground.color = new Color(defaultBackgroundColor.r, defaultBackgroundColor.g, defaultBackgroundColor.b, defaultBackgroundColor.a);
+        //    swimLaneText.color = new Color(defaultTextColor.r, defaultTextColor.g, defaultTextColor.b, defaultTextColor.a);
+        //    //deleteButton.gameObject.SetActive(false);
+        //}
     }
 }

+ 11 - 4
ActionTowerDefense/Assets/GameLevelEditor/GAAWCITY/TimelineUI/Scripts/TimelineController.cs

@@ -32,7 +32,6 @@ namespace TimelineViewer
         [SerializeField] UnityDateTime endTime;
 
         [Header("Clock Settings")]
-        [SerializeField] ClockType clockType;
         [SerializeField] int increments;
         public int maxMinute;
 
@@ -83,6 +82,16 @@ namespace TimelineViewer
             timelineSwimlaneController = timelineSwimlanes.GetComponent<TimelineSwimlaneController>();
         }
 
+        //private void Update()
+        //{
+        //    if (DailyIncements != increments)
+        //    {
+        //        DailyIncements = increments;
+        //        SetupTimelineHeader();
+        //    }
+            
+        //}
+
         public void AddNewSwimlane(string swimlaneName)
         {
             timelineSwimlaneController.AddSwimlane(swimlaneName, swimLaneLabelContent, TimeCount, DailyIncements);
@@ -116,9 +125,7 @@ namespace TimelineViewer
             {
                 var headerItem = Instantiate(timelineHeaderItemPrefab, timelineHeaderTransform, false);
                 var date = headerItem.GetComponent<TimelineHeaderItem>();
-
-                print(date);
-                print(timelineHeaderColor);
+ 
                 date.SetTextColor(timelineHeaderColor);
                 date.SetDateTime(i * increments);
 

+ 2 - 1
ActionTowerDefense/Assets/GameLevelEditor/GAAWCITY/TimelineUI/Scripts/TimelineSwimlane.cs

@@ -21,8 +21,9 @@ namespace TimelineViewer
         public SwimlaneItemLabel SetupSwimlane(string laneName, Transform parent, int timeCount)
         {
             var go = Instantiate(swimLaneContentItemLabelPrefab, parent, false);
-            var swimlaneLabel = go.GetComponentInChildren<TextMeshProUGUI>();
+            var swimlaneLabel = go.GetComponentInChildren<Text>();
             swimlaneLabel.text = laneName;
+                        
 
             for (int i = 0; i < timeCount; i++)
             {

+ 2 - 0
ActionTowerDefense/Assets/GameLevelEditor/GameMap/CoreScripts/GameMapTile.cs

@@ -32,6 +32,7 @@ public class GameMapTile
 	
 	[GameMapTilePreview] public Color color = Color.white;
 	public Vector2 radius;
+	public string name;
 
 
 	// ----------------------------------------------------------------------------------------------------------------
@@ -45,6 +46,7 @@ public class GameMapTile
 		t.opt1 = opt1;
 		t.color = color;
 		t.radius = radius;
+		t.name = name;
 	}
 
 	// ----------------------------------------------------------------------------------------------------------------

+ 8 - 0
ActionTowerDefense/Assets/GameLevelEditor/GameMap/Sample/Scripts/Main.cs

@@ -27,6 +27,8 @@ public class Main : MonoBehaviour
 	[HideInInspector] public Transform EnemyTowerContainer;
 	[HideInInspector] public Transform EnemyContainer;
 	[HideInInspector] public Transform BoxContainer;
+	public Transform swimlaneContainer;
+	public Transform timelineContainer;
 
 	//import
 	public ButtonTest buttonTest;
@@ -106,6 +108,11 @@ public class Main : MonoBehaviour
 			{
 				Destroy(BoxContainer.transform.GetChild(i).gameObject);
 			}
+			for(int i = 0; i < swimlaneContainer.childCount; i++)
+            {
+				Destroy(swimlaneContainer.transform.GetChild(i).gameObject);
+				Destroy(timelineContainer.transform.GetChild(i).gameObject);
+            }
 		}
 
 		// place tiles and objects. GameMap supports laters but if you choose not to use them then you only need to read from map.grid[]
@@ -139,6 +146,7 @@ public class Main : MonoBehaviour
 							break;
 					}
 					if (ren == null) continue;
+					buttonTest.AddSwimLane(t.name);
 					ren.color = t.color;
 					ren.transform.localScale = new Vector3(tileSize / ren.sprite.rect.width, tileSize / ren.sprite.rect.height, 1f);
 					ren.transform.localPosition = new Vector3(x * sz + offsX, y * sz + offsY, 0f);

+ 22 - 0
ActionTowerDefense/Assets/GameLevelEditor/tiles.asset

@@ -20,6 +20,7 @@ MonoBehaviour:
     opt1: 0
     color: {r: 0.17626214, g: 1, b: 0, a: 1}
     radius: {x: 0, y: 0}
+    name: 
   - id: 166
     sprite: {fileID: 21300000, guid: 65b0651ef19a49c4e9c6c4ff297c3d52, type: 3}
     _aid: -1
@@ -27,6 +28,7 @@ MonoBehaviour:
     opt1: 0
     color: {r: 1, g: 0, b: 0, a: 1}
     radius: {x: 0, y: 0}
+    name: 
   - id: 163
     sprite: {fileID: 21300000, guid: 01c1ca6a4fe22a94b91a3b2b90b5c88f, type: 3}
     _aid: -1
@@ -34,6 +36,7 @@ MonoBehaviour:
     opt1: 0
     color: {r: 1, g: 1, b: 1, a: 1}
     radius: {x: 1, y: 1}
+    name: "\u5F13\u7BAD\u624B1"
   - id: 164
     sprite: {fileID: 21300000, guid: 43f59a03605a34d4abed7ed387066287, type: 3}
     _aid: -1
@@ -41,6 +44,7 @@ MonoBehaviour:
     opt1: 1
     color: {r: 1, g: 1, b: 1, a: 1}
     radius: {x: 1, y: 2}
+    name: "\u6B66\u672F\u5BB6"
   - id: 165
     sprite: {fileID: 21300000, guid: b371758afaed0994e9076c34d8dbac5f, type: 3}
     _aid: -1
@@ -48,6 +52,7 @@ MonoBehaviour:
     opt1: 2
     color: {r: 1, g: 1, b: 1, a: 1}
     radius: {x: 2, y: 1}
+    name: "\u80D6\u5B50"
   - id: 168
     sprite: {fileID: 21300000, guid: 01c1ca6a4fe22a94b91a3b2b90b5c88f, type: 3}
     _aid: -1
@@ -55,6 +60,7 @@ MonoBehaviour:
     opt1: 0
     color: {r: 0.1495924, g: 1, b: 0, a: 1}
     radius: {x: 2, y: 2}
+    name: "\u5F13\u7BAD\u624B2"
   autoTiles:
   - id: 1
     tiles:
@@ -65,6 +71,7 @@ MonoBehaviour:
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
       radius: {x: 0, y: 0}
+      name: 
     - id: 32
       sprite: {fileID: 21300086, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
@@ -72,6 +79,7 @@ MonoBehaviour:
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
       radius: {x: 0, y: 0}
+      name: 
     - id: 33
       sprite: {fileID: 21300092, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
@@ -79,6 +87,7 @@ MonoBehaviour:
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
       radius: {x: 0, y: 0}
+      name: 
     - id: 34
       sprite: {fileID: 21300084, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
@@ -86,6 +95,7 @@ MonoBehaviour:
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
       radius: {x: 0, y: 0}
+      name: 
     - id: 35
       sprite: {fileID: 21300088, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
@@ -93,6 +103,7 @@ MonoBehaviour:
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
       radius: {x: 0, y: 0}
+      name: 
     - id: 36
       sprite: {fileID: 21300008, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
@@ -100,6 +111,7 @@ MonoBehaviour:
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
       radius: {x: 0, y: 0}
+      name: 
     - id: 37
       sprite: {fileID: 21300090, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
@@ -107,6 +119,7 @@ MonoBehaviour:
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
       radius: {x: 0, y: 0}
+      name: 
     - id: 38
       sprite: {fileID: 21300010, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
@@ -114,6 +127,7 @@ MonoBehaviour:
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
       radius: {x: 0, y: 0}
+      name: 
     - id: 39
       sprite: {fileID: 21300004, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
@@ -121,6 +135,7 @@ MonoBehaviour:
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
       radius: {x: 0, y: 0}
+      name: 
     - id: 40
       sprite: {fileID: 21300082, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
@@ -128,6 +143,7 @@ MonoBehaviour:
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
       radius: {x: 0, y: 0}
+      name: 
     - id: 41
       sprite: {fileID: 21300076, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
@@ -135,6 +151,7 @@ MonoBehaviour:
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
       radius: {x: 0, y: 0}
+      name: 
     - id: 42
       sprite: {fileID: 21300080, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
@@ -142,6 +159,7 @@ MonoBehaviour:
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
       radius: {x: 0, y: 0}
+      name: 
     - id: 43
       sprite: {fileID: 21300000, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
@@ -149,6 +167,7 @@ MonoBehaviour:
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
       radius: {x: 0, y: 0}
+      name: 
     - id: 44
       sprite: {fileID: 21300078, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
@@ -156,6 +175,7 @@ MonoBehaviour:
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
       radius: {x: 0, y: 0}
+      name: 
     - id: 45
       sprite: {fileID: 21300002, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
@@ -163,6 +183,7 @@ MonoBehaviour:
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
       radius: {x: 0, y: 0}
+      name: 
     - id: 46
       sprite: {fileID: 21300006, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
@@ -170,5 +191,6 @@ MonoBehaviour:
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
       radius: {x: 0, y: 0}
+      name: 
   nextTileId: 169
   nextAutoTileId: 7

+ 2 - 4
ActionTowerDefense/Assets/Scenes/Editor.unity

@@ -3582,7 +3582,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1258195767
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3618,8 +3618,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   timelineController: {fileID: 147472341}
-  swimLaneName: {fileID: 396494441}
-  swimlanes: {fileID: 1065073358}
   title: {fileID: 1262402376}
   month: {fileID: 1459196798}
   day: {fileID: 2015170714}
@@ -7011,7 +7009,7 @@ MonoBehaviour:
   EnemyTowerContainer: {fileID: 0}
   EnemyContainer: {fileID: 0}
   BoxContainer: {fileID: 0}
-  buttonTest: {fileID: 0}
+  buttonTest: {fileID: 1258195768}
 --- !u!1 &2142743453
 GameObject:
   m_ObjectHideFlags: 0