diff --git a/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2~2_tongxueA.controller b/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2~2_tongxueA.controller index cf449e1..61eae79 100644 --- a/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2~2_tongxueA.controller +++ b/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2~2_tongxueA.controller @@ -33,7 +33,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 5293858650183072699} - m_Position: {x: 270, y: 170, z: 0} + m_Position: {x: 200, y: 0, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -64,8 +64,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 1827226128182048838, guid: b0165af1b62f4df4c9b04d59700c300f, - type: 3} + m_Motion: {fileID: 1827226128182048838, guid: b0165af1b62f4df4c9b04d59700c300f, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2~2_tongxueC.FBX.meta b/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2~2_tongxueC.FBX.meta index 7d74c88..9643bc0 100644 --- a/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2~2_tongxueC.FBX.meta +++ b/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2~2_tongxueC.FBX.meta @@ -102,7 +102,7 @@ ModelImporter: cycleOffset: 0 loop: 0 hasAdditiveReferencePose: 0 - loopTime: 0 + loopTime: 1 loopBlend: 0 loopBlendOrientation: 0 loopBlendPositionY: 0 diff --git a/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2~3_tongxueE.FBX.meta b/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2~3_tongxueE.FBX.meta index 1613b32..f31fc86 100644 --- a/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2~3_tongxueE.FBX.meta +++ b/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2~3_tongxueE.FBX.meta @@ -44,7 +44,7 @@ ModelImporter: cycleOffset: 0 loop: 0 hasAdditiveReferencePose: 0 - loopTime: 0 + loopTime: 1 loopBlend: 0 loopBlendOrientation: 0 loopBlendPositionY: 0 @@ -73,7 +73,7 @@ ModelImporter: cycleOffset: 0 loop: 0 hasAdditiveReferencePose: 0 - loopTime: 0 + loopTime: 1 loopBlend: 0 loopBlendOrientation: 0 loopBlendPositionY: 0 diff --git a/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2~3_tongxueE.controller b/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2~3_tongxueE.controller index e922271..228254e 100644 --- a/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2~3_tongxueE.controller +++ b/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2~3_tongxueE.controller @@ -11,7 +11,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 3987000052103911472} - m_Position: {x: 280, y: 100, z: 0} + m_Position: {x: 200, y: 0, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -64,8 +64,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 1827226128182048838, guid: a61570d86a77b4e41b444c980929738d, - type: 3} + m_Motion: {fileID: 1827226128182048838, guid: a61570d86a77b4e41b444c980929738d, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Artworks/MeiGongZiYuan/Models/ChangJing/dimian.prefab b/Assets/Artworks/MeiGongZiYuan/Models/ChangJing/dimian.prefab index beba86e..de85a57 100644 --- a/Assets/Artworks/MeiGongZiYuan/Models/ChangJing/dimian.prefab +++ b/Assets/Artworks/MeiGongZiYuan/Models/ChangJing/dimian.prefab @@ -116,4 +116,4 @@ MonoBehaviour: m_IsFlatMirror: 1 m_ReflectLayers: serializedVersion: 2 - m_Bits: 65335 + m_Bits: 4294967295 diff --git a/Assets/OtherProject/Artworks/MeiGongZiYuan/Models/ChangJing/ChangJing.fbm/Mirror Shaders/Mirror.cs b/Assets/OtherProject/Artworks/MeiGongZiYuan/Models/ChangJing/ChangJing.fbm/Mirror Shaders/Mirror.cs index e0ff238..21e710c 100644 --- a/Assets/OtherProject/Artworks/MeiGongZiYuan/Models/ChangJing/ChangJing.fbm/Mirror Shaders/Mirror.cs +++ b/Assets/OtherProject/Artworks/MeiGongZiYuan/Models/ChangJing/ChangJing.fbm/Mirror Shaders/Mirror.cs @@ -71,11 +71,6 @@ public class Mirror : MonoBehaviour reflectionCamera.transform.position = newpos; Vector3 euler = cam.transform.eulerAngles; reflectionCamera.transform.eulerAngles = new Vector3(0, euler.y, euler.z); - - //Zxl - if(!reflectionCamera.enabled) - return; - reflectionCamera.Render(); reflectionCamera.transform.position = oldpos; GL.SetRevertBackfacing (false); diff --git a/Assets/OtherProject/Common.meta.private.0 b/Assets/OtherProject/Common.meta.private.0 deleted file mode 100644 index feff08e..0000000 --- a/Assets/OtherProject/Common.meta.private.0 +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1871f924fcab5374793a603615cbdd9e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherProject/Common.meta.private.0.meta b/Assets/OtherProject/Common.meta.private.0.meta deleted file mode 100644 index dd2b3dd..0000000 --- a/Assets/OtherProject/Common.meta.private.0.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 65da18d36e3485349ab395fd747b3ae7 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherProject/Timeline.meta.private.0 b/Assets/OtherProject/Timeline.meta.private.0 deleted file mode 100644 index 36b4af3..0000000 --- a/Assets/OtherProject/Timeline.meta.private.0 +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c625025b276b02246bf8139057543675 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherProject/Timeline.meta.private.0.meta b/Assets/OtherProject/Timeline.meta.private.0.meta deleted file mode 100644 index cc2e2ea..0000000 --- a/Assets/OtherProject/Timeline.meta.private.0.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6225c98c8e4915745aab8536b7f14713 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: