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

dev_chengFeng
gaoxin 2021-03-17 17:30:18 +08:00
commit 7b28309e1c
5 changed files with 15 additions and 11 deletions

View File

@ -64435,7 +64435,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 60
m_Alignment: 0
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0

View File

@ -1058,7 +1058,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {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_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1776344020
@ -6700,7 +6700,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
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}
--- !u!222 &2518333084048825677
CanvasRenderer:
@ -6930,7 +6930,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {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_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2518333084341339611
@ -14130,8 +14130,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: 363, y: -21.5}
m_SizeDelta: {x: 22, y: 43}
m_AnchoredPosition: {x: 377, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5213216419983842381
CanvasRenderer:
@ -14161,7 +14161,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
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_PreserveAspect: 0
m_FillCenter: 1
@ -15968,7 +15968,7 @@ PrefabInstance:
- target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -21.5
value: -25
objectReference: {fileID: 0}
- target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229,
type: 3}

View File

@ -32,7 +32,7 @@ local _ViewConfig = {
},
}
local curPlayerName = ""
local _PlayerHead = nil
--初始化组件(用于子类重写)
function PlayerInfoPopup:InitComponent()
@ -155,6 +155,7 @@ function PlayerInfoPopup:OnShow()
-- LogGreen(this._PlayerId.." "..this._Config.formationType)
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)
this._PlayerData = msg.teamInfo
this.RefreshPlayerInfo(msg.teamInfo)
@ -162,6 +163,7 @@ function PlayerInfoPopup:OnShow()
this.FormationAdapter(teamInfo)
--
this.RefreshFunction()
this.RefreshBtnShow()
end)
end
@ -291,7 +293,7 @@ end
-- 刷新按钮显示
function this.RefreshBtnShow()
-- 自己
if this._PlayerId == PlayerManager.uid then
if this._PlayerId == PlayerManager.uid or curPlayerName == Language[12230] then
this.boxLine:SetActive(false)
this.btnBox:SetActive(false)
return

View File

@ -294,6 +294,9 @@ function RewardItemSingleShowPopup:OnShow()
end
for i = 1, #jumpSortData do
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 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)

View File

@ -390,7 +390,6 @@ function GiftView:RefreshShowData(item, data, buyType, DataTypeIndex)
--绑定组件
local localSelf = self
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 price = Util.GetGameObject(item, "btnBuy/price"):GetComponent("Text")
local buyInfo = Util.GetGameObject(item, "buyInfo"):GetComponent("Text")