特训修改
parent
7421431e5f
commit
fe8af4d7ff
|
@ -111,7 +111,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 1961543400}
|
||||
m_Father: {fileID: 6674535297544090741}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
@ -6662,6 +6662,7 @@ RectTransform:
|
|||
- {fileID: 6674535297821892818}
|
||||
- {fileID: 6674535296452004501}
|
||||
- {fileID: 6674535297047208383}
|
||||
- {fileID: 3280923930891343233}
|
||||
- {fileID: 58549383}
|
||||
m_Father: {fileID: 31242521730910685}
|
||||
m_RootOrder: 3
|
||||
|
@ -6669,7 +6670,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 4, y: 12}
|
||||
m_SizeDelta: {x: 924.9, y: 586.58}
|
||||
m_SizeDelta: {x: 924.9, y: 727.18}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &6674535297544090736
|
||||
CanvasRenderer:
|
||||
|
@ -7650,6 +7651,85 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 186.6, y: 3.3}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &7538274353968400267
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1853591260201135836}
|
||||
- component: {fileID: 3293660012637184374}
|
||||
- component: {fileID: 7778916311321962695}
|
||||
m_Layer: 0
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1853591260201135836
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7538274353968400267}
|
||||
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: 3280923930891343233}
|
||||
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: 472.95, y: -104.75}
|
||||
m_SizeDelta: {x: 733.9, y: 83.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3293660012637184374
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7538274353968400267}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7778916311321962695
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7538274353968400267}
|
||||
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.19607843, g: 0.19607843, b: 0.19607843, 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: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||
m_FontSize: 32
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6240\u6709\u795E\u5C06\u793C\u7269\u5C5E\u6027+5%\uFF08\u6700\u9AD8200%\uFF09\r\n\u6240\u6709\u795E\u5C06\u793C\u7269\u683C\u5B50+1\uFF08\u6700\u591A\u5F00\u542F40\u4E2A\uFF09"
|
||||
--- !u!1 &7608725301674339549
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -7751,3 +7831,78 @@ MonoBehaviour:
|
|||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!1 &7625681019922917047
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3280923930891343233}
|
||||
- component: {fileID: 7826212416462491008}
|
||||
- component: {fileID: 2840686487913761662}
|
||||
m_Layer: 0
|
||||
m_Name: DesTip
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3280923930891343233
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7625681019922917047}
|
||||
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: 1853591260201135836}
|
||||
m_Father: {fileID: 6674535297544090741}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 412.7, y: -633.93}
|
||||
m_SizeDelta: {x: 825.4, y: 146.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &7826212416462491008
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7625681019922917047}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!114 &2840686487913761662
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7625681019922917047}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 106
|
||||
m_Right: 0
|
||||
m_Top: 63
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
|
|
|
@ -89,6 +89,8 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
|
|||
local numPre= Util.GetGameObject(_go,"Content/attPre/numPre")
|
||||
local mySelfCondition= Util.GetGameObject(_go,"HeroInfo/title/TrainingStatus/mySelfCondition"):GetComponent("Text")
|
||||
local trainingIcon= Util.GetGameObject(_go,"HeroInfo/title/TrainingStatus/trainingIcon")
|
||||
local DesTip=Util.GetGameObject(_go,"DesTip")
|
||||
DesTip.gameObject:SetActive(tData.Level==#self.showList)
|
||||
-- local isOpen=self._curHerodata.star>=tData.MyselfCondition and curLevel>=tData.Level
|
||||
local lastLevelData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.Train,"HeroID",self._curHerodata.id,"Level",tData.Level-1==0 and 1 or tData.Level-1)
|
||||
local isOpen= self._curHerodata.star>=lastLevelData.MyselfCondition and curLevel>=tData.Level
|
||||
|
|
Loading…
Reference in New Issue