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

art_wzw

2018-08-17 5ac9c626711b176665deccbab1ab107f8120f964

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

 Maps/A_Map_TongYong/Model/01.FBX

Binary files differ

 Maps/A_Map_TongYong/Model/01.FBX.meta

 Maps/A_Map_TongYong/Model/02.FBX

Binary files differ

 Maps/A_Map_TongYong/Model/02.FBX.meta

 Maps/A_Map_TongYong/Texture_2/05.png

 Maps/A_Map_TongYong/Texture_2/05.png.meta

File was renamed from Maps/Model/Map107_Shgm/Effect/Texture/Shgm_fx_010.png.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: d4cb7b1f66adaa5438757473776cb323
timeCreated: 1526635889
guid: f4d543c213a4a0e4b99c9075beff9ae7
timeCreated: 1526635830
licenseType: Pro
TextureImporter:
  fileIDToRecycleName: {}
@@ -24,13 +24,13 @@
  generateCubemap: 6
  cubemapConvolution: 0
  seamlessCubemap: 0
  textureFormat: 1
  maxTextureSize: 2048
  textureFormat: -1
  maxTextureSize: 512
  textureSettings:
    filterMode: -1
    aniso: -1
    mipBias: -1
    wrapMode: -1
    wrapMode: 0
  nPOTScale: 1
  lightmap: 0
  compressionQuality: 50
@@ -51,7 +51,15 @@
  textureFormatSet: 0
  platformSettings:
  - buildTarget: DefaultTexturePlatform
    maxTextureSize: 2048
    maxTextureSize: 512
    textureFormat: -1
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
  - buildTarget: Standalone
    maxTextureSize: 512
    textureFormat: -1
    textureCompression: 1
    compressionQuality: 50

 Maps/Model/Map107_Shgm/Effect/Effect.prefab

Diff too large

 Maps/Model/Map107_Shgm/Effect/Effect.prefab.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 7d767f05a95163244b41f264291f2ec5
timeCreated: 1508198034
timeCreated: 1534475693
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000

 Maps/Model/Map107_Shgm/Effect/Effect_shgm_dazuo.prefab

File was deleted

 Maps/Model/Map107_Shgm/Effect/Effect_shgm_dazuo.prefab.meta

File was deleted

 Maps/Model/Map107_Shgm/Effect/Material/Effect_Shgm_01.mat

File was renamed from Maps/Model/Map107_Shgm/Effect/Material/Shgm_fx_005.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Shgm_fx_005
  m_Name: Effect_Shgm_01
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4

 Maps/Model/Map107_Shgm/Effect/Material/Effect_Shgm_01.mat.meta

 Maps/Model/Map107_Shgm/Effect/Material/Effect_Shgm_02.mat

File was renamed from Maps/Model/Map107_Shgm/Effect/Material/Shgm_fx_006.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Shgm_fx_006
  m_Name: Effect_Shgm_02
  m_Shader: {fileID: 4800000, guid: e794bdd15123ce04ebd986725b08c31e, type: 3}
  m_ShaderKeywords: 
  m_LightmapFlags: 4

 Maps/Model/Map107_Shgm/Effect/Material/Effect_Shgm_02.mat.meta

 Maps/Model/Map107_Shgm/Effect/Material/Effect_Shgm_03.mat

File was renamed from Maps/Model/Map107_Shgm/Effect/Material/Shgm_fx_001.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Shgm_fx_001
  m_Name: Effect_Shgm_03
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 3a5a96df060a5cf4a9cc0c59e13486b7, type: 3}
        m_Texture: {fileID: 2800000, guid: f4d543c213a4a0e4b99c9075beff9ae7, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:

 Maps/Model/Map107_Shgm/Effect/Material/Effect_Shgm_03.mat.meta

 Maps/Model/Map107_Shgm/Effect/Material/Effect_Shgm_04.mat

File was renamed from Maps/Model/Map107_Shgm/Effect/Material/Shgm_fx_004.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Shgm_fx_004
  m_Name: Effect_Shgm_04
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4

 Maps/Model/Map107_Shgm/Effect/Material/Effect_Shgm_04.mat.meta

 Maps/Model/Map107_Shgm/Effect/Material/Effect_Shgm_05.png

 Maps/Model/Map107_Shgm/Effect/Material/Effect_Shgm_05.png.meta

 Maps/Model/Map107_Shgm/Effect/Material/Shgm_fx_003.mat

File was deleted

 Maps/Model/Map107_Shgm/Effect/Material/Shgm_fx_003.mat.meta

File was deleted

 Maps/Model/Map107_Shgm/Effect/Material/Shgm_fx_007.mat

File was deleted

 Maps/Model/Map107_Shgm/Effect/Material/Shgm_fx_007.mat.meta

File was deleted

 Maps/Model/Map107_Shgm/Effect/Material/Shgm_fx_008.mat

File was deleted

 Maps/Model/Map107_Shgm/Effect/Material/Shgm_fx_008.mat.meta

File was deleted

 Maps/Model/Map107_Shgm/Effect/Model/Shgm_fx_012.FBX

Binary files differ

 Maps/Model/Map107_Shgm/Effect/Model/Shgm_fx_012.FBX.meta

File was deleted

 Maps/Model/Map107_Shgm/Effect/Model/Shgm_fx_013.FBX

Binary files differ

 Maps/Model/Map107_Shgm/Effect/Model/Shgm_fx_013.FBX.meta

File was deleted

 Maps/Model/Map107_Shgm/Effect/Model/Shgm_fx_014.FBX

Binary files differ

 Maps/Model/Map107_Shgm/Effect/Model/Shgm_fx_014.FBX.meta

File was deleted

 Maps/Model/Map107_Shgm/Effect/Model/Shgm_fx_015.FBX

Binary files differ

 Maps/Model/Map107_Shgm/Effect/Model/Shgm_fx_015.FBX.meta

File was deleted

 Maps/Model/Map107_Shgm/Effect/Texture/01.png

 Maps/Model/Map107_Shgm/Effect/Texture/01.png.meta

 Maps/Model/Map107_Shgm/Effect/Texture/02.png

 Maps/Model/Map107_Shgm/Effect/Texture/02.png.meta

 Maps/Model/Map107_Shgm/Effect/Texture/03.png

 Maps/Model/Map107_Shgm/Effect/Texture/03.png.meta

 Maps/Model/Map107_Shgm/Effect/Texture/04.png

 Maps/Model/Map107_Shgm/Effect/Texture/04.png.meta

 Maps/Model/Map107_Shgm/Effect/Texture/Effect_Shgm_01.png

 Maps/Model/Map107_Shgm/Effect/Texture/Effect_Shgm_01.png.meta

 Maps/Model/Map107_Shgm/Effect/Texture/Effect_Shgm_02.png

 Maps/Model/Map107_Shgm/Effect/Texture/Effect_Shgm_02.png.meta

 Maps/Model/Map107_Shgm/Effect/Texture/Effect_Shgm_03.png

 Maps/Model/Map107_Shgm/Effect/Texture/Effect_Shgm_03.png.meta

 Maps/Model/Map107_Shgm/Effect/Texture/Effect_Shgm_04.png

 Maps/Model/Map107_Shgm/Effect/Texture/Effect_Shgm_04.png.meta

 Maps/Model/Map107_Shgm/Effect/Texture/Shgm_fx_003.png

Binary files differ

 Maps/Model/Map107_Shgm/Effect/Texture/Shgm_fx_006.png

Binary files differ

 Maps/Model/Map107_Shgm/Effect/Texture/Shgm_fx_006.png.meta

File was deleted

 Maps/Model/Map107_Shgm/Effect/Texture/Shgm_fx_009.png

Binary files differ

 Maps/Model/Map107_Shgm/Effect/Texture/Shgm_fx_010.png

Binary files differ

 Maps/Model/Map107_Shgm/Effect/Texture/Shgm_fx_011.png

Binary files differ

 Maps/Model/Map107_Shgm/Effect/Texture/Shgm_fx_011.png.meta

File was deleted