diff --git a/SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj b/SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj
index 950aaa92..43f3a127 100644
--- a/SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj
+++ b/SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj
@@ -45,7 +45,14 @@
+
+
+
+
+
+
+
E:\Program Files\Unity 2022.3.22f1\Editor\Data\Managed\UnityEngine\UnityEngine.dll
diff --git a/SXElectricityInformationAcquisition/Assembly-CSharp.csproj b/SXElectricityInformationAcquisition/Assembly-CSharp.csproj
index 2e400400..737bb167 100644
--- a/SXElectricityInformationAcquisition/Assembly-CSharp.csproj
+++ b/SXElectricityInformationAcquisition/Assembly-CSharp.csproj
@@ -67,8 +67,10 @@
+
+
@@ -89,9 +91,11 @@
+
+
E:\Program Files\Unity 2022.3.22f1\Editor\Data\Managed\UnityEngine\UnityEngine.dll
diff --git a/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs b/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs
index 6b90be89..acfb96e4 100644
--- a/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs
+++ b/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs
@@ -64,6 +64,8 @@ public class GameLauncher : MonoBehaviour
MotionEngine.CreateModule();
//人物装备
MotionEngine.CreateModule();
+ //数据配置文件
+ MotionEngine.CreateModule();
}
private void HandleMotionFrameworkLog(ELogLevel logLevel, string log)
diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/宸ュ叿闂碨cenes/宸ュ叿闂.unity b/SXElectricityInformationAcquisition/Assets/Scenes/宸ュ叿闂碨cenes/宸ュ叿闂.unity
index 86e62b8c..6da47071 100644
--- a/SXElectricityInformationAcquisition/Assets/Scenes/宸ュ叿闂碨cenes/宸ュ叿闂.unity
+++ b/SXElectricityInformationAcquisition/Assets/Scenes/宸ュ叿闂碨cenes/宸ュ叿闂.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994}
- m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
+ m_IndirectSpecularColor: {r: 0.1802841, g: 0.22571436, b: 0.30692357, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -294,7 +294,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &246443825
RectTransform:
m_ObjectHideFlags: 0
@@ -2817,37 +2817,16 @@ GameObject:
- component: {fileID: 2108215486}
- component: {fileID: 2108215485}
- component: {fileID: 2108215484}
- - component: {fileID: 2108215483}
+ - component: {fileID: 2108215489}
- component: {fileID: 2108215488}
- component: {fileID: 2108215487}
m_Layer: 0
- m_Name: "\u4E07\u7528\u8868"
+ m_Name: "\u96C6\u4E2D\u5668"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!65 &2108215483
-BoxCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2108215482}
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_IsTrigger: 0
- m_ProvidesContacts: 0
- m_Enabled: 1
- serializedVersion: 3
- m_Size: {x: 1, y: 1, z: 1}
- m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &2108215484
MeshRenderer:
m_ObjectHideFlags: 0
@@ -2907,7 +2886,7 @@ Transform:
m_GameObject: {fileID: 2108215482}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0.14, y: 0.73, z: -2.95}
+ m_LocalPosition: {x: 1.235, y: 0.73, z: -2.95}
m_LocalScale: {x: 0.3636, y: 0.3636, z: 0.3636}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -3093,6 +3072,27 @@ MonoBehaviour:
hitFxFadeOutDuration: 0.25
hitFxColor: {r: 1, g: 1, b: 1, a: 1}
hitFxRadius: 0.5
+--- !u!65 &2108215489
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2108215482}
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_IsTrigger: 0
+ m_ProvidesContacts: 0
+ m_Enabled: 1
+ serializedVersion: 3
+ m_Size: {x: 1, y: 1, z: 1}
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &8696923547104612602
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipBtOnClick.cs b/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipBtOnClick.cs
index 23197362..1e94fbb9 100644
--- a/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipBtOnClick.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipBtOnClick.cs
@@ -1,9 +1,29 @@
-锘縰sing UnityEngine;
+锘縰sing System;
+using MotionFramework;
+using UnityEngine;
+using UnityEngine.UI;
namespace DefaultNamespace
{
public class CharacterEquipBtOnClick : MonoBehaviour
{
-
+ private bool isChange = false;
+
+ public void Start()
+ {
+ this.GetComponent