Skip to content

Commit 7b999b7

Browse files
committed
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
2 parents d21bebe + 5da30ce commit 7b999b7

File tree

13 files changed

+33389
-737
lines changed

13 files changed

+33389
-737
lines changed
Binary file not shown.

UOP1_Project/Assets/Art/Characters/PhoenixChick/Animation/Nibbling_Sneezing.fbx.meta

Lines changed: 166 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/Art/Characters/RockCritter/Animation/RockCritter.overrideController

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,4 @@ AnimatorOverrideController:
3333
type: 3}
3434
- m_OriginalClip: {fileID: -5795714674559577720, guid: 52ff7facc4957e944815ef86a2669a4a,
3535
type: 3}
36-
m_OverrideClip: {fileID: -5252816984213320552, guid: 7ded5f0996b0fce4688147fd67a029e5,
37-
type: 3}
36+
m_OverrideClip: {fileID: 7400000, guid: cdaa7c76efa91a44e842d9766003e634, type: 2}

0 commit comments

Comments
 (0)