diff --git a/Assets/Resources/Games/workingDough.prefab b/Assets/Resources/Games/workingDough.prefab index 5eafbaa5..217e3b3a 100644 --- a/Assets/Resources/Games/workingDough.prefab +++ b/Assets/Resources/Games/workingDough.prefab @@ -226,8 +226,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 133050624414910191} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.4317, y: -0.08510001, z: 0} - m_LocalScale: {x: 0.027499998, y: 0.027499998, z: 1} + m_LocalPosition: {x: -0.4324, y: -0.0824, z: 0} + m_LocalScale: {x: 0.028724065, y: 0.028724065, z: 1.0445116} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2291739861585566994} @@ -309,7 +309,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 175006354839267055} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.447, y: 3.142, z: 0} + m_LocalPosition: {x: -1.584, y: 3.497, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -341,8 +341,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 183748965372185674} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.36030003, y: 0.0068000006, z: 0} - m_LocalScale: {x: 0.027499998, y: 0.027499998, z: 1} + m_LocalPosition: {x: -0.3649, y: 0.0062, z: 0} + m_LocalScale: {x: 0.028482111, y: 0.028482111, z: 1.0357132} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2291739861585566994} @@ -425,8 +425,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 235293979783291810} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.3125, y: -0.0315, z: 0} - m_LocalScale: {x: 0.027499998, y: 0.027499998, z: 1} + m_LocalPosition: {x: -0.31426, y: -0.0338, z: 0} + m_LocalScale: {x: 0.028482111, y: 0.028482111, z: 1.0357132} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2291739861585566994} @@ -1250,7 +1250,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 856345965020846573} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.316, y: 3.146, z: 0} + m_LocalPosition: {x: -4.959, y: 3.566, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1619,8 +1619,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1159492773092678817} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.4199, y: -0.0315, z: 0} - m_LocalScale: {x: 0.027499998, y: 0.027499998, z: 1} + m_LocalPosition: {x: -0.4242, y: -0.0338, z: 0} + m_LocalScale: {x: 0.028482111, y: 0.028482111, z: 1.0357132} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2291739861585566994} @@ -1818,7 +1818,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1249675109991954412} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.4801, y: 0.075500004, z: 0} + m_LocalPosition: {x: -0.4841, y: 0.0774, z: 0} m_LocalScale: {x: 0.027499998, y: 0.027499998, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2575,8 +2575,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1960724902114768218} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.4062, y: 0.1111, z: 0} - m_LocalScale: {x: 0.0275, y: 0.0275, z: 1} + m_LocalPosition: {x: 0.41974, y: 0.109, z: 0} + m_LocalScale: {x: 0.02867027, y: 0.02867027, z: 1.0425553} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3839262427627558499} @@ -3051,8 +3051,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2294933692644895938} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.4284, y: 0.1492, z: 0} - m_LocalScale: {x: 0.0275, y: 0.0275, z: 1} + m_LocalPosition: {x: 0.4374, y: 0.1474, z: 0} + m_LocalScale: {x: 0.027742, y: 0.027742, z: 1.0088} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3839262427627558499} @@ -3135,7 +3135,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2381724555849182230} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.261, y: -0.1823, z: 0} + m_LocalPosition: {x: -0.261, y: -0.1878, z: 0} m_LocalScale: {x: 0.027499998, y: 0.027499998, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3303,7 +3303,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2453527913116199009} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.368, y: 0.422, z: 0} + m_LocalPosition: {x: 3.457, y: 0.271, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3502,7 +3502,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2674440432262441285} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.289, y: 3.142, z: 0} + m_LocalPosition: {x: 5.186, y: 3.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3567,8 +3567,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2699690179793049664} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.5027, y: -0.114900015, z: 0} - m_LocalScale: {x: 0.027499998, y: 0.027499998, z: 1} + m_LocalPosition: {x: -0.5091, y: -0.115779996, z: 0} + m_LocalScale: {x: 0.028228747, y: 0.028228747, z: 1.0265} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2291739861585566994} @@ -3735,8 +3735,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2860743711354871909} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.5027, y: -0.1837, z: 0} - m_LocalScale: {x: 0.027499998, y: 0.027499998, z: 1} + m_LocalPosition: {x: -0.5091, y: -0.1864, z: 0} + m_LocalScale: {x: 0.028228747, y: 0.028228747, z: 1.0265} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2291739861585566994} @@ -5139,8 +5139,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3742160956613915319} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.33580002, y: -0.15750001, z: 0} - m_LocalScale: {x: 0.027499998, y: 0.027499998, z: 1} + m_LocalPosition: {x: 0.3434, y: -0.1584, z: 0} + m_LocalScale: {x: 0.028228747, y: 0.028228747, z: 1.0265} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2291739861585566994} @@ -5344,7 +5344,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3858965620394938747} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.258, y: -0.1823, z: 0} + m_LocalPosition: {x: 0.2712, y: -0.1878, z: 0} m_LocalScale: {x: 0.027499998, y: 0.027499998, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5596,8 +5596,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4210674834099149471} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.344, y: -0.1679, z: 0} - m_LocalScale: {x: 0.027499998, y: 0.027499998, z: 1} + m_LocalPosition: {x: 0.3498, y: -0.1717, z: 0} + m_LocalScale: {x: 0.028685953, y: 0.028685953, z: 1.0431256} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2291739861585566994} @@ -5933,7 +5933,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4645724415892072949} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.017359996, y: -0.227, z: 0} + m_LocalPosition: {x: 0.017359996, y: -0.2317, z: 0} m_LocalScale: {x: 0.03, y: 0.03, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -6166,8 +6166,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4739472692675560665} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.4054, y: 0.1093, z: 0} - m_LocalScale: {x: 0.0275, y: 0.0275, z: 1} + m_LocalPosition: {x: -0.41074002, y: 0.1093, z: 0} + m_LocalScale: {x: 0.0284735, y: 0.0284735, z: 1.0354} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3839262427627558499} @@ -6726,7 +6726,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5019667036651605351} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.368, y: 0.422, z: 0} + m_LocalPosition: {x: -3.308, y: 0.265, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -6822,8 +6822,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5089234276602518314} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.3901, y: -0.15750001, z: 0} - m_LocalScale: {x: 0.027499998, y: 0.027499998, z: 1} + m_LocalPosition: {x: 0.39829996, y: -0.1584, z: 0} + m_LocalScale: {x: 0.028228747, y: 0.028228747, z: 1.0265} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2291739861585566994} @@ -7424,8 +7424,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5569683690855811483} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.3415, y: -0.1462, z: 0} - m_LocalScale: {x: 0.024999999, y: 0.024999999, z: 1} + m_LocalPosition: {x: -0.3399, y: -0.1391, z: 0} + m_LocalScale: {x: 0.028860675, y: 0.028860675, z: 1.154427} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2291739861585566994} @@ -7508,8 +7508,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5572311965699107931} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.0509, y: 0.1097, z: 0} - m_LocalScale: {x: 0.0275, y: 0.0275, z: 1} + m_LocalPosition: {x: -0.052319, y: 0.10940001, z: 0} + m_LocalScale: {x: 0.028228749, y: 0.028228749, z: 1.0265} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3839262427627558499} @@ -7592,8 +7592,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5635080218152057524} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.4058, y: -0.291, z: 0} - m_LocalScale: {x: 0.0275, y: 0.0275, z: 1} + m_LocalPosition: {x: -0.4278, y: -0.2809, z: 0} + m_LocalScale: {x: 0.027491946, y: 0.027491946, z: 0.99970704} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3839262427627558499} @@ -7676,8 +7676,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5690423456339693452} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.425, y: 0.1486, z: 0} - m_LocalScale: {x: 0.0275, y: 0.0275, z: 1} + m_LocalPosition: {x: -0.42634052, y: 0.1486, z: 0} + m_LocalScale: {x: 0.027742, y: 0.027742, z: 1.0088} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3839262427627558499} @@ -8341,7 +8341,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6219959128085394575} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.42, y: 3.146, z: 0} + m_LocalPosition: {x: 1.816, y: 3.563, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -8943,8 +8943,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6825367882439310815} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.2993, y: 0.1111, z: 0} - m_LocalScale: {x: 0.0275, y: 0.0275, z: 1} + m_LocalPosition: {x: 0.3083, y: 0.109, z: 0} + m_LocalScale: {x: 0.02867027, y: 0.02867027, z: 1.0425553} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3839262427627558499} @@ -9027,8 +9027,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6916770449781898787} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.4436, y: -0.15750001, z: 0} - m_LocalScale: {x: 0.027499998, y: 0.027499998, z: 1} + m_LocalPosition: {x: 0.45289996, y: -0.1584, z: 0} + m_LocalScale: {x: 0.028228747, y: 0.028228747, z: 1.0265} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2291739861585566994} @@ -10433,8 +10433,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7822987519618068643} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.297, y: 0.1093, z: 0} - m_LocalScale: {x: 0.0275, y: 0.0275, z: 1} + m_LocalPosition: {x: -0.2997, y: 0.1093, z: 0} + m_LocalScale: {x: 0.0284735, y: 0.0284735, z: 1.0354} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3839262427627558499} @@ -10517,8 +10517,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7840149124385687523} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.26953003, y: -0.0052, z: 0} - m_LocalScale: {x: 0.024999999, y: 0.024999999, z: 1} + m_LocalPosition: {x: -0.2687, y: -0.0054, z: 0} + m_LocalScale: {x: 0.028386602, y: 0.028386602, z: 1.1354642} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2291739861585566994} @@ -10680,14 +10680,14 @@ MonoBehaviour: - tag: pos: {x: 0, y: 0, z: 0} target: {fileID: 8243929818588775467} - height: 2 + height: 1.75 duration: 1 useLastRealPos: 0 values: [] - tag: pos: {x: 0, y: 0, z: 0} target: {fileID: 7938430731601127163} - height: 2.5 + height: 1.75 duration: 1 useLastRealPos: 0 values: [] @@ -10730,7 +10730,7 @@ MonoBehaviour: - tag: pos: {x: 0, y: 0, z: 0} target: {fileID: 7417620092316839188} - height: 2 + height: 1.75 duration: 1 useLastRealPos: 0 values: [] @@ -10748,7 +10748,7 @@ MonoBehaviour: - tag: pos: {x: 0, y: 0, z: 0} target: {fileID: 6352785748787418662} - height: 2.5 + height: 1.75 duration: 1 useLastRealPos: 0 values: [] @@ -11257,8 +11257,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8145138357967239947} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.0561, y: 0.1095, z: 0} - m_LocalScale: {x: 0.0275, y: 0.0275, z: 1} + m_LocalPosition: {x: 0.057519, y: 0.1092, z: 0} + m_LocalScale: {x: 0.028228749, y: 0.028228749, z: 1.0265} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3839262427627558499} @@ -12700,19 +12700,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1330032459800393080, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} propertyPath: m_LocalScale.x - value: 0.53 + value: 0.534664 objectReference: {fileID: 0} - target: {fileID: 1330032459800393080, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} propertyPath: m_LocalScale.y - value: 0.53 + value: 0.534664 + objectReference: {fileID: 0} + - target: {fileID: 1330032459800393080, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} + propertyPath: m_LocalScale.z + value: 1.0088 objectReference: {fileID: 0} - target: {fileID: 1330032459800393080, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} propertyPath: m_LocalPosition.x - value: -2.324 + value: -2.33 objectReference: {fileID: 0} - target: {fileID: 1330032459800393080, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} propertyPath: m_LocalPosition.y - value: -1.787 + value: -1.775 objectReference: {fileID: 0} - target: {fileID: 1330032459800393080, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} propertyPath: m_LocalPosition.z @@ -12746,6 +12750,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2742453078061299544, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} + propertyPath: m_LocalPosition.x + value: 0.648 + objectReference: {fileID: 0} + - target: {fileID: 2742453078061299544, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} + propertyPath: m_LocalPosition.y + value: 0.065 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} --- !u!1 &616834573968593202 stripped @@ -12800,7 +12812,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3261934242483390250, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} propertyPath: m_LocalPosition.y - value: -3.0107033 + value: -3.144 objectReference: {fileID: 0} - target: {fileID: 3261934242483390250, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} propertyPath: m_LocalPosition.z @@ -12862,6 +12874,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 1228033412872818547, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} + propertyPath: m_LocalPosition.x + value: 0.019 + objectReference: {fileID: 0} - target: {fileID: 1228033412872818547, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} propertyPath: m_LocalPosition.y value: 0.2 @@ -12896,7 +12912,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3261934242483390250, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} propertyPath: m_LocalPosition.y - value: -3.0166938 + value: -3.137 objectReference: {fileID: 0} - target: {fileID: 3261934242483390250, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} propertyPath: m_LocalPosition.z @@ -12934,10 +12950,46 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0.418 objectReference: {fileID: 0} + - target: {fileID: 3703437605052498154, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} + propertyPath: m_Size.x + value: 1.53 + objectReference: {fileID: 0} + - target: {fileID: 3703437605052498154, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} + propertyPath: m_Size.y + value: 2.62 + objectReference: {fileID: 0} + - target: {fileID: 3703437605052498154, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5243118048156217723, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} + propertyPath: m_LocalPosition.x + value: 0.058 + objectReference: {fileID: 0} - target: {fileID: 5243118048156217723, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} propertyPath: m_LocalPosition.y value: 0.339 objectReference: {fileID: 0} + - target: {fileID: 5243118048156217723, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} + propertyPath: m_LocalPosition.z + value: 63.83932 + objectReference: {fileID: 0} + - target: {fileID: 5315066626796327776, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} + propertyPath: m_Size.x + value: 2.04 + objectReference: {fileID: 0} + - target: {fileID: 5315066626796327776, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} + propertyPath: m_Size.y + value: 3.81 + objectReference: {fileID: 0} + - target: {fileID: 5315066626796327776, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7292137674414384435, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 8467354610658101614, guid: 7d485aead8578964591aaea2653dec14, type: 3} - target: {fileID: 8871343647334617765, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} propertyPath: m_LocalPosition.x value: 0.011 @@ -13026,6 +13078,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2742453078061299544, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} + propertyPath: m_LocalPosition.x + value: 0.661 + objectReference: {fileID: 0} + - target: {fileID: 2742453078061299544, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} + propertyPath: m_LocalPosition.y + value: 0.051 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} --- !u!212 &5150472726866256945 stripped @@ -13060,19 +13120,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5941751787586211251, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} propertyPath: m_LocalScale.x - value: 0.53 + value: 0.534664 objectReference: {fileID: 0} - target: {fileID: 5941751787586211251, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} propertyPath: m_LocalScale.y - value: 0.53 + value: 0.534664 + objectReference: {fileID: 0} + - target: {fileID: 5941751787586211251, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0088 objectReference: {fileID: 0} - target: {fileID: 5941751787586211251, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} propertyPath: m_LocalPosition.x - value: 8.603727 + value: 8.751328 objectReference: {fileID: 0} - target: {fileID: 5941751787586211251, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} propertyPath: m_LocalPosition.y - value: -1.767 + value: -1.8007998 objectReference: {fileID: 0} - target: {fileID: 5941751787586211251, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} propertyPath: m_LocalPosition.z @@ -13106,6 +13170,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7354176120998023059, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} + propertyPath: m_LocalPosition.x + value: -0.621 + objectReference: {fileID: 0} + - target: {fileID: 7354176120998023059, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} + propertyPath: m_LocalPosition.y + value: -0.016 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} --- !u!212 &1388675758678105055 stripped @@ -13186,6 +13258,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7354176120998023059, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} + propertyPath: m_LocalPosition.x + value: -0.614 + objectReference: {fileID: 0} + - target: {fileID: 7354176120998023059, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} + propertyPath: m_LocalPosition.y + value: -0.024 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} --- !u!212 &1432049725433526705 stripped diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/BigDoughDudeIdle.anim b/Assets/Resources/Sprites/Games/WorkingDough/Animations/BigDoughDudeIdle.anim index de89e8a1..2927ca01 100644 --- a/Assets/Resources/Sprites/Games/WorkingDough/Animations/BigDoughDudeIdle.anim +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/BigDoughDudeIdle.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.1, y: -0.028, z: 0} + value: {x: -0.052, y: -0.039, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.083333336 - value: {x: -0.003, y: -0.05, z: 0} + value: {x: -0.014, y: -0.06, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -38,7 +38,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 - value: {x: -0.031, y: -0.05, z: 0} + value: {x: -0.098, y: -0.033, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -47,7 +47,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.25 - value: {x: -0.076, y: -0.028, z: 0} + value: {x: 0.006, y: -0.059, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -63,13 +63,13 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: -6051447644368879059, guid: 7d485aead8578964591aaea2653dec14, type: 3} + value: {fileID: -32806069753681351, guid: 7d485aead8578964591aaea2653dec14, type: 3} - time: 0.083333336 value: {fileID: 8299091404543056132, guid: 7d485aead8578964591aaea2653dec14, type: 3} - time: 0.16666667 - value: {fileID: -32806069753681351, guid: 7d485aead8578964591aaea2653dec14, type: 3} - - time: 0.25 value: {fileID: -6051447644368879059, guid: 7d485aead8578964591aaea2653dec14, type: 3} + - time: 0.25 + value: {fileID: 8299091404543056132, guid: 7d485aead8578964591aaea2653dec14, type: 3} attribute: m_Sprite path: classID: 212 @@ -96,10 +96,10 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: + - {fileID: -32806069753681351, guid: 7d485aead8578964591aaea2653dec14, type: 3} + - {fileID: 8299091404543056132, guid: 7d485aead8578964591aaea2653dec14, type: 3} - {fileID: -6051447644368879059, guid: 7d485aead8578964591aaea2653dec14, type: 3} - {fileID: 8299091404543056132, guid: 7d485aead8578964591aaea2653dec14, type: 3} - - {fileID: -32806069753681351, guid: 7d485aead8578964591aaea2653dec14, type: 3} - - {fileID: -6051447644368879059, guid: 7d485aead8578964591aaea2653dec14, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -126,7 +126,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.1 + value: -0.052 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -135,7 +135,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 - value: -0.003 + value: -0.014 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -144,7 +144,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: -0.031 + value: -0.098 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -153,7 +153,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: -0.076 + value: 0.006 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -172,7 +172,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.028 + value: -0.039 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -181,7 +181,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 - value: -0.05 + value: -0.06 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -190,7 +190,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: -0.05 + value: -0.033 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -199,7 +199,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: -0.028 + value: -0.059 inSlope: Infinity outSlope: 0 tangentMode: 7 diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/BigDoughJump.anim b/Assets/Resources/Sprites/Games/WorkingDough/Animations/BigDoughJump.anim index 2976414c..229567b5 100644 --- a/Assets/Resources/Sprites/Games/WorkingDough/Animations/BigDoughJump.anim +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/BigDoughJump.anim @@ -92,7 +92,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.4 - value: {x: 0.065, y: 0.394, z: 63.839317} + value: {x: 0.055, y: 0.404, z: 63.839317} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -101,7 +101,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.46666667 - value: {x: 0.065, y: 0.376, z: 63.839317} + value: {x: 0.055, y: 0.392, z: 63.839317} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -275,31 +275,6 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: SmallDoughHolder/SmallDoughDude - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0.003, y: -0.104, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.46666667 - value: {x: 0.003, y: -0.104, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: SmallDoughHolder/SmallDoughDudeIdle m_ScaleCurves: [] m_FloatCurves: - curve: @@ -530,13 +505,6 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 3382481983 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 pptrCurveMapping: - {fileID: 4633704460932284753, guid: 7d485aead8578964591aaea2653dec14, type: 3} - {fileID: 2483442457371451832, guid: 7d485aead8578964591aaea2653dec14, type: 3} @@ -639,7 +607,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.4 - value: 0.065 + value: 0.055 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -648,7 +616,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.46666667 - value: 0.065 + value: 0.055 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -739,7 +707,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.4 - value: 0.394 + value: 0.404 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -748,7 +716,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.46666667 - value: 0.376 + value: 0.392 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1526,90 +1494,6 @@ AnimationClip: path: SmallDoughHolder/SmallDoughDude classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.003 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.46666667 - value: 0.003 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: SmallDoughHolder/SmallDoughDudeIdle - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.104 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.46666667 - value: -0.104 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: SmallDoughHolder/SmallDoughDudeIdle - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.46666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: SmallDoughHolder/SmallDoughDudeIdle - classID: 4 - script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/NoJumping.anim b/Assets/Resources/Sprites/Games/WorkingDough/Animations/NoJumping.anim index 9894f503..9d497d0a 100644 --- a/Assets/Resources/Sprites/Games/WorkingDough/Animations/NoJumping.anim +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/NoJumping.anim @@ -20,18 +20,18 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.058, y: 0.379, z: 63.839317} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: 0.058, y: 0.393, z: 63.839317} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 - value: {x: 0.058, y: 0.379, z: 63.839317} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: 0.058, y: 0.393, z: 63.839317} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -46,8 +46,8 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0.019, y: 0.558, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -55,8 +55,8 @@ AnimationClip: - serializedVersion: 3 time: 1 value: {x: 0.019, y: 0.558, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -71,8 +71,8 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0.003, y: -0.104, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -80,8 +80,8 @@ AnimationClip: - serializedVersion: 3 time: 1 value: {x: 0.003, y: -0.104, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -96,8 +96,8 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0.003, y: -0.112, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -105,8 +105,8 @@ AnimationClip: - serializedVersion: 3 time: 1 value: {x: 0.003, y: -0.112, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -181,18 +181,18 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0.058 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: 0.058 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -208,19 +208,19 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.379 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: 0.393 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.379 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: 0.393 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -237,18 +237,18 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 63.839317 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: 63.839317 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -265,18 +265,18 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0.019 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: 0.019 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -293,18 +293,18 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0.558 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: 0.558 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -321,18 +321,18 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -349,18 +349,18 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0.003 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: 0.003 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -377,18 +377,18 @@ AnimationClip: - serializedVersion: 3 time: 0 value: -0.104 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: -0.104 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -405,18 +405,18 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -433,18 +433,18 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0.003 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: 0.003 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -461,18 +461,18 @@ AnimationClip: - serializedVersion: 3 time: 0 value: -0.112 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: -0.112 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -489,18 +489,18 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/SmallDoughDudeIdle.anim b/Assets/Resources/Sprites/Games/WorkingDough/Animations/SmallDoughDudeIdle.anim index 1b9a8e87..bb2e6b6d 100644 --- a/Assets/Resources/Sprites/Games/WorkingDough/Animations/SmallDoughDudeIdle.anim +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/SmallDoughDudeIdle.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.003, y: -0.104, z: 0} + value: {x: 0.002, y: -0.101, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.083333336 - value: {x: 0.003, y: -0.165, z: 0} + value: {x: 0.027, y: -0.162, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -38,7 +38,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 - value: {x: 0.003, y: -0.134, z: 0} + value: {x: 0.036, y: -0.14, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -47,7 +47,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.25 - value: {x: -0.003, y: -0.082, z: 0} + value: {x: 0.002, y: -0.101, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -126,7 +126,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.003 + value: 0.002 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -135,7 +135,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 - value: 0.003 + value: 0.027 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -144,7 +144,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: 0.003 + value: 0.036 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -153,7 +153,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: -0.003 + value: 0.002 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -172,7 +172,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.104 + value: -0.101 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -181,7 +181,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 - value: -0.165 + value: -0.162 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -190,7 +190,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: -0.134 + value: -0.14 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -199,7 +199,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: -0.082 + value: -0.101 inSlope: Infinity outSlope: 0 tangentMode: 7 diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/SmallDoughJump.anim b/Assets/Resources/Sprites/Games/WorkingDough/Animations/SmallDoughJump.anim index 232323fb..df8f7b5f 100644 --- a/Assets/Resources/Sprites/Games/WorkingDough/Animations/SmallDoughJump.anim +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/SmallDoughJump.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.011, y: 3.95, z: 0} + value: {x: 0.011, y: 3.881, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.2 - value: {x: 0.011, y: 3.67, z: 0} + value: {x: 0.011, y: 3.65, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -38,7 +38,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.23333333 - value: {x: 0.011, y: 3.54, z: 0} + value: {x: 0.011, y: 3.501, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -99,7 +99,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 5.11, z: 0} + value: {x: 0, y: 5.0410004, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -108,7 +108,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.2 - value: {x: 0.018, y: 4.82, z: 0} + value: {x: 0.018, y: 4.8, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -117,7 +117,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.23333333 - value: {x: 0.018, y: 4.66, z: 0} + value: {x: 0.018, y: 4.621, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -178,7 +178,16 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.024, y: 2.065, z: 0} + value: {x: 0.024, y: 1.9960002, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.2 + value: {x: 0.024, y: 1.9760003, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -198,6 +207,22 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: SmallDoughHolder/SmallSmokeTrail + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.058, y: 0.393, z: 63.839317} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: SmallDoughHolder m_ScaleCurves: [] m_FloatCurves: - curve: @@ -372,6 +397,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3844208733 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 1107659536 attribute: 2086281974 @@ -520,7 +552,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 3.95 + value: 3.881 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -529,7 +561,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 - value: 3.67 + value: 3.65 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -538,7 +570,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: 3.54 + value: 3.501 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -766,7 +798,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 5.11 + value: 5.0410004 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -775,7 +807,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 - value: 4.82 + value: 4.8 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -784,7 +816,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: 4.66 + value: 4.621 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1067,6 +1099,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0.024 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.4 value: 0.024 @@ -1088,7 +1129,16 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2.065 + value: 1.9960002 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 1.9760003 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1123,6 +1173,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.4 value: 0 @@ -1139,6 +1198,63 @@ AnimationClip: path: SmallDoughHolder/SmallSmokeTrail classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.058 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: SmallDoughHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.393 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: SmallDoughHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 63.839317 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: SmallDoughHolder + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs b/Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs index dd1f6c29..e4e172ef 100644 --- a/Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs +++ b/Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs @@ -20,7 +20,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough } private State currentState; - private double startBeat; + private double startBeat = double.MinValue; private bool big; @@ -64,45 +64,49 @@ namespace HeavenStudio.Games.Scripts_WorkingDough if (cond.isPlaying && !cond.isPaused) { - Vector3 pos = new Vector3(); - double beat = cond.songPositionInBeats; - switch (currentState) + if (startBeat > double.MinValue) { - case State.None: - break; - case State.Entering: - pos = GetPathPositionFromBeat(enterPath, Math.Max(beat, startBeat), startBeat); - break; - case State.Hit: - pos = GetPathPositionFromBeat(hitPath, Math.Max(beat, startBeat), startBeat); - if (beat >= startBeat + 1) - { - Destroy(gameObject); - } - break; - case State.Miss: - pos = GetPathPositionFromBeat(missPath, Math.Max(beat, startBeat), startBeat); - if (beat >= startBeat + 1) - { - Destroy(gameObject); - } - break; - case State.Weak: - pos = GetPathPositionFromBeat(weakPath, Math.Max(beat, startBeat), startBeat); - if (beat >= startBeat + 1) - { - Destroy(gameObject); - } - break; - case State.Barely: - pos = GetPathPositionFromBeat(barelyPath, Math.Max(beat, startBeat), startBeat); - if (beat >= startBeat + 2) - { - Destroy(gameObject); - } - break; + Vector3 pos = new Vector3(); + double beat = cond.songPositionInBeats; + switch (currentState) + { + case State.None: + break; + case State.Entering: + pos = GetPathPositionFromBeat(enterPath, Math.Max(beat, startBeat), startBeat); + break; + case State.Hit: + pos = GetPathPositionFromBeat(hitPath, Math.Max(beat, startBeat), startBeat); + if (beat >= startBeat + 1) + { + Destroy(gameObject); + } + break; + case State.Miss: + pos = GetPathPositionFromBeat(missPath, Math.Max(beat, startBeat), startBeat); + if (beat >= startBeat + 1) + { + Destroy(gameObject); + } + break; + case State.Weak: + pos = GetPathPositionFromBeat(weakPath, Math.Max(beat, startBeat), startBeat); + if (beat >= startBeat + 1) + { + Destroy(gameObject); + } + break; + case State.Barely: + pos = GetPathPositionFromBeat(barelyPath, Math.Max(beat, startBeat), startBeat); + if (beat >= startBeat + 2) + { + Destroy(gameObject); + } + break; + } + if (startBeat <= beat) transform.position = pos; + else transform.position = new Vector3(-80, -80); } - transform.position = pos; } } @@ -123,12 +127,12 @@ namespace HeavenStudio.Games.Scripts_WorkingDough if (big) { SoundByte.PlayOneShotGame("workingDough/bigPlayer"); - game.doughDudesPlayer.GetComponent().Play("BigDoughJump", 0, 0); + game.doughDudesPlayer.GetComponent().DoScaledAnimationAsync("BigDoughJump", 0.5f); } else { SoundByte.PlayOneShotGame("workingDough/smallPlayer"); - game.doughDudesPlayer.GetComponent().Play("SmallDoughJump", 0, 0); + game.doughDudesPlayer.GetComponent().DoScaledAnimationAsync("SmallDoughJump", 0.5f); } Update(); return; @@ -138,14 +142,14 @@ namespace HeavenStudio.Games.Scripts_WorkingDough { SoundByte.PlayOneShotGame("workingDough/bigPlayer"); SoundByte.PlayOneShotGame("workingDough/hitBigPlayer"); - game.doughDudesPlayer.GetComponent().Play("BigDoughJump", 0, 0); + game.doughDudesPlayer.GetComponent().DoScaledAnimationAsync("BigDoughJump", 0.5f); game.backgroundAnimator.Play("BackgroundFlash", 0, 0); } else { SoundByte.PlayOneShotGame("workingDough/smallPlayer"); SoundByte.PlayOneShotGame("workingDough/hitSmallPlayer"); - game.doughDudesPlayer.GetComponent().Play("SmallDoughJump", 0, 0); + game.doughDudesPlayer.GetComponent().DoScaledAnimationAsync("SmallDoughJump", 0.5f); } bool hasGandw = false; if (gandw != null) hasGandw = gandw.activeSelf; @@ -171,7 +175,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough { currentState = State.Weak; startBeat = beat; - game.doughDudesPlayer.GetComponent().Play("SmallDoughJump", 0, 0); + game.doughDudesPlayer.GetComponent().DoScaledAnimationAsync("SmallDoughJump", 0.5f); SoundByte.PlayOneShotGame("workingDough/smallPlayer"); SoundByte.PlayOneShotGame("workingDough/tooBig"); Update(); @@ -179,7 +183,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough else { GameObject.Instantiate(game.breakParticleEffect, game.breakParticleHolder); - game.doughDudesPlayer.GetComponent().Play("BigDoughJump", 0, 0); + game.doughDudesPlayer.GetComponent().DoScaledAnimationAsync("BigDoughJump", 0.5f); SoundByte.PlayOneShotGame("workingDough/bigPlayer"); SoundByte.PlayOneShotGame("workingDough/tooSmall"); Destroy(gameObject); diff --git a/Assets/Scripts/Games/WorkingDough/WorkingDough.cs b/Assets/Scripts/Games/WorkingDough/WorkingDough.cs index 05a2b76e..d42ff311 100644 --- a/Assets/Scripts/Games/WorkingDough/WorkingDough.cs +++ b/Assets/Scripts/Games/WorkingDough/WorkingDough.cs @@ -365,7 +365,7 @@ namespace HeavenStudio.Games { //Jump and play sound new BeatAction.Action(beat + 0.1f, delegate { arrowSRLeftNPC.sprite = whiteArrowSprite; }), - new BeatAction.Action(beat + 1f, delegate { doughDudesNPC.GetComponent().Play(isBig ? "BigDoughJump" :"SmallDoughJump", 0, 0); }), + new BeatAction.Action(beat + 1f, delegate { doughDudesNPC.GetComponent().DoScaledAnimationAsync(isBig ? "BigDoughJump" :"SmallDoughJump", 0.5f); }), new BeatAction.Action(beat + 1f, delegate { npcImpact.SetActive(true); }), new BeatAction.Action(beat + 1.1f, delegate { npcImpact.SetActive(false); }), new BeatAction.Action(beat + 1.9f, delegate { arrowSRRightNPC.sprite = redArrowSprite; }), @@ -532,12 +532,12 @@ namespace HeavenStudio.Games } if (PlayerInput.Pressed() && !IsExpectingInputNow(InputType.STANDARD_DOWN)) { - doughDudesPlayer.GetComponent().Play("SmallDoughJump", 0, 0); + doughDudesPlayer.GetComponent().DoScaledAnimationAsync("SmallDoughJump", 0.5f); SoundByte.PlayOneShotGame("workingDough/smallPlayer"); } else if (PlayerInput.AltPressed() && !IsExpectingInputNow(InputType.STANDARD_ALT_DOWN)) { - doughDudesPlayer.GetComponent().Play("BigDoughJump", 0, 0); + doughDudesPlayer.GetComponent().DoScaledAnimationAsync("BigDoughJump", 0.5f); SoundByte.PlayOneShotGame("workingDough/bigPlayer"); } } diff --git a/Assets/StreamingAssets/StreamingAssets b/Assets/StreamingAssets/StreamingAssets index 8da8f852..ad3ca9ad 100644 Binary files a/Assets/StreamingAssets/StreamingAssets and b/Assets/StreamingAssets/StreamingAssets differ diff --git a/Assets/StreamingAssets/StreamingAssets.manifest b/Assets/StreamingAssets/StreamingAssets.manifest index fc1b0944..4d502958 100644 --- a/Assets/StreamingAssets/StreamingAssets.manifest +++ b/Assets/StreamingAssets/StreamingAssets.manifest @@ -1,34 +1,34 @@ ManifestFileVersion: 0 -CRC: 759703038 +CRC: 368295644 AssetBundleManifest: AssetBundleInfos: Info_0: - Name: karate/common - Dependencies: {} - Info_1: - Name: ntridol/common - Dependencies: {} - Info_2: Name: ctrpillow/common Dependencies: {} - Info_3: + Info_1: + Name: ntrsamurai/common + Dependencies: {} + Info_2: Name: rvlbooks/locale.en Dependencies: {} - Info_4: - Name: ntridol/locale.jp - Dependencies: {} - Info_5: + Info_3: Name: agbmarcher/locale.jp Dependencies: {} - Info_6: + Info_4: + Name: ntridol/common + Dependencies: {} + Info_5: Name: ntrdj/common Dependencies: Dependency_0: rvldate/common + Info_6: + Name: ctrpillow/locale.jp + Dependencies: {} Info_7: - Name: ntrsamurai/common + Name: karate/common Dependencies: {} Info_8: - Name: ntrcoin/common + Name: ctrcatchy/common Dependencies: {} Info_9: Name: rvlbooks/common @@ -37,183 +37,183 @@ AssetBundleManifest: Name: agbmarcher/common Dependencies: {} Info_11: - Name: ctrcatchy/common + Name: ntridol/locale.jp Dependencies: {} Info_12: Name: agbmarcher/locale.en Dependencies: {} Info_13: - Name: ctrpillow/locale.ko + Name: ctrpillow/locale.en Dependencies: {} Info_14: Name: karate/locale.en Dependencies: {} Info_15: - Name: ctrpillow/locale.jp + Name: ntrcoin/common Dependencies: {} Info_16: - Name: ctrpillow/locale.en + Name: ctrpillow/locale.ko Dependencies: {} Info_17: Name: ntrsamurai/locale.en Dependencies: {} Info_18: - Name: rvldate/common - Dependencies: - Dependency_0: ntrdj/common + Name: ntrassembly/common + Dependencies: {} Info_19: - Name: agbtap/common - Dependencies: - Dependency_0: ntridol/common + Name: rvlinterview/locale.en + Dependencies: {} Info_20: - Name: ctrinterpreter/common + Name: rvlseal/locale.en Dependencies: {} Info_21: - Name: rvlbadminton/locale.en + Name: agbtoss/common Dependencies: {} Info_22: + Name: rvlrotation/common + Dependencies: {} + Info_23: + Name: rvlbadminton/locale.en + Dependencies: {} + Info_24: + Name: agbhair/common + Dependencies: {} + Info_25: + Name: agbclap/common + Dependencies: {} + Info_26: + Name: ctrinterpreter/common + Dependencies: {} + Info_27: + Name: ntrboxshow/common + Dependencies: {} + Info_28: + Name: agbexplode/common + Dependencies: {} + Info_29: + Name: rvllegs/common + Dependencies: {} + Info_30: Name: agbquiz/common Dependencies: Dependency_0: karate/common - Info_23: - Name: ntrtunnel/common + Info_31: + Name: agboffbeat/common Dependencies: {} - Info_24: - Name: rvlinterview/common + Info_32: + Name: ntrpingpong/common Dependencies: {} - Info_25: - Name: ntrshugyo/locale.en + Info_33: + Name: ntrcork/common Dependencies: {} - Info_26: + Info_34: + Name: agbspacedance/common + Dependencies: {} + Info_35: + Name: ctrbear/common + Dependencies: {} + Info_36: + Name: ntrbackbeat/common + Dependencies: {} + Info_37: Name: ntrninja/common Dependencies: {} - Info_27: - Name: pcomeat/common + Info_38: + Name: ntrsoccer/locale.en Dependencies: {} - Info_28: - Name: ntrsoccer/common - Dependencies: {} - Info_29: + Info_39: Name: ctrintro/common Dependencies: {} - Info_30: + Info_40: Name: rvlrocket/common Dependencies: {} - Info_31: + Info_41: + Name: pcosomen/common + Dependencies: {} + Info_42: Name: agbbatter/common Dependencies: Dependency_0: karate/common - Info_32: - Name: ntrstomp/common - Dependencies: {} - Info_33: + Info_43: Name: agbspacedance/locale.jp Dependencies: {} - Info_34: + Info_44: Name: agbghost/common Dependencies: {} - Info_35: - Name: ctrteppan/common - Dependencies: {} - Info_36: - Name: rvlbadminton/common - Dependencies: {} - Info_37: - Name: rvlseesaw/common - Dependencies: {} - Info_38: - Name: rvldough/common - Dependencies: {} - Info_39: - Name: rvlfork/common - Dependencies: {} - Info_40: - Name: mobtrick/common - Dependencies: {} - Info_41: - Name: rvlinterview/locale.en - Dependencies: {} - Info_42: - Name: rvlseal/locale.en - Dependencies: {} - Info_43: - Name: agbtoss/common - Dependencies: {} - Info_44: - Name: rvlrotation/common - Dependencies: {} Info_45: - Name: agbhair/common - Dependencies: {} - Info_46: - Name: rvllegs/locale.en - Dependencies: {} - Info_47: - Name: agbwizard/common - Dependencies: {} - Info_48: - Name: pcosomen/common - Dependencies: {} - Info_49: - Name: agbspacedance/common - Dependencies: {} - Info_50: - Name: ctrbear/common - Dependencies: {} - Info_51: - Name: ntrassembly/common - Dependencies: {} - Info_52: - Name: ntrbackbeat/common - Dependencies: {} - Info_53: - Name: ntrcork/common - Dependencies: {} - Info_54: - Name: rvlrotation/locale.en - Dependencies: {} - Info_55: - Name: rvllegs/common - Dependencies: {} - Info_56: - Name: agboffbeat/common - Dependencies: {} - Info_57: - Name: ntrpingpong/common - Dependencies: {} - Info_58: - Name: ntrsoccer/locale.en - Dependencies: {} - Info_59: - Name: rvlseal/common - Dependencies: {} - Info_60: - Name: agbclap/common - Dependencies: {} - Info_61: - Name: ntrboxshow/common - Dependencies: {} - Info_62: - Name: ntrshugyo/common - Dependencies: {} - Info_63: - Name: agbexplode/common - Dependencies: {} - Info_64: - Name: ntrboxshow/locale.en - Dependencies: {} - Info_65: - Name: rvlseesaw/locale.en - Dependencies: {} - Info_66: Name: ntrchorus/common Dependencies: {} - Info_67: - Name: rvldrum/common + Info_46: + Name: ctrteppan/common Dependencies: {} - Info_68: - Name: ntrchorus/locale.en + Info_47: + Name: rvldough/common Dependencies: {} - Info_69: + Info_48: + Name: rvlseesaw/common + Dependencies: {} + Info_49: + Name: rvlfork/common + Dependencies: {} + Info_50: Name: ntrtunnel/locale.en Dependencies: {} + Info_51: + Name: rvlinterview/common + Dependencies: {} + Info_52: + Name: rvlseal/common + Dependencies: {} + Info_53: + Name: ntrshugyo/common + Dependencies: {} + Info_54: + Name: ntrstomp/common + Dependencies: {} + Info_55: + Name: rvlbadminton/common + Dependencies: {} + Info_56: + Name: ntrboxshow/locale.en + Dependencies: {} + Info_57: + Name: ntrsoccer/common + Dependencies: {} + Info_58: + Name: agbwizard/common + Dependencies: {} + Info_59: + Name: rvlseesaw/locale.en + Dependencies: {} + Info_60: + Name: rvldate/common + Dependencies: + Dependency_0: ntrdj/common + Info_61: + Name: agbtap/common + Dependencies: + Dependency_0: ntridol/common + Info_62: + Name: ntrshugyo/locale.en + Dependencies: {} + Info_63: + Name: rvldrum/common + Dependencies: {} + Info_64: + Name: ntrchorus/locale.en + Dependencies: {} + Info_65: + Name: mobtrick/common + Dependencies: {} + Info_66: + Name: pcomeat/common + Dependencies: {} + Info_67: + Name: rvlrotation/locale.en + Dependencies: {} + Info_68: + Name: rvllegs/locale.en + Dependencies: {} + Info_69: + Name: ntrtunnel/common + Dependencies: {} diff --git a/Assets/StreamingAssets/agbbatter/common b/Assets/StreamingAssets/agbbatter/common index 34b06ce0..ff51b638 100644 Binary files a/Assets/StreamingAssets/agbbatter/common and b/Assets/StreamingAssets/agbbatter/common differ diff --git a/Assets/StreamingAssets/agbexplode/common b/Assets/StreamingAssets/agbexplode/common index f02802ab..012ad50d 100644 Binary files a/Assets/StreamingAssets/agbexplode/common and b/Assets/StreamingAssets/agbexplode/common differ diff --git a/Assets/StreamingAssets/agbhair/common b/Assets/StreamingAssets/agbhair/common index a019d7af..6ae209ae 100644 Binary files a/Assets/StreamingAssets/agbhair/common and b/Assets/StreamingAssets/agbhair/common differ diff --git a/Assets/StreamingAssets/agbhair/common.manifest b/Assets/StreamingAssets/agbhair/common.manifest index 0dc8d9ae..c950d2ee 100644 --- a/Assets/StreamingAssets/agbhair/common.manifest +++ b/Assets/StreamingAssets/agbhair/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 2499785235 +CRC: 507864373 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 5baf37b7b0b37b1a89bba8fe8011d367 + Hash: 6bbf6024922d57739466e33aae70becb TypeTreeHash: serializedVersion: 2 Hash: 6ab6f5dbbbc64091fe41d0a8194baa43 diff --git a/Assets/StreamingAssets/agboffbeat/common b/Assets/StreamingAssets/agboffbeat/common index 48fac493..9850e912 100644 Binary files a/Assets/StreamingAssets/agboffbeat/common and b/Assets/StreamingAssets/agboffbeat/common differ diff --git a/Assets/StreamingAssets/agbquiz/common.manifest b/Assets/StreamingAssets/agbquiz/common.manifest index bdaa03c4..6128ca84 100644 --- a/Assets/StreamingAssets/agbquiz/common.manifest +++ b/Assets/StreamingAssets/agbquiz/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 2136332037 +CRC: 475114992 Hashes: AssetFileHash: serializedVersion: 2 - Hash: bb75796a540b9d56585a025e55afb25a + Hash: 00245f07ed1e60e78624a147c6070fcf TypeTreeHash: serializedVersion: 2 Hash: 78b02268f01f8b6a77a608289ecb9d38 @@ -108,4 +108,4 @@ Assets: - Assets/Resources/Sfx/games/quizShow/hostDPad.ogg - Assets/Resources/Sfx/games/quizShow/hostExplode.ogg Dependencies: -- F:/Github/HeavenStudio/Assets/StreamingAssets/karate/common +- C:/Users/evanb/OneDrive/Documents/GitHub/HeavenStudio/Assets/StreamingAssets/karate/common diff --git a/Assets/StreamingAssets/agbspacedance/common b/Assets/StreamingAssets/agbspacedance/common index 2ac6a5c3..512af667 100644 Binary files a/Assets/StreamingAssets/agbspacedance/common and b/Assets/StreamingAssets/agbspacedance/common differ diff --git a/Assets/StreamingAssets/agbspacedance/common.manifest b/Assets/StreamingAssets/agbspacedance/common.manifest index 7ebfd0ae..614333b8 100644 --- a/Assets/StreamingAssets/agbspacedance/common.manifest +++ b/Assets/StreamingAssets/agbspacedance/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 4065572778 +CRC: 356229831 Hashes: AssetFileHash: serializedVersion: 2 - Hash: e3031a21c5953b972c8984aaf4d95f0b + Hash: 679d9c125a38f42ee552a09b2d8450ca TypeTreeHash: serializedVersion: 2 Hash: ddb2c4a70034b0784bb73c06ec09460c diff --git a/Assets/StreamingAssets/agbtap/common.manifest b/Assets/StreamingAssets/agbtap/common.manifest index b31f85c3..24ea8b95 100644 --- a/Assets/StreamingAssets/agbtap/common.manifest +++ b/Assets/StreamingAssets/agbtap/common.manifest @@ -3,7 +3,7 @@ CRC: 3317229876 Hashes: AssetFileHash: serializedVersion: 2 - Hash: feadaf1bb10efdd7ecb80e3bdf44f16f + Hash: 097bfdcc51c1b7fa6d036cc450fe5aec TypeTreeHash: serializedVersion: 2 Hash: 15c41fad7e66ce2236de71530bb543ef @@ -115,4 +115,4 @@ Assets: - Assets/Resources/Sprites/Games/TapTrial/Animations/Giraffe/Giraffe.controller - Assets/Resources/Sprites/Games/TapTrial/Animations/girl_bop/Bop.anim Dependencies: -- F:/Github/HeavenStudio/Assets/StreamingAssets/ntridol/common +- C:/Users/evanb/OneDrive/Documents/GitHub/HeavenStudio/Assets/StreamingAssets/ntridol/common diff --git a/Assets/StreamingAssets/ctrbear/common b/Assets/StreamingAssets/ctrbear/common index eecc4904..39eb0943 100644 Binary files a/Assets/StreamingAssets/ctrbear/common and b/Assets/StreamingAssets/ctrbear/common differ diff --git a/Assets/StreamingAssets/ctrinterpreter/common b/Assets/StreamingAssets/ctrinterpreter/common index 8893febc..7e107e69 100644 Binary files a/Assets/StreamingAssets/ctrinterpreter/common and b/Assets/StreamingAssets/ctrinterpreter/common differ diff --git a/Assets/StreamingAssets/ctrinterpreter/common.manifest b/Assets/StreamingAssets/ctrinterpreter/common.manifest index 4311599b..36c9b815 100644 --- a/Assets/StreamingAssets/ctrinterpreter/common.manifest +++ b/Assets/StreamingAssets/ctrinterpreter/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 2232750411 +CRC: 228563353 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 3fccd3f78801be327adeaf644d0b6bbe + Hash: c11b541d6d261d4dd9290709670eab03 TypeTreeHash: serializedVersion: 2 Hash: 6a87535638e108a5e3588d5397c1cf0a diff --git a/Assets/StreamingAssets/ctrintro/common b/Assets/StreamingAssets/ctrintro/common index de246d60..864d1e83 100644 Binary files a/Assets/StreamingAssets/ctrintro/common and b/Assets/StreamingAssets/ctrintro/common differ diff --git a/Assets/StreamingAssets/ctrpillow/common b/Assets/StreamingAssets/ctrpillow/common index 71aa7b5f..ff3d7466 100644 Binary files a/Assets/StreamingAssets/ctrpillow/common and b/Assets/StreamingAssets/ctrpillow/common differ diff --git a/Assets/StreamingAssets/ctrpillow/common.manifest b/Assets/StreamingAssets/ctrpillow/common.manifest index b9803ef8..9fe46686 100644 --- a/Assets/StreamingAssets/ctrpillow/common.manifest +++ b/Assets/StreamingAssets/ctrpillow/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 1473235682 +CRC: 2729409596 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 9c7e0e1b2c67ac5bd40cbd9eb89b6beb + Hash: db34b720a9d9411b825a7ce73d8d39f5 TypeTreeHash: serializedVersion: 2 Hash: fcb38c44c374dbbc10b37e4f25d6f505 diff --git a/Assets/StreamingAssets/karate/common b/Assets/StreamingAssets/karate/common index b7ce7b00..870a1b3c 100644 Binary files a/Assets/StreamingAssets/karate/common and b/Assets/StreamingAssets/karate/common differ diff --git a/Assets/StreamingAssets/karate/common.manifest b/Assets/StreamingAssets/karate/common.manifest index ad28397d..aae72577 100644 --- a/Assets/StreamingAssets/karate/common.manifest +++ b/Assets/StreamingAssets/karate/common.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 2004251384 +CRC: 3237470228 Hashes: AssetFileHash: serializedVersion: 2 - Hash: e1b76f6c4fa51db462b357a07e8aa8f3 + Hash: ae870462bbc5aa668ce9e7d382093efa TypeTreeHash: serializedVersion: 2 - Hash: b1f31a5996a0bf184f0808b1ad67ba96 + Hash: cd8ba1bce15aa5831d5b822e780d9ffc HashAppended: 0 ClassTypes: - Class: 1 @@ -31,10 +31,10 @@ ClassTypes: Script: {instanceID: 0} - Class: 114 Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 3f1678e3fe1b7c94f9a1558cfd247853, type: 3} - Class: 114 diff --git a/Assets/StreamingAssets/mobtrick/common b/Assets/StreamingAssets/mobtrick/common index c0eb72c1..9e2e8f58 100644 Binary files a/Assets/StreamingAssets/mobtrick/common and b/Assets/StreamingAssets/mobtrick/common differ diff --git a/Assets/StreamingAssets/mobtrick/common.manifest b/Assets/StreamingAssets/mobtrick/common.manifest index 7d045213..4613a838 100644 --- a/Assets/StreamingAssets/mobtrick/common.manifest +++ b/Assets/StreamingAssets/mobtrick/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 825088556 +CRC: 3685225554 Hashes: AssetFileHash: serializedVersion: 2 - Hash: e4bd15a1d4546fcb6056288aea7b1c47 + Hash: 17cb122eec6a1b815712f4e4c4117aae TypeTreeHash: serializedVersion: 2 Hash: 4f48d293ee91ce284b1290faa2bbe09e diff --git a/Assets/StreamingAssets/ntrbackbeat/common b/Assets/StreamingAssets/ntrbackbeat/common index 18cd9c48..2e107a1c 100644 Binary files a/Assets/StreamingAssets/ntrbackbeat/common and b/Assets/StreamingAssets/ntrbackbeat/common differ diff --git a/Assets/StreamingAssets/ntrbackbeat/common.manifest b/Assets/StreamingAssets/ntrbackbeat/common.manifest index af6707f5..d9eda0e9 100644 --- a/Assets/StreamingAssets/ntrbackbeat/common.manifest +++ b/Assets/StreamingAssets/ntrbackbeat/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 3661077965 +CRC: 3793105390 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 4616adb8a22566f01490d11ad570b4a4 + Hash: 05c17b1bcb126713b672a05f36a08689 TypeTreeHash: serializedVersion: 2 Hash: f54a1062817f77cb49f442d230fcc49b diff --git a/Assets/StreamingAssets/ntrchorus/common b/Assets/StreamingAssets/ntrchorus/common index 3857eac4..688962d1 100644 Binary files a/Assets/StreamingAssets/ntrchorus/common and b/Assets/StreamingAssets/ntrchorus/common differ diff --git a/Assets/StreamingAssets/ntrchorus/common.manifest b/Assets/StreamingAssets/ntrchorus/common.manifest index 531c7a7e..d384d03b 100644 --- a/Assets/StreamingAssets/ntrchorus/common.manifest +++ b/Assets/StreamingAssets/ntrchorus/common.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 277471755 +CRC: 103302383 Hashes: AssetFileHash: serializedVersion: 2 diff --git a/Assets/StreamingAssets/ntrcoin/common b/Assets/StreamingAssets/ntrcoin/common index adf56cce..724351e0 100644 Binary files a/Assets/StreamingAssets/ntrcoin/common and b/Assets/StreamingAssets/ntrcoin/common differ diff --git a/Assets/StreamingAssets/ntrcoin/common.manifest b/Assets/StreamingAssets/ntrcoin/common.manifest index 709fa6c3..1f47f2cd 100644 --- a/Assets/StreamingAssets/ntrcoin/common.manifest +++ b/Assets/StreamingAssets/ntrcoin/common.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 1725841183 +CRC: 355105624 Hashes: AssetFileHash: serializedVersion: 2 diff --git a/Assets/StreamingAssets/ntrcork/common b/Assets/StreamingAssets/ntrcork/common index c80d577c..9621ea9f 100644 Binary files a/Assets/StreamingAssets/ntrcork/common and b/Assets/StreamingAssets/ntrcork/common differ diff --git a/Assets/StreamingAssets/ntrcork/common.manifest b/Assets/StreamingAssets/ntrcork/common.manifest index 99196a1c..d938031a 100644 --- a/Assets/StreamingAssets/ntrcork/common.manifest +++ b/Assets/StreamingAssets/ntrcork/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 2081450428 +CRC: 758420560 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 304db464c2bead81b6428e9f6599cfdf + Hash: 43b90ac6b27481de91aff4c51e102d9d TypeTreeHash: serializedVersion: 2 Hash: 8f8d4a3f1f8c01578a5ce13063d68dc6 diff --git a/Assets/StreamingAssets/ntrdj/common b/Assets/StreamingAssets/ntrdj/common index 4ace83a2..e86dcbc5 100644 Binary files a/Assets/StreamingAssets/ntrdj/common and b/Assets/StreamingAssets/ntrdj/common differ diff --git a/Assets/StreamingAssets/ntrdj/common.manifest b/Assets/StreamingAssets/ntrdj/common.manifest index cb60cc69..f4df5b39 100644 --- a/Assets/StreamingAssets/ntrdj/common.manifest +++ b/Assets/StreamingAssets/ntrdj/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 1014792037 +CRC: 2188393902 Hashes: AssetFileHash: serializedVersion: 2 - Hash: a13b9b7ae5fc7cd834f5837f06a15414 + Hash: 2e097fe67ea099f1d8782df286912715 TypeTreeHash: serializedVersion: 2 Hash: 33a4c8442a7cb8448a93c2fa6c1d77eb @@ -125,4 +125,4 @@ Assets: - Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud1.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/Student/IdleBop.anim Dependencies: -- F:/Github/HeavenStudio/Assets/StreamingAssets/rvldate/common +- C:/Users/evanb/OneDrive/Documents/GitHub/HeavenStudio/Assets/StreamingAssets/rvldate/common diff --git a/Assets/StreamingAssets/ntridol/common b/Assets/StreamingAssets/ntridol/common index 1ef393b7..bd9a0009 100644 Binary files a/Assets/StreamingAssets/ntridol/common and b/Assets/StreamingAssets/ntridol/common differ diff --git a/Assets/StreamingAssets/ntridol/common.manifest b/Assets/StreamingAssets/ntridol/common.manifest index 40cad4b9..fca21fbe 100644 --- a/Assets/StreamingAssets/ntridol/common.manifest +++ b/Assets/StreamingAssets/ntridol/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 2219224297 +CRC: 170927077 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 39ab0a3b922fddd5c5f8503433d5681b + Hash: 5e8c1c6053d324755176fae1c553553b TypeTreeHash: serializedVersion: 2 Hash: 22daffce395c47caabb8dcd800097d0d diff --git a/Assets/StreamingAssets/ntrninja/common b/Assets/StreamingAssets/ntrninja/common index a42ee184..04452884 100644 Binary files a/Assets/StreamingAssets/ntrninja/common and b/Assets/StreamingAssets/ntrninja/common differ diff --git a/Assets/StreamingAssets/ntrpingpong/common b/Assets/StreamingAssets/ntrpingpong/common index d3da2091..2365b372 100644 Binary files a/Assets/StreamingAssets/ntrpingpong/common and b/Assets/StreamingAssets/ntrpingpong/common differ diff --git a/Assets/StreamingAssets/ntrsamurai/common b/Assets/StreamingAssets/ntrsamurai/common index d222bda6..520f3bf0 100644 Binary files a/Assets/StreamingAssets/ntrsamurai/common and b/Assets/StreamingAssets/ntrsamurai/common differ diff --git a/Assets/StreamingAssets/ntrsamurai/common.manifest b/Assets/StreamingAssets/ntrsamurai/common.manifest index 79c796e8..0fd3f6ba 100644 --- a/Assets/StreamingAssets/ntrsamurai/common.manifest +++ b/Assets/StreamingAssets/ntrsamurai/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 2661374951 +CRC: 3410317917 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 3fe3c2898ca2af1ad73c853576b8eb1b + Hash: edb9d0bb86ae4138ec11451db3f46184 TypeTreeHash: serializedVersion: 2 Hash: 10404da84d789c089050e7869762db38 diff --git a/Assets/StreamingAssets/ntrshugyo/common b/Assets/StreamingAssets/ntrshugyo/common index 75231078..ef033efd 100644 Binary files a/Assets/StreamingAssets/ntrshugyo/common and b/Assets/StreamingAssets/ntrshugyo/common differ diff --git a/Assets/StreamingAssets/ntrshugyo/common.manifest b/Assets/StreamingAssets/ntrshugyo/common.manifest index 53f0c946..6c928706 100644 --- a/Assets/StreamingAssets/ntrshugyo/common.manifest +++ b/Assets/StreamingAssets/ntrshugyo/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 1147724731 +CRC: 4281372860 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 6a9e69be6eb63dfd9189f44f901843bc + Hash: 491b6b03a6c315c4dad8b65fbe1fa137 TypeTreeHash: serializedVersion: 2 Hash: 91fa2f9c7ee652a4a4a405c50ad96d66 diff --git a/Assets/StreamingAssets/ntrsoccer/common b/Assets/StreamingAssets/ntrsoccer/common index f6b9be27..0f9dbfbf 100644 Binary files a/Assets/StreamingAssets/ntrsoccer/common and b/Assets/StreamingAssets/ntrsoccer/common differ diff --git a/Assets/StreamingAssets/ntrsoccer/common.manifest b/Assets/StreamingAssets/ntrsoccer/common.manifest index f4c640ef..862a1fab 100644 --- a/Assets/StreamingAssets/ntrsoccer/common.manifest +++ b/Assets/StreamingAssets/ntrsoccer/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 1066416111 +CRC: 3997452959 Hashes: AssetFileHash: serializedVersion: 2 - Hash: c6883dfb23673608c96404e04760523b + Hash: d2ac87099fff9a75acc859600a4abcf9 TypeTreeHash: serializedVersion: 2 Hash: 178c8be186c9c9195df8cbc397bf239f diff --git a/Assets/StreamingAssets/ntrstomp/common b/Assets/StreamingAssets/ntrstomp/common index 7d78539e..6595c9b8 100644 Binary files a/Assets/StreamingAssets/ntrstomp/common and b/Assets/StreamingAssets/ntrstomp/common differ diff --git a/Assets/StreamingAssets/ntrstomp/common.manifest b/Assets/StreamingAssets/ntrstomp/common.manifest index d64b62fb..64f9c932 100644 --- a/Assets/StreamingAssets/ntrstomp/common.manifest +++ b/Assets/StreamingAssets/ntrstomp/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 889841618 +CRC: 2232659825 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 6dfe3050277df130402e36e5fc6afe4f + Hash: 744950f261224b05b278d9aa6c85804d TypeTreeHash: serializedVersion: 2 Hash: ee5a1c4d119c5785c396deba9ffbfd13 diff --git a/Assets/StreamingAssets/pcomeat/common b/Assets/StreamingAssets/pcomeat/common index 84c126d5..99726a95 100644 Binary files a/Assets/StreamingAssets/pcomeat/common and b/Assets/StreamingAssets/pcomeat/common differ diff --git a/Assets/StreamingAssets/pcosomen/common b/Assets/StreamingAssets/pcosomen/common index 330db298..d3dea510 100644 Binary files a/Assets/StreamingAssets/pcosomen/common and b/Assets/StreamingAssets/pcosomen/common differ diff --git a/Assets/StreamingAssets/pcosomen/common.manifest b/Assets/StreamingAssets/pcosomen/common.manifest index d886e19e..d5afcfe1 100644 --- a/Assets/StreamingAssets/pcosomen/common.manifest +++ b/Assets/StreamingAssets/pcosomen/common.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 1166576383 +CRC: 63768738 Hashes: AssetFileHash: serializedVersion: 2 diff --git a/Assets/StreamingAssets/rvlbadminton/common b/Assets/StreamingAssets/rvlbadminton/common index 32c5ab8a..f2349047 100644 Binary files a/Assets/StreamingAssets/rvlbadminton/common and b/Assets/StreamingAssets/rvlbadminton/common differ diff --git a/Assets/StreamingAssets/rvldate/common b/Assets/StreamingAssets/rvldate/common index 76c3f779..4c1944e6 100644 Binary files a/Assets/StreamingAssets/rvldate/common and b/Assets/StreamingAssets/rvldate/common differ diff --git a/Assets/StreamingAssets/rvldough/common b/Assets/StreamingAssets/rvldough/common index 4a0dd9fd..728935dc 100644 Binary files a/Assets/StreamingAssets/rvldough/common and b/Assets/StreamingAssets/rvldough/common differ diff --git a/Assets/StreamingAssets/rvldough/common.manifest b/Assets/StreamingAssets/rvldough/common.manifest index dab747e9..ea247eb1 100644 --- a/Assets/StreamingAssets/rvldough/common.manifest +++ b/Assets/StreamingAssets/rvldough/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 2398193307 +CRC: 2756172653 Hashes: AssetFileHash: serializedVersion: 2 - Hash: df47fd12298183f93c6709b885dec51e + Hash: 866eaadc04183d547480b270d3a9a3a3 TypeTreeHash: serializedVersion: 2 Hash: 1937315467cf052612009b19bb313daf diff --git a/Assets/StreamingAssets/rvlfork/common b/Assets/StreamingAssets/rvlfork/common index 4ddb5a16..d40d5017 100644 Binary files a/Assets/StreamingAssets/rvlfork/common and b/Assets/StreamingAssets/rvlfork/common differ diff --git a/Assets/StreamingAssets/rvlinterview/common b/Assets/StreamingAssets/rvlinterview/common index 63b12d6d..75233fe6 100644 Binary files a/Assets/StreamingAssets/rvlinterview/common and b/Assets/StreamingAssets/rvlinterview/common differ diff --git a/Assets/StreamingAssets/rvlinterview/common.manifest b/Assets/StreamingAssets/rvlinterview/common.manifest index 88f0db3c..a37ab306 100644 --- a/Assets/StreamingAssets/rvlinterview/common.manifest +++ b/Assets/StreamingAssets/rvlinterview/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 3408282776 +CRC: 147771025 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 5db3d1b22c868c257b3d083eb184ae40 + Hash: 2f6d49bc3309bf1fe087ed1d0c677321 TypeTreeHash: serializedVersion: 2 Hash: 5542e4d11fa90b3df909513c3dc51ab6 diff --git a/Assets/StreamingAssets/rvllegs/common b/Assets/StreamingAssets/rvllegs/common index 71ec12d6..fb6de49b 100644 Binary files a/Assets/StreamingAssets/rvllegs/common and b/Assets/StreamingAssets/rvllegs/common differ diff --git a/Assets/StreamingAssets/rvllegs/common.manifest b/Assets/StreamingAssets/rvllegs/common.manifest index f64c4ec2..fec748a1 100644 --- a/Assets/StreamingAssets/rvllegs/common.manifest +++ b/Assets/StreamingAssets/rvllegs/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 445211871 +CRC: 139971118 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 46d9fbe7b468ea9f28764f68a9c513ad + Hash: 0245e4c82d51301e2234f16c6fc81b3b TypeTreeHash: serializedVersion: 2 Hash: 3e8c7d8755f6df3ed3fcea84d97f9900 diff --git a/Assets/StreamingAssets/rvlseal/common b/Assets/StreamingAssets/rvlseal/common index f1252845..d757bbf0 100644 Binary files a/Assets/StreamingAssets/rvlseal/common and b/Assets/StreamingAssets/rvlseal/common differ diff --git a/Assets/StreamingAssets/rvlseal/common.manifest b/Assets/StreamingAssets/rvlseal/common.manifest index 8da008f5..1ffcfe3c 100644 --- a/Assets/StreamingAssets/rvlseal/common.manifest +++ b/Assets/StreamingAssets/rvlseal/common.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 3782009495 +CRC: 1259606660 Hashes: AssetFileHash: serializedVersion: 2