CYT
/
FireDrillSystem_GC_QZ
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

去掉指令交互，战斗班去掉4G图传。加载灾情库只加载本单位的灾情

develop
曹衍涛 5 years ago
parent
4e5f06cf21
commit
fe237a965e
7 changed files with 54 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      Assets/Prefabs/DongYouLiQing/BaseCommander/ZhanDouBanPanel.prefab
  2. 8
      Assets/Prefabs/DongYouLiQing/BaseCommander/ZhongDuiPanel.prefab
  3. 8
      Assets/Prefabs/DongYouLiQing/CanMou/CanMouPanel.prefab
  4. 8
      Assets/Prefabs/DongYouLiQing/ZongZhiDa/DaDuiZhiHuiPanel.prefab
  5. 8
      Assets/Prefabs/DongYouLiQing/ZongZhiDa/ZhiDuiZhiHuiPanel.prefab
  6. 8
      Assets/Prefabs/DongYouLiQing/ZongZhiDa/ZongDuiZhiHuiPanel.prefab
  7. 47
      Assets/Scripts/Common/Lobby/MapItem.cs

16
Assets/Prefabs/DongYouLiQing/BaseCommander/ZhanDouBanPanel.prefab
Unescape View File

@ -9258,7 +9258,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &224562594872050860
RectTransform:
m_ObjectHideFlags: 0
@ -9275,9 +9275,9 @@ RectTransform:
m_Father: {fileID: 224435228627855546}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 1035, y: -29}
m_SizeDelta: {x: 145, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222770639843269956
@ -39484,7 +39484,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &224992086110352552
RectTransform:
m_ObjectHideFlags: 0
@ -39501,9 +39501,9 @@ RectTransform:
m_Father: {fileID: 224435228627855546}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 477.57748, y: -29}
m_SizeDelta: {x: 145, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222924531779253026

8
Assets/Prefabs/DongYouLiQing/BaseCommander/ZhongDuiPanel.prefab
Unescape View File

@ -42885,7 +42885,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &224256978615062894
RectTransform:
m_ObjectHideFlags: 0
@ -42902,9 +42902,9 @@ RectTransform:
m_Father: {fileID: 224609257569891380}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 479.08, y: -29}
m_SizeDelta: {x: 166.2, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222470598379439008

8
Assets/Prefabs/DongYouLiQing/CanMou/CanMouPanel.prefab
Unescape View File

@ -15070,7 +15070,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &224815434488241684
RectTransform:
m_ObjectHideFlags: 0
@ -15087,9 +15087,9 @@ RectTransform:
m_Father: {fileID: 224534332134038426}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 270.1, y: -29}
m_SizeDelta: {x: 130, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222447067819411616

8
Assets/Prefabs/DongYouLiQing/ZongZhiDa/DaDuiZhiHuiPanel.prefab
Unescape View File

@ -8962,7 +8962,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &224752964458450756
RectTransform:
m_ObjectHideFlags: 0
@ -8979,9 +8979,9 @@ RectTransform:
m_Father: {fileID: 224247944140956212}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 276.3, y: -29}
m_SizeDelta: {x: 145, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222142722465151634

8
Assets/Prefabs/DongYouLiQing/ZongZhiDa/ZhiDuiZhiHuiPanel.prefab
Unescape View File

@ -19699,7 +19699,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &224647183856904834
RectTransform:
m_ObjectHideFlags: 0
@ -19716,9 +19716,9 @@ RectTransform:
m_Father: {fileID: 224112599686047538}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 281.8, y: -29}
m_SizeDelta: {x: 145, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222377956380912624

8
Assets/Prefabs/DongYouLiQing/ZongZhiDa/ZongDuiZhiHuiPanel.prefab
Unescape View File

@ -11492,7 +11492,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &224060363695072954
RectTransform:
m_ObjectHideFlags: 0
@ -11509,9 +11509,9 @@ RectTransform:
m_Father: {fileID: 224025558114677860}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 283.8, y: -29}
m_SizeDelta: {x: 145, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222046660767150404

47
Assets/Scripts/Common/Lobby/MapItem.cs
Unescape View File

@ -80,29 +80,34 @@ public class MapItem : MonoBehaviour {
{
for (int i = disasterMetaData.Count - 1; i >= 0; i--)
{
GameObject obj = Instantiate(disasterItem, disasterContent.transform) as GameObject;
obj.transform.Find("Toggle").GetComponent<Toggle>().group = disasterContent.GetComponent<ToggleGroup>();
if (File.Exists(Application.streamingAssetsPath + "/DisasterLibrary/" + disasterMetaData[i].Id + ".disaster"))
{
obj.transform.Find("NotLoad").gameObject.SetActive(false);
obj.transform.Find("Button").gameObject.SetActive(false);
obj.GetComponent<DisasterItem>().myPath = Application.streamingAssetsPath + "/DisasterLibrary/" + disasterMetaData[i].Id + ".disaster";
obj.GetComponent<DisasterItem>().mapType = mapType;
obj.GetComponent<DisasterItem>().disasterMetaDataId = disasterMetaData[i].Id;
}
else
//筛选本建筑的灾情库
if (disasterMetaData[i].SceneType=="化工建筑"&&disasterMetaData[i].UnitName=="东油沥青")
{
obj.GetComponent<DisasterItem>().mapType = mapType;
obj.GetComponent<DisasterItem>().fullName = "DisasterLibrary/" + disasterMetaData[i].Id + ".disaster";
obj.GetComponent<DisasterItem>().disasterMetaDataId = disasterMetaData[i].Id;
}
obj.transform.Find("Toggle/Background").GetComponent<Image>().sprite
= Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
GameObject obj = Instantiate(disasterItem, disasterContent.transform) as GameObject;
obj.transform.Find("Toggle").GetComponent<Toggle>().group = disasterContent.GetComponent<ToggleGroup>();
if (File.Exists(Application.streamingAssetsPath + "/DisasterLibrary/" + disasterMetaData[i].Id + ".disaster"))
{
obj.transform.Find("NotLoad").gameObject.SetActive(false);
obj.transform.Find("Button").gameObject.SetActive(false);
obj.GetComponent<DisasterItem>().myPath = Application.streamingAssetsPath + "/DisasterLibrary/" + disasterMetaData[i].Id + ".disaster";
obj.GetComponent<DisasterItem>().mapType = mapType;
obj.GetComponent<DisasterItem>().disasterMetaDataId = disasterMetaData[i].Id;
}
else
{
obj.GetComponent<DisasterItem>().mapType = mapType;
obj.GetComponent<DisasterItem>().fullName = "DisasterLibrary/" + disasterMetaData[i].Id + ".disaster";
obj.GetComponent<DisasterItem>().disasterMetaDataId = disasterMetaData[i].Id;
}
obj.transform.Find("Toggle/Background").GetComponent<Image>().sprite
= Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
obj.transform.Find("Text").GetComponent<Text>().text = "灾情名称：" + disasterMetaData[i].DisasterName;
obj.transform.Find("Text").GetComponent<Text>().text = "灾情名称：" + disasterMetaData[i].DisasterName;
}
}
}

Write Preview
Loading…
Cancel
Save