Commit 1458dbdc authored by zhangzhe's avatar zhangzhe

Merge branch 'develop_mjb_cscmnq_1.0.7' of…

Merge branch 'develop_mjb_cscmnq_1.0.7' of gitlab.huolea.com:wangxuewei/wdlc_mjb_unity into develop_mjb_cscmnq_1.0.7
parents 7b4e5b26 ff2cd464
......@@ -308,31 +308,67 @@ PlayerSettings:
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 432
m_Height: 432
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 324
m_Height: 324
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 216
m_Height: 216
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 162
m_Height: 162
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 108
m_Height: 108
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 81
m_Height: 81
m_Kind: 2
m_SubKind:
- m_Textures:
- {fileID: 0}
m_Width: 192
m_Height: 192
m_Kind: 1
m_SubKind:
- m_Textures: []
- m_Textures:
- {fileID: 0}
m_Width: 144
m_Height: 144
m_Kind: 1
m_SubKind:
- m_Textures: []
- m_Textures:
- {fileID: 0}
m_Width: 96
m_Height: 96
m_Kind: 1
m_SubKind:
- m_Textures: []
- m_Textures:
- {fileID: 0}
m_Width: 72
m_Height: 72
m_Kind: 1
m_SubKind:
- m_Textures: []
- m_Textures:
- {fileID: 0}
m_Width: 48
m_Height: 48
m_Kind: 1
m_SubKind:
- m_Textures: []
- m_Textures:
- {fileID: 0}
m_Width: 36
m_Height: 36
m_Kind: 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment