1

2024-03-29 00:58:24 +08:00
parent 967ad8eacf
commit 05315ef4a8
232 changed files with 53368 additions and 8539 deletions
--- a/deleted)/Common/Materials/MC2_White.mat
+++ b/deleted)/Common/Materials/MC2_White.mat
@@ -104,6 +104,19 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _Tiling: {r: 1, g: 1, b: 0, a: 0}
  m_BuildTextureStacks: []
+--- !u!114 &100979206845169337
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!114 &5537520944958903688
 MonoBehaviour:
  m_ObjectHideFlags: 11
@@ -117,16 +130,3 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  version: 0
--- !u!114 &8003643711455902625
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 7
--- a/deleted)/Common/Scripts/AutoRotate.cs
+++ b/deleted)/Common/Scripts/AutoRotate.cs
@@ -9,6 +9,13 @@ namespace MagicaCloth2
    {
        public Vector3 eulers = new Vector3(0, 90, 0);
        public Space space = Space.World;
+        public enum UpdateMode
+        {
+            Update,
+            FixedUpdate,
+        }
+        [SerializeField]
+        private UpdateMode updateMode = UpdateMode.Update;

        [SerializeField]
        [Range(0.1f, 5.0f)]
@@ -19,11 +26,23 @@ namespace MagicaCloth2

        private float time = 0;

+        private void FixedUpdate()
+        {
+            if (updateMode == UpdateMode.FixedUpdate)
+                UpdatePosition(Time.fixedDeltaTime);
+        }
+
        void Update()
+        {
+            if (updateMode == UpdateMode.Update)
+                UpdatePosition(Time.deltaTime);
+        }
+
+        void UpdatePosition(float dtime)
        {
            if (useSin)
            {
-                time += Time.deltaTime;
+                time += dtime;
                float ang = (time % interval) / interval * Mathf.PI * 2.0f;
                var t = Mathf.Sin(ang);
                if (space == Space.World)
@@ -33,7 +52,7 @@ namespace MagicaCloth2
            }
            else
            {
-                transform.Rotate(eulers * Time.deltaTime, space);
+                transform.Rotate(eulers * dtime, space);
            }
        }
    }
--- a/deleted)/Common/Scripts/CameraOrbit.cs
+++ b/deleted)/Common/Scripts/CameraOrbit.cs
@@ -124,10 +124,7 @@ namespace MagicaCloth2
                return;

            // カメラターゲットポジション
-            if (cameraTarget)
-            {
-                cameraTargetPos = cameraTarget.position;
-            }
+            cameraTargetPos = cameraTarget ? cameraTarget.position : transform.position;

            // 補間
            cameraDist = Mathf.SmoothDamp(cameraDist, setCameraDist, ref cameraDistVelocity, cameraDistHokanTime);
@@ -147,13 +144,13 @@ namespace MagicaCloth2
            Vector3 pos = q * v;

            // ターゲットポジション
-            Vector3 tarpos = cameraTargetPos + cameraTargetOffset;
+            Vector3 tarpos = cameraTargetPos + transform.TransformVector(cameraTargetOffset);
            Vector3 fixpos = tarpos + pos;
-            cameraTransform.localPosition = fixpos;
+            cameraTransform.position = fixpos;

            // 回転確定
            Vector3 relativePos = tarpos - cameraTransform.position;
-            Quaternion rot = Quaternion.LookRotation(relativePos);
+            Quaternion rot = Quaternion.LookRotation(relativePos, transform.up);
            cameraTransform.rotation = rot;
        }

@@ -182,8 +179,8 @@ namespace MagicaCloth2
            }
            else if (moveMode == MoveMode.Free)
            {
-                Vector3 offset = cameraTransform.up * -speed.y * moveSpeed;
-                offset += cameraTransform.right * -speed.x * moveSpeed;
+                Vector3 offset = transform.InverseTransformDirection(cameraTransform.up) * -speed.y * moveSpeed;
+                offset += transform.InverseTransformDirection(cameraTransform.right) * -speed.x * moveSpeed;

                cameraTargetOffset += offset;
            }
@@ -207,7 +204,7 @@ namespace MagicaCloth2
        /// <param name="screenVelocity"></param>
        private void OnTouchMove(int fid, Vector2 screenPos, Vector2 screenVelocity, Vector2 cmVelocity)
        {
-            screenVelocity *= Time.deltaTime * 60.0f;
+            screenVelocity *= SpeedAdjustment();

            if (fid == 2)
            {
@@ -225,6 +222,8 @@ namespace MagicaCloth2

        private void OnDoubleTouchMove(int fid, Vector2 screenPos, Vector2 screenVelocity, Vector2 cmVelocity)
        {
+            screenVelocity *= SpeedAdjustment();
+
            if (SimpleInputManager.Instance.GetTouchCount() >= 3)
                updateOffset(screenVelocity);
        }
@@ -236,9 +235,15 @@ namespace MagicaCloth2
        /// <param name="speedcm"></param>
        private void OnTouchPinch(float speedscr, float speedcm)
        {
-            //if (Mathf.Abs(speedcm) > 1.0f)
+            speedcm *= SpeedAdjustment();
+
            if (SimpleInputManager.Instance.GetTouchCount() < 3)
                updateZoom(speedcm);
        }
+
+        private float SpeedAdjustment()
+        {
+            return Time.deltaTime * 60.0f;
+        }
    }
 }
--- a/deleted)/UnityChan/SD_Kohaku_chanz/Materials/SB_def_mat.mat
+++ b/deleted)/UnityChan/SD_Kohaku_chanz/Materials/SB_def_mat.mat
@@ -1,18 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-6730753341877941771
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 7
 --- !u!114 &-5755898939291106094
 MonoBehaviour:
  m_ObjectHideFlags: 11
@@ -130,3 +117,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _Tiling: {r: 1, g: 1, b: 0, a: 0}
  m_BuildTextureStacks: []
+--- !u!114 &3686974783191794861
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
--- a/deleted)/UnityChan/SD_Kohaku_chanz/Materials/SB_nol_mat.mat
+++ b/deleted)/UnityChan/SD_Kohaku_chanz/Materials/SB_nol_mat.mat
@@ -1,18 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-213942310117898930
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 7
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
@@ -130,3 +117,16 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  version: 0
+--- !u!114 &9126696614446968798
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
--- a/deleted)/UnityChan/SD_Kohaku_chanz/Materials/SB_skin_mat.mat
+++ b/deleted)/UnityChan/SD_Kohaku_chanz/Materials/SB_skin_mat.mat
@@ -117,7 +117,7 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _Tiling: {r: 1, g: 1, b: 0, a: 0}
  m_BuildTextureStacks: []
--- !u!114 &2265227992717787281
+--- !u!114 &5676845818307696089
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
--- a/deleted)/UnityChan/SD_Kohaku_chanz/Materials/def_mat.mat
+++ b/deleted)/UnityChan/SD_Kohaku_chanz/Materials/def_mat.mat
@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-5795192267020231345
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!114 &-1839986918002453301
 MonoBehaviour:
  m_ObjectHideFlags: 11
@@ -117,16 +130,3 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _Tiling: {r: 1, g: 1, b: 0, a: 0}
  m_BuildTextureStacks: []
--- !u!114 &6500927346791824399
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 7
--- a/deleted)/UnityChan/SD_Kohaku_chanz/Materials/hair_mat.mat
+++ b/deleted)/UnityChan/SD_Kohaku_chanz/Materials/hair_mat.mat
@@ -13,19 +13,6 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  version: 0
--- !u!114 &-2031477218990992808
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 7
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
@@ -130,3 +117,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _Tiling: {r: 1, g: 1, b: 0, a: 0}
  m_BuildTextureStacks: []
+--- !u!114 &8434226359592951986
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
--- a/deleted)/UnityChan/SD_Kohaku_chanz/Materials/mouth_mat.mat
+++ b/deleted)/UnityChan/SD_Kohaku_chanz/Materials/mouth_mat.mat
@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2738197846762444193
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
@@ -117,16 +130,3 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  version: 0
--- !u!114 &673101718532002599
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 7
--- a/deleted)/UnityChan/SD_Kohaku_chanz/Materials/nol_mat.mat
+++ b/deleted)/UnityChan/SD_Kohaku_chanz/Materials/nol_mat.mat
@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-7941851397000639434
+--- !u!114 &-1314805140553464764
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
--- a/deleted)/UnityChan/SD_Kohaku_chanz/Materials/skin_mat.mat
+++ b/deleted)/UnityChan/SD_Kohaku_chanz/Materials/skin_mat.mat
@@ -1,18 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8524726247996388922
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 7
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
@@ -130,3 +117,16 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  version: 0
+--- !u!114 &8663199020967170823
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7