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

dev_chengFeng
gaoxin 2021-03-07 17:43:12 +08:00
commit 89ff803da0
10 changed files with 46 additions and 143 deletions

View File

@ -34,7 +34,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: 95.6, y: -52.5}
m_AnchoredPosition: {x: 91, y: -52.5}
m_SizeDelta: {x: 210.9, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &95890888
@ -510,7 +510,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 248.8, y: 0}
m_SizeDelta: {x: 199.5, y: 50}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1292293278
CanvasRenderer:
@ -2882,7 +2882,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: 124, y: -52.5}
m_AnchoredPosition: {x: 119.7, y: -52.5}
m_SizeDelta: {x: 210.9, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5141270839687492266

View File

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

View File

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

View File

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

View File

@ -530,14 +530,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 20
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u8FDB\u884C"
LanguageIndex: 0

View File

@ -3257,7 +3257,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1918779212887374031}
- {fileID: 1076924525213601081}
m_Father: {fileID: 1918779212270220639}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4465,8 +4464,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 18.549988}
m_SizeDelta: {x: 335.2, y: 37.1}
m_AnchoredPosition: {x: 0, y: -18.55}
m_SizeDelta: {x: 459.73, y: 37.1}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &1918779212887373872
CanvasRenderer:
@ -4516,7 +4515,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 6
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -6436,100 +6435,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &3802844986406592470
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1076924525213601081}
- component: {fileID: 6365935994801057981}
- component: {fileID: 4474535916462347978}
- component: {fileID: 7060985104303015056}
m_Layer: 5
m_Name: time
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1076924525213601081
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3802844986406592470}
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: 3291570141714537517}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 40.2, y: -16.6}
m_SizeDelta: {x: 335.2, y: 37.1}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &6365935994801057981
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3802844986406592470}
m_CullTransparentMesh: 0
--- !u!114 &4474535916462347978
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3802844986406592470}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3}
m_Name:
m_EditorClassIdentifier:
_textSpacing: -1
--- !u!114 &7060985104303015056
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3802844986406592470}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.3018868, g: 0.3018868, b: 0.3018868, 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_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 27
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u6D3B\u52A8\u65F6\u95F4\uFF1A"
LanguageIndex: 11708
--- !u!1 &4143447345719299696
GameObject:
m_ObjectHideFlags: 0

View File

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

View File

@ -16,7 +16,7 @@ function this:InitComponent(gameObject)
this.quesBtn = Util.GetGameObject(this.gameObject, "bg/quesBtn")
this.helpPosition= this.quesBtn:GetComponent("RectTransform").localPosition
this.tips = Util.GetGameObject(this.gameObject, "bg/topBar/tips"):GetComponent("Text")
this.time = Util.GetGameObject(this.gameObject, "bg/topBar/time/time"):GetComponent("Text")
this.time = Util.GetGameObject(this.gameObject, "bg/topBar/time/Text"):GetComponent("Text")
this.buyBtn = Util.GetGameObject(this.gameObject, "bg/topBar/button/buyBtn")
this.buyBtnText = Util.GetGameObject(this.buyBtn, "Text"):GetComponent("Text")
@ -95,7 +95,7 @@ function this:OnShow(_parent,...)
end
this.tips.text = Language[11323]
local startTime,endTime,endTimeScale = QinglongSerectTreasureManager.GetTimeStartToEnd()
this.time.text = startTime.."-"..endTime
this.time.text = Language[10584]..startTime.."-"..endTime
this.remainTime.text = Language[10470]..TimeToDHMS(tonumber(endTimeScale) - GetTimeStamp())
this:ShowTime(endTimeScale)
this.refresh(true,true)

View File

@ -69,7 +69,6 @@ end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function RankingSingleListPanel:OnShow()
this.scrollParentView:SetActive(true)
-- local asda = {}
-- this.scrollView:SetData(asda,function(index,root)
-- this.ShowTrialInfo(root,asda[index],nil)
@ -166,7 +165,7 @@ function this.SetRankingInfo()
this.SetRankingInfo()
end)
end
end)
end,true,true)
end
--显示每条数据
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.starGrid = Util.GetGameObject(self.transform, "heroInfo/sartAndLvLayout")
this.posBgImage=Util.GetGameObject(self.transform,"Pos"):GetComponent("Image")
this.posText=Util.GetGameObject(this.posBgImage.gameObject,"PosText"):GetComponent("Text")
this.posText=Util.GetGameObject(self.transform,"Pos/PosText"):GetComponent("Text")
this.lvEndInfo=Util.GetGameObject(self.transform, "proInfo/lvEndText"):GetComponent("Text")
@ -76,7 +76,6 @@ function RoleAwakeSuccessPanel:OnOpen(_curHeroData,_nextHeroUpStarId,_curHeroRan
this.heroName.text =GetLanguageStrById(curHeroData.heroConfig.ReadingName)
this.posBgImage.sprite=Util.LoadSprite(GetHeroPosBgStr(curHeroData.heroConfig.Profession))
this.posText.text=GetLanguageStrById(curHeroData.heroConfig.HeroLocation)
SetTextVerTial(this.posText.transform,Vector3.New(70,0,0))
this.lvEndInfo.text=string.format(Language[11791],curHeroRankUpConfigOpenLevel)
local TalentData = this.GetNewTalentDataShow()
LogPink("TalentData "..#TalentData)