root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容

dev_chengFeng
jiaoyangna 2021-03-13 17:38:02 +08:00
parent f48ee539f6 17a9550df8
commit 4e4dedec14
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/ManagedResources/Prefabs/UI/Battle/BattleBossInfoPanel.prefab
View File

@ -5458,7 +5458,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &4300789958323628149
RectTransform:
m_ObjectHideFlags: 0
@ -5466,12 +5466,12 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3498697521810194728}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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: 1296008646247205113}
m_RootOrder: 7
m_Father: {fileID: 6932820901339804976}
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}
@ -5499,14 +5499,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.49019608}
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: cea0898d4352b7a47b6b7c95ec6e3883, type: 3}
m_Sprite: {fileID: 21300000, guid: c0c0fdb7708d818499549ab168426a61, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -5957,7 +5957,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: 0, y: -200}
m_AnchoredPosition: {x: 0, y: -116}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5528235509091943958
@ -5996,7 +5996,6 @@ RectTransform:
- {fileID: 7266648091790681345}
- {fileID: 5781867560655199275}
- {fileID: 3578655693771015575}
- {fileID: 4300789958323628149}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -11141,6 +11140,7 @@ RectTransform:
m_Children:
- {fileID: 2877197899002758564}
- {fileID: 9206567145182709600}
- {fileID: 4300789958323628149}
m_Father: {fileID: 1296008646247205113}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}