Browse Source

修改机器人比例及位置,修复机器转身离开碰撞器问题

wangxin 3 years ago
parent
commit
69dbbee0d0

+ 55 - 55
Assets/Prefabs/Robot.prefab

@@ -1,12 +1,12 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!54 &5653169007947485835
+--- !u!54 &5770503166328475817
 Rigidbody:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4419713850881433870}
+  m_GameObject: {fileID: 2536968153219130156}
   serializedVersion: 2
   m_Mass: 1
   m_Drag: 0
@@ -16,27 +16,27 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
---- !u!65 &5653169007947485832
+--- !u!65 &5770503166328475818
 BoxCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4419713850881433870}
+  m_GameObject: {fileID: 2536968153219130156}
   m_Material: {fileID: 0}
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0.72, y: 1.75, z: 0.46}
-  m_Center: {x: 0, y: 0.94, z: 0}
---- !u!95 &5653169007947485846
+  m_Size: {x: 0.72, y: 1.75, z: 0.72}
+  m_Center: {x: -0.00000001762431, y: 0.94000006, z: -0.08825178}
+--- !u!95 &5770503166328475828
 Animator:
   serializedVersion: 3
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4419713850881433870}
+  m_GameObject: {fileID: 2536968153219130156}
   m_Enabled: 1
   m_Avatar: {fileID: 9000000, guid: 4a5d2d624a65daa4a9c8cf5164951049, type: 3}
   m_Controller: {fileID: 9100000, guid: d320e9ddd0e88404882c0eb3e5bef4ec, type: 2}
@@ -48,34 +48,34 @@ Animator:
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorControllerStateOnDisable: 0
---- !u!114 &5653169007947485833
+--- !u!114 &5770503166328475819
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4419713850881433870}
+  m_GameObject: {fileID: 2536968153219130156}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 8cf28d5d4d9543148abc18f67944fc5e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   Speed: 1
---- !u!114 &5653169008377507737
+--- !u!114 &5770503165688753595
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4419713851689820040}
+  m_GameObject: {fileID: 2536968155103485354}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: e15cc7e8f14ffed4284f367a56ee23d3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mRobot: {fileID: 4419713850881433870}
+  mRobot: {fileID: 2536968153219130156}
   material: {fileID: 2100000, guid: 37ffdeb9d97292840952c48d1183d193, type: 2}
---- !u!1 &5653169007685538130
+--- !u!1 &5770503165047444336
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -83,7 +83,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 5653169007685538133}
+  - component: {fileID: 5770503165047444343}
   m_Layer: 0
   m_Name: Robot
   m_TagString: Untagged
@@ -91,29 +91,34 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
---- !u!4 &5653169007685538133
+--- !u!4 &5770503165047444343
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5653169007685538130}
-  m_LocalRotation: {x: 0, y: 0.0005934063, z: 0, w: 0.9999999}
-  m_LocalPosition: {x: 6.43, y: -1.74, z: -1.9}
+  m_GameObject: {fileID: 5770503165047444336}
+  m_LocalRotation: {x: 0, y: 0.85860234, z: -0, w: -0.51264215}
+  m_LocalPosition: {x: -1.12, y: -2, z: 6.65}
   m_LocalScale: {x: 2, y: 2, z: 2}
   m_Children:
-  - {fileID: 796754006676254107}
-  - {fileID: 796754006943699741}
+  - {fileID: 1544249515181944761}
+  - {fileID: 1544249516516708671}
   m_Father: {fileID: 0}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0.068, z: 0}
---- !u!1001 &5653169007526086273
+  m_LocalEulerAnglesHint: {x: 0, y: 241.68, z: 0}
+--- !u!1001 &5770503164870821027
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 5653169007685538133}
+    m_TransformParent: {fileID: 5770503165047444343}
     m_Modifications:
+    - target: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
+      propertyPath: m_Name
+      value: irobot
+      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -172,44 +177,49 @@ PrefabInstance:
     - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
         type: 3}
       propertyPath: m_LocalScale.x
-      value: 0.5
+      value: 0.65
       objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
         type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.5
+      value: 0.65
       objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
         type: 3}
       propertyPath: m_LocalScale.z
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
-        type: 3}
-      propertyPath: m_Name
-      value: irobot
+      value: 0.65
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
---- !u!1 &4419713851689820040 stripped
+--- !u!1 &2536968155103485354 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
     type: 3}
-  m_PrefabInstance: {fileID: 5653169007526086273}
+  m_PrefabInstance: {fileID: 5770503164870821027}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &796754006676254107 stripped
+--- !u!4 &1544249515181944761 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
     type: 3}
-  m_PrefabInstance: {fileID: 5653169007526086273}
+  m_PrefabInstance: {fileID: 5770503164870821027}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &5653169007791323143
+--- !u!1001 &5770503166207834661
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 5653169007685538133}
+    m_TransformParent: {fileID: 5770503165047444343}
     m_Modifications:
+    - target: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
+      propertyPath: m_Name
+      value: irobot (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -268,27 +278,17 @@ PrefabInstance:
     - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
         type: 3}
       propertyPath: m_LocalScale.x
-      value: 0.5
+      value: 0.65
       objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
         type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.5
+      value: 0.65
       objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
         type: 3}
       propertyPath: m_LocalScale.z
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
-        type: 3}
-      propertyPath: m_Name
-      value: irobot (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
+      value: 0.65
       objectReference: {fileID: 0}
     - target: {fileID: -1323028903878121218, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
         type: 3}
@@ -297,15 +297,15 @@ PrefabInstance:
       objectReference: {fileID: 2100000, guid: f3d2a40b9e0e3d942a6ea42996057467, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
---- !u!1 &4419713850881433870 stripped
+--- !u!1 &2536968153219130156 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
     type: 3}
-  m_PrefabInstance: {fileID: 5653169007791323143}
+  m_PrefabInstance: {fileID: 5770503166207834661}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &796754006943699741 stripped
+--- !u!4 &1544249516516708671 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
     type: 3}
-  m_PrefabInstance: {fileID: 5653169007791323143}
+  m_PrefabInstance: {fileID: 5770503166207834661}
   m_PrefabAsset: {fileID: 0}

+ 1 - 1
Assets/Prefabs/Robot.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1cee1bca5c513914bb66e250f05d93f9
+guid: a672f9c8652581d4a95949a90bc1e363
 PrefabImporter:
   externalObjects: {}
   userData: 

+ 4 - 2
Assets/XDKUnityCloudExamples/Common/Scripts/Iphone/Robot.cs

@@ -36,7 +36,7 @@ public class Robot : MonoBehaviour
     {
         if(other.tag == "RobotBox")
         {
-            isWalk = false;
+           
            
             switch (other.name)
             {
@@ -94,7 +94,9 @@ public class Robot : MonoBehaviour
     /// <returns></returns>
     IEnumerator Timing( float times, string state)
     {
-        yield return new  WaitForSeconds(times);
+        yield return new WaitForSeconds(0.1f);
+        isWalk = false;
+        yield return new  WaitForSeconds(times-0.1f);
         CutState(state);
     }
 

+ 89 - 89
Assets/XDKUnityCloudExamples/Demo/Scenes/Demo.unity

@@ -8594,7 +8594,7 @@ Transform:
   - {fileID: 1870624492}
   - {fileID: 242924312}
   - {fileID: 885482083}
-  - {fileID: 1558279978}
+  - {fileID: 5653169008072476507}
   m_Father: {fileID: 875360073}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -12671,7 +12671,7 @@ MonoBehaviour:
   - Car
   - Solar
   - Transformers
-  robot: {fileID: 1837131629}
+  robot: {fileID: 5653169007290041479}
 --- !u!114 &970254223
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -20123,12 +20123,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1555642070}
   m_CullTransparentMesh: 0
---- !u!4 &1558279978 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
-    type: 3}
-  m_PrefabInstance: {fileID: 1798329870}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &1562152357 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1469659092576718643, guid: d8791dc0c8261834c8c601971cd7091e,
@@ -23681,75 +23675,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1772549914}
   m_CullTransparentMesh: 0
---- !u!1001 &1798329870
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 630725844}
-    m_Modifications:
-    - target: {fileID: 5653169007685538130, guid: 1cee1bca5c513914bb66e250f05d93f9,
-        type: 3}
-      propertyPath: m_Name
-      value: Robot
-      objectReference: {fileID: 0}
-    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -1.12
-      objectReference: {fileID: 0}
-    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -2.53
-      objectReference: {fileID: 0}
-    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 6.65
-      objectReference: {fileID: 0}
-    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.858601
-      objectReference: {fileID: 0}
-    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.5126446
-      objectReference: {fileID: 0}
-    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 8
-      objectReference: {fileID: 0}
-    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 241.68
-      objectReference: {fileID: 0}
-    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 1cee1bca5c513914bb66e250f05d93f9, type: 3}
 --- !u!1 &1801162212
 GameObject:
   m_ObjectHideFlags: 0
@@ -24585,18 +24510,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1828555995}
   m_CullTransparentMesh: 0
---- !u!114 &1837131629 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5653169007947485833, guid: 1cee1bca5c513914bb66e250f05d93f9,
-    type: 3}
-  m_PrefabInstance: {fileID: 1798329870}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8cf28d5d4d9543148abc18f67944fc5e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1838035230
 GameObject:
   m_ObjectHideFlags: 0
@@ -29371,6 +29284,75 @@ PrefabInstance:
         type: 3}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 33a156d487b1c83498375053012dc7f8, type: 3}
+--- !u!1001 &2189001536879973420
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 630725844}
+    m_Modifications:
+    - target: {fileID: 5770503165047444336, guid: a672f9c8652581d4a95949a90bc1e363,
+        type: 3}
+      propertyPath: m_Name
+      value: Robot
+      objectReference: {fileID: 0}
+    - target: {fileID: 5770503165047444343, guid: a672f9c8652581d4a95949a90bc1e363,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -1.12
+      objectReference: {fileID: 0}
+    - target: {fileID: 5770503165047444343, guid: a672f9c8652581d4a95949a90bc1e363,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -2.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5770503165047444343, guid: a672f9c8652581d4a95949a90bc1e363,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 6.65
+      objectReference: {fileID: 0}
+    - target: {fileID: 5770503165047444343, guid: a672f9c8652581d4a95949a90bc1e363,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5770503165047444343, guid: a672f9c8652581d4a95949a90bc1e363,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.858601
+      objectReference: {fileID: 0}
+    - target: {fileID: 5770503165047444343, guid: a672f9c8652581d4a95949a90bc1e363,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5770503165047444343, guid: a672f9c8652581d4a95949a90bc1e363,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.5126446
+      objectReference: {fileID: 0}
+    - target: {fileID: 5770503165047444343, guid: a672f9c8652581d4a95949a90bc1e363,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 5770503165047444343, guid: a672f9c8652581d4a95949a90bc1e363,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5770503165047444343, guid: a672f9c8652581d4a95949a90bc1e363,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 241.68
+      objectReference: {fileID: 0}
+    - target: {fileID: 5770503165047444343, guid: a672f9c8652581d4a95949a90bc1e363,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a672f9c8652581d4a95949a90bc1e363, type: 3}
 --- !u!1001 &2468259019874778393
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -29519,6 +29501,24 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 663559669}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &5653169007290041479 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5770503166328475819, guid: a672f9c8652581d4a95949a90bc1e363,
+    type: 3}
+  m_PrefabInstance: {fileID: 2189001536879973420}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8cf28d5d4d9543148abc18f67944fc5e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &5653169008072476507 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5770503165047444343, guid: a672f9c8652581d4a95949a90bc1e363,
+    type: 3}
+  m_PrefabInstance: {fileID: 2189001536879973420}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5894011767265893332
 PrefabInstance:
   m_ObjectHideFlags: 0