小兵修改提交
parent
c045cff577
commit
0c757c4348
|
|
@ -1860,6 +1860,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 7630967346991338611}
|
- {fileID: 7630967346991338611}
|
||||||
- {fileID: 7487035368668197601}
|
- {fileID: 7487035368668197601}
|
||||||
|
- {fileID: 2719304422278233511}
|
||||||
m_Father: {fileID: 5214916544243538258}
|
m_Father: {fileID: 5214916544243538258}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
@ -2554,6 +2555,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 8057499879288503609}
|
- {fileID: 8057499879288503609}
|
||||||
- {fileID: 6872038068621434644}
|
- {fileID: 6872038068621434644}
|
||||||
|
- {fileID: 4923011902621538698}
|
||||||
m_Father: {fileID: 1244607052290142894}
|
m_Father: {fileID: 1244607052290142894}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
@ -3133,6 +3135,81 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &3488952581887516297
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 4923011902621538698}
|
||||||
|
- component: {fileID: 7582771317535544302}
|
||||||
|
- component: {fileID: 6833584041777257635}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: skillBG
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &4923011902621538698
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3488952581887516297}
|
||||||
|
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: 8127692889236249440}
|
||||||
|
m_Father: {fileID: 5933147020205367942}
|
||||||
|
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: -351, y: -13}
|
||||||
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &7582771317535544302
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3488952581887516297}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &6833584041777257635
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3488952581887516297}
|
||||||
|
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 &3560858941554132459
|
--- !u!1 &3560858941554132459
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -3207,6 +3284,80 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &3581349588907389929
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 4474071472324248290}
|
||||||
|
- component: {fileID: 762652199027345698}
|
||||||
|
- component: {fileID: 7269276335221881276}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: skillIcon
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &4474071472324248290
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3581349588907389929}
|
||||||
|
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: 2719304422278233511}
|
||||||
|
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: 0}
|
||||||
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &762652199027345698
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3581349588907389929}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &7269276335221881276
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3581349588907389929}
|
||||||
|
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 &3648748926217591478
|
--- !u!1 &3648748926217591478
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -5628,6 +5779,80 @@ MonoBehaviour:
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u4E0A\u9635"
|
m_Text: "\u4E0A\u9635"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
|
--- !u!1 &6499523508816429049
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 8127692889236249440}
|
||||||
|
- component: {fileID: 2237093280654558739}
|
||||||
|
- component: {fileID: 6402291808509701146}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: skillIcon
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &8127692889236249440
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6499523508816429049}
|
||||||
|
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: 4923011902621538698}
|
||||||
|
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: 0}
|
||||||
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &2237093280654558739
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6499523508816429049}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &6402291808509701146
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6499523508816429049}
|
||||||
|
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 &6557714910472333956
|
--- !u!1 &6557714910472333956
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -5939,6 +6164,81 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &7193392188034807522
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2719304422278233511}
|
||||||
|
- component: {fileID: 3250768574455360236}
|
||||||
|
- component: {fileID: 5607993840348537719}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: skillBG
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &2719304422278233511
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7193392188034807522}
|
||||||
|
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: 4474071472324248290}
|
||||||
|
m_Father: {fileID: 5510061066688970730}
|
||||||
|
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: -351, y: -12}
|
||||||
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &3250768574455360236
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7193392188034807522}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &5607993840348537719
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7193392188034807522}
|
||||||
|
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 &7302445526467382567
|
--- !u!1 &7302445526467382567
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -1279,6 +1279,81 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 460, y: -153.45}
|
m_AnchoredPosition: {x: 460, y: -153.45}
|
||||||
m_SizeDelta: {x: 908, y: 306.9}
|
m_SizeDelta: {x: 908, y: 306.9}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!1 &2279907743023716391
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1050263369020738955}
|
||||||
|
- component: {fileID: 3950937453329624115}
|
||||||
|
- component: {fileID: 6863478325998963989}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: skillBG
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1050263369020738955
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2279907743023716391}
|
||||||
|
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: 6638262113263094987}
|
||||||
|
m_Father: {fileID: 5933147020205367942}
|
||||||
|
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: -378, y: -18}
|
||||||
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &3950937453329624115
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2279907743023716391}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &6863478325998963989
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2279907743023716391}
|
||||||
|
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 &2312905949228558544
|
--- !u!1 &2312905949228558544
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -1710,6 +1785,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 6872038068621434644}
|
- {fileID: 6872038068621434644}
|
||||||
- {fileID: 410176051671839810}
|
- {fileID: 410176051671839810}
|
||||||
|
- {fileID: 1050263369020738955}
|
||||||
m_Father: {fileID: 1244607052290142894}
|
m_Father: {fileID: 1244607052290142894}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
@ -3759,6 +3835,80 @@ MonoBehaviour:
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u751F\u547D"
|
m_Text: "\u751F\u547D"
|
||||||
|
--- !u!1 &5359718275926829076
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6638262113263094987}
|
||||||
|
- component: {fileID: 6090650896046148916}
|
||||||
|
- component: {fileID: 5134674922044770004}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: skillIcon
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &6638262113263094987
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5359718275926829076}
|
||||||
|
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: 1050263369020738955}
|
||||||
|
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: 0}
|
||||||
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &6090650896046148916
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5359718275926829076}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &5134674922044770004
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5359718275926829076}
|
||||||
|
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 &5403624577458967048
|
--- !u!1 &5403624577458967048
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -6136,7 +6286,7 @@ MonoBehaviour:
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 0.9
|
||||||
m_Text: New Text
|
m_Text: New Text
|
||||||
--- !u!114 &1321810668871071889
|
--- !u!114 &1321810668871071889
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
|
|
||||||
|
|
@ -3415,6 +3415,22 @@ PropertyType = {
|
||||||
[5] = "时空",
|
[5] = "时空",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PropertyType2 = {
|
||||||
|
[0] = "全部神将",
|
||||||
|
[1] = "人系神将额外",
|
||||||
|
[2] = "佛系神将额外",
|
||||||
|
[3] = "妖系神将额外",
|
||||||
|
[4] = "道系神将额外",
|
||||||
|
[5] = "时空神将额外",
|
||||||
|
}
|
||||||
|
ProfessionType2 = {
|
||||||
|
[0] = "全部神将",
|
||||||
|
[1] = "肉盾神将额外",
|
||||||
|
[2] = "输出神将额外",
|
||||||
|
[3] = "控制神将额外",
|
||||||
|
[4] = "辅助神将额外",
|
||||||
|
}
|
||||||
|
|
||||||
ProfessionType = {
|
ProfessionType = {
|
||||||
[0] = "全部",
|
[0] = "全部",
|
||||||
[1] = "肉盾",
|
[1] = "肉盾",
|
||||||
|
|
|
||||||
|
|
@ -1397,14 +1397,14 @@ function this.OnUIOpen(id)
|
||||||
end
|
end
|
||||||
-- 引导结束再显示小手
|
-- 引导结束再显示小手
|
||||||
function this.OnFuncGuideDone()
|
function this.OnFuncGuideDone()
|
||||||
this.fightGuideEffect:SetActive(not GuideManager.IsInMainGuide() and not GuideManager.IsFunctionGuideExist())
|
--this.fightGuideEffect:SetActive(not GuideManager.IsInMainGuide() and not GuideManager.IsFunctionGuideExist())
|
||||||
end
|
end
|
||||||
-- 设置挑战按钮文字
|
-- 设置挑战按钮文字
|
||||||
function this.SetFightBtnText()
|
function this.SetFightBtnText()
|
||||||
this.fightLock:SetActive(false)
|
this.fightLock:SetActive(false)
|
||||||
this.fightSaoGuang:SetActive(true)
|
this.fightSaoGuang:SetActive(true)
|
||||||
-- 没在主线引导种就显示小手
|
-- 没在主线引导种就显示小手
|
||||||
this.fightGuideEffect:SetActive(not GuideManager.IsInMainGuide() and not GuideManager.IsFunctionGuideExist())
|
--this.fightGuideEffect:SetActive(not GuideManager.IsInMainGuide() and not GuideManager.IsFunctionGuideExist())
|
||||||
local isPass = FightPointPassManager.IsCanFight(FightPointPassManager.curOpenFight)
|
local isPass = FightPointPassManager.IsCanFight(FightPointPassManager.curOpenFight)
|
||||||
if not isCounting then
|
if not isCounting then
|
||||||
if not isPass then
|
if not isPass then
|
||||||
|
|
@ -1538,6 +1538,11 @@ function FightPointPassMainPanel:OnSortingOrderChange()
|
||||||
for i=1, #soliderPreList do
|
for i=1, #soliderPreList do
|
||||||
Util.SetParticleSortLayer(soliderPreList[i].effect, orginLayer+2)
|
Util.SetParticleSortLayer(soliderPreList[i].effect, orginLayer+2)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local haveNum=BagManager.GetItemCountById(tonumber(cost[1]))
|
||||||
|
this.costTxt.text=haveNum
|
||||||
|
this.chouRed:SetActive(haveNum>0)
|
||||||
|
this.fightGuideEffect:SetActive(haveNum>0)
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面关闭时调用(用于子类重写)
|
--界面关闭时调用(用于子类重写)
|
||||||
|
|
|
||||||
|
|
@ -241,6 +241,10 @@ function SmallSoldierInfoPanel:ShwoSoliderInfo(go,data,_type)
|
||||||
local powerDownTxt=Util.GetGameObject(go, "infoObj/powerImg/changeValueDown"):GetComponent("Text")
|
local powerDownTxt=Util.GetGameObject(go, "infoObj/powerImg/changeValueDown"):GetComponent("Text")
|
||||||
local powerUp=Util.GetGameObject(go, "infoObj/powerImg/changeValueUp")
|
local powerUp=Util.GetGameObject(go, "infoObj/powerImg/changeValueUp")
|
||||||
local powerUpTxt=Util.GetGameObject(go, "infoObj/powerImg/changeValueUp"):GetComponent("Text")
|
local powerUpTxt=Util.GetGameObject(go, "infoObj/powerImg/changeValueUp"):GetComponent("Text")
|
||||||
|
local skillBg=Util.GetGameObject(go, "skillObj/skillBG"):GetComponent("Image")
|
||||||
|
local skillIcon=Util.GetGameObject(go, "skillObj/skillBG/skillIcon"):GetComponent("Image")
|
||||||
|
skillBg.sprite=self.spLoader:LoadSprite(GetQuantityImageByquality(config.Quality))
|
||||||
|
skillIcon.sprite=self.spLoader:LoadSprite(GetResourcePath(config.SkillImage))
|
||||||
if _type==1 then
|
if _type==1 then
|
||||||
title.text=config.Name
|
title.text=config.Name
|
||||||
elseif _type==2 then
|
elseif _type==2 then
|
||||||
|
|
@ -256,7 +260,7 @@ function SmallSoldierInfoPanel:ShwoSoliderInfo(go,data,_type)
|
||||||
for i=1,#config.PropertyName do
|
for i=1,#config.PropertyName do
|
||||||
local aa=config.PropertyName[i]
|
local aa=config.PropertyName[i]
|
||||||
if aa[2] and aa[2]>0 and aa[1] then
|
if aa[2] and aa[2]>0 and aa[1] then
|
||||||
skillStr=skillStr..PropertyType[aa[1]].."神将+".. aa[2]/100 .. "% "
|
skillStr=skillStr..PropertyType2[aa[1]].."+".. aa[2]/100 .. "%神兵基础属性\n "
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -264,7 +268,7 @@ function SmallSoldierInfoPanel:ShwoSoliderInfo(go,data,_type)
|
||||||
for i=1,#config.Profession do
|
for i=1,#config.Profession do
|
||||||
local aa=config.Profession[i]
|
local aa=config.Profession[i]
|
||||||
if aa[2] and aa[2]>0 and aa[1] then
|
if aa[2] and aa[2]>0 and aa[1] then
|
||||||
skillStr=skillStr..ProfessionType[aa[1]].."神将+".. aa[2]/100 .. "% "
|
skillStr=skillStr..ProfessionType2[aa[1]].."+".. aa[2]/100 .. "%神兵基础属性\n "
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -210,8 +210,11 @@ function SmallSoldierLvInfoPanel:ShowLeftTime()
|
||||||
if leftTime<=0 then
|
if leftTime<=0 then
|
||||||
SmallSoldierManager.upEndTime=0
|
SmallSoldierManager.upEndTime=0
|
||||||
SmallSoldierManager.level=SmallSoldierManager.level+1
|
SmallSoldierManager.level=SmallSoldierManager.level+1
|
||||||
|
SmallSoldierManager.upEndTime=0
|
||||||
|
if self.timer then
|
||||||
self.timer:Stop()
|
self.timer:Stop()
|
||||||
self.timer = nil
|
self.timer = nil
|
||||||
|
end
|
||||||
self:OnShow()
|
self:OnShow()
|
||||||
end
|
end
|
||||||
end, 1, -1, true)
|
end, 1, -1, true)
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,11 @@ function SmallSoldierUpFigthInfoPanel:ShwoSoliderInfo(go,data,_type)
|
||||||
local grid=Util.GetGameObject(go, "infoObj/proGrid")
|
local grid=Util.GetGameObject(go, "infoObj/proGrid")
|
||||||
local skillObj=Util.GetGameObject(go, "skillObj")
|
local skillObj=Util.GetGameObject(go, "skillObj")
|
||||||
local skillinfo=Util.GetGameObject(go, "skillObj/Text"):GetComponent("Text")
|
local skillinfo=Util.GetGameObject(go, "skillObj/Text"):GetComponent("Text")
|
||||||
|
local skillBg=Util.GetGameObject(go, "skillObj/skillBG"):GetComponent("Image")
|
||||||
|
local skillIcon=Util.GetGameObject(go, "skillObj/skillBG/skillIcon"):GetComponent("Image")
|
||||||
local config=ConfigManager.GetConfigData(ConfigName.SoldiersSetting,data.id)
|
local config=ConfigManager.GetConfigData(ConfigName.SoldiersSetting,data.id)
|
||||||
|
skillBg.sprite=self.spLoader:LoadSprite(GetQuantityImageByquality(config.Quality))
|
||||||
|
skillIcon.sprite=self.spLoader:LoadSprite(GetResourcePath(config.SkillImage))
|
||||||
if _type==1 then
|
if _type==1 then
|
||||||
title.text=config.Name
|
title.text=config.Name
|
||||||
elseif _type==2 then
|
elseif _type==2 then
|
||||||
|
|
@ -103,7 +107,7 @@ function SmallSoldierUpFigthInfoPanel:ShwoSoliderInfo(go,data,_type)
|
||||||
for i=1,#config.PropertyName do
|
for i=1,#config.PropertyName do
|
||||||
local aa=config.PropertyName[i]
|
local aa=config.PropertyName[i]
|
||||||
if aa[2] and aa[2]>0 and aa[1] then
|
if aa[2] and aa[2]>0 and aa[1] then
|
||||||
skillStr=skillStr..PropertyType[aa[1]].."神将+".. aa[2]/100 .. "% "
|
skillStr=skillStr..PropertyType2[aa[1]].."+".. aa[2]/100 .. "%神兵基础属性\n "
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -111,7 +115,7 @@ function SmallSoldierUpFigthInfoPanel:ShwoSoliderInfo(go,data,_type)
|
||||||
for i=1,#config.Profession do
|
for i=1,#config.Profession do
|
||||||
local aa=config.Profession[i]
|
local aa=config.Profession[i]
|
||||||
if aa[2] and aa[2]>0 and aa[1] then
|
if aa[2] and aa[2]>0 and aa[1] then
|
||||||
skillStr=skillStr..ProfessionType[aa[1]].."神将+".. aa[2]/100 .. "% "
|
skillStr=skillStr..ProfessionType2[aa[1]].."+".. aa[2]/100 .. "%神兵基础属性\n "
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue