diff --git a/Assets/_MarrowAssets/Levels/Wuhu Island.unity b/Assets/_MarrowAssets/Levels/Wuhu Island.unity index d7771bb..c37cb7c 100644 --- a/Assets/_MarrowAssets/Levels/Wuhu Island.unity +++ b/Assets/_MarrowAssets/Levels/Wuhu Island.unity @@ -39347,7 +39347,7 @@ Animator: m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: c3dc6638dae57e9409b9a6457996e905, type: 2} m_CullingMode: 0 - m_UpdateMode: 0 + m_UpdateMode: 1 m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 @@ -39355,6 +39355,22 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 +--- !u!54 &549463289 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 549463287} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &561727308 GameObject: m_ObjectHideFlags: 0 @@ -40874,6 +40890,10 @@ PrefabInstance: propertyPath: m_ReceiveGI value: 2 objectReference: {fileID: 0} + - target: {fileID: 7871643943275593028, guid: 1f13953e6cb967045a54d9be1feaf839, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7871643943275593028, guid: 1f13953e6cb967045a54d9be1feaf839, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -40925,6 +40945,27 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1f13953e6cb967045a54d9be1feaf839, type: 3} m_PrefabInstance: {fileID: 641027001} m_PrefabAsset: {fileID: 0} +--- !u!1 &641027003 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7522124700618970859, guid: 1f13953e6cb967045a54d9be1feaf839, type: 3} + m_PrefabInstance: {fileID: 641027001} + m_PrefabAsset: {fileID: 0} +--- !u!54 &641027004 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641027003} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &644042177 GameObject: m_ObjectHideFlags: 0 @@ -41738,7 +41779,7 @@ Animator: m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: c3dc6638dae57e9409b9a6457996e905, type: 2} m_CullingMode: 0 - m_UpdateMode: 0 + m_UpdateMode: 1 m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 @@ -41746,6 +41787,22 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 +--- !u!54 &743353592 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 743353590} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &753569076 GameObject: m_ObjectHideFlags: 0 @@ -42079,7 +42136,7 @@ Animator: m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: c3dc6638dae57e9409b9a6457996e905, type: 2} m_CullingMode: 0 - m_UpdateMode: 0 + m_UpdateMode: 1 m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 @@ -42087,6 +42144,22 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 +--- !u!54 &819196429 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 819196427} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &826555557 PrefabInstance: m_ObjectHideFlags: 0 @@ -42406,7 +42479,7 @@ Animator: m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: c3dc6638dae57e9409b9a6457996e905, type: 2} m_CullingMode: 0 - m_UpdateMode: 0 + m_UpdateMode: 1 m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 @@ -42414,6 +42487,22 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 +--- !u!54 &866346755 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 866346753} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &879017165 PrefabInstance: m_ObjectHideFlags: 0 @@ -42513,7 +42602,7 @@ Animator: m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: c3dc6638dae57e9409b9a6457996e905, type: 2} m_CullingMode: 0 - m_UpdateMode: 0 + m_UpdateMode: 1 m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 @@ -42521,6 +42610,22 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 +--- !u!54 &879017169 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 879017167} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &901737582 GameObject: m_ObjectHideFlags: 0 @@ -43109,7 +43214,7 @@ Animator: m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 3659da27fba22cb4abf004c0aae7cbd5, type: 2} m_CullingMode: 0 - m_UpdateMode: 0 + m_UpdateMode: 1 m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 @@ -43333,7 +43438,7 @@ Animator: m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: c3dc6638dae57e9409b9a6457996e905, type: 2} m_CullingMode: 0 - m_UpdateMode: 0 + m_UpdateMode: 1 m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 @@ -43341,6 +43446,22 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 +--- !u!54 &1070360862 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070360860} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &1074707896 PrefabInstance: m_ObjectHideFlags: 0 @@ -43440,7 +43561,7 @@ Animator: m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: c3dc6638dae57e9409b9a6457996e905, type: 2} m_CullingMode: 0 - m_UpdateMode: 0 + m_UpdateMode: 1 m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 @@ -43448,6 +43569,22 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 +--- !u!54 &1074707900 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1074707898} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &1090295157 GameObject: m_ObjectHideFlags: 0 @@ -43815,7 +43952,7 @@ Animator: m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: c3dc6638dae57e9409b9a6457996e905, type: 2} m_CullingMode: 0 - m_UpdateMode: 0 + m_UpdateMode: 1 m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 @@ -43823,6 +43960,22 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 +--- !u!54 &1151683481 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1151683479} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &1175816934 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_MarrowAssets/Levels/Wuhu Island/Stage/static/Windmill/WS2_common_windmill/WS2_common_windmill.fbx.meta b/Assets/_MarrowAssets/Levels/Wuhu Island/Stage/static/Windmill/WS2_common_windmill/WS2_common_windmill.fbx.meta index 7f27caa..cea71af 100644 --- a/Assets/_MarrowAssets/Levels/Wuhu Island/Stage/static/Windmill/WS2_common_windmill/WS2_common_windmill.fbx.meta +++ b/Assets/_MarrowAssets/Levels/Wuhu Island/Stage/static/Windmill/WS2_common_windmill/WS2_common_windmill.fbx.meta @@ -73,8 +73,8 @@ ModelImporter: cycleOffset: 0 loop: 0 hasAdditiveReferencePose: 0 - loopTime: 0 - loopBlend: 0 + loopTime: 1 + loopBlend: 1 loopBlendOrientation: 0 loopBlendPositionY: 0 loopBlendPositionXZ: 0 diff --git a/Assets/_MarrowAssets/Levels/Wuhu Island/Stage/static/Windmill/WS2_common_windmill/WS2_common_windmill_1.controller b/Assets/_MarrowAssets/Levels/Wuhu Island/Stage/static/Windmill/WS2_common_windmill/WS2_common_windmill_1.controller index c1877d4..173b90b 100644 --- a/Assets/_MarrowAssets/Levels/Wuhu Island/Stage/static/Windmill/WS2_common_windmill/WS2_common_windmill_1.controller +++ b/Assets/_MarrowAssets/Levels/Wuhu Island/Stage/static/Windmill/WS2_common_windmill/WS2_common_windmill_1.controller @@ -59,14 +59,14 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -8011146190149103879} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 220, y: 90, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} + m_AnyStatePosition: {x: 240, y: 300, z: 0} + m_EntryPosition: {x: 240, y: 250, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -8011146190149103879} diff --git a/Assets/_MarrowAssets/_Pallets/Jokiller230.WuhuIsland/_WuhuIsland.pallet.asset b/Assets/_MarrowAssets/_Pallets/Jokiller230.WuhuIsland/_WuhuIsland.pallet.asset index 532c9e6..1d59778 100644 --- a/Assets/_MarrowAssets/_Pallets/Jokiller230.WuhuIsland/_WuhuIsland.pallet.asset +++ b/Assets/_MarrowAssets/_Pallets/Jokiller230.WuhuIsland/_WuhuIsland.pallet.asset @@ -19,7 +19,7 @@ MonoBehaviour: _unlockable: 0 _redacted: 0 _author: Jokiller230 - _version: 0.7.0 + _version: 0.7.1 _sdkVersion: 1.1.0 _internal: 0 _crates: @@ -151,6 +151,12 @@ MonoBehaviour: - remove some of the border textures, as they look terrible' + - version: 0.7.1 + title: Physics but ANIMATED + text: '- add kinematic rigidbody to animated components + + - fix loop on + WS2_common_windmill animation' _crateTitles: - Level Wuhu Island _datacardTitles: