Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev

dev_chengFeng
gaoxin 2021-03-07 17:31:43 +08:00
commit fb8637c613
7 changed files with 42 additions and 40 deletions

View File

@ -34,7 +34,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: 91, y: -52.5} m_AnchoredPosition: {x: 95.6, y: -52.5}
m_SizeDelta: {x: 210.9, y: 50} m_SizeDelta: {x: 210.9, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &95890888 --- !u!222 &95890888
@ -2844,7 +2844,7 @@ MonoBehaviour:
m_Alignment: 3 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 11.15-11.28 m_Text: 11.15-11.28
@ -2882,8 +2882,8 @@ RectTransform:
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}
m_AnchoredPosition: {x: 100.24, y: -52.5} m_AnchoredPosition: {x: 124, y: -52.5}
m_SizeDelta: {x: 543.53, y: 50} m_SizeDelta: {x: 210.9, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5141270839687492266 --- !u!222 &5141270839687492266
CanvasRenderer: CanvasRenderer:
@ -2923,7 +2923,7 @@ MonoBehaviour:
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 1
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\uFF08\u5269\u4F59\u65F6\u95F4\uFF1A05:02:53\uFF09" m_Text: "\uFF08\u5269\u4F59\u65F6\u95F4\uFF1A05:02:53\uFF09"

View File

@ -559,8 +559,8 @@ RectTransform:
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}
m_AnchoredPosition: {x: 1.5999999, y: -80.600006} m_AnchoredPosition: {x: 1.5999999, y: -93}
m_SizeDelta: {x: 150, y: 31.18} m_SizeDelta: {x: 150, y: 56}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &798116320357788934 --- !u!222 &798116320357788934
CanvasRenderer: CanvasRenderer:
@ -594,15 +594,15 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30 m_FontSize: 30
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 1
m_MinSize: 2 m_MinSize: 14
m_MaxSize: 40 m_MaxSize: 30
m_Alignment: 1 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 0
m_LineSpacing: 0.7 m_LineSpacing: 1
m_Text: lv 1 m_Text: lv 1
--- !u!1 &576510005279015588 --- !u!1 &576510005279015588
GameObject: GameObject:
@ -1093,8 +1093,8 @@ RectTransform:
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}
m_AnchoredPosition: {x: 1.5999999, y: -80.600006} m_AnchoredPosition: {x: 1.6, y: -88.2}
m_SizeDelta: {x: 81.99, y: 31.18} m_SizeDelta: {x: 153.2, y: 52.7}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &797259421257327180 --- !u!222 &797259421257327180
CanvasRenderer: CanvasRenderer:
@ -1128,14 +1128,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30 m_FontSize: 30
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 1
m_MinSize: 2 m_MinSize: 14
m_MaxSize: 40 m_MaxSize: 30
m_Alignment: 1 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "d\u7B49\u7EA71" m_Text: "d\u7B49\u7EA71"
LanguageIndex: 0 LanguageIndex: 0

View File

@ -576,8 +576,8 @@ RectTransform:
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}
m_AnchoredPosition: {x: -31.350037, y: 286.60507} m_AnchoredPosition: {x: 15.75, y: 276.75}
m_SizeDelta: {x: 197.07, y: 47.75} m_SizeDelta: {x: 1064.5, y: 67.505}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2380982328895866829 --- !u!222 &2380982328895866829
CanvasRenderer: CanvasRenderer:
@ -611,14 +611,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 35 m_FontSize: 35
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 1
m_MinSize: 0 m_MinSize: 26
m_MaxSize: 70 m_MaxSize: 35
m_Alignment: 3 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u83B7\u5F97\u9E3F\u8499\u9635\u5171\u9E23\u6548\u679C" m_Text: "\u83B7\u5F97\u9E3F\u8499\u9635\u5171\u9E23\u6548\u679C"
LanguageIndex: 10900 LanguageIndex: 10900

View File

@ -1988,8 +1988,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 122.402466, y: 37.29016} m_AnchoredPosition: {x: 228.2, y: 33.2}
m_SizeDelta: {x: 94, y: 34.5} m_SizeDelta: {x: 320.8, y: 42.7}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2878907979627942363 --- !u!222 &2878907979627942363
CanvasRenderer: CanvasRenderer:
@ -2023,14 +2023,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 28 m_FontSize: 28
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 1
m_MinSize: 2 m_MinSize: 14
m_MaxSize: 40 m_MaxSize: 28
m_Alignment: 6 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 0 m_RichText: 0
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u5171\u9E23\u6548\u679C\u8BE6\u60C5" m_Text: "\u5171\u9E23\u6548\u679C\u8BE6\u60C5"
LanguageIndex: 10145 LanguageIndex: 10145

View File

@ -28451,7 +28451,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: 73, y: -11} m_AnchoredPosition: {x: 49, y: -11}
m_SizeDelta: {x: 257, y: 297.3} m_SizeDelta: {x: 257, y: 297.3}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9142705236749420721 --- !u!222 &9142705236749420721

View File

@ -69,6 +69,7 @@ end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写) --界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function RankingSingleListPanel:OnShow() function RankingSingleListPanel:OnShow()
this.scrollParentView:SetActive(true)
-- local asda = {} -- local asda = {}
-- this.scrollView:SetData(asda,function(index,root) -- this.scrollView:SetData(asda,function(index,root)
-- this.ShowTrialInfo(root,asda[index],nil) -- this.ShowTrialInfo(root,asda[index],nil)
@ -165,7 +166,7 @@ function this.SetRankingInfo()
this.SetRankingInfo() this.SetRankingInfo()
end) end)
end end
end,true,true) end)
end end
--显示每条数据 --显示每条数据
function this.ShowWarPowerInfo(root,data,myRankData) function this.ShowWarPowerInfo(root,data,myRankData)

View File

@ -21,7 +21,7 @@ function RoleAwakeSuccessPanel:InitComponent()
this.proImage = Util.GetGameObject(self.transform, "heroInfo/nameAndPossLayout/proImage/proImage"):GetComponent("Image") this.proImage = Util.GetGameObject(self.transform, "heroInfo/nameAndPossLayout/proImage/proImage"):GetComponent("Image")
this.starGrid = Util.GetGameObject(self.transform, "heroInfo/sartAndLvLayout") this.starGrid = Util.GetGameObject(self.transform, "heroInfo/sartAndLvLayout")
this.posBgImage=Util.GetGameObject(self.transform,"Pos"):GetComponent("Image") this.posBgImage=Util.GetGameObject(self.transform,"Pos"):GetComponent("Image")
this.posText=Util.GetGameObject(self.transform,"Pos/PosText"):GetComponent("Text") this.posText=Util.GetGameObject(this.posBgImage.gameObject,"PosText"):GetComponent("Text")
this.lvEndInfo=Util.GetGameObject(self.transform, "proInfo/lvEndText"):GetComponent("Text") this.lvEndInfo=Util.GetGameObject(self.transform, "proInfo/lvEndText"):GetComponent("Text")
@ -76,6 +76,7 @@ function RoleAwakeSuccessPanel:OnOpen(_curHeroData,_nextHeroUpStarId,_curHeroRan
this.heroName.text =GetLanguageStrById(curHeroData.heroConfig.ReadingName) this.heroName.text =GetLanguageStrById(curHeroData.heroConfig.ReadingName)
this.posBgImage.sprite=Util.LoadSprite(GetHeroPosBgStr(curHeroData.heroConfig.Profession)) this.posBgImage.sprite=Util.LoadSprite(GetHeroPosBgStr(curHeroData.heroConfig.Profession))
this.posText.text=GetLanguageStrById(curHeroData.heroConfig.HeroLocation) this.posText.text=GetLanguageStrById(curHeroData.heroConfig.HeroLocation)
SetTextVerTial(this.posText.transform,Vector3.New(70,0,0))
this.lvEndInfo.text=string.format(Language[11791],curHeroRankUpConfigOpenLevel) this.lvEndInfo.text=string.format(Language[11791],curHeroRankUpConfigOpenLevel)
local TalentData = this.GetNewTalentDataShow() local TalentData = this.GetNewTalentDataShow()
LogPink("TalentData "..#TalentData) LogPink("TalentData "..#TalentData)