JiNan/VirtualFramework
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into LouDi_Pig

Browse Source
This commit is contained in:
李浩 2025-03-01 12:49:55 +08:00
commit a33bcffedf
9 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Art/UIPrefab/UITipWindow.prefab
View File

@ -652,8 +652,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Left: 20
m_Right: 20
m_Top: 20
m_Bottom: 0
m_ChildAlignment: 1

4
Assets/Scripts/Controller/ScoreController.cs
View File

@ -83,6 +83,10 @@ public class ScoreController : MonoSingleton<ScoreController>
scoreDict[key].value = 0;
}
}
else
{
Debug.LogError("没有找到 评分点：" + key);
}
}

12
Assets/Scripts/TimeScaleController.cs
View File

@ -39,12 +39,12 @@ public class TimeScaleController : MonoBehaviour
}
if (Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl))
{
if (Input.GetKeyDown(KeyCode.Q))
if (Input.GetKeyDown(KeyCode.C))
{
string str = string.Empty;
str = $"{gameObject.transform.position}|{gameObject.transform.eulerAngles}";
#if UNITY_WEBGL
Debug.Log("Ctrl + Q 被按下！");
Debug.Log("Ctrl + Q 被按下！"+str);
CopyToClipboard(str);
#elif UNITY_STANDALONE_WIN && !UNITY_EDITOR
// ʾÀýÊý¾Ý
@ -53,18 +53,14 @@ public class TimeScaleController : MonoBehaviour
#endif
}
#if UNITY_STANDALONE_WIN &&!UNITY_EDITOR
if (Input.GetKeyDown(KeyCode.E))
if (Input.GetKeyDown(KeyCode.V))
{
string tmp = GUIUtility.systemCopyBuffer;
Debug.LogError("当前剪贴板：" + tmp);
Debug.Log("当前剪贴板：" + tmp);
tmp = tmp.Replace("(", "");
Debug.LogError(tmp);
tmp = tmp.Replace(")", "");
Debug.LogError(tmp);
var datas = tmp.Split('|');
Debug.LogError(datas[0]);
Debug.LogError(datas[1]);
gameObject.transform.position = Utility.GetVector3FromStrArray(datas[0]);
gameObject.transform.eulerAngles = Utility.GetVector3FromStrArray(datas[1]);
}

12
Assets/Scripts/Tools/AsposeHelper.cs
View File

@ -5,14 +5,14 @@ using System.IO;
using UnityEngine;
using System.Windows.Forms;
using Newtonsoft.Json.Linq;
using System;
public class AsposeHelper : MonoBehaviour
{
public static void Writer(string json)
public static void Writer(string json, Action<DialogResult> callback = null)
{
Debug.LogError(File.Exists(Global.reportDemoPath));
// 加载Word文档
Document doc = new Document(Global.reportDemoPath);
@ -25,21 +25,23 @@ public class AsposeHelper : MonoBehaviour
doc.Range.Replace($"{{{key}}}", $"{value}", new FindReplaceOptions());
}
// 替换文本
SaveWithDialog(doc);
SaveWithDialog(doc, callback);
//Debug.Log("文档处理完成，新文档已保存到: " + outputFilePath);
}
private static void SaveWithDialog(Document doc)
private static void SaveWithDialog(Document doc, Action<DialogResult> callback)
{
SaveFileDialog dialog = new SaveFileDialog();
dialog.Filter = "Word文档|*.docx";
if (dialog.ShowDialog() == DialogResult.OK)
var result = dialog.ShowDialog();
if (result == DialogResult.OK)
{
doc.Save(dialog.FileName);
}
callback?.Invoke(result);
}
}

9
Assets/Scripts/UI/UICameraSwitch.cs
View File

@ -21,6 +21,7 @@ namespace QFramework.Example
}
public partial class UICameraSwitch : UIPanel
{
bool firstFreeMove = true;
protected override void OnInit(IUIData uiData = null)
{
TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
@ -114,6 +115,14 @@ namespace QFramework.Example
{
Near.isOn = false;
Far.isOn = false;
if (firstFreeMove)
{
UITipWindowData data = new UITipWindowData();
data.txt = "已切换至自由移动视角，点右下角按钮可回到预制视角。";
data.btns.Add(new UITipWindowData.ItemData() { txt = "确定" });
UIKit.OpenPanelAsync<UITipWindow>(canvasLevel: UILevel.PopUI, uiData: data).ToAction().StartGlobal();
firstFreeMove = false;
}
}
}

15
Assets/Scripts/UI/UIInstruction.cs
View File

@ -13,6 +13,7 @@ namespace QFramework.Example
public partial class UIInstruction : UIPanel
{
bool isNo = false;
bool isOperation = false;
protected override void OnInit(IUIData uiData = null)
{
TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
@ -46,8 +47,17 @@ namespace QFramework.Example
});
ConfirmBtn.onClick.AddListener(() =>
{
Hide();
isNo = NoToggle.isOn;
if (isOperation == false)
{
Operation.isOn = true;
isOperation = true;
}
else
{
Hide();
isNo = NoToggle.isOn;
}
});
@ -82,6 +92,7 @@ namespace QFramework.Example
protected override void OnHide()
{
mData = null;
StringEventSystem.Global.Send(this.GetType().Name + "Hide");
}
protected override void OnClose()

7
Assets/Scripts/UI/UIScore.cs
View File

@ -36,7 +36,12 @@ namespace QFramework.Example
});
loader.LoadAsync();
#elif UNITY_STANDALONE_WIN
AsposeHelper.Writer(GetScoreDataJson());
DownLoad.interactable = false;
AsposeHelper.Writer(GetScoreDataJson(), result =>
{
Debug.LogError("111");
DownLoad.interactable = true;
});
#endif

1
Assets/Scripts/UI/UITools.cs
View File

@ -42,6 +42,7 @@ namespace QFramework.Example
protected override void OnOpen(IUIData uiData = null)
{
mData = uiData as UIToolsData ?? new UIToolsData();
TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged).UnRegisterWhenDisabled(gameObject);
if (mData.totalScore > 0)
{

2
Assets/Scripts/Xml/XmlParser.cs
View File

@ -265,7 +265,7 @@ namespace XMLTool
// 解析模块名称
module.type = moduleElement.Element("Type")?.Value;
module.ModuleName = moduleElement.Element("Name")?.Value;
module.Descript = moduleElement.Element("Descript")?.Value;
module.Descript = moduleElement.Element("Descript")?.Value.Trim();
module.Scene = moduleElement.Element("Scene")?.Value;
// 解析设备