Browse Source

场景添加uidsysyem脚本。

修改初始相机位置。
修改罐区信息为start执行要不然绑定不上(执行顺序问题)。
进入场景根据场景类型设置灾情克隆图标是否显示
master
曹衍涛 4 years ago
parent
commit
a26f53bc4a
  1. 101385
      Assets/00Sinopec oil depot/Prefab/SceneAll.prefab
  2. 8
      Assets/Scenes/DongYouLiQing.unity
  3. 11
      Assets/Scripts/Common/Lobby/BackBtn/BackController.cs
  4. 15
      Assets/Scripts/DongYouLiQing/Common/OilTanks/OilTanksManager.cs
  5. 15
      Assets/Scripts/DongYouLiQing/LeadGroup/Setting/DisasterTitle.cs

101385
Assets/00Sinopec oil depot/Prefab/SceneAll.prefab

File diff suppressed because it is too large Load Diff

8
Assets/Scenes/DongYouLiQing.unity

@ -2066,7 +2066,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 654} m_GameObject: {fileID: 654}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.2, y: 3, z: -16} m_LocalPosition: {x: -130.5, y: 3, z: -16}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 7618} - {fileID: 7618}
@ -22269,7 +22269,7 @@ GameObject:
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!114 &143044676 --- !u!114 &143044676
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -22467,7 +22467,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 143044675} m_GameObject: {fileID: 143044675}
m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068}
m_LocalPosition: {x: -77, y: 10.246396, z: -44.5} m_LocalPosition: {x: -77, y: -8.4, z: -44.5}
m_LocalScale: {x: 15.500008, y: 9.330001, z: 15.500006} m_LocalScale: {x: 15.500008, y: 9.330001, z: 15.500006}
m_Children: m_Children:
- {fileID: 1166434511} - {fileID: 1166434511}
@ -157981,7 +157981,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1222156018} m_GameObject: {fileID: 1222156018}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c0919a223bd979e40a8295a4a1a95eed, type: 3} m_Script: {fileID: 11500000, guid: 771a85348a23e884f86378e2d47eb661, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mats: mats:

11
Assets/Scripts/Common/Lobby/BackBtn/BackController.cs

@ -63,9 +63,14 @@ public class BackController : MonoBehaviour
} }
if (haszhihui) if (haszhihui)
{ {
LoadPromptWin.Instance.LoadTextPromptWindow("房间已锁定,不能进行返回操作!", 1f); if (CurrentUserInfo.role!= Role.&&
BackBtns.gameObject.SetActive(false); CurrentUserInfo.role != Role.)
return; {
LoadPromptWin.Instance.LoadTextPromptWindow("房间已锁定,不能进行返回操作!", 1f);
BackBtns.gameObject.SetActive(false);
return;
}
} }
} }

15
Assets/Scripts/DongYouLiQing/Common/OilTanks/OilTanksManager.cs

@ -11,7 +11,7 @@ public class OilTanksManager : MonoBehaviour
public Transform OilTankParent; public Transform OilTankParent;
private ToggleGroup FatherGroup; private ToggleGroup FatherGroup;
private List<OilTankMessage> AllList = new List<OilTankMessage>(); private List<OilTankMessage> AllList = new List<OilTankMessage>();
void Awake() void Start()
{ {
//AllGuanQu = GameObject.Find("GuanQu_normal").transform; //AllGuanQu = GameObject.Find("GuanQu_normal").transform;
//for (int i = 0; i < AllGuanQu.childCount; i++) //for (int i = 0; i < AllGuanQu.childCount; i++)
@ -52,17 +52,14 @@ public class OilTanksManager : MonoBehaviour
DataBind(); DataBind();
} }
void Start()
{
}
private void DataBind() private void DataBind()
{ {
//{ //{
var DataList = from OilFlowManage in AllList where OilFlowManage.MyBaseMessage.TankFieldName.Contains("GuanQu") select OilFlowManage; var DataList = from OilFlowManage in AllList where OilFlowManage.MyBaseMessage.TankFieldName.Contains("GuanQu") select OilFlowManage;
//Debug.Log(DataList.Count());
BindMethord(DataList, "罐区"); //Debug.Log(DataList.Count());
BindMethord(DataList, "罐区");
//} //}
//{ //{
// var DataList = from OilFlowManage in AllList where OilFlowManage.MyBaseMessage.TankFieldName.Contains("QiuGuan") select OilFlowManage; // var DataList = from OilFlowManage in AllList where OilFlowManage.MyBaseMessage.TankFieldName.Contains("QiuGuan") select OilFlowManage;

15
Assets/Scripts/DongYouLiQing/LeadGroup/Setting/DisasterTitle.cs

@ -48,7 +48,20 @@ public class DisasterTitle : MonoBehaviour {
} }
// Use this for initialization // Use this for initialization
void Start () { void Start ()
{
if (GameSettings.othersSettings.SceneType == SceneType.)
{
DisaterContent.transform.Find("FireLiquidLevel").gameObject.SetActive(true);
DisaterContent.transform.Find("FlowLeak").gameObject.SetActive(true);
DisaterContent.transform.Find("SplashLeak").gameObject.SetActive(true);
}
else
{
DisaterContent.transform.Find("FireLiquidLevel").gameObject.SetActive(false);
DisaterContent.transform.Find("FlowLeak").gameObject.SetActive(false);
DisaterContent.transform.Find("SplashLeak").gameObject.SetActive(false);
}
} }

Loading…
Cancel
Save