Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
7b28309e1c
|
@ -64435,7 +64435,7 @@ MonoBehaviour:
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 0
|
m_MinSize: 0
|
||||||
m_MaxSize: 60
|
m_MaxSize: 60
|
||||||
m_Alignment: 0
|
m_Alignment: 1
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
|
|
|
@ -1058,7 +1058,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 526, y: -21.5}
|
m_AnchoredPosition: {x: 554, y: -25}
|
||||||
m_SizeDelta: {x: 284, y: 42}
|
m_SizeDelta: {x: 284, y: 42}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1776344020
|
--- !u!222 &1776344020
|
||||||
|
@ -6700,7 +6700,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0, y: 0.5}
|
m_AnchorMin: {x: 0, y: 0.5}
|
||||||
m_AnchorMax: {x: 0, y: 0.5}
|
m_AnchorMax: {x: 0, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 30, y: 71.9}
|
m_AnchoredPosition: {x: 30, y: 71.9}
|
||||||
m_SizeDelta: {x: 668, y: 43}
|
m_SizeDelta: {x: 696, y: 50}
|
||||||
m_Pivot: {x: 0, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!222 &2518333084048825677
|
--- !u!222 &2518333084048825677
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -6930,7 +6930,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 76, y: -21.5}
|
m_AnchoredPosition: {x: 76, y: -25}
|
||||||
m_SizeDelta: {x: 152, y: 42}
|
m_SizeDelta: {x: 152, y: 42}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2518333084341339611
|
--- !u!222 &2518333084341339611
|
||||||
|
@ -14130,8 +14130,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 363, y: -21.5}
|
m_AnchoredPosition: {x: 377, y: -25}
|
||||||
m_SizeDelta: {x: 22, y: 43}
|
m_SizeDelta: {x: 50, y: 50}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5213216419983842381
|
--- !u!222 &5213216419983842381
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -14161,7 +14161,7 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_Sprite: {fileID: 21300000, guid: 1e2d84c75cd281242a2bf1f69edfec36, type: 3}
|
m_Sprite: {fileID: 21300000, guid: 9b622bdc0076f3943adb78ee8d828620, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
@ -15968,7 +15968,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229,
|
- target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -21.5
|
value: -25
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229,
|
- target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
|
@ -32,7 +32,7 @@ local _ViewConfig = {
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
local curPlayerName = ""
|
||||||
local _PlayerHead = nil
|
local _PlayerHead = nil
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function PlayerInfoPopup:InitComponent()
|
function PlayerInfoPopup:InitComponent()
|
||||||
|
@ -155,6 +155,7 @@ function PlayerInfoPopup:OnShow()
|
||||||
-- LogGreen(this._PlayerId.." "..this._Config.formationType)
|
-- LogGreen(this._PlayerId.." "..this._Config.formationType)
|
||||||
NetManager.RequestPlayerInfo(this._PlayerId, this._Config.formationType, function(msg)
|
NetManager.RequestPlayerInfo(this._PlayerId, this._Config.formationType, function(msg)
|
||||||
-- 如果是好友更新好友数据
|
-- 如果是好友更新好友数据
|
||||||
|
curPlayerName = msg.teamInfo.name
|
||||||
GoodFriendManager.UpdateFriendData(this._PlayerId, msg.teamInfo.level, JingJiShouWeiToEn(msg.teamInfo.name) , msg.teamInfo.head, msg.teamInfo.headFrame)
|
GoodFriendManager.UpdateFriendData(this._PlayerId, msg.teamInfo.level, JingJiShouWeiToEn(msg.teamInfo.name) , msg.teamInfo.head, msg.teamInfo.headFrame)
|
||||||
this._PlayerData = msg.teamInfo
|
this._PlayerData = msg.teamInfo
|
||||||
this.RefreshPlayerInfo(msg.teamInfo)
|
this.RefreshPlayerInfo(msg.teamInfo)
|
||||||
|
@ -162,6 +163,7 @@ function PlayerInfoPopup:OnShow()
|
||||||
this.FormationAdapter(teamInfo)
|
this.FormationAdapter(teamInfo)
|
||||||
--
|
--
|
||||||
this.RefreshFunction()
|
this.RefreshFunction()
|
||||||
|
this.RefreshBtnShow()
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -291,7 +293,7 @@ end
|
||||||
-- 刷新按钮显示
|
-- 刷新按钮显示
|
||||||
function this.RefreshBtnShow()
|
function this.RefreshBtnShow()
|
||||||
-- 自己
|
-- 自己
|
||||||
if this._PlayerId == PlayerManager.uid then
|
if this._PlayerId == PlayerManager.uid or curPlayerName == Language[12230] then
|
||||||
this.boxLine:SetActive(false)
|
this.boxLine:SetActive(false)
|
||||||
this.btnBox:SetActive(false)
|
this.btnBox:SetActive(false)
|
||||||
return
|
return
|
||||||
|
|
|
@ -294,6 +294,9 @@ function RewardItemSingleShowPopup:OnShow()
|
||||||
end
|
end
|
||||||
for i = 1, #jumpSortData do
|
for i = 1, #jumpSortData do
|
||||||
if jumpSortData[i].id > 0 then
|
if jumpSortData[i].id > 0 then
|
||||||
|
if JumpConfig[jumpSortData[i].id].Type < 10000 then
|
||||||
|
if not ActTimeCtrlManager.SingleFuncState(JumpConfig[jumpSortData[i].id].Type) then break end
|
||||||
|
end
|
||||||
if not RECHARGEABLE then--(是否开启充值)
|
if not RECHARGEABLE then--(是否开启充值)
|
||||||
if this.isRewardItemPop == true or itemConfigData.Id == 61 or itemConfigData.Id == 19 or itemConfigData.ItemType == 17 then
|
if this.isRewardItemPop == true or itemConfigData.Id == 61 or itemConfigData.Id == 19 or itemConfigData.ItemType == 17 then
|
||||||
SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,false,self)
|
SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,false,self)
|
||||||
|
|
|
@ -390,7 +390,6 @@ function GiftView:RefreshShowData(item, data, buyType, DataTypeIndex)
|
||||||
--绑定组件
|
--绑定组件
|
||||||
local localSelf = self
|
local localSelf = self
|
||||||
local name = Util.GetGameObject(item, "context/text"):GetComponent("Text")
|
local name = Util.GetGameObject(item, "context/text"):GetComponent("Text")
|
||||||
Util.GetGameObject(item, "context/Image"):GetComponent("Image").sprite = Util.LoadSprite("c_czlb_yuan_zh")
|
|
||||||
local icon = Util.GetGameObject(item, "btnBuy/icon")
|
local icon = Util.GetGameObject(item, "btnBuy/icon")
|
||||||
local price = Util.GetGameObject(item, "btnBuy/price"):GetComponent("Text")
|
local price = Util.GetGameObject(item, "btnBuy/price"):GetComponent("Text")
|
||||||
local buyInfo = Util.GetGameObject(item, "buyInfo"):GetComponent("Text")
|
local buyInfo = Util.GetGameObject(item, "buyInfo"):GetComponent("Text")
|
||||||
|
|
Loading…
Reference in New Issue