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

修改一些问题

This commit is contained in:
YangHua 2024-03-13 16:23:56 +08:00
parent 9b90252c37
commit 1f4d4a7c1a
9 changed files with 1485 additions and 348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
Assets/3rdParty/AVProVideo/Demos/Scripts/VCR.cs vendored
View File

@ -1,5 +1,5 @@
#if UNITY_4_6 || UNITY_4_7 || UNITY_4_8 || UNITY_5 || UNITY_5_4_OR_NEWER #if UNITY_4_6 || UNITY_4_7 || UNITY_4_8 || UNITY_5 || UNITY_5_4_OR_NEWER
#define UNITY_FEATURE_UGUI #define UNITY_FEATURE_UGUI
#endif #endif
using UnityEngine; using UnityEngine;
@ -48,6 +48,8 @@ namespace RenderHeads.Media.AVProVideo.Demos
private MediaPlayer _loadingPlayer; private MediaPlayer _loadingPlayer;
public MediaPlayer PlayingPlayer public MediaPlayer PlayingPlayer
{ {
get get
@ -89,6 +91,7 @@ namespace RenderHeads.Media.AVProVideo.Demos
public void OnOpenVideoFile() public void OnOpenVideoFile()
{ {
Debug.Log(System.IO.Path.Combine(_folder, _videoFiles[_VideoIndex]));
LoadingPlayer.m_VideoPath = System.IO.Path.Combine(_folder, _videoFiles[_VideoIndex]); LoadingPlayer.m_VideoPath = System.IO.Path.Combine(_folder, _videoFiles[_VideoIndex]);
_VideoIndex = (_VideoIndex + 1) % (_videoFiles.Length); _VideoIndex = (_VideoIndex + 1) % (_videoFiles.Length);
if (string.IsNullOrEmpty(LoadingPlayer.m_VideoPath)) if (string.IsNullOrEmpty(LoadingPlayer.m_VideoPath))
@ -99,8 +102,8 @@ namespace RenderHeads.Media.AVProVideo.Demos
else else
{ {
LoadingPlayer.OpenVideoFromFile(_location, LoadingPlayer.m_VideoPath, _AutoStartToggle.isOn); LoadingPlayer.OpenVideoFromFile(_location, LoadingPlayer.m_VideoPath, _AutoStartToggle.isOn);
// SetButtonEnabled( "PlayButton", !_mediaPlayer.m_AutoStart ); // SetButtonEnabled( "PlayButton", !_mediaPlayer.m_AutoStart );
// SetButtonEnabled( "PauseButton", _mediaPlayer.m_AutoStart ); // SetButtonEnabled( "PauseButton", _mediaPlayer.m_AutoStart );
} }
if (_bufferedSliderRect != null) if (_bufferedSliderRect != null)
@ -111,9 +114,9 @@ namespace RenderHeads.Media.AVProVideo.Demos
public void OnAutoStartChange() public void OnAutoStartChange()
{ {
if(PlayingPlayer && if (PlayingPlayer &&
_AutoStartToggle && _AutoStartToggle.enabled && _AutoStartToggle && _AutoStartToggle.enabled &&
PlayingPlayer.m_AutoStart != _AutoStartToggle.isOn ) PlayingPlayer.m_AutoStart != _AutoStartToggle.isOn)
{ {
PlayingPlayer.m_AutoStart = _AutoStartToggle.isOn; PlayingPlayer.m_AutoStart = _AutoStartToggle.isOn;
} }
@ -139,20 +142,20 @@ namespace RenderHeads.Media.AVProVideo.Demos
public void OnPlayButton() public void OnPlayButton()
{ {
if(PlayingPlayer) if (PlayingPlayer)
{ {
PlayingPlayer.Control.Play(); PlayingPlayer.Control.Play();
// SetButtonEnabled( "PlayButton", false ); // SetButtonEnabled( "PlayButton", false );
// SetButtonEnabled( "PauseButton", true ); // SetButtonEnabled( "PauseButton", true );
} }
} }
public void OnPauseButton() public void OnPauseButton()
{ {
if(PlayingPlayer) if (PlayingPlayer)
{ {
PlayingPlayer.Control.Pause(); PlayingPlayer.Control.Pause();
// SetButtonEnabled( "PauseButton", false ); // SetButtonEnabled( "PauseButton", false );
// SetButtonEnabled( "PlayButton", true ); // SetButtonEnabled( "PlayButton", true );
} }
} }
@ -166,27 +169,27 @@ namespace RenderHeads.Media.AVProVideo.Demos
public void OnVideoSliderDown() public void OnVideoSliderDown()
{ {
if(PlayingPlayer) if (PlayingPlayer)
{ {
_wasPlayingOnScrub = PlayingPlayer.Control.IsPlaying(); _wasPlayingOnScrub = PlayingPlayer.Control.IsPlaying();
if( _wasPlayingOnScrub ) if (_wasPlayingOnScrub)
{ {
PlayingPlayer.Control.Pause(); PlayingPlayer.Control.Pause();
// SetButtonEnabled( "PauseButton", false ); // SetButtonEnabled( "PauseButton", false );
// SetButtonEnabled( "PlayButton", true ); // SetButtonEnabled( "PlayButton", true );
} }
OnVideoSeekSlider(); OnVideoSeekSlider();
} }
} }
public void OnVideoSliderUp() public void OnVideoSliderUp()
{ {
if(PlayingPlayer && _wasPlayingOnScrub ) if (PlayingPlayer && _wasPlayingOnScrub)
{ {
PlayingPlayer.Control.Play(); PlayingPlayer.Control.Play();
_wasPlayingOnScrub = false; _wasPlayingOnScrub = false;
// SetButtonEnabled( "PlayButton", false ); // SetButtonEnabled( "PlayButton", false );
// SetButtonEnabled( "PauseButton", true ); // SetButtonEnabled( "PauseButton", true );
} }
} }
@ -222,12 +225,28 @@ namespace RenderHeads.Media.AVProVideo.Demos
public void OnRewindButton() public void OnRewindButton()
{ {
if(PlayingPlayer) if (PlayingPlayer)
{ {
PlayingPlayer.Control.Rewind(); PlayingPlayer.Control.Rewind();
} }
} }
public Button multiplyPlaybackBtn;
public Button[] multiplyButtons;
public GameObject multiplyTogglesParents;
public bool isMultiplyOn = false;
public void ResetPlayState()
{
isMultiplyOn = false;
multiplyTogglesParents.SetActive(false);
multiplyPlaybackBtn.transform.GetChild(0).GetComponent<Text>().text = "×1";
}
/// <summary>
/// 倍数播放
/// </summary>
private void Awake() private void Awake()
{ {
_loadingPlayer = _mediaPlayerB; _loadingPlayer = _mediaPlayerB;
@ -235,7 +254,28 @@ namespace RenderHeads.Media.AVProVideo.Demos
void Start() void Start()
{ {
if(PlayingPlayer) multiplyPlaybackBtn.onClick.AddListener(() =>
{
isMultiplyOn = !isMultiplyOn;
multiplyTogglesParents.SetActive(isMultiplyOn);
});
for (int i = 0; i < multiplyButtons.Length; i++)
{
int index = i;
multiplyButtons[index].onClick.AddListener(() =>
{
multiplyPlaybackBtn.transform.GetChild(0).GetComponent<Text>().text = "×" + multiplyButtons[index].name;
float temp = float.Parse(multiplyButtons[index].name);
if (PlayingPlayer)
PlayingPlayer.Control.SetPlaybackRate(temp);
isMultiplyOn = false;
multiplyTogglesParents.SetActive(false);
});
}
ResetPlayState();
if (PlayingPlayer)
{ {
PlayingPlayer.Events.AddListener(OnVideoEvent); PlayingPlayer.Events.AddListener(OnVideoEvent);
@ -244,7 +284,7 @@ namespace RenderHeads.Media.AVProVideo.Demos
LoadingPlayer.Events.AddListener(OnVideoEvent); LoadingPlayer.Events.AddListener(OnVideoEvent);
} }
if ( _audioVolumeSlider ) if (_audioVolumeSlider)
{ {
// Volume // Volume
if (PlayingPlayer.Control != null) if (PlayingPlayer.Control != null)
@ -258,21 +298,21 @@ namespace RenderHeads.Media.AVProVideo.Demos
// Auto start toggle // Auto start toggle
_AutoStartToggle.isOn = PlayingPlayer.m_AutoStart; _AutoStartToggle.isOn = PlayingPlayer.m_AutoStart;
if(PlayingPlayer.m_AutoOpen ) if (PlayingPlayer.m_AutoOpen)
{ {
// RemoveOpenVideoButton(); // RemoveOpenVideoButton();
// SetButtonEnabled( "PlayButton", !_mediaPlayer.m_AutoStart ); // SetButtonEnabled( "PlayButton", !_mediaPlayer.m_AutoStart );
// SetButtonEnabled( "PauseButton", _mediaPlayer.m_AutoStart ); // SetButtonEnabled( "PauseButton", _mediaPlayer.m_AutoStart );
} }
else else
{ {
// SetButtonEnabled( "PlayButton", false ); // SetButtonEnabled( "PlayButton", false );
// SetButtonEnabled( "PauseButton", false ); // SetButtonEnabled( "PauseButton", false );
} }
// SetButtonEnabled( "MuteButton", !_mediaPlayer.m_Muted ); // SetButtonEnabled( "MuteButton", !_mediaPlayer.m_Muted );
// SetButtonEnabled( "UnmuteButton", _mediaPlayer.m_Muted ); // SetButtonEnabled( "UnmuteButton", _mediaPlayer.m_Muted );
OnOpenVideoFile(); OnOpenVideoFile();
} }
@ -344,37 +384,37 @@ namespace RenderHeads.Media.AVProVideo.Demos
Debug.Log("Event: " + et.ToString()); Debug.Log("Event: " + et.ToString());
} }
// private void SetButtonEnabled( string objectName, bool bEnabled ) // private void SetButtonEnabled( string objectName, bool bEnabled )
// { // {
// Button button = GameObject.Find( objectName ).GetComponent<Button>(); // Button button = GameObject.Find( objectName ).GetComponent<Button>();
// if( button ) // if( button )
// { // {
// button.enabled = bEnabled; // button.enabled = bEnabled;
// button.GetComponentInChildren<CanvasRenderer>().SetAlpha( bEnabled ? 1.0f : 0.4f ); // button.GetComponentInChildren<CanvasRenderer>().SetAlpha( bEnabled ? 1.0f : 0.4f );
// button.GetComponentInChildren<Text>().color = Color.clear; // button.GetComponentInChildren<Text>().color = Color.clear;
// } // }
// } // }
// private void RemoveOpenVideoButton() // private void RemoveOpenVideoButton()
// { // {
// Button openVideoButton = GameObject.Find( "OpenVideoButton" ).GetComponent<Button>(); // Button openVideoButton = GameObject.Find( "OpenVideoButton" ).GetComponent<Button>();
// if( openVideoButton ) // if( openVideoButton )
// { // {
// openVideoButton.enabled = false; // openVideoButton.enabled = false;
// openVideoButton.GetComponentInChildren<CanvasRenderer>().SetAlpha( 0.0f ); // openVideoButton.GetComponentInChildren<CanvasRenderer>().SetAlpha( 0.0f );
// openVideoButton.GetComponentInChildren<Text>().color = Color.clear; // openVideoButton.GetComponentInChildren<Text>().color = Color.clear;
// } // }
// //
// if( _AutoStartToggle ) // if( _AutoStartToggle )
// { // {
// _AutoStartToggle.enabled = false; // _AutoStartToggle.enabled = false;
// _AutoStartToggle.isOn = false; // _AutoStartToggle.isOn = false;
// _AutoStartToggle.GetComponentInChildren<CanvasRenderer>().SetAlpha( 0.0f ); // _AutoStartToggle.GetComponentInChildren<CanvasRenderer>().SetAlpha( 0.0f );
// _AutoStartToggle.GetComponentInChildren<Text>().color = Color.clear; // _AutoStartToggle.GetComponentInChildren<Text>().color = Color.clear;
// _AutoStartToggle.GetComponentInChildren<Image>().enabled = false; // _AutoStartToggle.GetComponentInChildren<Image>().enabled = false;
// _AutoStartToggle.GetComponentInChildren<Image>().color = Color.clear; // _AutoStartToggle.GetComponentInChildren<Image>().color = Color.clear;
// } // }
// } // }
} }
} }
#endif #endif

9
Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab
View File

@ -79,7 +79,7 @@ TextMesh:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 114525537} m_GameObject: {fileID: 114525537}
m_Text: m_Text: "\u7535\u5B50\u4FA6\u5BDF\u65E0\u4EBA\u673A"
m_OffsetZ: 0 m_OffsetZ: 0
m_CharacterSize: 1 m_CharacterSize: 1
m_LineSpacing: 1 m_LineSpacing: 1
@ -142,7 +142,7 @@ MonoBehaviour:
isEnableVertical: 1 isEnableVertical: 1
isEnableLerp: 0 isEnableLerp: 0
lerpTime: 1 lerpTime: 1
_distance: 10 _distance: 6
--- !u!1 &1868832759 --- !u!1 &1868832759
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -768,6 +768,11 @@ MonoBehaviour:
SurveillanceFrequencyBand: {fileID: 6513129680526216908} SurveillanceFrequencyBand: {fileID: 6513129680526216908}
gamePos: {fileID: 392167392884716949} gamePos: {fileID: 392167392884716949}
gamemap: {fileID: 6311100753636855780} gamemap: {fileID: 6311100753636855780}
reveal: 0
Ground:
serializedVersion: 2
m_Bits: 0
boisp: 1
attackColliders1: [] attackColliders1: []
currentCollider: {fileID: 0} currentCollider: {fileID: 0}
layerMask: layerMask:

1104
Assets/Resources/Prefabs/DoublePlay.prefab
View File

File diff suppressed because it is too large Load Diff

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

@ -12,6 +12,7 @@ public class Main_interface_Panel : XUIPanel
public Button train; public Button train;
public Button replay; public Button replay;
public Button appQuet; public Button appQuet;
public Text accountName;
public Main_interface_Panel() : base(UIType.Fixed, UIMode.None, UICollider.None) public Main_interface_Panel() : base(UIType.Fixed, UIMode.None, UICollider.None)
{ {
uiPath = "UIPanel/Main_interface_Panel"; uiPath = "UIPanel/Main_interface_Panel";
@ -34,6 +35,8 @@ public class Main_interface_Panel : XUIPanel
appQuet.onClick.AddListener(() => { Application.Quit(); appQuet.onClick.AddListener(() => { Application.Quit();
//Debug.Log("退出"); //Debug.Log("退出");
}); });
accountName = this.transform.Find("UPBG/avatar_btn/Text").GetComponent<Text>();
accountName.text = GlobalFlag.currentUser.login_name;
} }
/// <summary> /// <summary>

9
Assets/Temp/Scripts/Scenariopage.cs
View File

@ -369,10 +369,10 @@ public class Scenariopage : MonoBehaviour
caodi = GameObject.Find("Background"); caodi = GameObject.Find("Background");
//调用接口 //调用接口
Debug.Log("Url_Action..:" + Url_Action); //Debug.Log("Url_Action..:" + Url_Action);
StartCoroutine(Post1(Url_Action, (bol, str) => StartCoroutine(Post1(Url_Action, (bol, str) =>
{ {
Debug.Log(str); //Debug.Log(str);
Scenario(bol, str); Scenario(bol, str);
})); }));
Scenario();//想定文件 Scenario();//想定文件
@ -382,7 +382,8 @@ public class Scenariopage : MonoBehaviour
send_back_btn.onClick.AddListener(() => send_back_btn.onClick.AddListener(() =>
{ {
GameMain.tiao = false; GameMain.tiao = false;
SceneManager.LoadScene("SampleScene"); SceneLoad.Instance.SceneChange("SampleScene");
//SceneManager.LoadScene("SampleScene");
}); });
//SetLightValue(1f); //SetLightValue(1f);
queding.onClick.AddListener(() => queding.onClick.AddListener(() =>
@ -1558,7 +1559,7 @@ public class Scenariopage : MonoBehaviour
{ {
if (bol) if (bol)
{ {
Debug.LogError(str); //Debug.LogError(str);
scen = JsonMapper.ToObject<Editinformation>(str);//解析最外层的想定名称json文件 scen = JsonMapper.ToObject<Editinformation>(str);//解析最外层的想定名称json文件
for (int i = 0; i < scen.data.Count; i++) for (int i = 0; i < scen.data.Count; i++)
{ {

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

@ -38,9 +38,10 @@ public class Taskpanel : MonoBehaviour
public Button fanhuiBtn; public Button fanhuiBtn;
public Button fanhui; public Button fanhui;
private bool isp = true; private bool isp = true;
void Start() void Start()
{ {
this.transform.Find("UPBG/avatar_botn/Text").GetComponent<Text>().text = GlobalFlag.currentUser.login_name;
fanhui.onClick.AddListener(() => fanhui.onClick.AddListener(() =>
{ {
GameMain.tiao = false; GameMain.tiao = false;

9
Assets/Temp/Scripts/View_Panel2.cs
View File

@ -49,7 +49,6 @@ public class View_Panel2 : XUIPanel
public List<string> rootlist = new List<string>();//存入房间的名字 public List<string> rootlist = new List<string>();//存入房间的名字
public List<Button> buttonlist = new List<Button>();//克隆出来房间按钮 public List<Button> buttonlist = new List<Button>();//克隆出来房间按钮
//public string roomUrl = Url_RoomList; //public string roomUrl = Url_RoomList;
//public string userUrl = Url_StudentList; //public string userUrl = Url_StudentList;
public RoomData roomdata = new RoomData(); public RoomData roomdata = new RoomData();
@ -365,11 +364,11 @@ public class View_Panel2 : XUIPanel
/// <summary> /// <summary>
/// 取消分配 /// 取消分配
/// </summary> /// </summary>
public void DeleteAssignedAccount(string subjectID,string seatID) public void DeleteAssignedAccount(string subjectID, string seatID)
{ {
for (int i = 0; i < currentEditorAccounts.Count; i++) for (int i = 0; i < currentEditorAccounts.Count; i++)
{ {
if(currentEditorAccounts[i].subjectID.Equals(subjectID)&& currentEditorAccounts[i].SeatID.Equals(seatID)) if (currentEditorAccounts[i].subjectID.Equals(subjectID) && currentEditorAccounts[i].SeatID.Equals(seatID))
{ {
currentEditorAccounts.Remove(currentEditorAccounts[i]); currentEditorAccounts.Remove(currentEditorAccounts[i]);
} }
@ -555,7 +554,8 @@ public class View_Panel2 : XUIPanel
///想定编辑 ///想定编辑
scenario_btn.onClick.AddListener(() => scenario_btn.onClick.AddListener(() =>
{ {
SceneManager.LoadScene("Contingenc_yediting_panl"); SceneLoad.Instance.SceneChange("Contingenc_yediting_panl");
//SceneManager.LoadScene("Contingenc_yediting_panl");
}); });
} }
@ -860,6 +860,7 @@ public class View_Panel2 : XUIPanel
CreateRoomBase(returnRoomId.data, currentRoomName); CreateRoomBase(returnRoomId.data, currentRoomName);
refresh_btn.onClick?.Invoke(); refresh_btn.onClick?.Invoke();
} }
currentEditorAccounts.Clear();
string RoomName = "createroom " + returnRoomId.data; string RoomName = "createroom " + returnRoomId.data;
_ = AdamSync.SyncCreateRoom.SendMessageAsync(RoomName); _ = AdamSync.SyncCreateRoom.SendMessageAsync(RoomName);
} }

BIN
Assets/Zion/Scenes/Contingenc_yediting_panl.unity
View File

Binary file not shown.

4
Assets/Zion/Scripts/Adam/Components/Face2Camera.cs
View File

@ -46,8 +46,8 @@ public class Face2Camera : MonoBehaviour
float distance = Vector3.Distance(Camera.main.transform.position, transform.position);//不断变化的距离 float distance = Vector3.Distance(Camera.main.transform.position, transform.position);//不断变化的距离
float scale = distance / _distance; float scale = distance / _distance;
if (scale > 10f) if (scale > 3f)
scale = 10f; scale = 3f;
transform.localScale = initScale * scale; transform.localScale = initScale * scale;
} }