Merge branch 'china/dev' into china/test
commit
6da41a152f
|
|
@ -455,7 +455,7 @@ RectTransform:
|
||||||
- {fileID: 1657233504}
|
- {fileID: 1657233504}
|
||||||
- {fileID: 778723007}
|
- {fileID: 778723007}
|
||||||
m_Father: {fileID: 224115538434952156}
|
m_Father: {fileID: 224115538434952156}
|
||||||
m_RootOrder: 9
|
m_RootOrder: 10
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
|
@ -2982,7 +2982,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 6503219168857904452}
|
- {fileID: 6503219168857904452}
|
||||||
m_Father: {fileID: 224115538434952156}
|
m_Father: {fileID: 224115538434952156}
|
||||||
m_RootOrder: 10
|
m_RootOrder: 11
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
|
@ -3989,6 +3989,7 @@ RectTransform:
|
||||||
- {fileID: 224554591678231774}
|
- {fileID: 224554591678231774}
|
||||||
- {fileID: 8874365491579953670}
|
- {fileID: 8874365491579953670}
|
||||||
- {fileID: 224397395547572370}
|
- {fileID: 224397395547572370}
|
||||||
|
- {fileID: 90538113106510181}
|
||||||
- {fileID: 5817660371385231975}
|
- {fileID: 5817660371385231975}
|
||||||
- {fileID: 569836965}
|
- {fileID: 569836965}
|
||||||
- {fileID: 224691374942124352}
|
- {fileID: 224691374942124352}
|
||||||
|
|
@ -11256,7 +11257,7 @@ ParticleSystem:
|
||||||
--- !u!199 &3901388526691958109
|
--- !u!199 &3901388526691958109
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 2
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
|
@ -12141,6 +12142,100 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &2261365349935469722
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 460352526202496736}
|
||||||
|
- component: {fileID: 7777670130619924261}
|
||||||
|
- component: {fileID: 4160404129245020082}
|
||||||
|
- component: {fileID: 5828523404501463817}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Power
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &460352526202496736
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2261365349935469722}
|
||||||
|
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: 90538113106510181}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 236.5, y: -81.628525}
|
||||||
|
m_SizeDelta: {x: 160, y: 50}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &7777670130619924261
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2261365349935469722}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &4160404129245020082
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2261365349935469722}
|
||||||
|
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: 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: 634137158f07dff488d018d707aa403a, type: 2}
|
||||||
|
m_FontSize: 0
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 0
|
||||||
|
m_MaxSize: 41
|
||||||
|
m_Alignment: 3
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 1
|
||||||
|
m_VerticalOverflow: 0
|
||||||
|
m_LineSpacing: 0
|
||||||
|
m_Text: 2250
|
||||||
|
LanguageIndex: 10066
|
||||||
|
--- !u!114 &5828523404501463817
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2261365349935469722}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
_textSpacing: -30.48
|
||||||
--- !u!1 &2308785780374388787
|
--- !u!1 &2308785780374388787
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -17421,7 +17516,7 @@ ParticleSystem:
|
||||||
--- !u!199 &2334074927626818110
|
--- !u!199 &2334074927626818110
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 2
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
|
@ -18784,80 +18879,6 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 1080, y: 176}
|
m_SizeDelta: {x: 1080, y: 176}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &3999741132324034652
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 4238414832698109276}
|
|
||||||
- component: {fileID: 2987112694886467041}
|
|
||||||
- component: {fileID: 6800382780806945729}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: powerImg
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &4238414832698109276
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 3999741132324034652}
|
|
||||||
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: 5817660371385231975}
|
|
||||||
m_RootOrder: 0
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
|
||||||
m_AnchoredPosition: {x: 204, y: 1.62854}
|
|
||||||
m_SizeDelta: {x: 405, y: 138}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!222 &2987112694886467041
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 3999741132324034652}
|
|
||||||
m_CullTransparentMesh: 0
|
|
||||||
--- !u!114 &6800382780806945729
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 3999741132324034652}
|
|
||||||
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: 0fdb11ebf0af8694cb08b9c264d3fa2a, 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 &4022199724302367274
|
--- !u!1 &4022199724302367274
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -19008,7 +19029,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 224115538434952156}
|
m_Father: {fileID: 224115538434952156}
|
||||||
m_RootOrder: 11
|
m_RootOrder: 12
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
|
@ -21384,7 +21405,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1403381655516826608}
|
- {fileID: 1403381655516826608}
|
||||||
m_Father: {fileID: 5817660371385231975}
|
m_Father: {fileID: 5817660371385231975}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
|
|
@ -21575,100 +21596,6 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 767.25, y: -55}
|
m_AnchoredPosition: {x: 767.25, y: -55}
|
||||||
m_SizeDelta: {x: 100, y: 100}
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &4784167690911510864
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 4388651194028819967}
|
|
||||||
- component: {fileID: 2564597295430665844}
|
|
||||||
- component: {fileID: 9064688220550184364}
|
|
||||||
- component: {fileID: 1126905326998753524}
|
|
||||||
m_Layer: 0
|
|
||||||
m_Name: Power
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &4388651194028819967
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 4784167690911510864}
|
|
||||||
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: 5817660371385231975}
|
|
||||||
m_RootOrder: 2
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
|
||||||
m_AnchoredPosition: {x: 238, y: -11}
|
|
||||||
m_SizeDelta: {x: 160, y: 50}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!222 &2564597295430665844
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 4784167690911510864}
|
|
||||||
m_CullTransparentMesh: 0
|
|
||||||
--- !u!114 &9064688220550184364
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 4784167690911510864}
|
|
||||||
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: 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: 634137158f07dff488d018d707aa403a, type: 2}
|
|
||||||
m_FontSize: 0
|
|
||||||
m_FontStyle: 0
|
|
||||||
m_BestFit: 0
|
|
||||||
m_MinSize: 0
|
|
||||||
m_MaxSize: 41
|
|
||||||
m_Alignment: 3
|
|
||||||
m_AlignByGeometry: 0
|
|
||||||
m_RichText: 1
|
|
||||||
m_HorizontalOverflow: 1
|
|
||||||
m_VerticalOverflow: 0
|
|
||||||
m_LineSpacing: 0
|
|
||||||
m_Text: 148933
|
|
||||||
LanguageIndex: 10066
|
|
||||||
--- !u!114 &1126905326998753524
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 4784167690911510864}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
_textSpacing: -30.48
|
|
||||||
--- !u!1 &4981287195548359590
|
--- !u!1 &4981287195548359590
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -22057,7 +21984,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 5160507017579478065}
|
- {fileID: 5160507017579478065}
|
||||||
m_Father: {fileID: 224115538434952156}
|
m_Father: {fileID: 224115538434952156}
|
||||||
m_RootOrder: 12
|
m_RootOrder: 13
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
|
@ -27021,7 +26948,7 @@ ParticleSystem:
|
||||||
--- !u!199 &3140835597163104871
|
--- !u!199 &3140835597163104871
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 2
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
|
@ -32702,7 +32629,7 @@ ParticleSystem:
|
||||||
--- !u!199 &6767450369985271142
|
--- !u!199 &6767450369985271142
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 2
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
|
@ -34772,7 +34699,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 5817660371385231975}
|
m_Father: {fileID: 5817660371385231975}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
|
@ -39838,7 +39765,7 @@ ParticleSystem:
|
||||||
--- !u!199 &3618113272338546410
|
--- !u!199 &3618113272338546410
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 2
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
|
@ -44788,7 +44715,7 @@ ParticleSystem:
|
||||||
--- !u!199 &9139480562290851601
|
--- !u!199 &9139480562290851601
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 2
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
|
@ -45540,6 +45467,81 @@ MonoBehaviour:
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u79EF\u5206\uFF1A"
|
m_Text: "\u79EF\u5206\uFF1A"
|
||||||
LanguageIndex: 10062
|
LanguageIndex: 10062
|
||||||
|
--- !u!1 &8343138980272120530
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 90538113106510181}
|
||||||
|
- component: {fileID: 1396626353709724616}
|
||||||
|
- component: {fileID: 7828257678649452602}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: powerImg
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &90538113106510181
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8343138980272120530}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 100}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 460352526202496736}
|
||||||
|
m_Father: {fileID: 224115538434952156}
|
||||||
|
m_RootOrder: 8
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 200, y: -200}
|
||||||
|
m_SizeDelta: {x: 405, y: 138}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &1396626353709724616
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8343138980272120530}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &7828257678649452602
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8343138980272120530}
|
||||||
|
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: 0fdb11ebf0af8694cb08b9c264d3fa2a, 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 &8389099563239419031
|
--- !u!1 &8389099563239419031
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -46534,17 +46536,15 @@ RectTransform:
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 4238414832698109276}
|
|
||||||
- {fileID: 9062611971674071019}
|
- {fileID: 9062611971674071019}
|
||||||
- {fileID: 4388651194028819967}
|
|
||||||
- {fileID: 8872551768251343228}
|
- {fileID: 8872551768251343228}
|
||||||
m_Father: {fileID: 224115538434952156}
|
m_Father: {fileID: 224115538434952156}
|
||||||
m_RootOrder: 8
|
m_RootOrder: 9
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 619}
|
m_AnchoredPosition: {x: 0, y: 619}
|
||||||
m_SizeDelta: {x: 0, y: 169.26294}
|
m_SizeDelta: {x: 1080, y: 169.26294}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &8963787482496569464
|
--- !u!1 &8963787482496569464
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ function ArenaView:InitComponent()
|
||||||
|
|
||||||
this.myRank=Util.GetGameObject(self.gameObject,"MyRank")
|
this.myRank=Util.GetGameObject(self.gameObject,"MyRank")
|
||||||
this.rank=Util.GetGameObject(this.myRank,"Rank"):GetComponent("Text")
|
this.rank=Util.GetGameObject(this.myRank,"Rank"):GetComponent("Text")
|
||||||
this.power=Util.GetGameObject(this.myRank,"Power"):GetComponent("Text")
|
this.power=Util.GetGameObject(self.gameObject,"powerImg/Power"):GetComponent("Text")
|
||||||
--this.formationPower=Util.GetGameObject(self.gameObject,"defendbox/FormationPower/Text"):GetComponent("Text")
|
--this.formationPower=Util.GetGameObject(self.gameObject,"defendbox/FormationPower/Text"):GetComponent("Text")
|
||||||
|
|
||||||
this.effect = Util.GetGameObject(self.gameObject, "bg/UI_effect_ArenaMainPanel_particle")
|
this.effect = Util.GetGameObject(self.gameObject, "bg/UI_effect_ArenaMainPanel_particle")
|
||||||
|
|
|
||||||
|
|
@ -284,7 +284,7 @@ function this.OnPageTabChange(index)
|
||||||
if subViewList[index] and subViewList[index].config and subViewList[index].sub then
|
if subViewList[index] and subViewList[index].config and subViewList[index].sub then
|
||||||
--每日每周任务页签拆分用
|
--每日每周任务页签拆分用
|
||||||
if tabs[index].ShopData and tabs[index].ShopData[1][1] == -9999 then
|
if tabs[index].ShopData and tabs[index].ShopData[1][1] == -9999 then
|
||||||
CommonActPageManager.DynamicActType = tabs[index].Sort
|
CommonActPageManager.DynamicActType = tabs[index].Sort - 1
|
||||||
end
|
end
|
||||||
subViewList[index].sub:OnShow(orginLayer)
|
subViewList[index].sub:OnShow(orginLayer)
|
||||||
else
|
else
|
||||||
|
|
@ -294,7 +294,7 @@ function this.OnPageTabChange(index)
|
||||||
subViewList[index].sub = SubUIManager.Open(subViewList[index].config,this.content.transform,tabs[index],index,this)
|
subViewList[index].sub = SubUIManager.Open(subViewList[index].config,this.content.transform,tabs[index],index,this)
|
||||||
--每日每周任务页签拆分用
|
--每日每周任务页签拆分用
|
||||||
if tabs[index].ShopData and tabs[index].ShopData[1][1] == -9999 then
|
if tabs[index].ShopData and tabs[index].ShopData[1][1] == -9999 then
|
||||||
CommonActPageManager.DynamicActType = tabs[index].Sort
|
CommonActPageManager.DynamicActType = tabs[index].Sort - 1
|
||||||
end
|
end
|
||||||
subViewList[index].sub:OnShow(orginLayer)
|
subViewList[index].sub:OnShow(orginLayer)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -445,12 +445,20 @@ function this.GetActivityTableDataByPageInde(pageIndex)
|
||||||
local activityDatas = {}
|
local activityDatas = {}
|
||||||
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityGroups,"PageType",pageIndex)
|
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityGroups,"PageType",pageIndex)
|
||||||
for i = 1 , #configs do
|
for i = 1 , #configs do
|
||||||
if configs[i].ActiveType > 0 then
|
if configs[i].ActiveType > 0 then
|
||||||
if not activityDic[configs[i].ActiveType] and (not configs[i].ShopData or configs[i].ShopData[1][1] ~= -9999) then
|
if not activityDic[configs[i].ActiveType] then
|
||||||
activityDic[configs[i].ActiveType] = configs[i]
|
if configs[i].ShopData and configs[i].ShopData[1][1] == -9999 then
|
||||||
table.insert(activityGroupsData,configs[i])
|
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct)
|
||||||
|
if id and id > 0 and ActivityGiftManager.IsQualifiled(ActivityTypeDef.DynamicAct) and GlobalActivity[id].ShowArt == configs[i].ActId then
|
||||||
|
activityDic[configs[i].ActiveType] = configs[i]
|
||||||
|
table.insert(activityGroupsData,configs[i])
|
||||||
|
end
|
||||||
|
else
|
||||||
|
activityDic[configs[i].ActiveType] = configs[i]
|
||||||
|
table.insert(activityGroupsData,configs[i])
|
||||||
|
end
|
||||||
end
|
end
|
||||||
elseif configs[i].FunType > 0 then
|
elseif configs[i].FunType > 0 then
|
||||||
if not activityDic[configs[i].FunType] then
|
if not activityDic[configs[i].FunType] then
|
||||||
functionDic[configs[i].FunType] = configs[i]
|
functionDic[configs[i].FunType] = configs[i]
|
||||||
table.insert(activityGroupsData,configs[i])
|
table.insert(activityGroupsData,configs[i])
|
||||||
|
|
|
||||||
|
|
@ -224,6 +224,7 @@ end
|
||||||
function this.InitTaskData(curData,taskType,configName)
|
function this.InitTaskData(curData,taskType,configName)
|
||||||
local allListData = ConfigManager.GetAllConfigsDataByKey(configName, "ActivityId", curData.activityId)
|
local allListData = ConfigManager.GetAllConfigsDataByKey(configName, "ActivityId", curData.activityId)
|
||||||
local allMissionData = TaskManager.GetTypeTaskList(taskType)
|
local allMissionData = TaskManager.GetTypeTaskList(taskType)
|
||||||
|
-- LogGreen("this.DynamicActType:"..this.DynamicActType)
|
||||||
for i=1,#allListData do
|
for i=1,#allListData do
|
||||||
for j=1,#allMissionData do
|
for j=1,#allMissionData do
|
||||||
-- LogGreen("this.DynamicActType:"..this.DynamicActType)
|
-- LogGreen("this.DynamicActType:"..this.DynamicActType)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue