Merge remote-tracking branch 'origin/master'

Assets/Resources/Cock/prefab_cock_1.prefab

@@ -1571,6 +1571,7 @@ Transform:
   - {fileID: 7119851407046029862}
   - {fileID: 5155629703304567258}
   - {fileID: 9125122459027006504}
+  - {fileID: 7800160714772466582}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4472,6 +4473,51 @@ Transform:
   m_Father: {fileID: 6301228093198873314}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &9010540712720237238
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7800160714772466582}
+  - component: {fileID: 1196684179454002320}
+  m_Layer: 3
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7800160714772466582
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9010540712720237238}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.3, z: 0.2}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5221786613589611655}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &1196684179454002320
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9010540712720237238}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 0.1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &9049437899332930580
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/Cock/prefab_cock_2.prefab

@@ -2343,7 +2343,7 @@ Animator:
   m_Controller: {fileID: 9100000, guid: c08e2cd20ca874ee487ef60d32bd5ad1, type: 2}
   m_CullingMode: 1
   m_UpdateMode: 0
-  m_ApplyRootMotion: 1
+  m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
   m_WarningMessage: 

Assets/Resources/Cock/prefab_cock_3.prefab

@@ -231,7 +231,7 @@ Animator:
   m_Controller: {fileID: 9100000, guid: c08e2cd20ca874ee487ef60d32bd5ad1, type: 2}
   m_CullingMode: 1
   m_UpdateMode: 0
-  m_ApplyRootMotion: 1
+  m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
   m_WarningMessage: 

Assets/Resources/Cock/prefab_cock_4.prefab

@@ -3720,7 +3720,7 @@ Animator:
   m_Controller: {fileID: 9100000, guid: c08e2cd20ca874ee487ef60d32bd5ad1, type: 2}
   m_CullingMode: 1
   m_UpdateMode: 0
-  m_ApplyRootMotion: 1
+  m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
   m_WarningMessage: 

Assets/Resources/Cock/prefab_cock_5.prefab

@@ -2977,7 +2977,7 @@ Animator:
   m_Controller: {fileID: 9100000, guid: c08e2cd20ca874ee487ef60d32bd5ad1, type: 2}
   m_CullingMode: 1
   m_UpdateMode: 0
-  m_ApplyRootMotion: 1
+  m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
   m_WarningMessage: 

Assets/Resources/Cock/prefab_cock_6.prefab

@@ -4318,7 +4318,7 @@ Animator:
   m_Controller: {fileID: 9100000, guid: c08e2cd20ca874ee487ef60d32bd5ad1, type: 2}
   m_CullingMode: 1
   m_UpdateMode: 0
-  m_ApplyRootMotion: 1
+  m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
   m_WarningMessage: 

Assets/Resources/Cock/prefab_cock_7.prefab

@@ -4381,7 +4381,7 @@ Animator:
   m_Controller: {fileID: 9100000, guid: c08e2cd20ca874ee487ef60d32bd5ad1, type: 2}
   m_CullingMode: 1
   m_UpdateMode: 0
-  m_ApplyRootMotion: 1
+  m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
   m_WarningMessage: 

ProjectSettings/EditorBuildSettings.asset

@@ -12,5 +12,9 @@ EditorBuildSettings:
     path: Assets/Scenes/Battle.unity
     guid: c850ee8c3b14cc8459e7e186857cf567
   m_configObjects:
+    com.unity.adaptiveperformance.loader_settings: {fileID: 11400000, guid: 67fdd7a6b94fc46bc8ae68e0872669b0,
+      type: 2}
+    com.unity.adaptiveperformance.samsung.android.provider_settings: {fileID: 11400000,
+      guid: c09f357707e48432f97126356e4061fd, type: 2}
     com.unity.adaptiveperformance.simulator.provider_settings: {fileID: 11400000,
       guid: 93e2745ea45d04d12beda1220edf178a, type: 2}

ProjectSettings/ProjectSettings.asset

@@ -146,7 +146,9 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 1.0.2
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: 3631518619006024534, guid: 67fdd7a6b94fc46bc8ae68e0872669b0, type: 2}
+  - {fileID: 11400000, guid: c09f357707e48432f97126356e4061fd, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -710,7 +712,6 @@ PlayerSettings:
   switchNetworkInterfaceManagerInitializeEnabled: 1
   switchPlayerConnectionEnabled: 1
   switchUseNewStyleFilepaths: 0
-  switchUseLegacyFmodPriorities: 1
   switchUseMicroSleepForYield: 1
   switchEnableRamDiskSupport: 0
   switchMicroSleepForYieldTime: 25