Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-12-20 21:59:54 +08:00
commit 522913c7bf
4 changed files with 4 additions and 4 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 284 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 23b7c08b43e23454fab20f22d3d36a0c
guid: 3c2f9547d00880247b23208b7777f65e
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -97,7 +97,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 76d0c7cc410911a46b08f12b39395311
spriteID: 05874bf13bf25fa4d8162f5b1ebebf5e
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 35 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 5f3408f17d28a3e499ff4b93c5b47386
guid: 5be6ee5837711394b8f2b380c0dc47ce
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -97,7 +97,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 20b86e06a640cfd4ea00ac114f2ce9d0
spriteID: 2f93e5a531b895b4aaef2e1cd26e97ef
vertices: []
indices:
edges: []