Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
chenxi
@ -17,10 +17,10 @@ MonoBehaviour:
|
|||||||
- {fileID: 21300000, guid: 3c09c3571cc8aff4fbaee4765d7f856f, type: 3}
|
- {fileID: 21300000, guid: 3c09c3571cc8aff4fbaee4765d7f856f, type: 3}
|
||||||
- {fileID: 21300000, guid: fea4f86213a880344bcffd2308591e61, type: 3}
|
- {fileID: 21300000, guid: fea4f86213a880344bcffd2308591e61, type: 3}
|
||||||
- {fileID: 21300000, guid: 9f6e60819e9e45c41aa56a9e4325a233, type: 3}
|
- {fileID: 21300000, guid: 9f6e60819e9e45c41aa56a9e4325a233, type: 3}
|
||||||
- {fileID: 21300000, guid: 2b6d8940c0d20d14ab03aced34e9ceb2, type: 3}
|
|
||||||
- {fileID: 21300000, guid: f6e082a68016b8b4ea32bf4edf9bba42, type: 3}
|
- {fileID: 21300000, guid: f6e082a68016b8b4ea32bf4edf9bba42, type: 3}
|
||||||
- {fileID: 21300000, guid: c6dd28813849c724b9393c5dba8d8932, type: 3}
|
- {fileID: 21300000, guid: c6dd28813849c724b9393c5dba8d8932, type: 3}
|
||||||
- {fileID: 21300000, guid: 1c26d77ff4f175f48884f901f60af665, type: 3}
|
- {fileID: 21300000, guid: 1c26d77ff4f175f48884f901f60af665, type: 3}
|
||||||
|
- {fileID: 21300000, guid: 17507965a5b66704cb51bf0be72b64a6, type: 3}
|
||||||
- {fileID: 21300000, guid: d025347b20ad92a42bd93b934dc3b13c, type: 3}
|
- {fileID: 21300000, guid: d025347b20ad92a42bd93b934dc3b13c, type: 3}
|
||||||
- {fileID: 21300000, guid: 27ca2b254c606cd47b1599a680b470de, type: 3}
|
- {fileID: 21300000, guid: 27ca2b254c606cd47b1599a680b470de, type: 3}
|
||||||
- {fileID: 21300000, guid: 2aabeb48a7c79bb4592fd97f648de0bf, type: 3}
|
- {fileID: 21300000, guid: 2aabeb48a7c79bb4592fd97f648de0bf, type: 3}
|
||||||
|
|||||||
@ -61,11 +61,11 @@ SpriteAtlas:
|
|||||||
cachedData: {fileID: 0}
|
cachedData: {fileID: 0}
|
||||||
m_MasterAtlas: {fileID: 0}
|
m_MasterAtlas: {fileID: 0}
|
||||||
m_PackedSprites:
|
m_PackedSprites:
|
||||||
- {fileID: 21300000, guid: 2b6d8940c0d20d14ab03aced34e9ceb2, type: 3}
|
|
||||||
- {fileID: 21300000, guid: 9f6e60819e9e45c41aa56a9e4325a233, type: 3}
|
- {fileID: 21300000, guid: 9f6e60819e9e45c41aa56a9e4325a233, type: 3}
|
||||||
- {fileID: 21300000, guid: c6dd28813849c724b9393c5dba8d8932, type: 3}
|
- {fileID: 21300000, guid: c6dd28813849c724b9393c5dba8d8932, type: 3}
|
||||||
- {fileID: 21300000, guid: fea4f86213a880344bcffd2308591e61, type: 3}
|
- {fileID: 21300000, guid: fea4f86213a880344bcffd2308591e61, type: 3}
|
||||||
- {fileID: 21300000, guid: 27ca2b254c606cd47b1599a680b470de, type: 3}
|
- {fileID: 21300000, guid: 27ca2b254c606cd47b1599a680b470de, type: 3}
|
||||||
|
- {fileID: 21300000, guid: 17507965a5b66704cb51bf0be72b64a6, type: 3}
|
||||||
- {fileID: 21300000, guid: f6e082a68016b8b4ea32bf4edf9bba42, type: 3}
|
- {fileID: 21300000, guid: f6e082a68016b8b4ea32bf4edf9bba42, type: 3}
|
||||||
- {fileID: 21300000, guid: 3c09c3571cc8aff4fbaee4765d7f856f, type: 3}
|
- {fileID: 21300000, guid: 3c09c3571cc8aff4fbaee4765d7f856f, type: 3}
|
||||||
- {fileID: 21300000, guid: 2aabeb48a7c79bb4592fd97f648de0bf, type: 3}
|
- {fileID: 21300000, guid: 2aabeb48a7c79bb4592fd97f648de0bf, type: 3}
|
||||||
@ -73,17 +73,17 @@ SpriteAtlas:
|
|||||||
- {fileID: 21300000, guid: d025347b20ad92a42bd93b934dc3b13c, type: 3}
|
- {fileID: 21300000, guid: d025347b20ad92a42bd93b934dc3b13c, type: 3}
|
||||||
- {fileID: 21300000, guid: 1c26d77ff4f175f48884f901f60af665, type: 3}
|
- {fileID: 21300000, guid: 1c26d77ff4f175f48884f901f60af665, type: 3}
|
||||||
m_PackedSpriteNamesToIndex:
|
m_PackedSpriteNamesToIndex:
|
||||||
- frame_1
|
|
||||||
- 5
|
- 5
|
||||||
- frame_3
|
- frame_2
|
||||||
- 4
|
- 4
|
||||||
- frame_mask
|
- frame_mask
|
||||||
- frame_2
|
- frame_4
|
||||||
|
- frame_1
|
||||||
- 3
|
- 3
|
||||||
- frame_select
|
- frame_select
|
||||||
- 1
|
- 1
|
||||||
- frame_5
|
- frame_5
|
||||||
- frame_4
|
- frame_3
|
||||||
m_RenderDataMap: {}
|
m_RenderDataMap: {}
|
||||||
m_Tag: item
|
m_Tag: item
|
||||||
m_IsVariant: 0
|
m_IsVariant: 0
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 7.7 KiB |
|
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 8.1 KiB After Width: | Height: | Size: 8.2 KiB |
|
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 7.8 KiB |