【竞技场】竞技场增加输赢奖励
parent
85a608d21a
commit
de32379f8e
|
|
@ -4839,7 +4839,7 @@ ParticleSystem:
|
|||
--- !u!199 &199751331792092884
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -9983,7 +9983,7 @@ ParticleSystem:
|
|||
--- !u!199 &199378756395175552
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -14672,7 +14672,7 @@ ParticleSystem:
|
|||
--- !u!199 &199265941905233924
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -19794,7 +19794,7 @@ ParticleSystem:
|
|||
--- !u!199 &199262815093580326
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -24620,7 +24620,7 @@ ParticleSystem:
|
|||
--- !u!199 &199124944845306434
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -29537,7 +29537,7 @@ ParticleSystem:
|
|||
--- !u!199 &199983686832042590
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -34513,7 +34513,7 @@ ParticleSystem:
|
|||
--- !u!199 &199467966235450706
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -39641,7 +39641,7 @@ ParticleSystem:
|
|||
--- !u!199 &199106302272808156
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -44593,7 +44593,7 @@ ParticleSystem:
|
|||
--- !u!199 &199296089881545602
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -49506,7 +49506,7 @@ ParticleSystem:
|
|||
--- !u!199 &199638009383337254
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -54267,7 +54267,7 @@ ParticleSystem:
|
|||
--- !u!199 &199981568612824874
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -59028,7 +59028,7 @@ ParticleSystem:
|
|||
--- !u!199 &199088118467275108
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -63921,7 +63921,7 @@ ParticleSystem:
|
|||
--- !u!199 &199402197524602870
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -68756,7 +68756,7 @@ ParticleSystem:
|
|||
--- !u!199 &199999741332136942
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -69034,6 +69034,7 @@ RectTransform:
|
|||
- {fileID: 224836546439835890}
|
||||
- {fileID: 224038475112873826}
|
||||
- {fileID: 1852548999433109379}
|
||||
- {fileID: 3496196312176084102}
|
||||
m_Father: {fileID: 224686767627766440}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -74249,7 +74250,7 @@ ParticleSystem:
|
|||
--- !u!199 &199717821317809222
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -79253,7 +79254,7 @@ ParticleSystem:
|
|||
--- !u!199 &199919581824800930
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -84235,7 +84236,7 @@ ParticleSystem:
|
|||
--- !u!199 &199582716297619452
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -89061,7 +89062,7 @@ ParticleSystem:
|
|||
--- !u!199 &199111360589554142
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -93880,7 +93881,7 @@ ParticleSystem:
|
|||
--- !u!199 &199726438470990242
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -99079,7 +99080,7 @@ ParticleSystem:
|
|||
--- !u!199 &199454454352356604
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -99242,6 +99243,7 @@ RectTransform:
|
|||
- {fileID: 224391570006501050}
|
||||
- {fileID: 224164005327385426}
|
||||
- {fileID: 3152784231469993970}
|
||||
- {fileID: 5204075492092596295}
|
||||
m_Father: {fileID: 224749122026685894}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -99324,6 +99326,330 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &923055585949800845
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8781535101669711990}
|
||||
- component: {fileID: 850524893632871719}
|
||||
- component: {fileID: 7383014279110395638}
|
||||
m_Layer: 5
|
||||
m_Name: num
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8781535101669711990
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 923055585949800845}
|
||||
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: 3496196312176084102}
|
||||
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: 24, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &850524893632871719
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 923055585949800845}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7383014279110395638
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 923055585949800845}
|
||||
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.83137256, g: 0.6117647, b: 0.3882353, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
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: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: +100
|
||||
--- !u!1 &1267498100800410910
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3496196312176084102}
|
||||
- component: {fileID: 2126206722417419060}
|
||||
m_Layer: 5
|
||||
m_Name: reward
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3496196312176084102
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1267498100800410910}
|
||||
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: 8741109568226209049}
|
||||
- {fileID: 8781535101669711990}
|
||||
m_Father: {fileID: 224633684821610332}
|
||||
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}
|
||||
m_AnchoredPosition: {x: -309, y: -65}
|
||||
m_SizeDelta: {x: 162.1, y: 70}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2126206722417419060
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1267498100800410910}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &4669852998788182300
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5204075492092596295}
|
||||
- component: {fileID: 5166185508840367266}
|
||||
m_Layer: 5
|
||||
m_Name: reward
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5204075492092596295
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4669852998788182300}
|
||||
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: 210717685550672917}
|
||||
- {fileID: 6083953225834839817}
|
||||
m_Father: {fileID: 224830576291928056}
|
||||
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: -348, y: -215}
|
||||
m_SizeDelta: {x: 162.1, y: 70}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5166185508840367266
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4669852998788182300}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &4696497878548543124
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6083953225834839817}
|
||||
- component: {fileID: 3207488922130710396}
|
||||
- component: {fileID: 6957642601471867514}
|
||||
m_Layer: 5
|
||||
m_Name: num
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6083953225834839817
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4696497878548543124}
|
||||
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: 5204075492092596295}
|
||||
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: 24, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3207488922130710396
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4696497878548543124}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6957642601471867514
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4696497878548543124}
|
||||
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.8313726, g: 0.6117647, b: 0.38823533, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
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: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: +100
|
||||
--- !u!1 &5064591301707905079
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8741109568226209049}
|
||||
- component: {fileID: 789425001611070514}
|
||||
- component: {fileID: 3590234558311333001}
|
||||
m_Layer: 5
|
||||
m_Name: icon
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8741109568226209049
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5064591301707905079}
|
||||
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: 3496196312176084102}
|
||||
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: -53, y: 0}
|
||||
m_SizeDelta: {x: 50, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &789425001611070514
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5064591301707905079}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3590234558311333001
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5064591301707905079}
|
||||
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: 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 &5463799976473365634
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -99398,6 +99724,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &5638449375425840829
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 210717685550672917}
|
||||
- component: {fileID: 7742503352792298554}
|
||||
- component: {fileID: 8758024788918524228}
|
||||
m_Layer: 5
|
||||
m_Name: icon
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &210717685550672917
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5638449375425840829}
|
||||
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: 5204075492092596295}
|
||||
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: -53, y: 0}
|
||||
m_SizeDelta: {x: 50, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7742503352792298554
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5638449375425840829}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8758024788918524228
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5638449375425840829}
|
||||
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: 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 &6323650199933648291
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ ARENACHALLENGERESPONSE_DEFSCORECHANGE_FIELD = protobuf.FieldDescriptor();
|
|||
ARENACHALLENGERESPONSE_ARENAENEMYS_FIELD = protobuf.FieldDescriptor();
|
||||
ARENACHALLENGERESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
|
||||
ARENACHALLENGERESPONSE_FIGHTRESULT_FIELD = protobuf.FieldDescriptor();
|
||||
ARENACHALLENGERESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||
GETARENARANKINFORESPONSE = protobuf.Descriptor();
|
||||
GETARENARANKINFORESPONSE_RANKINFOS_FIELD = protobuf.FieldDescriptor();
|
||||
GETARENARANKINFORESPONSE_MYSCORE_FIELD = protobuf.FieldDescriptor();
|
||||
|
|
@ -214,11 +215,22 @@ ARENACHALLENGERESPONSE_FIGHTRESULT_FIELD.default_value = 0
|
|||
ARENACHALLENGERESPONSE_FIGHTRESULT_FIELD.type = 5
|
||||
ARENACHALLENGERESPONSE_FIGHTRESULT_FIELD.cpp_type = 1
|
||||
|
||||
ARENACHALLENGERESPONSE_DROP_FIELD.name = "drop"
|
||||
ARENACHALLENGERESPONSE_DROP_FIELD.full_name = ".com.ljsd.jieling.protocols.ArenaChallengeResponse.drop"
|
||||
ARENACHALLENGERESPONSE_DROP_FIELD.number = 6
|
||||
ARENACHALLENGERESPONSE_DROP_FIELD.index = 5
|
||||
ARENACHALLENGERESPONSE_DROP_FIELD.label = 1
|
||||
ARENACHALLENGERESPONSE_DROP_FIELD.has_default_value = false
|
||||
ARENACHALLENGERESPONSE_DROP_FIELD.default_value = nil
|
||||
ARENACHALLENGERESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
|
||||
ARENACHALLENGERESPONSE_DROP_FIELD.type = 11
|
||||
ARENACHALLENGERESPONSE_DROP_FIELD.cpp_type = 10
|
||||
|
||||
ARENACHALLENGERESPONSE.name = "ArenaChallengeResponse"
|
||||
ARENACHALLENGERESPONSE.full_name = ".com.ljsd.jieling.protocols.ArenaChallengeResponse"
|
||||
ARENACHALLENGERESPONSE.nested_types = {}
|
||||
ARENACHALLENGERESPONSE.enum_types = {}
|
||||
ARENACHALLENGERESPONSE.fields = {ARENACHALLENGERESPONSE_MYSCORECHANGE_FIELD, ARENACHALLENGERESPONSE_DEFSCORECHANGE_FIELD, ARENACHALLENGERESPONSE_ARENAENEMYS_FIELD, ARENACHALLENGERESPONSE_FIGHTDATA_FIELD, ARENACHALLENGERESPONSE_FIGHTRESULT_FIELD}
|
||||
ARENACHALLENGERESPONSE.fields = {ARENACHALLENGERESPONSE_MYSCORECHANGE_FIELD, ARENACHALLENGERESPONSE_DEFSCORECHANGE_FIELD, ARENACHALLENGERESPONSE_ARENAENEMYS_FIELD, ARENACHALLENGERESPONSE_FIGHTDATA_FIELD, ARENACHALLENGERESPONSE_FIGHTRESULT_FIELD, ARENACHALLENGERESPONSE_DROP_FIELD}
|
||||
ARENACHALLENGERESPONSE.is_extendable = false
|
||||
ARENACHALLENGERESPONSE.extensions = {}
|
||||
GETARENARANKINFORESPONSE_RANKINFOS_FIELD.name = "rankInfos"
|
||||
|
|
|
|||
|
|
@ -168,6 +168,7 @@ function this.RequestArenaChallenge(index, isSkip, func)
|
|||
arg.red.head = enemy.personInfo.head
|
||||
arg.red.frame = enemy.personInfo.headFrame
|
||||
arg.red.deltaScore = msg.defScoreChange
|
||||
arg.reward = msg.drop
|
||||
|
||||
Log(Language[10086]..msg.myScoreChange)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
|
||||
require("Base/BasePanel")
|
||||
local ArenaResultPopup = Inherit(BasePanel)
|
||||
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
||||
local this = ArenaResultPopup
|
||||
local orginLayer
|
||||
local fun = nil
|
||||
|
|
@ -54,6 +56,13 @@ function ArenaResultPopup:OnOpen(_args,_fun)
|
|||
local isWin = args.result == 1
|
||||
local blueInfo = args.blue
|
||||
local redInfo = args.red
|
||||
|
||||
local rewardData = {}
|
||||
if args.reward then
|
||||
rewardData.id = args.reward.itemlist[1].itemId
|
||||
rewardData.num = args.reward.itemlist[1].itemNum
|
||||
end
|
||||
|
||||
-- 如果我在防守方,交换数据,我要显示在蓝方
|
||||
if redInfo.uid == PlayerManager.uid then
|
||||
blueInfo = args.red
|
||||
|
|
@ -81,6 +90,11 @@ function ArenaResultPopup:OnOpen(_args,_fun)
|
|||
|
||||
local bigResult = Util.GetGameObject(_CurPanel, "ShiBai_WenZi"):GetComponent("Image")
|
||||
|
||||
local reward = Util.GetGameObject(_CurPanel, "Left/reward")
|
||||
reward:SetActive(false)
|
||||
local rewardIcon = Util.GetGameObject(_CurPanel, "Left/reward/icon"):GetComponent("Image")
|
||||
local rewardNum = Util.GetGameObject(_CurPanel, "Left/reward/num"):GetComponent("Text")
|
||||
|
||||
-- 昵称
|
||||
blueName:GetComponent("Text").text = blueInfo.name
|
||||
redName:GetComponent("Text").text = redInfo.name
|
||||
|
|
@ -91,6 +105,17 @@ function ArenaResultPopup:OnOpen(_args,_fun)
|
|||
redHeadIcon:GetComponent("Image").sprite = GetPlayerHeadSprite(redInfo.head)
|
||||
redHeadBg:GetComponent("Image").sprite = GetPlayerHeadFrameSprite(redInfo.frame)
|
||||
|
||||
LogYellow("sdsds:"..args.reward.itemlist[1].itemId)
|
||||
LogYellow("sdsds:"..args.reward.itemlist[1].itemNum)
|
||||
if args.reward then
|
||||
reward:SetActive(true)
|
||||
LogBlue("rewardData.id:"..rewardData.id)
|
||||
LogBlue("itemConfig[rewardData.id].ResourceID"..itemConfig[rewardData.id].ResourceID)
|
||||
LogBlue("Name"..tostring(artConfig[itemConfig[rewardData.id].ResourceID].Name))
|
||||
rewardIcon.sprite = Util.LoadSprite(artConfig[itemConfig[rewardData.id].ResourceID].Name)
|
||||
rewardNum.text = "+"..rewardData.num
|
||||
end
|
||||
|
||||
-- 积分
|
||||
local bScore = blueInfo.deltaScore
|
||||
if bScore then
|
||||
|
|
|
|||
Loading…
Reference in New Issue