improve facial override
This commit is contained in:
@@ -2241,7 +2241,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000244}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000305}
|
||||
m_SizeDelta: {x: 255, y: -90}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &92965282
|
||||
@@ -2932,7 +2932,7 @@ Transform:
|
||||
m_LocalScale: {x: 50, y: 0.2, z: 50}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 7
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &116348344
|
||||
GameObject:
|
||||
@@ -5185,7 +5185,7 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 2136933733}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 8
|
||||
m_RootOrder: 9
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &217907839
|
||||
MonoBehaviour:
|
||||
@@ -6185,7 +6185,7 @@ MonoBehaviour:
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacing: -100
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
@@ -6212,7 +6212,7 @@ MonoBehaviour:
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &262195458
|
||||
@@ -6723,7 +6723,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 255, y: -45.000244}
|
||||
m_AnchoredPosition: {x: 255, y: -45.000305}
|
||||
m_SizeDelta: {x: 270, y: -90}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &270183827
|
||||
@@ -10172,7 +10172,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 159042497}
|
||||
m_Father: {fileID: 1200264883}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
@@ -10264,7 +10264,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 1
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 1.5
|
||||
--- !u!222 &399621057
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -20280,7 +20280,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 544380815}
|
||||
m_Father: {fileID: 1200264883}
|
||||
m_RootOrder: 6
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
@@ -20372,7 +20372,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 1
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 1.5
|
||||
--- !u!222 &695996368
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -20973,7 +20973,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: b4b9eac9ba8f7c54cb12ef5f2f8b9fc8, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 4380b40e982f7ab44a07bac775c75385, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -20982,7 +20982,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 3
|
||||
m_PixelsPerUnitMultiplier: 2.5
|
||||
--- !u!222 &719282838
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -25982,7 +25982,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 699570313}
|
||||
m_Father: {fileID: 1200264883}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
@@ -26074,7 +26074,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 1
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 1.5
|
||||
--- !u!222 &886856745
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -26398,7 +26398,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: b4b9eac9ba8f7c54cb12ef5f2f8b9fc8, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 4380b40e982f7ab44a07bac775c75385, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -26407,7 +26407,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 3
|
||||
m_PixelsPerUnitMultiplier: 2.5
|
||||
--- !u!222 &893956227
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -26713,8 +26713,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 102, y: 10}
|
||||
m_SizeDelta: {x: 35, y: 35}
|
||||
m_AnchoredPosition: {x: 87.6, y: 22.499985}
|
||||
m_SizeDelta: {x: 80, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!114 &916764977
|
||||
MonoBehaviour:
|
||||
@@ -26792,7 +26792,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 35577cadf86d61e4fb606355b72c5aea, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 9a444f34ba8719a4083a94891d66b364, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -26801,7 +26801,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 4.2
|
||||
--- !u!222 &916764979
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -27034,7 +27034,7 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 110, y: 10, z: 0}
|
||||
--- !u!1 &931406425
|
||||
GameObject:
|
||||
@@ -27073,7 +27073,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 380, y: -45.000244}
|
||||
m_AnchoredPosition: {x: 380, y: -45.000305}
|
||||
m_SizeDelta: {x: 255, y: -90}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &931406427
|
||||
@@ -27307,7 +27307,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 255, y: -45.000244}
|
||||
m_AnchoredPosition: {x: 255, y: -45.000305}
|
||||
m_SizeDelta: {x: 270, y: -90}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &952551665
|
||||
@@ -28320,7 +28320,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: b4b9eac9ba8f7c54cb12ef5f2f8b9fc8, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 4380b40e982f7ab44a07bac775c75385, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -28329,7 +28329,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 3
|
||||
m_PixelsPerUnitMultiplier: 2.5
|
||||
--- !u!222 &991136002
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -29626,7 +29626,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000244}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000305}
|
||||
m_SizeDelta: {x: 255, y: -90}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &1040294592
|
||||
@@ -29774,7 +29774,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: b4b9eac9ba8f7c54cb12ef5f2f8b9fc8, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 4380b40e982f7ab44a07bac775c75385, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -29783,7 +29783,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 3
|
||||
m_PixelsPerUnitMultiplier: 2.5
|
||||
--- !u!222 &1046617017
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -31174,7 +31174,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: b4b9eac9ba8f7c54cb12ef5f2f8b9fc8, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 4380b40e982f7ab44a07bac775c75385, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -31183,7 +31183,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 3
|
||||
m_PixelsPerUnitMultiplier: 2.5
|
||||
--- !u!222 &1111810908
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -31262,7 +31262,7 @@ MonoBehaviour:
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: L
|
||||
m_Text: Lyrics
|
||||
--- !u!222 &1111938553
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -32586,7 +32586,7 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1385563000}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
@@ -33175,7 +33175,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: b4b9eac9ba8f7c54cb12ef5f2f8b9fc8, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 4380b40e982f7ab44a07bac775c75385, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -33184,7 +33184,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 3
|
||||
m_PixelsPerUnitMultiplier: 2.5
|
||||
--- !u!222 &1198130887
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -33412,12 +33412,12 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 2011080537}
|
||||
- {fileID: 399621054}
|
||||
- {fileID: 1690552082}
|
||||
- {fileID: 1259881231}
|
||||
- {fileID: 1342289415}
|
||||
- {fileID: 1259881231}
|
||||
- {fileID: 886856742}
|
||||
- {fileID: 695996365}
|
||||
- {fileID: 399621054}
|
||||
- {fileID: 1690552082}
|
||||
m_Father: {fileID: 733646225}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -33899,7 +33899,7 @@ RectTransform:
|
||||
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: -213.675}
|
||||
m_AnchoredPosition: {x: 283, y: -725.855}
|
||||
m_SizeDelta: {x: 283, y: 157.35}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!114 &1209823366
|
||||
@@ -34831,7 +34831,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 209682648}
|
||||
m_Father: {fileID: 1200264883}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
@@ -34923,7 +34923,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 1
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 1.5
|
||||
--- !u!222 &1259881234
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -37106,7 +37106,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: b4b9eac9ba8f7c54cb12ef5f2f8b9fc8, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 4380b40e982f7ab44a07bac775c75385, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -37115,7 +37115,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 3
|
||||
m_PixelsPerUnitMultiplier: 2.5
|
||||
--- !u!222 &1340983839
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -37212,7 +37212,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 685507283}
|
||||
m_Father: {fileID: 1200264883}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
@@ -37304,7 +37304,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 1
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 1.5
|
||||
--- !u!222 &1342289418
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -40316,7 +40316,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -29.999756}
|
||||
m_AnchoredPosition: {x: 0, y: -29.999817}
|
||||
m_SizeDelta: {x: 300, y: -60.000233}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!114 &1453791885
|
||||
@@ -40626,7 +40626,7 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 790387848}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!95 &1468470379
|
||||
Animator:
|
||||
@@ -41653,7 +41653,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000244}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000305}
|
||||
m_SizeDelta: {x: 380, y: -90}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!224 &1525688469 stripped
|
||||
@@ -42289,7 +42289,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000244}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000305}
|
||||
m_SizeDelta: {x: 255, y: -90}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &1558324558
|
||||
@@ -43484,7 +43484,7 @@ Transform:
|
||||
- {fileID: 473655707}
|
||||
- {fileID: 141131295}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1618706695
|
||||
GameObject:
|
||||
@@ -45759,7 +45759,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000244}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000305}
|
||||
m_SizeDelta: {x: 380, y: -90}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &1678768231
|
||||
@@ -46093,7 +46093,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000244}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000305}
|
||||
m_SizeDelta: {x: 380, y: -90}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &1684693616
|
||||
@@ -46287,7 +46287,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 1656599274}
|
||||
m_Father: {fileID: 1200264883}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
@@ -46379,7 +46379,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 1
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 1.5
|
||||
--- !u!222 &1690552085
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -46463,7 +46463,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000244}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000305}
|
||||
m_SizeDelta: {x: 380, y: -90}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &1699478760
|
||||
@@ -47815,7 +47815,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: b4b9eac9ba8f7c54cb12ef5f2f8b9fc8, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 4380b40e982f7ab44a07bac775c75385, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -47824,7 +47824,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 3
|
||||
m_PixelsPerUnitMultiplier: 2.5
|
||||
--- !u!222 &1744041650
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -48497,7 +48497,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 255, y: -45.000244}
|
||||
m_AnchoredPosition: {x: 255, y: -45.000305}
|
||||
m_SizeDelta: {x: 270, y: -90}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &1765749874
|
||||
@@ -53536,7 +53536,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000244}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000305}
|
||||
m_SizeDelta: {x: 400, y: -90}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &1970310175
|
||||
@@ -54847,7 +54847,7 @@ RectTransform:
|
||||
- {fileID: 1210994110}
|
||||
- {fileID: 859153092}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
@@ -54978,7 +54978,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 1
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 1.5
|
||||
--- !u!222 &2011080540
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -56115,7 +56115,7 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 6
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2049278006
|
||||
GameObject:
|
||||
@@ -56939,7 +56939,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 25}
|
||||
m_AnchoredPosition: {x: 0, y: 4.3}
|
||||
m_SizeDelta: {x: -16, y: 25}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2083721901
|
||||
@@ -57108,7 +57108,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: b4b9eac9ba8f7c54cb12ef5f2f8b9fc8, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 4380b40e982f7ab44a07bac775c75385, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -57117,7 +57117,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 3
|
||||
m_PixelsPerUnitMultiplier: 2.5
|
||||
--- !u!222 &2091332069
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -58166,8 +58166,8 @@ RectTransform:
|
||||
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: -10}
|
||||
m_SizeDelta: {x: 40, y: 40}
|
||||
m_AnchoredPosition: {x: 0, y: -36.6}
|
||||
m_SizeDelta: {x: 45, y: 45}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2108171287
|
||||
MonoBehaviour:
|
||||
@@ -58540,7 +58540,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000244}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000305}
|
||||
m_SizeDelta: {x: 400, y: -90}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &2129326814
|
||||
@@ -59762,7 +59762,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000244}
|
||||
m_AnchoredPosition: {x: 0, y: -45.000305}
|
||||
m_SizeDelta: {x: 255, y: -90}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &2146564492
|
||||
@@ -66735,5 +66735,5 @@ Transform:
|
||||
- {fileID: 1174230685}
|
||||
- {fileID: 1085021151}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
||||
@@ -267,7 +267,7 @@ public class UmaViewerBuilder : MonoBehaviour
|
||||
}
|
||||
else
|
||||
{
|
||||
var asset1 = Main.AbList[UmaDatabaseController.HeadPath + $"chr{id}_{costumeId}/clothes/pfb_chr{id}_{costumeId}_cloth00"];
|
||||
var asset1 = Main.AbList[UmaDatabaseController.HeadPath + $"chr{head_id}_{head_costumeId}/clothes/pfb_chr{head_id}_{head_costumeId}_cloth00"];
|
||||
RecursiveLoadAsset(asset1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -369,6 +369,10 @@ namespace Gallop
|
||||
public void ChangeMorph()
|
||||
{
|
||||
FacialResetAll();
|
||||
if (Container.FaceOverrideData && Container.FaceOverrideData.Enable)
|
||||
{
|
||||
OverrideFace(Container.FaceOverrideData);
|
||||
}
|
||||
EarMorphs.ForEach(morph => ProcessMorph(morph));
|
||||
EyeBrowMorphs.ForEach(morph => ProcessMorph(morph));
|
||||
EyeMorphs.ForEach(morph => ProcessMorph(morph));
|
||||
@@ -380,6 +384,10 @@ namespace Gallop
|
||||
public void ChangeMorphEye()
|
||||
{
|
||||
FacialResetEye();
|
||||
if (Container.FaceOverrideData && Container.FaceOverrideData.Enable)
|
||||
{
|
||||
OverrideFace(Container.FaceOverrideData);
|
||||
}
|
||||
EyeMorphs.ForEach(morph => ProcessMorph(morph));
|
||||
ApplyRotationEye();
|
||||
}
|
||||
@@ -423,22 +431,24 @@ namespace Gallop
|
||||
|
||||
private void ProcessMorph(FacialMorph morph)
|
||||
{
|
||||
if (morph.weight == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
var isOverride = Container.FaceOverrideData && Container.FaceOverrideData.Enable;
|
||||
if (isOverride && morph.OverrideType == OverrideType.Ignore) return;
|
||||
if (morph.weight == 0 && (!isOverride || morph.OverrideType == OverrideType.None))return;
|
||||
|
||||
var weight = (isOverride && morph.OverrideType == OverrideType.Override ? morph.overrideWeight : morph.weight);
|
||||
|
||||
foreach (TrsArray trs in morph.trsArray)
|
||||
{
|
||||
if (trs.isPhysics && Container.EnablePhysics)
|
||||
{
|
||||
trs.physicsParticle.m_InitLocalPosition += trs._position * morph.weight;
|
||||
ParticleRecorder[trs.physicsParticle] += trs._rotation * morph.weight;
|
||||
trs.physicsParticle.m_InitLocalPosition += trs._position * weight;
|
||||
ParticleRecorder[trs.physicsParticle] += trs._rotation * 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;
|
||||
trs.transform.localScale += trs._scale * weight;
|
||||
trs.transform.localPosition += trs._position * weight;
|
||||
RotationRecorder[trs.transform] += trs._rotation * weight;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -501,10 +511,6 @@ namespace Gallop
|
||||
|
||||
public void FacialResetAll()
|
||||
{
|
||||
if (Container.FaceOverrideData && Container.FaceOverrideData.Enable)
|
||||
{
|
||||
OverrideFace(Container.FaceOverrideData);
|
||||
}
|
||||
FacialReset(BaseLEarMorph.trsArray);
|
||||
FacialReset(BaseREarMorph.trsArray);
|
||||
FacialReset(BaseLEyeBrowMorph.trsArray);
|
||||
@@ -517,39 +523,23 @@ namespace Gallop
|
||||
|
||||
public void FacialResetEye()
|
||||
{
|
||||
if (Container.FaceOverrideData && Container.FaceOverrideData.Enable)
|
||||
{
|
||||
OverrideFace(Container.FaceOverrideData);
|
||||
}
|
||||
FacialReset(BaseLEyeMorph.trsArray);
|
||||
FacialReset(BaseREyeMorph.trsArray);
|
||||
}
|
||||
|
||||
public void FacialResetMouth()
|
||||
{
|
||||
if (Container.FaceOverrideData && Container.FaceOverrideData.Enable)
|
||||
{
|
||||
OverrideFace(Container.FaceOverrideData);
|
||||
}
|
||||
FacialReset(BaseMouthMorph.trsArray);
|
||||
}
|
||||
|
||||
public void FacialResetEyebrow()
|
||||
{
|
||||
if (Container.FaceOverrideData && Container.FaceOverrideData.Enable)
|
||||
{
|
||||
OverrideFace(Container.FaceOverrideData);
|
||||
}
|
||||
FacialReset(BaseLEyeBrowMorph.trsArray);
|
||||
FacialReset(BaseREyeBrowMorph.trsArray);
|
||||
}
|
||||
|
||||
public void FacialResetEar()
|
||||
{
|
||||
if (Container.FaceOverrideData && Container.FaceOverrideData.Enable)
|
||||
{
|
||||
OverrideFace(Container.FaceOverrideData);
|
||||
}
|
||||
FacialReset(BaseLEarMorph.trsArray);
|
||||
FacialReset(BaseREarMorph.trsArray);
|
||||
}
|
||||
@@ -754,47 +744,45 @@ namespace Gallop
|
||||
|
||||
Action<List<FacialMorph>, FaceOverrideReplaceDataSet[]> action = delegate (List<FacialMorph> morphs, FaceOverrideReplaceDataSet[] datalist)
|
||||
{
|
||||
Dictionary<LiveTimelineDefine.FacialEyeId, FacialMorph> morphDic = new Dictionary<LiveTimelineDefine.FacialEyeId, FacialMorph>();
|
||||
morphs.ForEach(m => {
|
||||
m.OverrideType = OverrideType.Ignore;
|
||||
m.overrideWeight = 0;
|
||||
morphDic.Add((LiveTimelineDefine.FacialEyeId)m.index, m);
|
||||
});
|
||||
|
||||
foreach (var data in datalist)
|
||||
{
|
||||
if (data.IsOnlyBaseReplace)
|
||||
{
|
||||
var replacemorph = GetMorphByType(morphs, data.BaseReplaceFaceType);
|
||||
var morph = morphs.Find(m => (m.weight > 0 && m != replacemorph));
|
||||
if (morph == null)
|
||||
{
|
||||
replacemorph.weight = 1;
|
||||
break;
|
||||
}
|
||||
replacemorph.weight = 0;
|
||||
}
|
||||
|
||||
bool changed = false;
|
||||
foreach (var arr in data.DataArray)
|
||||
{
|
||||
List<Action> targetMorph = new List<Action>();
|
||||
bool changed = false;
|
||||
foreach (var src in arr.SrcArray)
|
||||
{
|
||||
if (src == LiveTimelineDefine.FacialEyeId.Base) continue;
|
||||
var srcmorph = GetMorphByType(morphs, src);
|
||||
if (srcmorph.weight > 0 && !changed)
|
||||
if (morphDic[src].weight > 0 )
|
||||
{
|
||||
foreach (var dst in arr.DstArray)
|
||||
{
|
||||
var dm = GetMorphByType(morphs, dst.Index);
|
||||
var weight = (dst.Weight == 1 ? 1 : Mathf.Lerp(0, dst.Weight, srcmorph.weight));
|
||||
targetMorph.Add(delegate () { dm.weight = weight; });
|
||||
var dm = morphDic[dst.Index];
|
||||
var weight = (dst.Weight == 1 ? 1 : Mathf.Lerp(0, dst.Weight, morphDic[src].weight));
|
||||
dm.overrideWeight += weight;
|
||||
dm.OverrideType = OverrideType.Override;
|
||||
}
|
||||
morphDic[src].OverrideType = OverrideType.Override;
|
||||
changed = true;
|
||||
}
|
||||
|
||||
if (new List<FaceOverrideElement>(arr.DstArray).Find(f => f.Index == src) == null)
|
||||
{
|
||||
srcmorph.weight = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
targetMorph.ForEach(a => a());
|
||||
}
|
||||
|
||||
if (!changed && data.IsOnlyBaseReplace)
|
||||
{
|
||||
var replacemorph = morphDic[data.BaseReplaceFaceType];
|
||||
replacemorph.overrideWeight += 1;
|
||||
replacemorph.OverrideType = OverrideType.Override;
|
||||
}
|
||||
}
|
||||
morphs.ForEach(m=> { m.overrideWeight = Mathf.Clamp01(m.overrideWeight); });
|
||||
};
|
||||
|
||||
if (overrideData.IsBothEyesSetting)
|
||||
@@ -804,11 +792,6 @@ namespace Gallop
|
||||
}
|
||||
}
|
||||
|
||||
public FacialMorph GetMorphByType(List<FacialMorph> morphs, LiveTimelineDefine.FacialEyeId Type)
|
||||
{
|
||||
return morphs.Find(m => m.index == (int)Type);
|
||||
}
|
||||
|
||||
public void AlterUpdateAutoLip(LiveTimelineKeyLipSyncData _prevLipKeyData, LiveTimelineKeyLipSyncData keyData_, float liveTime_, float _switch)
|
||||
{
|
||||
//|| lockMouth
|
||||
|
||||
@@ -15,10 +15,19 @@ namespace Gallop
|
||||
public string tag = "";
|
||||
public bool direction;
|
||||
public float weight;
|
||||
public OverrideType OverrideType;
|
||||
public float overrideWeight;
|
||||
public List<TrsArray> trsArray;
|
||||
public Transform locator;
|
||||
}
|
||||
|
||||
public enum OverrideType
|
||||
{
|
||||
None,
|
||||
Override,
|
||||
Ignore
|
||||
}
|
||||
|
||||
[System.Serializable]
|
||||
public class FacialOtherMorph : FacialMorph
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user