Quellcode durchsuchen

Merge branch 'feature/JNHJ' into develop_合作分支

# Conflicts:
#	ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/220kV隔离开关-GW4A型传动机构和转动部件大修.unity.meta
#	ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV断路器-LW35型解体大修.meta
#	ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/110kV断路器-LW35型解体大修.xlsx.meta
#	ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/110kV断路器-LW35型解体大修_题库.xlsx.meta
2809621200 vor 5 Monaten
Ursprung
Commit
64bb1a79c3

BIN
ChivaTechFramework/Assets/GameAssets/03.Models/03.500kV断路器-LW13型/断路器_500kV_LW13A_550Y_H(1).FBX


+ 97 - 0
ChivaTechFramework/Assets/GameAssets/03.Models/03.500kV断路器-LW13型/断路器_500kV_LW13A_550Y_H(1).FBX.meta

@@ -0,0 +1,97 @@
+fileFormatVersion: 2
+guid: 963a0eb15824424428f69a76c1447729
+ModelImporter:
+  serializedVersion: 19301
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
ChivaTechFramework/Assets/GameAssets/03.Models/03.500kV断路器-LW13型/断路器_Tex/瓷瓶_Normal.png.meta

@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -51,7 +51,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0

Datei-Diff unterdrückt, da er zu groß ist
+ 254 - 160
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/220kV断路器-LW25型瓷质绝缘检修.unity


Datei-Diff unterdrückt, da er zu groß ist
+ 556 - 119
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/500kV断路器-LW13型控制、传动部分解体检修.unity


BIN
ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/500kV断路器-LW13型控制、传动部分解体检修.xlsx


BIN
ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/500kV断路器-LW13型控制、传动部分解体检修_题库.xlsx


+ 7 - 0
ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/500kV断路器-LW13型控制、传动部分解体检修_题库.xlsx.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3e84d13401cf17f47878e1cacdd1d0ca
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.