zhuyayu
/
E_ElecCompetition
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition

This commit is contained in:
huangjiayu 2023-09-19 10:40:26 +08:00
parent fa345cba57 8059759620
commit 9ab8f92ae2
4 changed files with 153 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/工具相关/Tex/TY_DN_0a.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 316 KiB

After

Width:  |  Height:  |  Size: 390 KiB

165
Electrical_inspectionCompetitionSystem/Assets/Scenes/居民自建.unity
View File

@ -52272,8 +52272,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 626193689}
m_LocalRotation: {x: 0.01948188, y: 0.7221224, z: 0.020370077, w: -0.69119084}
m_LocalPosition: {x: 12.327513, y: 1.837357, z: 337.13864}
m_LocalRotation: {x: 0.0063704625, y: -0.6792101, z: -0.005911192, w: -0.73389244}
m_LocalPosition: {x: -25.284452, y: 1.6443559, z: 337.073}
m_LocalScale: {x: 1, y: 0.8000001, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -96003,6 +96003,103 @@ MonoBehaviour:
m_BoolArgument: 0
m_CallState: 2
m_IsOn: 1
--- !u!1 &1147447981
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1147447982}
- component: {fileID: 1147447985}
- component: {fileID: 1147447984}
- component: {fileID: 1147447983}
m_Layer: 0
m_Name: Cube (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1147447982
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1147447981}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1460110911}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1147447983
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1147447981}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1147447984
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1147447981}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1147447985
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1147447981}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1147532496
GameObject:
m_ObjectHideFlags: 0
@ -107473,6 +107570,51 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1281986201}
m_CullTransparentMesh: 1
--- !u!1 &1282121493
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1282121494}
- component: {fileID: 1282121495}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1282121494
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1282121493}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.2324, y: 2.2731, z: 3.1818}
m_LocalScale: {x: 13.375333, y: 7.6703672, z: 6.5834804}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1460110911}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1282121495
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1282121493}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &1282202762
GameObject:
m_ObjectHideFlags: 0
@ -123133,24 +123275,11 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1459376165}
m_CullTransparentMesh: 1
--- !u!1 &1460110908 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: cbaac457787f0dc44a40112e8c8ae0b9, type: 3}
--- !u!4 &1460110911 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: cbaac457787f0dc44a40112e8c8ae0b9, type: 3}
m_PrefabInstance: {fileID: 1419654635}
m_PrefabAsset: {fileID: 0}
--- !u!65 &1460110912
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1460110908}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 18.000177, y: 11.547414, z: 6.758063}
m_Center: {x: -1.577461, y: 1.0027452, z: 3.3790314}
--- !u!1 &1460903127
GameObject:
m_ObjectHideFlags: 0

8
Electrical_inspectionCompetitionSystem/Packages/packages-lock.json
View File

@ -35,12 +35,12 @@
"source": "builtin",
"dependencies": {
"com.unity.ide.visualstudio": "2.0.16",
"com.unity.ide.rider": "3.0.16",
"com.unity.ide.rider": "3.0.15",
"com.unity.ide.vscode": "1.2.5",
"com.unity.editorcoroutines": "1.0.0",
"com.unity.performance.profile-analyzer": "1.1.1",
"com.unity.test-framework": "1.1.31",
"com.unity.testtools.codecoverage": "1.2.2"
"com.unity.testtools.codecoverage": "1.0.1"
}
},
"com.unity.ide.rider": {
@ -92,7 +92,7 @@
"url": "https://packages.unity.cn"
},
"com.unity.services.core": {
"version": "1.6.0",
"version": "1.4.2",
"depth": 1,
"source": "registry",
"dependencies": {
@ -121,7 +121,7 @@
"url": "https://packages.unity.cn"
},
"com.unity.testtools.codecoverage": {
"version": "1.2.2",
"version": "1.0.1",
"depth": 1,
"source": "registry",
"dependencies": {

4
Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt
View File

@ -1,2 +1,2 @@
m_EditorVersion: 2021.3.15f1c1
m_EditorVersionWithRevision: 2021.3.15f1c1 (080beb55ecda)
m_EditorVersion: 2021.3.10f1c2
m_EditorVersionWithRevision: 2021.3.10f1c2 (5a059dbcdda5)