Merge branch 'develop'

gatosyocora · Jul 31, 2020 · 5c3ae87 · 5c3ae87
2 parents 8ff54ae + 873d24f
commit 5c3ae87
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/Assets/VRCAvatars3Tools/AnimatorControllerCombiner/Editor/AnimatorControllerCombiner.cs b/Assets/VRCAvatars3Tools/AnimatorControllerCombiner/Editor/AnimatorControllerCombiner.cs
@@ -10,7 +10,7 @@
 using System.Collections.Generic;
 using Gatosyocora.VRCAvatars3Tools.Utilitys;
 
-// ver 1.0.3.1
+// ver 1.0.3.2
 // Copyright (c) 2020 gatosyocora
 // MIT License. See LICENSE.txt
 

diff --git a/.../VRCAvatars3Tools/AnimatorControllerCombiner/Editor/Utilitys/AnimatorControllerUtility.cs b/.../VRCAvatars3Tools/AnimatorControllerCombiner/Editor/Utilitys/AnimatorControllerUtility.cs
@@ -5,11 +5,11 @@
 using System.Linq;
 using System;
 #if VRC_SDK_VRCSDK3
-using VRC.SDK3.Components;
+using VRC.SDK3.Avatars.Components;
 using static VRC.SDKBase.VRC_AvatarParameterDriver;
 #endif
 
-// ver 1.0.1
+// ver 1.0.2
 // Copyright (c) 2020 gatosyocora
 // MIT License. See LICENSE.txt
 
@@ -384,6 +384,7 @@ private static void CopyBehaivourParameters(StateMachineBehaviour srcBehaivour,
                 layerControl.blendDuration = srcControl.blendDuration;
                 layerControl.debugString = srcControl.debugString;
                 layerControl.goalWeight = srcControl.goalWeight;
+                layerControl.layer = srcControl.layer;
                 layerControl.playable = srcControl.playable;
             }
             else if (dstBehaivour is VRCAnimatorLocomotionControl locomotionControl)
@@ -421,6 +422,7 @@ private static void CopyBehaivourParameters(StateMachineBehaviour srcBehaivour,
                 trackingControl.trackingLeftFingers = srcControl.trackingLeftFingers;
                 trackingControl.trackingLeftFoot = srcControl.trackingLeftFoot;
                 trackingControl.trackingLeftHand = srcControl.trackingLeftHand;
+                trackingControl.trackingMouth = srcControl.trackingMouth;
                 trackingControl.trackingRightFingers = srcControl.trackingRightFingers;
                 trackingControl.trackingRightFoot = srcControl.trackingRightFoot;
                 trackingControl.trackingRightHand = srcControl.trackingRightHand;

diff --git a/Assets/VRCAvatars3Tools/README.txt b/Assets/VRCAvatars3Tools/README.txt
@@ -1,7 +1,7 @@
 本セットに含まれる各種Editor拡張に関しての説明と利用規約を記載しています。
 
 ----------------------------------------------------
-〇AnimatorControllerCombiner (ver 1.0.3.1)
+〇AnimatorControllerCombiner (ver 1.0.3.2)
 AnimatorControllerのLayerとParameterを他のAnimatorControllerにコピーすることで合成します
 
 「VRCAvatars3Tools > AnimatorControllerCombiner」で以下の機能を持つウィンドウが開きます
@@ -15,6 +15,8 @@ Dst AnimatorController : コピー先AnimatorController
 StateBehaviourを持つStateを含むLayerをコピーするとエラーが表示されます（動作には問題ない感じがします）
 
 ・更新履歴
+ver1.0.3.2
+	* VRCSDK3-AVATAR-2020.07.30.09.18_Public.unitypackageに対応
 ver1.0.3.1
 	* VRCSDK3-AVATAR-2020.07.14.20.50_Public.unitypackageに対応
 		- VRCAnimatorSetViewを廃止, VRCAnimatorRemeasureAvatarとVRCAnimatorTemporaryPoseSpaceを追加
@@ -30,7 +32,7 @@ ver1.0
 	* ツールを作成
 
 ----------------------------------------------------
-〇VRCAvatarConverterTo3 (ver 1.0)
+〇VRCAvatarConverterTo3 (ver 1.0.0.1)
 VRCSDK2で作成したアバター(Avatars2.0)をAvatars3.0のアバターに変換できます。
 
 「VRCAvatars3Tools > VRCAvatarConverterTo3」で以下の機能を持つウィンドウが開きます
@@ -53,6 +55,8 @@ VRCSDK2で作成したアバター(Avatars2.0)をAvatars3.0のアバターに変
  Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Antoine Aubry
 
  ・更新履歴
+ ver1.0.1
+	* VRCSDK3-AVATAR-2020.07.30.09.18_Public.unitypackageに対応
  ver1.0
 	* ツールを作成
 

diff --git a/Assets/VRCAvatars3Tools/VRCAvatarConverterTo3/Editor/VRCAvatarConverterTo3.cs b/Assets/VRCAvatars3Tools/VRCAvatarConverterTo3/Editor/VRCAvatarConverterTo3.cs
@@ -5,12 +5,10 @@
 using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
-using VRC.SDK3.Components;
+using VRC.SDK3.Avatars.Components;
 using YamlDotNet.RepresentationModel;
-using YamlDotNet.Serialization;
-using YamlDotNet.Serialization.NamingConventions;
 
-// ver 1.0
+// ver 1.0.0.1
 // Copyright (c) 2020 gatosyocora
 // MIT License. See LICENSE.txt