Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
de87e6bb56
|
@ -146,7 +146,7 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
|
@ -5258,7 +5258,7 @@ ParticleSystem:
|
|||
--- !u!199 &7136637659642796895
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -10157,7 +10157,7 @@ ParticleSystem:
|
|||
--- !u!199 &5948455514502789201
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -14869,7 +14869,7 @@ ParticleSystem:
|
|||
--- !u!199 &8147078368002070576
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -19670,7 +19670,7 @@ ParticleSystem:
|
|||
--- !u!199 &5593093079576810994
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -20027,7 +20027,7 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
|
|
|
@ -3633,11 +3633,11 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 1
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 30
|
||||
m_MaxSize: 34
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
|
@ -5791,11 +5791,11 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 1
|
||||
m_MinSize: 26
|
||||
m_MaxSize: 30
|
||||
m_MinSize: 4
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
|
@ -8319,7 +8319,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontSize: 32
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
|
@ -9551,7 +9551,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 718, y: -265.4}
|
||||
m_SizeDelta: {x: 168, y: 58}
|
||||
m_SizeDelta: {x: 200, y: 60}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2925438806915909498
|
||||
CanvasRenderer:
|
||||
|
|
|
@ -4883,7 +4883,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0.000030517578, y: -73.150055}
|
||||
m_AnchoredPosition: {x: 0.000061035156, y: -73.150055}
|
||||
m_SizeDelta: {x: 0, y: 151}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &5729675956691850897
|
||||
|
@ -11492,8 +11492,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -2.0000916, y: -338}
|
||||
m_SizeDelta: {x: 632.8, y: 115.1}
|
||||
m_AnchoredPosition: {x: -2.0000916, y: -358}
|
||||
m_SizeDelta: {x: 632.8, y: 110}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8029727511439798878
|
||||
CanvasRenderer:
|
||||
|
@ -11530,7 +11530,7 @@ MonoBehaviour:
|
|||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 35
|
||||
m_Alignment: 4
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
|
@ -12175,6 +12175,7 @@ RectTransform:
|
|||
- {fileID: 1476705969769019370}
|
||||
- {fileID: 1490723457883463994}
|
||||
- {fileID: 5788485169862634178}
|
||||
- {fileID: 9219691551877081052}
|
||||
- {fileID: 5386223018036512039}
|
||||
- {fileID: 3716822012489561467}
|
||||
m_Father: {fileID: 6546050026599574073}
|
||||
|
@ -17462,6 +17463,86 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u786E \u8BA4"
|
||||
LanguageIndex: 10123
|
||||
--- !u!1 &3194234360027244328
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9219691551877081052}
|
||||
- component: {fileID: 6741188306691445682}
|
||||
- component: {fileID: 1775217852176720052}
|
||||
m_Layer: 5
|
||||
m_Name: tip3
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9219691551877081052
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3194234360027244328}
|
||||
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: 7880990553496357112}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 335.51, y: -285}
|
||||
m_SizeDelta: {x: 299.63, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6741188306691445682
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3194234360027244328}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1775217852176720052
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3194234360027244328}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.27058825, g: 0.58431375, b: 0.23137255, 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: 38
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 1
|
||||
m_MinSize: 26
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u89E3\u9501\u79D8\u5B9D"
|
||||
LanguageIndex: 11706
|
||||
--- !u!1 &3207916625006229119
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -22140,7 +22221,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7880990553496357112}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
@ -22181,14 +22262,14 @@ MonoBehaviour:
|
|||
m_FontStyle: 0
|
||||
m_BestFit: 1
|
||||
m_MinSize: 26
|
||||
m_MaxSize: 300
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u89E3\u9501\u989D\u5916\u4E13\u5C5E\u5956\u52B1"
|
||||
m_Text: "\u989D\u5916\u4E13\u5C5E\u5956\u52B1"
|
||||
LanguageIndex: 11706
|
||||
--- !u!1 &3992426135626145794
|
||||
GameObject:
|
||||
|
@ -36438,18 +36519,18 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 38
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 1
|
||||
m_MinSize: 26
|
||||
m_MaxSize: 38
|
||||
m_MinSize: 4
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6FC0\u6D3B\u53EF\u76F4\u63A5\u9886\u53D6\u5956\u52B1"
|
||||
m_Text: "\u6FC0\u6D3B\u5373\u523B\u9886\u53D6"
|
||||
LanguageIndex: 11705
|
||||
--- !u!1 &7172461940304152595
|
||||
GameObject:
|
||||
|
@ -40213,7 +40294,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 6071250916756540572}
|
||||
m_Father: {fileID: 7880990553496357112}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
@ -46555,7 +46636,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0.000030517578, y: -73.150055}
|
||||
m_AnchoredPosition: {x: 0.000061035156, y: -73.150055}
|
||||
m_SizeDelta: {x: 0, y: 151}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &3467615898781068815
|
||||
|
|
|
@ -362,6 +362,7 @@ GameObject:
|
|||
- component: {fileID: 1662225323140950576}
|
||||
- component: {fileID: 1664449989081959998}
|
||||
- component: {fileID: 1556168925233679058}
|
||||
- component: {fileID: 4764726196237194272}
|
||||
m_Layer: 5
|
||||
m_Name: mask
|
||||
m_TagString: Untagged
|
||||
|
@ -409,7 +410,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 0.4}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 0.78431374}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -425,6 +426,48 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!114 &4764726196237194272
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1443825339087276890}
|
||||
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: 0
|
||||
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: 1556168925233679058}
|
||||
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 &1444024074724095458
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -185,7 +185,7 @@ MonoBehaviour:
|
|||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 0}
|
||||
m_TargetGraphic: {fileID: 470471732384404232}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
@ -1301,8 +1301,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 1093.21, y: 51}
|
||||
m_SizeDelta: {x: 907.52, y: 137.78}
|
||||
m_AnchoredPosition: {x: 1095.4, y: 51.7}
|
||||
m_SizeDelta: {x: 903.1, y: 136.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1124245353996132879
|
||||
CanvasRenderer:
|
||||
|
@ -4105,6 +4105,7 @@ GameObject:
|
|||
- component: {fileID: 3255756753876272268}
|
||||
- component: {fileID: 3253565859519815810}
|
||||
- component: {fileID: 3433770411348223086}
|
||||
- component: {fileID: 5935392281016303681}
|
||||
m_Layer: 5
|
||||
m_Name: mask
|
||||
m_TagString: Untagged
|
||||
|
@ -4152,7 +4153,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 0.4}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 0.78431374}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -4168,6 +4169,48 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!114 &5935392281016303681
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3330081952599844326}
|
||||
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: 0
|
||||
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: 3433770411348223086}
|
||||
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 &3415653861856496758
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -4779,7 +4779,7 @@ ParticleSystem:
|
|||
--- !u!199 &6592683375458268281
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -10129,7 +10129,7 @@ ParticleSystem:
|
|||
--- !u!199 &7701417699251665490
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -14950,7 +14950,7 @@ ParticleSystem:
|
|||
--- !u!199 &5148051361005824703
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -15435,8 +15435,8 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 32
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
|
@ -20424,7 +20424,7 @@ ParticleSystem:
|
|||
--- !u!199 &8174669962452051146
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -25930,7 +25930,7 @@ ParticleSystem:
|
|||
--- !u!199 &5220329669127798686
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -31354,7 +31354,7 @@ ParticleSystem:
|
|||
--- !u!199 &706227594672674341
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
@ -65,18 +65,20 @@ function this:OnShow(_parent,...)
|
|||
rewardData = TreasureOfHeavenManger.GetAllRewardData()
|
||||
this:showRewardTianGong()
|
||||
this.tip.text = Language[12286]
|
||||
this.tip.text = "·获得<color=#45953B>200积分</color>\n·获取<color=#45953B>1980妖晶</color>,激活<color=#45953B>进阶专属奖励</color>\n<size=25> <color=#45953B>妖晶</color>奖励通过<color=#45953B>邮件</color>发送</size>"
|
||||
this.dealBtnIma.gameObject:SetActive(true)
|
||||
this.dealBtnText.gameObject:SetActive(false)
|
||||
elseif curType == 2 then
|
||||
rewardData = QinglongSerectTreasureManager.GetAllRewardData()
|
||||
this:showRewardQinglong()
|
||||
this.tip.text = Language[12287]
|
||||
this.tip.text = "·直升<color=#45953B>15级</color>\n·获取<color=#45953B>1980妖晶</color>,激活<color=#45953B>进阶专属奖励</color>\n<size=25> <color=#45953B>妖晶</color>奖励通过<color=#45953B>邮件</color>发送</size>"
|
||||
this.dealBtnIma.gameObject:SetActive(true)
|
||||
this.dealBtnText.gameObject:SetActive(false)
|
||||
elseif curType == 3 then
|
||||
rewardData,rewardData1 = EndLessMapManager.GetAllRewardData()
|
||||
this:showRewardWuJin(rewardData,rewardData1)
|
||||
this.tip.text = "<color=#60A22C>解锁秘宝,激活进阶</color><color=#95523B>专属奖励+2000积分,<color=#CC4325>可获取1280妖晶</color></color>"
|
||||
-- this.tip.text = "<color=#60A22C>解锁秘宝,激活进阶</color><color=#95523B>专属奖励+2000积分,<color=#CC4325>可获取1280妖晶</color></color>"
|
||||
this.tip.text = "·获得<color=#45953B>2000积分</color>\n·获取<color=#45953B>1980妖晶</color>,激活<color=#45953B>进阶专属奖励</color>\n<size=25> <color=#45953B>妖晶</color>奖励通过<color=#45953B>邮件</color>发送</size>"
|
||||
this.dealBtnIma.gameObject:SetActive(false)
|
||||
this.dealBtnText.gameObject:SetActive(true)
|
||||
local config = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,type[curType].id)
|
||||
|
@ -84,7 +86,8 @@ function this:OnShow(_parent,...)
|
|||
elseif curType == 4 then --七界秘宝
|
||||
rewardData,rewardData1 = GeneralTreasureMangaer.GetAllRewardData()
|
||||
this:SetItem(rewardData,rewardData1)
|
||||
this.tip.text = "<color=#60A22C>解锁秘宝,激活进阶</color><color=#95523B>专属奖励+1500积分,<color=#CC4325>可获取1980妖晶</color></color>"
|
||||
-- this.tip.text = "<color=#60A22C>解锁秘宝,激活进阶</color><color=#95523B>专属奖励+1500积分,<color=#CC4325>可获取1980妖晶</color></color>"
|
||||
this.tip.text = "·获得<color=#45953B>1500积分</color>\n·获取<color=#45953B>1980妖晶</color>,激活<color=#45953B>进阶专属奖励</color>\n<size=25> <color=#45953B>妖晶</color>奖励通过<color=#45953B>邮件</color>发送</size>"
|
||||
this.dealBtnIma.gameObject:SetActive(false)
|
||||
this.dealBtnText.gameObject:SetActive(true)
|
||||
local config = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,type[curType].id)
|
||||
|
|
|
@ -26,6 +26,7 @@ local PropertyName={
|
|||
--初始化组件(用于子类重写)
|
||||
function this:InitComponent()
|
||||
this.spLoader = SpriteLoader.New()
|
||||
this.mask = Util.GetGameObject(self.gameObject, "mask")
|
||||
this.backBtn = Util.GetGameObject(self.gameObject, "bg/btnBack")
|
||||
this.professionGrid = Util.GetGameObject(self.gameObject, "bg/professionGrid")
|
||||
this.curGomgmingLv = Util.GetGameObject(self.gameObject, "bg/propertyAddGrid/curAdd/curGomgmingLv"):GetComponent("Text")
|
||||
|
@ -57,6 +58,9 @@ end
|
|||
|
||||
--绑定事件(用于子类重写)
|
||||
function this:BindEvent()
|
||||
Util.AddClick(this.mask, function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
Util.AddClick(this.backBtn, function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
|
|
|
@ -41,6 +41,7 @@ local barWidth=700
|
|||
--初始化组件(用于子类重写)FourQuadrantPopup
|
||||
function this:InitComponent()
|
||||
this.spLoader = SpriteLoader.New()
|
||||
this.mask = Util.GetGameObject(self.gameObject, "mask")
|
||||
this.backBtn = Util.GetGameObject(self.gameObject, "bg/btnBack")
|
||||
this.titleText = Util.GetGameObject(self.gameObject, "bg/titleText"):GetComponent("Text")
|
||||
this.limitHint = Util.GetGameObject(self.gameObject, "bg/limitHint"):GetComponent("Text")
|
||||
|
@ -92,6 +93,9 @@ function this:BindEvent()
|
|||
Util.AddClick(this.backBtn, function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
Util.AddClick(this.mask, function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
Util.AddClick(this.shuchuBtn, function()
|
||||
local professionId=ProfessionType[1]
|
||||
this.SetSelectBtn(professionId)
|
||||
|
|
Loading…
Reference in New Issue