summaryrefslogtreecommitdiff
path: root/Erika/Assets/Bundle/Materials
AgeCommit message (Collapse)Author
2022-11-21* miscHEADmasterchai
2022-11-12* 新碰撞检测chai
2022-11-06+ Action Settingschai
2022-07-12+ modelschai
2022-07-05* modelschai
2022-07-05* modelschai
2022-07-04* node testchai
2022-06-28+ Node Editorchai
2022-06-24*Unit Animation -> Unit Actionchai
2022-06-21* placeholder clipchai
2022-06-21Merge branch 'master' of warmcat.org:/home/git-repo/Erika into HEADchai
# 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
2022-06-21* Resources -> Bundlechai
2022-06-20* rename Bundle -> Resourceschai
2022-06-20* changeschai
2022-06-06* miscchai
2022-03-10* move folderchai
generated by cgit v1.1-26-g67d0 at 2025-07-09 10:10:13 +0000