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

client_Wu Xijin

2018-08-18 113773fd17d79cb9fefc1c6137f37ea94dc56ef6

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

 Maps/A_Map_TongYong/Texture_2/29.psd

Binary files differ

 Maps/A_Map_TongYong/Texture_2/29.psd.meta

File was renamed from Maps/Model/Map103_Bzjec/Effect/Texture/Effect_Bzjec_02.psd.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 456cc2d1b04032946a58219f9a3669e0
guid: 0cb27dce91b5ba74780c6c09a7b43028
timeCreated: 1526636438
licenseType: Pro
TextureImporter:

 Maps/A_Map_TongYong/Texture_2/30.png

 Maps/A_Map_TongYong/Texture_2/30.png.meta

File was renamed from Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_05.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a9a6b7264d521e34ab54b02a5c963e2a
guid: 2a025a65f4a824d488b690275767fc84
timeCreated: 1526635871
licenseType: Pro
TextureImporter:

 Maps/A_Map_TongYong/Texture_2/31.png

 Maps/A_Map_TongYong/Texture_2/31.png.meta

File was renamed from Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_08.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4c47f71bc1e82014982692b1020f2335
guid: 456e1d7a4d30ac547ac3b42f9e578917
timeCreated: 1526635872
licenseType: Pro
TextureImporter:

 Maps/Model/Map007_Jyzk/Effect/Animation/01.anim

File was deleted

 Maps/Model/Map007_Jyzk/Effect/Animation/01.anim.meta

File was deleted

 Maps/Model/Map007_Jyzk/Effect/Animation/01.controller

File was deleted

 Maps/Model/Map007_Jyzk/Effect/Animation/01.controller.meta

File was deleted

 Maps/Model/Map007_Jyzk/Effect/Animation/02.anim

File was deleted

 Maps/Model/Map007_Jyzk/Effect/Animation/02.anim.meta

File was deleted

 Maps/Model/Map007_Jyzk/Effect/Animation/02.controller

File was deleted

 Maps/Model/Map007_Jyzk/Effect/Animation/02.controller.meta

File was deleted

 Maps/Model/Map007_Jyzk/Effect/Materials/Effect_Juzk_01.mat

@@ -19,7 +19,7 @@
    serializedVersion: 3
    m_TexEnvs:
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 94df4a4bec2e314489cff12dc99551a2, type: 3}
        m_Texture: {fileID: 2800000, guid: 1013fdb9e666d404cb742dacbdcb2a90, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Floats:

 Maps/Model/Map007_Jyzk/Effect/Materials/Effect_Juzk_03.mat

@@ -19,7 +19,7 @@
    serializedVersion: 3
    m_TexEnvs:
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 48e7f138ec3983c49b5a1d8431d83431, type: 3}
        m_Texture: {fileID: 2800000, guid: 80685f3b4bbc73747bd689bd8944d4b0, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Floats:

 Maps/Model/Map007_Jyzk/Effect/Materials/Effect_Juzk_05.mat

@@ -19,7 +19,7 @@
    serializedVersion: 3
    m_TexEnvs:
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 041cfeb8837898749b1e268886a80c59, type: 3}
        m_Texture: {fileID: 2800000, guid: e5a08c46c44d62f46bf51c9dbfec4ce4, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Floats:

 Maps/Model/Map007_Jyzk/Effect/Materials/Effect_Juzk_06.mat

@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: d718626900fd1e047a6cca54e2c13a5d, type: 3}
        m_Texture: {fileID: 2800000, guid: 23e2d32407edf22488b91319955a5c08, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:

 Maps/Model/Map007_Jyzk/Effect/Materials/Effect_Juzk_07.mat

@@ -19,7 +19,7 @@
    serializedVersion: 3
    m_TexEnvs:
    - _BaseTex:
        m_Texture: {fileID: 2800000, guid: 66aa5f3bb1172fb4a9230c2f3f3b39e3, type: 3}
        m_Texture: {fileID: 2800000, guid: 0e9c4c7c267dbd64b96f6370e0712852, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _BumpMap:
@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _DisplaceTex:
        m_Texture: {fileID: 2800000, guid: 4d056047d9a56424ba53f23b6e054736, type: 3}
        m_Texture: {fileID: 2800000, guid: c7226df952b93bb4191e7aa5377872a1, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _EmissionMap:

 Maps/Model/Map007_Jyzk/Effect/Materials/Effect_Juzk_08.mat

@@ -19,7 +19,7 @@
    serializedVersion: 3
    m_TexEnvs:
    - _BaseTex:
        m_Texture: {fileID: 2800000, guid: 66aa5f3bb1172fb4a9230c2f3f3b39e3, type: 3}
        m_Texture: {fileID: 2800000, guid: 0e9c4c7c267dbd64b96f6370e0712852, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _BumpMap:
@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _DisplaceTex:
        m_Texture: {fileID: 2800000, guid: 4d056047d9a56424ba53f23b6e054736, type: 3}
        m_Texture: {fileID: 2800000, guid: c7226df952b93bb4191e7aa5377872a1, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _EmissionMap:

 Maps/Model/Map007_Jyzk/Effect/Materials/Effect_Juzk_09.mat

@@ -43,7 +43,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 158b36d888f16574494fb82168d7b1cb, type: 3}
        m_Texture: {fileID: 2800000, guid: d72acd040312795469116391e9f53c15, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:

 Maps/Model/Map007_Jyzk/Effect/Materials/Effect_Juzk_13.mat

@@ -19,7 +19,7 @@
    serializedVersion: 3
    m_TexEnvs:
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 536a6716f169154448b2082cbc955e2c, type: 3}
        m_Texture: {fileID: 2800000, guid: 4208d12174a6eb24891d22fb48df8153, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Floats:

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_02.png

Binary files differ

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_02.png.meta

File was deleted

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_04.png

Binary files differ

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_04.png.meta

File was deleted

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_05.png

Binary files differ

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_05.png.meta

File was deleted

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_06.png

Binary files differ

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_06.png.meta

File was deleted

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_07.png

Binary files differ

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_07.png.meta

File was deleted

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_09.png

Binary files differ

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_09.png.meta

File was deleted

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_11.png

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_12.png

Binary files differ

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_12.png.meta

File was deleted

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_13.png

Binary files differ

 Maps/Model/Map007_Jyzk/Effect/Textures/Effect_Juzk_13.png.meta

File was deleted

 Maps/Model/Map008_Xmhj/Effect/Material/01.mat

File was deleted

 Maps/Model/Map008_Xmhj/Effect/Material/01.mat.meta

File was deleted

 Maps/Model/Map008_Xmhj/Effect/Material/02.mat

File was deleted

 Maps/Model/Map008_Xmhj/Effect/Material/02.mat.meta

File was deleted

 Maps/Model/Map008_Xmhj/Effect/Material/03.mat

File was deleted

 Maps/Model/Map008_Xmhj/Effect/Material/03.mat.meta

File was deleted

 Maps/Model/Map008_Xmhj/Effect/Material/Effect_Xmhj_08.mat

@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 2d80105b129a4bd4584a87e07a0b5a92, type: 3}
        m_Texture: {fileID: 2800000, guid: 8cd91fee51063b34282934d9c6acef6d, type: 3}
        m_Scale: {x: 2, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
@@ -47,7 +47,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MistTex:
        m_Texture: {fileID: 2800000, guid: a0140be8cc438f84bab27be98dc2dc66, type: 3}
        m_Texture: {fileID: 2800000, guid: 8fb6606bb73ca7b4bafef5550d507986, type: 3}
        m_Scale: {x: 2, y: 1}
        m_Offset: {x: 0, y: 0}
    - _OcclusionMap:

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

Binary files differ

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

File was deleted

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

Binary files differ

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

File was deleted

 Maps/Model/Map008_Xmhj/Effect/Texture/03.psd

Binary files differ

 Maps/Model/Map008_Xmhj/Effect/Texture/03.psd.meta

File was deleted

 Maps/Model/Map008_Xmhj/Effect/Texture/Effect_Xmhj_02.psd

Binary files differ

 Maps/Model/Map008_Xmhj/Effect/Texture/Effect_Xmhj_05.psd

Binary files differ

 Maps/Model/Map008_Xmhj/Effect/Texture/Effect_Xmhj_06.psd

Binary files differ

 Maps/Model/Map008_Xmhj/Effect/Texture/Effect_Xmhj_08.png

Binary files differ

 Maps/Model/Map008_Xmhj/Effect/Texture/Effect_Xmhj_08.png.meta

File was deleted

 Maps/Model/Map008_Xmhj/Effect/Texture/Effect_Xmhj_09.png

Binary files differ

 Maps/Model/Map008_Xmhj/Effect/Texture/Effect_Xmhj_09.png.meta

File was deleted

 Maps/Model/Map008_Xmhj/Effect/Texture/Effect_Xmhj_12.psd

Binary files differ

 Maps/Model/Map008_Xmhj/Effect/Texture/Effect_Xmhj_13.psd

Binary files differ

 Maps/Model/Map009_Lysj/Effect/Material/Effect_Lysj_05.mat

@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 3c3883b26123c27408db22a13583a141, type: 3}
        m_Texture: {fileID: 2800000, guid: 2dd4ec97cc3e17048a1b82f2a745e87a, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:

 Maps/Model/Map009_Lysj/Effect/Material/Effect_Lysj_10.mat

@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: e4ca48c1e8a77b2488abd72e2be120b6, type: 3}
        m_Texture: {fileID: 2800000, guid: 8cd91fee51063b34282934d9c6acef6d, type: 3}
        m_Scale: {x: 2, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
@@ -47,7 +47,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MistTex:
        m_Texture: {fileID: 2800000, guid: 4aed495134999d44284b82f71fc3c8ae, type: 3}
        m_Texture: {fileID: 2800000, guid: 8fb6606bb73ca7b4bafef5550d507986, type: 3}
        m_Scale: {x: 2, y: 1}
        m_Offset: {x: 0, y: 0}
    - _OcclusionMap:

 Maps/Model/Map009_Lysj/Effect/Texture/Effect_Lysj_02.png

 Maps/Model/Map009_Lysj/Effect/Texture/Effect_Lysj_03.tga

Binary files differ

 Maps/Model/Map009_Lysj/Effect/Texture/Effect_Lysj_05.png

Binary files differ

 Maps/Model/Map009_Lysj/Effect/Texture/Effect_Lysj_05.png.meta

File was deleted

 Maps/Model/Map009_Lysj/Effect/Texture/Effect_Lysj_06.png

 Maps/Model/Map009_Lysj/Effect/Texture/Effect_Lysj_07.png

 Maps/Model/Map009_Lysj/Effect/Texture/Effect_Lysj_08.png

Binary files differ

 Maps/Model/Map009_Lysj/Effect/Texture/Effect_Lysj_08.png.meta

File was deleted

 Maps/Model/Map009_Lysj/Effect/Texture/Effect_Lysj_09.png

Binary files differ

 Maps/Model/Map009_Lysj/Effect/Texture/Effect_Lysj_09.png.meta

File was deleted

 Maps/Model/Map009_Lysj/Effect/Texture/Effect_Lysj_12.png

 Maps/Model/Map011_Hgdg/Effect/Material/Effect_Hgdg_11.mat

@@ -51,7 +51,7 @@
        m_Scale: {x: 2, y: 1}
        m_Offset: {x: 0, y: 0}
    - _NoiseTex:
        m_Texture: {fileID: 2800000, guid: 95a0a5359e05b524d8865af81f074c66, type: 3}
        m_Texture: {fileID: 2800000, guid: 8fb6606bb73ca7b4bafef5550d507986, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _OcclusionMap:

 Maps/Model/Map011_Hgdg/Effect/Material/Effect_Hgdg_12.mat

@@ -47,7 +47,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MistTex:
        m_Texture: {fileID: 2800000, guid: 95a0a5359e05b524d8865af81f074c66, type: 3}
        m_Texture: {fileID: 2800000, guid: 8fb6606bb73ca7b4bafef5550d507986, type: 3}
        m_Scale: {x: 2, y: 1}
        m_Offset: {x: 0, y: 0}
    - _OcclusionMap:

 Maps/Model/Map011_Hgdg/Effect/Texture/Effect_Hgdg_02.png

 Maps/Model/Map011_Hgdg/Effect/Texture/Effect_Hgdg_04.png

 Maps/Model/Map011_Hgdg/Effect/Texture/Effect_Hgdg_06.png

 Maps/Model/Map011_Hgdg/Effect/Texture/Effect_Hgdg_07.tga

Binary files differ

 Maps/Model/Map011_Hgdg/Effect/Texture/Effect_Hgdg_08.png

 Maps/Model/Map011_Hgdg/Effect/Texture/Effect_Hgdg_10.png

 Maps/Model/Map011_Hgdg/Effect/Texture/Effect_Hgdg_12.png

Binary files differ

 Maps/Model/Map011_Hgdg/Effect/Texture/Effect_Hgdg_12.png.meta

File was deleted

 Maps/Model/Map101_Dtzz/Effect/Material/01.mat

File was deleted

 Maps/Model/Map101_Dtzz/Effect/Material/01.mat.meta

File was deleted

 Maps/Model/Map101_Dtzz/Effect/Material/02.mat

File was deleted

 Maps/Model/Map101_Dtzz/Effect/Material/02.mat.meta

File was deleted

 Maps/Model/Map101_Dtzz/Effect/Material/03.mat

File was deleted

 Maps/Model/Map101_Dtzz/Effect/Material/03.mat.meta

File was deleted

 Maps/Model/Map101_Dtzz/Effect/Material/Effect_Dtzz_01.mat

@@ -43,7 +43,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 95f35a022c9c2104990a7b1176480810, type: 3}
        m_Texture: {fileID: 2800000, guid: f4d543c213a4a0e4b99c9075beff9ae7, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MaskT:

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

Binary files differ

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

File was deleted

 Maps/Model/Map101_Dtzz/Effect/Texture/Effect_Dtzz_01.png

Binary files differ

 Maps/Model/Map101_Dtzz/Effect/Texture/Effect_Dtzz_01.png.meta

File was deleted

 Maps/Model/Map102_bzjyc/Effect/Material/Effect_Bzjyc_01.mat

@@ -51,11 +51,11 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: f7c7b2efc4f39f24aad50e0c3fa7d1a5, type: 3}
        m_Texture: {fileID: 2800000, guid: cb8cb311b2c7cbb45bdb9edebfe3607d, type: 3}
        m_Scale: {x: 1.5, y: 1.5}
        m_Offset: {x: 1, y: 1}
    - _MaskTex:
        m_Texture: {fileID: 2800000, guid: da46b45185c18c34f9513d5c2692160f, type: 3}
        m_Texture: {fileID: 2800000, guid: 0cb27dce91b5ba74780c6c09a7b43028, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:

 Maps/Model/Map102_bzjyc/Effect/Material/Effect_Bzjyc_02.mat

@@ -51,7 +51,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: f7c7b2efc4f39f24aad50e0c3fa7d1a5, type: 3}
        m_Texture: {fileID: 2800000, guid: cb8cb311b2c7cbb45bdb9edebfe3607d, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 1, y: 1}
    - _MaskTex:

 Maps/Model/Map102_bzjyc/Effect/Material/Effect_Bzjyc_03.mat

@@ -51,7 +51,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: f7c7b2efc4f39f24aad50e0c3fa7d1a5, type: 3}
        m_Texture: {fileID: 2800000, guid: cb8cb311b2c7cbb45bdb9edebfe3607d, type: 3}
        m_Scale: {x: 1.5, y: 1.5}
        m_Offset: {x: 1, y: 1}
    - _MaskTex:

 Maps/Model/Map102_bzjyc/Effect/Material/Effect_Bzjyc_04.mat

@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: ce63e6be0ee623f4babeb9ab1d187010, type: 3}
        m_Texture: {fileID: 2800000, guid: 80685f3b4bbc73747bd689bd8944d4b0, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:

 Maps/Model/Map102_bzjyc/Effect/Material/Effect_Bzjyc_05.mat

@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: a9a6b7264d521e34ab54b02a5c963e2a, type: 3}
        m_Texture: {fileID: 2800000, guid: 2a025a65f4a824d488b690275767fc84, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:

 Maps/Model/Map102_bzjyc/Effect/Material/Effect_Bzjyc_08.mat

@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 3d840ff633ea6404d81086e85e2af7a6, type: 3}
        m_Texture: {fileID: 2800000, guid: f825cbe40df1ac44e9845b52cc5a0511, type: 3}
        m_Scale: {x: 4, y: 5}
        m_Offset: {x: 0, y: 0}
    - _MaskTex:

 Maps/Model/Map102_bzjyc/Effect/Material/Effect_Bzjyc_09.mat

@@ -51,7 +51,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 4c47f71bc1e82014982692b1020f2335, type: 3}
        m_Texture: {fileID: 2800000, guid: 456e1d7a4d30ac547ac3b42f9e578917, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 1, y: 1}
    - _MaskTex:
@@ -105,4 +105,4 @@
    - _MainCol: {r: 0.7794118, g: 0.6782305, b: 0.55017304, a: 1}
    - _Speed: {r: 0, g: 6, b: 0, a: 6}
    - _TillingXYPannerXY: {r: 1, g: 1, b: 0, a: 0.4}
    - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.522}
    - _TintColor: {r: 0.079422556, g: 0.5199335, b: 0.8308824, a: 0.522}

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

Binary files differ

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

File was deleted

 Maps/Model/Map102_bzjyc/Effect/Texture/Bzjyc_fx_004.png

Binary files differ

 Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_01.tga

Binary files differ

 Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_01.tga.meta

File was deleted

 Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_02.psd

Binary files differ

 Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_02.psd.meta

File was deleted

 Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_03.png

 Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_04.png

 Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_05.png

Binary files differ

 Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_06.png

 Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_07.tga

Binary files differ

 Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_07.tga.meta

File was deleted

 Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_08.png

Binary files differ

 Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_09.png

 Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_09.png.meta

 Maps/Model/Map103_Bzjec/Effect/Material/Effect_Bzjec_01.mat

@@ -51,11 +51,11 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: b6def164b4aba3643b14f6425d2b854b, type: 3}
        m_Texture: {fileID: 2800000, guid: 0e9c4c7c267dbd64b96f6370e0712852, type: 3}
        m_Scale: {x: 0.5, y: 0.5}
        m_Offset: {x: 1, y: 1}
    - _MaskTex:
        m_Texture: {fileID: 2800000, guid: 456cc2d1b04032946a58219f9a3669e0, type: 3}
        m_Texture: {fileID: 2800000, guid: 0cb27dce91b5ba74780c6c09a7b43028, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:

 Maps/Model/Map103_Bzjec/Effect/Material/Effect_Bzjec_02.mat

@@ -19,7 +19,7 @@
    serializedVersion: 3
    m_TexEnvs:
    - _BaseTex:
        m_Texture: {fileID: 2800000, guid: b6def164b4aba3643b14f6425d2b854b, type: 3}
        m_Texture: {fileID: 2800000, guid: 0e9c4c7c267dbd64b96f6370e0712852, type: 3}
        m_Scale: {x: 0.5, y: 0.5}
        m_Offset: {x: 0, y: 0}
    - _BumpMap:

 Maps/Model/Map103_Bzjec/Effect/Material/Effect_Bzjec_03.mat

@@ -19,7 +19,7 @@
    serializedVersion: 3
    m_TexEnvs:
    - _BaseTex:
        m_Texture: {fileID: 2800000, guid: b6def164b4aba3643b14f6425d2b854b, type: 3}
        m_Texture: {fileID: 2800000, guid: 0e9c4c7c267dbd64b96f6370e0712852, type: 3}
        m_Scale: {x: 3, y: 0.3}
        m_Offset: {x: 0, y: 0}
    - _BumpMap:

 Maps/Model/Map103_Bzjec/Effect/Material/Effect_Bzjec_04.mat

@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 98d63c23589cd95488af933e85c2e130, type: 3}
        m_Texture: {fileID: 2800000, guid: 2a025a65f4a824d488b690275767fc84, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:

 Maps/Model/Map103_Bzjec/Effect/Material/Effect_Bzjec_05.mat

@@ -51,7 +51,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 338a9c4a8ef3b1244abddaa1bb44595d, type: 3}
        m_Texture: {fileID: 2800000, guid: 456e1d7a4d30ac547ac3b42f9e578917, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 1, y: 1}
    - _MaskTex:
@@ -118,4 +118,4 @@
    - _NormalSpeed: {r: 1.3, g: -1.4, b: -1.5, a: 1.6}
    - _Speed: {r: 0, g: 6, b: 0, a: 6}
    - _TillingXYPannerXY: {r: 1, g: 1, b: 0, a: 0.4}
    - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.522}
    - _TintColor: {r: 0.85294116, g: 0.27595156, b: 0.27595156, a: 0.522}

 Maps/Model/Map103_Bzjec/Effect/Material/Effect_Bzjec_06.mat

@@ -19,7 +19,7 @@
    serializedVersion: 3
    m_TexEnvs:
    - _BaseTex:
        m_Texture: {fileID: 2800000, guid: b6def164b4aba3643b14f6425d2b854b, type: 3}
        m_Texture: {fileID: 2800000, guid: 0e9c4c7c267dbd64b96f6370e0712852, type: 3}
        m_Scale: {x: 15, y: 15}
        m_Offset: {x: 0, y: 0}
    - _BumpMap:

 Maps/Model/Map103_Bzjec/Effect/Texture/Bzjec_mask_00.png

Binary files differ

 Maps/Model/Map103_Bzjec/Effect/Texture/Bzjec_mask_00.png.meta

File was deleted

 Maps/Model/Map103_Bzjec/Effect/Texture/Effect_Bzjec_01.png

Binary files differ

 Maps/Model/Map103_Bzjec/Effect/Texture/Effect_Bzjec_01.png.meta

File was deleted

 Maps/Model/Map103_Bzjec/Effect/Texture/Effect_Bzjec_02.psd

Binary files differ

 Maps/Model/Map103_Bzjec/Effect/Texture/Effect_Bzjec_03.png

Binary files differ

 Maps/Model/Map103_Bzjec/Effect/Texture/Effect_Bzjec_03.png.meta

File was deleted

 Maps/Model/Map103_Bzjec/Effect/Texture/Effect_Bzjec_05.png

Binary files differ

 Maps/Model/Map103_Bzjec/Effect/Texture/Effect_Bzjec_05.png.meta

File was deleted