Merge Fuki emotes into one controller

( i hardly know her )
This commit is contained in:
MindfulMinun committed 2022-02-25 02:33:59 -06:00
1 parent 68dbc1c349
commit 0b967a6fc3
10 files changed
+245 -395

No files matched your search

+15 -6
View File
@@ -779,11 +779,17 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 904903484}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fd41423fac95444da8286db867308b4, type: 3}
m_Name:
m_EditorClassIdentifier:
followCam: {fileID: 0}
staticCam: {fileID: 0}
smoothSpeed: 1
rayLength: 4
target: {fileID: 0}
rb: {fileID: 0}
--- !u!114 &904903487
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1069,6 +1075,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
controller: {fileID: 1044829896}
animator: {fileID: 0}
runSpeed: 40
--- !u!58 &1044829893
CircleCollider2D:
@@ -1155,6 +1162,8 @@ MonoBehaviour:
m_GroundCheck: {fileID: 860984838}
m_CeilingCheck: {fileID: 1477138878}
m_CrouchDisableCollider: {fileID: 1044829894}
m_Grounded: 0
m_Velocity: {x: 0, y: 0, z: 0}
OnLandEvent:
m_PersistentCalls:
m_Calls: []
@@ -1754,9 +1763,9 @@ MonoBehaviour:
pages:
- asdfsadfasfdsadfasdfsdfasdfasdf
- ahhhhhhhhhhhhhhh
emotes: 0100000003000000
emotes: 0700000007000000
controller: {fileID: 9100000, guid: 7eb4fdbc838e84a8e83347d54fd48aa6, type: 2}
startSprite: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
startSprite: {fileID: -1886119498855039967, guid: d48fd9d9f47b5467cb424240c7f9f276, type: 3}
audioManager: {fileID: 1586724389}
isTalking: 1
--- !u!4 &1977072049
@@ -1811,7 +1820,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1196539433
m_SortingLayer: 2
m_SortingLayer: 1
m_SortingOrder: 0
m_Sprite: {fileID: 4887068915747301843, guid: 73ae3db8a07b2424caf7884baa7964f8, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1920,7 +1929,7 @@ PrefabInstance:
- target: {fileID: 4883996976931216989, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
objectReference: {fileID: -1886119498855039967, guid: d48fd9d9f47b5467cb424240c7f9f276, type: 3}
- target: {fileID: 4883996976931216989, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
@@ -2242,7 +2251,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1027733709
m_SortingLayer: 1
m_SortingLayer: 2
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: f1a2cb3f7f820294b8bf45a3cf11e89a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}