Merge branch 'master' of http://172.16.1.12/taosuqi/CultivationOfBrewing

Assets/Models/Materials/gaoliangzhongzi_BaseColor.mat

@@ -42,7 +42,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 060ce6ecf89b91e4299e8b98dc44d7a3, type: 3}
+        m_Texture: {fileID: 2800000, guid: 57a76308775ba584e9a601bbd43d549b, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

Assets/Models/Materials/gaoliangzhongzi_BaseColor.mat.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b346dc6d0a85cfd479fdc41551fe9767
+guid: b0fbb12c63b41ca46b5fb0a1da07ee31
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000

Assets/Models/Materials/竹筛子.mat

@@ -42,7 +42,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 4436853b22a5a524aa30e3f2a1066350, type: 3}
+        m_Texture: {fileID: 2800000, guid: b4214b47f94273e4c85e734072372a7f, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

Assets/Models/Materials/竹筛子.mat.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b312a192e4993f04b88dff7b40b27247
+guid: 3e61649c4b11b2943b44b64c4c3a2f6a
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000

Assets/Models/筛子.fbm.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7245434d1f5aeca498bc929493733235
+guid: 1d82abd68f179c644b649775d90cf908
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Models/筛子.fbm/竹筛子.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4436853b22a5a524aa30e3f2a1066350
+guid: b4214b47f94273e4c85e734072372a7f
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Models/筛子.fbx.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c9051bec6792f55479c0bd76870c6ae8
+guid: 4618bac6d722f234a8b441d60ac0092a
 ModelImporter:
   serializedVersion: 21300
   internalIDToNameTable: []

Assets/Models/高粱种子.fbm.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a19b6f541f4ec2b4681faf7e2dd5132b
+guid: 88ac3fae25542894986c80c1e2640d26
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Models/高粱种子.fbm/gaoliangzhongzi_BaseColor.jpg.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 060ce6ecf89b91e4299e8b98dc44d7a3
+guid: 57a76308775ba584e9a601bbd43d549b
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Models/高粱种子.fbx.meta

@@ -0,0 +1,107 @@
+fileFormatVersion: 2
+guid: 6c7cbc6b210e1c7419bfdf5bcfb65606
+ModelImporter:
+  serializedVersion: 21300
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 0
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 1
+    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
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  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
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: