yulong
/
NewN_UAVPlane
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: yulong:6b854ffbe4de7d708ecb5b47c8bda34d77d517f3
Branches Tags
yulong:master
...
compare: yulong:1a8a7de71889989098a28c83c817e1c5f4d2dac8
Branches Tags
yulong:master

2 Commits
6b854ffbe4 ... 1a8a7de718

Author SHA1 Message Date
账号名 1a8a7de718 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-22 15:06:55 +08:00
账号名 b3ad76c664 1 2024-01-22 15:06:47 +08:00
2 changed files with 20 additions and 19 deletions
Show Stats Expand all files Collapse all files

36
Assets/Resources/UIPanel/View_Panel2.prefab
View File

@ -35,9 +35,9 @@ RectTransform:
m_Father: {fileID: 7392146754304400180}
m_RootOrder: 0
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: 146.5, y: -23.57019}
m_SizeDelta: {x: 257.1306, y: 47.14038}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &75562428
@ -3313,7 +3313,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0.000015258789}
m_SizeDelta: {x: 466, y: 0}
m_SizeDelta: {x: 466, y: 40}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &4190038651164879950
CanvasRenderer:
@ -6089,9 +6089,9 @@ RectTransform:
m_Father: {fileID: 310255569351066625}
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: 467.59424, y: -20.5}
m_SizeDelta: {x: 138, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4190038651655802450
@ -10509,9 +10509,9 @@ RectTransform:
m_Father: {fileID: 310255569351066625}
m_RootOrder: 0
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: 155.86475, y: -20.5}
m_SizeDelta: {x: 138, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4190038652554789178
@ -11585,9 +11585,9 @@ RectTransform:
m_Father: {fileID: 4190038651164879948}
m_RootOrder: 0
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: 233, y: -20}
m_SizeDelta: {x: 464, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4190038652731363784
@ -13581,7 +13581,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 47.14038}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &3376152895897855733
MonoBehaviour:
@ -14282,9 +14282,9 @@ RectTransform:
m_Father: {fileID: 4918790080607414966}
m_RootOrder: 0
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: 233, y: -20}
m_SizeDelta: {x: 464, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1529645506382856278
@ -14695,7 +14695,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0.000015258789}
m_SizeDelta: {x: 466, y: 0}
m_SizeDelta: {x: 466, y: 40}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &2371850406196654679
CanvasRenderer:

3
Assets/Temp/Scripts/Mastermanagement.cs
View File

@ -19,7 +19,7 @@ public class Mastermanagement : MonoBehaviour
private IEnumerator WaitGetAllDevice()
{
yield return new WaitForSeconds(0.01f);
yield return new WaitForSeconds(0.1f);
weapongames = DeviceManager.Instance.GetPlayerDecive1();
if (weapongames != null)
{
@ -43,6 +43,7 @@ public class Mastermanagement : MonoBehaviour
if (dragControllers[i].gameObject.name == game.name)
{
dragControllers[i].gameObject.SetActive(false);
break;
}
}
}