Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition
This commit is contained in:
commit
09762597b9
|
|
@ -9424,8 +9424,8 @@ BoxCollider:
|
|||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 0.005161286, y: 0.0018310574, z: 0.005163432}
|
||||
m_Center: {x: 0.0000019071158, y: 0.0009155273, z: -0.00000011955854}
|
||||
m_Size: {x: 0.005161286, y: 0.0053709717, z: 0.005163432}
|
||||
m_Center: {x: 0.0000019068073, y: 0.0026854845, z: -0.00000011960203}
|
||||
--- !u!1 &392085716
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -22524,20 +22524,10 @@ MonoBehaviour:
|
|||
returnButton: {fileID: 635778594}
|
||||
originalPosition: {x: 0, y: 0, z: 0}
|
||||
originalRotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
- toolObject: {fileID: 274807175}
|
||||
returnButton: {fileID: 108426143}
|
||||
originalPosition: {x: 0, y: 0, z: 0}
|
||||
originalRotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
- toolObject: {fileID: 1498050634}
|
||||
returnButton: {fileID: 478745220}
|
||||
originalPosition: {x: 0, y: 0, z: 0}
|
||||
originalRotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
onladderTools:
|
||||
- {fileID: 945637454}
|
||||
- {fileID: 724345513}
|
||||
- {fileID: 798421952}
|
||||
- {fileID: 274807175}
|
||||
- {fileID: 1498050634}
|
||||
PlayercameraTrans: {fileID: 1035373398}
|
||||
Fieldobservation: {fileID: 616989521}
|
||||
--- !u!4 &1039753534
|
||||
|
|
@ -23204,8 +23194,8 @@ BoxCollider:
|
|||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 0.005161286, y: 0.0018310574, z: 0.005163432}
|
||||
m_Center: {x: 0.0000019071158, y: 0.0009155273, z: -0.00000011955854}
|
||||
m_Size: {x: 0.005161286, y: 0.005798218, z: 0.005163432}
|
||||
m_Center: {x: 0.0000019067827, y: 0.0028991075, z: -0.00000011961477}
|
||||
--- !u!1 &1074012515
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -3739,8 +3739,8 @@ BoxCollider:
|
|||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 0.005161286, y: 0.0018310574, z: 0.005163432}
|
||||
m_Center: {x: 0.0000019071158, y: 0.0009155273, z: -0.00000011955854}
|
||||
m_Size: {x: 0.005161286, y: 0.0092161875, z: 0.005163432}
|
||||
m_Center: {x: 0.0000019065862, y: 0.004608092, z: -0.00000011971663}
|
||||
--- !u!4 &177045583 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8378556726591945539, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
|
||||
|
|
@ -5387,8 +5387,8 @@ BoxCollider:
|
|||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 0.005161286, y: 0.0018310574, z: 0.005163432}
|
||||
m_Center: {x: 0.0000019071158, y: 0.0009155273, z: -0.00000011955854}
|
||||
m_Size: {x: 0.005161286, y: 0.009460328, z: 0.005163432}
|
||||
m_Center: {x: 0.0000019065723, y: 0.004730162, z: -0.00000011972391}
|
||||
--- !u!1 &286447742
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -28283,20 +28283,10 @@ MonoBehaviour:
|
|||
returnButton: {fileID: 1869768458}
|
||||
originalPosition: {x: 0, y: 0, z: 0}
|
||||
originalRotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
- toolObject: {fileID: 1485260145}
|
||||
returnButton: {fileID: 156402808}
|
||||
originalPosition: {x: 0, y: 0, z: 0}
|
||||
originalRotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
- toolObject: {fileID: 2018635915}
|
||||
returnButton: {fileID: 587729411}
|
||||
originalPosition: {x: 0, y: 0, z: 0}
|
||||
originalRotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
onladderTools:
|
||||
- {fileID: 4441233656616589336}
|
||||
- {fileID: 1112936940}
|
||||
- {fileID: 588400109}
|
||||
- {fileID: 1485260145}
|
||||
- {fileID: 2018635915}
|
||||
PlayercameraTrans: {fileID: 6121626523118833240}
|
||||
Fieldobservation: {fileID: 6121626523908351180}
|
||||
--- !u!114 &1505150134
|
||||
|
|
|
|||
|
|
@ -116,54 +116,54 @@ public class ToolManager : MonoBehaviour
|
|||
}
|
||||
}
|
||||
}
|
||||
public void HandleStringEvent(string message)
|
||||
{
|
||||
if (generateAreaScript.IsPlayerInArea())
|
||||
{
|
||||
if (message == "炅綾")
|
||||
{
|
||||
Tool[0].gameObject.SetActive(true);
|
||||
Ladder.instance.Init();
|
||||
}
|
||||
if (message == "묏鱗聯")
|
||||
{
|
||||
Tool[1].gameObject.SetActive(true);
|
||||
}
|
||||
if (message == "괆窟풂")
|
||||
{
|
||||
Tool[2].gameObject.SetActive(true);
|
||||
RetractBtn[0].gameObject.SetActive(true);
|
||||
}
|
||||
if (message == "駱든궝")
|
||||
{
|
||||
Tool[3].gameObject.SetActive(true);
|
||||
RetractBtn[1].gameObject.SetActive(true);
|
||||
}
|
||||
if (message == "쭁介독")
|
||||
{
|
||||
Tool[4].gameObject.SetActive(true);
|
||||
RetractBtn[2].gameObject.SetActive(true);
|
||||
}
|
||||
if (message == "없鍍스던")
|
||||
{
|
||||
Tool[5].gameObject.SetActive(true);
|
||||
RetractBtn[3].gameObject.SetActive(true);
|
||||
}
|
||||
//public void HandleStringEvent(string message)
|
||||
//{
|
||||
// if (generateAreaScript.IsPlayerInArea())
|
||||
// {
|
||||
// if (message == "炅綾")
|
||||
// {
|
||||
// Tool[0].gameObject.SetActive(true);
|
||||
// Ladder.instance.Init();
|
||||
// }
|
||||
// if (message == "묏鱗聯")
|
||||
// {
|
||||
// Tool[1].gameObject.SetActive(true);
|
||||
// }
|
||||
// if (message == "괆窟풂")
|
||||
// {
|
||||
// Tool[2].gameObject.SetActive(true);
|
||||
// RetractBtn[0].gameObject.SetActive(true);
|
||||
// }
|
||||
// if (message == "駱든궝")
|
||||
// {
|
||||
// Tool[3].gameObject.SetActive(true);
|
||||
// RetractBtn[1].gameObject.SetActive(true);
|
||||
// }
|
||||
// if (message == "쭁介독")
|
||||
// {
|
||||
// Tool[4].gameObject.SetActive(true);
|
||||
// RetractBtn[2].gameObject.SetActive(true);
|
||||
// }
|
||||
// if (message == "없鍍스던")
|
||||
// {
|
||||
// Tool[5].gameObject.SetActive(true);
|
||||
// RetractBtn[3].gameObject.SetActive(true);
|
||||
// }
|
||||
|
||||
if (message == "l謹섞櫓포")
|
||||
{
|
||||
Tool[6].gameObject.SetActive(true);
|
||||
RetractBtn[4].gameObject.SetActive(true);
|
||||
}
|
||||
if (message == "분陋룐丹")
|
||||
{
|
||||
Tool[7].gameObject.SetActive(true);
|
||||
RetractBtn[5].gameObject.SetActive(true);
|
||||
}
|
||||
// if (message == "l謹섞櫓포")
|
||||
// {
|
||||
// Tool[6].gameObject.SetActive(true);
|
||||
// RetractBtn[4].gameObject.SetActive(true);
|
||||
// }
|
||||
// if (message == "분陋룐丹")
|
||||
// {
|
||||
// Tool[7].gameObject.SetActive(true);
|
||||
// RetractBtn[5].gameObject.SetActive(true);
|
||||
// }
|
||||
|
||||
Debug.Log("Received message: " + message);
|
||||
}
|
||||
}
|
||||
// Debug.Log("Received message: " + message);
|
||||
// }
|
||||
//}
|
||||
public void HandleStringEvents(string message)
|
||||
{
|
||||
if (generateAreaScript.IsPlayerInArea())
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ public class TooslManager : MonoBehaviour
|
|||
/// <summary>
|
||||
/// 在梯子上使用的工具
|
||||
/// </summary>
|
||||
public GameObject[] onladderTools;
|
||||
// public GameObject[] onladderTools;
|
||||
|
||||
public Transform PlayercameraTrans;
|
||||
|
||||
|
|
@ -100,11 +100,11 @@ public class TooslManager : MonoBehaviour
|
|||
// tool.SetActive(true);
|
||||
// }
|
||||
//}
|
||||
void ToggleTools(bool activate)
|
||||
{
|
||||
foreach (GameObject tool in onladderTools)
|
||||
{
|
||||
tool.SetActive(activate);
|
||||
}
|
||||
}
|
||||
//void ToggleTools(bool activate)
|
||||
//{
|
||||
// foreach (GameObject tool in onladderTools)
|
||||
// {
|
||||
// tool.SetActive(activate);
|
||||
// }
|
||||
//}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue