diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
index d1c3a526..111fa8a3 100644
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
@@ -483,14 +483,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0a0782d2b4482d547ad00c06c17202a4, type: 3}
m_Name:
m_EditorClassIdentifier:
- instance: {fileID: 0}
moveSpeed: 5
rotateSpeed: 1
xRotationLimit: 60
- yRotationLimit: 360
- minRotationLimitY: -135
- maxRotationLimitY: -45
- enableCollision: 0
+ enableCollision: 1
isLock: 0
--- !u!1 &653260035
GameObject:
diff --git a/Assets/Scripts/Actions/ActionHelper.cs b/Assets/Scripts/Actions/ActionHelper.cs
index 6c22e183..d6e79a57 100644
--- a/Assets/Scripts/Actions/ActionHelper.cs
+++ b/Assets/Scripts/Actions/ActionHelper.cs
@@ -145,6 +145,10 @@ public class ActionHelper
var strAction = (XMLTool.StringListAction)act;
return CameraSwitchAction.Allocate(strAction.args[0], strAction.args[1], strAction.args[2], strAction.args[3], strAction.args[4], strAction.args[5], strAction.args[6]);
}
+ case "LockCamera":
+ {
+ return LockCameraAction.Allocate(act.Value);
+ }
}
break;
case XMLTool.Condition condition:
diff --git a/Assets/Scripts/FreeCameraController.cs b/Assets/Scripts/FreeCameraController.cs
index d6ac7513..871d427c 100644
--- a/Assets/Scripts/FreeCameraController.cs
+++ b/Assets/Scripts/FreeCameraController.cs
@@ -10,9 +10,9 @@ public class FreeCameraController : MonoBehaviour
// X轴旋转的最大范围
public float xRotationLimit = 80.0f;
// Y轴旋转的最大范围
- public float yRotationLimit = 180.0f;
- public float minRotationLimitY = -1;
- public float maxRotationLimitY = -1;
+ //public float yRotationLimit = 180.0f;
+ //public float minRotationLimitY = -1;
+ //public float maxRotationLimitY = -1;
// 是否启用碰撞检测
public bool enableCollision = false; // 默认关闭碰撞检测，根据需要开启
diff --git a/Data/App.xml b/Data/App.xml
index 9af441da..1818b361 100644
--- a/Data/App.xml
+++ b/Data/App.xml
@@ -633,8 +633,6 @@
-
-
-
+
+
-
-
+
+
@@ -733,9 +731,10 @@
+
-
-
+
+
@@ -748,8 +747,8 @@
-
-
+
+
@@ -763,8 +762,8 @@
-
-
+
+
@@ -776,8 +775,8 @@
-
-
+
+
diff --git a/Doc/Xml閰嶇疆鏂囨。.xml b/Doc/Xml閰嶇疆鏂囨。.xml
index 8935ab99..86f93027 100644
--- a/Doc/Xml閰嶇疆鏂囨。.xml
+++ b/Doc/Xml閰嶇疆鏂囨。.xml
@@ -49,6 +49,8 @@
+
+
Scene