Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
8046913cef
|
@ -89197,7 +89197,7 @@ MonoBehaviour:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 7224308302718123313}
|
m_GameObject: {fileID: 7224308302718123313}
|
||||||
m_Enabled: 1
|
m_Enabled: 0
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
|
@ -89255,9 +89255,9 @@ MonoBehaviour:
|
||||||
loop: 0
|
loop: 0
|
||||||
loopType: 0
|
loopType: 0
|
||||||
targetObj: {fileID: 9156408247357342761}
|
targetObj: {fileID: 9156408247357342761}
|
||||||
isPlayAudio: 1
|
isPlayAudio: 0
|
||||||
isHaveCloseBtn: 0
|
isHaveCloseBtn: 0
|
||||||
isPlayOnOpen: 1
|
isPlayOnOpen: 0
|
||||||
--- !u!1 &7413048951530282211
|
--- !u!1 &7413048951530282211
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -519,6 +519,9 @@ function SetCardStars(starGrid, star)
|
||||||
end
|
end
|
||||||
elseif star > 9 then
|
elseif star > 9 then
|
||||||
starGrid.transform:GetChild(star).gameObject:SetActive(true)
|
starGrid.transform:GetChild(star).gameObject:SetActive(true)
|
||||||
|
if star > 10 then
|
||||||
|
Util.GetGameObject(starGrid.transform:GetChild(star),"star").gameObject:SetActive(false)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- 在给定节点下加载预设, 返回实例化的预设
|
-- 在给定节点下加载预设, 返回实例化的预设
|
||||||
|
|
|
@ -141,11 +141,6 @@ function HandBookHeroInfoPanel:OnShow()
|
||||||
Util.ClearChild(self.rightObj.transform)
|
Util.ClearChild(self.rightObj.transform)
|
||||||
|
|
||||||
self:RefreshHeroLive()
|
self:RefreshHeroLive()
|
||||||
if heroConFigData.MaxRank > 5 then
|
|
||||||
this.laiiyuanBtn.gameObject:SetActive(true)
|
|
||||||
else
|
|
||||||
this.laiiyuanBtn.gameObject:SetActive(false)
|
|
||||||
end
|
|
||||||
if PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout2 then
|
if PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout2 then
|
||||||
PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout = true
|
PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout = true
|
||||||
PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout2 = true
|
PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout2 = true
|
||||||
|
@ -213,6 +208,11 @@ function HandBookHeroInfoPanel:SetPanelBg(heroData)
|
||||||
this.bgImageList[i]:SetActive(false)
|
this.bgImageList[i]:SetActive(false)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
if heroConFigData.MaxRank > 5 then
|
||||||
|
this.laiiyuanBtn.gameObject:SetActive(true)
|
||||||
|
else
|
||||||
|
this.laiiyuanBtn.gameObject:SetActive(false)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--刷新页签数据
|
--刷新页签数据
|
||||||
|
|
|
@ -244,21 +244,23 @@ function ElementDrawCardPanelNew:OnShow(orginLayer)
|
||||||
self.itemPos[i].codeLayer.sortingOrder = self.sortingOrder + 2
|
self.itemPos[i].codeLayer.sortingOrder = self.sortingOrder + 2
|
||||||
Util.SetParticleSortLayer(self.itemPos[i].effect, self.sortingOrder + 1)
|
Util.SetParticleSortLayer(self.itemPos[i].effect, self.sortingOrder + 1)
|
||||||
end
|
end
|
||||||
self.itemPosCom.enabled = false
|
self.itemPosCom.enabled = true
|
||||||
if isPlayAnim then
|
ForceRebuildLayout(self.itemPosCom.transform)
|
||||||
isPlayAnim = false
|
-- self.itemPosCom.enabled = false
|
||||||
local anims = self.gameObject:GetComponentsInChildren(typeof(PlayFlyAnim))
|
-- if isPlayAnim then
|
||||||
if anims.Length > 0 then
|
-- isPlayAnim = false
|
||||||
for i = 0, anims.Length - 1 do
|
-- local anims = self.gameObject:GetComponentsInChildren(typeof(PlayFlyAnim))
|
||||||
local anim = anims[i]
|
-- if anims.Length > 0 then
|
||||||
if anim.isPlayOnOpen then
|
-- for i = 0, anims.Length - 1 do
|
||||||
anim:PlayAnim(false,function()
|
-- local anim = anims[i]
|
||||||
self.itemPosCom.enabled = true
|
-- if anim.isPlayOnOpen then
|
||||||
end)
|
-- anim:PlayAnim(false,function()
|
||||||
end
|
-- self.itemPosCom.enabled = true
|
||||||
end
|
-- end)
|
||||||
end
|
-- end
|
||||||
end
|
-- end
|
||||||
|
-- end
|
||||||
|
-- end
|
||||||
-- Timer.New(function()
|
-- Timer.New(function()
|
||||||
-- self.itemPosCom.enabled = true
|
-- self.itemPosCom.enabled = true
|
||||||
-- end,0.5):Start()
|
-- end,0.5):Start()
|
||||||
|
|
|
@ -30,7 +30,7 @@ function this.UpdateData(msg)
|
||||||
this.rewardStateData = msg.treasureRewardState
|
this.rewardStateData = msg.treasureRewardState
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
this.TreasrueState = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106)
|
this.TreasrueState = msg.isBuy--OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.SetTreasureState()
|
function this.SetTreasureState()
|
||||||
|
|
|
@ -85,29 +85,79 @@ local function SetPosition(self, dv2,isBack)
|
||||||
else
|
else
|
||||||
dv2.y = 0
|
dv2.y = 0
|
||||||
end
|
end
|
||||||
local fv2 = av2 + dv2
|
|
||||||
|
|
||||||
--if not self.elastic then
|
--if not self.elastic then
|
||||||
if self.itemDis > 0 then
|
if self.itemDis > 0 then
|
||||||
if self.dragType == 1 then
|
if self.dragType == 1 then
|
||||||
if fv2.y < (0 - self.maxOffSet) or fv2.y > (self.itemDis + self.maxOffSet) then
|
if av2.y < (0 - self.maxOffSet) then
|
||||||
fv2.y = math.clamp(fv2.y, 0, self.itemDis)
|
self.isReachMax = 1
|
||||||
if not isBack then
|
elseif av2.y > (self.itemDis + self.maxOffSet) then
|
||||||
return
|
self.isReachMax = 2
|
||||||
end
|
else
|
||||||
end
|
self.isReachMax = 0
|
||||||
elseif self.dragType == 2 then
|
end
|
||||||
if fv2.x < (0 - self.maxOffSet) or fv2.x > (self.itemDis + self.maxOffSet) then
|
elseif self.dragType == 2 then
|
||||||
fv2.x = math.clamp(-fv2.x, -self.itemDis, 0)
|
if av2.x > (0 + self.maxOffSet) then
|
||||||
if not isBack then
|
self.isReachMax = 1
|
||||||
return
|
elseif av2.x < -(self.itemDis + self.maxOffSet) then
|
||||||
end
|
self.isReachMax = 2
|
||||||
end
|
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
|
end
|
||||||
else
|
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
|
||||||
--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
|
self.dragGOTran.anchoredPosition = fv2
|
||||||
|
|
||||||
local curIndex
|
local curIndex
|
||||||
|
@ -132,7 +182,10 @@ local function OnBeginDrag(self, Pointgo, data)
|
||||||
self.moveTween.enabled = true
|
self.moveTween.enabled = true
|
||||||
self.moveTween.Momentum = Vector3.zero
|
self.moveTween.Momentum = Vector3.zero
|
||||||
self.moveTween.IsUseCallBack = false
|
self.moveTween.IsUseCallBack = false
|
||||||
|
self.isReachMax = 0
|
||||||
data:Use()
|
data:Use()
|
||||||
|
self.moveTween.Strength = 1
|
||||||
|
self.realPos = self.dragGOTran.anchoredPosition
|
||||||
end
|
end
|
||||||
|
|
||||||
local function OnDrag(self, Pointgo, data)
|
local function OnDrag(self, Pointgo, data)
|
||||||
|
@ -150,6 +203,8 @@ local function OnEndDrag(self, Pointgo, data)
|
||||||
self.moveTween.IsUseCallBack = true
|
self.moveTween.IsUseCallBack = true
|
||||||
data:Use()
|
data:Use()
|
||||||
self.isBeginDrag = false
|
self.isBeginDrag = false
|
||||||
|
self.isReachMax = 0
|
||||||
|
self.moveTween.Strength = 1
|
||||||
end
|
end
|
||||||
|
|
||||||
local function OnMoveEnd(self)
|
local function OnMoveEnd(self)
|
||||||
|
|
Loading…
Reference in New Issue