huangjiayu
/
ShanxiKnowledgeBase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交

This commit is contained in:
yzx 2024-06-04 20:13:51 +08:00
parent 6c96e20746
commit dcbecd6c46
4 changed files with 211 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity
View File

@ -242,6 +242,62 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1771205975173060022}
m_Modifications:
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_DirtyAABB
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.x
value: -0.00000013411045
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.y
value: -0.000000059604645
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.z
value: 0.000002694549
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.x
value: 0.0060756058
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.y
value: 0.013877571
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.z
value: 0.0044264225
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_DirtyAABB
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.x
value: -0.00000013411045
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.y
value: -0.000000059604645
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.z
value: 0.000002694549
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.x
value: 0.0060756058
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.y
value: 0.013877571
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.z
value: 0.0044264225
objectReference: {fileID: 0}
- target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_LocalPosition.x
value: -3.1579
@ -284,7 +340,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7587649942819475418, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_Name
value: "I\u578B\u96C6\u4E2D\u5668 (1)"
value: "\u96C6\u4E2D\u5668"
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@ -990,6 +1046,62 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1771205975173060022}
m_Modifications:
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_DirtyAABB
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.x
value: -0.00000013411045
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.y
value: -0.000000059604645
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.z
value: 0.000002694549
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.x
value: 0.0060756058
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.y
value: 0.013877571
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.z
value: 0.0044264225
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_DirtyAABB
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.x
value: -0.00000013411045
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.y
value: -0.000000059604645
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.z
value: 0.000002694549
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.x
value: 0.0060756058
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.y
value: 0.013877571
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.z
value: 0.0044264225
objectReference: {fileID: 0}
- target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_LocalPosition.x
value: -3.1579
@ -1032,7 +1144,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7587649942819475418, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_Name
value: "I\u578B\u96C6\u4E2D\u5668 (2)"
value: "\u96C6\u4E2D\u5668"
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@ -1808,8 +1920,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 963194225}
serializedVersion: 2
m_LocalRotation: {x: -0.0015304144, y: 0.99706376, z: -0.07372659, w: -0.020641118}
m_LocalPosition: {x: 1.2103322, y: 1.4038103, z: 1.5464077}
m_LocalRotation: {x: -0.07771084, y: 0.8584069, z: -0.13659753, w: -0.48830304}
m_LocalPosition: {x: -1.5510933, y: 1.7070881, z: -0.29013184}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -4367,6 +4479,62 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1771205975173060022}
m_Modifications:
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_DirtyAABB
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.x
value: -0.00000013411045
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.y
value: -0.000000059604645
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.z
value: 0.000002694549
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.x
value: 0.0060756058
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.y
value: 0.013877571
objectReference: {fileID: 0}
- target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.z
value: 0.0044264225
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_DirtyAABB
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.x
value: -0.00000013411045
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.y
value: -0.000000059604645
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Center.z
value: 0.000002694549
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.x
value: 0.0060756058
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.y
value: 0.013877571
objectReference: {fileID: 0}
- target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_AABB.m_Extent.z
value: 0.0044264225
objectReference: {fileID: 0}
- target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_LocalPosition.x
value: -3.1579
@ -4409,7 +4577,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7587649942819475418, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
propertyPath: m_Name
value: "I\u578B\u96C6\u4E2D\u5668"
value: "\u96C6\u4E2D\u5668"
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []

52
SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs
View File

@ -18,22 +18,21 @@ public enum ToolsPackScene
/// <summary>
/// 工具包
/// </summary>
public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
{
private Dictionary<string, GameObject> _toolsPack;
public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
{
private Dictionary<string, List<GameObject>> _toolsPack;
private Dictionary<string, Texture2D> _toolsPackWindowBtImage; //工具窗口下的按钮图集
private List<GameObject> _toolsPackWindowItemBts;//工具窗口下创建的按钮集合,点击按钮的X用来删除和新增
private GameObject _toolsPackWindow;
private List<GameObject> _toolsPackWindowItemBts; //工具窗口下创建的按钮集合,点击按钮的X用来删除和新增
private GameObject _toolsPackWindow;
private GameObject _toolsPackWindowBt;
private Transform _canvas;
private GameObject _toolsPackWindowTemp;
private ToolsPackScene _toolsPackScene;
public void OnCreate(object createParam)
{
_toolsPack = new Dictionary<string, GameObject>();
_toolsPack = new Dictionary<string, List<GameObject>>();
_toolsPackWindowItemBts = new List<GameObject>();
//加载工具窗口按钮
_toolsPackWindowBt = Resources.Load<GameObject>("Prefabs/Window/ToolsPack/ToolsPackWindowItemBt");
@ -76,7 +75,11 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
{
if (!_toolsPack.ContainsKey(toolsName))
{
_toolsPack.Add(toolsName, toolsGame);
_toolsPack.Add(toolsName, new List<GameObject>() { toolsGame });
}
else
{
_toolsPack[toolsName].Add(toolsGame);
}
}
@ -109,15 +112,21 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
/// 根据名字查询工具包内容
/// </summary>
/// <returns></returns>
public (string, GameObject) GetToolsPack(string toolsName)
public GameObject GetToolsPack(string toolsName,int index)
{
GameObject game;
List<GameObject> game;
if (_toolsPack.TryGetValue(toolsName, out game))
{
return (toolsName, game);
for (int i = 0; i < game.Count; i++)
{
if (i == index)
{
return (game[i]);
}
}
}
return (toolsName, null);
return null;
}
public Texture2D GetToolsPackWindowBtImage(string gName)
@ -135,17 +144,17 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
{
return _toolsPackWindow;
}
public GameObject GetToolsPackWindowBt()
{
return _toolsPackWindowBt;
}
public GameObject GetToolsPackWindowTemp()
{
return _toolsPackWindowTemp;
}
public void SetToolsPackWindowTemp(GameObject win)
{
_toolsPackWindowTemp = win;
@ -160,10 +169,12 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
return _canvas;
}
public ToolsPackScene GetToolsPackScene()
{
return _toolsPackScene;
}
public void SetToolsPackScene(ToolsPackScene toolsPackScene)
{
_toolsPackScene = toolsPackScene;
@ -173,14 +184,15 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
{
_toolsPackWindowItemBts.Add(toolGame);
}
public void ClearToolsPackWindowItemBts()
{
_toolsPackWindowItemBts.Clear();
}
public void DeleteToolsPackWindowItemBts(string toolName)
{
List<string> list = MotionEngine.GetModule<DataConfigManager>().GetToolsPackData(toolName);
List<string> list = MotionEngine.GetModule<DataConfigManager>().GetToolsPackData(toolName);
if (list != null)
{
for (int i = 0; i < _toolsPackWindowItemBts.Count; i++)
@ -208,7 +220,5 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
}
}
}
}
}

7
SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs
View File

@ -12,6 +12,7 @@ namespace ToolsPack
[SerializeField] private RawImage ico;
[SerializeField] private GameObject closeBt;
[SerializeField] private string btName;
[SerializeField] private int index;
[SerializeField] private Text btNameText;
@ -19,18 +20,18 @@ namespace ToolsPack
{
closeBt.GetComponent<Button>().onClick.AddListener(delegate
{
(string str, GameObject toolsGame) = MotionEngine.GetModule<ToolsPackManager>().GetToolsPack(btName);
GameObject toolsGame = MotionEngine.GetModule<ToolsPackManager>().GetToolsPack(btName,index);
toolsGame.SetActive(true);
MotionEngine.GetModule<ToolsPackManager>().DeleteToolsPack(btName);
MotionEngine.GetModule<ToolsPackManager>().DeleteToolsPackWindowItemBts(btName);
});
}
public void Init(string gName, string btName)
public void Init(string gName, string btName,int index)
{
btNameText.text = gName;
this.btName = btName;
this.index = index;
ico.texture = MotionEngine.GetModule<ToolsPackManager>().GetToolsPackWindowBtImage(gName);
if (MotionEngine.GetModule<ToolsPackManager>().GetToolsPackScene() == ToolsPackScene.工具间)
{

5
SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowManager.cs
View File

@ -32,11 +32,12 @@ namespace ToolsPack
foreach (var v in _toolsNames)
{
List<string> li = MotionEngine.GetModule<DataConfigManager>().GetToolsPackData(v);
if (li == null)
{
ToolsPackWindowItemBtComponent btComponent = Instantiate(bt, content, false).GetComponent<ToolsPackWindowItemBtComponent>();
btComponent.name = v;
btComponent.Init(v,v);
// btComponent.Init(v,v);
MotionEngine.GetModule<ToolsPackManager>().AddToolsPackWindowItemBts(btComponent.gameObject);
}
else
@ -45,7 +46,7 @@ namespace ToolsPack
{
ToolsPackWindowItemBtComponent btComponent = Instantiate(bt, content, false).GetComponent<ToolsPackWindowItemBtComponent>();
btComponent.name = to;
btComponent.Init(to,v);
// btComponent.Init(to,v);
MotionEngine.GetModule<ToolsPackManager>().AddToolsPackWindowItemBts(btComponent.gameObject);
}
}