Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2022-03-02 13:43:36 +08:00
commit 74b385e4a1
10 changed files with 678 additions and 28 deletions

View File

@ -1175,6 +1175,86 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!1 &2513452287476722024
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8410525750991352182}
- component: {fileID: 4381674129411887551}
- component: {fileID: 6959371288816909557}
m_Layer: 0
m_Name: num
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8410525750991352182
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2513452287476722024}
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: 3494299099718931292}
m_RootOrder: 5
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: 374, y: -5}
m_SizeDelta: {x: 65.045, y: 40.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4381674129411887551
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2513452287476722024}
m_CullTransparentMesh: 0
--- !u!114 &6959371288816909557
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2513452287476722024}
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.5568628, g: 0.34509805, b: 0.007843138, 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: 3
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "10\u4E07"
LanguageIndex: 0
--- !u!1 &2588435604671984359
GameObject:
m_ObjectHideFlags: 0
@ -1362,7 +1442,7 @@ RectTransform:
- {fileID: 2141245032203355400}
- {fileID: 6645418896731573800}
m_Father: {fileID: 3494299099718931292}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1968,6 +2048,80 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_textSpacing: -35.71
--- !u!1 &4421647392477402947
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3484322744488117743}
- component: {fileID: 1713355051177663779}
- component: {fileID: 4162647219030893437}
m_Layer: 0
m_Name: line1 (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3484322744488117743
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4421647392477402947}
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: 3494299099718931292}
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: 280, y: 0}
m_SizeDelta: {x: 2, y: 130}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1713355051177663779
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4421647392477402947}
m_CullTransparentMesh: 0
--- !u!114 &4162647219030893437
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4421647392477402947}
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: a3b7ee2a75a2bfc47bf4534293029e8e, 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 &4612458422254679486
GameObject:
m_ObjectHideFlags: 0
@ -2429,7 +2583,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 69.44, y: 50}
m_AnchoredPosition: {x: 20, y: 50}
m_SizeDelta: {x: 941.13, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4640554905699171782
@ -3273,7 +3427,9 @@ RectTransform:
- {fileID: 3979927985244373730}
- {fileID: 6399695341577499029}
- {fileID: 4443834661574304576}
- {fileID: 3484322744488117743}
- {fileID: 9217716073908009951}
- {fileID: 8410525750991352182}
- {fileID: 2786481321683172066}
m_Father: {fileID: 1700717659683241118}
m_RootOrder: 5
@ -3652,11 +3808,11 @@ RectTransform:
m_Children:
- {fileID: 3397336181230354578}
m_Father: {fileID: 3494299099718931292}
m_RootOrder: 4
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}
m_AnchoredPosition: {x: 417, y: 27}
m_AnchoredPosition: {x: 340.7, y: 33}
m_SizeDelta: {x: 186, y: 86}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5006147964805573017
@ -3729,7 +3885,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: 61, y: -10}
m_AnchoredPosition: {x: 0, y: -10}
m_SizeDelta: {x: 450, y: 106.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3243220325870193425
@ -3750,7 +3906,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_Spacing: -10
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -3943,7 +4099,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: 173, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8825782786179138557
@ -3981,7 +4137,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1

View File

@ -1185,7 +1185,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8830212790296371356}
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}
@ -1729,6 +1729,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1492014920698701228
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5847209506620974032}
- component: {fileID: 3492235523638776659}
- component: {fileID: 4040328044963099778}
m_Layer: 5
m_Name: SortNum (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &5847209506620974032
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1492014920698701228}
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: 2768369360284364994}
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: -4.5, y: -5.4000244}
m_SizeDelta: {x: 88.77, y: 92.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3492235523638776659
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1492014920698701228}
m_CullTransparentMesh: 0
--- !u!114 &4040328044963099778
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1492014920698701228}
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: f5ba695b044676047802f7b7fa302002, 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 &1508250640729403881
GameObject:
m_ObjectHideFlags: 0
@ -2154,7 +2228,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8830212790296371356}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -3196,6 +3270,54 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 100
--- !u!1 &2449681994483706353
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2768369360284364994}
- component: {fileID: 6869033483054845749}
m_Layer: 5
m_Name: SortNum
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2768369360284364994
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2449681994483706353}
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: 114392394623845990}
- {fileID: 5847209506620974032}
- {fileID: 5682711187862867978}
- {fileID: 4606918705282375362}
m_Father: {fileID: 8830212790296371356}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -202, y: 227}
m_SizeDelta: {x: 104, y: 108}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6869033483054845749
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2449681994483706353}
m_CullTransparentMesh: 0
--- !u!1 &2541852913773742530
GameObject:
m_ObjectHideFlags: 0
@ -3617,6 +3739,81 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2884270579039231070
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4606918705282375362}
- component: {fileID: 8505672038382819732}
- component: {fileID: 2372996110901730034}
m_Layer: 5
m_Name: SortNum (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &4606918705282375362
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2884270579039231070}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.2, y: 1.2, z: 1}
m_Children:
- {fileID: 5318039779527738113}
m_Father: {fileID: 2768369360284364994}
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: -4.5, y: -5.0000243}
m_SizeDelta: {x: 96, y: 98}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8505672038382819732
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2884270579039231070}
m_CullTransparentMesh: 0
--- !u!114 &2372996110901730034
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2884270579039231070}
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: be396ad540240e7448f96fdf1875ffa0, 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 &2947308749935651746
GameObject:
m_ObjectHideFlags: 0
@ -3651,7 +3848,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: -19.56, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 88.77, y: 92.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6567650090774944819
@ -5074,7 +5271,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8830212790296371356}
m_RootOrder: 2
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}
@ -5608,6 +5805,85 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4953676118473081941
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5318039779527738113}
- component: {fileID: 7771262062745812654}
- component: {fileID: 3479453589364174937}
m_Layer: 5
m_Name: TitleText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5318039779527738113
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4953676118473081941}
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: 4606918705282375362}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 6.1}
m_SizeDelta: {x: 242.11, y: 39.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7771262062745812654
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4953676118473081941}
m_CullTransparentMesh: 0
--- !u!114 &3479453589364174937
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4953676118473081941}
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.70980394, g: 0.6156863, b: 0.46666667, 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: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 5
--- !u!1 &4981964135313688951
GameObject:
m_ObjectHideFlags: 0
@ -6642,6 +6918,80 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u699C\u5355\u4E3A\u7A7A"
LanguageIndex: 0
--- !u!1 &5741684345859586576
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5682711187862867978}
- component: {fileID: 3088044543745031767}
- component: {fileID: 7396974660667075997}
m_Layer: 5
m_Name: SortNum (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &5682711187862867978
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5741684345859586576}
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: 2768369360284364994}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -4.5, y: -5.4000244}
m_SizeDelta: {x: 88.77, y: 92.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3088044543745031767
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5741684345859586576}
m_CullTransparentMesh: 0
--- !u!114 &7396974660667075997
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5741684345859586576}
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: 0e991e88b403b29409e591653827134c, 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 &5847635040583623828
GameObject:
m_ObjectHideFlags: 0
@ -7107,6 +7457,7 @@ RectTransform:
m_Children:
- {fileID: 2063961932793240932}
- {fileID: 618109845203557499}
- {fileID: 2768369360284364994}
- {fileID: 8877777530771163856}
- {fileID: 3128544740893925850}
- {fileID: 2141559868187526545}
@ -7128,6 +7479,80 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6475515671209916733}
m_CullTransparentMesh: 0
--- !u!1 &6656657935750090097
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 114392394623845990}
- component: {fileID: 802677998648736691}
- component: {fileID: 2334064092601015345}
m_Layer: 5
m_Name: SortNum (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &114392394623845990
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6656657935750090097}
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: 2768369360284364994}
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: -4.5, y: -5.4}
m_SizeDelta: {x: 88.77, y: 92.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &802677998648736691
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6656657935750090097}
m_CullTransparentMesh: 0
--- !u!114 &2334064092601015345
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6656657935750090097}
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: c3dd9610bb7d50b47bc158a0e12c6839, 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 &6668652242499862181
GameObject:
m_ObjectHideFlags: 0
@ -7882,7 +8307,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &618109845203557499
RectTransform:
m_ObjectHideFlags: 0
@ -8185,7 +8610,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: -19.56, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 88.77, y: 92.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6391847137419503985
@ -8259,7 +8684,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: -19.56, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 88.77, y: 92.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7408164104149730898
@ -8334,7 +8759,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: -21.2, y: 0.4}
m_AnchoredPosition: {x: 0, y: 0.4}
m_SizeDelta: {x: 96, y: 98}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &610554642510868398
@ -8651,7 +9076,7 @@ RectTransform:
m_Children:
- {fileID: 3781080258569070105}
m_Father: {fileID: 8830212790296371356}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -9180,7 +9605,7 @@ RectTransform:
- {fileID: 5896565808654764326}
- {fileID: 877776905871896781}
m_Father: {fileID: 8830212790296371356}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}

View File

@ -138,10 +138,10 @@ function this.InitActivityServerData(msg, isUpdate)
if GlobalActivity[v.activityId] then
this.CheckMoneyProgress(v)
this.mission[v.activityId] = v
LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
if v.endTime and v.endTime > 0 then
LogYellow(" 结束日期:"..TimeStampToDateStr4(v.endTime))
end
-- LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
-- if v.endTime and v.endTime > 0 then
-- LogYellow(" 结束日期:"..TimeStampToDateStr4(v.endTime))
-- end
for n, m in ipairs(v.mission) do
-- LogGreen(" 刷新活动数据missionId" .. m.missionId .. " state" .. m.state .. " progress" .. m.progress)
if (v.activityId == ActivityTypeDef.OnlineGift) then

View File

@ -10908,6 +10908,57 @@ local passivityList = {
end
role.Event:AddEvent(BattleEventName.PassiveChangeDefDMGReFac,addDMGFac,nil,nil,role)
end,
-- 攻击时若目标[a]类型[b]效果,则当次攻击自身暴击[c]改变[d]%
-- a[int],b[int],c[改变类型],d[float]
[425] = function(role, args,id,judge)
local dot = args[1]
local pro = args[2]
local ct = args[3]
local f1 = args[4]
local function onRoleDamageBefore(critFunc,atkRole,defRole,skill)
if atkRole~=role then
return
end
if not skill then
return
end
if skill and not skill.isTriggerJudge and judge==1 then
return
end
local isHave=false
if dot==BuffName.DOT then
if BattleLogic.BuffMgr:HasBuff(defRole, BuffName.DOT, function(buff) return buff.damageType == pro end,role,pro) then
isHave=true
end
end
if isHave then
critFunc(f1,ct,false)
end
end
BattleLogic.Event:AddEvent(BattleEventName.TemporaryChangeCrit, onRoleDamageBefore,nil,nil,role)
end,
--改变[a]目标[b]生命回复量[c]%
--a[int],b[int 1:敌方],c[float]
[426]=function(role, args,id,judge)
local ct=args[1]
local type=args[2]
local pro=args[3]
local function onPassiveTreatFactor(func,target,skill)
local isTrigger=false
if type==1 and target.camp~=role.camp then
isTrigger=true
end
if isTrigger then
func(pro,ct)
end
end
BattleLogic.Event:AddEvent(BattleEventName.PassiveTreatingFactor,onPassiveTreatFactor,nil,nil,role)
end,
}
return passivityList

View File

@ -1242,7 +1242,7 @@ function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamag
end
castRole.Event:DispatchEvent(BattleEventName.PassiveTreatingFactor, treatFactorFunc, targetRole,skill)
targetRole.Event:DispatchEvent(BattleEventName.PassiveBeTreatedFactor, treatFactorFunc, castRole)
BattleLogic.Event:DispatchEvent(BattleEventName.PassiveTreatingFactor,treatFactorFunc,targetRole,skill)
local factor = castRole.isTeam and 1 or castRole:GetRoleData(RoleDataName.TreatFacter) --释放者为team则不计算治疗加成属性
if factor==0 then
factor=1

View File

@ -53,7 +53,6 @@ function this:OnShow(_parent,_Data)
this.content.text= str
activityType = args[2]
local str2 = ActivityGiftManager.GetTimeStartToEnd(activityType)
local poolUpType = args[3] or 0
local poolType = args[4] or 0
@ -200,10 +199,12 @@ function this:BuildRateData(actType,UpItem,upItemList)
local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig, m.Reward[1])
table.insert(rateList,{id = m.Reward[1],tag = "心愿UP神将/道具", name=itemConfig.Name,value = m.Weight,color = "AD4152"})
table.insert(_upRateList,{id = m.Reward[1],tag = "5星神将UP!", name=itemConfig.Name,value = m.Weight})
LogGreen("name:"..tostring(itemConfig.Name).." weight:"..tostring(m.Weight))
end
for n,m in ipairs(UpItem) do
local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig, m.Reward[1])
table.insert(rateList,{id = m.Reward[1],tag = itemConfig.Name, name=m.Reward[2],value = m.Weight,color = "BDB69C" })
LogYellow("name:"..tostring(itemConfig.Name).." weight:"..tostring(m.Weight))
end
elseif actType == ActivityTypeDef.tiandihonglu then
for n,m in ipairs(upItemList) do

View File

@ -1458,7 +1458,10 @@ function this.TimeFormat()
local QingLong = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
if QingLong and QingLong > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then
if v.ActiveType == 42 then
if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) and ActivityGiftManager.CheckSupremeMission(3,true) then
if ActivityGiftManager.CheckSupremeMission(1,true)
and ActivityGiftManager.CheckSupremeMission(2,true)
and ActivityGiftManager.CheckSupremeMission(3,true)
and ActivityGiftManager.CheckSupremeMission(4,true) then
showTab = false
else
local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero)
@ -1721,7 +1724,10 @@ function this.RefreshActivityShow()
local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then
if v.ActiveType == 42 then
if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) and ActivityGiftManager.CheckSupremeMission(3,true) then
if ActivityGiftManager.CheckSupremeMission(1,true)
and ActivityGiftManager.CheckSupremeMission(2,true)
and ActivityGiftManager.CheckSupremeMission(3,true)
and ActivityGiftManager.CheckSupremeMission(4,true) then
showTab = false
else
local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero)

View File

@ -426,7 +426,10 @@ function RewardItemSingleShowPopup:OnShow()
elseif JumpConfig[jumpDataList[i]].Type == JumpType.ZhiZunJiangShi then
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero)
if id and id > 0 then
if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) and ActivityGiftManager.CheckSupremeMission(3,true) then
if ActivityGiftManager.CheckSupremeMission(1,true)
and ActivityGiftManager.CheckSupremeMission(2,true)
and ActivityGiftManager.CheckSupremeMission(3,true)
and ActivityGiftManager.CheckSupremeMission(4,true)then
isShow = false
else
local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero)

View File

@ -133,7 +133,7 @@ function PowerRice:Refresh(_curIndex,isTop,isAni)
self.text2.text = "奖励 领取奖励"
elseif _curIndex == 2 then
self.text1.text = "名次"
self.text2.text = "奖励"
self.text2.text = "奖励 战力要求"
RankingManager.InitData(RANK_TYPE.POWER_RICE,function ()
local allRankData,myRankData = RankingManager.GetRankingInfo()
@ -222,7 +222,12 @@ function PowerRice:SingleDataShow2(item,data,index)
local sort4Text = Util.GetGameObject(sortNumTabs[4],"TitleText"):GetComponent("Text")
local mark = Util.GetGameObject(item,"mark")
mark:SetActive(self.myRank > 0 and self.myRank >= data.MinRank and self.myRank <= data.MaxRank)
local powerLimit = Util.GetGameObject(item,"num"):GetComponent("Text")
powerLimit.text = ""
if data.RankLimit and data.RankLimit[2]>0 then
powerLimit.text = (data.RankLimit[2]/10000)..""
end
if data.MinRank == data.MaxRank then
if data.MaxRank < 4 then
sortNumTabs[data.MinRank]:SetActive(true)

View File

@ -33,6 +33,7 @@ function RankingSingleListPanel:InitComponent()
this.name=Util.GetGameObject(self.gameObject,"Content/bg/name"):GetComponent("Text")
this.firstHeadName=Util.GetGameObject(self.gameObject,"Content/firstHead/nameText"):GetComponent("Text")
this.firstHeadinfoGo=Util.GetGameObject(self.gameObject,"Content/firstHead/infoGo")
this.firstSortNum = Util.GetGameObject(self.gameObject,"Content/firstHead/SortNum")
this.scrollParentView=Util.GetGameObject(self.gameObject,"Content/RankList/ScrollParentView")
this.itemPre=Util.GetGameObject(self.gameObject,"Content/RankList/ScrollParentView/ItemPre")
this.scrollView = nil
@ -282,6 +283,8 @@ function this.SetHeadsInfo(data,root,index,name,level)
this.playerHeadList[root]:SetEffectScale(0.8)
this.firstHeadName.text = name
this.SetInfoShow(this.firstHeadinfoGo,data,sData.rankType)
--在战力冲刺中所有人的第一名不一定是排行榜的第一名有战力限制
this.SetRankingNum(this.firsthead, data.rankInfo.rank)
--data.sex
--加载立绘
-- if this.liveNode then