YDL
/
TianJin_23
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
天津23维预案
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
3 Commits
1 Branch
0 Tags
2.0 GiB
 
 
 
 
 
 
Tree: 41766c0d3c
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '41766c0d3c'
${ noResults }
TianJin_23/复制车辆.diff

973 lines
32 KiB
Raw Blame History

From 374677946a6372814b169e03707b3b6908bde817 Mon Sep 17 00:00:00 2001
From: zzj <1603306380@qq.com>
Date: Thu, 27 Jul 2017 11:59:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E8=BD=A6=E8=BE=86=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Assets/Canvas.prefab | 385 ++++++++++++++++++++-
Assets/Scripts/CarControl/BaseClass.cs | 2 +-
Assets/Scripts/CarControl/InstantiationCar.cs | 30 +-
Assets/Scripts/CopyCarScript.meta | 9 +
Assets/Scripts/CopyCarScript/CopyCarScripts.cs | 209 +++++++++++
.../Scripts/CopyCarScript/CopyCarScripts.cs.meta | 12 +
Assets/Scripts/Record/InstanceRecordPlane.cs | 2 +-
Assets/Scripts/XunLu/AgentControl.cs | 8 +-
8 files changed, 626 insertions(+), 31 deletions(-)
create mode 100644 Assets/Scripts/CopyCarScript.meta
create mode 100644 Assets/Scripts/CopyCarScript/CopyCarScripts.cs
create mode 100644 Assets/Scripts/CopyCarScript/CopyCarScripts.cs.meta
diff --git a/Assets/Canvas.prefab b/Assets/Canvas.prefab
index ef512fe..5b8621f 100644
--- a/Assets/Canvas.prefab
+++ b/Assets/Canvas.prefab
@@ -5941,7 +5941,7 @@ GameObject:
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- - 224: {fileID: 224000012652927710}
+ - 224: {fileID: 224000011161622376}
- 222: {fileID: 222000013566581098}
- 114: {fileID: 114000012954698638}
- 114: {fileID: 114000012723415552}
@@ -14296,6 +14296,23 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
+--- !u!1 &1000011637180456
+GameObject:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ serializedVersion: 4
+ m_Component:
+ - 224: {fileID: 224000012103493808}
+ - 222: {fileID: 222000011176826314}
+ - 114: {fileID: 114000012208647456}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
--- !u!1 &1000011638085208
GameObject:
m_ObjectHideFlags: 1
@@ -20556,6 +20573,25 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
+--- !u!1 &1000012319882054
+GameObject:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ serializedVersion: 4
+ m_Component:
+ - 224: {fileID: 224000012652927710}
+ - 222: {fileID: 222000013362680448}
+ - 114: {fileID: 114000013824048674}
+ - 114: {fileID: 114000013415359270}
+ - 114: {fileID: 114000011065012324}
+ m_Layer: 5
+ m_Name: CopyCar
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
--- !u!1 &1000012320074910
GameObject:
m_ObjectHideFlags: 1
@@ -23672,6 +23708,23 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
+--- !u!1 &1000012674518542
+GameObject:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ serializedVersion: 4
+ m_Component:
+ - 224: {fileID: 224000013026005992}
+ - 222: {fileID: 222000010495946524}
+ - 114: {fileID: 114000011013266368}
+ m_Layer: 5
+ m_Name: Mark
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
--- !u!1 &1000012679010960
GameObject:
m_ObjectHideFlags: 1
@@ -33379,6 +33432,23 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
+--- !u!1 &1000013783542652
+GameObject:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ serializedVersion: 4
+ m_Component:
+ - 224: {fileID: 224000010222506978}
+ - 222: {fileID: 222000010501470188}
+ - 114: {fileID: 114000011049308192}
+ m_Layer: 5
+ m_Name: Copy
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
--- !u!1 &1000013784008752
GameObject:
m_ObjectHideFlags: 1
@@ -52624,7 +52694,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 114000013938110190}
m_HandleRect: {fileID: 224000011865202090}
m_Direction: 2
- m_Value: 1
+ m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@@ -60866,6 +60936,33 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
+--- !u!114 &114000011013266368
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000012674518542}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: 37d2532b02de1754985c38aae4de8567, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
--- !u!114 &114000011014806048
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -61874,6 +61971,39 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
+--- !u!114 &114000011049308192
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000013783542652}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.49411768, g: 0.49411768, b: 0.49411768, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: f3e850e3270f1244393ae7821fc03aa0, type: 3}
+ m_FontSize: 20
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u590D\u5236\u8F66\u8F86"
--- !u!114 &114000011050052550
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -62266,6 +62396,20 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u989C\u8272"
+--- !u!114 &114000011065012324
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000012319882054}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 21521cb283d9ddc4f8b08fd375955b44, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ ground_layerMask:
+ serializedVersion: 2
+ m_Bits: 33554432
--- !u!114 &114000011065276470
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -82773,7 +82917,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 114000011451998908}
m_HandleRect: {fileID: 224000012195842000}
m_Direction: 2
- m_Value: 0
+ m_Value: 1
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@@ -88018,6 +88162,33 @@ MonoBehaviour:
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
EndScrollDelay: 0.2
+--- !u!114 &114000012208647456
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000011637180456}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: 49c171497e77df84c98a8425be4b4663, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
--- !u!114 &114000012208838094
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -94714,6 +94885,16 @@ MonoBehaviour:
m_EditorClassIdentifier:
PowerGame: {fileID: 1000010388376696, guid: f50b013e46c639740b344f44353fe20e, type: 2}
CarName:
+ gpcNum: 0
+ pmcNum: 0
+ dgcNum: 0
+ qxcNum: 0
+ qccNum: 0
+ sgcNum: 0
+ ytcNum: 0
+ zmcNum: 0
+ txcNum: 0
+ pycNum: 0
TopName:
isboolCar: 0
isCarSelect: 0
@@ -103733,7 +103914,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 114000010470821584}
m_HandleRect: {fileID: 224000013433706032}
m_Direction: 0
- m_Value: 0.00000022801544
+ m_Value: 0
m_Size: 0.86953133
m_NumberOfSteps: 0
m_OnValueChanged:
@@ -115081,6 +115262,51 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
+--- !u!114 &114000013415359270
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000012319882054}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 2109663825, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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: 2
+ 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_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_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 114000011013266368}
+ toggleTransition: 1
+ graphic: {fileID: 114000011013266368}
+ m_Group: {fileID: 0}
+ onValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+ m_IsOn: 0
--- !u!114 &114000013415475184
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -115608,7 +115834,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 114000011904700978}
m_HandleRect: {fileID: 224000011747057352}
m_Direction: 2
- m_Value: 1
+ m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@@ -118605,7 +118831,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u5C5E\u6027"
+ m_Text: "\u8F66\u8F86\u5C5E\u6027"
--- !u!114 &114000013563234402
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -124666,6 +124892,33 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u786E\u5B9A"
+--- !u!114 &114000013824048674
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000012319882054}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: 20256a8f08c1bf4459703689934a03de, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
--- !u!114 &114000013825126782
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -137599,6 +137852,12 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000013974123354}
+--- !u!222 &222000010495946524
+CanvasRenderer:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000012674518542}
--- !u!222 &222000010497637116
CanvasRenderer:
m_ObjectHideFlags: 1
@@ -137617,6 +137876,12 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000010847667392}
+--- !u!222 &222000010501470188
+CanvasRenderer:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000013783542652}
--- !u!222 &222000010505161758
CanvasRenderer:
m_ObjectHideFlags: 1
@@ -139561,6 +139826,12 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000011105164768}
+--- !u!222 &222000011176826314
+CanvasRenderer:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000011637180456}
--- !u!222 &222000011178016258
CanvasRenderer:
m_ObjectHideFlags: 1
@@ -145267,6 +145538,12 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000013200219646}
+--- !u!222 &222000013362680448
+CanvasRenderer:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000012319882054}
--- !u!222 &222000013363804638
CanvasRenderer:
m_ObjectHideFlags: 1
@@ -149844,6 +150121,24 @@ RectTransform:
m_AnchoredPosition: {x: 65, y: -22}
m_SizeDelta: {x: 120, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224000010222506978
+RectTransform:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000013783542652}
+ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_Children: []
+ m_Father: {fileID: 224000012652927710}
+ m_RootOrder: 2
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0.00000071525574, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224000010222757448
RectTransform:
m_ObjectHideFlags: 1
@@ -158893,6 +159188,27 @@ RectTransform:
m_AnchoredPosition: {x: 112.5, y: 74.5}
m_SizeDelta: {x: 20, y: 195}
m_Pivot: {x: 1, y: 1}
+--- !u!224 &224000011161622376
+RectTransform:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000010674089336}
+ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_Children:
+ - {fileID: 224000011391924178}
+ - {fileID: 224000013092619466}
+ - {fileID: 224000012652927710}
+ m_Father: {fileID: 224000012659039068}
+ m_RootOrder: 8
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 402.4, y: 73.19997}
+ m_SizeDelta: {x: 95.3, y: 40}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224000011162886898
RectTransform:
m_ObjectHideFlags: 1
@@ -159741,7 +160057,7 @@ RectTransform:
m_RootOrder: 3
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 76.44127, y: -19.899961}
+ m_AnchoredPosition: {x: 80.47215, y: -19.899961}
m_SizeDelta: {x: 0, y: 25.8}
m_Pivot: {x: 0.5, y: 0.5000015}
--- !u!224 &224000011245947674
@@ -161007,7 +161323,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
- m_Father: {fileID: 224000012652927710}
+ m_Father: {fileID: 224000011161622376}
m_RootOrder: 0
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -168195,6 +168511,24 @@ RectTransform:
m_AnchoredPosition: {x: 525.5, y: -81.5}
m_SizeDelta: {x: 143, y: 153}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224000012103493808
+RectTransform:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000011637180456}
+ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_Children: []
+ m_Father: {fileID: 224000012652927710}
+ m_RootOrder: 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: 94, y: 40}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224000012104463482
RectTransform:
m_ObjectHideFlags: 1
@@ -173485,19 +173819,20 @@ RectTransform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1000010674089336}
+ m_GameObject: {fileID: 1000012319882054}
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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children:
- - {fileID: 224000011391924178}
- - {fileID: 224000013092619466}
- m_Father: {fileID: 224000012659039068}
- m_RootOrder: 8
+ - {fileID: 224000012103493808}
+ - {fileID: 224000013026005992}
+ - {fileID: 224000010222506978}
+ m_Father: {fileID: 224000011161622376}
+ m_RootOrder: 2
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 402.4, y: 73.19997}
+ m_AnchoredPosition: {x: -105.20004, y: 0.0000076293945}
m_SizeDelta: {x: 95.3, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224000012653651520
@@ -173555,7 +173890,7 @@ RectTransform:
- {fileID: 224000013535030900}
- {fileID: 224000011088079766}
- {fileID: 224000013153449678}
- - {fileID: 224000012652927710}
+ - {fileID: 224000011161622376}
m_Father: {fileID: 224000011285996318}
m_RootOrder: 0
m_AnchorMin: {x: 0, y: 0}
@@ -176900,6 +177235,24 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224000013026005992
+RectTransform:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000012674518542}
+ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_Children: []
+ m_Father: {fileID: 224000012652927710}
+ m_RootOrder: 1
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0.0000076293945}
+ m_SizeDelta: {x: 95.3, y: 40}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224000013026827816
RectTransform:
m_ObjectHideFlags: 1
@@ -177534,7 +177887,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
- m_Father: {fileID: 224000012652927710}
+ m_Father: {fileID: 224000011161622376}
m_RootOrder: 1
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
diff --git a/Assets/Scripts/CarControl/BaseClass.cs b/Assets/Scripts/CarControl/BaseClass.cs
index 0347545..1518c61 100644
--- a/Assets/Scripts/CarControl/BaseClass.cs
+++ b/Assets/Scripts/CarControl/BaseClass.cs
@@ -441,7 +441,7 @@ public class BaseClass : MonoBehaviour {
public void SetCengID(GameObject obj)
{
BuildItem build = new BuildItem();
- if (hit.collider.GetComponent<CengID>())
+ if (hit.collider != null && hit.collider.GetComponent<CengID>())
{
build.floor = hit.collider.GetComponent<CengID>().cengID;
build.buildType = hit.collider.GetComponent<CengID>().CengIDBuildType;
diff --git a/Assets/Scripts/CarControl/InstantiationCar.cs b/Assets/Scripts/CarControl/InstantiationCar.cs
index 1e95a6a..4678d8c 100644
--- a/Assets/Scripts/CarControl/InstantiationCar.cs
+++ b/Assets/Scripts/CarControl/InstantiationCar.cs
@@ -29,16 +29,26 @@ public class InstantiationCar : MonoBehaviour
private LayerMask ground_layerMask = -1;//地面层
//public LayerMask r_layerMask = -1;
private LayerMask indoor_layerMask = -1;//室内层
- private int gpcNum = 0;
- private int pmcNum = 0;
- private int dgcNum = 0;
- private int qxcNum = 0;
- private int qccNum = 0;
- private int sgcNum = 0;
- private int ytcNum = 0;
- private int zmcNum = 0;
- private int txcNum = 0;
- private int pycNum = 0;
+ [HideInInspector]
+ public int gpcNum = 0;
+ [HideInInspector]
+ public int pmcNum = 0;
+ [HideInInspector]
+ public int dgcNum = 0;
+ [HideInInspector]
+ public int qxcNum = 0;
+ [HideInInspector]
+ public int qccNum = 0;
+ [HideInInspector]
+ public int sgcNum = 0;
+ [HideInInspector]
+ public int ytcNum = 0;
+ [HideInInspector]
+ public int zmcNum = 0;
+ [HideInInspector]
+ public int txcNum = 0;
+ [HideInInspector]
+ public int pycNum = 0;
public string TopName = "";
public bool isboolCar = false;
private InputField ForceNameInput;
diff --git a/Assets/Scripts/CopyCarScript.meta b/Assets/Scripts/CopyCarScript.meta
new file mode 100644
index 0000000..2055b09
--- /dev/null
+++ b/Assets/Scripts/CopyCarScript.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: cc3be6b906f8d2340acbc42abbc93fd0
+folderAsset: yes
+timeCreated: 1500974138
+licenseType: Pro
+DefaultImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/CopyCarScript/CopyCarScripts.cs b/Assets/Scripts/CopyCarScript/CopyCarScripts.cs
new file mode 100644
index 0000000..5f4af90
--- /dev/null
+++ b/Assets/Scripts/CopyCarScript/CopyCarScripts.cs
@@ -0,0 +1,209 @@
+using UnityEngine;
+using System.Collections;
+using UnityEngine.UI;
+using System.Collections.Generic;
+using UnityEngine.EventSystems;
+using AX.MessageSystem;
+using System;
+using AX.TrackRecord;
+
+public class CopyCarScripts : MonoBehaviour {
+
+ /// <summary>
+ /// 复制车辆脚本
+ /// </summary>
+
+ private Toggle CopyBtn;
+ private RaycastHit hit;
+ private bool CopyBool;
+ private GameObject CarGameobj;
+ public LayerMask ground_layerMask = -1;//地面层
+ void Start ()
+ {
+ CopyBtn = GetComponent<Toggle>();
+ CopyBtn.onValueChanged.AddListener(CopyEvent);
+ }
+
+ void CopyEvent(bool flag)
+ {
+
+ if (flag)
+ {
+ if (LineamentEvent.gameobj != null && LineamentEvent.gameobj.name.Contains("xiaofangche"))
+ {
+ CopyBool = flag;
+ string Str = LineamentEvent.gameobj.name.Substring(0, 20);
+ Debug.Log(Str);
+ CarGameobj = Instantiate(LineamentEvent.gameobj) as GameObject;
+ string TopName;
+ if (InstantiationCar.Instance.isboolCar)
+ {
+ TopName = EditForceName.Instance.JudgeName + "-" + GetName(CarGameobj.name);
+ }
+ else
+ {
+ TopName = GetName(CarGameobj.name);
+ }
+
+ CarGameobj.transform.FindChild("info").GetComponent<EnemyInfo>().SetName(TopName);
+ CarGameobj.transform.parent = LineamentEvent.gameobj.transform.parent;
+ CarGameobj.GetComponent<NavMeshAgent>().enabled = false;
+ CarGameobj.GetComponent<BoxCollider>().enabled = false;
+ CarGameobj.GetComponent<AgentControl>().enabled = false;
+ if (CarGameobj.GetComponent<RLineControl>())
+ {
+ CarGameobj.GetComponent<RLineControl>().LineList_GameObject.Clear();
+ }
+
+ CarGameobj.GetComponent<AgentControl>().agent.speed = 7f * 3f;
+
+ CarGameobj.name = Str + NormalCars.carIndex;
+ NormalCars.carIndex++;
+ }
+ else
+ {
+ MessageDispatcher.SendMessage("Operatinghints", (object)"请选择车辆复制");
+ CopyBtn.isOn = false;
+ }
+ MessageDispatcher.SendMessage("ResettingButton", (object)this.name);
+ LineamentEvent.gameobj = null;
+ }
+ else
+ {
+
+
+ }
+ }
+ String GetName(String str)
+ {
+ if (str.Contains("sgc"))
+ {
+ InstantiationCar.Instance.sgcNum++;
+ int Num = InstantiationCar.Instance.sgcNum;
+ return "水罐车-"+ Num.ToString();
+ }
+ else if (str.Contains("pmc"))
+ {
+ InstantiationCar.Instance.pmcNum++;
+ int Num = InstantiationCar.Instance.pmcNum;
+ return "泡沫车-" + Num.ToString();
+ }
+ else if (str.Contains("dgc"))
+ {
+ InstantiationCar.Instance.dgcNum++;
+ int Num = InstantiationCar.Instance.dgcNum;
+ return "举高车-" + Num.ToString();
+ }
+
+ else if (str.Contains("gpc"))
+ {
+ InstantiationCar.Instance.gpcNum++;
+ int Num = InstantiationCar.Instance.gpcNum;
+ return "高喷车-" + Num.ToString();
+ }
+
+ else if (str.Contains("ytc"))
+ {
+ InstantiationCar.Instance.ytcNum++;
+ int Num = InstantiationCar.Instance.ytcNum;
+ return "云梯车-" + Num.ToString();
+ }
+ else if (str.Contains("zmc"))
+ {
+ InstantiationCar.Instance.zmcNum++;
+ int Num = InstantiationCar.Instance.zmcNum;
+ return "照明车-" + Num.ToString();
+ }
+ else if (str.Contains("qcc"))
+ {
+ InstantiationCar.Instance.qccNum++;
+ int Num = InstantiationCar.Instance.qccNum;
+ return "器材车-" + Num.ToString();
+ }
+ else if (str.Contains("qxc"))
+ {
+ InstantiationCar.Instance.qxcNum++;
+ int Num = InstantiationCar.Instance.qxcNum;
+ return "抢险车-" + Num.ToString();
+ }
+ else if (str.Contains("pyc"))
+ {
+ InstantiationCar.Instance.pycNum++;
+ int Num = InstantiationCar.Instance.pycNum;
+ return "排烟车-" + Num.ToString();
+ }
+ else if (str.Contains("zmc"))
+ {
+ InstantiationCar.Instance.zmcNum++;
+ int Num = InstantiationCar.Instance.zmcNum;
+ return "照明车-" + Num.ToString();
+ }
+ else
+ {
+ return "";
+ }
+
+ }
+ void Update ()
+ {
+ if (CopyBool)
+ {
+ if (CarGameobj != null)
+ {
+ if (this.GetComponent<NavMeshObstacle>())
+ {//拖动时，NavmeshObstacle不能激活，否则会使其它消防车产生位移
+ GetComponent<NavMeshObstacle>().enabled = false;
+ }
+ var screenSpace = Camera.main.WorldToScreenPoint(CarGameobj.transform.position);//三维物体坐标转屏幕坐标 //将鼠标屏幕坐标转为三维坐标，再算出物体位置与鼠标之间的距离
+ var offset = CarGameobj.transform.position - Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, screenSpace.z));
+ var curScreenSpace = new Vector3(Input.mousePosition.x, Input.mousePosition.y, screenSpace.z);
+ var curPosition = Camera.main.ScreenToWorldPoint(curScreenSpace+ offset) ;
+
+ CarGameobj.transform.position = new Vector3(curPosition.x, CarGameobj.transform.position.y, curPosition.z);
+
+ Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
+ if (EventSystem.current.IsPointerOverGameObject())
+ {
+ return;
+ }
+
+ if (Physics.Raycast(ray, out hit, Mathf.Infinity) && Input.GetMouseButtonDown(0))
+ {
+ if (hit.collider.gameObject.layer != 25)
+ {
+ MessageDispatcher.SendMessage("Operatinghints", (object)"此处不能停放车辆");
+ return;
+ }
+
+ }
+ if (Physics.Raycast(ray, out hit, Mathf.Infinity, ground_layerMask) && Input.GetMouseButtonDown(0) && !EventSystem.current.IsPointerOverGameObject())
+ {
+ CarGameobj.transform.position = hit.point;
+ CopyBtn.isOn = false;
+ CopyBool = false;
+
+ CarGameobj.GetComponent<BoxCollider>().enabled = true;
+ AX.TrackRecord.BuildItem build = new BuildItem();
+ if (hit.collider.GetComponent<CengID>())
+ {
+ build.floor = hit.collider.GetComponent<CengID>().cengID;
+ build.buildType = hit.collider.GetComponent<CengID>().CengIDBuildType;
+ MessageDispatcher.SendMessage(CarGameobj.name, "SetCengID", build);
+ }
+ if (RecordManager.Instance.IsRecording)
+ {
+ MessageDispatcher.SendMessage("RecordInstantiateEvent", (object)CarGameobj.name);
+ }
+ }
+
+ if (Input.GetMouseButtonDown(1))
+ {
+ CopyBtn.isOn = false;
+ Destroy(CarGameobj);
+ }
+ }
+
+ }
+
+ }
+}
diff --git a/Assets/Scripts/CopyCarScript/CopyCarScripts.cs.meta b/Assets/Scripts/CopyCarScript/CopyCarScripts.cs.meta
new file mode 100644
index 0000000..a5c881b
--- /dev/null
+++ b/Assets/Scripts/CopyCarScript/CopyCarScripts.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 21521cb283d9ddc4f8b08fd375955b44
+timeCreated: 1500974167
+licenseType: Pro
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Record/InstanceRecordPlane.cs b/Assets/Scripts/Record/InstanceRecordPlane.cs
index 72bca95..cf60a57 100644
--- a/Assets/Scripts/Record/InstanceRecordPlane.cs
+++ b/Assets/Scripts/Record/InstanceRecordPlane.cs
@@ -122,7 +122,7 @@ public class InstanceRecordPlane : MonoBehaviour {
{
return "排烟车";
}
- else if (str.Contains("ZHC"))
+ else if (str.Contains("ZMC"))
{
return "照明车";
}
diff --git a/Assets/Scripts/XunLu/AgentControl.cs b/Assets/Scripts/XunLu/AgentControl.cs
index 35c0516..34fcc7a 100644
--- a/Assets/Scripts/XunLu/AgentControl.cs
+++ b/Assets/Scripts/XunLu/AgentControl.cs
@@ -8,8 +8,8 @@ using System.Linq;
public class AgentControl : MonoBehaviour
{
-
- private NavMeshAgent agent;
+ [HideInInspector]
+ public NavMeshAgent agent;
public NavMeshPath NavMeshPath;
private NavMeshObstacle obstacle;//寻路障碍
public Vector3 point;
@@ -35,7 +35,9 @@ public class AgentControl : MonoBehaviour
agent.acceleration = 50000000;
NavMeshPath = new NavMeshPath();
lastMask = GetComponent<NavMeshAgent>().areaMask;
- if (this.transform.parent.gameObject.name == "pxiaofangche")
+
+
+ if (this.transform.parent!=null && this.transform.parent.gameObject.name == "pxiaofangche")
agent.speed = 7f * 3f;
else
{
--
2.7.4.windows.1