Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
399c79391d
|
|
@ -15,7 +15,7 @@ MonoBehaviour:
|
|||
OneFloderOneBundle:
|
||||
- asset: {fileID: 102900000, guid: f2604dcc0c929f948bb06b5f51a6df14, type: 3}
|
||||
compressType: 2
|
||||
- asset: {fileID: 102900000, guid: 1bee9cd9832d3455f8cdd9cecb78dd56, type: 3}
|
||||
- asset: {fileID: 102900000, guid: 781cdbd956a971b469061dcdae3be9d5, type: 3}
|
||||
compressType: 2
|
||||
- asset: {fileID: 102900000, guid: 55477e2105aef8847870051ca544e6bd, type: 3}
|
||||
compressType: 1
|
||||
|
|
@ -57,7 +57,3 @@ MonoBehaviour:
|
|||
compressType: 1
|
||||
- asset: {fileID: 102900000, guid: ddfa1c1ffb0ca1e4db51985fcba257e4, type: 3}
|
||||
compressType: 1
|
||||
- asset: {fileID: 102900000, guid: 3bcdeee92b4a0b54d9c22bc0a34b29dc, type: 3}
|
||||
compressType: 1
|
||||
- asset: {fileID: 102900000, guid: 552c247fe5f26fe468433385bbe4c4ba, type: 3}
|
||||
compressType: 1
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 1bee9cd9832d3455f8cdd9cecb78dd56
|
||||
guid: 781cdbd956a971b469061dcdae3be9d5
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f78bb24dc9c85b647aa1505283bec868
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Loading…
Reference in New Issue