修改Timeline主脚本

ActionTowerDefense/Assets/GameLevelEditor/GAAWCITY/TimelineUI/Scripts/ButtonTest.cs

@@ -5,56 +5,53 @@ using TimelineViewer;
 using TMPro;
 using UnityEngine;
 
-namespace TimelineViewer.Sample
+public class ButtonTest : MonoBehaviour
 {
-    public class ButtonTest : MonoBehaviour
-    {
-        [SerializeField] TimelineController timelineController;
+    [SerializeField] TimelineController timelineController;
 
-        [Header("Swimlane Controls")]
-        [SerializeField] TMP_InputField swimLaneName;
+    [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;
-        [SerializeField] TMP_InputField year;
-        [SerializeField] TMP_InputField hour;
-        [SerializeField] TMP_InputField min;
-        [SerializeField] TMP_InputField eventLength;
+    [Header("Events Controls")]
+    [SerializeField] TMP_Dropdown swimlanes;
+    [SerializeField] TMP_InputField title;
+    [SerializeField] TMP_InputField month;
+    [SerializeField] TMP_InputField day;
+    [SerializeField] TMP_InputField year;
+    [SerializeField] TMP_InputField hour;
+    [SerializeField] TMP_InputField min;
+    [SerializeField] TMP_InputField eventLength;
 
-        [Header("Form Elements")]
-        [SerializeField] Transform swimLaneContainer;
+    [Header("Form Elements")]
+    [SerializeField] Transform swimLaneContainer;
 
 
-        public void AddSwimLane()
-        {
-            timelineController.AddNewSwimlane(swimLaneName.text);
+    public void AddSwimLane()
+    {
+        timelineController.AddNewSwimlane(swimLaneName.text);
 
-            swimlanes.ClearOptions();
-            swimlanes.AddOptions(timelineController.SwimLaneController.CurrentSwimlanes
-                     .Select(p => new TMP_Dropdown.OptionData { text = p }).ToList());
-        }
+        swimlanes.ClearOptions();
+        swimlanes.AddOptions(timelineController.SwimLaneController.CurrentSwimlanes
+                 .Select(p => new TMP_Dropdown.OptionData { text = p }).ToList());
+    }
 
-        public void AddEventToTimeline()
-        {
-            var eventDate = new UnityDateTime();
+    public void AddEventToTimeline()
+    {
+        var eventDate = new UnityDateTime();
 
-            eventDate.m_DateTime =
-                new System.DateTime(int.Parse(year.text), int.Parse(month.text), int.Parse(day.text),
-                                    int.Parse(hour.text), int.Parse(min.text), 0, 0);
+        eventDate.m_DateTime =
+            new System.DateTime(int.Parse(year.text), int.Parse(month.text), int.Parse(day.text),
+                                int.Parse(hour.text), int.Parse(min.text), 0, 0);
 
 
-            double length = double.Parse(eventLength.text);
+        double length = double.Parse(eventLength.text);
 
-            int swimlaneIndex = swimlanes.value;
+        int swimlaneIndex = swimlanes.value;
 
-            timelineController.AddEventToTimeline(swimlaneIndex, title.text, eventDate, length);
-        }
+        timelineController.AddEventToTimeline(swimlaneIndex, title.text, eventDate, length);
+    }
 
 
 
 
-    }
 }

ActionTowerDefense/Assets/GameLevelEditor/GameMap/CoreScripts/GameMapTile.cs

@@ -31,7 +31,9 @@ public class GameMapTile
 	public int opt1 = 0;			// this value could depend on the chosen type. For example, if NPC then this could indicate which NPC prefab to spawn from an array of NPC prefabs.
 	
 	[GameMapTilePreview] public Color color = Color.white;
-	[GameMapTilePreview] public string strVal = "";
+	public int num = 1;
+	public int startTime = 0;
+
 
 	// ----------------------------------------------------------------------------------------------------------------
 
@@ -43,7 +45,7 @@ public class GameMapTile
 		t.type = type;
 		t.opt1 = opt1;
 		t.color = color;
-		t.strVal = strVal;
+		t.num = num;
 	}
 
 	// ----------------------------------------------------------------------------------------------------------------

ActionTowerDefense/Assets/GameLevelEditor/GameMap/Sample/Scripts/Main.cs

@@ -28,6 +28,9 @@ public class Main : MonoBehaviour
 	[HideInInspector] public Transform EnemyTowerContainer;
 	[HideInInspector] public Transform EnemyContainer;
 
+	//import
+	public ButtonTest buttonTest;
+
 	#endregion
 	// ----------------------------------------------------------------------------------------------------------------
 	#region system
@@ -120,65 +123,27 @@ public class Main : MonoBehaviour
 					if (t == null) continue;
 					SpriteRenderer ren = null;
 					switch (t.type)
-                    {
+					{
 						case GameMapTile.Type.Player:
 							ren = Instantiate(playerFab[t.opt1]).GetComponentInChildren<SpriteRenderer>();
 							ren.transform.SetParent(PlayerContainer, false);
-							ren.transform.localPosition = new Vector3(x * sz + offsX, y * sz + offsY, 0f);
 							break;
 						case GameMapTile.Type.Tower:
 							ren = Instantiate(towerFab[t.opt1]).GetComponent<SpriteRenderer>();
 							ren.transform.SetParent(TowerContainer, false);
-							ren.transform.localPosition = new Vector3(x * sz + offsX, y * sz + offsY, 0f);
 							break;
 						case GameMapTile.Type.EnemyTower:
 							ren = Instantiate(enemyTowerFab[t.opt1]).GetComponent<SpriteRenderer>();
 							ren.transform.SetParent(EnemyTowerContainer, false);
-							ren.transform.localPosition = new Vector3(x * sz + offsX, y * sz + offsY, 0f);
 							break;
 						case GameMapTile.Type.Enemy:
 							ren = Instantiate(enemyFabs[t.opt1]).GetComponent<SpriteRenderer>();
 							ren.transform.SetParent(EnemyContainer, false);
-							ren.transform.localPosition = new Vector3(x * sz + offsX, y * sz + offsY, 0f);
 							break;
 					}
 					if (ren == null) continue;
 					ren.transform.localScale = new Vector3(tileSize / ren.sprite.rect.width, tileSize / ren.sprite.rect.height, 1f);
-					
-					//if (t.type == GameMapTile.Type.Floor)
-					//{   // place a floor tile
-					//	if (t.sprite == null) continue;
-					//	SpriteRenderer ren = Instantiate(floorFab).GetComponent<SpriteRenderer>();
-					//	ren.sprite = t.sprite;
-					//	ren.transform.SetParent(floorContainer, false);
-					//	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);
-					//	ren.GetComponent<BoxCollider2D>().size = new Vector2(ren.sprite.rect.width / ren.sprite.pixelsPerUnit, ren.sprite.rect.height / ren.sprite.pixelsPerUnit);
-					//}
-
-					//else if (t.type == GameMapTile.Type.NPC)
-					//{   // place an NPC
-					//	SpriteRenderer ren = Instantiate(npcFabs[t.opt1]).GetComponent<SpriteRenderer>();
-					//	ren.transform.SetParent(npcContainer, false);
-					//	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);
-					//}
-
-					//else if (t.type == GameMapTile.Type.Trap)
-					//{   // place a Trap
-					//	SpriteRenderer ren = Instantiate(trapFabs[t.opt1]).GetComponent<SpriteRenderer>();
-					//	ren.transform.SetParent(trapContainer, false);
-					//	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);
-					//}
-
-					//else if (t.type == GameMapTile.Type.Start)
-					//{   // place player object
-					//	SpriteRenderer ren = Instantiate(playerFab).GetComponent<SpriteRenderer>();
-					//	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);
-					//}
-
+					ren.transform.localPosition = new Vector3(x * sz + offsX, y * sz + offsY, 0f);
 				}
 			}
 		}

ActionTowerDefense/Assets/GameLevelEditor/Ui_Textures/level_editer_box.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 9eef856a4c2ee4a44bbe775884f22ef4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ActionTowerDefense/Assets/GameLevelEditor/tiles.asset

@@ -19,42 +19,48 @@ MonoBehaviour:
     type: 1
     opt1: 0
     color: {r: 1, g: 1, b: 1, a: 1}
-    strVal: 
+    num: 1
+    startTime: 0
   - id: 167
     sprite: {fileID: 21300000, guid: 65b0651ef19a49c4e9c6c4ff297c3d52, type: 3}
     _aid: -1
     type: 2
     opt1: 0
     color: {r: 0.17626214, g: 1, b: 0, a: 1}
-    strVal: 
+    num: 1
+    startTime: 0
   - id: 166
     sprite: {fileID: 21300000, guid: 65b0651ef19a49c4e9c6c4ff297c3d52, type: 3}
     _aid: -1
     type: 3
     opt1: 0
     color: {r: 1, g: 0, b: 0, a: 1}
-    strVal: 
+    num: 1
+    startTime: 0
   - id: 163
     sprite: {fileID: 21300000, guid: 01c1ca6a4fe22a94b91a3b2b90b5c88f, type: 3}
     _aid: -1
     type: 4
     opt1: 0
     color: {r: 1, g: 1, b: 1, a: 1}
-    strVal: 
+    num: 1
+    startTime: 0
   - id: 164
     sprite: {fileID: 21300000, guid: 43f59a03605a34d4abed7ed387066287, type: 3}
     _aid: -1
     type: 4
     opt1: 1
     color: {r: 1, g: 1, b: 1, a: 1}
-    strVal: 
+    num: 5
+    startTime: 0
   - id: 165
     sprite: {fileID: 21300000, guid: b371758afaed0994e9076c34d8dbac5f, type: 3}
     _aid: -1
     type: 4
     opt1: 2
     color: {r: 1, g: 1, b: 1, a: 1}
-    strVal: 
+    num: 1
+    startTime: 0
   autoTiles:
   - id: 1
     tiles:
@@ -64,111 +70,127 @@ MonoBehaviour:
       type: 3
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
-      strVal: 
+      num: 1
+      startTime: 0
     - id: 32
       sprite: {fileID: 21300086, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
       type: 3
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
-      strVal: 
+      num: 1
+      startTime: 0
     - id: 33
       sprite: {fileID: 21300092, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
       type: 3
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
-      strVal: 
+      num: 1
+      startTime: 0
     - id: 34
       sprite: {fileID: 21300084, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
       type: 3
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
-      strVal: 
+      num: 1
+      startTime: 0
     - id: 35
       sprite: {fileID: 21300088, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
       type: 3
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
-      strVal: 
+      num: 1
+      startTime: 0
     - id: 36
       sprite: {fileID: 21300008, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
       type: 3
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
-      strVal: 
+      num: 1
+      startTime: 0
     - id: 37
       sprite: {fileID: 21300090, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
       type: 3
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
-      strVal: 
+      num: 1
+      startTime: 0
     - id: 38
       sprite: {fileID: 21300010, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
       type: 3
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
-      strVal: 
+      num: 1
+      startTime: 0
     - id: 39
       sprite: {fileID: 21300004, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
       type: 3
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
-      strVal: 
+      num: 1
+      startTime: 0
     - id: 40
       sprite: {fileID: 21300082, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
       type: 3
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
-      strVal: 
+      num: 1
+      startTime: 0
     - id: 41
       sprite: {fileID: 21300076, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
       type: 3
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
-      strVal: 
+      num: 1
+      startTime: 0
     - id: 42
       sprite: {fileID: 21300080, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
       type: 3
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
-      strVal: 
+      num: 1
+      startTime: 0
     - id: 43
       sprite: {fileID: 21300000, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
       type: 3
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
-      strVal: 
+      num: 1
+      startTime: 0
     - id: 44
       sprite: {fileID: 21300078, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
       type: 3
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
-      strVal: 
+      num: 1
+      startTime: 0
     - id: 45
       sprite: {fileID: 21300002, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
       type: 3
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
-      strVal: 
+      num: 1
+      startTime: 0
     - id: 46
       sprite: {fileID: 21300006, guid: 40d48dc34acd41044a366ee03841e848, type: 3}
       _aid: 1
       type: 3
       opt1: 0
       color: {r: 1, g: 1, b: 1, a: 1}
-      strVal: 
+      num: 1
+      startTime: 0
   nextTileId: 168
   nextAutoTileId: 7

ActionTowerDefense/Assets/Scenes/Editor.unity

@@ -7008,6 +7008,7 @@ MonoBehaviour:
   TowerContainer: {fileID: 0}
   EnemyTowerContainer: {fileID: 0}
   EnemyContainer: {fileID: 0}
+  buttonTest: {fileID: 0}
 --- !u!1 &2142743453
 GameObject:
   m_ObjectHideFlags: 0