Merge pull request #10 from croakfang/master

Add ear morph with physics support
This commit is contained in:
katboi01
2022-11-08 11:35:27 +01:00
committed by GitHub
101 changed files with 1048 additions and 1651 deletions
-1
View File
@@ -1,6 +1,5 @@
using UnityEngine;
using UnityEditor;
using System.Collections;
using System.IO;
using Newtonsoft.Json.Linq;
@@ -1,55 +1,80 @@
fileFormatVersion: 2
guid: 9b6ba260dada0ea4a871a42011f8b87d
timeCreated: 1466788355
licenseType: Store
PluginImporter:
serializedVersion: 1
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Android:
- first:
: Linux
second:
enabled: 0
settings:
CPU: x86
- first:
: OSXIntel
second:
enabled: 0
settings:
CPU: AnyCPU
Any:
- first:
: OSXIntel64
second:
enabled: 0
settings:
CPU: AnyCPU
- first:
: SamsungTV
second:
enabled: 0
settings:
STV_MODEL: STANDARD_13
- first:
Android: Android
second:
enabled: 0
settings:
CPU: AnyCPU
- first:
Any:
second:
enabled: 0
settings: {}
Editor:
- first:
Editor: Editor
second:
enabled: 0
settings:
CPU: AnyCPU
DefaultValueInitialized: true
OS: AnyOS
Linux:
enabled: 0
settings:
CPU: x86
Linux64:
enabled: 0
settings:
CPU: x86_64
OSXIntel:
- first:
Standalone: Linux64
second:
enabled: 0
settings:
CPU: AnyCPU
OSXIntel64:
- first:
Standalone: Win
second:
enabled: 0
settings:
CPU: AnyCPU
SamsungTV:
enabled: 0
settings:
STV_MODEL: STANDARD_13
Win:
- first:
Standalone: Win64
second:
enabled: 0
settings:
CPU: AnyCPU
Win64:
enabled: 0
settings:
CPU: AnyCPU
WindowsStoreApps:
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 1
settings:
CPU: AnyCPU
@@ -57,7 +82,9 @@ PluginImporter:
PlaceholderPath: Assets/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll
SDK: AnySDK
ScriptingBackend: DotNet
iOS:
- first:
iPhone: iOS
second:
enabled: 0
settings:
CompileFlags:
+86 -4
View File
@@ -31,6 +31,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1632224465550007520}
- {fileID: 4146413565610975991}
- {fileID: 8301924667655547497}
- {fileID: 2752195846700614642}
m_Father: {fileID: 0}
@@ -91,10 +92,91 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 908bc558174093149b89e5c25c1be244, type: 3}
m_Name:
m_EditorClassIdentifier:
Name: {fileID: 857826377799910844}
TextComponentType: 0
TextMesh: {fileID: 857826377799910844}
Text: {fileID: 1349694594143736175}
Button: {fileID: 4701344421301256321}
Slider: {fileID: 0}
Image: {fileID: 2042513854733717578}
--- !u!1 &2491819406042194125
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4146413565610975991}
- component: {fileID: 5894614192165020956}
- component: {fileID: 1349694594143736175}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4146413565610975991
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2491819406042194125}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.8, y: 0.8, z: 1}
m_Children: []
m_Father: {fileID: 3084157013075778163}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 3.1146011, y: 0}
m_SizeDelta: {x: 36.229202, y: 13.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5894614192165020956
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2491819406042194125}
m_CullTransparentMesh: 1
--- !u!114 &1349694594143736175
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2491819406042194125}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 036631af73b15ac41a9d10f75f5bbafe, type: 3}
m_FontSize: 23
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 300
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: New Text
--- !u!1 &4970516181956112805
GameObject:
m_ObjectHideFlags: 0
@@ -336,7 +418,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8301924667655547497
RectTransform:
m_ObjectHideFlags: 0
@@ -349,7 +431,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3084157013075778163}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -485,7 +567,7 @@ RectTransform:
m_Children:
- {fileID: 6549944385096739170}
m_Father: {fileID: 3084157013075778163}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
-429
View File
@@ -1,429 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &648541853701480401
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3084157013075778163}
- component: {fileID: 8271955219447533037}
- component: {fileID: 5050386386052281307}
- component: {fileID: 937176245766373427}
m_Layer: 5
m_Name: UmaContainerNoTMP
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3084157013075778163
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 648541853701480401}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1065474299355261280}
- {fileID: 2752195846700614642}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 180, y: 35}
m_Pivot: {x: 0, y: 1}
--- !u!222 &8271955219447533037
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 648541853701480401}
m_CullTransparentMesh: 1
--- !u!114 &5050386386052281307
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 648541853701480401}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &937176245766373427
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 648541853701480401}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 908bc558174093149b89e5c25c1be244, type: 3}
m_Name:
m_EditorClassIdentifier:
Name: {fileID: 0}
Button: {fileID: 4701344421301256321}
Slider: {fileID: 0}
--- !u!1 &935821269070673055
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1065474299355261280}
- component: {fileID: 276688823476019565}
- component: {fileID: 1733649770603997391}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1065474299355261280
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 935821269070673055}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.2, y: 0.2, z: 1}
m_Children: []
m_Father: {fileID: 3084157013075778163}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 180, y: 175}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &276688823476019565
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 935821269070673055}
m_CullTransparentMesh: 1
--- !u!114 &1733649770603997391
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 935821269070673055}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: e9132b160714b954cbe8e5341e773754, type: 3}
m_FontSize: 70
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 300
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: New Text
--- !u!1 &4970516181956112805
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6549944385096739170}
- component: {fileID: 448347931352800618}
- component: {fileID: 1909881884718146367}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &6549944385096739170
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4970516181956112805}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2752195846700614642}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &448347931352800618
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4970516181956112805}
m_CullTransparentMesh: 1
--- !u!114 &1909881884718146367
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4970516181956112805}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Button
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &7108175433982420903
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2752195846700614642}
- component: {fileID: 4213100049085397978}
- component: {fileID: 2085099962136127970}
- component: {fileID: 4701344421301256321}
m_Layer: 5
m_Name: Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2752195846700614642
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7108175433982420903}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6549944385096739170}
m_Father: {fileID: 3084157013075778163}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4213100049085397978
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7108175433982420903}
m_CullTransparentMesh: 1
--- !u!114 &2085099962136127970
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7108175433982420903}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &4701344421301256321
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7108175433982420903}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 2085099962136127970}
m_OnClick:
m_PersistentCalls:
m_Calls: []
+4 -1
View File
@@ -90,9 +90,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 908bc558174093149b89e5c25c1be244, type: 3}
m_Name:
m_EditorClassIdentifier:
Name: {fileID: 857826377799910844}
TextComponentType: 1
TextMesh: {fileID: 857826377799910844}
Text: {fileID: 0}
Button: {fileID: 4701344421301256321}
Slider: {fileID: 0}
Image: {fileID: 0}
--- !u!1 &4970516181956112805
GameObject:
m_ObjectHideFlags: 0
+4 -1
View File
@@ -180,9 +180,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 908bc558174093149b89e5c25c1be244, type: 3}
m_Name:
m_EditorClassIdentifier:
Name: {fileID: 857826377799910844}
TextComponentType: 1
TextMesh: {fileID: 857826377799910844}
Text: {fileID: 0}
Button: {fileID: 0}
Slider: {fileID: 9166705304021389345}
Image: {fileID: 0}
--- !u!1 &694429400078501214
GameObject:
m_ObjectHideFlags: 0
+143
View File
@@ -22,6 +22,33 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-4932711163649999293
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: motion_1
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -3766207837626781151}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: f09fc3a683510f9408466071b03b572c, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-4072449279223152736
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -44,6 +71,28 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3766207837626781151
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -4932711163649999293}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-3716543570628925844
AnimatorState:
serializedVersion: 6
@@ -71,6 +120,28 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter: animSpeed
--- !u!1107 &-1865300679427312503
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Pos Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -4932711163649999293}
m_Position: {x: 310, y: 210, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -4932711163649999293}
--- !u!1102 &-1569566867637420955
AnimatorState:
serializedVersion: 6
@@ -167,6 +238,30 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
- serializedVersion: 5
m_Name: Tail Layer
m_StateMachine: {fileID: 2493255104703599953}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 1
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
- serializedVersion: 5
m_Name: Pos Layer
m_StateMachine: {fileID: -1865300679427312503}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1107 &1917244892325702502
AnimatorStateMachine:
serializedVersion: 6
@@ -223,6 +318,28 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1107 &2493255104703599953
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Tail Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 7645721988896293745}
m_Position: {x: 330, y: 200, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 7645721988896293745}
--- !u!1101 &2501757138902606358
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -319,3 +436,29 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &7645721988896293745
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: motion_1
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 3760a5527a1ec5c4884ec081fbcc6542, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+83 -12
View File
@@ -49,6 +49,28 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter: animSpeed
--- !u!1101 &-971734861674072838
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 5228601998091799676}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@@ -64,18 +86,6 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: next
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: next_s
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@@ -89,6 +99,18 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
- serializedVersion: 5
m_Name: Ear Layer
m_StateMachine: {fileID: 3753690335887328880}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 1
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1107 &1917244892325702502
AnimatorStateMachine:
serializedVersion: 6
@@ -111,3 +133,52 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -1046042063806159501}
--- !u!1107 &3753690335887328880
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Ear Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 5228601998091799676}
m_Position: {x: 310, y: 160, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 5228601998091799676}
--- !u!1102 &5228601998091799676
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: motion_1
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -971734861674072838}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 3ea5c07300fddb0428f90a5f85f22ee5, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+53
View File
@@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: clip_p
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
@@ -1,7 +1,8 @@
fileFormatVersion: 2
guid: 7522c75d8071d9a4d89e4cc8236693b4
PrefabImporter:
guid: f09fc3a683510f9408466071b03b572c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
+53
View File
@@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: clip_t
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3760a5527a1ec5c4884ec081fbcc6542
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
+35 -745
View File
@@ -955,81 +955,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 69389580}
m_CullTransparentMesh: 1
--- !u!1 &70184842
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 70184843}
- component: {fileID: 70184845}
- component: {fileID: 70184844}
m_Layer: 5
m_Name: Checkmark
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &70184843
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 70184842}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1635973781}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &70184844
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 70184842}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &70184845
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 70184842}
m_CullTransparentMesh: 1
--- !u!1 &71219874
GameObject:
m_ObjectHideFlags: 0
@@ -1575,7 +1500,6 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1946133108}
- {fileID: 844924682}
m_Father: {fileID: 1704906816}
m_RootOrder: 17
@@ -1583,7 +1507,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 141.5, y: -410}
m_SizeDelta: {x: 283, y: 100}
m_SizeDelta: {x: 283, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &93905315
MonoBehaviour:
@@ -1849,7 +1773,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: 036631af73b15ac41a9d10f75f5bbafe, type: 3}
m_FontSize: 37
m_FontStyle: 0
m_BestFit: 0
@@ -2101,7 +2025,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 40, y: -15}
m_SizeDelta: {x: 227.5, y: 30}
m_SizeDelta: {x: 247.5, y: 30}
m_Pivot: {x: 0, y: 0.5}
--- !u!1 &137571846
GameObject:
@@ -5817,85 +5741,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 352625029}
m_CullTransparentMesh: 1
--- !u!1 &354788360
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 354788361}
- component: {fileID: 354788363}
- component: {fileID: 354788362}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &354788361
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 354788360}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1069223801}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &354788362
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 354788360}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 25
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Clear Cache
--- !u!222 &354788363
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 354788360}
m_CullTransparentMesh: 1
--- !u!1 &354822016
GameObject:
m_ObjectHideFlags: 0
@@ -6387,7 +6232,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -60}
m_SizeDelta: {x: 255, y: 30}
m_SizeDelta: {x: 300, y: 30}
m_Pivot: {x: 0, y: 1}
--- !u!114 &388427689
MonoBehaviour:
@@ -7112,7 +6957,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 255, y: -45}
m_SizeDelta: {x: 320, y: -90}
m_SizeDelta: {x: 360, y: -90}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &420311250
MonoBehaviour:
@@ -8344,19 +8189,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 22499384, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3}
propertyPath: m_AnchorMax.x
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22499384, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22499384, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3}
propertyPath: m_AnchorMin.x
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22499384, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224930228632997228, guid: 916ee089a0d7b63419075f91e1c657ec,
type: 3}
@@ -10519,14 +10364,13 @@ RectTransform:
- {fileID: 1798338064}
- {fileID: 482905334}
- {fileID: 1424772036}
- {fileID: 1333306137}
m_Father: {fileID: 1704906816}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 200}
m_SizeDelta: {x: 0, y: 150.52}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &548276325
MonoBehaviour:
@@ -12732,19 +12576,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 22499384, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3}
propertyPath: m_AnchorMax.x
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22499384, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22499384, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3}
propertyPath: m_AnchorMin.x
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22499384, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224930228632997228, guid: 916ee089a0d7b63419075f91e1c657ec,
type: 3}
@@ -12891,6 +12735,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -15
objectReference: {fileID: 0}
- target: {fileID: 5349439747052562945, guid: 916ee089a0d7b63419075f91e1c657ec,
type: 3}
propertyPath: m_text
value: 255
objectReference: {fileID: 0}
- target: {fileID: 6902966852220138908, guid: 916ee089a0d7b63419075f91e1c657ec,
type: 3}
propertyPath: m_AnchorMax.y
@@ -13041,6 +12890,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -7.825
objectReference: {fileID: 0}
- target: {fileID: 8839826584184242325, guid: 916ee089a0d7b63419075f91e1c657ec,
type: 3}
propertyPath: m_text
value: 255
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3}
--- !u!1 &695996364
@@ -14161,7 +14015,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -60}
m_SizeDelta: {x: 575, y: 30}
m_SizeDelta: {x: 615, y: 30}
m_Pivot: {x: 0, y: 1}
--- !u!114 &774603563
MonoBehaviour:
@@ -15976,7 +15830,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -45}
m_SizeDelta: {x: 255, y: -90}
m_SizeDelta: {x: 380, y: -90}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &835845607
MonoBehaviour:
@@ -16191,7 +16045,7 @@ GameObject:
- component: {fileID: 844924684}
- component: {fileID: 844924683}
m_Layer: 5
m_Name: ClearLoadedBunlde
m_Name: ClearLoadedBundle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -16210,7 +16064,7 @@ RectTransform:
m_Children:
- {fileID: 570264420}
m_Father: {fileID: 93905314}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@@ -19932,139 +19786,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1065889391}
m_CullTransparentMesh: 1
--- !u!1 &1069223800
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1069223801}
- component: {fileID: 1069223804}
- component: {fileID: 1069223803}
- component: {fileID: 1069223802}
m_Layer: 5
m_Name: Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1069223801
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1069223800}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 354788361}
m_Father: {fileID: 1946133108}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1069223802
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1069223800}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1069223803}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1564959567}
m_TargetAssemblyTypeName: UmaViewerUI, Assembly-CSharp
m_MethodName: ClearCache
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1069223803
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1069223800}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1069223804
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1069223800}
m_CullTransparentMesh: 1
--- !u!1 &1074257859
GameObject:
m_ObjectHideFlags: 0
@@ -22043,7 +21764,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1882365342}
m_Direction: 2
m_Value: 1
m_Size: 1
m_Size: 0.9250021
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -23203,104 +22924,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &1252885463
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1252885464}
- component: {fileID: 1252885465}
m_Layer: 5
m_Name: Toggle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1252885464
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1252885463}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1635973781}
- {fileID: 1301256969}
m_Father: {fileID: 1333306137}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 160, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1252885465
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1252885463}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1635973782}
toggleTransition: 1
graphic: {fileID: 70184844}
m_Group: {fileID: 0}
onValueChanged:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1564959567}
m_TargetAssemblyTypeName: UmaViewerUI, umamusume
m_MethodName: SetEarMorphEnable
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_IsOn: 0
--- !u!1 &1255010893
GameObject:
m_ObjectHideFlags: 0
@@ -24335,140 +23958,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1301256968
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1301256969}
- component: {fileID: 1301256971}
- component: {fileID: 1301256970}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1301256969
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1301256968}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1252885464}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -22.849878, y: 0}
m_SizeDelta: {x: 45.700245, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1301256970
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1301256968}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Ear Morph Override
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 22
m_fontSizeBase: 22
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1301256971
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1301256968}
m_CullTransparentMesh: 1
--- !u!1 &1301831364
GameObject:
m_ObjectHideFlags: 0
@@ -24678,51 +24167,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1323454210}
m_CullTransparentMesh: 1
--- !u!1 &1333306136
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1333306137}
- component: {fileID: 1333306139}
m_Layer: 5
m_Name: EarMoprh
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1333306137
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1333306136}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1252885464}
m_Father: {fileID: 548276324}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 283, y: -175}
m_SizeDelta: {x: 283, y: 50}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &1333306139
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1333306136}
m_CullTransparentMesh: 1
--- !u!1 &1339030789
GameObject:
m_ObjectHideFlags: 0
@@ -26315,7 +25759,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 255, y: -45}
m_SizeDelta: {x: 320, y: -90}
m_SizeDelta: {x: 360, y: -90}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1440546413
MonoBehaviour:
@@ -28157,8 +27601,6 @@ MonoBehaviour:
type: 3}
UmaContainerAssetsPrefab: {fileID: 648541853701480401, guid: 69086587771c25b49aca758a09c06c9b,
type: 3}
UmaContainerNoTMPPrefab: {fileID: 648541853701480401, guid: 7522c75d8071d9a4d89e4cc8236693b4,
type: 3}
LoadedAssetsPanel: {fileID: 2126459761}
UIColor1: {r: 1, g: 1, b: 1, a: 0.39215687}
UIColor2: {r: 1, g: 1, b: 1, a: 1}
@@ -28324,7 +27766,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -60}
m_SizeDelta: {x: 255, y: 30}
m_SizeDelta: {x: 380, y: 30}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1568796217
MonoBehaviour:
@@ -29349,82 +28791,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1625876556}
m_CullTransparentMesh: 1
--- !u!1 &1635973780
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1635973781}
- component: {fileID: 1635973783}
- component: {fileID: 1635973782}
m_Layer: 5
m_Name: Background
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1635973781
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1635973780}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 70184843}
m_Father: {fileID: 1252885464}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 35.3, y: 0}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1635973782
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1635973780}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1635973783
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1635973780}
m_CullTransparentMesh: 1
--- !u!1 &1636363194
GameObject:
m_ObjectHideFlags: 0
@@ -32285,8 +31651,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 307.5, y: -15}
m_SizeDelta: {x: 227.5, y: 30}
m_AnchoredPosition: {x: 327.5, y: -15}
m_SizeDelta: {x: 247.5, y: 30}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1771722158
MonoBehaviour:
@@ -33591,7 +32957,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -45}
m_SizeDelta: {x: 255, y: -90}
m_SizeDelta: {x: 300, y: -90}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1878249919
MonoBehaviour:
@@ -34611,82 +33977,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Padding: {x: -8, y: -5, z: -8, w: -5}
m_Softness: {x: 0, y: 0}
--- !u!1 &1946133107
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1946133108}
- component: {fileID: 1946133110}
- component: {fileID: 1946133109}
m_Layer: 5
m_Name: ClearCache
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1946133108
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1946133107}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1069223801}
m_Father: {fileID: 93905314}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 283, y: -25}
m_SizeDelta: {x: 283, y: 50}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1946133109
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1946133107}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.19607843}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1946133110
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1946133107}
m_CullTransparentMesh: 1
--- !u!1 &1949291610
GameObject:
m_ObjectHideFlags: 0
@@ -38206,7 +37496,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Clear Loaded Bunlde
m_Text: Clear Loaded Bundle
--- !u!222 &2108058675
CanvasRenderer:
m_ObjectHideFlags: 0
-86
View File
@@ -88,20 +88,6 @@ public class CameraOrbit : MonoBehaviour
Debug.Log($"Switched AntiAliasing to {(PostProcessLayer.Antialiasing)AAModeDropdown.value}");
AAMode = AAModeDropdown.value;
}
#if UNITY_ANDROID
switch (CameraModeDropdown.value)
{
case 0:
MobileOrbitAround();
MobileOrbitLight();
break;
case 1:
MobileOrbitAround(true);
MobileOrbitLight();
break;
case 2: FreeCamera(); break;
}
#else
switch (CameraModeDropdown.value)
{
case 0:
@@ -110,7 +96,6 @@ public class CameraOrbit : MonoBehaviour
break;
case 1: FreeCamera(); break;
}
#endif
}
@@ -223,75 +208,4 @@ public class CameraOrbit : MonoBehaviour
}
}
#endregion
#region Mobile Controls
Vector3 mouseBasePos = Vector3.zero;
/// <summary>
/// Rotate Light Source
/// </summary>
private void MobileOrbitLight()
{
return;
if (Input.touchCount == 2 && !eventSystem.IsPointerOverGameObject(Input.touches[0].fingerId) && !eventSystem.IsPointerOverGameObject(Input.touches[1].fingerId))
{
Light.transform.Rotate(Input.GetAxis("Mouse X") * Vector3.up, Space.Self);
Light.transform.Rotate(Input.GetAxis("Mouse Y") * Vector3.right, Space.Self);
}
}
/// <summary>
/// Orbit camera around world center
/// </summary>
void MobileOrbitAround(bool aroundCharacter = false)
{
TargetCenter = Vector3.zero;
Camera.main.fieldOfView = OrbitCamFovSlider.value;
Vector3 position = transform.position;
if (Input.GetMouseButtonDown(0) && !eventSystem.IsPointerOverGameObject(0))
{
mouseBasePos = Input.mousePosition;
controlOn = true;
}
if (Input.touchCount==1 && controlOn)
{
position -= (Input.mousePosition - mouseBasePos).x * 0.001f * transform.right * OrbitCamSpeedSlider.value;
OrbitCamHeightSlider.value -= (Input.mousePosition - mouseBasePos).y * 0.001f * OrbitCamSpeedSlider.value;
}
else
{
mouseBasePos = Vector3.zero;
controlOn = false;
}
if (Input.touchCount == 2)
{
Touch touchZero = Input.GetTouch(0);
Touch touchOne = Input.GetTouch(1);
Vector2 touchZeroPrevPos = touchZero.position - touchZero.deltaPosition;
Vector2 touchOnePrevPos = touchOne.position - touchOne.deltaPosition;
float prevMagnitude = (touchZeroPrevPos - touchOnePrevPos).magnitude;
float currentMagnitude = (touchZero.position - touchOne.position).magnitude;
float difference = currentMagnitude - prevMagnitude;
OrbitCamZoomSlider.value -= difference * 0.01f * OrbitCamZoomSpeedSlider.value;
}
float camDist = OrbitCamZoomSlider.value;
OrbitCamHeightSlider.maxValue = camDist + 1 - camDist * 0.2f;
OrbitCamHeightSlider.minValue = -camDist + 1 + camDist * 0.2f;
Vector3 target = TargetCenter + OrbitCamTargetHeightSlider.value * Vector3.up; //set target offsets
position.y = TargetCenter.y + OrbitCamHeightSlider.value; //set camera height
transform.position = position; //set final position of camera at target
transform.LookAt(target); //look at target position
transform.position = target - transform.forward * camDist; //move away from target
}
#endregion
}
+62 -3
View File
@@ -1,12 +1,71 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class UmaUIContainer : MonoBehaviour
{
public TMPro.TextMeshProUGUI Name;
enum TextType
{
Text,
TextMesh,
}
[SerializeField]TextType TextComponentType = TextType.Text;
public string Name
{
get
{
switch (TextComponentType)
{
case TextType.Text: return Text.text;
case TextType.TextMesh: return TextMesh.text;
default: return TextMesh.text;
}
}
set
{
switch (TextComponentType)
{
case TextType.Text:
Text.text = value;
break;
case TextType.TextMesh:
TextMesh.text = value;
break;
}
}
}
public float FontSize
{
get
{
switch (TextComponentType)
{
case TextType.Text: return Text.fontSize;
case TextType.TextMesh: return TextMesh.fontSize;
default: return TextMesh.fontSize;
}
}
set
{
switch (TextComponentType)
{
case TextType.Text:
Text.fontSize = (int)value;
break;
case TextType.TextMesh:
TextMesh.fontSize = value;
break;
}
}
}
public TMPro.TextMeshProUGUI TextMesh;
public Text Text;
public Button Button;
public Slider Slider;
public Image Image;
}
+27 -7
View File
@@ -1,25 +1,24 @@
using Gallop;
using Newtonsoft.Json.Linq;
using RootMotion.Dynamics;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using UnityEngine;
public class UmaContainer : MonoBehaviour
{
public JObject CharaData;
public DataRow CharaData;
public GameObject Body;
public GameObject Tail;
public GameObject Head;
public GameObject PhysicsController;
public List<Texture2D> TailTextures = new List<Texture2D>();
[Header("Animator")]
public Animator UmaAnimator;
public AnimatorOverrideController OverrideController;
public bool isAnimatorControl;
public Animator UmaFaceAnimator;
public AnimatorOverrideController FaceOverrideController;
public bool isAnimatorControl;
[Header("Face")]
public FaceDrivenKeyTarget FaceDrivenKeyTarget;
@@ -38,6 +37,10 @@ public class UmaContainer : MonoBehaviour
public bool IsMini = false;
public List<Texture2D> MiniHeadTextures = new List<Texture2D>();
[Header("Physics")]
public bool EnablePhysics = true;
public List<CySpringDataContainer> cySpringDataContainers;
public void MergeModel()
{
if (!Body) return;
@@ -96,6 +99,11 @@ public class UmaContainer : MonoBehaviour
}
public void SetHeight(int scale)
{
transform.Find("Position").localScale *= (scale / 160f);//WIP
}
public Transform[] MergeBone(SkinnedMeshRenderer from, List<Transform> targetBones)
{
var rootbone = targetBones.FindLast(a => a.name.Equals(from.rootBone.name));
@@ -127,16 +135,28 @@ public class UmaContainer : MonoBehaviour
public void LoadPhysics()
{
cySpringDataContainers = new List<CySpringDataContainer>();
var springs = PhysicsController.GetComponentsInChildren<CySpringDataContainer>();
foreach (CySpringDataContainer spring in springs)
{
cySpringDataContainers.Add(spring);
spring.InitializePhysics();
}
}
public void SetDynamicBoneEnable(bool isOn)
{
if (IsMini) return;
EnablePhysics = isOn;
foreach (CySpringDataContainer cySpring in cySpringDataContainers)
{
cySpring.EnablePhysics(isOn);
}
}
private void FixedUpdate()
{
if (TrackTarget&& EnableEyeTracking && !IsMini)
if (TrackTarget && EnableEyeTracking && !isAnimatorControl && !IsMini)
{
var targetPosotion = TrackTarget.transform.position - HeadBone.transform.up*EyeHeight;
var deltaPos = HeadBone.transform.InverseTransformPoint(targetPosotion);
@@ -64,6 +64,33 @@ public class FaceTypeData
}
}
[System.Serializable]
public class CharaEntry
{
public string Name;
public Sprite Icon;
public int Id;
}
[System.Serializable]
public class LiveEntry
{
public int MusicId;
public string SongName;
public string BackGroundId;
public List<string[]> LiveSettings = new List<string[]>();
public LiveEntry(string data)
{
string[] lines = data.Split("\n"[0]);
for (int i = 1; i < lines.Length; i++)
{
LiveSettings.Add(lines[i].Split(','));
}
BackGroundId = LiveSettings[1][2];
}
}
public enum UmaFileType
{
_3d_cutt,
@@ -1,12 +1,8 @@
using UnityEngine;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Mono.Data.Sqlite;
using System.IO;
using UnityEngine.XR;
using System.Data;
public class UmaDatabaseController
{
@@ -42,8 +38,9 @@ public class UmaDatabaseController
public static string CharaPath = "3d/chara/";
public IEnumerable<UmaDatabaseEntry> MetaEntries;
public IEnumerable<UmaCharaData> CharaData;
public IEnumerable<DataRow> CharaData;
public IEnumerable<FaceTypeData> FaceTypeData;
public IEnumerable<DataRow> LiveData;
/// <summary> Meta Database Connection </summary>
private SqliteConnection metaDb;
@@ -66,9 +63,11 @@ public class UmaDatabaseController
}
metaDb.Open();
MetaEntries = ReadMeta(metaDb);
masterDb.Open();
CharaData = ReadMaster(masterDb);
FaceTypeData = ReadFaceTypeData(masterDb);
LiveData = ReadAllLiveData(masterDb);
}
catch
{
@@ -102,19 +101,17 @@ public class UmaDatabaseController
return entries;
}
static IEnumerable<UmaCharaData> ReadMaster(SqliteConnection conn)
static IEnumerable<DataRow> ReadMaster(SqliteConnection conn)
{
SqliteCommand sqlite_cmd = conn.CreateCommand();
sqlite_cmd.CommandText = "SELECT id,tail_model_id FROM chara_data";
sqlite_cmd.CommandText = "SELECT * FROM chara_data C,(SELECT D.'index' charaid,D.'text' charaname FROM text_data D WHERE id like 6) T WHERE C.id like T.charaid";
SqliteDataReader sqlite_datareader = sqlite_cmd.ExecuteReader();
while (sqlite_datareader.Read())
var result = new DataTable();
result.Load(sqlite_datareader);
var temp = result.Rows.GetEnumerator();
while (temp.MoveNext())
{
UmaCharaData entry = new UmaCharaData()
{
id = sqlite_datareader.GetInt32(0),
tail_model_id = sqlite_datareader.GetInt32(1).ToString(),
};
yield return entry;
yield return (DataRow)temp.Current;
}
}
@@ -141,6 +138,32 @@ public class UmaDatabaseController
}
}
static IEnumerable<DataRow> ReadAllLiveData(SqliteConnection conn)
{
SqliteCommand sqlite_cmd = conn.CreateCommand();
sqlite_cmd.CommandText =
$"SELECT * FROM live_data L,(SELECT D.'index' songid,D.'text' songname FROM text_data D WHERE id like 16) T WHERE L.music_id like T.songid";
SqliteDataReader sqlite_datareader = sqlite_cmd.ExecuteReader();
var result = new DataTable();
result.Load(sqlite_datareader);
var temp = result.Rows.GetEnumerator();
while (temp.MoveNext())
{
yield return (DataRow)temp.Current;
}
}
public static DataRow ReadCharaData(int id)
{
SqliteCommand sqlite_cmd = instance.masterDb.CreateCommand();
sqlite_cmd.CommandText = $"SELECT * FROM chara_data WHERE id LIKE {id}";
SqliteDataReader sqlite_datareader = sqlite_cmd.ExecuteReader();
var result = new DataTable();
result.Load(sqlite_datareader);
DataRow row = result.Rows[0];
return row;
}
public static string GetABPath(UmaDatabaseEntry entry)
{
if (Application.platform == RuntimePlatform.Android)
+80 -48
View File
@@ -2,15 +2,14 @@
using CriWareFormats;
using Gallop;
using NAudio.Wave;
using Newtonsoft.Json.Linq;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
using UmaMusumeAudio;
using UnityEngine;
using static UmaViewerMain;
public class UmaViewerBuilder : MonoBehaviour
{
@@ -56,31 +55,29 @@ public class UmaViewerBuilder : MonoBehaviour
UnloadAllBundle();
yield return UmaViewerDownload.DownloadText($"https://www.tracenacademy.com/api/CharaData/{id}", txt =>
CurrentUMAContainer.CharaData = UmaDatabaseController.ReadCharaData(id);
if (mini)
{
Debug.Log(txt);
CurrentUMAContainer.CharaData = JObject.Parse(txt);
if (mini)
{
LoadMiniUma(id, costumeId);
}
else
{
LoadNormalUma(id, costumeId);
}
});
LoadMiniUma(id, costumeId);
}
else
{
LoadNormalUma(id, costumeId);
}
yield break;
}
private void LoadNormalUma(int id, string costumeId)
{
JObject charaData = CurrentUMAContainer.CharaData;
DataRow charaData = CurrentUMAContainer.CharaData;
bool genericCostume = CurrentUMAContainer.IsGeneric = costumeId.Length >= 4;
string skin = (string)charaData["skin"],
height = (string)charaData["height"],
socks = (string)charaData["socks"],
bust = (string)charaData["bust"],
sex = (string)charaData["sex"],
shape = (string)charaData["shape"],
string skin = charaData["skin"].ToString(),
height = charaData["height"].ToString(),
socks = charaData["socks"].ToString(),
bust = charaData["bust"].ToString(),
sex = charaData["sex"].ToString(),
shape = charaData["shape"].ToString(),
costumeIdShort = "";
UmaDatabaseEntry asset = null;
@@ -107,9 +104,9 @@ public class UmaViewerBuilder : MonoBehaviour
body = UmaDatabaseController.BodyPath + $"bdy{costumeIdShort}/pfb_bdy{costumeId}_{height}_{shape}_{bust}";
Debug.Log("Looking for " + body);
asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == body);
asset = UmaViewerMain.Instance.AbChara.FirstOrDefault(a => a.Name == body);
}
else asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == UmaDatabaseController.BodyPath + $"bdy{id}_{costumeId}/pfb_bdy{id}_{costumeId}");
else asset = UmaViewerMain.Instance.AbChara.FirstOrDefault(a => a.Name == UmaDatabaseController.BodyPath + $"bdy{id}_{costumeId}/pfb_bdy{id}_{costumeId}");
if (asset == null)
{
@@ -144,7 +141,7 @@ public class UmaViewerBuilder : MonoBehaviour
}
Debug.Log(texPattern1 + " " + texPattern2);
//Load Body Textures
foreach (var asset1 in UmaViewerMain.Instance.AbList.Where(a => a.Name.StartsWith(UmaDatabaseController.BodyPath)
foreach (var asset1 in UmaViewerMain.Instance.AbChara.Where(a => a.Name.StartsWith(UmaDatabaseController.BodyPath)
&& (a.Name.Contains(texPattern1)
|| a.Name.Contains(texPattern2)
|| (string.IsNullOrEmpty(texPattern3) ? false : a.Name.Contains(texPattern3))
@@ -157,7 +154,7 @@ public class UmaViewerBuilder : MonoBehaviour
RecursiveLoadAsset(asset);
//Load Physics
foreach (var asset1 in UmaViewerMain.Instance.AbList.Where(a => a.Name.StartsWith(UmaDatabaseController.BodyPath + $"bdy{costumeIdShort}/clothes")))
foreach (var asset1 in UmaViewerMain.Instance.AbChara.Where(a => a.Name.StartsWith(UmaDatabaseController.BodyPath + $"bdy{costumeIdShort}/clothes")))
{
if (asset1.Name.Contains("cloth00") && asset1.Name.Contains("bust" + bust))
RecursiveLoadAsset(asset1);
@@ -168,7 +165,7 @@ public class UmaViewerBuilder : MonoBehaviour
RecursiveLoadAsset(asset);
//Load Physics
foreach (var asset1 in UmaViewerMain.Instance.AbList.Where(a => a.Name.StartsWith(UmaDatabaseController.BodyPath + $"bdy{id}_{costumeId}/clothes")))
foreach (var asset1 in UmaViewerMain.Instance.AbChara.Where(a => a.Name.StartsWith(UmaDatabaseController.BodyPath + $"bdy{id}_{costumeId}/clothes")))
{
if (asset1.Name.Contains("cloth04"))
RecursiveLoadAsset(asset1);
@@ -179,7 +176,7 @@ public class UmaViewerBuilder : MonoBehaviour
// Record Head Data
int head_id;
string head_costumeId;
int tailId = (int)charaData["tailModelId"];
int tailId = Convert.ToInt32(charaData["tail_model_id"]);
//The tailId of 9006 is 1, but the character has no tail
if (id == 9006) tailId = -1;
@@ -204,19 +201,19 @@ public class UmaViewerBuilder : MonoBehaviour
}
string head = UmaDatabaseController.HeadPath + $"chr{head_id}_{head_costumeId}/pfb_chr{head_id}_{head_costumeId}";
asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == head);
asset = UmaViewerMain.Instance.AbChara.FirstOrDefault(a => a.Name == head);
bool isDefaultHead = false;
//Some costumes don't have custom heads
if (head_costumeId != "00" && asset == null)
{
asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == UmaDatabaseController.HeadPath + $"chr{head_id}_00/pfb_chr{head_id}_00");
asset = UmaViewerMain.Instance.AbChara.FirstOrDefault(a => a.Name == UmaDatabaseController.HeadPath + $"chr{head_id}_00/pfb_chr{head_id}_00");
isDefaultHead = true;
}
if (asset != null)
{
//Load Hair Textures
foreach (var asset1 in UmaViewerMain.Instance.AbList.Where(a => a.Name.StartsWith($"{UmaDatabaseController.HeadPath}chr{head_id}_{head_costumeId}/textures")))
foreach (var asset1 in UmaViewerMain.Instance.AbChara.Where(a => a.Name.StartsWith($"{UmaDatabaseController.HeadPath}chr{head_id}_{head_costumeId}/textures")))
{
RecursiveLoadAsset(asset1);
}
@@ -226,7 +223,7 @@ public class UmaViewerBuilder : MonoBehaviour
//Load Physics
if (isDefaultHead)
{
foreach (var asset1 in UmaViewerMain.Instance.AbList.Where(a => a.Name.StartsWith($"{UmaDatabaseController.HeadPath}chr{head_id}_00/clothes")))
foreach (var asset1 in UmaViewerMain.Instance.AbChara.Where(a => a.Name.StartsWith($"{UmaDatabaseController.HeadPath}chr{head_id}_00/clothes")))
{
if (asset1.Name.Contains("cloth00"))
RecursiveLoadAsset(asset1);
@@ -234,7 +231,7 @@ public class UmaViewerBuilder : MonoBehaviour
}
else
{
foreach (var asset1 in UmaViewerMain.Instance.AbList.Where(a => a.Name.StartsWith($"{UmaDatabaseController.HeadPath}chr{head_id}_{head_costumeId}/clothes")))
foreach (var asset1 in UmaViewerMain.Instance.AbChara.Where(a => a.Name.StartsWith($"{UmaDatabaseController.HeadPath}chr{head_id}_{head_costumeId}/clothes")))
{
if (asset1.Name.Contains("cloth00"))
RecursiveLoadAsset(asset1);
@@ -248,10 +245,10 @@ public class UmaViewerBuilder : MonoBehaviour
string tailName = $"tail{tailId.ToString().PadLeft(4, '0')}_00";
string tailPath = $"3d/chara/tail/{tailName}/";
string tailPfb = tailPath + $"pfb_{tailName}";
asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == tailPfb);
asset = UmaViewerMain.Instance.AbChara.FirstOrDefault(a => a.Name == tailPfb);
if (asset != null)
{
foreach (var asset1 in UmaViewerMain.Instance.AbList.Where(a => a.Name.StartsWith($"{tailPath}textures/tex_{tailName}_{head_id}") || a.Name.StartsWith($"{tailPath}textures/tex_{tailName}_0000")))
foreach (var asset1 in UmaViewerMain.Instance.AbChara.Where(a => a.Name.StartsWith($"{tailPath}textures/tex_{tailName}_{head_id}") || a.Name.StartsWith($"{tailPath}textures/tex_{tailName}_0000")))
{
RecursiveLoadAsset(asset1);
}
@@ -259,7 +256,7 @@ public class UmaViewerBuilder : MonoBehaviour
//Load Physics
foreach (var asset1 in UmaViewerMain.Instance.AbList.Where(a => a.Name.StartsWith($"{tailPath}clothes")))
foreach (var asset1 in UmaViewerMain.Instance.AbChara.Where(a => a.Name.StartsWith($"{tailPath}clothes")))
{
if (asset1.Name.Contains("cloth00"))
RecursiveLoadAsset(asset1);
@@ -271,6 +268,9 @@ public class UmaViewerBuilder : MonoBehaviour
}
}
CurrentUMAContainer.LoadPhysics(); //Need to load physics before loading FacialMorph
//Load FacialMorph
if (CurrentUMAContainer.Head)
{
@@ -294,20 +294,20 @@ public class UmaViewerBuilder : MonoBehaviour
CurrentUMAContainer.MergeModel();
CurrentUMAContainer.LoadPhysics();
CurrentUMAContainer.SetHeight(Convert.ToInt32(CurrentUMAContainer.CharaData["scale"]));
LoadAsset(UmaViewerMain.Instance.AbMotions.FirstOrDefault(a => a.Name.EndsWith($"anm_eve_chr{id}_00_idle01_loop")));
}
private void LoadMiniUma(int id, string costumeId)
{
JObject charaData = CurrentUMAContainer.CharaData;
DataRow charaData = CurrentUMAContainer.CharaData;
CurrentUMAContainer.IsMini = true;
bool isGeneric = CurrentUMAContainer.IsGeneric = costumeId.Length >= 4;
string skin = (string)charaData["skin"],
height = (string)charaData["height"],
socks = (string)charaData["socks"],
bust = (string)charaData["bust"],
sex = (string)charaData["sex"],
string skin = charaData["skin"].ToString(),
height = charaData["height"].ToString(),
socks = charaData["socks"].ToString(),
bust = charaData["bust"].ToString(),
sex = charaData["sex"].ToString(),
costumeIdShort = "";
bool customHead = true;
@@ -952,6 +952,7 @@ public class UmaViewerBuilder : MonoBehaviour
RecursiveLoadAsset(motion_s);
}
SetPreviewCamera(null);
var lastTime = CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0).normalizedTime;
CurrentUMAContainer.OverrideController["clip_1"] = CurrentUMAContainer.OverrideController["clip_2"];
CurrentUMAContainer.OverrideController["clip_2"] = clip;
@@ -962,15 +963,35 @@ public class UmaViewerBuilder : MonoBehaviour
CurrentUMAContainer.isAnimatorControl = false;
CurrentUMAContainer.TrackTarget = Camera.main.gameObject;
}
else if (clip.name.Contains("tail"))
{
if (CurrentUMAContainer.IsMini) return;
var currentStateInfo = CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0);
CurrentUMAContainer.UmaAnimator.Rebind();
CurrentUMAContainer.OverrideController["clip_t"] = clip;
CurrentUMAContainer.UmaAnimator.Play("motion_t", 1, 0);
CurrentUMAContainer.UmaAnimator.Play(currentStateInfo.shortNameHash, 0, currentStateInfo.normalizedTime);
}
else if (clip.name.Contains("face"))
{
if (CurrentUMAContainer.IsMini) return;
CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator();
CurrentUMAContainer.FaceOverrideController["clip_1"] = clip;
CurrentUMAContainer.isAnimatorControl = true;
CurrentUMAContainer.UmaFaceAnimator.Play("motion_1", 0, 0);
}
else if (clip.name.Contains("ear"))
{
if (CurrentUMAContainer.IsMini) return;
CurrentUMAContainer.FaceOverrideController["clip_2"] = clip;
CurrentUMAContainer.UmaFaceAnimator.Play("motion_1", 1, 0);
}
else if (clip.name.Contains("pos"))
{
if (CurrentUMAContainer.IsMini) return;
CurrentUMAContainer.OverrideController["clip_p"] = clip;
CurrentUMAContainer.UmaFaceAnimator.Play("motion_1", 2, 0);
}
else if (clip.name.Contains("cam"))
{
var overrideController = Instantiate(CameraOverrideController);
@@ -988,28 +1009,39 @@ public class UmaViewerBuilder : MonoBehaviour
{
var facialMotion = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name + "_face"));
var cameraMotion = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name + "_cam"));
var earMotion = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name + "_ear"));
var posMotion = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name + "_pos"));
if (facialMotion != null)
{
RecursiveLoadAsset(facialMotion);
}
if (earMotion != null)
{
RecursiveLoadAsset(earMotion);
}
if (cameraMotion != null)
{
RecursiveLoadAsset(cameraMotion);
}
if (CurrentUMAContainer.IsMini)
if (posMotion != null)
{
RecursiveLoadAsset(posMotion);
}
if (CurrentUMAContainer.IsMini)
{
SetPreviewCamera(null);
}
CurrentUMAContainer.UmaAnimator.Play("motion_2", 0, 0);
CurrentUMAContainer.OverrideController["clip_2"].wrapMode = WrapMode.Loop;
CurrentUMAContainer.TrackTarget = PreviewCamera.gameObject;
}
else
{
if (CurrentUMAContainer.FaceDrivenKeyTarget)
if (CurrentUMAContainer.FaceDrivenKeyTarget)
{
CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator();
}
@@ -1124,7 +1156,7 @@ public class UmaViewerBuilder : MonoBehaviour
if (container.Slider != null)
container.Slider.SetValueWithoutNotify(0);
}
if (CurrentUMAContainer.FaceDrivenKeyTarget)
if (CurrentUMAContainer.FaceDrivenKeyTarget)
{
CurrentUMAContainer.FaceDrivenKeyTarget.ClearMorph();
CurrentUMAContainer.FaceDrivenKeyTarget.ChangeMorph();
@@ -1134,7 +1166,7 @@ public class UmaViewerBuilder : MonoBehaviour
private void FixedUpdate()
{
if (PreviewCamera&&PreviewCamera.enabled == true)
if (PreviewCamera && PreviewCamera.enabled == true)
{
PreviewCamera.fieldOfView = PreviewCamera.gameObject.transform.parent.transform.localScale.x;
}
+7 -15
View File
@@ -7,25 +7,17 @@ public class UmaViewerDownload : MonoBehaviour
{
public static IEnumerator DownloadText(string url, System.Action<string> callback)
{
if (PlayerPrefs.GetString(url, "")=="")
{
UnityWebRequest www = UnityWebRequest.Get(url);
yield return www.SendWebRequest();
UnityWebRequest www = UnityWebRequest.Get(url);
yield return www.SendWebRequest();
if (www.result != UnityWebRequest.Result.Success)
{
Debug.Log(www.error);
}
else
{
PlayerPrefs.SetString(url, www.downloadHandler.text);
callback(www.downloadHandler.text);
}
if (www.result != UnityWebRequest.Result.Success)
{
Debug.Log(www.error);
callback("");
}
else
{
callback(PlayerPrefs.GetString(url, ""));
callback(www.downloadHandler.text);
}
}
}
+51 -72
View File
@@ -1,20 +1,16 @@
using Newtonsoft.Json.Linq;
using System.Reflection;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using UnityEngine;
using UnityEngine.UI;
using System;
using Newtonsoft.Json.Linq;
using System.Collections;
public class UmaViewerMain : MonoBehaviour
{
public static UmaViewerMain Instance;
private UmaViewerUI UI => UmaViewerUI.Instance;
private UmaViewerBuilder Builder => UmaViewerBuilder.Instance;
public JArray UmaCharaData;
public JArray UmaLiveData;
public List<CharaEntry> Characters = new List<CharaEntry>();
public List<LiveEntry> Lives = new List<LiveEntry>();
@@ -37,61 +33,71 @@ public class UmaViewerMain : MonoBehaviour
AbSounds = AbList.Where(ab => ab.Name.EndsWith(".awb") || ab.Name.EndsWith(".acb")).ToList();
}
IEnumerator Start()
private IEnumerator Start()
{
Dictionary<int, string> enNames = new Dictionary<int, string>();
yield return UmaViewerDownload.DownloadText("https://www.tracenacademy.com/api/BasicCharaDataInfo", txt =>
{
UmaCharaData = JArray.Parse(txt);
foreach (var item in UmaCharaData)
if (string.IsNullOrEmpty(txt)) return;
var umaData = JArray.Parse(txt);
foreach (var item in umaData)
{
//Debug.Log(item);
if (!Characters.Where(c => c.Id == (int)item["charaId"]).Any())
if (!enNames.ContainsKey((int)item["charaId"]))
{
Characters.Add(new CharaEntry()
{
Name = (string)item["charaNameEnglish"],
Icon = UmaViewerBuilder.Instance.LoadCharaIcon((string)item["charaId"]),
Id = (int)item["charaId"]
});
enNames.Add((int)item["charaId"], item["charaNameEnglish"].ToString());
}
}
UI.LoadModelPanels();
UI.LoadMiniModelPanels();
UI.LoadPropPanel();
UI.LoadMapPanel();
});
yield return UmaViewerDownload.DownloadText("https://www.tracenacademy.com/api/BasicLiveDataInfo", txt =>
var UmaCharaData = UmaDatabaseController.Instance.CharaData;
foreach (var item in UmaCharaData)
{
UmaLiveData = JArray.Parse(txt);
var asset = AbList.FirstOrDefault(a => a.Name.Equals("livesettings"));
if(asset != null)
var id = Convert.ToInt32(item["id"]);
if (!Characters.Where(c => c.Id == id).Any())
{
string filePath = UmaDatabaseController.GetABPath(asset);
if (File.Exists(filePath))
Characters.Add(new CharaEntry()
{
AssetBundle bundle = AssetBundle.LoadFromFile(filePath);
foreach (var item in UmaLiveData)
{
if (!Lives.Where(c => c.MusicId == (int)item["musicId"]).Any())
{
if (bundle.Contains((string)item["musicId"]))
{
TextAsset liveData = bundle.LoadAsset<TextAsset>((string)item["musicId"]);
Name = enNames.ContainsKey(id)? enNames[id] : item["charaname"].ToString(),
Icon = UmaViewerBuilder.Instance.LoadCharaIcon(id.ToString()),
Id = id
});
}
}
Lives.Add(new LiveEntry(liveData.text)
{
MusicId = (int)item["musicId"],
songName = (string)item["songName"]
});
}
UI.LoadModelPanels();
UI.LoadMiniModelPanels();
UI.LoadPropPanel();
UI.LoadMapPanel();
var asset = AbList.FirstOrDefault(a => a.Name.Equals("livesettings"));
if (asset != null)
{
string filePath = UmaDatabaseController.GetABPath(asset);
if (File.Exists(filePath))
{
AssetBundle bundle = AssetBundle.LoadFromFile(filePath);
foreach (var item in UmaDatabaseController.Instance.LiveData)
{
var musicId = Convert.ToInt32(item["music_id"]);
var songName = item["songname"].ToString();
if (!Lives.Where(c => c.MusicId == musicId).Any())
{
if (bundle.Contains(musicId.ToString()))
{
TextAsset liveData = bundle.LoadAsset<TextAsset>(musicId.ToString());
Lives.Add(new LiveEntry(liveData.text)
{
MusicId = musicId,
SongName = songName
});
}
}
UI.LoadLivePanels();
}
UI.LoadLivePanels();
}
});
}
}
public void OpenUrl(string url)
@@ -99,31 +105,4 @@ public class UmaViewerMain : MonoBehaviour
Application.OpenURL(url);
}
[System.Serializable]
public class CharaEntry
{
public string Name;
public Sprite Icon;
public int Id;
}
[System.Serializable]
public class LiveEntry
{
public int MusicId;
public string songName;
public string BackGroundId;
public List<string[]> LiveSettings = new List<string[]>();
public LiveEntry(string data)
{
string[] lines = data.Split("\n"[0]);
for (int i = 1; i < lines.Length; i++)
{
LiveSettings.Add(lines[i].Split(','));
}
BackGroundId = LiveSettings[1][2];
}
}
}
+42 -70
View File
@@ -75,7 +75,6 @@ public class UmaViewerUI : MonoBehaviour
public GameObject UmaContainerPrefab;
public GameObject UmaContainerSliderPrefab;
public GameObject UmaContainerAssetsPrefab;
public GameObject UmaContainerNoTMPPrefab;
private int LoadedAssetCount = 0;
[SerializeField] private RectTransform LoadedAssetsPanel;
@@ -146,7 +145,7 @@ public class UmaViewerUI : MonoBehaviour
LoadedAssetCount++;
string filePath = UmaDatabaseController.GetABPath(entry);
var container = Instantiate(UmaContainerAssetsPrefab, LoadedAssetsPanel).GetComponent<UmaUIContainer>();
container.Name.text = Path.GetFileName(entry.Name) + "\n" + entry.Url;
container.Name = Path.GetFileName(entry.Name) + "\n" + entry.Url;
container.Button.onClick.AddListener(() => {Process.Start("explorer.exe", "/select," + filePath);});
LoadedAssetsPanel.sizeDelta = new Vector2(0, LoadedAssetCount * 35);
}
@@ -164,7 +163,7 @@ public class UmaViewerUI : MonoBehaviour
public void LoadModelPanels()
{
var container = Instantiate(UmaContainerPrefab, AnimationSetList.content).GetComponent<UmaUIContainer>();
container.Name.text = container.name = "Generic";
container.Name = container.name = "Generic";
var imageInstance = container.GetComponent<Image>();
container.Button.onClick.AddListener(() => {
HighlightChildImage(AnimationSetList.content, imageInstance);
@@ -172,7 +171,7 @@ public class UmaViewerUI : MonoBehaviour
});
container = Instantiate(UmaContainerPrefab, AnimationSetList.content).GetComponent<UmaUIContainer>();
container.Name.text = container.name = "Tail";
container.Name = container.name = "Tail";
imageInstance = container.GetComponent<Image>();
container.Button.onClick.AddListener(() => {
HighlightChildImage(AnimationSetList.content, imageInstance);
@@ -184,7 +183,7 @@ public class UmaViewerUI : MonoBehaviour
var charaInstance = chara;
container = Instantiate(UmaContainerPrefab, CharactersList.content).GetComponent<UmaUIContainer>();
container.Name.text = container.name = chara.Id + " " + chara.Name;
container.Name = container.name = chara.Id + " " + chara.Name;
var imageInstance1 = container.GetComponent<Image>();
container.Button.onClick.AddListener(() => {
HighlightChildImage(CharactersList.content, imageInstance1);
@@ -198,7 +197,7 @@ public class UmaViewerUI : MonoBehaviour
}
container = Instantiate(UmaContainerPrefab, AnimationSetList.content).GetComponent<UmaUIContainer>();
container.Name.text = container.name = chara.Id + " " + chara.Name;
container.Name = container.name = chara.Id + " " + chara.Name;
var imageInstance2 = container.GetComponent<Image>();
container.Button.onClick.AddListener(() => {
HighlightChildImage(AnimationSetList.content, imageInstance2);
@@ -218,7 +217,7 @@ public class UmaViewerUI : MonoBehaviour
foreach (FacialMorph morph in targetMorph)
{
var container = Instantiate(UmaContainerSliderPrefab, TargetList.content).GetComponent<UmaUIContainer>();
container.Name.text = morph.name + " (" + morph.tag + ")";
container.Name = morph.name + " (" + morph.tag + ")";
container.Slider.value = morph.weight;
container.Slider.maxValue = 1;
container.Slider.minValue = 0;
@@ -242,22 +241,6 @@ public class UmaViewerUI : MonoBehaviour
InstantiateFacialPart(UmaContainerSliderPrefab, target, target.EyeMorphs, EyeList);
InstantiateFacialPart(UmaContainerSliderPrefab, target, target.MouthMorphs, MouthList);
/*
List<FacialMorph> tempMorph = new List<FacialMorph>();
tempMorph.AddRange(target.EarMorphs);
tempMorph.AddRange(target.EyeBrowMorphs);
tempMorph.AddRange(target.EyeMorphs);
tempMorph.AddRange(target.MouthMorphs);
foreach (FacialMorph morph in tempMorph)
{
var container = Instantiate(UmaContainerSliderPrefab, FacialList.content).GetComponent<UmaUIContainer>();
container.Name.text = morph.name + " (" + morph.tag + ")";
container.Slider.value = morph.weight;
container.Slider.maxValue = 1;
container.Slider.minValue = 0;
container.Slider.onValueChanged.AddListener((a) => {target.ChangeMorphWeight(morph, a);});
}
*/
}
public void UpdateFacialPanels()
@@ -281,7 +264,7 @@ public class UmaViewerUI : MonoBehaviour
continue;
}
var container = Instantiate(UmaContainerSliderPrefab, EmotionList.content).GetComponent<UmaUIContainer>();
container.Name.text = emotion.label;
container.Name = emotion.label;
container.Slider.value = emotion.Weight;
container.Slider.maxValue = 1;
container.Slider.minValue = 0;
@@ -294,16 +277,16 @@ public class UmaViewerUI : MonoBehaviour
foreach (var live in Main.Lives.OrderBy(c => c.MusicId))
{
var liveInstance = live;
var container = Instantiate(UmaContainerNoTMPPrefab, LiveList.content).GetComponent<UmaUIContainer>();
container.GetComponentInChildren<Text>().text = " "+ live.MusicId + " " + live.songName;
var container = Instantiate(UmaContainerPrefab, LiveList.content).GetComponent<UmaUIContainer>();
container.Name = " "+ live.MusicId + " " + live.SongName;
var imageInstance1 = container.GetComponent<Image>();
container.Button.onClick.AddListener(() => {
HighlightChildImage(LiveList.content, imageInstance1);
Builder.LoadLive(live);
});
var CharaContainer = Instantiate(UmaContainerNoTMPPrefab, LiveSoundList.content).GetComponent<UmaUIContainer>();
CharaContainer.GetComponentInChildren<Text>().text = " " + live.MusicId + " " + live.songName;
var CharaContainer = Instantiate(UmaContainerPrefab, LiveSoundList.content).GetComponent<UmaUIContainer>();
CharaContainer.Name = " " + live.MusicId + " " + live.SongName;
var CharaimageInstance1 = CharaContainer.GetComponent<Image>();
CharaContainer.Button.onClick.AddListener(() => {
HighlightChildImage(LiveSoundList.content, CharaimageInstance1);
@@ -315,7 +298,7 @@ public class UmaViewerUI : MonoBehaviour
public void LoadMiniModelPanels()
{
var container = Instantiate(UmaContainerPrefab, MiniAnimationSetList.content).GetComponent<UmaUIContainer>();
container.Name.text = container.name = "General";
container.Name = container.name = "General";
var imageInstance = container.GetComponent<Image>();
container.Button.onClick.AddListener(() => {
HighlightChildImage(MiniAnimationSetList.content, imageInstance);
@@ -326,7 +309,7 @@ public class UmaViewerUI : MonoBehaviour
{
var charaInstance = chara;
container = Instantiate(UmaContainerPrefab, MiniCharactersList.content).GetComponent<UmaUIContainer>();
container.Name.text = container.name = chara.Id + " " + chara.Name;
container.Name = container.name = chara.Id + " " + chara.Name;
var imageInstance1 = container.GetComponent<Image>();
container.Button.onClick.AddListener(() => {
HighlightChildImage(MiniCharactersList.content, imageInstance1);
@@ -340,7 +323,7 @@ public class UmaViewerUI : MonoBehaviour
}
container = Instantiate(UmaContainerPrefab, MiniAnimationSetList.content).GetComponent<UmaUIContainer>();
container.Name.text = container.name = chara.Id + " " + chara.Name;
container.Name = container.name = chara.Id + " " + chara.Name;
var imageInstance2 = container.GetComponent<Image>();
container.Button.onClick.AddListener(() => {
HighlightChildImage(MiniAnimationSetList.content, imageInstance2);
@@ -361,7 +344,7 @@ public class UmaViewerUI : MonoBehaviour
{
var propInstance = prop;
var container = Instantiate(UmaContainerPrefab, PropList.content).GetComponent<UmaUIContainer>();
container.Name.text = container.name = Path.GetFileName(prop.Name);
container.Name = container.name = Path.GetFileName(prop.Name);
var imageInstance1 = container.GetComponent<Image>();
container.Button.onClick.AddListener(() => {
HighlightChildImage(PropList.content, imageInstance1);
@@ -376,7 +359,8 @@ public class UmaViewerUI : MonoBehaviour
{
var sceneInstance = scene;
var container = Instantiate(UmaContainerPrefab, SceneList.content).GetComponent<UmaUIContainer>();
container.Name.text = container.name = Path.GetFileName(scene.Name);
container.Name = container.name = Path.GetFileName(scene.Name);
container.FontSize = 19;
var imageInstance1 = container.GetComponent<Image>();
container.Button.onClick.AddListener(() => {
HighlightChildImage(SceneList.content, imageInstance1);
@@ -398,7 +382,7 @@ public class UmaViewerUI : MonoBehaviour
var container = Instantiate(UmaContainerPrefab, costumeList.content).GetComponent<UmaUIContainer>();
string[] split = entry.Name.Split('_');
string costumeId = split[split.Length - 1];
container.Name.text = container.name = GetCostumeName(costumeId);
container.Name = container.name = GetCostumeName(costumeId);
container.Button.onClick.AddListener(() => {
HighlightChildImage(costumeList.content, container.GetComponent<Image>());
StartCoroutine(Builder.LoadUma(umaId, costumeId, mini));
@@ -416,7 +400,7 @@ public class UmaViewerUI : MonoBehaviour
costumes.Add(id);
string costumeId = id;
var container = Instantiate(UmaContainerPrefab, costumeList.content).GetComponent<UmaUIContainer>();
container.Name.text = container.name = GetCostumeName(id);
container.Name = container.name = GetCostumeName(id);
container.Button.onClick.AddListener(() => {
HighlightChildImage(costumeList.content, container.GetComponent<Image>());
StartCoroutine(Builder.LoadUma(umaId, costumeId, mini));
@@ -452,7 +436,7 @@ public class UmaViewerUI : MonoBehaviour
var container = Instantiate(UmaContainerPrefab, LiveCharaSoundList.content).GetComponent<UmaUIContainer>();
string[] split = Path.GetFileNameWithoutExtension(entry.Name).Split('_');
string name = split[split.Length - 2] + getCharaName(split[split.Length - 2]) + " " + split[split.Length - 1];
container.Name.text = name;
container.Name = name;
container.Button.onClick.AddListener(() => {
HighlightChildImage(LiveCharaSoundList.content, container.GetComponent<Image>());
if (isCriware)
@@ -519,8 +503,7 @@ public class UmaViewerUI : MonoBehaviour
Destroy(animationList.content.GetChild(i).gameObject);
}
var filteredList = Main.AbList.Where(a => a.Name.StartsWith(UmaDatabaseController.MotionPath)
&& !a.Name.Contains($"mirror")
var filteredList = Main.AbMotions.Where(a => !a.Name.Contains($"mirror")
&& (mini ? a.Name.Contains($"mini") : !a.Name.Contains($"mini"))
&& !a.Name.Contains($"facial")
&& !a.Name.Contains($"_cam")
@@ -534,7 +517,8 @@ public class UmaViewerUI : MonoBehaviour
{
var entryInstance = entry;
var container = Instantiate(UmaContainerPrefab, animationList.content).GetComponent<UmaUIContainer>();
container.Name.text = container.name = Path.GetFileName(entry.Name);
container.Name = container.name = Path.GetFileName(entry.Name);
container.FontSize = 19;
container.Button.onClick.AddListener(() => {
HighlightChildImage(animationList.content, container.GetComponent<Image>());
Builder.LoadAsset(entryInstance);
@@ -548,7 +532,8 @@ public class UmaViewerUI : MonoBehaviour
{
var entryInstance = entry;
var container = Instantiate(UmaContainerPrefab, animationList.content).GetComponent<UmaUIContainer>();
container.Name.text = container.name = Path.GetFileName(entry.Name);
container.Name = container.name = Path.GetFileName(entry.Name);
container.FontSize = 19;
container.Button.onClick.AddListener(() => {
HighlightChildImage(animationList.content, container.GetComponent<Image>());
Builder.LoadAsset(entryInstance);
@@ -563,7 +548,8 @@ public class UmaViewerUI : MonoBehaviour
{
var entryInstance = entry;
var container = Instantiate(UmaContainerPrefab, animationList.content).GetComponent<UmaUIContainer>();
container.Name.text = container.name = Path.GetFileName(entry.Name);
container.Name = container.name = Path.GetFileName(entry.Name);
container.FontSize = 19;
container.Button.onClick.AddListener(() => {
HighlightChildImage(animationList.content, container.GetComponent<Image>());
Builder.LoadAsset(entryInstance);
@@ -576,7 +562,8 @@ public class UmaViewerUI : MonoBehaviour
{
var entryInstance = entry;
var container = Instantiate(UmaContainerPrefab, animationList.content).GetComponent<UmaUIContainer>();
container.Name.text = container.name = Path.GetFileName(entry.Name);
container.Name = container.name = Path.GetFileName(entry.Name);
container.FontSize = 19;
container.Button.onClick.AddListener(() => {
HighlightChildImage(animationList.content, container.GetComponent<Image>());
Builder.LoadAsset(entryInstance);
@@ -592,8 +579,9 @@ public class UmaViewerUI : MonoBehaviour
AnimationSlider.SetValueWithoutNotify(0);
// Reset settings by Panel
Builder.CurrentUMAContainer.UmaAnimator.speed = AnimationSpeedSlider.value;
if(Builder.CurrentUMAContainer.UmaFaceAnimator)
Builder.CurrentUMAContainer.UmaFaceAnimator.speed = AnimationSpeedSlider.value;
Builder.PreviewCameraAnimator.speed = AnimationSpeedSlider.value;
if (Builder.CurrentUMAContainer.UmaFaceAnimator)
Builder.CurrentUMAContainer.UmaFaceAnimator.speed = AnimationSpeedSlider.value;
}
/// <summary> Toggles one object ON and all others from UI.TogglablePanels list OFF </summary>
@@ -646,21 +634,7 @@ public class UmaViewerUI : MonoBehaviour
{
if (Builder.CurrentUMAContainer)
{
foreach(CySpringDataContainer cySpring in Builder.CurrentUMAContainer.GetComponentsInChildren<CySpringDataContainer>())
{
cySpring.EnablePhysics(isOn);
}
}
}
public void SetEarMorphEnable(bool isOn)
{
if (Builder.CurrentUMAContainer)
{
foreach (CySpringDataContainer cySpring in Builder.CurrentUMAContainer.GetComponentsInChildren<CySpringDataContainer>())
{
cySpring.EnableEarPhysics(!isOn);
}
Builder.CurrentUMAContainer.SetDynamicBoneEnable(isOn);
}
}
@@ -672,12 +646,6 @@ public class UmaViewerUI : MonoBehaviour
}
}
public void ClearCache()
{
PlayerPrefs.DeleteAll();
Application.Quit();
}
public void AudioPause()
{
if (Builder.CurrentAudioSources.Count>0)
@@ -743,13 +711,15 @@ public class UmaViewerUI : MonoBehaviour
else
{
animator.speed = AnimationSpeedSlider.value;
animator.Play(0, -1, 0);
animator.Play(0, 0, 0);
animator.Play(0, 2, 0);
animator_cam.speed = AnimationSpeedSlider.value;
animator_cam.Play(0, -1, 0);
if (animator_face)
{
animator_face.speed = AnimationSpeedSlider.value;
animator_face.Play(0, -1, 0);
animator_face.Play(0, 0, 0);
animator_face.Play(0, 1, 0);
}
}
@@ -758,7 +728,7 @@ public class UmaViewerUI : MonoBehaviour
public void AnimationProgressChange(float val)
{
if (!Builder.CurrentUMAContainer || !Builder.CurrentUMAContainer.UmaAnimator) return;
if (!Builder.CurrentUMAContainer) return;
var animator = Builder.CurrentUMAContainer.UmaAnimator;
var animator_face = Builder.CurrentUMAContainer.UmaFaceAnimator;
var animator_cam = Builder.PreviewCameraAnimator;
@@ -768,13 +738,15 @@ public class UmaViewerUI : MonoBehaviour
// Pause and Seek;
animator.speed = 0;
animator.Play(0, -1, val);
animator.Play(0, 0, val);
animator.Play(0, 2, val);
animator_cam.speed = 0;
animator_cam.Play(0, -1, val);
if (animator_face)
{
animator_face.speed = 0;
animator_face.Play(0, -1, val);
animator_face.Play(0, 0, val);
animator_face.Play(0, 1, val);
}
AnimationProgressText.text = string.Format("{0} / {1}", ToFrameFormat(val * AnimeClip.length, AnimeClip.frameRate), ToFrameFormat(AnimeClip.length, AnimeClip.frameRate));
@@ -103,8 +103,8 @@ namespace Gallop
else
{
dynamic.m_Damping = 0.2f;
dynamic.m_Stiffness = Mathf.Clamp01(40 / spring._stiffnessForce);
dynamic.m_Elasticity = Mathf.Clamp01(40 / spring._dragForce);
dynamic.m_Stiffness = Mathf.Clamp01(45 / spring._stiffnessForce);
dynamic.m_Elasticity = Mathf.Clamp01(45 / spring._dragForce);
}
dynamic.m_Radius = spring._collisionRadius;
@@ -125,7 +125,6 @@ namespace Gallop
var tempParticle = dynamic.Particles.Find(a => { return a.m_Transform.gameObject.name == Childcollision._boneName; });
if (tempParticle != null)
{
tempParticle.m_Damping = 0.2f;
if (isTail)
{
tempParticle.m_Damping = 0.1f;
@@ -135,8 +134,8 @@ namespace Gallop
else
{
tempParticle.m_Damping = 0.2f;
tempParticle.m_Stiffness = Mathf.Clamp01(40 / spring._stiffnessForce);
tempParticle.m_Elasticity = Mathf.Clamp01(40 / spring._dragForce);
tempParticle.m_Stiffness = Mathf.Clamp01(45 / spring._stiffnessForce);
tempParticle.m_Elasticity = Mathf.Clamp01(45 / spring._dragForce);
}
tempParticle.m_Radius = Childcollision._collisionRadius;
foreach (string collisionName in Childcollision._collisionNameList)
@@ -158,21 +157,7 @@ namespace Gallop
{
foreach(DynamicBone dynamic in DynamicBones)
{
if (!dynamic.m_Root.name.Contains("Ear"))
{
dynamic.enabled = isOn;
}
}
}
public void EnableEarPhysics(bool isOn)
{
foreach (DynamicBone dynamic in DynamicBones)
{
if (dynamic.m_Root.name.Contains("Ear"))
{
dynamic.enabled = isOn;
}
dynamic.enabled = isOn;
}
}
}
@@ -2,6 +2,7 @@ using Gallop.Live.Cutt;
using System;
using System.Collections.Generic;
using UnityEngine;
using static DynamicBone;
namespace Gallop
{
@@ -25,15 +26,25 @@ namespace Gallop
public List<FacialMorph> MouthMorphs = new List<FacialMorph>();
public GameObject DrivenKeyLocator;
public GameObject EyeballCtrl_L_Locator, EyeballCtrl_R_Locator, EyeballCtrl_All_Locator;
public UmaContainer Container;
Dictionary<Transform, Vector3> RotationRecorder = new Dictionary<Transform, Vector3>();
Dictionary<Particle, Vector3> ParticleRecorder = new Dictionary<Particle, Vector3>();
public void Initialize(List<Transform> objs)
{
Objs = objs;
List<Particle> particles = new List<Particle>();
foreach (CySpringDataContainer spring in Container.cySpringDataContainers)
{
foreach (DynamicBone dynamicBone in spring.DynamicBones)
{
particles.AddRange(dynamicBone.Particles);
}
}
for (int i = 0; i < _earTarget.Count; i++)
{
for (int j = 0; j < _earTarget[i]._faceGroupInfo.Count; j++)
@@ -46,6 +57,12 @@ namespace Gallop
morph.trsArray = _earTarget[i]._faceGroupInfo[j]._trsArray;
foreach (TrsArray trs in morph.trsArray)
{
var physicsParticle = particles.Find(a => a.m_Transform.name.Equals(trs._path));
if (physicsParticle != null)
{
trs.isPhysics = true;
trs.physicsParticle = physicsParticle;
}
trs.transform = Objs.Find(ani => ani.name.Equals(trs._path));
}
if (i == 0)
@@ -147,7 +164,7 @@ namespace Gallop
}
}
}
FacialResetAll();
ChangeMorphWeight(MouthMorphs[3], 1);
SetupAnimator();
if (UmaViewerUI.Instance)
@@ -160,12 +177,26 @@ namespace Gallop
{
DrivenKeyLocator = new GameObject("DrivenKeyLocator");
DrivenKeyLocator.transform.SetParent(Container.transform);
SetupLocator("Ear_L_Ctrl", "Ear_L__", EarMorphs.FindAll(a => a.direction == true));
SetupLocator("Ear_R_Ctrl", "Ear_R__", EarMorphs.FindAll(a => a.direction == false));
SetupLocator("Eye_L_Base_Ctrl", "Eye_L__", EyeMorphs.FindAll(a => a.direction == true));
SetupLocator("Eye_R_Base_Ctrl", "Eye_R__", EyeMorphs.FindAll(a => a.direction == false));
SetupLocator("Eyebrow_L_Base_Ctrl", "Eyebrow_L__", EyeBrowMorphs.FindAll(a => a.direction == true));
SetupLocator("Eyebrow_R_Base_Ctrl", "Eyebrow_R__", EyeBrowMorphs.FindAll(a => a.direction == false));
SetupLocator("Mouth_Base_Ctrl", "Mouth__", MouthMorphs.FindAll(a => a.direction == false));
var root = new GameObject("Eyeball_L_Ctrl");
root.transform.SetParent(DrivenKeyLocator.transform);
EyeballCtrl_L_Locator = root;
root = new GameObject("Eyeball_R_Ctrl");
root.transform.SetParent(DrivenKeyLocator.transform);
EyeballCtrl_R_Locator = root;
root = new GameObject("Eyeball_all_Ctrl");
root.transform.SetParent(DrivenKeyLocator.transform);
EyeballCtrl_All_Locator = root;
Container.UmaFaceAnimator = DrivenKeyLocator.AddComponent<Animator>();
Container.UmaFaceAnimator.avatar = AvatarBuilder.BuildGenericAvatar(DrivenKeyLocator, "DrivenKeyLocator");
Container.FaceOverrideController = Instantiate(UmaViewerBuilder.Instance.FaceOverrideController);
@@ -177,8 +208,9 @@ namespace Gallop
var root = new GameObject(rootName);
root.transform.SetParent(DrivenKeyLocator.transform);
morphs.ForEach(morph=>{
var locator = new GameObject(prefix+morph.tag);
morphs.ForEach(morph =>
{
var locator = new GameObject(prefix + morph.tag);
locator.transform.SetParent(root.transform);
morph.locator = locator.transform;
});
@@ -213,7 +245,6 @@ namespace Gallop
public void ClearMorph()
{
foreach (FacialMorph morph in EarMorphs)
{
morph.weight = 0;
@@ -239,12 +270,17 @@ namespace Gallop
{
foreach (TrsArray trs in morph.trsArray)
{
if (trs.transform)
if (trs.isPhysics && Container.EnablePhysics)
{
trs.physicsParticle.m_InitLocalPosition += trs._position * morph.weight;
ParticleRecorder[trs.physicsParticle] += trs._rotation * morph.weight;
}
else if(trs.transform)
{
trs.transform.localScale += trs._scale * morph.weight;
trs.transform.localPosition += trs._position * morph.weight;
RotationRecorder[trs.transform] += trs._rotation * morph.weight;
};
}
}
}
@@ -264,12 +300,17 @@ namespace Gallop
{
foreach (TrsArray trs in trsArrays)
{
if (trs.transform)
if (trs.isPhysics && Container.EnablePhysics)
{
trs.physicsParticle.m_InitLocalPosition = trs._position;
ParticleRecorder[trs.physicsParticle] = trs._rotation;
}
else if (trs.transform)
{
trs.transform.localPosition = trs._position;
trs.transform.localScale = trs._scale;
RotationRecorder[trs.transform] = trs._rotation;
};
}
}
}
@@ -277,18 +318,25 @@ namespace Gallop
{
foreach (var trs in RotationRecorder)
{
trs.Key.localRotation = RotationConvert.fromMaya(trs.Value);
trs.Key.transform.localRotation = RotationConvert.fromMaya(trs.Value);
}
if (Container.EnablePhysics)
{
foreach (var particle in ParticleRecorder)
{
particle.Key.m_InitLocalRotation = RotationConvert.fromMaya(particle.Value);
}
}
}
public void ChangeMorphWeight(FacialMorph morph,float val)
public void ChangeMorphWeight(FacialMorph morph, float val)
{
Container.isAnimatorControl = false;
morph.weight = val;
ChangeMorph();
}
public void SetEyeRange(float lx, float ly,float rx, float ry)
public void SetEyeRange(float lx, float ly, float rx, float ry)
{
LeftEyeXrange.weight = lx;
LeftEyeYrange.weight = ly;
@@ -303,44 +351,64 @@ namespace Gallop
{
morph.weight = morph.locator.transform.localPosition.x * -100;
});
EyeMorphs.ForEach(morph =>
EarMorphs.ForEach(morph =>
{
if (morph == LeftEyeXrange || morph == LeftEyeYrange || morph == RightEyeXrange || morph == RightEyeYrange)
{
if (!Container.EnableEyeTracking)
{
morph.weight = morph.locator.transform.localPosition.x * -100;
}
}
else
{
morph.weight = morph.locator.transform.localPosition.x * -100;
}
morph.weight = morph.locator.transform.localPosition.x * -100;
});
MouthMorphs.ForEach(morph =>
{
morph.weight = morph.locator.transform.localPosition.x * -100;
});
EyeMorphs.ForEach(morph =>
{
if (!(morph == LeftEyeXrange || morph == LeftEyeYrange || morph == RightEyeXrange || morph == RightEyeYrange))
{
morph.weight = morph.locator.transform.localPosition.x * -100;
}
});
LeftEyeXrange.weight = -(EyeballCtrl_L_Locator.transform.localPosition.x * -100 + EyeballCtrl_All_Locator.transform.localPosition.x * -100);
RightEyeXrange.weight = -(EyeballCtrl_R_Locator.transform.localPosition.x * -100 + EyeballCtrl_All_Locator.transform.localPosition.x * -100);
LeftEyeYrange.weight = -(EyeballCtrl_L_Locator.transform.localPosition.y * -100 + EyeballCtrl_All_Locator.transform.localPosition.y * -100);
RightEyeYrange.weight = (EyeballCtrl_R_Locator.transform.localPosition.y * -100 + EyeballCtrl_All_Locator.transform.localPosition.y * -100);
ChangeMorph();
}
public void ResetLocator()
{
EarMorphs.ForEach(morph =>
{
morph.weight = 0;
morph.locator.transform.localPosition = Vector3.zero;
});
EyeBrowMorphs.ForEach(morph =>
{
morph.weight = 0;
morph.locator.transform.localPosition = Vector3.zero;
});
EyeMorphs.ForEach(morph =>
{
morph.weight = 0;
morph.locator.transform.localPosition = Vector3.zero;
});
MouthMorphs.ForEach(morph =>
{
morph.weight = 0;
morph.locator.transform.localPosition = Vector3.zero;
});
EyeballCtrl_L_Locator.transform.localPosition = Vector3.zero;
EyeballCtrl_R_Locator.transform.localPosition = Vector3.zero;
EyeballCtrl_All_Locator.transform.localPosition = Vector3.zero;
ChangeMorph();
}
}
@@ -1,15 +1,9 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using UnityEditor;
using UnityEngine;
namespace Gallop.Live.Cutt
{
public enum LiveTimelineKeyAttribute
public enum LiveTimelineKeyAttribute
{
Disable = 1,
CameraDelayEnable = 2,
+9
View File
@@ -1,6 +1,7 @@
using Unity;
using System.Collections.Generic;
using UnityEngine;
using static DynamicBone;
[System.Serializable]
public class AssetTable
@@ -40,6 +41,14 @@ public class TrsArray
public Vector3 _scale;
public Vector3 _rotation;
public bool IsOverrideTarget;
public bool isPhysics;
public Particle physicsParticle;
public override int GetHashCode()
{
return base.GetHashCode();
}
}
[System.Serializable]
Binary file not shown.
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e9132b160714b954cbe8e5341e773754
guid: 036631af73b15ac41a9d10f75f5bbafe
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
@@ -9,7 +9,7 @@ TrueTypeFontImporter:
characterPadding: 1
includeFontData: 1
fontNames:
- Alibaba PuHuiTi
- UMAMUSUME-RodinWanpaku Pro
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0

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