Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

art_wzw

2018-08-17 43f01c2758564c9e1a3565ac6e6a7081c94eaaf4

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

 Maps/A_Map_TongYong/Texture_2/06.png

 Maps/A_Map_TongYong/Texture_2/06.png.meta

copy from Role/M014/Effect/Texture/WenLi_0018.png.meta
copy to Maps/A_Map_TongYong/Texture_2/06.png.meta
File was copied from Role/M014/Effect/Texture/WenLi_0018.png.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 89d401906f60ede439eb30b698233188
timeCreated: 1526636083
guid: e47e18c07f275ab4b8b3a9898b399c41
timeCreated: 1526635906
licenseType: Pro
TextureImporter:
  fileIDToRecycleName: {}
@@ -59,14 +59,6 @@
    allowsAlphaSplitting: 0
    overridden: 0
  - buildTarget: Standalone
    maxTextureSize: 2048
    textureFormat: -1
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
  - buildTarget: Android
    maxTextureSize: 2048
    textureFormat: -1
    textureCompression: 1

 Maps/A_Map_TongYong/Texture_2/07.png

 Maps/A_Map_TongYong/Texture_2/07.png.meta

File was renamed from Maps/Model/Map108_Xjmj/Effect/Texture/02.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b9c4256a5795c0643994e5b56e94e916
guid: 650256232b4b39f46a90e7876a69d6d7
timeCreated: 1526635828
licenseType: Pro
TextureImporter:

 Maps/Model/Map108_Xjmj/Effect/Effect.prefab

Diff too large

 Maps/Model/Map108_Xjmj/Effect/Effect.prefab.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: c980aa7b18a3cc146978e54f309d96fc
timeCreated: 1534390799
timeCreated: 1534478233
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000

 Maps/Model/Map108_Xjmj/Effect/Material/Effect_Xjmj_01.mat

File was renamed from Maps/Model/Map108_Xjmj/Effect/Material/Xjmj_fx_001_foam.mat
@@ -6,13 +6,13 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Xjmj_fx_001_foam
  m_Name: Effect_Xjmj_01
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: 3001
  m_CustomRenderQueue: -1
  stringTagMap: {}
  disabledShaderPasses: []
  m_SavedProperties:
@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 7a030417cbb1abb42a8804c981e40993, type: 3}
        m_Texture: {fileID: 2800000, guid: e47e18c07f275ab4b8b3a9898b399c41, type: 3}
        m_Scale: {x: 8, y: 1}
        m_Offset: {x: 0.9416046, y: -1.8832092}
    - _Maintex:

 Maps/Model/Map108_Xjmj/Effect/Material/Effect_Xjmj_01.mat.meta

 Maps/Model/Map108_Xjmj/Effect/Material/Effect_Xjmj_02.mat

File was renamed from Maps/Model/Map108_Xjmj/Effect/Material/Xjmj_water_01.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Xjmj_water_01
  m_Name: Effect_Xjmj_02
  m_Shader: {fileID: 4800000, guid: 1bbefd55f7b8d0d4a8917366ab23186b, type: 3}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
@@ -47,7 +47,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: b9c4256a5795c0643994e5b56e94e916, type: 3}
        m_Texture: {fileID: 2800000, guid: 650256232b4b39f46a90e7876a69d6d7, type: 3}
        m_Scale: {x: 16, y: 8}
        m_Offset: {x: 0, y: 0}
    - _MaskTex:

 Maps/Model/Map108_Xjmj/Effect/Material/Effect_Xjmj_02.mat.meta

 Maps/Model/Map108_Xjmj/Effect/Material/Effect_Xjmj_03.mat

File was renamed from Maps/Model/Map108_Xjmj/Effect/Material/Xjmj_water_02.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Xjmj_water_02
  m_Name: Effect_Xjmj_03
  m_Shader: {fileID: 4800000, guid: 1bbefd55f7b8d0d4a8917366ab23186b, type: 3}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
@@ -47,7 +47,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: bbb953218b3ee8d4db9b062a414ded4f, type: 3}
        m_Texture: {fileID: 2800000, guid: 650256232b4b39f46a90e7876a69d6d7, type: 3}
        m_Scale: {x: 16, y: 8}
        m_Offset: {x: 0, y: 0}
    - _MaskTex:

 Maps/Model/Map108_Xjmj/Effect/Material/Effect_Xjmj_03.mat.meta

 Maps/Model/Map108_Xjmj/Effect/Material/Effect_Xjmj_04.mat

copy from Maps/Model/Map108_Xjmj/Effect/Material/Xjmj_fx_001_alpha 1.mat
copy to Maps/Model/Map108_Xjmj/Effect/Material/Effect_Xjmj_04.mat
File was copied from Maps/Model/Map108_Xjmj/Effect/Material/Xjmj_fx_001_alpha 1.mat
@@ -6,8 +6,8 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Xjmj_fx_001_alpha 1
  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_Name: Effect_Xjmj_04
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 52ced3e7c12bb8e4e8f45f9abbab38af, type: 3}
        m_Texture: {fileID: 2800000, guid: 7ca08b2aadf2f144db2e3bc2854a9992, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:

 Maps/Model/Map108_Xjmj/Effect/Material/Effect_Xjmj_04.mat.meta

copy from Maps/Model/Map109_Xsjq/Effect/Material/Xsjq_fx_003.mat.meta
copy to Maps/Model/Map108_Xjmj/Effect/Material/Effect_Xjmj_04.mat.meta
File was copied from Maps/Model/Map109_Xsjq/Effect/Material/Xsjq_fx_003.mat.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 41791817699640c42bf9e9f07718ea17
timeCreated: 1506050940
guid: 85f105d628acbd24db46a435fcee041a
timeCreated: 1534477391
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000

 Maps/Model/Map108_Xjmj/Effect/Material/Effect_Xjmj_05.mat

File was renamed from Maps/Model/Map108_Xjmj/Effect/Material/Xjmj_fx_001_alpha 1.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Xjmj_fx_001_alpha 1
  m_Name: Effect_Xjmj_05
  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4

 Maps/Model/Map108_Xjmj/Effect/Material/Effect_Xjmj_05.mat.meta

 Maps/Model/Map108_Xjmj/Effect/Material/Xjmj_fx_001_foam 1.mat

File was deleted

 Maps/Model/Map108_Xjmj/Effect/Material/Xjmj_fx_001_foam 1.mat.meta

File was deleted

 Maps/Model/Map108_Xjmj/Effect/Material/Xjmj_water_03.mat

File was deleted

 Maps/Model/Map108_Xjmj/Effect/Material/Xjmj_water_03.mat.meta

File was deleted

 Maps/Model/Map108_Xjmj/Effect/Model.meta

File was renamed from Role/M102/Effect/Model.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 6bde4b47ab1f5b747bdff52dc2d20938
guid: 98d419e6512d737468f4d2fc161df64d
folderAsset: yes
timeCreated: 1534154343
timeCreated: 1534476972
licenseType: Pro
DefaultImporter:
  userData: 

 Maps/Model/Map108_Xjmj/Effect/Model/Effect_Xjmj_01.FBX

Binary files differ

 Maps/Model/Map108_Xjmj/Effect/Model/Effect_Xjmj_01.FBX.meta

New file
@@ -0,0 +1,83 @@
fileFormatVersion: 2
guid: 178db609c14b5aa4eb6986aafe885b2f
timeCreated: 1503555588
licenseType: Pro
ModelImporter:
  serializedVersion: 19
  fileIDToRecycleName:
    100000: //RootNode
    400000: //RootNode
    2300000: //RootNode
    3300000: //RootNode
    4300000: Mld_foam
    9500000: //RootNode
  materials:
    importMaterials: 0
    materialName: 0
    materialSearch: 1
  animations:
    legacyGenerateAnimations: 4
    bakeSimulation: 0
    resampleCurves: 1
    optimizeGameObjects: 0
    motionNodeName: 
    rigImportErrors: 
    rigImportWarnings: 
    animationImportErrors: 
    animationImportWarnings: 
    animationRetargetingWarnings: 
    animationDoRetargetingWarnings: 0
    animationCompression: 1
    animationRotationError: 0.5
    animationPositionError: 0.5
    animationScaleError: 0.5
    animationWrapMode: 0
    extraExposedTransformPaths: []
    clipAnimations: []
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 3
    addColliders: 0
    importBlendShapes: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 0
    keepQuads: 0
    weldVertices: 0
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
    secondaryUVPackMargin: 4
    useFileScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 2
    tangentImportMode: 2
  importAnimation: 0
  copyAvatar: 0
  humanDescription:
    serializedVersion: 2
    human: []
    skeleton: []
    armTwist: 0.5
    foreArmTwist: 0.5
    upperLegTwist: 0.5
    legTwist: 0.5
    armStretch: 0.05
    legStretch: 0.05
    feetSpacing: 0
    rootMotionBoneName: 
    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
    hasTranslationDoF: 0
    hasExtraRoot: 0
    skeletonHasParents: 1
  lastHumanDescriptionAvatarSource: {instanceID: 0}
  animationType: 0
  humanoidOversampling: 1
  additionalBone: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Maps/Model/Map108_Xjmj/Effect/Texture/Dhd_Wind01.tga

Binary files differ

 Maps/Model/Map108_Xjmj/Effect/Texture/Dhd_Wind01.tga.meta

File was deleted

 Maps/Model/Map108_Xjmj/Effect/Texture/Effect_Xjmj_01.png

 Maps/Model/Map108_Xjmj/Effect/Texture/Effect_Xjmj_01.png.meta

 Maps/Model/Map108_Xjmj/Effect/Texture/Effect_Xjmj_02.png

 Maps/Model/Map108_Xjmj/Effect/Texture/Effect_Xjmj_02.png.meta

 Maps/Model/Map108_Xjmj/Effect/Texture/Effect_Xjmj_05.png

 Maps/Model/Map108_Xjmj/Effect/Texture/Effect_Xjmj_05.png.meta

 Maps/Model/Map108_Xjmj/Effect/Texture/Xjmj_water_mask3.png

Binary files differ

 Maps/Model/Map108_Xjmj/Effect/Texture/Xjmj_water_mask3.png.meta

File was deleted

 Maps/Model/Map109_Xsjq/Effect/Effect.prefab

Diff too large

 Maps/Model/Map109_Xsjq/Effect/Effect.prefab.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: e6265bb55e0f79440bcb592612f9894c
timeCreated: 1511437621
timeCreated: 1534478727
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000

 Maps/Model/Map109_Xsjq/Effect/Material/Effect_Xsjq_01.mat

File was renamed from Maps/Model/Map109_Xsjq/Effect/Material/Xsjq_fx_001.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Xsjq_fx_001
  m_Name: Effect_Xsjq_01
  m_Shader: {fileID: 4800000, guid: 396e15d27916e57438b52fdc7309a31d, type: 3}
  m_ShaderKeywords: 
  m_LightmapFlags: 4

 Maps/Model/Map109_Xsjq/Effect/Material/Effect_Xsjq_01.mat.meta

 Maps/Model/Map109_Xsjq/Effect/Material/Effect_Xsjq_02.mat

File was renamed from Maps/Model/Map109_Xsjq/Effect/Material/Xsjq_fx_002.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Xsjq_fx_002
  m_Name: Effect_Xsjq_02
  m_Shader: {fileID: 4800000, guid: 396e15d27916e57438b52fdc7309a31d, type: 3}
  m_ShaderKeywords: 
  m_LightmapFlags: 4

 Maps/Model/Map109_Xsjq/Effect/Material/Effect_Xsjq_02.mat.meta

 Maps/Model/Map109_Xsjq/Effect/Material/Effect_Xsjq_03.mat

copy from Maps/Model/Map108_Xjmj/Effect/Material/Xjmj_fx_001_alpha 1.mat
copy to Maps/Model/Map109_Xsjq/Effect/Material/Effect_Xsjq_03.mat
File was copied from Maps/Model/Map108_Xjmj/Effect/Material/Xjmj_fx_001_alpha 1.mat
@@ -6,8 +6,8 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Xjmj_fx_001_alpha 1
  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_Name: Effect_Xsjq_03
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 52ced3e7c12bb8e4e8f45f9abbab38af, type: 3}
        m_Texture: {fileID: 2800000, guid: 7ca08b2aadf2f144db2e3bc2854a9992, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:

 Maps/Model/Map109_Xsjq/Effect/Material/Effect_Xsjq_03.mat.meta

File was renamed from Maps/Model/Map109_Xsjq/Effect/Material/Xsjq_fx_003.mat.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 41791817699640c42bf9e9f07718ea17
timeCreated: 1506050940
guid: bf2d2c7a59c324542bc874615839adcb
timeCreated: 1534478651
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000

 Maps/Model/Map109_Xsjq/Effect/Material/Xsjq_fx_003.mat

File was deleted

 Role/M014/Effect/Materials/WenLi_0019.mat

@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 89d401906f60ede439eb30b698233188, type: 3}
        m_Texture: {fileID: 2800000, guid: a1decf69aa494cf4e92b6b8c71fda899, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:

 Role/M014/Effect/Texture/WenLi_0020.png

 Role/M014/Effect/Texture/WenLi_0020.png.meta

File was renamed from Role/M014/Effect/Texture/WenLi_0018.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 89d401906f60ede439eb30b698233188
guid: a1decf69aa494cf4e92b6b8c71fda899
timeCreated: 1526636083
licenseType: Pro
TextureImporter:

 Role/M705/Effects/Animation.meta

File was deleted

 Role/M705/Effects/Model.meta

File was deleted