handling merge

2023-06-29 17:12:41 +08:00
parent 7f4c560592
commit 9129db4307
15 changed files with 122 additions and 79 deletions
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b3e58808cb15120468eafdef64280407
-timeCreated: 1540224475
-licenseType: Store
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 59d63bcae2fecff42be7b4fc8b1df10f
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 7d1083877b3838042b9e91b249731b89
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0512c18ad5403428db876010796c1cda
-timeCreated: 1453118000
-licenseType: Store
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: d00cc5f8e672c264d856aa10ed20df7e
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -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<Animator>();
-        BipedRagdollReferences r = BipedRagdollReferences.FromAvatar(animator);
-        BipedRagdollCreator.Options options = BipedRagdollCreator.AutodetectOptions(r);
-
-        var ik = container.gameObject.AddComponent<BipedIK>();
-        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<IKSolver>(ik.solvers.ikSolvers).ForEach(i => i.IKPositionWeight = 0);
-        new List<IKSolverLimb>(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();
-    }
 }
@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: 57ddc43ace113674392034825a54600a
+guid: af3410625d37b4b46a660a23bb72b644
+folderAsset: yes
 DefaultImporter:
  externalObjects: {}
  userData: 
@@ -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}
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0f77a385a9aa0e94caecbb3613daed40
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 8574412962073106934
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -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}
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c902541042b1bfc44b9e537ec3b6e8ef
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 8574412962073106934
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -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}
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 32d6c62772a64654f948ab55ca08af28
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 8574412962073106934
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -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}
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e3b80235f8ffc234b8468389e9302023
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 8574412962073106934
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: