Merge branch 'china/dev' into china/test
commit
66134423f3
|
|
@ -1532,9 +1532,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 2569204044901933266}
|
m_Father: {fileID: 2569204044901933266}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
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: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 462.5, y: -35}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 911.109, y: 70}
|
m_SizeDelta: {x: 911.109, y: 70}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2569204044212116970
|
--- !u!222 &2569204044212116970
|
||||||
|
|
@ -1686,9 +1686,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 2569204044901933266}
|
m_Father: {fileID: 2569204044901933266}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
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: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 462.5, y: -70}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 912.8, y: 250}
|
m_SizeDelta: {x: 912.8, y: 250}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!222 &2569204044474226676
|
--- !u!222 &2569204044474226676
|
||||||
|
|
@ -1871,7 +1871,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &2569204044901933266
|
--- !u!224 &2569204044901933266
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -1888,9 +1888,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 2569204043929918739}
|
m_Father: {fileID: 2569204043929918739}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
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: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 462.5, y: -160}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 925, y: 320}
|
m_SizeDelta: {x: 925, y: 320}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &2569204044901933267
|
--- !u!114 &2569204044901933267
|
||||||
|
|
@ -2500,19 +2500,6 @@ MonoBehaviour:
|
||||||
loop: 0
|
loop: 0
|
||||||
loopType: 0
|
loopType: 0
|
||||||
targetObj: {fileID: 0}
|
targetObj: {fileID: 0}
|
||||||
- initV3: {x: 0, y: 0, z: 0}
|
|
||||||
initFloat: 0
|
|
||||||
isInit: 0
|
|
||||||
changeV3: {x: 0, y: 0, z: 0}
|
|
||||||
changeFloat: 1
|
|
||||||
duration: 0.2
|
|
||||||
delay: 0
|
|
||||||
curveType: 1
|
|
||||||
changeType: 8
|
|
||||||
sequeueType: 1
|
|
||||||
loop: 0
|
|
||||||
loopType: 0
|
|
||||||
targetObj: {fileID: 0}
|
|
||||||
- initV3: {x: 0.95, y: 0.95, z: 0.95}
|
- initV3: {x: 0.95, y: 0.95, z: 0.95}
|
||||||
initFloat: 0
|
initFloat: 0
|
||||||
isInit: 0
|
isInit: 0
|
||||||
|
|
@ -3826,11 +3813,6 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 2569204043989112587}
|
m_TransformParent: {fileID: 2569204043989112587}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 800187307388672636, guid: 6e21988006c4b0942b32c75e6b6987ba,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: fx_zhuangbeijiemian
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba,
|
- target: {fileID: 2317469752420294965, guid: 6e21988006c4b0942b32c75e6b6987ba,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
|
@ -3886,6 +3868,11 @@ PrefabInstance:
|
||||||
propertyPath: m_LocalEulerAnglesHint.z
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 800187307388672636, guid: 6e21988006c4b0942b32c75e6b6987ba,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: fx_zhuangbeijiemian
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 6e21988006c4b0942b32c75e6b6987ba, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 6e21988006c4b0942b32c75e6b6987ba, type: 3}
|
||||||
--- !u!4 &256400619242869876 stripped
|
--- !u!4 &256400619242869876 stripped
|
||||||
|
|
|
||||||
|
|
@ -93,9 +93,14 @@ function this:OnShow(_parent,_args)
|
||||||
quan.sprite=self.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[list[i][1]].Quantity].circle)
|
quan.sprite=self.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[list[i][1]].Quantity].circle)
|
||||||
local numTxt=Util.GetGameObject(this.costList[i],"num"):GetComponent("Text")
|
local numTxt=Util.GetGameObject(this.costList[i],"num"):GetComponent("Text")
|
||||||
local bagNum=BagManager.GetItemCountById(list[i][1])
|
local bagNum=BagManager.GetItemCountById(list[i][1])
|
||||||
|
--去除自身 and
|
||||||
|
if soulId==list[i][1] and (heroId==nil or heroId=="") then
|
||||||
|
bagNum=bagNum-1
|
||||||
|
end
|
||||||
if i==1 then
|
if i==1 then
|
||||||
table.insert(costIds,list[i][1])
|
table.insert(costIds,list[i][1])
|
||||||
end
|
end
|
||||||
|
|
||||||
if bagNum < list[i][2] then
|
if bagNum < list[i][2] then
|
||||||
isCan=false
|
isCan=false
|
||||||
numTxt.text=string.format("<color=#FF0000FF>%s/%s</color>",PrintWanNum(bagNum),list[i][2])
|
numTxt.text=string.format("<color=#FF0000FF>%s/%s</color>",PrintWanNum(bagNum),list[i][2])
|
||||||
|
|
|
||||||
|
|
@ -390,9 +390,9 @@ function this.SetScrollPre(root,data)
|
||||||
local pos=this.GetPos()--位置
|
local pos=this.GetPos()--位置
|
||||||
local oldPower = HeroManager.GetSingleHeroData(curHeroData.dynamicId).warPower
|
local oldPower = HeroManager.GetSingleHeroData(curHeroData.dynamicId).warPower
|
||||||
UIManager.OpenPanel(UIName.GodPrintPopUp,1,curHeroData.dynamicId,data.id,pos,function()
|
UIManager.OpenPanel(UIName.GodPrintPopUp,1,curHeroData.dynamicId,data.id,pos,function()
|
||||||
if curHeroData.dynamicId then
|
-- if curHeroData.dynamicId then
|
||||||
PopupTipPanel.ShowTip(Language[11526])
|
-- PopupTipPanel.ShowTip(Language[11526])
|
||||||
end
|
-- end
|
||||||
this.RefreshShow()
|
this.RefreshShow()
|
||||||
--对比战力并更新战力值 播放战力变更动画
|
--对比战力并更新战力值 播放战力变更动画
|
||||||
HeroManager.CompareWarPower1(curHeroData.dynamicId,oldPower)
|
HeroManager.CompareWarPower1(curHeroData.dynamicId,oldPower)
|
||||||
|
|
@ -493,12 +493,12 @@ function this.GetCurHeroSoulPrintState(id)
|
||||||
for k=1,#curHeroData.godPrintList do
|
for k=1,#curHeroData.godPrintList do
|
||||||
local _id=curHeroData.godPrintList[k].equipId
|
local _id=curHeroData.godPrintList[k].equipId
|
||||||
|
|
||||||
-- if equipConfig[_id].SuiteID==equipConfig[id].SuiteID then
|
if equipConfig[_id].SuiteID==equipConfig[id].SuiteID then
|
||||||
-- return true
|
|
||||||
-- end
|
|
||||||
if equipConfig[_id].Id==equipConfig[id].Id then
|
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
-- if equipConfig[_id].Id==equipConfig[id].Id then
|
||||||
|
-- return true
|
||||||
|
-- end
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -96,7 +96,7 @@ function GodPrintPopUp:BindEvent()
|
||||||
if curType~=2 then
|
if curType~=2 then
|
||||||
heroId=nil
|
heroId=nil
|
||||||
end
|
end
|
||||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.GodPrintUp,soulId,pos,heroId,nil)
|
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.GodPrintUp,soulId,pos,heroId,callback)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
--穿戴
|
--穿戴
|
||||||
|
|
@ -159,6 +159,7 @@ function GodPrintPopUp:BindEvent()
|
||||||
local wearInfo = {heroId = tostring(heroId),equipId = soulId,position = pos}
|
local wearInfo = {heroId = tostring(heroId),equipId = soulId,position = pos}
|
||||||
NetManager.WearGodSealRequest(1,wearInfo,function()
|
NetManager.WearGodSealRequest(1,wearInfo,function()
|
||||||
HeroManager.AddGodPrintUpHeroDynamicId(heroId,soulId,pos)
|
HeroManager.AddGodPrintUpHeroDynamicId(heroId,soulId,pos)
|
||||||
|
PopupTipPanel.ShowTip(Language[11526])
|
||||||
HeroPropManager.SetDirtyByType(wearInfo.heroId, Hero_Prop_Type.GodPrint)
|
HeroPropManager.SetDirtyByType(wearInfo.heroId, Hero_Prop_Type.GodPrint)
|
||||||
if callback then
|
if callback then
|
||||||
callback()
|
callback()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue