优化页面和部分战斗报错修改
parent
7903cc1e46
commit
204aa8d607
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.3 KiB |
|
|
@ -342,8 +342,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.54, y: -4.31}
|
||||
m_SizeDelta: {x: 85.51, y: 84.78}
|
||||
m_AnchoredPosition: {x: -0.54, y: -10}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1403729248
|
||||
CanvasRenderer:
|
||||
|
|
@ -16002,7 +16002,7 @@ 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: -74, y: -397.1}
|
||||
m_AnchoredPosition: {x: -70, y: -455}
|
||||
m_SizeDelta: {x: 1150, y: 263}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5173896560747882327
|
||||
|
|
@ -16282,9 +16282,9 @@ RectTransform:
|
|||
m_Father: {fileID: 2996056851831115851}
|
||||
m_RootOrder: 7
|
||||
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: 452, y: 344}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 390, y: 344}
|
||||
m_SizeDelta: {x: 89, y: 89}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8831489817173743925
|
||||
|
|
@ -16567,7 +16567,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 10}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -0.4, y: -10}
|
||||
m_AnchoredPosition: {x: -0.4, y: -12.2}
|
||||
m_SizeDelta: {x: 180, y: 146}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3805720915081306908
|
||||
|
|
@ -21345,8 +21345,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.54124, y: -4.3099976}
|
||||
m_SizeDelta: {x: 85.507, y: 84.78}
|
||||
m_AnchoredPosition: {x: -0.54124, y: -10}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6755898298904498982
|
||||
CanvasRenderer:
|
||||
|
|
@ -21455,9 +21455,9 @@ RectTransform:
|
|||
m_Father: {fileID: 2996056851831115851}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 74.2, y: 230.1}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 101.2, y: 230.1}
|
||||
m_SizeDelta: {x: 413.3, y: 73.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8474098984495242449
|
||||
|
|
@ -26782,10 +26782,10 @@ RectTransform:
|
|||
m_Father: {fileID: 2996056851831115851}
|
||||
m_RootOrder: 3
|
||||
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: 5}
|
||||
m_SizeDelta: {x: 1120, y: 681}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -27.250008}
|
||||
m_SizeDelta: {x: 1120, y: 745.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1740481921477327890
|
||||
CanvasRenderer:
|
||||
|
|
@ -26858,10 +26858,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6077850415073973405}
|
||||
m_RootOrder: 1
|
||||
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: -7, y: -30}
|
||||
m_SizeDelta: {x: 908.3, y: 505.6}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: -21, y: -127}
|
||||
m_SizeDelta: {x: 908.3, y: 505.59998}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3258777718055325936
|
||||
CanvasRenderer:
|
||||
|
|
@ -26948,9 +26948,9 @@ RectTransform:
|
|||
m_Father: {fileID: 2996056851831115851}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: -6, y: 132}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 21, y: 132}
|
||||
m_SizeDelta: {x: 756, y: 300}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2189502383107436058
|
||||
|
|
|
|||
|
|
@ -686,8 +686,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -7.700001, y: -10.200001}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4519675045673822026
|
||||
CanvasRenderer:
|
||||
|
|
@ -13092,8 +13092,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -7.700001, y: -10.200001}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8313818104604249363
|
||||
CanvasRenderer:
|
||||
|
|
@ -13762,8 +13762,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: 120, y: 15.885}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_AnchoredPosition: {x: 125.00002, y: 21.884998}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7125064262154070217
|
||||
CanvasRenderer:
|
||||
|
|
@ -18724,7 +18724,7 @@ RectTransform:
|
|||
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: 68, y: 68}
|
||||
m_SizeDelta: {x: 88, y: 72}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6862390233077325795
|
||||
CanvasRenderer:
|
||||
|
|
@ -26654,8 +26654,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -7.700001, y: -10.200001}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2302609630177786835
|
||||
CanvasRenderer:
|
||||
|
|
@ -26728,8 +26728,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: 77.8, y: 36.1}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_AnchoredPosition: {x: 87.9, y: 47.1}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4923744113459652667
|
||||
CanvasRenderer:
|
||||
|
|
@ -26881,8 +26881,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -7.700001, y: -10.200001}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8812833425648178038
|
||||
CanvasRenderer:
|
||||
|
|
@ -28156,8 +28156,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -7.700001, y: -10.200001}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3305247604279922050
|
||||
CanvasRenderer:
|
||||
|
|
@ -28435,8 +28435,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -7.700001, y: -10.200001}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4577195757855600251
|
||||
CanvasRenderer:
|
||||
|
|
@ -29173,8 +29173,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -7.700001, y: -10.200001}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7886335957896522229
|
||||
CanvasRenderer:
|
||||
|
|
@ -35182,8 +35182,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: 114, y: 16}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_AnchoredPosition: {x: 119, y: 22}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4264676262867937960
|
||||
CanvasRenderer:
|
||||
|
|
@ -35500,8 +35500,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -7.700001, y: -10.200001}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3679987128871835396
|
||||
CanvasRenderer:
|
||||
|
|
|
|||
|
|
@ -577,7 +577,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 1395699284204232}
|
||||
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_LocalScale: {x: 1.4, y: 1.4, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1800235187309093387}
|
||||
m_Father: {fileID: 224600226821235800}
|
||||
|
|
@ -1211,8 +1211,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: 385.8, y: 39.7}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_AnchoredPosition: {x: 343, y: 39.7}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222568781164101466
|
||||
CanvasRenderer:
|
||||
|
|
@ -1791,7 +1791,7 @@ 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: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
|
@ -1981,7 +1981,8 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 2797532054882724647}
|
||||
- component: {fileID: 1271770663175238432}
|
||||
- component: {fileID: 2744014931473363068}
|
||||
- component: {fileID: 1063277234937061328}
|
||||
- component: {fileID: 7744040210759265772}
|
||||
m_Layer: 5
|
||||
m_Name: isTopImg
|
||||
m_TagString: Untagged
|
||||
|
|
@ -2016,7 +2017,7 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 633953809663610452}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2744014931473363068
|
||||
--- !u!114 &1063277234937061328
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -2025,7 +2026,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 633953809663610452}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
|
|
@ -2036,15 +2037,35 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: edcb694b0b09af246ab5576b6265566d, type: 3}
|
||||
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_FontData:
|
||||
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u7F6E\u9876"
|
||||
--- !u!114 &7744040210759265772
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 633953809663610452}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 1, y: -1}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &1835407667214448347
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -1014,7 +1014,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 51.99829, y: 0.00004875168}
|
||||
m_AnchoredPosition: {x: 51.99829, y: -0.00002748153}
|
||||
m_SizeDelta: {x: 837.9, y: 0}
|
||||
m_Pivot: {x: -9.313226e-10, y: -0.00000009685755}
|
||||
--- !u!114 &114856704771779596
|
||||
|
|
@ -1228,6 +1228,7 @@ GameObject:
|
|||
- component: {fileID: 224844119586139480}
|
||||
- component: {fileID: 222020114320664264}
|
||||
- component: {fileID: 3081948793912735}
|
||||
- component: {fileID: 3617094082941775024}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
|
|
@ -1297,6 +1298,21 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u9886\u53D6"
|
||||
LanguageIndex: 0
|
||||
--- !u!114 &3617094082941775024
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1718980963654646}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 1, y: -1}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &1871565725321798
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1579,6 +1595,7 @@ GameObject:
|
|||
- component: {fileID: 3635776725646956425}
|
||||
- component: {fileID: 8807674708746483729}
|
||||
- component: {fileID: 4078240510986758300}
|
||||
- component: {fileID: 4841276667570447867}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
|
|
@ -1626,7 +1643,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.23137257, g: 0.23137257, b: 0.23137257, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
@ -1648,6 +1665,21 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u5220\u9664"
|
||||
LanguageIndex: 0
|
||||
--- !u!114 &4841276667570447867
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1678823524648710643}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 1, y: -1}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &5594717824785830915
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1683,7 +1715,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: -0.000061035156, y: -0.000061035156}
|
||||
m_AnchoredPosition: {x: -0.000061035156, y: 0.000030517578}
|
||||
m_SizeDelta: {x: 675.2, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &4820645118571433122
|
||||
|
|
@ -2033,7 +2065,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 6ff20609e8c68014394e6b730e1c7948, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 71162a8d1456dde45a156c169aeccf54, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
|
|||
|
|
@ -11701,7 +11701,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -124.20001, y: -199}
|
||||
m_AnchoredPosition: {x: -124.20001, y: -172}
|
||||
m_SizeDelta: {x: 233.5, y: 84}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4570418038677911438
|
||||
|
|
@ -16990,7 +16990,7 @@ RectTransform:
|
|||
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: 50, y: 0}
|
||||
m_SizeDelta: {x: 88, y: 72}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8158193788146855441
|
||||
CanvasRenderer:
|
||||
|
|
@ -17020,7 +17020,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: d7183aaa8ad92e2488276d26fc370192, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -21864,10 +21864,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6999176096490070205}
|
||||
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: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 540, y: -40}
|
||||
m_SizeDelta: {x: 178, y: 70}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4230894382925717242
|
||||
CanvasRenderer:
|
||||
|
|
@ -28103,8 +28103,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: 721, y: -40}
|
||||
m_SizeDelta: {x: 72, y: 70}
|
||||
m_AnchoredPosition: {x: 729, y: -40}
|
||||
m_SizeDelta: {x: 67, y: 70}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1421548564459575904
|
||||
CanvasRenderer:
|
||||
|
|
@ -39203,7 +39203,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: 463, y: -40}
|
||||
m_AnchoredPosition: {x: 457.5, y: -40}
|
||||
m_SizeDelta: {x: 280, y: 80}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3842461532959549957
|
||||
|
|
@ -39235,7 +39235,7 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 1
|
||||
m_BestFit: 0
|
||||
|
|
@ -61319,7 +61319,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -100, y: -323}
|
||||
m_AnchoredPosition: {x: -334, y: -310}
|
||||
m_SizeDelta: {x: 70, y: 70}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1051757220321499835
|
||||
|
|
@ -66127,10 +66127,10 @@ RectTransform:
|
|||
m_Father: {fileID: 8807105563129826786}
|
||||
m_RootOrder: 2
|
||||
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: 70}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 124, y: -35}
|
||||
m_SizeDelta: {x: 108, y: 70}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2317278536197132997
|
||||
CanvasRenderer:
|
||||
|
|
@ -66161,7 +66161,7 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
|
|
@ -72122,8 +72122,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: 644, y: -40}
|
||||
m_SizeDelta: {x: 62, y: 80}
|
||||
m_AnchoredPosition: {x: 646.5, y: -40}
|
||||
m_SizeDelta: {x: 78, y: 80}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3741071860444679150
|
||||
CanvasRenderer:
|
||||
|
|
@ -72154,7 +72154,7 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 1
|
||||
m_BestFit: 0
|
||||
|
|
|
|||
|
|
@ -2183,8 +2183,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: 34, y: 33}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_AnchoredPosition: {x: 49, y: 44}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1152626723460165360
|
||||
CanvasRenderer:
|
||||
|
|
@ -3604,8 +3604,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: 34, y: 33}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_AnchoredPosition: {x: 49.00001, y: 44.000046}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1109515459570090558
|
||||
CanvasRenderer:
|
||||
|
|
@ -9335,7 +9335,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -82.10071}
|
||||
m_AnchoredPosition: {x: 0, y: -82.100586}
|
||||
m_SizeDelta: {x: 0, y: 166.8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6184446612678913023
|
||||
|
|
@ -14178,8 +14178,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: 34, y: 33}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_AnchoredPosition: {x: 49.00001, y: 44.000046}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4888555450829132123
|
||||
CanvasRenderer:
|
||||
|
|
@ -19636,7 +19636,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0.025146484, y: 43.50305}
|
||||
m_AnchoredPosition: {x: 0.025146484, y: 43.50293}
|
||||
m_SizeDelta: {x: 0, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8192165474500473353
|
||||
|
|
@ -24107,8 +24107,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: 34, y: 33}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_AnchoredPosition: {x: 49.00001, y: 44.000046}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2018580604552352836
|
||||
CanvasRenderer:
|
||||
|
|
@ -26334,8 +26334,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: 34, y: 33}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_AnchoredPosition: {x: 49.00001, y: 44.000046}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6931982276704757744
|
||||
CanvasRenderer:
|
||||
|
|
@ -27974,8 +27974,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: 34, y: 33}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_AnchoredPosition: {x: 49.00001, y: 44.000046}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9124319086602404715
|
||||
CanvasRenderer:
|
||||
|
|
@ -29471,7 +29471,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 82.3, y: 29.9}
|
||||
m_SizeDelta: {x: 40, y: 40}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6092516506755470784
|
||||
CanvasRenderer:
|
||||
|
|
@ -30067,7 +30067,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 423.4, y: -106.5}
|
||||
m_SizeDelta: {x: 40, y: 40}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7686434233130170854
|
||||
CanvasRenderer:
|
||||
|
|
@ -33355,7 +33355,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 81.00004, y: 30.799988}
|
||||
m_SizeDelta: {x: 40, y: 40}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8952362879051704451
|
||||
CanvasRenderer:
|
||||
|
|
@ -34630,7 +34630,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0.000030517578}
|
||||
m_AnchoredPosition: {x: 0, y: -0.0000076293945}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &1537562228229781123
|
||||
|
|
|
|||
|
|
@ -186,8 +186,8 @@ RectTransform:
|
|||
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: 7.2001953}
|
||||
m_SizeDelta: {x: 1, y: -82}
|
||||
m_AnchoredPosition: {x: -2.3000488, y: 7.2001953}
|
||||
m_SizeDelta: {x: -58.8, y: -82}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1370109979933842796
|
||||
MonoBehaviour:
|
||||
|
|
@ -304,7 +304,7 @@ 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: 82.8385, y: 30.382507}
|
||||
m_AnchoredPosition: {x: 64.3, y: 42.8}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5655440297304059979
|
||||
|
|
@ -671,7 +671,7 @@ 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: -494.7999, y: 447.22577}
|
||||
m_AnchoredPosition: {x: -494.7999, y: 421.8126}
|
||||
m_SizeDelta: {x: 987.4, y: 0}
|
||||
m_Pivot: {x: -0.00000007683411, y: 0.9999999}
|
||||
--- !u!114 &3184966851960719010
|
||||
|
|
@ -694,8 +694,8 @@ MonoBehaviour:
|
|||
m_ChildAlignment: 0
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 100, y: 100}
|
||||
m_Spacing: {x: 68, y: 93.25}
|
||||
m_CellSize: {x: 135, y: 135}
|
||||
m_Spacing: {x: 40, y: 50}
|
||||
m_Constraint: 1
|
||||
m_ConstraintCount: 5
|
||||
--- !u!114 &6846399584543095795
|
||||
|
|
@ -746,7 +746,7 @@ 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: 21.41, y: 66.38}
|
||||
m_AnchoredPosition: {x: 0, y: 88}
|
||||
m_SizeDelta: {x: 151.73, y: 45.68}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &542043527256496620
|
||||
|
|
@ -1793,7 +1793,7 @@ RectTransform:
|
|||
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: 100, y: 100}
|
||||
m_SizeDelta: {x: 135, y: 135}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &6760748432821755191
|
||||
GameObject:
|
||||
|
|
@ -2022,7 +2022,7 @@ 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: 21.41, y: -29}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 180, y: 146}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2583225234602877354
|
||||
|
|
@ -2173,7 +2173,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -1131, y: -186}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_SizeDelta: {x: 135, y: 135}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &8233277016427264071
|
||||
GameObject:
|
||||
|
|
|
|||
|
|
@ -508,7 +508,7 @@ function EnemyView:OnSkillPlay(type)
|
|||
-- name="skill"
|
||||
-- end
|
||||
|
||||
local name = "attack"
|
||||
local name = "atk2"
|
||||
local humanname = "atk"
|
||||
if type and type == 2 then
|
||||
humanname = "skill2"
|
||||
|
|
@ -516,7 +516,7 @@ function EnemyView:OnSkillPlay(type)
|
|||
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, humanname, false)
|
||||
if type == 0 and self.RoleSkillLiveGoGraphic ~= nil then
|
||||
self:PlaySpineAnim(self.RoleSkillLiveGoGraphic, 0, name, false)
|
||||
self:PlaySpineAnim(self.RoleSkillLiveGoGraphic, 0, "play_skill_self", false)
|
||||
elseif self.RoleSkillLiveGoGraphic ~= nil then
|
||||
-- name="skill"
|
||||
self.RoleSkillLiveGo2:SetActive(true)
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ function MonsterView:OnSkillCastingStart(skill)
|
|||
else
|
||||
self.castingNameNode:SetActive(false)
|
||||
end
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic3, 0, "attack" , false)
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic3, 0, "atk" , false)
|
||||
-- coroutine.wait(1.5)
|
||||
--self.turnEffect:SetActive(false)
|
||||
--end)
|
||||
|
|
@ -349,7 +349,7 @@ function MonsterView:OnSkillCastingStart(skill)
|
|||
if self.isMainPlayer then
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "idle" , false)
|
||||
else
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "attack" , false)
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "atk" , false)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -541,6 +541,7 @@ function PlayerView:PlaySpineAnim(gog, time, name, isLoop)
|
|||
end
|
||||
gog.AnimationState:ClearTracks() -- 清除上一个动画的影响(修复概率攻击动画播放错误的问题)
|
||||
self.currAniName=name
|
||||
LogError("================:"..gog.gameObject.name)
|
||||
gog.AnimationState:SetAnimation(time, name, isLoop)
|
||||
gog.AnimationState.Complete = gog.AnimationState.Complete + _complete
|
||||
end
|
||||
|
|
@ -589,7 +590,7 @@ function PlayerView:OnSkillPlay(type,combat)
|
|||
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, humanname, false)
|
||||
if type==0 and self.RoleSkillLiveGoGraphic ~= nil then
|
||||
self:PlaySpineAnim(self.RoleSkillLiveGoGraphic, 0, "attack", false)
|
||||
self:PlaySpineAnim(self.RoleSkillLiveGoGraphic, 0, "play_skill_self", false)
|
||||
elseif self.RoleSkillLiveGoGraphic2~=nil and self.combat2.EffectType==8 and type>1 then
|
||||
--type>1 的都为技能,目前是只有技能才有特效,播放play_skill_self
|
||||
-- name="skill"
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ function RoleView:OnSkillPlay()
|
|||
cardRenderMat:SetInt("_IsMask", 0)
|
||||
end
|
||||
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, "attack", false)
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, "atk", false)
|
||||
end
|
||||
|
||||
function RoleView:OnSkillEnd()
|
||||
|
|
|
|||
|
|
@ -97,10 +97,11 @@ function SkillCaster:OnSkillCast(skill)
|
|||
posy=displaceoffset[2]
|
||||
end
|
||||
end
|
||||
LogError(tostring(postion))
|
||||
LogError(tostring(Vector3.New(postion.x-(self.owner.camp==0 and posx or(-posx)),postion.y+posy,postion.z)))
|
||||
--LogError(tostring(postion))
|
||||
--LogError(tostring(Vector3.New(postion.x-(self.owner.camp==0 and posx or(-posx)),postion.y+posy,postion.z)))
|
||||
LogError("===========================:"..self.owner.RoleLiveGO.name)
|
||||
self.owner.RoleLiveGO.transform:DOMove(Vector3.New(postion.x-(self.owner.camp==0 and posx or(-posx)),postion.y+posy,startPos.z), combat.AttackDisplaceTime/1000, false):OnComplete(function ()
|
||||
self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder+50
|
||||
self.owner.RoleLiveGO.transform.parent.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.parent.gameObject:GetComponent("Canvas").sortingOrder+50
|
||||
if self.owner.OnSkillPlay then
|
||||
self.owner:OnSkillPlay(localtype,combat)
|
||||
end
|
||||
|
|
@ -120,6 +121,7 @@ function SkillCaster:OnSkillCast(skill)
|
|||
end
|
||||
|
||||
--LogError("技能位移Id"..combat.Id.."开始时间"..os.date())
|
||||
LogError("技能位移Id"..combat.Id.."开始时间"..self.owner.RoleLiveGO.name)
|
||||
self.owner.RoleLiveGO.transform:DOMove(Vector3.New(t.GameObject.transform.position.x-(self.owner.camp==0 and displaceoffset[1] or(-displaceoffset[1])),t.GameObject.transform.position.y+displaceoffset[2],t.GameObject.transform.position.z), combat.AttackDisplaceTime/1000, false):OnComplete(function ()
|
||||
self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder+50
|
||||
|
||||
|
|
@ -206,10 +208,15 @@ function SkillCaster:OnSkillCast(skill)
|
|||
-- 调用上层接口
|
||||
|
||||
if self.owner.RoleLiveGO and combat.AttackDisplacement ==1 then
|
||||
LogError("技能返回位移Id"..combat.Id.."开始时间"..os.date())
|
||||
LogError("技能返回位移Id"..combat.Id.."开始时间"..os.date().."=="..self.owner.RoleLiveGO.name)
|
||||
self.owner:DelayFunc(combat.AttackDisplaceBackTime/1000+((type(combat.SkillNumbetTime[1][1]) == "userdata" or combat.SkillNumbetTime[1][1]==0) and 0 or combat.SkillNumbetTime[#combat.SkillNumbetTime][2])/1000, function()
|
||||
self.owner.RoleLiveGO.transform:DOMove(startPos, combat.AttackDisplaceTime/1000, false):OnComplete(function ()
|
||||
self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder-50
|
||||
self.owner.RoleLiveGO.transform:DOMove(startPos, combat.AttackDisplaceTime/1000, false):OnComplete(function ()
|
||||
LogError("技能返回位移Id"..combat.Id.."开始时间"..os.date().."=="..self.owner.RoleLiveGO.name)
|
||||
local Canvas = self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas")
|
||||
if Canvas==nil then
|
||||
Canvas = self.owner.RoleLiveGO.transform.parent.parent.gameObject:GetComponent("Canvas")
|
||||
end
|
||||
Canvas.sortingOrder = Canvas.sortingOrder-50
|
||||
self.owner.GameObject:SetActive(true)
|
||||
LogError("技能返回位移Id"..combat.Id.."结束时间"..os.date())
|
||||
--self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder-50
|
||||
|
|
@ -905,7 +912,7 @@ function SkillCaster:CheckSkillHitEffect(checkType, combat, skill)
|
|||
if compnet~=nil then
|
||||
-- compnet.transform.localScale = Vector3.one * 3
|
||||
-- compnet.transform.sizeDelta = Vector2.New(1000, 1000)
|
||||
compnet.AnimationState:SetAnimation(0, "attack", true)
|
||||
compnet.AnimationState:SetAnimation(0, "atk", true)
|
||||
compnet.AnimationState.TimeScale=combat.HitTimeScale/1000
|
||||
end
|
||||
if self:CheckRotate(go2, combat.HitOrientation) then
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@ function WeaponView:OnSkillCastingStart(skill)
|
|||
else
|
||||
self.castingNameNode:SetActive(false)
|
||||
end
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic3, 0, "attack" , false)
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic3, 0, "atk" , false)
|
||||
-- coroutine.wait(1.5)
|
||||
--self.turnEffect:SetActive(false)
|
||||
end)
|
||||
|
|
@ -264,7 +264,7 @@ function WeaponView:OnSkillCastingStart(skill)
|
|||
if self.isMainPlayer then
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "idle" , false)
|
||||
else
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "attack" , false)
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "atk" , false)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ function EightDayGiftPanel:SetSingleReward(item,i)
|
|||
local view = SubUIManager.Open(SubUIConfig.ItemView,icon.transform)
|
||||
ItemViewList[i] = view
|
||||
end
|
||||
ItemViewList[i]:OnOpen(false,EightDayRewardConfig[i].Reward[1],0.6,false)
|
||||
ItemViewList[i]:OnOpen(false,EightDayRewardConfig[i].Reward[1],0.75,false)
|
||||
|
||||
--2\3\8可领取的金框
|
||||
if i == 2 or i == 3 or i == 8 then
|
||||
|
|
|
|||
|
|
@ -188,7 +188,7 @@ function UpperMonthCard:SetRewardInfo()
|
|||
self.itemLst[i].go.gameObject:SetActive(true)
|
||||
self.itemLst[i].name.text = string.format("第%s天",NumToChinese[i])
|
||||
local reward = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LuxuryFundConfig,"Type",self.baseType,"Day",i).reward[1]
|
||||
self.itemLst[i].itemView:OnOpen(false, reward, 1.1, false, false, false, self.sortingOrder)
|
||||
self.itemLst[i].itemView:OnOpen(false, reward, 1, false, false, false, self.sortingOrder)
|
||||
--1 已领取 0 未领
|
||||
-- LogGreen(tostring(mission[i].missionId).." ".."state:"..tostring(mission[i].otherData.State))
|
||||
self.itemLst[i].yiGet.gameObject:SetActive(false)
|
||||
|
|
@ -202,7 +202,7 @@ function UpperMonthCard:SetRewardInfo()
|
|||
end
|
||||
end
|
||||
local v = self.gridRect.sizeDelta
|
||||
v.y = (math.ceil(#self.itemLst/5) * self.itemHeight) + ((math.ceil(#self.itemLst/5)) * 94)
|
||||
v.y = (math.ceil(#self.itemLst/5) * self.itemHeight) + ((math.ceil(#self.itemLst/5)) * 65)
|
||||
self.gridRect.sizeDelta = v
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -308,7 +308,7 @@ function this.SetLive2dAnim(object, ainIndex, delayTime, setData, effectRoot, di
|
|||
local animName = {
|
||||
[1] = "idle",
|
||||
[2] = "hit",
|
||||
[3] = "attack",
|
||||
[3] = "atk",
|
||||
[4] = "touch",
|
||||
}
|
||||
if not delayTime then delayTime = 0 end
|
||||
|
|
|
|||
Loading…
Reference in New Issue