【飞升】=====代码预设提交
parent
adae4e2134
commit
2f2634eb39
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f83e4f66b22e87349b04f05d7410abf9
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: cbec2d8982ff522499292eb4232d936b
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e271fbe8b5dd96d4cbd887ae92aabcff
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f60141b03b3949143a3fd61c63cc1c93
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -5213,7 +5213,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199793888397422328
|
--- !u!199 &199793888397422328
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -10305,7 +10305,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199786334729933541
|
--- !u!199 &199786334729933541
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -15061,7 +15061,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199812891778826125
|
--- !u!199 &199812891778826125
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -19749,7 +19749,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199314592830468766
|
--- !u!199 &199314592830468766
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -24559,7 +24559,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199738970247411175
|
--- !u!199 &199738970247411175
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -24783,6 +24783,7 @@ RectTransform:
|
||||||
- {fileID: 224426596203719212}
|
- {fileID: 224426596203719212}
|
||||||
- {fileID: 8582805338355612662}
|
- {fileID: 8582805338355612662}
|
||||||
- {fileID: 8221946263362407270}
|
- {fileID: 8221946263362407270}
|
||||||
|
- {fileID: 7432465770644269213}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -29732,7 +29733,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199312732024159113
|
--- !u!199 &199312732024159113
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -34818,7 +34819,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199309040906483979
|
--- !u!199 &199309040906483979
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -39574,7 +39575,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199592651100025897
|
--- !u!199 &199592651100025897
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -44404,7 +44405,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199310039250832541
|
--- !u!199 &199310039250832541
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -49160,7 +49161,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199031629276305175
|
--- !u!199 &199031629276305175
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -53997,7 +53998,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199224694020007487
|
--- !u!199 &199224694020007487
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -60119,3 +60120,446 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1001 &337763193236505275
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 224287801546099592}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 3228300391096871728, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: c_long
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3228300389721697169, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[0]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590349223948}
|
||||||
|
- target: {fileID: 3228300389721697169, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[1]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590349223942}
|
||||||
|
- target: {fileID: 3228300389721697169, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[2]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590349223966}
|
||||||
|
- target: {fileID: 3228300389721697169, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[3]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590349223964}
|
||||||
|
- target: {fileID: 3228300389721697169, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[4]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590349223954}
|
||||||
|
- target: {fileID: 3228300389721697169, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[5]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590349223958}
|
||||||
|
- target: {fileID: 3228300389721697169, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[6]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590349223956}
|
||||||
|
- target: {fileID: 3228300389721697169, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[7]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590349223952}
|
||||||
|
- target: {fileID: 3228300389721697169, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[8]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590349223960}
|
||||||
|
- target: {fileID: 3228300389721697169, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[9]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590349223962}
|
||||||
|
- target: {fileID: 3228300389721697169, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[10]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590349223940}
|
||||||
|
- target: {fileID: 3228300389721697169, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[11]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590349223978}
|
||||||
|
- target: {fileID: 3228300389721697169, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[12]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590349223936}
|
||||||
|
- target: {fileID: 3228300389721697169, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[13]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590349223938}
|
||||||
|
- target: {fileID: 3228300389721697169, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootBone
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590349223948}
|
||||||
|
- target: {fileID: 3228300390111628989, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[0]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590496148768}
|
||||||
|
- target: {fileID: 3228300390111628989, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[1]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590496148778}
|
||||||
|
- target: {fileID: 3228300390111628989, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[2]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590496148786}
|
||||||
|
- target: {fileID: 3228300390111628989, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[3]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590496148784}
|
||||||
|
- target: {fileID: 3228300390111628989, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[4]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590496148798}
|
||||||
|
- target: {fileID: 3228300390111628989, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[5]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590496148794}
|
||||||
|
- target: {fileID: 3228300390111628989, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[6]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590496148792}
|
||||||
|
- target: {fileID: 3228300390111628989, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[7]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590496148796}
|
||||||
|
- target: {fileID: 3228300390111628989, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[8]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590496148788}
|
||||||
|
- target: {fileID: 3228300390111628989, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[9]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590496148790}
|
||||||
|
- target: {fileID: 3228300390111628989, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[10]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590496148776}
|
||||||
|
- target: {fileID: 3228300390111628989, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[11]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590496148742}
|
||||||
|
- target: {fileID: 3228300390111628989, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[12]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590496148780}
|
||||||
|
- target: {fileID: 3228300390111628989, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Bones.Array.data[13]
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590496148782}
|
||||||
|
- target: {fileID: 3228300390111628989, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootBone
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 2910103590496148768}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 15
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_SizeDelta.x
|
||||||
|
value: 100
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_SizeDelta.y
|
||||||
|
value: 100
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMin.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Pivot.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Pivot.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: c6a529a4c47a6fc4589b8da7a192044f, type: 3}
|
||||||
|
--- !u!4 &2910103590496148768 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300390098067355, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590496148782 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300390098067349, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590496148780 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300390098067351, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590496148778 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300390098067345, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590496148776 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300390098067347, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590496148790 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300390098067341, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590496148788 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300390098067343, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590496148786 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300390098067337, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590496148784 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300390098067339, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590496148798 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300390098067333, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590496148796 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300390098067335, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590496148794 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300390098067329, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590496148792 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300390098067331, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590496148742 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300390098067389, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590349223948 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300389716261559, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590349223938 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300389716261561, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590349223936 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300389716261563, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590349223942 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300389716261565, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590349223940 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300389716261567, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590349223962 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300389716261537, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590349223960 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300389716261539, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590349223966 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300389716261541, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590349223964 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300389716261543, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590349223954 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300389716261545, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590349223952 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300389716261547, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590349223958 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300389716261549, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590349223956 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300389716261551, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &2910103590349223978 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3228300389716261521, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!224 &7432465770644269213 stripped
|
||||||
|
RectTransform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 7172710184493525542, guid: c6a529a4c47a6fc4589b8da7a192044f,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 337763193236505275}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
|
@ -736,7 +736,7 @@ MonoBehaviour:
|
||||||
m_Top: 10
|
m_Top: 10
|
||||||
m_Bottom: 20
|
m_Bottom: 20
|
||||||
m_ChildAlignment: 1
|
m_ChildAlignment: 1
|
||||||
m_Spacing: 0
|
m_Spacing: 30
|
||||||
m_ChildForceExpandWidth: 0
|
m_ChildForceExpandWidth: 0
|
||||||
m_ChildForceExpandHeight: 1
|
m_ChildForceExpandHeight: 1
|
||||||
m_ChildControlWidth: 0
|
m_ChildControlWidth: 0
|
||||||
|
|
|
@ -153,6 +153,10 @@ function AddParticleSortLayer(go,layer)
|
||||||
if render then
|
if render then
|
||||||
render.sortingOrder=render.sortingOrder+layer
|
render.sortingOrder=render.sortingOrder+layer
|
||||||
end
|
end
|
||||||
|
local render2=aaa:GetComponent(typeof(UnityEngine.SkinnedMeshRenderer))
|
||||||
|
if render2 then
|
||||||
|
render2.sortingOrder=render.sortingOrder+layer
|
||||||
|
end
|
||||||
local canvas=aaa:GetComponent(typeof(UnityEngine.Canvas))
|
local canvas=aaa:GetComponent(typeof(UnityEngine.Canvas))
|
||||||
if canvas then
|
if canvas then
|
||||||
canvas.sortingOrder=canvas.sortingOrder+layer
|
canvas.sortingOrder=canvas.sortingOrder+layer
|
||||||
|
@ -170,6 +174,10 @@ function SetParticleSortLayer(go,layer)
|
||||||
if render then
|
if render then
|
||||||
render.sortingOrder=layer
|
render.sortingOrder=layer
|
||||||
end
|
end
|
||||||
|
local render2=aaa:GetComponent(typeof(UnityEngine.SkinnedMeshRenderer))
|
||||||
|
if render2 then
|
||||||
|
render2.sortingOrder=layer
|
||||||
|
end
|
||||||
local canvas=aaa:GetComponent(typeof(UnityEngine.Canvas))
|
local canvas=aaa:GetComponent(typeof(UnityEngine.Canvas))
|
||||||
if canvas then
|
if canvas then
|
||||||
canvas.sortingOrder=layer
|
canvas.sortingOrder=layer
|
||||||
|
|
|
@ -9519,15 +9519,11 @@ local passivityList = {
|
||||||
BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange,onRoundChange,nil,nil,role)
|
BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange,onRoundChange,nil,nil,role)
|
||||||
end,
|
end,
|
||||||
--目标存在御甲,追击的普攻对御甲额外造成[a]倍伤害,不存在御甲,追击的普攻额外造成目标[b][c]%的伤害
|
--目标存在御甲,追击的普攻对御甲额外造成[a]倍伤害,不存在御甲,追击的普攻额外造成目标[b][c]%的伤害
|
||||||
--【御甲不足以抵扣a倍伤害 对神将造成血量伤害=([d]属性*[e]-御甲值)/[f]】
|
--a[int],b[int],c[float]
|
||||||
--a[int],b[int],c[float],d[int],e[int],f[int]
|
|
||||||
[383]=function(role, args,id,judge)
|
[383]=function(role, args,id,judge)
|
||||||
local d1 = args[1]
|
local d1 = args[1]
|
||||||
local p1 = args[2]
|
local p1 = args[2]
|
||||||
local v1 = args[3]
|
local v1 = args[3]
|
||||||
local p2 = args[4]
|
|
||||||
local v2 = args[5]
|
|
||||||
local d2 = args[6]
|
|
||||||
local passiveDmg=function(func, defRole, damage, skill, dotType, bCrit,damageType, dotType,isDirect)
|
local passiveDmg=function(func, defRole, damage, skill, dotType, bCrit,damageType, dotType,isDirect)
|
||||||
if not skill then
|
if not skill then
|
||||||
return
|
return
|
||||||
|
@ -9548,7 +9544,7 @@ local passivityList = {
|
||||||
else
|
else
|
||||||
local jia=defRole.bloodShield.bloodValue
|
local jia=defRole.bloodShield.bloodValue
|
||||||
if damage*d1>jia then
|
if damage*d1>jia then
|
||||||
local aaa=(role:GetRoleData(BattlePropList[p2])*v2-jia)/d2
|
local aaa=damage-(jia/d1)+jia-damage
|
||||||
func(-floor(aaa))
|
func(-floor(aaa))
|
||||||
else
|
else
|
||||||
func(-floor(damage*(d1-1)))
|
func(-floor(damage*(d1-1)))
|
||||||
|
|
|
@ -78,7 +78,19 @@ function HandBookRoleInfoLayout:OnShowHeroData(_starType,_star)
|
||||||
|
|
||||||
--天赋
|
--天赋
|
||||||
self.talentBtn:SetActive(heroConFigData.OpenPassiveSkillRules ~= nil)
|
self.talentBtn:SetActive(heroConFigData.OpenPassiveSkillRules ~= nil)
|
||||||
local talentBtnImage = _star == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh"
|
|
||||||
|
local talentBtnImage=""
|
||||||
|
if _star==HeroManager.awakeNextStarIndex then
|
||||||
|
talentBtnImage="r_hero_tianfu2_zh"
|
||||||
|
elseif _star==12 then
|
||||||
|
talentBtnImage="r_tongyong_tianfufeisheng1"
|
||||||
|
elseif _star==13 then
|
||||||
|
talentBtnImage="r_tongyong_tianfufeisheng2"
|
||||||
|
elseif _star==14 then
|
||||||
|
talentBtnImage="r_tongyong_tianfufeisheng3"
|
||||||
|
else
|
||||||
|
talentBtnImage="r_hero_tianfu1_zh"
|
||||||
|
end
|
||||||
self.talentBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(talentBtnImage)
|
self.talentBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(talentBtnImage)
|
||||||
local OpenPassiveSkillRules = _star >= HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules
|
local OpenPassiveSkillRules = _star >= HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules
|
||||||
if OpenPassiveSkillRules then
|
if OpenPassiveSkillRules then
|
||||||
|
@ -145,6 +157,7 @@ end
|
||||||
|
|
||||||
--计算英雄属性 1 初始 2 指定星级 _starNum星级变化
|
--计算英雄属性 1 初始 2 指定星级 _starNum星级变化
|
||||||
function HandBookRoleInfoLayout:CalculateHeroAllProValList(_starType,_starNum)
|
function HandBookRoleInfoLayout:CalculateHeroAllProValList(_starType,_starNum)
|
||||||
|
LogError("startype==".._starType.." strnum==".._starNum)
|
||||||
local allAddProVal = {}
|
local allAddProVal = {}
|
||||||
for i, v in ConfigPairs(propertyConfig) do
|
for i, v in ConfigPairs(propertyConfig) do
|
||||||
allAddProVal[i] = 0
|
allAddProVal[i] = 0
|
||||||
|
@ -170,6 +183,7 @@ function HandBookRoleInfoLayout:CalculateHeroAllProValList(_starType,_starNum)
|
||||||
if breakId==0 then
|
if breakId==0 then
|
||||||
breakId=6
|
breakId=6
|
||||||
end
|
end
|
||||||
|
LogError("breakid=="..breakId.." upstarid=="..upStarId)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -56,6 +56,7 @@ function RoleFlyUpLayout:InitComponent()
|
||||||
this.phyDef_UpStar=Util.GetGameObject(self.gameObject,"upStar/upStarProInfo/pro/phyDef")
|
this.phyDef_UpStar=Util.GetGameObject(self.gameObject,"upStar/upStarProInfo/pro/phyDef")
|
||||||
this.magDef_UpStar=Util.GetGameObject(self.gameObject,"upStar/upStarProInfo/pro/magDef")
|
this.magDef_UpStar=Util.GetGameObject(self.gameObject,"upStar/upStarProInfo/pro/magDef")
|
||||||
this.flyImage=Util.GetGameObject(self.gameObject,"upStar/upStarProInfo/img"):GetComponent("Image")
|
this.flyImage=Util.GetGameObject(self.gameObject,"upStar/upStarProInfo/img"):GetComponent("Image")
|
||||||
|
this.flyTxt=Util.GetGameObject(self.gameObject,"upStar/upStarProInfo/Image/Text"):GetComponent("Text")
|
||||||
this.help=Util.GetGameObject(self.gameObject,"upStar/btns/help")
|
this.help=Util.GetGameObject(self.gameObject,"upStar/btns/help")
|
||||||
|
|
||||||
this.heroSource = Util.GetGameObject(self.gameObject,"upStar/btns/heroSource")
|
this.heroSource = Util.GetGameObject(self.gameObject,"upStar/btns/heroSource")
|
||||||
|
@ -131,17 +132,23 @@ function RoleFlyUpLayout:UpdateHeroUpStarData()
|
||||||
if upStarRankUpConfig and upStarRankUpConfig.Id then
|
if upStarRankUpConfig and upStarRankUpConfig.Id then
|
||||||
this:UpdateHeroUpStarProUpShow()
|
this:UpdateHeroUpStarProUpShow()
|
||||||
end
|
end
|
||||||
|
LogError("curHeroData.upStarId==12=="..curHeroData.star)
|
||||||
local str=""
|
local str=""
|
||||||
if curHeroData.upStarId==12 then
|
local flyStr=""
|
||||||
str="r_hero_tianfu2_zh"
|
if curHeroData.star==11 then
|
||||||
elseif curHeroData.upStarId==13 then
|
str="r_tongyong_tianfufeishengxiao1"
|
||||||
str="r_hero_tianfu2_zh"
|
flyStr="飞升一阶"
|
||||||
elseif curHeroData.upStarId==14 then
|
elseif curHeroData.star==12 then
|
||||||
str="r_hero_tianfu2_zh"
|
str="r_tongyong_tianfufeishengxiao2"
|
||||||
|
flyStr="飞升二阶"
|
||||||
|
elseif curHeroData.star==13 then
|
||||||
|
str="r_tongyong_tianfufeishengxiao3"
|
||||||
|
flyStr="飞升三阶"
|
||||||
else
|
else
|
||||||
str="r_hero_tianfu2_zh"
|
str="r_hero_tianfu2_zh"
|
||||||
end
|
end
|
||||||
this.flyImage.sprite=this.spLoader:LoadSprite(str)
|
this.flyImage.sprite=this.spLoader:LoadSprite(str)
|
||||||
|
this.flyTxt.text=flyStr
|
||||||
local awaken=curHeroData.heroConfig.Awaken
|
local awaken=curHeroData.heroConfig.Awaken
|
||||||
LogError("upstarid=="..curHeroData.upStarId)
|
LogError("upstarid=="..curHeroData.upStarId)
|
||||||
if awaken then
|
if awaken then
|
||||||
|
|
|
@ -117,11 +117,11 @@ function RoleFlyUpSuccessPanel:OnOpen(...)
|
||||||
local upStar=curHeroData.star+1
|
local upStar=curHeroData.star+1
|
||||||
local flyImg=""
|
local flyImg=""
|
||||||
if upStar==12 then
|
if upStar==12 then
|
||||||
flyImg="r_hero_tianfu2_zh"
|
flyImg="r_tongyong_tianfufeishengxiao1"
|
||||||
elseif upStar==13 then
|
elseif upStar==13 then
|
||||||
flyImg="r_hero_tianfu2_zh"
|
flyImg="r_tongyong_tianfufeishengxiao2"
|
||||||
elseif upStar==14 then
|
elseif upStar==14 then
|
||||||
flyImg="r_hero_tianfu2_zh"
|
flyImg="r_tongyong_tianfufeishengxiao3"
|
||||||
end
|
end
|
||||||
this.flyImage.sprite=this.spLoader:LoadSprite(flyImg)
|
this.flyImage.sprite=this.spLoader:LoadSprite(flyImg)
|
||||||
this.heroName.text=GetLanguageStrById(curHeroData.heroConfig.ReadingName)
|
this.heroName.text=GetLanguageStrById(curHeroData.heroConfig.ReadingName)
|
||||||
|
|
|
@ -116,6 +116,7 @@ function RoleInfoPanel:InitComponent()
|
||||||
this.force = Util.GetGameObject(self.transform, "powerBtn/value"):GetComponent("Text")
|
this.force = Util.GetGameObject(self.transform, "powerBtn/value"):GetComponent("Text")
|
||||||
Util.GetGameObject(self.transform, "powerBtn"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-zhanli_zh")
|
Util.GetGameObject(self.transform, "powerBtn"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-zhanli_zh")
|
||||||
this.upLvEffect = Util.GetGameObject(self.transform,"powerBtn/effect")
|
this.upLvEffect = Util.GetGameObject(self.transform,"powerBtn/effect")
|
||||||
|
this.flyUpEffect = Util.GetGameObject(self.transform,"c_long")
|
||||||
this.posBgImage=Util.GetGameObject(self.transform,"powerBtn/Pos"):GetComponent("Image")
|
this.posBgImage=Util.GetGameObject(self.transform,"powerBtn/Pos"):GetComponent("Image")
|
||||||
this.posImage=Util.GetGameObject(self.transform,"powerBtn/Pos/PosImage"):GetComponent("Image")
|
this.posImage=Util.GetGameObject(self.transform,"powerBtn/Pos/PosImage"):GetComponent("Image")
|
||||||
this.posText=Util.GetGameObject(self.transform,"powerBtn/Pos/PosText"):GetComponent("Text")
|
this.posText=Util.GetGameObject(self.transform,"powerBtn/Pos/PosText"):GetComponent("Text")
|
||||||
|
@ -302,6 +303,7 @@ function RoleInfoPanel:OnShow()
|
||||||
|
|
||||||
isClickLeftOrRightBtn = true
|
isClickLeftOrRightBtn = true
|
||||||
this.upLvEffect:SetActive(false)
|
this.upLvEffect:SetActive(false)
|
||||||
|
this.flyUpEffect:SetActive(true)
|
||||||
for i = 1, #heroDatas do
|
for i = 1, #heroDatas do
|
||||||
if curHeroData.dynamicId == heroDatas[i].dynamicId then
|
if curHeroData.dynamicId == heroDatas[i].dynamicId then
|
||||||
index = i
|
index = i
|
||||||
|
@ -558,8 +560,8 @@ function this:UpdateBtnList()
|
||||||
tabsList[k].gameObject:SetActive(false)
|
tabsList[k].gameObject:SetActive(false)
|
||||||
end
|
end
|
||||||
elseif k== RoleInfoPanelIndex.feiSheng then
|
elseif k== RoleInfoPanelIndex.feiSheng then
|
||||||
--and ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.FlyUp)
|
--
|
||||||
if curHeroData.star >=11 and curHeroData.heroConfig.MaxRank>11 and curHeroData.star<14 then
|
if curHeroData.star >=11 and curHeroData.heroConfig.MaxRank>11 and curHeroData.star<14 then --and ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.FlyUp) then
|
||||||
tabsList[k].gameObject:SetActive(true)
|
tabsList[k].gameObject:SetActive(true)
|
||||||
else
|
else
|
||||||
tabsList[k].gameObject:SetActive(false)
|
tabsList[k].gameObject:SetActive(false)
|
||||||
|
@ -641,6 +643,8 @@ end
|
||||||
|
|
||||||
function this:OnSortingOrderChange()
|
function this:OnSortingOrderChange()
|
||||||
Util.AddParticleSortLayer(this.upLvEffect, this.sortingOrder - orginLayer)
|
Util.AddParticleSortLayer(this.upLvEffect, this.sortingOrder - orginLayer)
|
||||||
|
|
||||||
|
AddParticleSortLayer(this.flyUpEffect, this.sortingOrder - orginLayer)
|
||||||
orginLayer = this.sortingOrder
|
orginLayer = this.sortingOrder
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -770,11 +774,11 @@ function this:UpdateHeroInfoData()
|
||||||
if curHeroData.star==HeroManager.awakeNextStarIndex then
|
if curHeroData.star==HeroManager.awakeNextStarIndex then
|
||||||
talentBtnImage="r_hero_tianfu2_zh"
|
talentBtnImage="r_hero_tianfu2_zh"
|
||||||
elseif curHeroData.star==12 then
|
elseif curHeroData.star==12 then
|
||||||
talentBtnImage="r_hero_tianfu2_zh"
|
talentBtnImage="r_tongyong_tianfufeisheng1"
|
||||||
elseif curHeroData.star==13 then
|
elseif curHeroData.star==13 then
|
||||||
talentBtnImage="r_hero_tianfu2_zh"
|
talentBtnImage="r_tongyong_tianfufeisheng2"
|
||||||
elseif curHeroData.star==14 then
|
elseif curHeroData.star==14 then
|
||||||
talentBtnImage="r_hero_tianfu2_zh"
|
talentBtnImage="r_tongyong_tianfufeisheng3"
|
||||||
else
|
else
|
||||||
talentBtnImage="r_hero_tianfu1_zh"
|
talentBtnImage="r_hero_tianfu1_zh"
|
||||||
end
|
end
|
||||||
|
|
|
@ -85,6 +85,7 @@ function RoleTalentPopup:GetTalentDataShow()
|
||||||
if curUpStarId>11 then
|
if curUpStarId>11 then
|
||||||
|
|
||||||
--self.grid.sizeDelta=Vector2.New(969,1000)
|
--self.grid.sizeDelta=Vector2.New(969,1000)
|
||||||
|
kongStr=" "
|
||||||
if curUpStarId==25 then
|
if curUpStarId==25 then
|
||||||
titleStr="飞升一阶激活:\n"
|
titleStr="飞升一阶激活:\n"
|
||||||
elseif curUpStarId==26 then
|
elseif curUpStarId==26 then
|
||||||
|
@ -162,18 +163,21 @@ function RoleTalentPopup:GetTalentDataShow()
|
||||||
end
|
end
|
||||||
go.gameObject:SetActive(false)
|
go.gameObject:SetActive(false)
|
||||||
end
|
end
|
||||||
|
LogError("lem=="..#upStarSkillDataList2)
|
||||||
for i = 1, #upStarSkillDataList2 do
|
for i = 1, #upStarSkillDataList2 do
|
||||||
local go = self.upStarSkillGoList[i]
|
local go = self.upStarSkillGoList[i]
|
||||||
go.gameObject:SetActive(true)
|
go.gameObject:SetActive(true)
|
||||||
|
local flyImg= Util.GetGameObject(go, "flyImg")
|
||||||
local kongStr = ""
|
local kongStr = ""
|
||||||
if passiveSkillLogicConfig[upStarSkillDataList2[i].passiveSkillId].Judge == 1 then
|
if passiveSkillLogicConfig[upStarSkillDataList2[i].passiveSkillId].Judge == 1 then
|
||||||
kongStr = Language[11835]
|
kongStr = Language[11835]
|
||||||
|
end
|
||||||
|
if i>5 then
|
||||||
|
kongStr = " "
|
||||||
|
flyImg.gameObject:SetActive(true)
|
||||||
else
|
else
|
||||||
if i>11 then
|
kongStr =""
|
||||||
kongStr = "飞升"
|
flyImg.gameObject:SetActive(false)
|
||||||
else
|
|
||||||
kongStr =""
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
-- Util.GetGameObject(go.transform, "Image"):SetActive(passiveSkillLogicConfig[upStarSkillDataList2[i].passiveSkillId].Judge == 1)
|
-- Util.GetGameObject(go.transform, "Image"):SetActive(passiveSkillLogicConfig[upStarSkillDataList2[i].passiveSkillId].Judge == 1)
|
||||||
-- Util.GetGameObject(go.transform, "Image"):SetActive(false)
|
-- Util.GetGameObject(go.transform, "Image"):SetActive(false)
|
||||||
|
|
Loading…
Reference in New Issue