puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_hero' into dev_hero_2

Browse Source 
# Conflicts:
#	Assets/arts/sounds/sfx/battle/20007001.wav.meta
#	Assets/arts/sounds/sfx/battle/20007005.wav.meta
#	Assets/arts/sounds/sfx/battle/20008001.wav.meta
#	Assets/arts/sounds/sfx/battle/20008004.wav.meta
This commit is contained in:
puxuan 2025-11-06 10:26:25 +08:00
commit 068f382c47
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/arts/sounds/sfx/battle/20007001.wav.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ea31cb776c8124c468639e21dd01a2a4
guid: 6cf1da36ac43eb14aa6737a92d157a54
AudioImporter:
externalObjects: {}
serializedVersion: 6

2
Assets/arts/sounds/sfx/battle/20007005.wav.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 44c41c5e1cb8acb4a8c9ddb783f9e44a
guid: fc8edaff18eab8d469e7cec3e0ed40e7
AudioImporter:
externalObjects: {}
serializedVersion: 6

2
Assets/arts/sounds/sfx/battle/20008001.wav.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: c72ef8b87a3891540b72c45e75bfd1e6
guid: 5655a0fb68235104babf8565c207ec5c
AudioImporter:
externalObjects: {}
serializedVersion: 6

2
Assets/arts/sounds/sfx/battle/20008004.wav.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: c39f8947d7791534cb88e89b9e6263bf
guid: 566660f64231fba43882159b8af571c4
AudioImporter:
externalObjects: {}
serializedVersion: 6

2
Assets/prefabs/effects/ui/vfx_c1_ui_vs_01.prefab
View File

@ -48779,7 +48779,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 99}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8673939345137079590