【1/11鸿蒙阵bug修改】
parent
c910fd4372
commit
7aac4cbd32
|
|
@ -515,6 +515,7 @@ RectTransform:
|
|||
- {fileID: 4916292726979426115}
|
||||
- {fileID: 2363755377382008852}
|
||||
- {fileID: 5927229397764442815}
|
||||
- {fileID: 8534136813269813907}
|
||||
- {fileID: 3396493132143195623}
|
||||
- {fileID: 4802209639077060581}
|
||||
- {fileID: 627185284009965664}
|
||||
|
|
@ -836,7 +837,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 7953072678851445006}
|
||||
m_Father: {fileID: 798015173237835578}
|
||||
m_RootOrder: 8
|
||||
m_RootOrder: 9
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -1698,7 +1699,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 4991937154532343318}
|
||||
m_Father: {fileID: 798015173237835578}
|
||||
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}
|
||||
|
|
@ -2109,7 +2110,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 798015173237835578}
|
||||
m_RootOrder: 13
|
||||
m_RootOrder: 14
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -2296,7 +2297,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 798015173237835578}
|
||||
m_RootOrder: 9
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
|
|
@ -2868,7 +2869,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 798015173237835578}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -3022,7 +3023,7 @@ RectTransform:
|
|||
- {fileID: 4088516387311303254}
|
||||
- {fileID: 1038121354329436082}
|
||||
m_Father: {fileID: 798015173237835578}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
|
@ -3059,7 +3060,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 798015173237835578}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
|
@ -3283,7 +3284,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 798015173237835578}
|
||||
m_RootOrder: 7
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
|
|
@ -3632,7 +3633,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 798015173237835578}
|
||||
m_RootOrder: 14
|
||||
m_RootOrder: 15
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -3862,7 +3863,7 @@ RectTransform:
|
|||
- {fileID: 5136775017715279467}
|
||||
- {fileID: 1676212431931269004}
|
||||
m_Father: {fileID: 798015173237835578}
|
||||
m_RootOrder: 11
|
||||
m_RootOrder: 12
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -4168,6 +4169,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &6447825970967217879
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8534136813269813907}
|
||||
- component: {fileID: 4633203853668247611}
|
||||
- component: {fileID: 7025522335526480249}
|
||||
m_Layer: 5
|
||||
m_Name: tiao3_bg
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &8534136813269813907
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6447825970967217879}
|
||||
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: 798015173237835578}
|
||||
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: -33, y: -461}
|
||||
m_SizeDelta: {x: 509.85, y: 509.85}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4633203853668247611
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6447825970967217879}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7025522335526480249
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6447825970967217879}
|
||||
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: fbe18f8337a8e3f439f006aac4918036, 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 &6658901313732968845
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4307,7 +4382,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: fbe18f8337a8e3f439f006aac4918036, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 1dd8d4c8eca3fcd42ae1403ba03f440c, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -4913,7 +4988,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 2638102834562654791}
|
||||
m_Father: {fileID: 798015173237835578}
|
||||
m_RootOrder: 10
|
||||
m_RootOrder: 11
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
|
|
@ -5178,7 +5253,7 @@ RectTransform:
|
|||
- {fileID: 2238990896396835307}
|
||||
- {fileID: 2129515910323730583}
|
||||
m_Father: {fileID: 798015173237835578}
|
||||
m_RootOrder: 12
|
||||
m_RootOrder: 13
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
|
|||
|
|
@ -496,6 +496,7 @@ RectTransform:
|
|||
- {fileID: 224230261642866192}
|
||||
- {fileID: 224426544923544496}
|
||||
- {fileID: 224097724301338018}
|
||||
- {fileID: 1363187077722955401}
|
||||
m_Father: {fileID: 224922477455617218}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -1996,6 +1997,81 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &954533782056180850
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7341448468586361976}
|
||||
- component: {fileID: 4493684441687764869}
|
||||
- component: {fileID: 1939683536194329591}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7341448468586361976
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 954533782056180850}
|
||||
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: 7876971151857339451}
|
||||
m_Father: {fileID: 1363187077722955401}
|
||||
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: -167, y: 176}
|
||||
m_SizeDelta: {x: 402, y: 234}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4493684441687764869
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 954533782056180850}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1939683536194329591
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 954533782056180850}
|
||||
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: 88785b6606f773e43bfb8d365c2689ab, 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 &1475993059460255161
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2071,6 +2147,81 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1636702142379701936
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1363187077722955401}
|
||||
- component: {fileID: 1828166734822558296}
|
||||
- component: {fileID: 6481325546638321311}
|
||||
m_Layer: 5
|
||||
m_Name: Empty
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1363187077722955401
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1636702142379701936}
|
||||
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: 7341448468586361976}
|
||||
m_Father: {fileID: 224525958220227972}
|
||||
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: 130, y: 0}
|
||||
m_SizeDelta: {x: 354, y: 470}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1828166734822558296
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1636702142379701936}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6481325546638321311
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1636702142379701936}
|
||||
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: e1eb5a78b93294840889587d72740102, 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 &1815623199820785523
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3067,6 +3218,85 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &5921247490466823263
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7876971151857339451}
|
||||
- component: {fileID: 7282509928213079179}
|
||||
- component: {fileID: 7575177336753451948}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7876971151857339451
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5921247490466823263}
|
||||
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: 7341448468586361976}
|
||||
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: -2, y: 13.8}
|
||||
m_SizeDelta: {x: 261.2, y: 57.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7282509928213079179
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5921247490466823263}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7575177336753451948
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5921247490466823263}
|
||||
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.9882353, g: 0.92156863, b: 0.7921569, 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 35
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 0
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u65E0\u53EF\u9009\u62E9\u795E\u5C06\uFF01"
|
||||
--- !u!1 &6505609753015256063
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ function this.UpdateHongMengDataHeroInfos(hongmengHeroInfos)
|
|||
-- body
|
||||
this.hongmengHeroInfos[i].time = this.hongmengHeroInfos[i].time + GetTimeStamp()
|
||||
end
|
||||
|
||||
-- print(HeroManager.)
|
||||
end
|
||||
|
||||
if this.hongmengAdditions[1] then
|
||||
|
|
@ -401,7 +401,11 @@ function this.GetSingleAdditions(type)
|
|||
-- body
|
||||
for i = 1, #this.hongmengAdditions do
|
||||
if this.hongmengAdditions[i].additionType == type then
|
||||
--print("!!!!!!!"..this.hongmengAdditions[i].value.."####"..type)
|
||||
if type == 1 then
|
||||
-- body
|
||||
--print("!!!!!!!"..this.hongmengAdditions[i].value.."####"..type)
|
||||
end
|
||||
|
||||
return this.hongmengAdditions[i].value
|
||||
end
|
||||
end
|
||||
|
|
@ -412,6 +416,13 @@ end
|
|||
|
||||
function this.GetHongMengUpData()
|
||||
|
||||
if this.hongmengAdditions[1].value < 330 then
|
||||
-- body
|
||||
LogBlue("服务器数据为"..this.hongmengAdditions[1].value)
|
||||
return nil
|
||||
|
||||
end
|
||||
LogGreen("服务器数据为"..this.hongmengAdditions[1].value)
|
||||
for key, value in ConfigPairs(HongmengUp) do
|
||||
-- body
|
||||
if value.HongmengLevel == this.hongmengAdditions[1].value + 1 then
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ local curHeroData = {}
|
|||
local TempData = nil;
|
||||
local SelectHero = nil
|
||||
local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
|
||||
local jewelConfig = ConfigManager.GetConfig(ConfigName.JewelConfig)
|
||||
--初始化组件(用于子类重写)
|
||||
function GongMingResultTips:InitComponent()
|
||||
|
||||
|
|
@ -161,24 +162,40 @@ function GongMingResultTips:OnOpen(flag)
|
|||
end
|
||||
|
||||
end
|
||||
|
||||
if EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]) then
|
||||
local dataRockOne = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2])
|
||||
if dataRockOne then
|
||||
-- body
|
||||
if EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]).lv > 0 then
|
||||
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = string.format("%d",EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]).lv)
|
||||
HunDegree = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]).lv
|
||||
if dataRockOne.lv > 0 then
|
||||
if dataRockOne.type == "魂宝" then
|
||||
-- body
|
||||
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = string.format("%d",dataRockOne.lv)
|
||||
HunDegree = dataRockOne.lv
|
||||
else
|
||||
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = string.format("%d",dataRockOne.lv)
|
||||
LingDegree = dataRockOne.lv
|
||||
end
|
||||
|
||||
else
|
||||
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = "无"
|
||||
end
|
||||
else
|
||||
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = "无"
|
||||
end
|
||||
if EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]) then
|
||||
|
||||
local dataRockTwo = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1])
|
||||
if dataRockTwo then
|
||||
-- body
|
||||
if EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]).lv > 0 then
|
||||
if dataRockTwo.lv > 0 then
|
||||
-- bodyLingDegree
|
||||
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = string.format("%d",EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]).lv)
|
||||
LingDegree = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]).lv
|
||||
if dataRockTwo.type == "灵宝" then
|
||||
-- body
|
||||
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = string.format("%d",dataRockTwo.lv)
|
||||
LingDegree = dataRockTwo.lv
|
||||
else
|
||||
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = string.format("%d",dataRockTwo.lv)
|
||||
HunDegree = dataRockTwo.lv
|
||||
end
|
||||
|
||||
else
|
||||
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = "无"
|
||||
end
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ function GongMingResultTips:OnOpen(skinId)
|
|||
else
|
||||
local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,data[i].value)
|
||||
|
||||
self.upStarSkillTextPreEquip:GetComponent("Text").text = string.format("\t\t\t\t\t\t<color=green>%s%d品</color>(%s)",GetQuantityStrByquality(equip.Quality),equip.Stars,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
|
||||
self.upStarSkillTextPreEquip:GetComponent("Text").text = string.format("\t\t\t\t\t\t<color=green>%s%d星</color>(%s)",GetQuantityStrByquality(equip.Quality),equip.Stars,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
|
||||
end
|
||||
|
||||
-- body ReadingName
|
||||
|
|
|
|||
|
|
@ -281,8 +281,14 @@ function HongMengEnvoyPanel:OnOpen(equipSId)
|
|||
self.contents[i].view:OnOpen()
|
||||
end
|
||||
local data = HarmonyManager:GetHongMengUpData()
|
||||
self.TextGold.text = data.LevelUp[1][2]
|
||||
self.TextGrowthAmulet.text = data.LevelUp[2][2]
|
||||
if data then
|
||||
-- body
|
||||
self.TextGold.text = data.LevelUp[1][2]
|
||||
self.TextGrowthAmulet.text = data.LevelUp[2][2]
|
||||
else
|
||||
LogGreen(" error: data is nil ")
|
||||
end
|
||||
|
||||
|
||||
local sum = HarmonyManager:HongMengTowerUpLimit()
|
||||
self.GradeText.text = string.format("%d/%d", HarmonyManager.hongmengAdditions[1].value, sum)
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@ HeroData.__get__.lv = function(self)
|
|||
|
||||
--LogGreen(tostring(HeroManager.IsElevenStar(self.star)))
|
||||
--print(self._id.." "..HarmonyManager.hongmengAdditions[1].heroTid..self.heroConfig.ReadingName)
|
||||
if HeroManager.IsTenTalent(self._id) and HarmonyManager.hongmengAdditions[1].heroTid == 0 then
|
||||
if HeroManager.IsTenTalent(self._id) and HarmonyManager.hongmengAdditions[1].heroTid == 0 and HarmonyManager:HongMengTowerUpLimit() ~= 0 then
|
||||
-- bodys
|
||||
|
||||
endLv = HarmonyManager.hongmengAdditions[1].value
|
||||
--print(endLv," "..self.heroConfig.ReadingName)
|
||||
-- print(endLv," "..self.heroConfig.ReadingName.."!!!!!!!!"..HarmonyManager.hongmengAdditions[1].value)
|
||||
else
|
||||
local curlvEen = HeroManager.heroLvEnd[self.id]
|
||||
--
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ function this.InitHeroData(_msgHeroList)
|
|||
this.heroResolveLicence[tonumber(hero_resolve_licence[i])] = tonumber(hero_resolve_licence[i])
|
||||
end
|
||||
this.UpdateHeroLvEnd()
|
||||
--Log("服务端推送英雄数量:" .. #_msgHeroList)
|
||||
Log("服务端推送英雄数量:" .. #_msgHeroList)
|
||||
for i = 1, #_msgHeroList do
|
||||
this.UpdateHeroDatas(_msgHeroList[i], true)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ function RoleChooseListPanel:InitComponent()
|
|||
|
||||
this.desText = Util.GetGameObject(self.gameObject, "desText"):GetComponent("Text")
|
||||
this.numText = Util.GetGameObject(self.gameObject, "numText"):GetComponent("Text")
|
||||
|
||||
this.Empty = Util.GetGameObject(self.gameObject, "bg/Empty")
|
||||
local v = Util.GetGameObject(self.gameObject, "scroll"):GetComponent("RectTransform").rect
|
||||
|
||||
this.Scrollbar= Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar")
|
||||
|
|
@ -36,6 +36,7 @@ function RoleChooseListPanel:InitComponent()
|
|||
this.ScrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5)
|
||||
this.ScrollView.moveTween.MomentumAmount = 1
|
||||
this.ScrollView.moveTween.Strength = 1
|
||||
|
||||
this:InitData()
|
||||
end
|
||||
|
||||
|
|
@ -125,26 +126,34 @@ function RoleChooseListPanel:OnOpen(flag)
|
|||
this.title_text.text ="共鸣神将选择"
|
||||
self.flag = flag
|
||||
local list = HarmonyManager.ChooseDataList
|
||||
table.sort(list, function(a, b)
|
||||
if a.star == b.star then
|
||||
if a.heroConfig.Natural ==b.heroConfig.Natural then
|
||||
if a.lv == b.lv then
|
||||
return a.heroConfig.Id < b.heroConfig.Id
|
||||
if #list > 0 then
|
||||
-- body
|
||||
this.Empty:SetActive(false)
|
||||
table.sort(list, function(a, b)
|
||||
if a.star == b.star then
|
||||
if a.heroConfig.Natural ==b.heroConfig.Natural then
|
||||
if a.lv == b.lv then
|
||||
return a.heroConfig.Id < b.heroConfig.Id
|
||||
else
|
||||
return a.lv > b.lv
|
||||
end
|
||||
else
|
||||
return a.lv > b.lv
|
||||
return a.heroConfig.Natural > b.heroConfig.Natural
|
||||
end
|
||||
else
|
||||
return a.heroConfig.Natural > b.heroConfig.Natural
|
||||
return a.star > b.star
|
||||
end
|
||||
else
|
||||
return a.star > b.star
|
||||
end
|
||||
end)
|
||||
self.ScrollView:SetData(list,function (index, go)
|
||||
end)
|
||||
self.ScrollView:SetData(list,function (index, go)
|
||||
|
||||
this.OnShowSingleCardData(go, list[index],index)--
|
||||
|
||||
end)
|
||||
|
||||
this.OnShowSingleCardData(go, list[index],index)--
|
||||
|
||||
end)
|
||||
else
|
||||
this.Empty:SetActive(true)
|
||||
end
|
||||
|
||||
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -329,13 +329,21 @@ end
|
|||
function TalismanInfoPanel:RightBtnOnClick()
|
||||
index = (index + 1 <= #_heroListData and index + 1 or 1)
|
||||
curHeroData = _heroListData[index]
|
||||
self:OnShowPanelData()
|
||||
if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then
|
||||
self:RightBtnOnClick()
|
||||
else
|
||||
self:OnShowPanelData()
|
||||
end
|
||||
end
|
||||
--左切换按钮点击
|
||||
function TalismanInfoPanel:LeftBtnOnClick()
|
||||
index = (index - 1 > 0 and index - 1 or #_heroListData)
|
||||
curHeroData = _heroListData[index]
|
||||
self:OnShowPanelData()
|
||||
if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then
|
||||
self:LeftBtnOnClick()
|
||||
else
|
||||
self:OnShowPanelData()
|
||||
end
|
||||
end
|
||||
|
||||
function TalismanInfoPanel:OnClose()
|
||||
|
|
|
|||
Loading…
Reference in New Issue