From e7d64874872d2c44a76a0b26eec3d1d87872f37d Mon Sep 17 00:00:00 2001 From: oldpeper <96619050+oldpeper@users.noreply.github.com> Date: Tue, 22 Oct 2024 11:31:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E8=BD=A6=E5=89=8D=E6=89=80=E6=9C=89?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- d2/Assets/Demigiant.meta | 8 + .../DOTween/Editor/DOTweenUpgradeManager.XML | 14 - .../DOTween/Editor/DOTweenUpgradeManager.dll | Bin 10752 -> 0 bytes .../Editor/DOTweenUpgradeManager.dll.meta | 21 - d2/Assets/Resources.meta | 8 + d2/Assets/Resources/DOTweenSettings.asset | 48 + .../Resources/DOTweenSettings.asset.meta | 8 + d2/Assets/Scenes/SampleScene.unity | 9959 ++++++++++++++++- d2/Assets/Script/GameManager.cs | 42 +- d2/Assets/Script/Map/MapManager.cs | 48 +- d2/Assets/Script/ObjectEndity/Grid.cs | 106 +- .../Script/ObjectEndity/PassengerObject.cs | 35 +- d2/Assets/Script/ObjectEndity/WaitSlot.cs | 36 + .../Script/ObjectEndity/WaitSlot.cs.meta | 11 + d2/Assets/Script/Tool.meta | 8 + d2/Assets/prefab.meta | 8 + d2/Assets/prefab/Image.prefab | 144 + .../Image.prefab.meta} | 4 +- d2/Assets/prefab/passenger.prefab | 92 + d2/Assets/prefab/passenger.prefab.meta | 7 + d2/UserSettings/EditorUserSettings.asset | 9 + 21 files changed, 10513 insertions(+), 103 deletions(-) create mode 100644 d2/Assets/Demigiant.meta delete mode 100644 d2/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML delete mode 100644 d2/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll delete mode 100644 d2/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.meta create mode 100644 d2/Assets/Resources.meta create mode 100644 d2/Assets/Resources/DOTweenSettings.asset create mode 100644 d2/Assets/Resources/DOTweenSettings.asset.meta create mode 100644 d2/Assets/Script/ObjectEndity/WaitSlot.cs create mode 100644 d2/Assets/Script/ObjectEndity/WaitSlot.cs.meta create mode 100644 d2/Assets/Script/Tool.meta create mode 100644 d2/Assets/prefab.meta create mode 100644 d2/Assets/prefab/Image.prefab rename d2/Assets/{Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML.meta => prefab/Image.prefab.meta} (62%) create mode 100644 d2/Assets/prefab/passenger.prefab create mode 100644 d2/Assets/prefab/passenger.prefab.meta diff --git a/d2/Assets/Demigiant.meta b/d2/Assets/Demigiant.meta new file mode 100644 index 00000000..5d4f2be1 --- /dev/null +++ b/d2/Assets/Demigiant.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0601edf0b587e8b4eae85ba535c269cb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/d2/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML b/d2/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML deleted file mode 100644 index 02c3c95e..00000000 --- a/d2/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML +++ /dev/null @@ -1,14 +0,0 @@ - - - - DOTweenUpgradeManager - - - - - This class and its whole library are deleted the first time DOTween's setup is run after an upgrade (or after a new install). - NOTE: DidReloadScripts doesn't work on first install so it's useless, InitializeOnLoad is the only way - - - - diff --git a/d2/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll b/d2/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll deleted file mode 100644 index 10511cc237b624be10a162f9c2b8ee87f7e21518..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10752 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 T(); + passenger.transform.position=grid.transform.position; + passenger.passColor = (ColorEnum)colorIndex; + grid.passenger = passenger; + grid.buttonAction = grid.PlaySystemEvent; + } } // Update is called once per frame @@ -15,5 +37,23 @@ namespace Script { } + + public void MoveWaitEvent(Grid grid) + { + if (MapManager.ins.WaitSlot.MoveOpen(out var moveGrid)) + { + if (grid.NorthOpen()) + { + moveGrid.passenger = grid.passenger; + grid.passenger = null; + moveGrid.PassengerAni(); + } + } + } + + public void MoveCarEvent() + { + + } } } diff --git a/d2/Assets/Script/Map/MapManager.cs b/d2/Assets/Script/Map/MapManager.cs index 5be9f3c4..1d848b82 100644 --- a/d2/Assets/Script/Map/MapManager.cs +++ b/d2/Assets/Script/Map/MapManager.cs @@ -6,6 +6,7 @@ using UnityEngine.Serialization; namespace Script.Map { + //地图总控制脚本 public class MapManager : MonoBehaviour { public static MapManager ins; @@ -13,29 +14,60 @@ namespace Script.Map [SerializeField] private List carObjects; [SerializeField] private GameObject templateGrid; + public WaitSlot WaitSlot => _waitSlot; + [SerializeField] private WaitSlot _waitSlot; public Grid[,] MapGrid ; + [SerializeField] private List MapGrids; [SerializeField] private Transform gridParent; - public int x { get; private set; } - public int y { get; private set; } + public int x => mX; + [SerializeField] private int mX; + public int y => mY; + [SerializeField] private int mY; public bool InitReady { get; private set; } = false; private void Awake() { ins = this; + } + /// + /// 初始化游戏数据 + /// + public void InitPlayData() + { + MapGrid = new Grid[x, y]; + foreach (var grid in MapGrids) + { + MapGrid[grid.X, grid.Y] = grid; + } + } + + + [InspectorButton("初始化地图")] + public void InitMap() + { + if (ins==null) + { + ins = this; + } Init(10, 10); } - + + /// + /// 地图生成调用 + /// + /// + /// public void Init(int _x,int _y) { InitReady = false; - x = _x; - y = _y; + mX = _x; + mY = _y; MapGrid = new Grid[x, y]; - StartCoroutine(InitGrid()); + InitGrid(); } - private IEnumerator InitGrid(Action action=null) + private void InitGrid(Action action=null) { for (var i = 0; i < x; i++) { @@ -45,7 +77,7 @@ namespace Script.Map MapGrid[i,j].SetData(i,j); MapGrid[i,j].SetBool(true); MapGrid[i, j].SetRestPostion(); - yield return null; + MapGrids.Add(MapGrid[i,j]); } } diff --git a/d2/Assets/Script/ObjectEndity/Grid.cs b/d2/Assets/Script/ObjectEndity/Grid.cs index 8547cfcf..920d5680 100644 --- a/d2/Assets/Script/ObjectEndity/Grid.cs +++ b/d2/Assets/Script/ObjectEndity/Grid.cs @@ -1,76 +1,136 @@ using System; using System.Collections; using System.Collections.Generic; +using DG.Tweening; +using Script; using Script.Map; using UnityEngine; +using UnityEngine.UI; +//格子脚本，用于获取相邻信息 public class Grid : MonoBehaviour { - public int x { get; private set; } - public int y { get; private set; } - public bool Open { get; private set; } - public Grid East { get; private set; } - public Grid South { get; private set; } - public Grid West { get; private set; } - public Grid North { get; private set; } + public int X => gx; + [SerializeField] private int gx; + public int Y => gy; + [SerializeField] private int gy; + public bool Open => gOpen; + [SerializeField] private bool gOpen=true; + public Grid East => gEast; + [SerializeField] private Grid gEast; + public Grid South => gSouth; + [SerializeField] private Grid gSouth; + public Grid West => gWest; + [SerializeField] private Grid gWest; + public Grid North => gNorth; + [SerializeField] private Grid gNorth; + public bool aniPlay => gAniPlay; + [SerializeField] private bool gAniPlay=false; + + public PassengerObject passenger; + + public Action action = null; + public Action buttonAction=null; + + + private void Awake() + { + GetComponent