Modify: 매지카클로스2 버전업데이트

This commit is contained in:
Yamo4490 2025-09-02 02:43:55 +09:00
parent d74c524809
commit 920b9966ee
474 changed files with 21559 additions and 9828 deletions

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Materials/MC2_Floor.mat
uploadId: 756593

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Materials/MC2_Test_Back.mat
uploadId: 756593

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Materials/MC2_Test_Front.mat
uploadId: 756593

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-39192238385914524
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: 10
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -118,6 +105,19 @@ Material:
- _Tiling: {r: 1, g: 1, b: 0, a: 0} - _Tiling: {r: 1, g: 1, b: 0, a: 0}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
m_AllowLocking: 1 m_AllowLocking: 1
--- !u!114 &3313520665792390858
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: 10
--- !u!114 &5537520944958903688 --- !u!114 &5537520944958903688
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Materials/MC2_White.mat
uploadId: 756593

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Model/Materials/Arrow.mat
uploadId: 756593

View File

@ -95,3 +95,10 @@ ModelImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Model/arrow_b.fbx
uploadId: 756593

View File

@ -5,3 +5,10 @@ PrefabImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Cube.prefab
uploadId: 756593

View File

@ -5,3 +5,10 @@ PrefabImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/CubeRoup.prefab
uploadId: 756593

View File

@ -5,3 +5,10 @@ PrefabImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Env.prefab
uploadId: 756593

View File

@ -5,3 +5,10 @@ PrefabImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Plane.prefab
uploadId: 756593

View File

@ -5,3 +5,10 @@ PrefabImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/RuntimeBuildDemo.prefab
uploadId: 756593

View File

@ -5,3 +5,10 @@ PrefabImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/RuntimeDressUpDemo.prefab
uploadId: 756593

View File

@ -5,3 +5,10 @@ PrefabImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/SimpleImputManager.prefab
uploadId: 756593

View File

@ -5,3 +5,10 @@ PrefabImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Stage.prefab
uploadId: 756593

View File

@ -5,3 +5,10 @@ PrefabImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_KAGURA.prefab
uploadId: 756593

View File

@ -5,3 +5,10 @@ PrefabImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_RuntimeBuild.prefab
uploadId: 756593

View File

@ -5,3 +5,10 @@ PrefabImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_RuntimeDressUp.prefab
uploadId: 756593

View File

@ -5,3 +5,10 @@ PrefabImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_Wind.prefab
uploadId: 756593

View File

@ -5,3 +5,10 @@ PrefabImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/WindDemo.prefab
uploadId: 756593

View File

@ -5,3 +5,10 @@ PrefabImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/WindParticle.prefab
uploadId: 756593

View File

@ -5,3 +5,10 @@ TextScriptImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Resources/MC2_BoneCloth_Ribbon_Demo.json
uploadId: 756593

View File

@ -9,6 +9,13 @@ namespace MagicaCloth2
{ {
public Vector3 eulers = new Vector3(0, 90, 0); public Vector3 eulers = new Vector3(0, 90, 0);
public Space space = Space.World; public Space space = Space.World;
public enum UpdateMode
{
Update,
FixedUpdate,
}
[SerializeField]
private UpdateMode updateMode = UpdateMode.Update;
[SerializeField] [SerializeField]
[Range(0.1f, 5.0f)] [Range(0.1f, 5.0f)]
@ -19,11 +26,23 @@ namespace MagicaCloth2
private float time = 0; private float time = 0;
private void FixedUpdate()
{
if (updateMode == UpdateMode.FixedUpdate)
UpdatePosition(Time.fixedDeltaTime);
}
void Update() void Update()
{
if (updateMode == UpdateMode.Update)
UpdatePosition(Time.deltaTime);
}
void UpdatePosition(float dtime)
{ {
if (useSin) if (useSin)
{ {
time += Time.deltaTime; time += dtime;
float ang = (time % interval) / interval * Mathf.PI * 2.0f; float ang = (time % interval) / interval * Mathf.PI * 2.0f;
var t = Mathf.Sin(ang); var t = Mathf.Sin(ang);
if (space == Space.World) if (space == Space.World)
@ -33,7 +52,7 @@ namespace MagicaCloth2
} }
else else
{ {
transform.Rotate(eulers * Time.deltaTime, space); transform.Rotate(eulers * dtime, space);
} }
} }
} }

View File

@ -10,3 +10,10 @@ MonoImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Scripts/AutoRotate.cs
uploadId: 756593

View File

@ -124,10 +124,7 @@ namespace MagicaCloth2
return; return;
// カメラターゲットポジション // カメラターゲットポジション
if (cameraTarget) cameraTargetPos = cameraTarget ? cameraTarget.position : transform.position;
{
cameraTargetPos = cameraTarget.position;
}
// 補間 // 補間
cameraDist = Mathf.SmoothDamp(cameraDist, setCameraDist, ref cameraDistVelocity, cameraDistHokanTime); cameraDist = Mathf.SmoothDamp(cameraDist, setCameraDist, ref cameraDistVelocity, cameraDistHokanTime);
@ -147,13 +144,13 @@ namespace MagicaCloth2
Vector3 pos = q * v; Vector3 pos = q * v;
// ターゲットポジション // ターゲットポジション
Vector3 tarpos = cameraTargetPos + cameraTargetOffset; Vector3 tarpos = cameraTargetPos + transform.TransformVector(cameraTargetOffset);
Vector3 fixpos = tarpos + pos; Vector3 fixpos = tarpos + pos;
cameraTransform.localPosition = fixpos; cameraTransform.position = fixpos;
// 回転確定 // 回転確定
Vector3 relativePos = tarpos - cameraTransform.position; Vector3 relativePos = tarpos - cameraTransform.position;
Quaternion rot = Quaternion.LookRotation(relativePos); Quaternion rot = Quaternion.LookRotation(relativePos, transform.up);
cameraTransform.rotation = rot; cameraTransform.rotation = rot;
} }
@ -182,8 +179,8 @@ namespace MagicaCloth2
} }
else if (moveMode == MoveMode.Free) else if (moveMode == MoveMode.Free)
{ {
Vector3 offset = cameraTransform.up * -speed.y * moveSpeed; Vector3 offset = transform.InverseTransformDirection(cameraTransform.up) * -speed.y * moveSpeed;
offset += cameraTransform.right * -speed.x * moveSpeed; offset += transform.InverseTransformDirection(cameraTransform.right) * -speed.x * moveSpeed;
cameraTargetOffset += offset; cameraTargetOffset += offset;
} }
@ -207,7 +204,7 @@ namespace MagicaCloth2
/// <param name="screenVelocity"></param> /// <param name="screenVelocity"></param>
private void OnTouchMove(int fid, Vector2 screenPos, Vector2 screenVelocity, Vector2 cmVelocity) private void OnTouchMove(int fid, Vector2 screenPos, Vector2 screenVelocity, Vector2 cmVelocity)
{ {
screenVelocity *= Time.deltaTime * 60.0f; screenVelocity *= SpeedAdjustment();
if (fid == 2) if (fid == 2)
{ {
@ -225,6 +222,8 @@ namespace MagicaCloth2
private void OnDoubleTouchMove(int fid, Vector2 screenPos, Vector2 screenVelocity, Vector2 cmVelocity) private void OnDoubleTouchMove(int fid, Vector2 screenPos, Vector2 screenVelocity, Vector2 cmVelocity)
{ {
screenVelocity *= SpeedAdjustment();
if (SimpleInputManager.Instance.GetTouchCount() >= 3) if (SimpleInputManager.Instance.GetTouchCount() >= 3)
updateOffset(screenVelocity); updateOffset(screenVelocity);
} }
@ -236,9 +235,15 @@ namespace MagicaCloth2
/// <param name="speedcm"></param> /// <param name="speedcm"></param>
private void OnTouchPinch(float speedscr, float speedcm) private void OnTouchPinch(float speedscr, float speedcm)
{ {
//if (Mathf.Abs(speedcm) > 1.0f) speedcm *= SpeedAdjustment();
if (SimpleInputManager.Instance.GetTouchCount() < 3) if (SimpleInputManager.Instance.GetTouchCount() < 3)
updateZoom(speedcm); updateZoom(speedcm);
} }
private float SpeedAdjustment()
{
return Time.deltaTime * 60.0f;
}
} }
} }

View File

@ -9,3 +9,10 @@ MonoImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Scripts/CameraOrbit.cs
uploadId: 756593

View File

@ -9,3 +9,10 @@ MonoImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Scripts/CreateSingleton.cs
uploadId: 756593

View File

@ -5,3 +5,10 @@ AssemblyDefinitionImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Scripts/Editor/ShaderGraph/MagicaCloth2UPMImporterShaderGraph.asmdef
uploadId: 756593

View File

@ -9,3 +9,10 @@ MonoImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Scripts/Editor/ShaderGraph/UnityPackageImporter.cs
uploadId: 756593

View File

@ -9,3 +9,10 @@ MonoImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Scripts/GameObjectContainer.cs
uploadId: 756593

View File

@ -0,0 +1,25 @@
{
"name": "MagicaCloth2Example",
"rootNamespace": "",
"references": [
"MagicaClothV2",
"Unity.InputSystem"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": true,
"precompiledReferences": [],
"autoReferenced": false,
"defineConstraints": [
"MAGICACLOTH2"
],
"versionDefines": [
{
"name": "com.unity.inputsystem",
"expression": "1.0.0",
"define": "MC2_INPUTSYSTEM"
}
],
"noEngineReferences": false
}

View File

@ -0,0 +1,14 @@
fileFormatVersion: 2
guid: 5bc0ea054e216f5498d1a84885db7ab1
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Scripts/MagicaCloth2Example.asmdef
uploadId: 756593

View File

@ -9,3 +9,10 @@ MonoImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Scripts/ModelController.cs
uploadId: 756593

View File

@ -233,6 +233,7 @@ namespace MagicaCloth2
sdata.colliderCollisionConstraint.mode = ColliderCollisionConstraint.Mode.Point; sdata.colliderCollisionConstraint.mode = ColliderCollisionConstraint.Mode.Point;
// setup collider // setup collider
// UpperLeg L
var lobj = new GameObject("CapsuleCollider_L"); var lobj = new GameObject("CapsuleCollider_L");
lobj.transform.SetParent(gameObjectContainer.GetGameObject("Character1_LeftUpLeg").transform); lobj.transform.SetParent(gameObjectContainer.GetGameObject("Character1_LeftUpLeg").transform);
lobj.transform.localPosition = new Vector3(0.0049f, 0.0f, -0.0832f); lobj.transform.localPosition = new Vector3(0.0049f, 0.0f, -0.0832f);
@ -240,17 +241,10 @@ namespace MagicaCloth2
var colliderL = lobj.AddComponent<MagicaCapsuleCollider>(); var colliderL = lobj.AddComponent<MagicaCapsuleCollider>();
colliderL.direction = MagicaCapsuleCollider.Direction.Z; colliderL.direction = MagicaCapsuleCollider.Direction.Z;
colliderL.SetSize(0.082f, 0.094f, 0.3f); colliderL.SetSize(0.082f, 0.094f, 0.3f);
// UpperLeg R (Symmetry)
var robj = new GameObject("CapsuleCollider_R"); colliderL.symmetryMode = ColliderSymmetryMode.AutomaticHumanBody;
robj.transform.SetParent(gameObjectContainer.GetGameObject("Character1_RightUpLeg").transform); colliderL.UpdateParameters(); // Required when changing parameters.
robj.transform.localPosition = new Vector3(-0.0049f, 0.0f, -0.0832f);
robj.transform.localEulerAngles = new Vector3(0.23f, -16.376f, -0.028f);
var colliderR = robj.AddComponent<MagicaCapsuleCollider>();
colliderR.direction = MagicaCapsuleCollider.Direction.Z;
colliderR.SetSize(0.082f, 0.094f, 0.3f);
sdata.colliderCollisionConstraint.colliderList.Add(colliderL); sdata.colliderCollisionConstraint.colliderList.Add(colliderL);
sdata.colliderCollisionConstraint.colliderList.Add(colliderR);
// start build // start build
cloth.BuildAndRun(); cloth.BuildAndRun();

View File

@ -9,3 +9,10 @@ MonoImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Scripts/RuntimeBuildDemo.cs
uploadId: 756593

View File

@ -9,3 +9,10 @@ MonoImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Scripts/RuntimeDressUpDemo.cs
uploadId: 756593

View File

@ -0,0 +1,196 @@
// Magica Cloth 2.
// Copyright (c) 2025 MagicaSoft.
// https://magicasoft.jp
using UnityEngine;
#if MC2_INPUTSYSTEM
using UnityEngine.InputSystem;
using UnityEngine.InputSystem.EnhancedTouch;
#endif
namespace MagicaCloth2
{
/// <summary>
/// InputManager/InputSystem入力切り替えラッパー
/// </summary>
public class SimpleInput
{
#if MC2_INPUTSYSTEM
// (New) Imput System
public static void Init()
{
EnhancedTouchSupport.Enable();
}
public static int touchCount
{
get
{
return UnityEngine.InputSystem.EnhancedTouch.Touch.activeTouches.Count;
}
}
public static UnityEngine.Touch GetTouch(int index)
{
var touchData = new UnityEngine.Touch();
int count = UnityEngine.InputSystem.EnhancedTouch.Touch.activeTouches.Count;
if (index < count)
{
var touch = UnityEngine.InputSystem.EnhancedTouch.Touch.activeTouches[index];
// convert
touchData.fingerId = touch.finger.index;
touchData.position = touch.screenPosition;
touchData.deltaPosition = touch.delta;
switch (touch.phase)
{
case UnityEngine.InputSystem.TouchPhase.Canceled:
touchData.phase = UnityEngine.TouchPhase.Canceled;
break;
case UnityEngine.InputSystem.TouchPhase.Ended:
touchData.phase = UnityEngine.TouchPhase.Ended;
break;
case UnityEngine.InputSystem.TouchPhase.Moved:
touchData.phase = UnityEngine.TouchPhase.Moved;
break;
case UnityEngine.InputSystem.TouchPhase.Began:
touchData.phase = UnityEngine.TouchPhase.Began;
break;
}
}
return touchData;
}
public static bool GetKey(KeyCode key)
{
switch (key)
{
case KeyCode.Escape:
return Keyboard.current.escapeKey.isPressed;
default:
return false;
}
}
public static bool GetKeyDown(KeyCode key)
{
switch (key)
{
case KeyCode.Backspace:
return Keyboard.current.backspaceKey.wasPressedThisFrame;
default:
return false;
}
}
public static bool GetMouseButtonDown(int button)
{
switch (button)
{
case 0:
return Mouse.current.leftButton.wasPressedThisFrame;
case 1:
return Mouse.current.rightButton.wasPressedThisFrame;
case 2:
return Mouse.current.middleButton.wasPressedThisFrame;
default:
return false;
}
}
public static bool GetMouseButtonUp(int button)
{
switch (button)
{
case 0:
return Mouse.current.leftButton.wasReleasedThisFrame;
case 1:
return Mouse.current.rightButton.wasReleasedThisFrame;
case 2:
return Mouse.current.middleButton.wasReleasedThisFrame;
default:
return false;
}
}
public static Vector3 mousePosition
{
get
{
return Mouse.current.position.ReadValue();
}
}
public static float GetMouseScrollWheel()
{
// 古いInputSystemに不具合あり
// ホイールデルタがデフォルトでx120されて返ってくる
// これはWindowsのみの挙動でMac/Linuxでは発生しない
// そしてUnity 2023.2以降は修正された
float value = Mouse.current.scroll.ReadValue().y * 0.12f; // base
#if UNITY_2023_2_OR_NEWER
return value;
#else
#if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
return value / 120.0f; // ホイールデルタの不具合を吸収
#else
return value;
#endif
#endif
}
#else
// (Old) Imput Manager
public static void Init()
{
}
public static int touchCount
{
get
{
return Input.touchCount;
}
}
public static Touch GetTouch(int index)
{
return Input.GetTouch(index);
}
public static bool GetKey(KeyCode key)
{
return Input.GetKey(key);
}
public static bool GetKeyDown(KeyCode key)
{
return Input.GetKeyDown(key);
}
public static bool GetMouseButtonDown(int button)
{
return Input.GetMouseButtonDown(button);
}
public static bool GetMouseButtonUp(int button)
{
return Input.GetMouseButtonUp(button);
}
public static Vector3 mousePosition
{
get
{
return Input.mousePosition;
}
}
public static float GetMouseScrollWheel()
{
return Input.GetAxis("Mouse ScrollWheel");
}
#endif
}
}

View File

@ -0,0 +1,18 @@
fileFormatVersion: 2
guid: ab72fcfec8965ae4181307a06400b57b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SimpleInput.cs
uploadId: 756593

View File

@ -105,6 +105,8 @@ namespace MagicaCloth2
//========================================================================================= //=========================================================================================
protected override void InitSingleton() protected override void InitSingleton()
{ {
SimpleInput.Init();
// スクリーン情報 // スクリーン情報
CalcScreenDpi(); CalcScreenDpi();
@ -188,7 +190,7 @@ namespace MagicaCloth2
public int GetTouchCount() public int GetTouchCount()
{ {
return Input.touchCount; return SimpleInput.touchCount;
} }
public bool IsUI() public bool IsUI()
@ -199,7 +201,7 @@ namespace MagicaCloth2
if (mobilePlatform) if (mobilePlatform)
{ {
// モバイル用タッチ入力 // モバイル用タッチ入力
return EventSystem.current.IsPointerOverGameObject(Input.GetTouch(0).fingerId); return EventSystem.current.IsPointerOverGameObject(SimpleInput.GetTouch(0).fingerId);
} }
else else
{ {
@ -214,7 +216,7 @@ namespace MagicaCloth2
/// </summary> /// </summary>
private void UpdateMobile() private void UpdateMobile()
{ {
int count = Input.touchCount; int count = SimpleInput.touchCount;
if (count == 0) if (count == 0)
{ {
@ -223,7 +225,7 @@ namespace MagicaCloth2
// バックボタン // バックボタン
if (Application.platform == RuntimePlatform.Android) if (Application.platform == RuntimePlatform.Android)
{ {
if (Input.GetKey(KeyCode.Escape) && lastTime + 0.2f < Time.time) if (SimpleInput.GetKey(KeyCode.Escape) && lastTime + 0.2f < Time.time)
{ {
lastTime = Time.time; lastTime = Time.time;
if (OnBackButton != null) if (OnBackButton != null)
@ -239,7 +241,7 @@ namespace MagicaCloth2
// メイン // メイン
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
Touch touch = Input.GetTouch(i); Touch touch = SimpleInput.GetTouch(i);
int fid = touch.fingerId; int fid = touch.fingerId;
// フィンガーIDが以外は無視する // フィンガーIDが以外は無視する
@ -289,7 +291,7 @@ namespace MagicaCloth2
int setcnt = 0; int setcnt = 0;
for (int j = 0; j < count; j++) for (int j = 0; j < count; j++)
{ {
Touch t = Input.GetTouch(j); Touch t = SimpleInput.GetTouch(j);
if (mainFingerId == t.fingerId) if (mainFingerId == t.fingerId)
{ {
t1pos = t.position; t1pos = t.position;
@ -497,7 +499,7 @@ namespace MagicaCloth2
private void UpdateMouse() private void UpdateMouse()
{ {
// BackSpace を Android 端末のバックボタンに割り当てる // BackSpace を Android 端末のバックボタンに割り当てる
if (Input.GetKeyDown(KeyCode.Backspace)) if (SimpleInput.GetKeyDown(KeyCode.Backspace))
{ {
if (OnBackButton != null) if (OnBackButton != null)
OnBackButton(); OnBackButton();
@ -507,7 +509,7 @@ namespace MagicaCloth2
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
// マウスボタンダウン // マウスボタンダウン
if (Input.GetMouseButtonDown(i)) if (SimpleInput.GetMouseButtonDown(i))
{ {
if (IsUI()) if (IsUI())
continue; continue;
@ -519,46 +521,46 @@ namespace MagicaCloth2
mouseDown[i] = true; mouseDown[i] = true;
// 入力位置を記録 // 入力位置を記録
downPos[i] = Input.mousePosition; downPos[i] = SimpleInput.mousePosition;
mouseOldMovePos[i] = Input.mousePosition; mouseOldMovePos[i] = SimpleInput.mousePosition;
if (i == 0) if (i == 0)
flickDownPos[i] = Input.mousePosition; flickDownPos[i] = SimpleInput.mousePosition;
// タッチダウンイベント発行 // タッチダウンイベント発行
if (OnTouchDown != null) if (OnTouchDown != null)
OnTouchDown(i, Input.mousePosition); OnTouchDown(i, SimpleInput.mousePosition);
} }
// マウスボタンアップ // マウスボタンアップ
if (Input.GetMouseButtonUp(i) && mouseDown[i]) if (SimpleInput.GetMouseButtonUp(i) && mouseDown[i])
{ {
mouseDown[i] = false; mouseDown[i] = false;
// フリック判定 // フリック判定
if (i == 0) if (i == 0)
{ {
CheckFlic(i, mouseOldMovePos[i], Input.mousePosition, flickDownPos[i], flickDownTime[i]); CheckFlic(i, mouseOldMovePos[i], SimpleInput.mousePosition, flickDownPos[i], flickDownTime[i]);
} }
mouseOldMovePos[i] = Vector2.zero; mouseOldMovePos[i] = Vector2.zero;
// タッチアップイベント // タッチアップイベント
if (OnTouchUp != null) if (OnTouchUp != null)
OnTouchUp(i, Input.mousePosition); OnTouchUp(i, SimpleInput.mousePosition);
// タップ判定 // タップ判定
float distcm = Vector2.Distance(downPos[0], Input.mousePosition) / screenDpc; float distcm = Vector2.Distance(downPos[0], SimpleInput.mousePosition) / screenDpc;
if (distcm <= tapRadiusCm) if (distcm <= tapRadiusCm)
{ {
if (OnTouchTap != null) if (OnTouchTap != null)
OnTouchTap(i, Input.mousePosition); OnTouchTap(i, SimpleInput.mousePosition);
} }
} }
// 移動 // 移動
if (mouseDown[i]) if (mouseDown[i])
{ {
Vector2 spos = new Vector2(Input.mousePosition.x, Input.mousePosition.y); Vector2 spos = new Vector2(SimpleInput.mousePosition.x, SimpleInput.mousePosition.y);
Vector2 delta = spos - mouseOldMovePos[i]; Vector2 delta = spos - mouseOldMovePos[i];
if (spos != mouseOldMovePos[i]) if (spos != mouseOldMovePos[i])
@ -569,10 +571,10 @@ namespace MagicaCloth2
// 移動通知(現在スクリーン座標、速度(スクリーン比率/s)、速度(cm/s)) // 移動通知(現在スクリーン座標、速度(スクリーン比率/s)、速度(cm/s))
if (OnTouchMove != null) if (OnTouchMove != null)
OnTouchMove(i, Input.mousePosition, CalcScreenRatioVector(delta) / Time.deltaTime, speedcm); OnTouchMove(i, SimpleInput.mousePosition, CalcScreenRatioVector(delta) / Time.deltaTime, speedcm);
} }
mouseOldMovePos[i] = Input.mousePosition; mouseOldMovePos[i] = SimpleInput.mousePosition;
// フリックダウン位置更新 // フリックダウン位置更新
flickDownPos[i] = (flickDownPos[i] + spos) * 0.5f; flickDownPos[i] = (flickDownPos[i] + spos) * 0.5f;
@ -582,7 +584,7 @@ namespace MagicaCloth2
} }
// ピンチイン/アウト // ピンチイン/アウト
float w = Input.GetAxis("Mouse ScrollWheel"); float w = SimpleInput.GetMouseScrollWheel();
if (Mathf.Abs(w) > 0.01f) if (Mathf.Abs(w) > 0.01f)
{ {
// モバイル入力とスケール感を合わせるために係数を掛ける // モバイル入力とスケール感を合わせるために係数を掛ける

View File

@ -9,3 +9,10 @@ MonoImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SimpleInputManager.cs
uploadId: 756593

View File

@ -9,3 +9,10 @@ MonoImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SliderText.cs
uploadId: 756593

View File

@ -9,3 +9,10 @@ MonoImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Scripts/TargetFPS.cs
uploadId: 756593

View File

@ -9,3 +9,10 @@ MonoImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Scripts/WindDemo.cs
uploadId: 756593

View File

@ -8,3 +8,10 @@ ScriptedImporter:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Shaders/MC2_Common_Lit_Back.shadergraph
uploadId: 756593

View File

@ -8,3 +8,10 @@ ScriptedImporter:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Shaders/MC2_Common_Lit_Front.shadergraph
uploadId: 756593

View File

@ -133,3 +133,10 @@ TextureImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/Common/Textures/SD_UnityChan_Skirt_PaintMap.png
uploadId: 756593

View File

@ -5,3 +5,10 @@ DefaultImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/RuntimeBuild_CoreRP.unity
uploadId: 756593

View File

@ -5,3 +5,10 @@ DefaultImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/RuntimeDressUp_CoreRP.unity
uploadId: 756593

View File

@ -5,3 +5,10 @@ DefaultImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/UnityChanKAGURA_CoreRP.unity
uploadId: 756593

View File

@ -5,3 +5,10 @@ DefaultImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/Wind_CoreRP.unity
uploadId: 756593

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/MC2_SkyandFogSettingsProfile.asset
uploadId: 756593

View File

@ -5,3 +5,10 @@ DefaultImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/RuntimeBuild_HDRP.unity
uploadId: 756593

View File

@ -5,3 +5,10 @@ DefaultImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/RuntimeDressUp_HDRP.unity
uploadId: 756593

View File

@ -5,3 +5,10 @@ DefaultImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/UnityChanKAGURA_HDRP.unity
uploadId: 756593

View File

@ -5,3 +5,10 @@ DefaultImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/Wind_HDRP.unity
uploadId: 756593

View File

@ -5,3 +5,10 @@ DefaultImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/RuntimeBuild_URP.unity
uploadId: 756593

View File

@ -5,3 +5,10 @@ DefaultImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/RuntimeDressUp_URP.unity
uploadId: 756593

View File

@ -5,3 +5,10 @@ DefaultImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/UnityChanKAGURA_URP.unity
uploadId: 756593

View File

@ -5,3 +5,10 @@ DefaultImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/Wind_URP.unity
uploadId: 756593

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 20f694a56cb3ba842b35402189c3b2f6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 098d9df8397d80f45baed0214420d1cf
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,14 @@
fileFormatVersion: 2
guid: 8a0637df5c1ee8a4d8d6c5d2f3807cde
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/RuntimeBuild_HighDefinition3D.unity
uploadId: 756593

View File

@ -0,0 +1,14 @@
fileFormatVersion: 2
guid: 30700d501f109174891f340ae1fc1833
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/RuntimeDressUp_HighDefinition3D.unity
uploadId: 756593

View File

@ -0,0 +1,14 @@
fileFormatVersion: 2
guid: ca2d4f8e19e54d642bbc386701570fd4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/UnityChanKAGURA_HighDefinition3D.unity
uploadId: 756593

View File

@ -0,0 +1,14 @@
fileFormatVersion: 2
guid: 8ef5d38bbe84ef44cb76386cf579b78d
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/Wind_HighDefinition3D.unity
uploadId: 756593

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ee41de38686ef9b439643dd695fd9f9d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,14 @@
fileFormatVersion: 2
guid: 9d96bb6c1a7bbf14b95fba198bd36558
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/RuntimeBuild_Universal3D.unity
uploadId: 756593

View File

@ -0,0 +1,14 @@
fileFormatVersion: 2
guid: 01f984873de94d845a6f0dad6e1764ce
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/RuntimeDressUp_Universal3D.unity
uploadId: 756593

View File

@ -0,0 +1,14 @@
fileFormatVersion: 2
guid: 54b38eb7d538c7f44b7fd7a9df0478d3
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/UnityChanKAGURA_Universal3D.unity
uploadId: 756593

View File

@ -0,0 +1,14 @@
fileFormatVersion: 2
guid: 44a8005bc0be2894fb5f7cec86f3eeae
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/Wind_Universal3D.unity
uploadId: 756593

View File

@ -133,3 +133,10 @@ TextureImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/UnityChan/Logo/Dark_Silhouette.png
uploadId: 756593

View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-5805247609134839791 --- !u!114 &-8367319535634762937
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Materials/SB_def_mat.mat
uploadId: 756593

View File

@ -105,19 +105,6 @@ Material:
- _Tiling: {r: 1, g: 1, b: 0, a: 0} - _Tiling: {r: 1, g: 1, b: 0, a: 0}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
m_AllowLocking: 1 m_AllowLocking: 1
--- !u!114 &1416824612331664537
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: 10
--- !u!114 &5988364977265673585 --- !u!114 &5988364977265673585
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
@ -131,3 +118,16 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
version: 0 version: 0
--- !u!114 &6642007414726601541
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: 10

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Materials/SB_nol_mat.mat
uploadId: 756593

View File

@ -13,6 +13,19 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
version: 0 version: 0
--- !u!114 &-3527211999276890483
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: 10
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -118,16 +131,3 @@ Material:
- _Tiling: {r: 1, g: 1, b: 0, a: 0} - _Tiling: {r: 1, g: 1, b: 0, a: 0}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
m_AllowLocking: 1 m_AllowLocking: 1
--- !u!114 &7561439969631927331
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: 10

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Materials/SB_skin_mat.mat
uploadId: 756593

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-3348263818793008538
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: 10
--- !u!114 &-1839986918002453301 --- !u!114 &-1839986918002453301
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
@ -26,6 +13,19 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
version: 0 version: 0
--- !u!114 &-1156612615677998621
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: 10
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Materials/def_mat.mat
uploadId: 756593

View File

@ -118,7 +118,7 @@ Material:
- _Tiling: {r: 1, g: 1, b: 0, a: 0} - _Tiling: {r: 1, g: 1, b: 0, a: 0}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
m_AllowLocking: 1 m_AllowLocking: 1
--- !u!114 &8904441550551059416 --- !u!114 &3524422830314133294
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Materials/hair_mat.mat
uploadId: 756593

View File

@ -1,5 +1,18 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-4586411623184738822
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: 10
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -118,16 +131,3 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
version: 0 version: 0
--- !u!114 &6747972257908541556
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: 10

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Materials/mouth_mat.mat
uploadId: 756593

View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-3882220622740168363 --- !u!114 &-1182480219143839893
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Materials/nol_mat.mat
uploadId: 756593

View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-6659663828051372056 --- !u!114 &-6487248340714685668
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Materials/skin_mat.mat
uploadId: 756593

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/SD_UnityChan.controller
uploadId: 756593

View File

@ -133,3 +133,10 @@ TextureImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/body_sum.png
uploadId: 756593

View File

@ -133,3 +133,10 @@ TextureImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/body_win.png
uploadId: 756593

View File

@ -133,3 +133,10 @@ TextureImporter:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.1
assetPath: Assets/External/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/misaki_head.png
uploadId: 756593

Some files were not shown because too many files have changed in this diff Show More