bug fix
This commit is contained in:
+113
-112
@@ -2702,10 +2702,10 @@ RectTransform:
|
||||
m_Father: {fileID: 733646225}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 2034.2386, y: -30}
|
||||
m_SizeDelta: {x: 413.69547, y: 60}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &127647253
|
||||
MonoBehaviour:
|
||||
@@ -3808,10 +3808,10 @@ RectTransform:
|
||||
m_Father: {fileID: 733646225}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 1620.5432, y: -30}
|
||||
m_SizeDelta: {x: 413.69547, y: 60}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &197132282
|
||||
GameObject:
|
||||
@@ -8288,10 +8288,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1200264883}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 375, y: -15}
|
||||
m_SizeDelta: {x: 250, y: 30}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &399621055
|
||||
MonoBehaviour:
|
||||
@@ -8772,9 +8772,9 @@ RectTransform:
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -17, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &418000890
|
||||
MonoBehaviour:
|
||||
@@ -12955,10 +12955,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1704906816}
|
||||
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: -702.18}
|
||||
m_SizeDelta: {x: 283, y: 220}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 220}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!114 &548276325
|
||||
MonoBehaviour:
|
||||
@@ -14890,10 +14890,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1704906816}
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 141.5, y: -912.18}
|
||||
m_SizeDelta: {x: 283, y: 40}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &673546063
|
||||
MonoBehaviour:
|
||||
@@ -16327,10 +16327,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1200264883}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 625, y: -45}
|
||||
m_SizeDelta: {x: 250, y: 30}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &695996366
|
||||
MonoBehaviour:
|
||||
@@ -20232,10 +20232,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1704906816}
|
||||
m_RootOrder: 20
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 141.5, y: -1152.1799}
|
||||
m_SizeDelta: {x: 283, y: 40}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &842158913
|
||||
MonoBehaviour:
|
||||
@@ -21276,10 +21276,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1200264883}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 375, y: -45}
|
||||
m_SizeDelta: {x: 250, y: 30}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &886856743
|
||||
MonoBehaviour:
|
||||
@@ -21665,10 +21665,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1704906816}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 141.5, y: -832.18}
|
||||
m_SizeDelta: {x: 283, y: 40}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &893956226
|
||||
MonoBehaviour:
|
||||
@@ -23216,10 +23216,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1704906816}
|
||||
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: 141.5, y: -20}
|
||||
m_SizeDelta: {x: 283, y: 40}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &991136001
|
||||
MonoBehaviour:
|
||||
@@ -24553,10 +24553,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1704906816}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 141.5, y: -572.18}
|
||||
m_SizeDelta: {x: 283, y: 40}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1046617016
|
||||
MonoBehaviour:
|
||||
@@ -25760,10 +25760,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1704906816}
|
||||
m_RootOrder: 16
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 141.5, y: -1072.1799}
|
||||
m_SizeDelta: {x: 283, y: 40}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1111810906
|
||||
MonoBehaviour:
|
||||
@@ -27525,10 +27525,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1704906816}
|
||||
m_RootOrder: 14
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 141.5, y: -1032.1799}
|
||||
m_SizeDelta: {x: 283, y: 40}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1198130886
|
||||
MonoBehaviour:
|
||||
@@ -27796,10 +27796,10 @@ RectTransform:
|
||||
m_Father: {fileID: 733646225}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1413.6954, y: 60}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &1200264884
|
||||
MonoBehaviour:
|
||||
@@ -29182,10 +29182,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1200264883}
|
||||
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: 875, y: -15}
|
||||
m_SizeDelta: {x: 250, y: 30}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1259881232
|
||||
MonoBehaviour:
|
||||
@@ -31120,10 +31120,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1704906816}
|
||||
m_RootOrder: 12
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 141.5, y: -992.18}
|
||||
m_SizeDelta: {x: 283, y: 40}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1340983838
|
||||
MonoBehaviour:
|
||||
@@ -31253,10 +31253,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1200264883}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 125, y: -45}
|
||||
m_SizeDelta: {x: 250, y: 30}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1342289416
|
||||
MonoBehaviour:
|
||||
@@ -33122,10 +33122,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1704906816}
|
||||
m_RootOrder: 18
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 141.5, y: -1112.1799}
|
||||
m_SizeDelta: {x: 283, y: 40}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1443320127
|
||||
MonoBehaviour:
|
||||
@@ -37835,10 +37835,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1704906816}
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 141.5, y: -952.18}
|
||||
m_SizeDelta: {x: 283, y: 40}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1664478986
|
||||
MonoBehaviour:
|
||||
@@ -38698,10 +38698,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1200264883}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 625, y: -15}
|
||||
m_SizeDelta: {x: 250, y: 30}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1690552083
|
||||
MonoBehaviour:
|
||||
@@ -39000,7 +39000,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0.000030517578}
|
||||
m_SizeDelta: {x: 0, y: 1172.1799}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &1704906817
|
||||
MonoBehaviour:
|
||||
@@ -45830,10 +45830,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1200264883}
|
||||
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: 125, y: -15}
|
||||
m_SizeDelta: {x: 250, y: 30}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2011080538
|
||||
MonoBehaviour:
|
||||
@@ -47017,6 +47017,7 @@ MonoBehaviour:
|
||||
_Global_FogMinDistance: {x: 0, y: 0, z: 0, w: 0}
|
||||
_Global_FogLength: {x: 0, y: 0, z: 0, w: 0}
|
||||
_RimHorizonOffset: 0
|
||||
_UVEmissivePower: 1
|
||||
_AmbientColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
scrollPosition: {x: 0, y: 0}
|
||||
--- !u!4 &2048991191
|
||||
@@ -47731,10 +47732,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1704906816}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 141.5, y: -872.18}
|
||||
m_SizeDelta: {x: 283, y: 40}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2091332067
|
||||
MonoBehaviour:
|
||||
@@ -50652,9 +50653,9 @@ RectTransform:
|
||||
m_Father: {fileID: 6878219667498913896}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 106.5, y: -286}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 180, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &6878219665895574065
|
||||
@@ -51160,9 +51161,9 @@ RectTransform:
|
||||
m_Father: {fileID: 6878219667498913896}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 106.5, y: -57.2}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 180, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &6878219666109573094
|
||||
@@ -51267,10 +51268,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1704906816}
|
||||
m_RootOrder: 1
|
||||
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: -296.09}
|
||||
m_SizeDelta: {x: 283, y: 512.18}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 512.18}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!114 &6878219666121841225
|
||||
MonoBehaviour:
|
||||
@@ -53517,9 +53518,9 @@ RectTransform:
|
||||
m_Father: {fileID: 6878219667498913896}
|
||||
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: 106.5, y: -171.6}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 180, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &6878219666841734894
|
||||
@@ -54348,9 +54349,9 @@ RectTransform:
|
||||
m_Father: {fileID: 6878219667498913896}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 106.5, y: -228.8}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 180, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &6878219667203546886
|
||||
@@ -56060,9 +56061,9 @@ RectTransform:
|
||||
m_Father: {fileID: 6878219667498913896}
|
||||
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: 106.5, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 180, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &6878219667749320559
|
||||
@@ -56280,9 +56281,9 @@ RectTransform:
|
||||
m_Father: {fileID: 6878219667498913896}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 106.5, y: -114.4}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 180, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!1 &6878219667784581358
|
||||
|
||||
@@ -453,7 +453,10 @@ namespace Gallop
|
||||
|
||||
public void FacialResetAll()
|
||||
{
|
||||
|
||||
if (Container.FaceOverrideData)
|
||||
{
|
||||
OverrideFace(Container.FaceOverrideData);
|
||||
}
|
||||
FacialReset(BaseLEarMorph.trsArray);
|
||||
FacialReset(BaseREarMorph.trsArray);
|
||||
FacialReset(BaseLEyeBrowMorph.trsArray);
|
||||
@@ -462,10 +465,6 @@ namespace Gallop
|
||||
FacialReset(BaseREyeMorph.trsArray);
|
||||
FacialReset(BaseMouthMorph.trsArray);
|
||||
ApplyRotation();
|
||||
if (Container.FaceOverrideData)
|
||||
{
|
||||
OverrideFace(Container.FaceOverrideData);
|
||||
}
|
||||
}
|
||||
|
||||
public void FacialReset(List<TrsArray> trsArrays)
|
||||
@@ -583,36 +582,45 @@ namespace Gallop
|
||||
|
||||
public void OverrideFace(FaceOverrideData overrideData)
|
||||
{
|
||||
|
||||
Action<List<FacialMorph>, FaceOverrideReplaceDataSet[]> action = delegate (List<FacialMorph> morphs, FaceOverrideReplaceDataSet[] datalist)
|
||||
{
|
||||
foreach (var data in datalist)
|
||||
{
|
||||
if (data.IsOnlyBaseReplace)
|
||||
{
|
||||
var morph = morphs.Find(m => m.weight > 0);
|
||||
var replacemorph = GetMorphByType(morphs, data.BaseReplaceFaceType);
|
||||
var morph = morphs.Find(m => (m.weight > 0 && m != replacemorph));
|
||||
if (morph == null)
|
||||
{
|
||||
GetMorphByType(morphs, data.BaseReplaceFaceType).weight = 1;
|
||||
replacemorph.weight = 1;
|
||||
break;
|
||||
}
|
||||
replacemorph.weight = 0;
|
||||
}
|
||||
|
||||
foreach (var arr in data.DataArray)
|
||||
{
|
||||
List<Action> targetMorph = new List<Action>();
|
||||
bool changed = false;
|
||||
foreach(var src in arr.SrcArray)
|
||||
foreach (var src in arr.SrcArray)
|
||||
{
|
||||
if (src == LiveTimelineDefine.FacialEyeId.Base) continue;
|
||||
var srcmorph = GetMorphByType(morphs, src);
|
||||
if (srcmorph.weight > 0 && !changed)
|
||||
foreach (var dst in arr.DstArray)
|
||||
{
|
||||
changed = true;
|
||||
foreach (var dst in arr.DstArray)
|
||||
var dm = GetMorphByType(morphs, dst.Index);
|
||||
if (!changed)
|
||||
{
|
||||
GetMorphByType(morphs, dst.Index).weight = Mathf.Lerp(0, dst.Weight, srcmorph.weight);
|
||||
var weight = (dst.Weight == 1 ? 1 : Mathf.Lerp(0, dst.Weight, srcmorph.weight));
|
||||
targetMorph.Add(delegate () { dm.weight = weight; });
|
||||
}
|
||||
if (srcmorph != dm) srcmorph.weight = 0;
|
||||
}
|
||||
srcmorph.weight = 0;
|
||||
changed = true;
|
||||
|
||||
}
|
||||
targetMorph.ForEach(a => a.Invoke());
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -622,8 +630,6 @@ namespace Gallop
|
||||
action.Invoke(leftEyeMorph, overrideData.FaceOverrideArray);
|
||||
action.Invoke(rightEyeMorph, overrideData.FaceOverrideArray);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
public FacialMorph GetMorphByType(List<FacialMorph> morphs, LiveTimelineDefine.FacialEyeId Type)
|
||||
|
||||
Reference in New Issue
Block a user