From 31cb3b1ff3620d631a3d735464a9511686b0b82d Mon Sep 17 00:00:00 2001
From: 2021744738 <2021744738@qq.com>
Date: Wed, 27 Sep 2023 17:15:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=81=AF=E5=85=89=EF=BC=8C?=
=?UTF-8?q?=E9=80=9F=E5=BA=A6=EF=BC=8C=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Assets/BuildSystem/Example/BuildExample.unity | 229 +++++++++++++++++-
Assets/BuildSystem/Scripts/Car.cs | 7 +-
Assets/BuildSystem/Scripts/CarController.cs | 11 +-
Assets/Changjing/Prefabs/Ding/T3Right.prefab | 6 +-
4 files changed, 238 insertions(+), 15 deletions(-)
diff --git a/Assets/BuildSystem/Example/BuildExample.unity b/Assets/BuildSystem/Example/BuildExample.unity
index c7ef88d..c7acb24 100644
--- a/Assets/BuildSystem/Example/BuildExample.unity
+++ b/Assets/BuildSystem/Example/BuildExample.unity
@@ -1223,7 +1223,10 @@ MonoBehaviour:
birth: []
carPrefabs:
- {fileID: 7784768132697704694, guid: f7edd1ca06cddcc4783ee10929c068e2, type: 3}
- carNumber: 20
+ carNumber: 60
+ number: 0
+ createTime: {x: 2, y: 4}
+ speed: {x: 30, y: 60}
--- !u!4 &137901425
Transform:
m_ObjectHideFlags: 0
@@ -8577,7 +8580,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 963194225}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
- m_LocalPosition: {x: 349, y: 564.453, z: 213.8}
+ m_LocalPosition: {x: 349, y: 564.453, z: 145}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -9451,7 +9454,7 @@ Light:
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
- m_Bits: 311
+ m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 1
m_LightShadowCasterMode: 0
@@ -14209,6 +14212,7 @@ RectTransform:
- {fileID: 1686403367}
- {fileID: 654788397}
- {fileID: 1565805092}
+ - {fileID: 2065607436}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -16244,6 +16248,147 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2054002118}
m_Mesh: {fileID: 4300008, guid: e4aafaf7056bfc14d88ac105dee3c9fa, type: 3}
+--- !u!1 &2065607435
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2065607436}
+ - component: {fileID: 2065607439}
+ - component: {fileID: 2065607438}
+ - component: {fileID: 2065607437}
+ m_Layer: 5
+ m_Name: Button
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2065607436
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2065607435}
+ 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_Children:
+ - {fileID: 2132431871}
+ m_Father: {fileID: 1671534114}
+ m_RootOrder: 7
+ 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: -826, y: -32}
+ m_SizeDelta: {x: 160, y: 80}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2065607437
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2065607435}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ 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: 2065607438}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 137901424}
+ m_MethodName: StartCreateCar
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ - m_Target: {fileID: 2065607435}
+ m_MethodName: SetActive
+ m_Mode: 6
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+--- !u!114 &2065607438
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2065607435}
+ 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_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!222 &2065607439
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2065607435}
+ m_CullTransparentMesh: 0
--- !u!1 &2091767263
GameObject:
m_ObjectHideFlags: 0
@@ -16670,6 +16815,84 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2130921948}
m_Mesh: {fileID: 992098593096247513, guid: c0598eff3556ae549a6b6bff8a1799a4, type: 3}
+--- !u!1 &2132431870
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2132431871}
+ - component: {fileID: 2132431873}
+ - component: {fileID: 2132431872}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2132431871
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2132431870}
+ 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_Children: []
+ m_Father: {fileID: 2065607436}
+ 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!114 &2132431872
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2132431870}
+ 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: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 31
+ 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: "\u901A\u8F66"
+--- !u!222 &2132431873
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2132431870}
+ m_CullTransparentMesh: 0
--- !u!1 &2133209043
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/BuildSystem/Scripts/Car.cs b/Assets/BuildSystem/Scripts/Car.cs
index a8a0214..701007e 100644
--- a/Assets/BuildSystem/Scripts/Car.cs
+++ b/Assets/BuildSystem/Scripts/Car.cs
@@ -51,7 +51,7 @@ namespace BuildSystem
}
Ray ray = new Ray(transform.position + Vector3.up, fordir.transform.position - transform.position);
- Debug.DrawRay(transform.position + Vector3.up, fordir.transform.position - transform.position, Color.blue);
+ //Debug.DrawRay(transform.position + Vector3.up, fordir.transform.position - transform.position, Color.blue);
int mask = 1 << 11;
if (Physics.Raycast(ray, out raycastHit,15,mask))
{
@@ -66,11 +66,10 @@ namespace BuildSystem
}
else {
isCanMove = true;
- stupT = 0;
}
if (stupT > 30) {
- CarController.Instance.carNumber--;
+ CarController.Instance.number--;
Destroy(gameObject);
}
@@ -120,8 +119,6 @@ namespace BuildSystem
/// 下一个点的目标
///
IEnumerator Move(Grid nextGird) {
- Debug.Log(moveRoad);
- Debug.Log(now);
Grid nextnextGrid = moveRoad.Peek();
List roadPos = nextGird.placeObject.GetComponent().GetRoad(BuildSystemManager.Instance.gridMap[now.x][now.y], nextGird, nextnextGrid);
isMoveEnd = false;
diff --git a/Assets/BuildSystem/Scripts/CarController.cs b/Assets/BuildSystem/Scripts/CarController.cs
index 302ebb7..0497aa7 100644
--- a/Assets/BuildSystem/Scripts/CarController.cs
+++ b/Assets/BuildSystem/Scripts/CarController.cs
@@ -9,14 +9,17 @@ namespace BuildSystem
public List birth = new List();
public GameObject[] carPrefabs;
public int carNumber;
- int number = 0;
+ public int number = 0;
+ public Vector2 createTime;
+ [Header("40为标准速度")]
+ public Vector2 speed;
void Start()
{
birth.Add(new Vector2Int(0 , 2));
birth.Add(new Vector2Int(10, 0));
birth.Add(new Vector2Int(3, 7));
birth.Add(new Vector2Int(13, 5));
- StartCreateCar();
+ //StartCreateCar();
}
public void StartCreateCar() {
@@ -26,10 +29,10 @@ namespace BuildSystem
IEnumerator CreateCar() {
while (true) {
yield return new WaitUntil(() => { return number < carNumber; });
- yield return new WaitForSeconds(Random.Range(2, 4));
+ yield return new WaitForSeconds(Random.Range(createTime.x, createTime.y));
number++;
GameObject car = Instantiate(carPrefabs[Random.Range(0, carPrefabs.Length)],transform);
- car.GetComponent().OpenMove(birth[Random.Range(0, birth.Count)],10*Random.Range(4,8));
+ car.GetComponent().OpenMove(birth[Random.Range(0, birth.Count)],Random.Range(speed.x,speed.y));
}
}
}
diff --git a/Assets/Changjing/Prefabs/Ding/T3Right.prefab b/Assets/Changjing/Prefabs/Ding/T3Right.prefab
index a08a67b..86f082e 100644
--- a/Assets/Changjing/Prefabs/Ding/T3Right.prefab
+++ b/Assets/Changjing/Prefabs/Ding/T3Right.prefab
@@ -1077,7 +1077,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6170792753424671673}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 14.87, y: 1.53, z: 0}
+ m_LocalPosition: {x: -1.33, y: 16.21, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6820546616547621374}
@@ -1348,7 +1348,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8052245046934131181}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 15.89, y: 7.81, z: -0}
+ m_LocalPosition: {x: -7.88, y: 15.28, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5320623258974781687}
@@ -1499,7 +1499,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9119570708478062230}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 14.87, y: 4.71, z: -0}
+ m_LocalPosition: {x: -4.49, y: 15.65, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3854353063896593969}