From 9129db43076d74bf8330e6237904e7f8dbb42b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=A6=E5=8F=B3=E7=9C=8B?= <1918891542@qq.com> Date: Thu, 29 Jun 2023 17:12:41 +0800 Subject: [PATCH] handling merge --- ... Jobs (Unity 2018.2.4f1).unitypackage.meta | 8 ---- .../IK Jobs (Unity 2019.3).unitypackage.meta | 7 ---- ...culus Integration v1.37).unitypackage.meta | 7 ---- ...4.28f1, PlayMaker 1.9.0).unitypackage.meta | 8 ---- ... 2017.4.28f1, UMA 2.8.1).unitypackage.meta | 7 ---- Assets/Scripts/UmaViewerUI.cs | 41 ------------------- ...ypackage.meta => _TerrainAutoUpgrade.meta} | 3 +- ...ototype Black3d3aba195e4d26ee.terrainlayer | 22 ++++++++++ ...pe Black3d3aba195e4d26ee.terrainlayer.meta | 8 ++++ .../layer_Sand 118c7f28bcf2878ea.terrainlayer | 22 ++++++++++ ...r_Sand 118c7f28bcf2878ea.terrainlayer.meta | 8 ++++ .../layer_Sand 218c7f28bcf2878ea.terrainlayer | 22 ++++++++++ ...r_Sand 218c7f28bcf2878ea.terrainlayer.meta | 8 ++++ .../layer_Sand 33d3aba195e4d26ee.terrainlayer | 22 ++++++++++ ...r_Sand 33d3aba195e4d26ee.terrainlayer.meta | 8 ++++ 15 files changed, 122 insertions(+), 79 deletions(-) delete mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2018.2.4f1).unitypackage.meta delete mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2019.3).unitypackage.meta delete mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/Oculus (Unity 2017.4.28f1, Oculus Integration v1.37).unitypackage.meta delete mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/Playmaker (Unity 2017.4.28f1, PlayMaker 1.9.0).unitypackage.meta delete mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/UMA (Unity 2017.4.28f1, UMA 2.8.1).unitypackage.meta rename Assets/{Plugins/RootMotion/FinalIK/_Integration/Steam VR (Unity 2017.4.28f1, SteamVR Plugin v2.2.0).unitypackage.meta => _TerrainAutoUpgrade.meta} (67%) create mode 100644 Assets/_TerrainAutoUpgrade/layer_Prototype Black3d3aba195e4d26ee.terrainlayer create mode 100644 Assets/_TerrainAutoUpgrade/layer_Prototype Black3d3aba195e4d26ee.terrainlayer.meta create mode 100644 Assets/_TerrainAutoUpgrade/layer_Sand 118c7f28bcf2878ea.terrainlayer create mode 100644 Assets/_TerrainAutoUpgrade/layer_Sand 118c7f28bcf2878ea.terrainlayer.meta create mode 100644 Assets/_TerrainAutoUpgrade/layer_Sand 218c7f28bcf2878ea.terrainlayer create mode 100644 Assets/_TerrainAutoUpgrade/layer_Sand 218c7f28bcf2878ea.terrainlayer.meta create mode 100644 Assets/_TerrainAutoUpgrade/layer_Sand 33d3aba195e4d26ee.terrainlayer create mode 100644 Assets/_TerrainAutoUpgrade/layer_Sand 33d3aba195e4d26ee.terrainlayer.meta diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2018.2.4f1).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2018.2.4f1).unitypackage.meta deleted file mode 100644 index 0c7320b..0000000 --- a/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2018.2.4f1).unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b3e58808cb15120468eafdef64280407 -timeCreated: 1540224475 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2019.3).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2019.3).unitypackage.meta deleted file mode 100644 index 00a91fc..0000000 --- a/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2019.3).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 59d63bcae2fecff42be7b4fc8b1df10f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/Oculus (Unity 2017.4.28f1, Oculus Integration v1.37).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/Oculus (Unity 2017.4.28f1, Oculus Integration v1.37).unitypackage.meta deleted file mode 100644 index d9fcdc9..0000000 --- a/Assets/Plugins/RootMotion/FinalIK/_Integration/Oculus (Unity 2017.4.28f1, Oculus Integration v1.37).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7d1083877b3838042b9e91b249731b89 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/Playmaker (Unity 2017.4.28f1, PlayMaker 1.9.0).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/Playmaker (Unity 2017.4.28f1, PlayMaker 1.9.0).unitypackage.meta deleted file mode 100644 index adf9b6b..0000000 --- a/Assets/Plugins/RootMotion/FinalIK/_Integration/Playmaker (Unity 2017.4.28f1, PlayMaker 1.9.0).unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0512c18ad5403428db876010796c1cda -timeCreated: 1453118000 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/UMA (Unity 2017.4.28f1, UMA 2.8.1).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/UMA (Unity 2017.4.28f1, UMA 2.8.1).unitypackage.meta deleted file mode 100644 index 21cc026..0000000 --- a/Assets/Plugins/RootMotion/FinalIK/_Integration/UMA (Unity 2017.4.28f1, UMA 2.8.1).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d00cc5f8e672c264d856aa10ed20df7e -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index fb15548..fd671fe 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -1,8 +1,4 @@ using Gallop; -using RootMotion; -using RootMotion.Demos; -using RootMotion.Dynamics; -using RootMotion.FinalIK; using SFB; using System; using System.Collections; @@ -1323,41 +1319,4 @@ public class UmaViewerUI : MonoBehaviour TextureExporter.exportAllTexture(Builder.CurrentUMAContainer.gameObject); } } - - public void Debug() - { - var container = Builder.CurrentUMAContainer; - if (!container) return; - var animator = container.GetComponent(); - BipedRagdollReferences r = BipedRagdollReferences.FromAvatar(animator); - BipedRagdollCreator.Options options = BipedRagdollCreator.AutodetectOptions(r); - - var ik = container.gameObject.AddComponent(); - ik.references.root = container.transform; - ik.references.pelvis = r.hips; - ik.references.spine = new Transform[] { r.spine, r.chest }; - ik.references.leftThigh = r.leftUpperLeg; - ik.references.leftCalf = r.leftLowerLeg; - ik.references.leftFoot = r.leftFoot; - ik.references.rightThigh = r.rightUpperLeg; - ik.references.rightCalf = r.rightLowerLeg; - ik.references.rightFoot = r.rightFoot; - ik.references.leftUpperArm = r.leftUpperArm; - ik.references.leftForearm = r.leftLowerArm; - ik.references.leftHand = r.leftHand; - ik.references.rightUpperArm = r.rightUpperArm; - ik.references.rightForearm = r.rightLowerArm; - ik.references.rightHand = r.rightHand; - ik.references.head = r.head; - - new List(ik.solvers.ikSolvers).ForEach(i => i.IKPositionWeight = 0); - new List(ik.solvers.limbs).ForEach(i => i.IKRotationWeight = 0); - ik.solvers.lookAt.IKPositionWeight = 1; - ik.solvers.lookAt.headWeight = 0.8f; - ik.solvers.lookAt.bodyWeight = 0.2f; - ik.solvers.lookAt.target = Camera.main.transform; - //BipedRagdollCreator.Create(r, options); - //var master = PuppetMaster.SetUp(container.transform, 8, 9); - //master.FlattenHierarchy(); - } } diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/Steam VR (Unity 2017.4.28f1, SteamVR Plugin v2.2.0).unitypackage.meta b/Assets/_TerrainAutoUpgrade.meta similarity index 67% rename from Assets/Plugins/RootMotion/FinalIK/_Integration/Steam VR (Unity 2017.4.28f1, SteamVR Plugin v2.2.0).unitypackage.meta rename to Assets/_TerrainAutoUpgrade.meta index 839abdf..4148ee0 100644 --- a/Assets/Plugins/RootMotion/FinalIK/_Integration/Steam VR (Unity 2017.4.28f1, SteamVR Plugin v2.2.0).unitypackage.meta +++ b/Assets/_TerrainAutoUpgrade.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 57ddc43ace113674392034825a54600a +guid: af3410625d37b4b46a660a23bb72b644 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/_TerrainAutoUpgrade/layer_Prototype Black3d3aba195e4d26ee.terrainlayer b/Assets/_TerrainAutoUpgrade/layer_Prototype Black3d3aba195e4d26ee.terrainlayer new file mode 100644 index 0000000..54dc18b --- /dev/null +++ b/Assets/_TerrainAutoUpgrade/layer_Prototype Black3d3aba195e4d26ee.terrainlayer @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1953259897 &8574412962073106934 +TerrainLayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: layer_Prototype Black3d3aba195e4d26ee + m_DiffuseTexture: {fileID: 2800000, guid: c32a0b1f62ac42e4399935ffff09c099, type: 3} + m_NormalMapTexture: {fileID: 0} + m_MaskMapTexture: {fileID: 0} + m_TileSize: {x: 15, y: 15} + m_TileOffset: {x: 0, y: 0} + m_Specular: {r: 0, g: 0, b: 0, a: 0} + m_Metallic: 0 + m_Smoothness: 0 + m_NormalScale: 1 + m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} + m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Assets/_TerrainAutoUpgrade/layer_Prototype Black3d3aba195e4d26ee.terrainlayer.meta b/Assets/_TerrainAutoUpgrade/layer_Prototype Black3d3aba195e4d26ee.terrainlayer.meta new file mode 100644 index 0000000..9a1f5f7 --- /dev/null +++ b/Assets/_TerrainAutoUpgrade/layer_Prototype Black3d3aba195e4d26ee.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f77a385a9aa0e94caecbb3613daed40 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8574412962073106934 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_TerrainAutoUpgrade/layer_Sand 118c7f28bcf2878ea.terrainlayer b/Assets/_TerrainAutoUpgrade/layer_Sand 118c7f28bcf2878ea.terrainlayer new file mode 100644 index 0000000..919e46c --- /dev/null +++ b/Assets/_TerrainAutoUpgrade/layer_Sand 118c7f28bcf2878ea.terrainlayer @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1953259897 &8574412962073106934 +TerrainLayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: layer_Sand 118c7f28bcf2878ea + m_DiffuseTexture: {fileID: 2800000, guid: b4ef8bb5ab02b47ddbc04f9ed0bcee7c, type: 3} + m_NormalMapTexture: {fileID: 0} + m_MaskMapTexture: {fileID: 0} + m_TileSize: {x: 25, y: 25} + m_TileOffset: {x: 0, y: 0} + m_Specular: {r: 0, g: 0, b: 0, a: 0} + m_Metallic: 0 + m_Smoothness: 0 + m_NormalScale: 1 + m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} + m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Assets/_TerrainAutoUpgrade/layer_Sand 118c7f28bcf2878ea.terrainlayer.meta b/Assets/_TerrainAutoUpgrade/layer_Sand 118c7f28bcf2878ea.terrainlayer.meta new file mode 100644 index 0000000..4eef784 --- /dev/null +++ b/Assets/_TerrainAutoUpgrade/layer_Sand 118c7f28bcf2878ea.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c902541042b1bfc44b9e537ec3b6e8ef +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8574412962073106934 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_TerrainAutoUpgrade/layer_Sand 218c7f28bcf2878ea.terrainlayer b/Assets/_TerrainAutoUpgrade/layer_Sand 218c7f28bcf2878ea.terrainlayer new file mode 100644 index 0000000..00f531a --- /dev/null +++ b/Assets/_TerrainAutoUpgrade/layer_Sand 218c7f28bcf2878ea.terrainlayer @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1953259897 &8574412962073106934 +TerrainLayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: layer_Sand 218c7f28bcf2878ea + m_DiffuseTexture: {fileID: 2800000, guid: ac421e7b864c341f181a5d136ca4ed37, type: 3} + m_NormalMapTexture: {fileID: 0} + m_MaskMapTexture: {fileID: 0} + m_TileSize: {x: 25, y: 25} + m_TileOffset: {x: 0, y: 0} + m_Specular: {r: 0, g: 0, b: 0, a: 0} + m_Metallic: 0 + m_Smoothness: 0 + m_NormalScale: 1 + m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} + m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Assets/_TerrainAutoUpgrade/layer_Sand 218c7f28bcf2878ea.terrainlayer.meta b/Assets/_TerrainAutoUpgrade/layer_Sand 218c7f28bcf2878ea.terrainlayer.meta new file mode 100644 index 0000000..ec64ea4 --- /dev/null +++ b/Assets/_TerrainAutoUpgrade/layer_Sand 218c7f28bcf2878ea.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 32d6c62772a64654f948ab55ca08af28 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8574412962073106934 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_TerrainAutoUpgrade/layer_Sand 33d3aba195e4d26ee.terrainlayer b/Assets/_TerrainAutoUpgrade/layer_Sand 33d3aba195e4d26ee.terrainlayer new file mode 100644 index 0000000..9634c9e --- /dev/null +++ b/Assets/_TerrainAutoUpgrade/layer_Sand 33d3aba195e4d26ee.terrainlayer @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1953259897 &8574412962073106934 +TerrainLayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: layer_Sand 33d3aba195e4d26ee + m_DiffuseTexture: {fileID: 2800000, guid: a810c0e3b6ef7440a89a1ba1a931b299, type: 3} + m_NormalMapTexture: {fileID: 0} + m_MaskMapTexture: {fileID: 0} + m_TileSize: {x: 15, y: 15} + m_TileOffset: {x: 0, y: 0} + m_Specular: {r: 0, g: 0, b: 0, a: 0} + m_Metallic: 0 + m_Smoothness: 0 + m_NormalScale: 1 + m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} + m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Assets/_TerrainAutoUpgrade/layer_Sand 33d3aba195e4d26ee.terrainlayer.meta b/Assets/_TerrainAutoUpgrade/layer_Sand 33d3aba195e4d26ee.terrainlayer.meta new file mode 100644 index 0000000..0e32b89 --- /dev/null +++ b/Assets/_TerrainAutoUpgrade/layer_Sand 33d3aba195e4d26ee.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e3b80235f8ffc234b8468389e9302023 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8574412962073106934 + userData: + assetBundleName: + assetBundleVariant: