Compare commits
No commits in common. "7cf1a6ba2bbf958d64df0b557e39ec50b7b9e429" and "d5308e7249ba4aa5408bd05495a7aa6346dc628f" have entirely different histories.
7cf1a6ba2b
...
d5308e7249
|
|
@ -1786,14 +1786,13 @@ GameObject:
|
||||||
- component: {fileID: 7875158991895200655}
|
- component: {fileID: 7875158991895200655}
|
||||||
- component: {fileID: 7948171202674590707}
|
- component: {fileID: 7948171202674590707}
|
||||||
- component: {fileID: 367880661161749300}
|
- component: {fileID: 367880661161749300}
|
||||||
- component: {fileID: 6401969213118122126}
|
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u6709\u5149\u4F0F_\u5E76\u7F51\u8868_\u76D6\u5B50"
|
m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u6709\u5149\u4F0F_\u5E76\u7F51\u8868_\u76D6\u5B50"
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!4 &6754469576225502091
|
--- !u!4 &6754469576225502091
|
||||||
Transform:
|
Transform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -1873,20 +1872,6 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
name: "\u76D6\u5B50"
|
name: "\u76D6\u5B50"
|
||||||
ammeterSon: {fileID: 0}
|
ammeterSon: {fileID: 0}
|
||||||
--- !u!64 &6401969213118122126
|
|
||||||
MeshCollider:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1032632914913527736}
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_IsTrigger: 0
|
|
||||||
m_Enabled: 1
|
|
||||||
serializedVersion: 4
|
|
||||||
m_Convex: 0
|
|
||||||
m_CookingOptions: 30
|
|
||||||
m_Mesh: {fileID: -2998889441421176999, guid: fb9dcd7a1b7c9d541a485f770d0c786c, type: 3}
|
|
||||||
--- !u!1 &1085956406430007308
|
--- !u!1 &1085956406430007308
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -6070,7 +6055,6 @@ GameObject:
|
||||||
- component: {fileID: 8290444955099289595}
|
- component: {fileID: 8290444955099289595}
|
||||||
- component: {fileID: 7214588288924135272}
|
- component: {fileID: 7214588288924135272}
|
||||||
- component: {fileID: 4178374076203963528}
|
- component: {fileID: 4178374076203963528}
|
||||||
- component: {fileID: 5961635962258652438}
|
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u6709\u5149\u4F0F_\u5E76\u7F51\u8868_\u87BA\u4E1D"
|
m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u6709\u5149\u4F0F_\u5E76\u7F51\u8868_\u87BA\u4E1D"
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -6157,20 +6141,6 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
name: "\u87BA\u4E1D"
|
name: "\u87BA\u4E1D"
|
||||||
ammeterSon: {fileID: 367880661161749300}
|
ammeterSon: {fileID: 367880661161749300}
|
||||||
--- !u!64 &5961635962258652438
|
|
||||||
MeshCollider:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 3395799650169961684}
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_IsTrigger: 0
|
|
||||||
m_Enabled: 1
|
|
||||||
serializedVersion: 4
|
|
||||||
m_Convex: 0
|
|
||||||
m_CookingOptions: 30
|
|
||||||
m_Mesh: {fileID: -1097162192350208437, guid: fb9dcd7a1b7c9d541a485f770d0c786c, type: 3}
|
|
||||||
--- !u!1 &3432868336608827256
|
--- !u!1 &3432868336608827256
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1028,8 +1028,8 @@ BoxCollider:
|
||||||
m_IsTrigger: 1
|
m_IsTrigger: 1
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Size: {x: 0.09950634, y: 0.03646712, z: 0.26431698}
|
m_Size: {x: 0.1543576, y: 0.03646712, z: 0.27555346}
|
||||||
m_Center: {x: -0.047818907, y: -0.005653806, z: -0.1273031}
|
m_Center: {x: -0.049798988, y: -0.005653805, z: -0.13292134}
|
||||||
--- !u!114 &6158171241742345500
|
--- !u!114 &6158171241742345500
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -91,29 +91,29 @@ public class GameManager : MonoBehaviour
|
||||||
|
|
||||||
private void Update()
|
private void Update()
|
||||||
{
|
{
|
||||||
switch (interactiveEnum)
|
//switch (interactiveEnum)
|
||||||
{
|
//{
|
||||||
//case Interactive.none:
|
// case Interactive.none:
|
||||||
// for (int i = 0; i < interactive.Count; i++)
|
// for (int i = 0; i < interactive.Count; i++)
|
||||||
// {
|
// {
|
||||||
// interactive[i].transform.GetComponent<door_control>().启用交互 = true;
|
// interactive[i].transform.GetComponent<door_control>().启用交互 = true;
|
||||||
// }
|
// }
|
||||||
// break;
|
// break;
|
||||||
case Interactive.YanDian:
|
// case Interactive.YanDian:
|
||||||
for (int i = 0; i < interactive.Count; i++)
|
// for (int i = 0; i < interactive.Count; i++)
|
||||||
{
|
// {
|
||||||
interactive[i].transform.GetComponent<door_control>().启用交互 = false;
|
// interactive[i].transform.GetComponent<door_control>().启用交互 = false;
|
||||||
}
|
// }
|
||||||
break;
|
// break;
|
||||||
case Interactive.QianXing:
|
// case Interactive.QianXing:
|
||||||
for (int i = 0; i < interactive.Count; i++)
|
// for (int i = 0; i < interactive.Count; i++)
|
||||||
{
|
// {
|
||||||
interactive[i].transform.GetComponent<door_control>().启用交互 = true;
|
// interactive[i].transform.GetComponent<door_control>().启用交互 = true;
|
||||||
}
|
// }
|
||||||
break;
|
// break;
|
||||||
default:
|
// default:
|
||||||
break;
|
// break;
|
||||||
}
|
//}
|
||||||
if (Input.GetKeyDown(KeyCode.K))
|
if (Input.GetKeyDown(KeyCode.K))
|
||||||
{
|
{
|
||||||
ToolsShow(QianXing);
|
ToolsShow(QianXing);
|
||||||
|
|
@ -124,7 +124,6 @@ public class GameManager : MonoBehaviour
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void ToolsShow(GameObject tools)
|
public void ToolsShow(GameObject tools)
|
||||||
{
|
{
|
||||||
Camera.main.fieldOfView = 60;
|
|
||||||
FirstPersonController.enabled = false;
|
FirstPersonController.enabled = false;
|
||||||
if (temp != null)
|
if (temp != null)
|
||||||
{
|
{
|
||||||
|
|
@ -150,7 +149,7 @@ public class GameManager : MonoBehaviour
|
||||||
break;
|
break;
|
||||||
case "ǯÐεçÁ÷±í":
|
case "ǯÐεçÁ÷±í":
|
||||||
interactiveEnum = Interactive.QianXing;
|
interactiveEnum = Interactive.QianXing;
|
||||||
temp.transform.localEulerAngles = new Vector3(90, 180, 0);
|
temp.transform.localRotation = Quaternion.Euler(new Vector3(90, 180, 0));
|
||||||
QianStopValve.trans = temp.transform.Find("Ðýת");
|
QianStopValve.trans = temp.transform.Find("Ðýת");
|
||||||
WanStopValve.gameObject.SetActive(false);
|
WanStopValve.gameObject.SetActive(false);
|
||||||
QianStopValve.gameObject.SetActive(true);
|
QianStopValve.gameObject.SetActive(true);
|
||||||
|
|
|
||||||
|
|
@ -32,9 +32,9 @@ public class ClampAmmetersInteractive : MonoBehaviour
|
||||||
{
|
{
|
||||||
GameManager.ins.DianFuIm.gameObject.SetActive(true);
|
GameManager.ins.DianFuIm.gameObject.SetActive(true);
|
||||||
GameManager.ins.temp.transform.parent = g1.transform;
|
GameManager.ins.temp.transform.parent = g1.transform;
|
||||||
GameManager.ins.temp.transform.DOLocalRotate(new Vector3(47.52f,0,53.88f), 0.25f);
|
GameManager.ins.temp.transform.DOLocalRotate(new Vector3(40.35f,186.12f,-142.8f), 0.25f);
|
||||||
GameManager.ins.temp.transform.DOScale(new Vector3(50,50,50), 0.25f);
|
GameManager.ins.temp.transform.DOScale(new Vector3(30,30,30), 0.25f);
|
||||||
GameManager.ins.temp.transform.DOLocalMove(new Vector3(1.42f,-6.02f,8.35f), 0.25f);
|
GameManager.ins.temp.transform.DOLocalMove(new Vector3(0.6f,-5.43f,-7.09f), 0.25f);
|
||||||
GameManager.ins.DianFuTex.text = Fuan +" "+ unit;
|
GameManager.ins.DianFuTex.text = Fuan +" "+ unit;
|
||||||
for (int i = 0; i < floats.Count; i++)
|
for (int i = 0; i < floats.Count; i++)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue