diff --git a/ProjectNLD/Assets/Art/Animations/Show/ani_s_agree01_a001.FBX.meta b/ProjectNLD/Assets/Art/Animations/Show/ani_s_agree01_a001.FBX.meta index 790d8288b81..b74f309f228 100644 --- a/ProjectNLD/Assets/Art/Animations/Show/ani_s_agree01_a001.FBX.meta +++ b/ProjectNLD/Assets/Art/Animations/Show/ani_s_agree01_a001.FBX.meta @@ -74,7 +74,7 @@ ModelImporter: loop: 0 hasAdditiveReferencePose: 0 loopTime: 1 - loopBlend: 0 + loopBlend: 1 loopBlendOrientation: 1 loopBlendPositionY: 1 loopBlendPositionXZ: 1 diff --git a/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance01_a001.fbx.meta b/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance01_a001.fbx.meta index a3022dbf87a..5034769c0e7 100644 --- a/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance01_a001.fbx.meta +++ b/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance01_a001.fbx.meta @@ -10,7 +10,7 @@ ModelImporter: materialSearch: 1 materialLocation: 1 animations: - legacyGenerateAnimations: 4 + legacyGenerateAnimations: 0 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 @@ -33,9 +33,38 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: ani_s_dance01_a001 - takeName: Take 001 - internalID: 1827226128182048838 + name: ani_s_dance01_a001_start + takeName: + internalID: 3060610079319413300 + firstFrame: 0 + lastFrame: 433 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 1 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: ani_s_dance01_a001_loop + takeName: + internalID: -6004787696405322892 firstFrame: 0 lastFrame: 433 wrapMode: 0 @@ -61,6 +90,35 @@ ModelImporter: maskType: 3 maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: ani_s_dance01_a001_end + takeName: + internalID: -5880667880897408871 + firstFrame: 0 + lastFrame: 433 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 1 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance02_a001.fbx.meta b/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance02_a001.fbx.meta index b0f8be7afbb..8bb7d26a722 100644 --- a/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance02_a001.fbx.meta +++ b/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance02_a001.fbx.meta @@ -10,7 +10,7 @@ ModelImporter: materialSearch: 1 materialLocation: 1 animations: - legacyGenerateAnimations: 4 + legacyGenerateAnimations: 0 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 @@ -33,9 +33,38 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: ani_s_dance02_a001 - takeName: Take 001 - internalID: 1827226128182048838 + name: ani_s_dance02_a001_start + takeName: + internalID: 3060610079319413300 + firstFrame: 0 + lastFrame: 709 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 1 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: ani_s_dance02_a001_loop + takeName: + internalID: -6004787696405322892 firstFrame: 0 lastFrame: 709 wrapMode: 0 @@ -61,6 +90,35 @@ ModelImporter: maskType: 3 maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: ani_s_dance02_a001_end + takeName: + internalID: -5880667880897408871 + firstFrame: 0 + lastFrame: 709 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 1 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance03_a001.fbx.meta b/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance03_a001.fbx.meta index cc2e79c8c93..138dd4ca96a 100644 --- a/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance03_a001.fbx.meta +++ b/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance03_a001.fbx.meta @@ -10,7 +10,7 @@ ModelImporter: materialSearch: 1 materialLocation: 1 animations: - legacyGenerateAnimations: 4 + legacyGenerateAnimations: 0 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 @@ -33,9 +33,38 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: ani_s_dance03_a001 - takeName: Take 001 - internalID: 1827226128182048838 + name: ani_s_dance03_a001_start + takeName: + internalID: 3060610079319413300 + firstFrame: 0 + lastFrame: 425 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 1 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: ani_s_dance03_a001_loop + takeName: + internalID: -6004787696405322892 firstFrame: 0 lastFrame: 425 wrapMode: 0 @@ -61,6 +90,35 @@ ModelImporter: maskType: 3 maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: ani_s_dance03_a001_end + takeName: + internalID: -5880667880897408871 + firstFrame: 0 + lastFrame: 425 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 1 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance04_a001.fbx.meta b/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance04_a001.fbx.meta index 3aecf7e0cbf..b6577face6a 100644 --- a/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance04_a001.fbx.meta +++ b/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance04_a001.fbx.meta @@ -10,7 +10,7 @@ ModelImporter: materialSearch: 1 materialLocation: 1 animations: - legacyGenerateAnimations: 4 + legacyGenerateAnimations: 0 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 @@ -33,9 +33,38 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: ani_s_dance04_a001 - takeName: Take 001 - internalID: 1827226128182048838 + name: ani_s_dance04_a001_start + takeName: + internalID: 3060610079319413300 + firstFrame: 0 + lastFrame: 340 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 1 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: ani_s_dance04_a001_loop + takeName: + internalID: -6004787696405322892 firstFrame: 0 lastFrame: 340 wrapMode: 0 @@ -61,6 +90,35 @@ ModelImporter: maskType: 3 maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: ani_s_dance04_a001_end + takeName: + internalID: -5880667880897408871 + firstFrame: 0 + lastFrame: 340 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 1 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance05_a001.fbx.meta b/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance05_a001.fbx.meta index 94df1e49260..0d6868f4f3d 100644 --- a/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance05_a001.fbx.meta +++ b/ProjectNLD/Assets/Art/Animations/Show/ani_s_dance05_a001.fbx.meta @@ -10,7 +10,7 @@ ModelImporter: materialSearch: 1 materialLocation: 1 animations: - legacyGenerateAnimations: 4 + legacyGenerateAnimations: 0 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 @@ -33,9 +33,38 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: ani_s_dance05_a001 - takeName: Take 001 - internalID: 1827226128182048838 + name: ani_s_dance05_a001_start + takeName: + internalID: 3060610079319413300 + firstFrame: 0 + lastFrame: 722 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 1 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: ani_s_dance05_a001_loop + takeName: + internalID: -6004787696405322892 firstFrame: 0 lastFrame: 722 wrapMode: 0 @@ -61,6 +90,35 @@ ModelImporter: maskType: 3 maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: ani_s_dance05_a001_end + takeName: + internalID: -5880667880897408871 + firstFrame: 0 + lastFrame: 722 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 1 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_Interface/UI_InterfaceController.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_Interface/UI_InterfaceController.cs index 0168004ad0e..6f2a55fdafb 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_Interface/UI_InterfaceController.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_Interface/UI_InterfaceController.cs @@ -134,21 +134,21 @@ public class UI_InterfaceController : UIWindow float nowTime = 0; void Update() { - if(!isAnalyzerStart) - { - return; - } + //if(!isAnalyzerStart) + //{ + // return; + //} - if(nowTime>=refreshTime) - { - nowTime = 0; - AudioManager.Instance.analyzer.GetSpectrumLevels(ref levels); - RefreshCube(levels); - }else - { - nowTime += Time.deltaTime; - } - //for (int i = 0; i < levels.Length; i++) + ////if(nowTime>=refreshTime) + ////{ + //// nowTime = 0; + // AudioManager.Instance.analyzer.GetSpectrumLevels(ref levels); + // RefreshCube(levels); + //}else + //{ + // nowTime += Time.deltaTime; + //} + ////for (int i = 0; i < levels.Length; i++) //{ // if (levels[i] * 100 > 10) // {