【功能】==========白金装备合成提交
parent
e671673389
commit
a3e1782007
|
@ -1296,16 +1296,16 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 173035024844242691}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
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: 1497742951593094833}
|
||||
m_RootOrder: 1
|
||||
m_Father: {fileID: 2248028536939215397}
|
||||
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: -50.144997, y: 82.54}
|
||||
m_AnchoredPosition: {x: -61.864998, y: -5.4950333}
|
||||
m_SizeDelta: {x: 89.01, y: 89.01}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &173035024844242700
|
||||
|
@ -3559,6 +3559,43 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &495103655851905403
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2248028536939215397}
|
||||
m_Layer: 5
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2248028536939215397
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 495103655851905403}
|
||||
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: 173035024844242690}
|
||||
- {fileID: 565897333366907270}
|
||||
m_Father: {fileID: 1330976387068556715}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &628967727135085873
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -9836,7 +9873,7 @@ ParticleSystem:
|
|||
--- !u!199 &1083645269967354099
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -11143,8 +11180,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 173035026013783637}
|
||||
- {fileID: 173035024844242690}
|
||||
- {fileID: 565897333366907270}
|
||||
- {fileID: 1330976387068556715}
|
||||
m_Father: {fileID: 217968288355428412}
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -11475,6 +11511,43 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1644429324222970595
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7273363057484306791}
|
||||
m_Layer: 5
|
||||
m_Name: GameObject1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7273363057484306791
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1644429324222970595}
|
||||
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: 872463944835836816}
|
||||
- {fileID: 242700335765732177}
|
||||
m_Father: {fileID: 1330976387068556715}
|
||||
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_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1677513200730892735
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -20124,7 +20197,7 @@ ParticleSystem:
|
|||
--- !u!199 &8451515492985319499
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -20687,6 +20760,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &3811889045125424190
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 872463944835836816}
|
||||
- component: {fileID: 6289175791214525517}
|
||||
- component: {fileID: 6193056998796952450}
|
||||
m_Layer: 5
|
||||
m_Name: icon
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &872463944835836816
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3811889045125424190}
|
||||
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: 7273363057484306791}
|
||||
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: -61.864998, y: -5.4950333}
|
||||
m_SizeDelta: {x: 89.01, y: 89.01}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6289175791214525517
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3811889045125424190}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6193056998796952450
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3811889045125424190}
|
||||
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: 13359dde0f9d67c4aa047816a4d00962, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &3913772942107928659
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -25348,7 +25495,7 @@ ParticleSystem:
|
|||
--- !u!199 &6598447891554960103
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -27687,12 +27834,12 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1497742951593094833}
|
||||
m_RootOrder: 2
|
||||
m_Father: {fileID: 2248028536939215397}
|
||||
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: 76.8, y: 80.1}
|
||||
m_AnchoredPosition: {x: 65.07997, y: -7.9350357}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8990994826563288777
|
||||
|
@ -28329,6 +28476,68 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5652308418706547558}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &5695635499953840949
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1330976387068556715}
|
||||
- component: {fileID: 8865158975305238656}
|
||||
m_Layer: 5
|
||||
m_Name: costTab
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1330976387068556715
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5695635499953840949}
|
||||
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: 2248028536939215397}
|
||||
- {fileID: 7273363057484306791}
|
||||
m_Father: {fileID: 1497742951593094833}
|
||||
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: 10, y: 85}
|
||||
m_SizeDelta: {x: 515.9, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &8865158975305238656
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5695635499953840949}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 4
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 1
|
||||
m_CellSize: {x: 120, y: 100}
|
||||
m_Spacing: {x: 0, y: 0}
|
||||
m_Constraint: 0
|
||||
m_ConstraintCount: 2
|
||||
--- !u!1 &5726819685649359017
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -34134,7 +34343,7 @@ ParticleSystem:
|
|||
--- !u!199 &5882379970318000206
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -34310,6 +34519,85 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &6703536234690285769
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 242700335765732177}
|
||||
- component: {fileID: 341705511381764572}
|
||||
- component: {fileID: 6191817164430089400}
|
||||
m_Layer: 5
|
||||
m_Name: needGoldText
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &242700335765732177
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6703536234690285769}
|
||||
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: 7273363057484306791}
|
||||
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: 65.07997, y: -7.9350357}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &341705511381764572
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6703536234690285769}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6191817164430089400
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6703536234690285769}
|
||||
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: 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_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 35
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: 500
|
||||
--- !u!1 &6772629145476747391
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -35640,7 +35928,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &217968288355428412
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -1496,6 +1496,7 @@ RectTransform:
|
|||
- {fileID: 4508968544864302910}
|
||||
- {fileID: 1907392365603983225}
|
||||
- {fileID: 2856958353880018865}
|
||||
- {fileID: 5597027167517714480}
|
||||
m_Father: {fileID: 8505417738643154992}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -2189,7 +2190,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: -300.2, y: 0}
|
||||
m_AnchoredPosition: {x: -300.19995, y: 0}
|
||||
m_SizeDelta: {x: 154.03003, y: 355.40002}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!1 &61426804455508623
|
||||
|
@ -2811,7 +2812,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8505417738643154992
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -4554,7 +4555,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: 10, y: 170}
|
||||
m_AnchoredPosition: {x: 178, y: 170}
|
||||
m_SizeDelta: {x: 240.5, y: 64.4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4094702553831684654
|
||||
|
@ -8508,7 +8509,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: 93.19998, y: -831.5}
|
||||
m_AnchoredPosition: {x: 93.19995, y: -831.5}
|
||||
m_SizeDelta: {x: 892, y: 77}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &1955803390550189038
|
||||
|
@ -23831,6 +23832,80 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &4856973404426969706
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7550398729733085449}
|
||||
- component: {fileID: 7939555479090723065}
|
||||
- component: {fileID: 3381036378884148009}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7550398729733085449
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4856973404426969706}
|
||||
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: 5597027167517714480}
|
||||
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: -165, y: 0.0000038147}
|
||||
m_SizeDelta: {x: 94.9, y: 94.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7939555479090723065
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4856973404426969706}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3381036378884148009
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4856973404426969706}
|
||||
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: 0
|
||||
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: 13359dde0f9d67c4aa047816a4d00962, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &4894879778907874288
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -30159,6 +30234,86 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6399081247021929797}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &6405187422553695343
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5597027167517714480}
|
||||
- component: {fileID: 3521754474225237217}
|
||||
- component: {fileID: 3370397228383238316}
|
||||
m_Layer: 5
|
||||
m_Name: Num2
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5597027167517714480
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6405187422553695343}
|
||||
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: 7550398729733085449}
|
||||
m_Father: {fileID: 1127398776}
|
||||
m_RootOrder: 3
|
||||
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: 10, y: 170}
|
||||
m_SizeDelta: {x: 240.5, y: 64.4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3521754474225237217
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6405187422553695343}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3370397228383238316
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6405187422553695343}
|
||||
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: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
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: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: 200000
|
||||
--- !u!1 &6416895969727511378
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -487,6 +487,7 @@ PanelType = {
|
|||
XiuXing = {14,16,1226},--修行
|
||||
QiJie = {14,16,1240},--七界试炼
|
||||
WorldArena = { 107,16,23}, --玉虚论道
|
||||
Compound_equip = { 14, 16,1258 }, --装备合成
|
||||
}
|
||||
|
||||
|
||||
|
@ -557,6 +558,7 @@ UpViewRechargeType = {
|
|||
XunBaoMiZong = 1229, --宝图碎片
|
||||
TaichuZhiQi = 1211,
|
||||
jingwenmiyao = 104, --镜纹密钥
|
||||
godEquipStone= 1258,--神装觉醒石
|
||||
}
|
||||
|
||||
SHOP_PAGE = {
|
||||
|
|
|
@ -140,7 +140,7 @@ function this.SwitchView(index)
|
|||
end
|
||||
--区分显示
|
||||
if index==1 then
|
||||
this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})
|
||||
this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Compound_equip})
|
||||
elseif index==2 then
|
||||
this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})
|
||||
elseif index==3 then
|
||||
|
|
|
@ -23,12 +23,15 @@ local curNeedEquip = {}
|
|||
local curSelectEquip = {}
|
||||
local curSelectGO
|
||||
local materidaIsCan = false
|
||||
local otherMateialIsCan = false
|
||||
local bagPosEquips = {}
|
||||
local needGoldNum = 0
|
||||
local needOtherNum=0
|
||||
local otherId=1258
|
||||
function this:InitComponent(gameObject)
|
||||
this.spLoader = SpriteLoader.New()
|
||||
this.tabBox = Util.GetGameObject(gameObject, "CompoundPanel_Equip/TabBox")
|
||||
this.needGoldText = Util.GetGameObject(gameObject, "CompoundPanel_Equip/compoundBtn/needGoldText"):GetComponent("Text")
|
||||
this.needGoldText = Util.GetGameObject(gameObject, "CompoundPanel_Equip/compoundBtn/costTab/GameObject1/needGoldText"):GetComponent("Text")
|
||||
this.compoundBtn = Util.GetGameObject(gameObject, "CompoundPanel_Equip/compoundBtn")
|
||||
this.autoCompoundBtn = Util.GetGameObject(gameObject, "CompoundPanel_Equip/autoCompoundBtn")
|
||||
this.addBtn = Util.GetGameObject(gameObject, "CompoundPanel_Equip/titleGo/addBtn")
|
||||
|
@ -38,10 +41,10 @@ function this:InitComponent(gameObject)
|
|||
this.needEquip = Util.GetGameObject(gameObject, "CompoundPanel_Equip/titleGo/needEquip")
|
||||
this.compoundEquip = Util.GetGameObject(gameObject, "CompoundPanel_Equip/titleGo/compoundEquip")
|
||||
this.progressImage = Util.GetGameObject(gameObject, "CompoundPanel_Equip/titleGo/progress/Image"):GetComponent("Image")
|
||||
|
||||
--for i = 1, 6 do
|
||||
-- this.tabs[i] = Util.GetGameObject(gameObject, "CompoundPanel_Equip/Tabs/Btn" .. i)
|
||||
--end
|
||||
this.needOtherObg=Util.GetGameObject(gameObject, "CompoundPanel_Equip/compoundBtn/costTab/GameObject")
|
||||
this.needOtherImg=Util.GetGameObject(gameObject, "CompoundPanel_Equip/compoundBtn/costTab/GameObject/icon"):GetComponent("Image")
|
||||
this.needOtherTxt=Util.GetGameObject(gameObject, "CompoundPanel_Equip/compoundBtn/costTab/GameObject/needGoldText"):GetComponent("Text")
|
||||
this.needOtherImg.sprite=this.spLoader:LoadSprite(GetResourcePath(itemConfig[otherId].ResourceID))
|
||||
this.equipPre = Util.GetGameObject(gameObject, "CompoundPanel_Equip/equipPre")
|
||||
this.ScrollBar=Util.GetGameObject(gameObject, "CompoundPanel_Equip/Scrollbar"):GetComponent("Scrollbar")
|
||||
local v2 = Util.GetGameObject(gameObject, "CompoundPanel_Equip/scroll"):GetComponent("RectTransform").rect
|
||||
|
@ -78,10 +81,17 @@ end
|
|||
function this.ShowGoldNum0()
|
||||
if needGoldNum > BagManager.GetItemCountById(14) then
|
||||
materidaIsCan = false
|
||||
this.needGoldText.text = string.format("<color=#FF0011>%s</color>", needGoldNum)
|
||||
this.needGoldText.text = string.format("<color=#FF0011>%s</color>", PrintWanNum(needGoldNum))
|
||||
else
|
||||
materidaIsCan = true
|
||||
this.needGoldText.text =string.format("<color=#FCF5D3FF>%s</color>", needGoldNum)
|
||||
this.needGoldText.text =string.format("<color=#FCF5D3FF>%s</color>", PrintWanNum(needGoldNum))
|
||||
end
|
||||
if needOtherNum>BagManager.GetItemCountById(otherId) then
|
||||
otherMateialIsCan = false
|
||||
this.needOtherTxt.text=string.format("<color=#FF0011>%s</color>", needOtherNum)
|
||||
else
|
||||
otherMateialIsCan =true
|
||||
this.needOtherTxt.text =string.format("<color=#FCF5D3FF>%s</color>", needOtherNum)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -111,12 +121,6 @@ function this.OnClickTabBtn(_curIndex)
|
|||
this.SingleItemDataShow(go, equipDatas[index],equipStarsConfig[equipDatas[index].Star])
|
||||
end)
|
||||
this.ShowTitleData(equipStarsConfig[curSelectEquip.Star])
|
||||
-- this.ScrollView:ForeachItemGO(function(index, go)
|
||||
-- Timer.New(function()
|
||||
-- go.gameObject:SetActive(true)
|
||||
-- PlayUIAnim(go.gameObject)
|
||||
-- end, 0.001 * (index - 1)):Start()
|
||||
-- end)
|
||||
end
|
||||
|
||||
function this.ShowTitleData(curEquipStarsConfig)
|
||||
|
@ -142,10 +146,26 @@ function this.ShowGoldNum(upEquipStarsConfig,compoundNum)
|
|||
needGoldNum = compoundNum * upEquipStarsConfig.RankupResources[1][2]
|
||||
if needGoldNum > BagManager.GetItemCountById(upEquipStarsConfig.RankupResources[1][1]) then
|
||||
materidaIsCan = false
|
||||
this.needGoldText.text = string.format("<color=#FF0011>%s</color>", needGoldNum)
|
||||
this.needGoldText.text = string.format("<color=#FF0011>%s</color>",PrintWanNum(needGoldNum))
|
||||
else
|
||||
materidaIsCan = true
|
||||
this.needGoldText.text =string.format("<color=#FCF5D3FF>%s</color>", needGoldNum)
|
||||
this.needGoldText.text =string.format("<color=#FCF5D3FF>%s</color>",PrintWanNum(needGoldNum))
|
||||
end
|
||||
--如果有额外消耗物品
|
||||
if upEquipStarsConfig.RankupResources[2] then
|
||||
needOtherNum = compoundNum * upEquipStarsConfig.RankupResources[2][2]
|
||||
otherId=upEquipStarsConfig.RankupResources[2][1]
|
||||
if needOtherNum>BagManager.GetItemCountById(otherId) then
|
||||
otherMateialIsCan = false
|
||||
this.needOtherTxt.text=string.format("<color=#FF0011>%s</color>", needOtherNum)
|
||||
else
|
||||
otherMateialIsCan = true
|
||||
this.needOtherTxt.text =string.format("<color=#FCF5D3FF>%s</color>", needOtherNum)
|
||||
end
|
||||
this.needOtherObg:SetActive(true)
|
||||
else
|
||||
this.needOtherObg:SetActive(false)
|
||||
otherMateialIsCan = true
|
||||
end
|
||||
this.numText.text = compoundNum
|
||||
Util.SetGray(this.addBtn,false)
|
||||
|
@ -222,7 +242,7 @@ function this.CompoundNumChange(type)
|
|||
compoundNum = compoundNum - 1
|
||||
end
|
||||
--LogError("compoundNum "..compoundNum)
|
||||
this.ShowGoldNum(equipStarsConfig[curSelectEquip.Star],compoundNum)
|
||||
this.ShowGoldNum(equipStarsConfig[curSelectEquip.Star-1],compoundNum)
|
||||
end
|
||||
function this.Compound()
|
||||
--LogError(" `````````````````` "..curIndex.." "..curSelectEquip.Star.." "..compoundNum)
|
||||
|
@ -234,6 +254,11 @@ function this.Compound()
|
|||
UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = UpViewRechargeType.Gold })
|
||||
return
|
||||
end
|
||||
|
||||
if not otherMateialIsCan then
|
||||
PopupTipPanel.ShowTip(itemConfig[otherId].Name.."不足")
|
||||
return
|
||||
end
|
||||
NetManager.ComplexEquipRequest(curIndex,curSelectEquip.Star,compoundNum,function(msg)
|
||||
SoundManager.PlaySound(SoundConfig.UI_Duanzao)
|
||||
-- SoundManager.PlaySound(SoundConfig.UI_Baoqi)
|
||||
|
@ -247,8 +272,10 @@ function this.AutoCompound(_position)
|
|||
--进度剩余的的装备材料的数量
|
||||
local curPosEquips = EquipManager.GetEquipCompoundDataByEquipPosition1(_position)
|
||||
local bagPosEquips = EquipManager.GetEquipCompoundDataByEquipPosition1(_position)
|
||||
--进度需要的消耗材料的数量
|
||||
--进度需要的消耗金币的数量
|
||||
local shengGoldNum = 0
|
||||
--进度需要消耗其他物品的数量
|
||||
local shengOtherNum = 0
|
||||
--进度剩余的的消耗材料的数量
|
||||
local bagNums = {}
|
||||
|
||||
|
@ -289,7 +316,12 @@ function this.AutoCompound(_position)
|
|||
end
|
||||
for itemId, num in pairs(materialNums) do
|
||||
bagNums[itemId] = bagNums[itemId] - endCompoundNum * num
|
||||
shengGoldNum = shengGoldNum + endCompoundNum * num
|
||||
if itemId==14 then
|
||||
shengGoldNum = shengGoldNum + endCompoundNum * num
|
||||
else
|
||||
shengOtherNum = shengOtherNum + endCompoundNum * num
|
||||
end
|
||||
|
||||
end
|
||||
curPosEquips[i] = curPosEquips[i] - endCompoundNum * equipStarsConfig[i].RankupCount
|
||||
if curPosEquips[i + 1] then
|
||||
|
@ -319,7 +351,7 @@ function this.AutoCompound(_position)
|
|||
return
|
||||
end
|
||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.EquipCompound,
|
||||
shengGoldNum,curRewards,function ()
|
||||
shengGoldNum,shengOtherNum,curRewards,function ()
|
||||
NetManager.ComplexEquipRequest(curIndex,0,0,function(msg)
|
||||
SoundManager.PlaySound(SoundConfig.UI_Duanzao)
|
||||
SoundManager.PlaySound(SoundConfig.UI_Baoqi)
|
||||
|
|
|
@ -16,7 +16,9 @@ function this:InitComponent(gameObject)
|
|||
this.spLoader = SpriteLoader.New()
|
||||
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
|
||||
this.num=Util.GetGameObject(gameObject,"Body/Num"):GetComponent("Text")
|
||||
this.num2=Util.GetGameObject(gameObject,"Body/Num2"):GetComponent("Text")
|
||||
this.numImage=Util.GetGameObject(gameObject,"Body/Num/Image"):GetComponent("Image")
|
||||
this.numImage2=Util.GetGameObject(gameObject,"Body/Num2/Image"):GetComponent("Image")
|
||||
this.cancelBtn=Util.GetGameObject(gameObject,"CancelBtn")
|
||||
this.confirmBtn=Util.GetGameObject(gameObject,"ConfirmBtn")
|
||||
|
||||
|
@ -48,10 +50,12 @@ function this:OnShow(_parent,...)
|
|||
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
|
||||
local args = {...}
|
||||
this.num.text = args[1]
|
||||
fun = args[3]
|
||||
this.num2.text = args[2]
|
||||
fun = args[4]
|
||||
this.titleText.text=Language[11541]
|
||||
this.numImage.sprite = SetIcon(this.spLoader, 14)
|
||||
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,10,1,sortingOrder,false,args[2])
|
||||
this.numImage2.sprite = SetIcon(this.spLoader, 1258)
|
||||
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,10,1,sortingOrder,false,args[3])
|
||||
end
|
||||
|
||||
function this:OnClose()
|
||||
|
|
|
@ -62,6 +62,7 @@ local _ShowPlusType = {
|
|||
UpViewRechargeType.TaichuZhiQi,
|
||||
UpViewRechargeType.XunBaoMiZong,
|
||||
UpViewRechargeType.jingwenmiyao,
|
||||
UpViewRechargeType.godEquipStone,
|
||||
}
|
||||
|
||||
-- 判断是否显示加号
|
||||
|
@ -394,7 +395,8 @@ function UpView:RechargeType(_type)
|
|||
_type == UpViewRechargeType.QiJieCoin or
|
||||
_type == UpViewRechargeType.LunDaoBi or
|
||||
_type == UpViewRechargeType.jingwenmiyao or
|
||||
_type == UpViewRechargeType.TaichuZhiQi then
|
||||
_type == UpViewRechargeType.TaichuZhiQi or
|
||||
_type == UpViewRechargeType.godEquipStone then
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _type)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue