神将合成修改提交
parent
c4938b7bd3
commit
783583404e
File diff suppressed because it is too large
Load Diff
|
@ -593,9 +593,9 @@ RectTransform:
|
|||
m_Father: {fileID: 7086677512586395648}
|
||||
m_RootOrder: 1
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 50, y: -267.96}
|
||||
m_SizeDelta: {x: 151.25, y: 152.42}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222245335330091708
|
||||
|
@ -5512,7 +5512,7 @@ ParticleSystem:
|
|||
--- !u!199 &199793888397422328
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -6139,9 +6139,9 @@ RectTransform:
|
|||
m_Father: {fileID: 7086677512586395648}
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 50, y: -75.625}
|
||||
m_SizeDelta: {x: 151.25, y: 151.25}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222809709876260760
|
||||
|
@ -10978,7 +10978,7 @@ ParticleSystem:
|
|||
--- !u!199 &199786334729933541
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -15897,7 +15897,7 @@ ParticleSystem:
|
|||
--- !u!199 &199812891778826125
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -20791,7 +20791,7 @@ ParticleSystem:
|
|||
--- !u!199 &199314592830468766
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -25719,7 +25719,7 @@ ParticleSystem:
|
|||
--- !u!199 &199738970247411175
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -31357,7 +31357,7 @@ ParticleSystem:
|
|||
--- !u!199 &199312732024159113
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -32196,10 +32196,10 @@ RectTransform:
|
|||
m_Father: {fileID: 8357676685865063738}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 125.3, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 100.75}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 125.3, y: -50}
|
||||
m_SizeDelta: {x: 180, y: 100.75}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222314792653266900
|
||||
CanvasRenderer:
|
||||
|
@ -32936,9 +32936,9 @@ RectTransform:
|
|||
m_Father: {fileID: 8357676685865063738}
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -50}
|
||||
m_SizeDelta: {x: 0, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1697735609296544
|
||||
|
@ -37842,7 +37842,7 @@ ParticleSystem:
|
|||
--- !u!199 &199309040906483979
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -42598,7 +42598,7 @@ ParticleSystem:
|
|||
--- !u!199 &199592651100025897
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -42885,6 +42885,7 @@ RectTransform:
|
|||
- {fileID: 6743409831326071006}
|
||||
- {fileID: 4172850431574215875}
|
||||
- {fileID: 5951933202179215959}
|
||||
- {fileID: 7281189283262575951}
|
||||
m_Father: {fileID: 224306611852066076}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -47752,7 +47753,7 @@ ParticleSystem:
|
|||
--- !u!199 &199310039250832541
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -52508,7 +52509,7 @@ ParticleSystem:
|
|||
--- !u!199 &199031629276305175
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -57645,7 +57646,7 @@ ParticleSystem:
|
|||
--- !u!199 &199224694020007487
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -59430,6 +59431,80 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: 5/5
|
||||
--- !u!1 &328294775252760364
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6472820671852015204}
|
||||
- component: {fileID: 4486101587543401107}
|
||||
- component: {fileID: 7411405180080563023}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6472820671852015204
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 328294775252760364}
|
||||
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: 7281189283262575951}
|
||||
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: 28, y: -24}
|
||||
m_SizeDelta: {x: 250.7, y: 1.83}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4486101587543401107
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 328294775252760364}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7411405180080563023
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 328294775252760364}
|
||||
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: 0, g: 1, b: 0.023529412, 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: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &377429856273959163
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -59466,9 +59541,9 @@ RectTransform:
|
|||
m_Father: {fileID: 7942848174134688160}
|
||||
m_RootOrder: 1
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -75}
|
||||
m_SizeDelta: {x: 0, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7345339821710159408
|
||||
|
@ -61724,6 +61799,85 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1578756471579470695
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6196456797811029977}
|
||||
- component: {fileID: 5213567447429978439}
|
||||
- component: {fileID: 2316449208119459818}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6196456797811029977
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1578756471579470695}
|
||||
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: 7281189283262575951}
|
||||
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: 24.8, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5213567447429978439
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1578756471579470695}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2316449208119459818
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1578756471579470695}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0, g: 1, b: 0.023529412, 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_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 50
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 4
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u524D\u5F80\u5316\u865A\u575B"
|
||||
--- !u!1 &1611431616077111093
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -62022,7 +62176,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 7, y: 483}
|
||||
m_SizeDelta: {x: 0, y: 100}
|
||||
m_SizeDelta: {x: 215.3, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2729942992745642625
|
||||
MonoBehaviour:
|
||||
|
@ -77195,9 +77349,9 @@ RectTransform:
|
|||
m_Father: {fileID: 7086677512586395648}
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 50, y: -477.66998}
|
||||
m_SizeDelta: {x: 151.25, y: 186}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8440567242530909706
|
||||
|
@ -77904,6 +78058,116 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 0
|
||||
--- !u!1 &8672684029435291300
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7281189283262575951}
|
||||
- component: {fileID: 5170435786110081326}
|
||||
- component: {fileID: 4028092732817372673}
|
||||
- component: {fileID: 7131607221167406563}
|
||||
m_Layer: 5
|
||||
m_Name: goCompoundHero
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7281189283262575951
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8672684029435291300}
|
||||
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:
|
||||
- {fileID: 6196456797811029977}
|
||||
- {fileID: 6472820671852015204}
|
||||
m_Father: {fileID: 224325337873657404}
|
||||
m_RootOrder: 9
|
||||
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: 437.19, y: 56.428}
|
||||
m_SizeDelta: {x: 438.29, y: 51.3}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5170435786110081326
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8672684029435291300}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4028092732817372673
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8672684029435291300}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
|
||||
--- !u!114 &7131607221167406563
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8672684029435291300}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 4028092732817372673}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!1 &8707170348898911644
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -78698,9 +78962,9 @@ RectTransform:
|
|||
m_Father: {fileID: 5063085520193273305}
|
||||
m_RootOrder: 1
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 50, y: -60.5}
|
||||
m_SizeDelta: {x: 121, y: 121}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5110366226388002499
|
||||
|
|
|
@ -462,7 +462,7 @@ PanelType = {
|
|||
Guild = {14, 16, 65}, -- 新法宝
|
||||
TimelimitCall={87,16}, --限时召唤
|
||||
QianKunBox={1002,1003,16},--乾坤包囊
|
||||
HeroReplace={14,16,94},--神将置换
|
||||
HeroReplace={14,16,92},--神将置换
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -2288,4 +2288,7 @@
|
|||
[12287] = "确定归元",
|
||||
[12288] = "<color=#6DFA55>%s</color>的法宝会重置为<color=#6DFA55>1</color>,并返还进阶时消耗的金币和陨铁,是否确认归元?\n\n\t\t\t\t\t\t\t归元后获得:",
|
||||
[12289] = "请选择一个需要归元的法宝神将!",
|
||||
[12290] = "前往化虚坛",
|
||||
[12291] = "请选择需要合成的神将",
|
||||
[12292] = "%s星同阵营神将",
|
||||
}
|
||||
|
|
|
@ -704,8 +704,8 @@ function this.GetItemListFromTempBag(drop, isSave)
|
|||
itemdata.frame = GetQuantityImageByquality(itemdata.configData.Quantity)
|
||||
itemdata.icon = GetResourcePath(itemdata.configData.ResourceID)
|
||||
itemdata.num = drop.itemlist[i].itemNum
|
||||
-- LogGreen("itemdata.configData.ItemType "..itemdata.configData.ItemType.." this.dropIsSHowEquipPrint "..tostring(this.dropIsSHowEquipPrint))
|
||||
if itemdata.configData.ItemType ~= ItemType.Equip or itemdata.configData.ItemType ~= ItemType.HunYin then
|
||||
LogGreen("itemdata.configData.ItemType "..itemdata.configData.ItemType.." this.dropIsSHowEquipPrint "..tostring(this.dropIsSHowEquipPrint))
|
||||
if itemdata.configData.ItemType ~= ItemType.Equip and itemdata.configData.ItemType ~= ItemType.HunYin then
|
||||
table.insert(itemDataList, itemdata)
|
||||
elseif this.dropIsSHowEquipPrint then--献祭 升星吞卡 掉落身上装备和魂印 但是不显示 前端做处理
|
||||
table.insert(itemDataList, itemdata)
|
||||
|
|
|
@ -65,7 +65,7 @@ function CompoundHeroFirstUpStarListPanel:OnOpen(heroData,_openThisPanel,_curHer
|
|||
curHeroData = _curHeroData
|
||||
heroDataList = heroData
|
||||
curSelectHeroList = {}
|
||||
curSelectHeroList[_curHeroData.dynamicId] = _curHeroData
|
||||
if _curHeroData.dynamicId then curSelectHeroList[_curHeroData.dynamicId] = _curHeroData end
|
||||
this.HeroSortData(heroDataList)
|
||||
for i, v in pairs(heroDataList) do
|
||||
for n,w in pairs(FormationManager.formationList) do
|
||||
|
@ -84,7 +84,7 @@ function CompoundHeroFirstUpStarListPanel:OnOpen(heroData,_openThisPanel,_curHer
|
|||
end)
|
||||
|
||||
curNeedRoleNum=1
|
||||
local str = _curHeroData.heroConfig.ReadingName
|
||||
local str = _curHeroData.heroConfig and _curHeroData.heroConfig.ReadingName or _curHeroData.ReadingName
|
||||
this.desText.text=string.format(Language[11872],curNeedRoleNum,str)--HeroRankupGroupData.Name)
|
||||
this.numText.text=string.format("%s/%s",LengthOfTable(curSelectHeroList) ,curNeedRoleNum)
|
||||
end
|
||||
|
@ -148,10 +148,13 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
|
|||
choosed:SetActive(true)
|
||||
this.numText.text=string.format("%s/%s",LengthOfTable(curSelectHeroList),curNeedRoleNum)
|
||||
end)
|
||||
|
||||
Util.AddOnceClick(formationMask, function()
|
||||
if heroData.isFormation ~= "" then
|
||||
PopupTipPanel.ShowTip( heroData.isFormation)
|
||||
if #heroData.formationList ~= 0 then
|
||||
local text = ""
|
||||
for index, value in ipairs(heroData.formationList) do
|
||||
text = HeroManager.GetHeroFormationStr(index)
|
||||
end
|
||||
PopupTipPanel.ShowTip(text)
|
||||
return
|
||||
end
|
||||
if heroData.lockState == 1 then
|
||||
|
|
|
@ -163,8 +163,12 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
|
|||
end)
|
||||
|
||||
Util.AddOnceClick(formationMask, function()
|
||||
if heroData.isFormation ~= "" then
|
||||
PopupTipPanel.ShowTip( heroData.isFormation)
|
||||
if #heroData.formationList ~= 0 then
|
||||
local text = ""
|
||||
for index, value in ipairs(heroData.formationList) do
|
||||
text = HeroManager.GetHeroFormationStr(index)
|
||||
end
|
||||
PopupTipPanel.ShowTip(text)
|
||||
return
|
||||
end
|
||||
if heroData.lockState == 1 then
|
||||
|
|
|
@ -31,7 +31,7 @@ function this:InitComponent(gameObject)
|
|||
--up compound Hero info
|
||||
this.compoundHero = Util.GetGameObject(gameObject, "CompoundHeroPanel_Compound/titleGo/compoundHero/Hero")
|
||||
this.compoundHeroTipText = Util.GetGameObject(gameObject, "CompoundHeroPanel_Compound/titleGo/compoundHero/tipText")
|
||||
this.compoundHeroTipText:GetComponent("Text").text = "请选择需要合成的神将"
|
||||
this.compoundHeroTipText:GetComponent("Text").text = Language[12291]
|
||||
this.compoundHerobg=Util.GetGameObject(this.compoundHero,"Bg1"):GetComponent("Image")
|
||||
this.compoundHerolv=Util.GetGameObject(this.compoundHero,"lv/Text"):GetComponent("Text")
|
||||
this.compoundHerohp = Util.GetGameObject(this.compoundHero,"hpProgress/hp"):GetComponent("Image")
|
||||
|
@ -172,9 +172,9 @@ function this.UpdateHeroUpStarData(_curUpStarData)
|
|||
local frame = Util.GetGameObject(go.transform,"frame")
|
||||
local addBtn=Util.GetGameObject(go.transform,"add")
|
||||
local addBtnImage = Util.GetGameObject(go.transform,"add/add")
|
||||
local num = Util.GetGameObject(go.transform,"num")
|
||||
local num = Util.GetGameObject(go.transform,"num")
|
||||
local num = Util.GetGameObject(go.transform,"lv/num")
|
||||
local starGrid = Util.GetGameObject(go.transform, "iconbg/starGrid")
|
||||
Util.GetGameObject(go.transform, "nameText"):GetComponent("Text").text = this.GetNeedHeroName(upStarMaterialsData)
|
||||
proImage:SetActive(false)
|
||||
if upStarMaterialsData.Issame==1 or upStarMaterialsData.IsId>0 then
|
||||
iconDefault:SetActive(false)
|
||||
|
@ -208,7 +208,7 @@ function this.UpdateHeroUpStarData(_curUpStarData)
|
|||
num:GetComponent("Text").text=string.format("<color=#FF0000FF>%s/%s</color>",0,curUpStarData[4])
|
||||
SetHeroStars(starGrid, upStarMaterialsData.StarLimit,1,nil,-15.3)
|
||||
Util.AddOnceClick(addBtn, function()
|
||||
if not curSelectHero then PopupTipPanel.ShowTip("没有本体") return end
|
||||
if not curSelectHero then return end
|
||||
curSelectUpStarData=curUpStarData
|
||||
curSelectUpStarGo=go
|
||||
local curShowHeroListData=this.SetShowHeroListData(upStarConsumeMaterial,_curUpStarData.haveHeroList3[i + 1])
|
||||
|
@ -282,7 +282,7 @@ function this.AutoSelectUpStarHeroList(_curUpStarData)
|
|||
-- curSelectUpStarGo = needHeros[i + 1]
|
||||
for j = 1, LengthOfTable(upStarHeroListData) do
|
||||
if #curSelectHeroList < _curUpStarData.upStarData[i][4] then
|
||||
if upStarHeroListData[j].lockState == 0 and (curSelectHero.heroConfig and upStarHeroListData[j].dynamicId ~= curSelectHero.dynamicId) and upStarHeroListData[i].isFormation == "" then
|
||||
if upStarHeroListData[j] and upStarHeroListData[j].dynamicId and upStarHeroListData[j].lockState == 0 and (curSelectHero.heroConfig and upStarHeroListData[j].dynamicId ~= curSelectHero.dynamicId) and upStarHeroListData[i].isFormation == "" then
|
||||
table.insert(curSelectHeroList,upStarHeroListData[j])
|
||||
end
|
||||
end
|
||||
|
@ -358,11 +358,11 @@ function this.UpdateFirstHeroUpStarData(curHeroCompoundData)
|
|||
local frame = Util.GetGameObject(go.transform,"frame")
|
||||
local addBtn=Util.GetGameObject(go.transform,"add")
|
||||
local addBtnImage = Util.GetGameObject(go.transform,"add/add")
|
||||
local num = Util.GetGameObject(go.transform,"num")
|
||||
local num = Util.GetGameObject(go.transform,"num")
|
||||
local num = Util.GetGameObject(go.transform,"lv/num")
|
||||
local starGrid = Util.GetGameObject(go.transform, "iconbg/starGrid")
|
||||
if curSelectHero or curHeroCompoundData then
|
||||
local heroConfig = curSelectHero and curSelectHero.heroConfig or curHeroCompoundData.config
|
||||
Util.GetGameObject(go.transform, "nameText"):GetComponent("Text").text = heroConfig.ReadingName
|
||||
go:SetActive(true)
|
||||
proImage:SetActive(true)
|
||||
iconDefault:SetActive(false)
|
||||
|
@ -377,7 +377,7 @@ function this.UpdateFirstHeroUpStarData(curHeroCompoundData)
|
|||
num:GetComponent("Text").text=string.format("<color=#FF0000FF>%s/%s</color>",0,1)
|
||||
end
|
||||
Util.AddOnceClick(addBtn, function()
|
||||
if not curSelectHero or not curSelectHero.heroConfig then PopupTipPanel.ShowTip("没有本体") return end
|
||||
if not curSelectHero then return end
|
||||
curSelectUpStarData=nil
|
||||
curSelectUpStarGo=go
|
||||
local curShowHeroListData=this.SetShowHeroListData(upStarConsumeMaterial,curHeroCompoundData.haveHeroList3[1],true)
|
||||
|
@ -465,6 +465,7 @@ function this.Compound()
|
|||
UIManager.OpenPanel(UIName.RoleUpStarSuccessPanel,curSelectHero,upStarRankUpConfig.Id,upStarRankUpConfig.OpenLevel,function ()
|
||||
local dropItemTabs = BagManager.GetTableByBackDropData(msg)
|
||||
if #dropItemTabs > 0 then
|
||||
BagManager.SetDropIsSHowEquipPrint(false)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, msg, 1, function ()
|
||||
this.DeleteUpStarMaterials()
|
||||
end)
|
||||
|
@ -679,4 +680,20 @@ function this.SelectHeroShow(curHeroCompoundData)
|
|||
this.UpdateHeroUpStarData(nil)
|
||||
end
|
||||
end
|
||||
function this.GetNeedHeroName(heroRankUpGroup)
|
||||
if curSelectHero then
|
||||
local curConFig = curSelectHero.heroConfig and curSelectHero.heroConfig or curSelectHero
|
||||
if heroRankUpGroup.Issame == 1 then --需要同名卡
|
||||
return curConFig.ReadingName
|
||||
end
|
||||
if heroRankUpGroup.IsId > 0 then --需要指定id
|
||||
return ConfigManager.GetConfigData(ConfigName.HeroConfig,heroRankUpGroup.IsId).ReadingName
|
||||
end
|
||||
if heroRankUpGroup.IsSameClan == 1 then --需要是否同系
|
||||
return string.format(Language[12292],heroRankUpGroup.StarLimit)
|
||||
end
|
||||
else
|
||||
return ""
|
||||
end
|
||||
end
|
||||
return this
|
|
@ -37,6 +37,7 @@ function this:InitComponent(gameObject)
|
|||
|
||||
this.text = Util.GetGameObject(gameObject, "CompoundHeroPanel_Replace/heros/content/Text")
|
||||
this.cost = Util.GetGameObject(gameObject, "CompoundHeroPanel_Replace/heros/content/cost")
|
||||
this.costText = Util.GetGameObject(this.cost,"Text"):GetComponent("Text")
|
||||
|
||||
end
|
||||
|
||||
|
@ -147,6 +148,8 @@ function this:OnShow(...)
|
|||
end)
|
||||
end
|
||||
this.HeroReplaceBtnClick(tabs[1],curIndex)
|
||||
|
||||
|
||||
end
|
||||
|
||||
--英雄类型按钮点击事件
|
||||
|
@ -234,7 +237,7 @@ function this.SingleHeroDataShow(_go,_heroData)
|
|||
else
|
||||
choosed:SetActive(true)
|
||||
curSelectHero = heroData
|
||||
|
||||
this.ShowCostInfo()
|
||||
this.needHero:SetActive(true)
|
||||
this.replaceHero:SetActive(false)
|
||||
this.needBg:SetActive(false)
|
||||
|
@ -272,7 +275,9 @@ function this.SingleHeroDataShow(_go,_heroData)
|
|||
end
|
||||
|
||||
for i = 1, #heroDatas do
|
||||
heroSelectBtn[i]:SetActive(heroDatas[i].dynamicId == curSelectHero.dynamicId)
|
||||
if heroSelectBtn[i] and heroDatas[i] then
|
||||
heroSelectBtn[i]:SetActive(heroDatas[i].dynamicId == curSelectHero.dynamicId)
|
||||
end
|
||||
end
|
||||
|
||||
end)
|
||||
|
@ -362,6 +367,22 @@ function this.SetBtnSelect(_parObj)
|
|||
this.selectBtn.transform.localPosition=Vector3.zero
|
||||
end
|
||||
|
||||
function this.ShowCostInfo()
|
||||
local replaceItemIdConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,68)
|
||||
local replaceCostConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,69)
|
||||
if replaceItemIdConfig then
|
||||
this.text:GetComponent("Text").text = BagManager.GetItemCountById(tonumber(replaceItemIdConfig.Value))
|
||||
end
|
||||
if curSelectHero and replaceCostConfig then
|
||||
local getCostByStar = string.split(replaceCostConfig.Value,"|")
|
||||
if curSelectHero.star == 4 then
|
||||
this.costText.text = string.split(getCostByStar[1],"#")[2]
|
||||
elseif curSelectHero.star == 5 then
|
||||
this.costText.text = string.split(getCostByStar[2],"#")[2]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function this:OnClose()
|
||||
curSelectHero = {}
|
||||
curSelectHeroConfig = {}
|
||||
|
|
|
@ -2896,7 +2896,13 @@ function this.ByCompoundHeroGetAllHeros()
|
|||
local downSoryHeroList = {}
|
||||
for i, v in pairs(heroDatas) do
|
||||
if v.star == 4 or v.star == 5 or v.star == 3 then--四星 五星 才能加 3星 是狗粮
|
||||
v.isFormation = ""
|
||||
if #v.formationList ~= 0 then
|
||||
local text = ""
|
||||
for index, value in ipairs(v.formationList) do
|
||||
text = HeroManager.GetHeroFormationStr(index)
|
||||
end
|
||||
v.isFormation = text
|
||||
end
|
||||
table.insert(upSortHeroList,v)
|
||||
table.insert(downSoryHeroList,v)
|
||||
end
|
||||
|
|
|
@ -142,6 +142,8 @@ function RoleInfoPanel:InitComponent()
|
|||
this.gold2Image=Util.GetGameObject(this.upStar,"goldGrid/gold2")
|
||||
this.roleUpStarLayoutTip=Util.GetGameObject(this.upStar,"tip"):GetComponent("Text")
|
||||
this.roleUpStarRedPoint=Util.GetGameObject(self.transform,"rolePanel/btnList/btnUpStar/redPoint")
|
||||
this.goCompoundHero=Util.GetGameObject(this.upStar.transform, "goCompoundHero")
|
||||
Util.GetGameObject(this.upStar.transform, "goCompoundHero/Text"):GetComponent("Text").text = Language[12290]
|
||||
--升星属性
|
||||
this.curStarGrid = Util.GetGameObject(this.upStar.transform, "upStarProInfo/curStarGrid")
|
||||
this.nextStarGrid = Util.GetGameObject(this.upStar.transform, "upStarProInfo/nextStarGrid")
|
||||
|
@ -266,6 +268,14 @@ function RoleInfoPanel:BindEvent()
|
|||
--升星
|
||||
Util.AddClick(this.upStarBtn, function()
|
||||
self:StarUpClick()
|
||||
end)
|
||||
--前往化虚坛
|
||||
Util.AddClick(this.goCompoundHero, function()
|
||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.COMPOUND_HERO) then
|
||||
JumpManager.GoJump(740001)
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.COMPOUND_HERO))
|
||||
end
|
||||
end)
|
||||
--回溯
|
||||
-- Util.AddClick(this.upReturn, function()
|
||||
|
@ -686,6 +696,7 @@ function this:UpdateHeroUpStarData(isNeedLoadLive)
|
|||
upStarConsumeMaterial={}
|
||||
upStarMaterialIsAll = {}
|
||||
upStarPreList = {}
|
||||
this.goCompoundHero:SetActive(curHeroData.star == 4 or curHeroData.star == 5)
|
||||
for i = 1, #curUpStarData do
|
||||
local go=newObject(this.upStarPre)
|
||||
go.transform:SetParent(this.upStarGrid.transform)
|
||||
|
|
|
@ -2287,3 +2287,6 @@
|
|||
12287,确定归元
|
||||
12288,<color=#6DFA55>%s</color>的法宝会重置为<color=#6DFA55>1</color>,并返还进阶时消耗的金币和陨铁,是否确认归元?\n\n\t\t\t\t\t\t\t归元后获得:
|
||||
12289,请选择一个需要归元的法宝神将!
|
||||
12290,前往化虚坛
|
||||
12291,请选择需要合成的神将
|
||||
12292,%s星同阵营神将
|
||||
|
|
|
Loading…
Reference in New Issue