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

dev_chengFeng
luyao 2021-07-15 21:10:50 +08:00
commit b8afca215b
3 changed files with 5 additions and 7 deletions

View File

@ -28,7 +28,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 173196095}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalPosition: {x: 0, y: 0, z: 100.00001}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6871191882722429008}
@ -36,9 +36,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -89.5, y: -106.4}
m_AnchoredPosition: {x: -85.999695, y: -178.39969}
m_SizeDelta: {x: 68, y: 68}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.50000036, y: 0.500001}
--- !u!222 &173196099
CanvasRenderer:
m_ObjectHideFlags: 0

View File

@ -64,8 +64,6 @@ function RecruitPanelNew:InitComponent()
self.upHeroPreList[i].pos = Util.GetGameObject(self.upHeroPreList[i].go,"di")
self.upHeroPreList[i].itempos = Util.GetGameObject(self.upHeroPreList[i].go,"itempos")
self.upHeroPreList[i].item = SubUIManager.Open(SubUIConfig.ItemView,self.upHeroPreList[i].itempos.transform)
self.upHeroPreList[i].item.transform:SetSiblingIndex(1)
self.upHeroPreList[i].item.transform:GetComponent("RectTransform").anchoredPosition = Vector3.New(32,-25.5,0)
self.upHeroPreList[i].choosed = Util.GetGameObject(self.upHeroPreList[i].go,"state")
end
self.btns = {}
@ -203,7 +201,7 @@ function RecruitPanelNew:UpdataWishPanel()
local id = data.heroTid
if id > 0 then
self.upHeroPreList[i].item.gameObject:SetActive(true)
self.upHeroPreList[i].item:OnOpen(false, {id,0}, 0.7, false, false, false, self.sortingOrder)
self.upHeroPreList[i].item:OnOpen(false, {id,0},1, false, false, false, self.sortingOrder)
self.upHeroPreList[i].choosed:SetActive(data.status == 1)
else
self.upHeroPreList[i].item.gameObject:SetActive(false)

View File

@ -1 +1 @@
{"subChannel":"2000","buglyId":"261348dcd3","channel":"YX","resUrl":"http://jl.tyu89.wang/mht_china/youxin/","packageVersion":"0.1","version":"1.1.1","serverUrl":"http://60.1.1.163:8080/"}
{"subChannel":"2000","buglyId":"261348dcd3","channel":"YX","resUrl":"http://jl.tyu89.wang/mht_china/youxin/","packageVersion":"0.1","version":"1.1.1","serverUrl":"http://81.71.49.181:8080/"}