|
# Conflicts:
# Erika/Assets/Bundle/Materials/Unit/Effect.meta
# Erika/Assets/Bundle/Shaders/Include.meta
# Erika/Assets/Bundle/Shaders/Unit/Effect.meta
# Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta
# Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta
# Erika/Assets/Bundle/Unit/NPC.meta
# Erika/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta
# Erika/Assets/Bundle/Unit/PC/Erika/Models.meta
# Erika/Assets/Bundle/Unit/PC/Erika/UnitData.meta
# Erika/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta
# Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta
# Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta
# Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta
# Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta
# Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta
# Erika/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta
# Erika/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta
# Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta
# Erika/Assets/Bundle/Unit/Prop.meta
# Erika/Assets/Scripts/Managers/ResourceManager.cs
# Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
# Erika/Assets/Scripts/Utils/LogHelper.cs
# Erika/Assets/Scripts/Utils/LogTag.cs
# Erika/Assets/Scripts/Utils/LogTag.cs.meta
|