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

dev_chengFeng
gaoxin 2021-08-09 10:34:38 +08:00
commit 8046913cef
6 changed files with 103 additions and 43 deletions

View File

@ -89197,7 +89197,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7224308302718123313}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
@ -89255,9 +89255,9 @@ MonoBehaviour:
loop: 0
loopType: 0
targetObj: {fileID: 9156408247357342761}
isPlayAudio: 1
isPlayAudio: 0
isHaveCloseBtn: 0
isPlayOnOpen: 1
isPlayOnOpen: 0
--- !u!1 &7413048951530282211
GameObject:
m_ObjectHideFlags: 0

View File

@ -519,6 +519,9 @@ function SetCardStars(starGrid, star)
end
elseif star > 9 then
starGrid.transform:GetChild(star).gameObject:SetActive(true)
if star > 10 then
Util.GetGameObject(starGrid.transform:GetChild(star),"star").gameObject:SetActive(false)
end
end
end
-- 在给定节点下加载预设, 返回实例化的预设

View File

@ -141,11 +141,6 @@ function HandBookHeroInfoPanel:OnShow()
Util.ClearChild(self.rightObj.transform)
self:RefreshHeroLive()
if heroConFigData.MaxRank > 5 then
this.laiiyuanBtn.gameObject:SetActive(true)
else
this.laiiyuanBtn.gameObject:SetActive(false)
end
if PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout2 then
PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout = true
PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout2 = true
@ -213,6 +208,11 @@ function HandBookHeroInfoPanel:SetPanelBg(heroData)
this.bgImageList[i]:SetActive(false)
end
end
if heroConFigData.MaxRank > 5 then
this.laiiyuanBtn.gameObject:SetActive(true)
else
this.laiiyuanBtn.gameObject:SetActive(false)
end
end
--刷新页签数据

View File

@ -244,21 +244,23 @@ function ElementDrawCardPanelNew:OnShow(orginLayer)
self.itemPos[i].codeLayer.sortingOrder = self.sortingOrder + 2
Util.SetParticleSortLayer(self.itemPos[i].effect, self.sortingOrder + 1)
end
self.itemPosCom.enabled = false
if isPlayAnim then
isPlayAnim = false
local anims = self.gameObject:GetComponentsInChildren(typeof(PlayFlyAnim))
if anims.Length > 0 then
for i = 0, anims.Length - 1 do
local anim = anims[i]
if anim.isPlayOnOpen then
anim:PlayAnim(false,function()
self.itemPosCom.enabled = true
end)
end
end
end
end
self.itemPosCom.enabled = true
ForceRebuildLayout(self.itemPosCom.transform)
-- self.itemPosCom.enabled = false
-- if isPlayAnim then
-- isPlayAnim = false
-- local anims = self.gameObject:GetComponentsInChildren(typeof(PlayFlyAnim))
-- if anims.Length > 0 then
-- for i = 0, anims.Length - 1 do
-- local anim = anims[i]
-- if anim.isPlayOnOpen then
-- anim:PlayAnim(false,function()
-- self.itemPosCom.enabled = true
-- end)
-- end
-- end
-- end
-- end
-- Timer.New(function()
-- self.itemPosCom.enabled = true
-- end,0.5):Start()

View File

@ -30,7 +30,7 @@ function this.UpdateData(msg)
this.rewardStateData = msg.treasureRewardState
end
end
this.TreasrueState = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106)
this.TreasrueState = msg.isBuy--OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106)
end
function this.SetTreasureState()

View File

@ -85,29 +85,79 @@ local function SetPosition(self, dv2,isBack)
else
dv2.y = 0
end
local fv2 = av2 + dv2
--if not self.elastic then
if self.itemDis > 0 then
if self.dragType == 1 then
if fv2.y < (0 - self.maxOffSet) or fv2.y > (self.itemDis + self.maxOffSet) then
fv2.y = math.clamp(fv2.y, 0, self.itemDis)
if not isBack then
return
end
end
elseif self.dragType == 2 then
if fv2.x < (0 - self.maxOffSet) or fv2.x > (self.itemDis + self.maxOffSet) then
fv2.x = math.clamp(-fv2.x, -self.itemDis, 0)
if not isBack then
return
end
end
if self.itemDis > 0 then
if self.dragType == 1 then
if av2.y < (0 - self.maxOffSet) then
self.isReachMax = 1
elseif av2.y > (self.itemDis + self.maxOffSet) then
self.isReachMax = 2
else
self.isReachMax = 0
end
elseif self.dragType == 2 then
if av2.x > (0 + self.maxOffSet) then
self.isReachMax = 1
elseif av2.x < -(self.itemDis + self.maxOffSet) then
self.isReachMax = 2
else
self.isReachMax = 0
end
end
else
return
end
self.realPos = av2 + dv2
if self.isReachMax ~= 0 then
self.moveTween.MomentumAmount = 0
self.moveTween.Momentum = Vector3.zero
self.moveTween.Strength = 10
self.moveTween:LerpMomentum(Vector3.zero)
if self.dragType == 1 then
if (self.realPos + dv2).y < self.realPos.y and self.isReachMax == 1 then
dv2.y = 0
elseif (self.realPos + dv2).y > self.realPos.y and self.isReachMax == 2 then
dv2.y = 0
end
else
return
if (self.realPos + dv2).x > self.realPos.x and self.isReachMax == 1 then
dv2.x = 0
elseif (self.realPos + dv2).x < self.realPos.x and self.isReachMax == 2 then
dv2.x = 0
end
end
--end
else
self.moveTween.Strength = 1
self.moveTween.MomentumAmount = 1
end
local fv2 = av2 + dv2
-- --if not self.elastic then
-- if self.itemDis > 0 then
-- if self.dragType == 1 then
-- if fv2.y < (0 - self.maxOffSet) then
-- fv2.y = 0 - self.maxOffSet
-- self.isReachMax = true
-- elseif fv2.y > (self.itemDis + self.maxOffSet) then
-- fv2.y = self.itemDis + self.maxOffSet
-- self.isReachMax = true
-- else
-- self.isReachMax = false
-- end
-- elseif self.dragType == 2 then
-- if fv2.x > (0 + self.maxOffSet) then
-- fv2.x = (0 + self.maxOffSet)
-- self.isReachMax = true
-- elseif fv2.x < -(self.itemDis + self.maxOffSet) then
-- fv2.x = -(self.itemDis + self.maxOffSet)
-- self.isReachMax = true
-- else
-- self.isReachMax = false
-- end
-- end
-- else
-- return
-- end
self.dragGOTran.anchoredPosition = fv2
local curIndex
@ -132,7 +182,10 @@ local function OnBeginDrag(self, Pointgo, data)
self.moveTween.enabled = true
self.moveTween.Momentum = Vector3.zero
self.moveTween.IsUseCallBack = false
self.isReachMax = 0
data:Use()
self.moveTween.Strength = 1
self.realPos = self.dragGOTran.anchoredPosition
end
local function OnDrag(self, Pointgo, data)
@ -150,6 +203,8 @@ local function OnEndDrag(self, Pointgo, data)
self.moveTween.IsUseCallBack = true
data:Use()
self.isBeginDrag = false
self.isReachMax = 0
self.moveTween.Strength = 1
end
local function OnMoveEnd(self)