Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition
# Conflicts: # SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln
This commit is contained in:
commit
55a3ac2b04
File diff suppressed because it is too large
Load Diff
|
@ -95,8 +95,8 @@ BoxCollider:
|
|||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 238.59589, y: 298.2687, z: 21.246815}
|
||||
m_Center: {x: 74.434784, y: -103.808556, z: 8.196153}
|
||||
m_Size: {x: 101.60154, y: 298.2687, z: 21.246813}
|
||||
m_Center: {x: -1.0707321, y: -103.80854, z: 8.196152}
|
||||
--- !u!114 &5512499863435223851
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -8701,16 +8701,6 @@ Transform:
|
|||
m_CorrespondingSourceObject: {fileID: 8322912254063910965, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
|
||||
m_PrefabInstance: {fileID: 601364440}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &601364442 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7745216743049305763, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
|
||||
m_PrefabInstance: {fileID: 601364440}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &601364443 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7727877916779522580, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
|
||||
m_PrefabInstance: {fileID: 601364440}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &601364444 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 8810976127009250453, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
|
||||
|
@ -8737,11 +8727,6 @@ BoxCollider:
|
|||
serializedVersion: 3
|
||||
m_Size: {x: 0.012151217, y: 0.0088528525, z: 0.027755149}
|
||||
m_Center: {x: 0.0000001341104, y: 0.0000026882633, z: 0.00000017881396}
|
||||
--- !u!137 &601364449 stripped
|
||||
SkinnedMeshRenderer:
|
||||
m_CorrespondingSourceObject: {fileID: 5725098936793829084, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
|
||||
m_PrefabInstance: {fileID: 601364440}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &603379991
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -17549,44 +17534,6 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1278583460}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1294725815 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 3089552133719165161, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
m_PrefabInstance: {fileID: 1830033822}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1294725821
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1294725815}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b47ec41343fb25f4e81cbeceb223bc5a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
PliersObj: {fileID: 1294725815}
|
||||
PliersAni: {fileID: 1294725822}
|
||||
SkinnedMeshRenderer: {fileID: 601364449}
|
||||
Doorlock: {fileID: 601364443}
|
||||
DoorOfCabinet: {fileID: 601364442}
|
||||
--- !u!111 &1294725822
|
||||
Animation:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1294725815}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Animation: {fileID: 1827226128182048838, guid: b3a82017d7338d04fa5b8d7a3932cb9d, type: 3}
|
||||
m_Animations:
|
||||
- {fileID: 1827226128182048838, guid: b3a82017d7338d04fa5b8d7a3932cb9d, type: 3}
|
||||
m_WrapMode: 0
|
||||
m_PlayAutomatically: 0
|
||||
m_AnimatePhysics: 0
|
||||
m_CullingType: 0
|
||||
--- !u!1 &1295043054
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -26217,81 +26164,6 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1825445162}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1001 &1830033822
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2426204242853352019, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 303.043
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2426204242853352019, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 2.715
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2426204242853352019, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 163.429
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2426204242853352019, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.61066854
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2426204242853352019, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.35648844
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2426204242853352019, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.35648844
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2426204242853352019, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.61066854
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2426204242853352019, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: -60.55
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2426204242853352019, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2426204242853352019, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2576258974582097026, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 13.004021
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3089552133719165161, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u5265\u7EBF\u94B3"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3089552133719165161, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7411639059728083780, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: -13.004021
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 3089552133719165161, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1294725821}
|
||||
- targetCorrespondingSourceObject: {fileID: 3089552133719165161, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1294725822}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
--- !u!1 &1835037580
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -221927,6 +221799,63 @@ MeshFilter:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5582591975178399775}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!1001 &4441233656616589334
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -1.4711838
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.07306337
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0.13374138
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5376740296190089428, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u5265\u7EBF\u94B3"
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
|
||||
--- !u!64 &4459080182946570877
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -222954,4 +222883,4 @@ SceneRoots:
|
|||
- {fileID: 1505150131}
|
||||
- {fileID: 1714310254403284403}
|
||||
- {fileID: 1790438426}
|
||||
- {fileID: 1830033822}
|
||||
- {fileID: 4441233656616589334}
|
||||
|
|
Loading…
Reference in New Issue