Merge branch 'onepiece_demo' into TCX_LongZhu
commit
8be0c3672d
|
@ -108,7 +108,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: -8, y: 400}
|
||||
m_AnchoredPosition: {x: 4, y: 362}
|
||||
m_SizeDelta: {x: 311, y: 309}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &833224204
|
||||
|
@ -330,8 +330,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: 2.51, y: 394.05}
|
||||
m_SizeDelta: {x: 1082.77, y: 904.91}
|
||||
m_AnchoredPosition: {x: 2.51, y: 475.3}
|
||||
m_SizeDelta: {x: 1082.8, y: 1067.4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1026965358347488299
|
||||
CanvasRenderer:
|
||||
|
@ -30462,7 +30462,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: 0, y: 418}
|
||||
m_AnchoredPosition: {x: 3, y: 421}
|
||||
m_SizeDelta: {x: 150, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6698283452277567238
|
||||
|
@ -30860,8 +30860,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: -1.2248535, y: 20.299805}
|
||||
m_SizeDelta: {x: 10.25, y: -227}
|
||||
m_AnchoredPosition: {x: -1.2248535, y: 66.89995}
|
||||
m_SizeDelta: {x: 10.3, y: -133.8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4507142556566682274
|
||||
CanvasRenderer:
|
||||
|
@ -35940,8 +35940,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 1.7907715, y: 53.69995}
|
||||
m_SizeDelta: {x: 1069.7, y: 173.3}
|
||||
m_AnchoredPosition: {x: -0.00012207031, y: -50.1}
|
||||
m_SizeDelta: {x: 0.00036621, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4746018904163205472
|
||||
CanvasRenderer:
|
||||
|
@ -42021,10 +42021,10 @@ RectTransform:
|
|||
m_Father: {fileID: 3756806480519388516}
|
||||
m_RootOrder: 2
|
||||
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: 3.125, y: -826.7}
|
||||
m_SizeDelta: {x: 1084, y: 306.7}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -0.00024414062, y: 17}
|
||||
m_SizeDelta: {x: -0.00054932, y: 300}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2332249307189341976
|
||||
CanvasRenderer:
|
||||
|
|
|
@ -406,8 +406,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: 0, y: 616.3}
|
||||
m_SizeDelta: {x: 1000, y: 424.75}
|
||||
m_AnchoredPosition: {x: 0, y: 608.5}
|
||||
m_SizeDelta: {x: 1000, y: 416.9}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &2080008711610104528
|
||||
CanvasRenderer:
|
||||
|
@ -705,9 +705,9 @@ RectTransform:
|
|||
m_Father: {fileID: 4072935318317542415}
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -253, y: 777}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -253, y: -1153}
|
||||
m_SizeDelta: {x: 258, y: 85}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9203457012568939700
|
||||
|
@ -6196,9 +6196,9 @@ RectTransform:
|
|||
m_Father: {fileID: 4072935318317542415}
|
||||
m_RootOrder: 24
|
||||
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: 0, y: 670}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -1255}
|
||||
m_SizeDelta: {x: 800, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7824437057902464144
|
||||
|
@ -6354,10 +6354,10 @@ RectTransform:
|
|||
m_Father: {fileID: 2155765969751685322}
|
||||
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: 0, y: 311.3}
|
||||
m_SizeDelta: {x: 929.7, y: 839.1}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 1.3999023, y: -593.6001}
|
||||
m_SizeDelta: {x: 15.6, y: 1008.4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6646934886774772053
|
||||
CanvasRenderer:
|
||||
|
@ -6701,9 +6701,9 @@ RectTransform:
|
|||
m_Father: {fileID: 4072935318317542415}
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 272, y: 773}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 272, y: -1149}
|
||||
m_SizeDelta: {x: 263.9, y: 88}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8681661694272815419
|
||||
|
@ -38230,10 +38230,10 @@ RectTransform:
|
|||
m_Father: {fileID: 2155765969751685322}
|
||||
m_RootOrder: 3
|
||||
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: -231, y: 769.9}
|
||||
m_SizeDelta: {x: 618.69995, y: 128.19995}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: -405.83, y: -1147}
|
||||
m_SizeDelta: {x: 811.65, y: 128.2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5101248089985389127
|
||||
CanvasRenderer:
|
||||
|
@ -44245,9 +44245,9 @@ RectTransform:
|
|||
m_Father: {fileID: 4072935318317542415}
|
||||
m_RootOrder: 23
|
||||
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: 1, y: 629.6}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 1, y: -1308}
|
||||
m_SizeDelta: {x: 1080, y: 5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1971781535669546148
|
||||
|
|
|
@ -49523,10 +49523,10 @@ RectTransform:
|
|||
m_Father: {fileID: 224688690836167678}
|
||||
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: 17.3}
|
||||
m_SizeDelta: {x: 1080, y: 2334.6}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 3.4680176, y: 0}
|
||||
m_SizeDelta: {x: 6.936, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222210643621885542
|
||||
CanvasRenderer:
|
||||
|
@ -49596,6 +49596,7 @@ RectTransform:
|
|||
- {fileID: 224910525349788610}
|
||||
- {fileID: 224937005449219178}
|
||||
- {fileID: 224582139656678132}
|
||||
- {fileID: 5559236973367770373}
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -54875,10 +54876,10 @@ RectTransform:
|
|||
m_Father: {fileID: 224688690836167678}
|
||||
m_RootOrder: 1
|
||||
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: -0.000014404, y: 137.2}
|
||||
m_SizeDelta: {x: 1080, y: 281.1}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 147}
|
||||
m_SizeDelta: {x: 0, y: 294}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222839184784845028
|
||||
CanvasRenderer:
|
||||
|
@ -77340,8 +77341,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: 415.8}
|
||||
m_SizeDelta: {x: 0, y: -1020.2}
|
||||
m_AnchoredPosition: {x: 0, y: 462.93}
|
||||
m_SizeDelta: {x: 0, y: -925.85}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3090640870368794596
|
||||
CanvasRenderer:
|
||||
|
@ -97915,7 +97916,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: 166, y: -160}
|
||||
m_AnchoredPosition: {x: 151, y: -152}
|
||||
m_SizeDelta: {x: 305.5, y: 131.3}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7798329101788675826
|
||||
|
@ -135199,7 +135200,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: -837.1, y: 82}
|
||||
m_AnchoredPosition: {x: -837.1002, y: 82}
|
||||
m_SizeDelta: {x: 0, y: 164}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &1757188509791595279
|
||||
|
@ -281581,6 +281582,80 @@ MonoBehaviour:
|
|||
m_LineSpacing: 0.7
|
||||
m_Text: "\u6218\u9774"
|
||||
LanguageIndex: 11545
|
||||
--- !u!1 &7343670388826790658
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5559236973367770373}
|
||||
- component: {fileID: 1235222968814823123}
|
||||
- component: {fileID: 2071841518451362794}
|
||||
m_Layer: 5
|
||||
m_Name: Image (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5559236973367770373
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7343670388826790658}
|
||||
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: 224688690836167678}
|
||||
m_RootOrder: 3
|
||||
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: -50}
|
||||
m_SizeDelta: {x: 0, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1235222968814823123
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7343670388826790658}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2071841518451362794
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7343670388826790658}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 420d1d17a3d5ced4cb07001dd98f9852, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &7348339223175834790
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -337602,87 +337677,9 @@ PrefabInstance:
|
|||
objectReference: {fileID: 8944061103535072730}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 4c8639a41d5af934d933d50f22d40218, type: 3}
|
||||
--- !u!4 &8944061103535072710 stripped
|
||||
--- !u!4 &9048018877149632055 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907933, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072708 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907935, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632045 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377590, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072714 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907921, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072712 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907923, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072718 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907925, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072722 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907913, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632047 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377588, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072720 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907915, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632041 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377586, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072726 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907917, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632043 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377584, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632037 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377598, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632039 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377596, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377580, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -337704,27 +337701,9 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632051 stripped
|
||||
--- !u!4 &9048018877149632037 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377576, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632049 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377578, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072724 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907919, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072730 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907905, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377598, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -337734,21 +337713,21 @@ RectTransform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072716 stripped
|
||||
--- !u!4 &8944061103535072730 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907927, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907905, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072704 stripped
|
||||
--- !u!4 &8944061103535072724 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907931, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907919, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632055 stripped
|
||||
--- !u!4 &9048018877149632053 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377580, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377582, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -337770,9 +337749,105 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632053 stripped
|
||||
--- !u!4 &8944061103535072704 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377582, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907931, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072710 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907933, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072726 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907917, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632043 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377584, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632041 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377586, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632039 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377596, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072720 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907915, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072708 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907935, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072714 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907921, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072712 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907923, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072718 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907925, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072716 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907927, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8944061103535072722 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1271572593135907913, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632045 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377590, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632051 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377576, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632049 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377578, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9048018877149632047 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1165092669499377588, guid: 4c8639a41d5af934d933d50f22d40218,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7906694384947843483}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
@ -4240,8 +4240,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: 0}
|
||||
m_SizeDelta: {x: 127, y: 135}
|
||||
m_AnchoredPosition: {x: 6, y: 7}
|
||||
m_SizeDelta: {x: 190, y: 180}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5669662170968483784
|
||||
CanvasRenderer:
|
||||
|
@ -6499,7 +6499,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: 2.5, y: -46}
|
||||
m_AnchoredPosition: {x: 4, y: -46}
|
||||
m_SizeDelta: {x: 160, y: 60}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3515399070798666638
|
||||
|
@ -8019,16 +8019,6 @@ PrefabInstance:
|
|||
propertyPath: tweenSequeue.Array.data[2].targetObj
|
||||
value:
|
||||
objectReference: {fileID: 3396417041430177420}
|
||||
- target: {fileID: 8422961301032672449, guid: 5499cdbed3f400441b21a8becb5b5e84,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 0.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8422961301032672449, guid: 5499cdbed3f400441b21a8becb5b5e84,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 0.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8422961301032672449, guid: 5499cdbed3f400441b21a8becb5b5e84,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
|
@ -8059,16 +8049,6 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -24.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8422961301032672449, guid: 5499cdbed3f400441b21a8becb5b5e84,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 102
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8422961301032672449, guid: 5499cdbed3f400441b21a8becb5b5e84,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 83
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3290621036918302228, guid: 5499cdbed3f400441b21a8becb5b5e84,
|
||||
type: 3}
|
||||
propertyPath: m_TargetGraphic
|
||||
|
|
|
@ -79,10 +79,10 @@ function this:OnOpen(heroTId, skinId, damageValue, allDamage, func,_func2)
|
|||
SetHEeroLiveToward(this.liveNode,toward)
|
||||
local SkeletonGraphic = this.liveNode:GetComponent("SkeletonGraphic")
|
||||
local idle = function()
|
||||
SkeletonGraphic.AnimationState:SetAnimation(0, heroTId==10016 and "animation" or"idle", true)
|
||||
SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
|
||||
end
|
||||
|
||||
SkeletonGraphic.AnimationState:SetAnimation(0, heroTId==10016 and "animation" or"idle", true)
|
||||
SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
|
||||
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle
|
||||
poolManager:SetLiveClearCall(this.liveName, this.liveNode, function()
|
||||
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete - idle
|
||||
|
|
Loading…
Reference in New Issue