Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop

dev_chengFeng
wangzhenxing 2023-02-23 15:33:07 +08:00
commit 438e09fdcd
2 changed files with 86 additions and 0 deletions

View File

@ -1886,6 +1886,7 @@ RectTransform:
- {fileID: 2866081251682980860}
- {fileID: 642658349}
- {fileID: 2466546000184883600}
- {fileID: 8487607530837184666}
m_Father: {fileID: 1197411485}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4326,6 +4327,85 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u6211\u7684\u6392\u540D"
--- !u!1 &8672857293765675362
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8487607530837184666}
- component: {fileID: 7300353593644335419}
- component: {fileID: 4491763352922409576}
m_Layer: 5
m_Name: myRank
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8487607530837184666
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8672857293765675362}
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: 1928608338}
m_RootOrder: 17
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: -364.4, y: 824.2}
m_SizeDelta: {x: 287.8, y: 92.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7300353593644335419
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8672857293765675362}
m_CullTransparentMesh: 0
--- !u!114 &4491763352922409576
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8672857293765675362}
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.47058824, g: 0.31764707, b: 0, 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 45
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 50
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u6211\u7684\u6392\u540D"
--- !u!1 &8863254459455005950
GameObject:
m_ObjectHideFlags: 0

View File

@ -31,6 +31,7 @@ function this:InitComponent()
this.selectTxt=Util.GetGameObject(self.gameObject, "bg/tabSelectBtn/Text"):GetComponent("Text")
this.tabBox=Util.GetGameObject(self.gameObject, "bg/TabBox")
this.btn_help=Util.GetGameObject(self.gameObject, "bg/btn_help")
this.myRank=Util.GetGameObject(self.gameObject, "bg/myRank"):GetComponent("Text")
local rootHight = this.rewardGrid.transform.rect.height
local width = this.rewardGrid.transform.rect.width
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.rewardGrid.transform,this.rewardItem, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0,0))
@ -154,6 +155,11 @@ function this.ChangeWindow(config)
LogError("ranktype=="..rankType)
local ranks,myRank = RankingManager.GetRankingInfo()
ownRank=myRank.rank
if ownRank>0 then
this.myRank.text="我的排名:"..ownRank
else
this.myRank.text=""
end
LogError("ranks len======="..#ranks)
--this.SetRoleRank(ranks,myRank,true,true)
if type==1 then