c1_unity

History

xiekaidong 8bc091438b Merge branch 'dev_20230725' into dungeon

# Conflicts:
#	Assets/arts/spines/characters/m20039.meta
#	Assets/arts/spines/characters/m20039/m20039.atlas.txt.meta
#	Assets/arts/spines/characters/m20039/m20039.png.meta
#	Assets/arts/spines/characters/m20039/m20039.skel.bytes.meta
#	Assets/arts/spines/characters/m20039/m20039_atlas.asset
#	Assets/arts/spines/characters/m20039/m20039_atlas.asset.meta
#	Assets/arts/spines/characters/m20039/m20039_material.mat
#	Assets/arts/spines/characters/m20039/m20039_material.mat.meta
#	Assets/arts/spines/characters/m20039/m20039_skeletondata.asset
#	Assets/arts/spines/characters/m20039/m20039_skeletondata.asset.meta
#	Assets/arts/spines/characters/m20040.meta
#	Assets/arts/spines/characters/m20040/m20040.atlas.txt.meta
#	Assets/arts/spines/characters/m20040/m20040.png.meta
#	Assets/arts/spines/characters/m20040/m20040.skel.bytes.meta
#	Assets/arts/spines/characters/m20040/m20040_atlas.asset
#	Assets/arts/spines/characters/m20040/m20040_atlas.asset.meta
#	Assets/arts/spines/characters/m20040/m20040_material.mat
#	Assets/arts/spines/characters/m20040/m20040_material.mat.meta
#	Assets/arts/spines/characters/m20040/m20040_skeletondata.asset
#	Assets/arts/spines/characters/m20040/m20040_skeletondata.asset.meta
#	Assets/arts/spines/characters/m20041.meta
#	Assets/arts/spines/characters/m20041/m20041.atlas.txt.meta
#	Assets/arts/spines/characters/m20041/m20041.png.meta
#	Assets/arts/spines/characters/m20041/m20041.skel.bytes.meta
#	Assets/arts/spines/characters/m20041/m20041_atlas.asset
#	Assets/arts/spines/characters/m20041/m20041_atlas.asset.meta
#	Assets/arts/spines/characters/m20041/m20041_material.mat
#	Assets/arts/spines/characters/m20041/m20041_material.mat.meta
#	Assets/arts/spines/characters/m20041/m20041_skeletondata.asset
#	Assets/arts/spines/characters/m20041/m20041_skeletondata.asset.meta
#	Assets/arts/spines/characters/m20042.meta
#	Assets/arts/spines/characters/m20042/m20042.atlas.txt.meta
#	Assets/arts/spines/characters/m20042/m20042.png.meta
#	Assets/arts/spines/characters/m20042/m20042.skel.bytes
#	Assets/arts/spines/characters/m20042/m20042.skel.bytes.meta
#	Assets/arts/spines/characters/m20042/m20042_atlas.asset
#	Assets/arts/spines/characters/m20042/m20042_atlas.asset.meta
#	Assets/arts/spines/characters/m20042/m20042_material.mat
#	Assets/arts/spines/characters/m20042/m20042_material.mat.meta
#	Assets/arts/spines/characters/m20042/m20042_skeletondata.asset
#	Assets/arts/spines/characters/m20042/m20042_skeletondata.asset.meta
#	Assets/arts/spines/characters/m20043.meta
#	Assets/arts/spines/characters/m20043/m20043.atlas.txt.meta
#	Assets/arts/spines/characters/m20043/m20043.png.meta
#	Assets/arts/spines/characters/m20043/m20043.skel.bytes.meta
#	Assets/arts/spines/characters/m20043/m20043_atlas.asset
#	Assets/arts/spines/characters/m20043/m20043_atlas.asset.meta
#	Assets/arts/spines/characters/m20043/m20043_material.mat
#	Assets/arts/spines/characters/m20043/m20043_material.mat.meta
#	Assets/arts/spines/characters/m20043/m20043_skeletondata.asset
#	Assets/arts/spines/characters/m20043/m20043_skeletondata.asset.meta
#	Assets/prefabs/spine/ui/characters/m20039.prefab
#	Assets/prefabs/spine/ui/characters/m20039.prefab.meta
#	Assets/prefabs/spine/ui/characters/m20040.prefab
#	Assets/prefabs/spine/ui/characters/m20040.prefab.meta
#	Assets/prefabs/spine/ui/characters/m20041.prefab
#	Assets/prefabs/spine/ui/characters/m20041.prefab.meta
#	Assets/prefabs/spine/ui/characters/m20042.prefab
#	Assets/prefabs/spine/ui/characters/m20042.prefab.meta
#	Assets/prefabs/spine/ui/characters/m20043.prefab
#	Assets/prefabs/spine/ui/characters/m20043.prefab.meta

2023-07-19 20:18:20 +08:00

appicon

更新icon

2023-06-16 17:43:14 +08:00

arts

Merge branch 'dev_20230725' into dungeon

2023-07-19 20:18:20 +08:00

Editor

提升版本号

2023-07-17 18:45:44 +08:00

first

first字体大小调整