命格修改提交
parent
0e083205a3
commit
2b93776f7c
File diff suppressed because it is too large
Load Diff
|
|
@ -5109,6 +5109,7 @@ RectTransform:
|
|||
- {fileID: 6289080837045013737}
|
||||
- {fileID: 6261284298473088597}
|
||||
- {fileID: 2751805522823345747}
|
||||
- {fileID: 4557629352460047959}
|
||||
m_Father: {fileID: 224797861638971062}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -39373,6 +39374,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &3785884355970210309
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4557629352460047959}
|
||||
- component: {fileID: 5649685251962768694}
|
||||
- component: {fileID: 7558079773466867239}
|
||||
m_Layer: 5
|
||||
m_Name: upImg
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4557629352460047959
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3785884355970210309}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224550793111032812}
|
||||
m_RootOrder: 16
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 45.6, y: 34.8}
|
||||
m_SizeDelta: {x: 50, y: 66}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5649685251962768694
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3785884355970210309}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7558079773466867239
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3785884355970210309}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 736b010be2bfac44bb6520822053e76b, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &3803455112433413651
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -1006,6 +1006,8 @@ RedPointType = {
|
|||
Practice_main = 5000,--主界面下方按钮
|
||||
Practice = 500,--主界面下方tab按钮——修行
|
||||
Gem = 600,--主界面下方tab按钮——命石
|
||||
Gem_1 =601,
|
||||
Gem_2 = 602,
|
||||
Practice_upgrade = 5001,--突破按钮
|
||||
Practice_imprint = 5002,--神印按钮
|
||||
Practice_fourQua = 5003,--四象心法
|
||||
|
|
|
|||
|
|
@ -998,6 +998,12 @@ function this.GetTableByBackDropData(drop)
|
|||
itemdata.frame = GetHeroQuantityImageByquality(configData.Quality)
|
||||
itemdata.icon = GetResourcePath(configData.Image)
|
||||
itemdata.num = 1
|
||||
if drop.gemNew[i].isReplace==1 then
|
||||
itemdata.isReplace=true
|
||||
else
|
||||
itemdata.isReplace=false
|
||||
end
|
||||
|
||||
local pros={}
|
||||
local proList=drop.gemNew[i].attr
|
||||
for j=1,#proList do
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ function this.InitGemsInfo(msg)
|
|||
if gemsData==nil then
|
||||
return
|
||||
end
|
||||
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||
local isChange=false
|
||||
LogError("gemsData len==========="..#gemsData)
|
||||
this.myGemList={}
|
||||
this.sperGemList={}
|
||||
|
|
@ -27,31 +29,47 @@ function this.InitGemsInfo(msg)
|
|||
local id=gemsData[i].id
|
||||
local config=gemConfig[id]
|
||||
local proList=gemsData[i].attr
|
||||
local gemsData={}
|
||||
gemsData.id=id
|
||||
gemsData.config=config
|
||||
gemsData.sId = id
|
||||
gemsData.backData = gemsData[i]
|
||||
gemsData.configData = config
|
||||
local data={}
|
||||
data.id=id
|
||||
data.config=config
|
||||
data.sId = id
|
||||
data.backData = gemsData[i]
|
||||
data.configData = config
|
||||
--local itemConfig = itemConfig[drop.pokemon[i].tempId]
|
||||
gemsData.name = config.Name
|
||||
data.name = config.Name
|
||||
-- itemdata.config=itemConfig
|
||||
gemsData.ItemType = 31--itemConfig.ItemType
|
||||
gemsData.frame = GetHeroQuantityImageByquality(config.Quality)
|
||||
gemsData.icon = GetResourcePath(config.Image)
|
||||
gemsData.num = 1
|
||||
data.ItemType = 31--itemConfig.ItemType
|
||||
data.frame = GetHeroQuantityImageByquality(config.Quality)
|
||||
data.icon = GetResourcePath(config.Image)
|
||||
data.num = 1
|
||||
LogError("gemsData[i].isReplace================"..gemsData[i].isReplace)
|
||||
if gemsData[i].isReplace==1 then
|
||||
isChange=true
|
||||
data.isReplace=true
|
||||
else
|
||||
data.isReplace=false
|
||||
end
|
||||
local pros={}
|
||||
for j=1,#proList do
|
||||
--pros[proList[j].id]=proList[j].value
|
||||
pros[j]={proList[j].id,proList[j].value}
|
||||
end
|
||||
gemsData.pro=pros
|
||||
data.pro=pros
|
||||
if config.Library==1 then
|
||||
this.myGemList[config.Type]=gemsData
|
||||
this.myGemList[config.Type]=data
|
||||
else
|
||||
this.sperGemList[config.Type]=gemsData
|
||||
this.sperGemList[config.Type]=data
|
||||
end
|
||||
end
|
||||
|
||||
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.Gem)
|
||||
--获取新战力
|
||||
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
|
||||
local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||
LogError("oldwar===="..oldWarPower.." temppower=="..tempPower)
|
||||
if oldWarPower ~= tempPower then
|
||||
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower})
|
||||
end
|
||||
if this.timer~=nil then
|
||||
this.timer:Stop()
|
||||
this.timer=nil
|
||||
|
|
@ -60,8 +78,98 @@ function this.InitGemsInfo(msg)
|
|||
Game.GlobalEvent:DispatchEvent(GameEvent.Gem.RefreshPanel)
|
||||
end, 1, -1, true)
|
||||
this.timer:Start()
|
||||
|
||||
end
|
||||
|
||||
|
||||
function this.CheckGemRed()
|
||||
local actconfigs=ActivityGiftManager.GetActivityInfoByType(12301)
|
||||
local isOpen=CheckFunctionOpen(144)
|
||||
if isOpen==false then
|
||||
LogError("144==========================")
|
||||
return false
|
||||
end
|
||||
local progresss=0
|
||||
if actconfigs then
|
||||
for i = 1,#actconfigs.mission do
|
||||
progresss=actconfigs.mission[i].progress
|
||||
local config=ConfigManager.GetConfigData(ConfigName.GemLotteryConfig,actconfigs.mission[i].missionId) --ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.GemLotteryConfig,"Library",curType,"Level",actconfigs.mission[i].missionId)
|
||||
if actconfigs.mission[i].state==0 and progresss>=config.LibraryNumber then
|
||||
LogError("144 red==========================")
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
function this.CheckSuperGemRed()
|
||||
local isOpen=CheckFunctionOpen(145)
|
||||
if isOpen==false then
|
||||
LogError("145==========================")
|
||||
return false
|
||||
end
|
||||
local actconfigs=ActivityGiftManager.GetActivityInfoByType(12401)
|
||||
local progresss=0
|
||||
if actconfigs then
|
||||
for i = 1,#actconfigs.mission do
|
||||
progresss=actconfigs.mission[i].progress
|
||||
local config=ConfigManager.GetConfigData(ConfigName.GemLotteryConfig,actconfigs.mission[i].missionId) --ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.GemLotteryConfig,"Library",curType,"Level",actconfigs.mission[i].missionId)
|
||||
if actconfigs.mission[i].state==0 and progresss>=config.LibraryNumber then
|
||||
LogError("145 red==========================")
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
--获取所有属性
|
||||
function this.GetAllAttri()
|
||||
local data = {}
|
||||
--命石
|
||||
for k, v in pairs(this.myGemList) do
|
||||
if v.pro and #v.pro then
|
||||
for j=1,#v.pro do
|
||||
local proId=v.pro[j][1]
|
||||
local value=v.pro[j][2]
|
||||
if not data[proId] then
|
||||
data[proId] = 0
|
||||
end
|
||||
if propertyConfig[proId] then
|
||||
if propertyConfig[proId].Style==1 then
|
||||
data[proId] = data[proId] + value
|
||||
elseif propertyConfig[proId].Style==2 then
|
||||
data[proId] = data[proId] + value
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
--高级命石
|
||||
for k, v in pairs(this.sperGemList) do
|
||||
if v.pro and #v.pro then
|
||||
for j=1,#v.pro do
|
||||
local proId=v.pro[j][1]
|
||||
local value=v.pro[j][2]
|
||||
if not data[proId] then
|
||||
data[proId] = 0
|
||||
end
|
||||
if propertyConfig[proId] then
|
||||
if propertyConfig[proId].Style==1 then
|
||||
data[proId] = data[proId] + value
|
||||
elseif propertyConfig[proId].Style==2 then
|
||||
data[proId] = data[proId] + value/10000
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
return data
|
||||
end
|
||||
|
||||
|
||||
|
||||
function this.ChangeOneGemData(_gem)
|
||||
local gemsData={}
|
||||
local config=gemConfig[_gem.id]
|
||||
|
|
|
|||
|
|
@ -114,7 +114,8 @@ function Gem:InitComponent()
|
|||
--宝箱
|
||||
self.btn_box=Util.GetGameObject(self.gameObject, "btngroup/rewardBox/Btn")
|
||||
self.boxLv=Util.GetGameObject(self.gameObject, "btngroup/rewardBox/di/Text"):GetComponent("Text")
|
||||
self.boxIcon=Util.GetGameObject(self.gameObject, "btngroup/rewardBox/boxIcon")
|
||||
self.boxIcon=Util.GetGameObject(self.gameObject, "btngroup/rewardBox/boxIcon"):GetComponent("Image")
|
||||
|
||||
self.boxProgress=Util.GetGameObject(self.gameObject, "btngroup/rewardBox/progress/Text"):GetComponent("Text")
|
||||
self.proPreList={}
|
||||
for i=1,8 do
|
||||
|
|
@ -161,18 +162,18 @@ end
|
|||
function Gem:UpdatePanelData(_type)
|
||||
curType=_type
|
||||
--宝箱显示
|
||||
|
||||
if _type==1 then
|
||||
activityId=12301
|
||||
self.boxIcon.sprite=self.spLoader:LoadSprite("i_act_nwsdyy_box5")
|
||||
else
|
||||
activityId=12401
|
||||
self.boxIcon.sprite=self.spLoader:LoadSprite("i_act_nwsdyy_box6")
|
||||
end
|
||||
local isCan=false
|
||||
local actconfigs=ActivityGiftManager.GetActivityInfoByType(activityId)
|
||||
if actconfigs then
|
||||
for i = 1,#actconfigs.mission do
|
||||
progresss=actconfigs.mission[i].progress
|
||||
LogError("progress================"..progresss)
|
||||
--LogError("curtype==============="..curType)
|
||||
local config=ConfigManager.GetConfigData(ConfigName.GemLotteryConfig,actconfigs.mission[i].missionId) --ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.GemLotteryConfig,"Library",curType,"Level",actconfigs.mission[i].missionId)
|
||||
if actconfigs.mission[i].state==0 and progresss>=config.LibraryNumber then
|
||||
|
|
@ -184,7 +185,7 @@ function Gem:UpdatePanelData(_type)
|
|||
end
|
||||
local nextNum=0
|
||||
--LogError("progress==============="..progresss)
|
||||
self.boxIcon:GetComponent("Animator").enabled = isCan
|
||||
self.boxIcon.gameObject:GetComponent("Animator").enabled = isCan
|
||||
local curBoxConfig=ConfigManager.TryGetAllConfigsDataByKey(ConfigName.GemLotteryConfig,"Library",_type)
|
||||
if curBoxConfig then
|
||||
for i=1,#curBoxConfig do
|
||||
|
|
@ -204,8 +205,12 @@ function Gem:UpdatePanelData(_type)
|
|||
-- end
|
||||
-- end
|
||||
end
|
||||
if _type==1 then
|
||||
self.boxLv.text="命格等级:"..wishLv
|
||||
else
|
||||
self.boxLv.text="高级命格等级:"..wishLv
|
||||
end
|
||||
|
||||
self.boxLv.text="宝箱等级:"..wishLv
|
||||
LogError("nextnum==="..nextNum.." progersss=="..progresss)
|
||||
if nextNum==0 and progresss~=0 then
|
||||
self.boxProgress.text="宝箱已达最大等级"
|
||||
|
|
|
|||
|
|
@ -12,6 +12,17 @@ local progress=0
|
|||
local curType=0
|
||||
local rewardConfig=nil
|
||||
local isCan=false
|
||||
local quaName={"粗糙","普通","优良","优秀","稀有","史诗","传说","神话"}
|
||||
local quaColor={
|
||||
Color.New(211/255,193/255,158/255,1),
|
||||
Color.New(106/255,188/255,54/255,1),
|
||||
Color.New(60/255,92/255,164/255,1),
|
||||
Color.New(145/255,28/255,108/255,1),
|
||||
Color.New(176/255,170/255,49/255,1),
|
||||
Color.New(162/255,38/255,38/255,1),
|
||||
Color.New(210/255,200/255,90/255,1),
|
||||
Color.New(149/255,228/255,233/255,1)
|
||||
}
|
||||
function GemRewardInfoPanel:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
self.btn_close=Util.GetGameObject(self.gameObject, "bg/close")
|
||||
|
|
@ -27,6 +38,8 @@ function GemRewardInfoPanel:InitComponent()
|
|||
list[i]={}
|
||||
local line=Util.GetGameObject(self.gameObject, "bg/grid/pre ("..i..")" )
|
||||
list[i].curLv=Util.GetGameObject(line, "curLv/Text" ):GetComponent("Text")
|
||||
list[i].curImg=Util.GetGameObject(line, "curLv"):GetComponent("Image")
|
||||
list[i].nextImg=Util.GetGameObject(line, "nextLv"):GetComponent("Image")
|
||||
list[i].nextLv=Util.GetGameObject(line, "nextLv/Text" ):GetComponent("Text")
|
||||
end
|
||||
end
|
||||
|
|
@ -84,14 +97,16 @@ function GemRewardInfoPanel:OnShow()
|
|||
self.nextlv.text="下一等级:"..nextLv
|
||||
local qua=0
|
||||
for i=1,8 do
|
||||
list[i].curLv.text=GetStringByEquipQua(i, GetQuaStringByEquipQua(i)).." "..curConfig.Show[1][i]/100 .."%"
|
||||
list[i].curLv.text=quaName[i].." "..curConfig.Show[1][i]/100 .."%"
|
||||
if curConfig.Show[1][i]>0 then
|
||||
qua=i
|
||||
end
|
||||
list[i].nextLv.text=nextConfig.Show[1][i]/100 .."%"
|
||||
list[i].curImg.color=quaColor[i]
|
||||
list[i].nextImg.color=quaColor[i]
|
||||
end
|
||||
self.lvInfo.text=progress.."/"..nextConfig.LibraryNumber
|
||||
self.info.text="最高可开出"..GetStringByEquipQua(qua, GetQuaStringByEquipQua(qua)).."品质命石"
|
||||
self.info.text="最高可开出"..quaName[qua] .."品质命石"
|
||||
self:CheckReward()
|
||||
end
|
||||
|
||||
|
|
@ -115,8 +130,6 @@ function GemRewardInfoPanel:CheckReward()
|
|||
isCan=false
|
||||
break
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -150,7 +163,7 @@ end
|
|||
|
||||
|
||||
function GemRewardInfoPanel:OnClose()
|
||||
|
||||
CheckRedPointStatus(RedPointType.Gem)
|
||||
end
|
||||
|
||||
function GemRewardInfoPanel:OnDestroy()
|
||||
|
|
|
|||
|
|
@ -113,7 +113,10 @@ Func_Prop_Func = {
|
|||
end,
|
||||
-- 命格
|
||||
[Func_Prop_Type.Gem] = function()
|
||||
local allPro = GemManager.GetAllAttri()
|
||||
local allPro = GemNewManager.GetAllAttri()
|
||||
for k, v in pairs(allPro) do
|
||||
LogError("命石 k===="..k.." v=="..v)
|
||||
end
|
||||
return allPro
|
||||
end,
|
||||
--神兵属性加成
|
||||
|
|
|
|||
|
|
@ -352,6 +352,8 @@ function this.InitRedPointAllRelate()
|
|||
|
||||
--命格
|
||||
RPData:SetParent(RedPointType.Gem,RedPointType.Practice_main)
|
||||
RPData:SetParent(RedPointType.Gem_1,RedPointType.Gem)
|
||||
RPData:SetParent(RedPointType.Gem_2,RedPointType.Gem_2)
|
||||
RPData:SetParent(RedPointType.TimeLimitWish,RedPointType.Recruit)
|
||||
-- RPData:SetParent(RedPointType.TimeLimitWishStore,RedPointType.TimeLimitWish)--奇珍宝阁相关红点屏蔽
|
||||
--战力冲刺
|
||||
|
|
@ -678,7 +680,9 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.recruitTreasure_two,RecruitTreasureManager.GetRedPointStatus)
|
||||
RPData:AddCheckFunc(RedPointType.recruitTreasure_three,RecruitTreasureManager.GetRedPointStatus)
|
||||
--命格
|
||||
RPData:AddCheckFunc(RedPointType.Gem,GemManager.RedPointCheck,FUNCTION_OPEN_TYPE.Gem)
|
||||
--RPData:AddCheckFunc(RedPointType.Gem,GemManager.RedPointCheck,FUNCTION_OPEN_TYPE.Gem)
|
||||
RPData:AddCheckFunc(RedPointType.Gem_1,GemNewManager.CheckGemRed)
|
||||
RPData:AddCheckFunc(RedPointType.Gem_1,GemNewManager.CheckSuperGemRed)
|
||||
RPData:AddCheckFunc(RedPointType.ExploreFunc,ExploreManager.CheckRedPoint)
|
||||
|
||||
RPData:AddCheckFunc(RedPointType.chaozhifanli,DynamicActivityManager.CheckRedPointPremium)
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ function Practice:BindEvent()
|
|||
BindRedPointObject(RedPointType.Sacred_roleInfo,self.treeRed)
|
||||
BindRedPointObject(RedPointType.incarnation,self.incarnationBtnRed)
|
||||
BindRedPointObject(RedPointType.Practice,self.practice_tab)
|
||||
BindRedPointObject(RedPointType.Gem,self.gem_tab)
|
||||
BindRedPointObject(RedPointType.Gem,self.gemRedPoint)
|
||||
end
|
||||
function Practice:BtnClickEvent()
|
||||
NetManager.UpPracticeLevelRequest(function ()
|
||||
|
|
@ -337,6 +337,7 @@ function Practice:OnShow()
|
|||
CheckRedPointStatus(RedPointType.Practice_upgrade)
|
||||
CheckRedPointStatus(RedPointType.Practice_fourQua)
|
||||
CheckRedPointStatus(RedPointType.Practice_Cultivation)
|
||||
CheckRedPointStatus(RedPointType.Gem)
|
||||
FormationManager.RefreshMainFormationPower()
|
||||
self.curLevelConfig = PracticeManager.GetCurConfigData()
|
||||
oldPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||
|
|
@ -532,7 +533,7 @@ function Practice:OnDestroy()
|
|||
ClearRedPointObject(RedPointType.tailsmanSoul,self.talsmanSoulBtnRed)
|
||||
ClearRedPointObject(RedPointType.incarnation,self.incarnationBtnRed)
|
||||
ClearRedPointObject(RedPointType.Practice,self.practice_tab)
|
||||
ClearRedPointObject(RedPointType.Gem,self.gem_tab)
|
||||
ClearRedPointObject(RedPointType.Gem,self.gemRedPoint)
|
||||
for i = 1, 4 do
|
||||
ClearRedPointObject(500+i*100,Util.GetGameObject(self.Practice, "SkillObj/skill"..i.."/red"))
|
||||
end
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ local recType = {}
|
|||
local orginLayer
|
||||
local costId=0
|
||||
local activityId=0
|
||||
local showLv=0
|
||||
--初始化组件(用于子类重写)
|
||||
function WishGemBuyOnePanel:InitComponent()
|
||||
this.spLoader = SpriteLoader.New()
|
||||
|
|
@ -32,7 +31,8 @@ function WishGemBuyOnePanel:InitComponent()
|
|||
this.openOneAgainButton=Util.GetGameObject(self.gameObject, "bottom/openOneAgainButton")
|
||||
this.detailImage=Util.GetGameObject(self.gameObject, "Tip")
|
||||
this.detailText = Util.GetGameObject(this.detailImage, "Text"):GetComponent("Text")
|
||||
this.detailImage:SetActive(false)
|
||||
this.detailImage:SetActive(true)
|
||||
this.detailText.text="仅保留高品质命石属性"
|
||||
this.content3=Util.GetGameObject(self.gameObject,"bottom/openOneAgainButton/Content3")
|
||||
this.content3:SetActive(true)
|
||||
this.itemIcon3=Util.GetGameObject(this.content3, "icon"):GetComponent("Image")
|
||||
|
|
@ -121,6 +121,7 @@ end
|
|||
|
||||
function WishGemBuyOnePanel:OnShow()
|
||||
local lv=0
|
||||
local showLv = PlayerPrefs.GetInt(PlayerManager.uid.."newGem"..activityId)
|
||||
local actconfigs=ActivityGiftManager.GetActivityInfoByType(activityId)
|
||||
local progresss=0
|
||||
if actconfigs then
|
||||
|
|
@ -133,7 +134,9 @@ function WishGemBuyOnePanel:OnShow()
|
|||
end
|
||||
end
|
||||
if lv>0 and lv>showLv then
|
||||
showLv=lv
|
||||
CheckRedPointStatus(RedPointType.Gem_1)
|
||||
CheckRedPointStatus(RedPointType.Gem_2)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."newGem"..activityId,lv)
|
||||
UIManager.OpenPanel(UIName.GemBoxLvUpPopup,lv)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -31,7 +31,8 @@ function WishGemBuyTenPanel:InitComponent()
|
|||
|
||||
this.detailImage=Util.GetGameObject(self.gameObject, "Tip")
|
||||
this.detailText = Util.GetGameObject(this.detailImage, "Text"):GetComponent("Text")
|
||||
this.detailImage:SetActive(false)
|
||||
this.detailImage:SetActive(true)
|
||||
this.detailText.text="仅保留高品质命石属性"
|
||||
this.content3=Util.GetGameObject(self.gameObject,"bottom/openTenAgainButton/Content3")
|
||||
this.content3:SetActive(true)
|
||||
this.itemIcon3=Util.GetGameObject(this.content3, "icon"):GetComponent("Image")
|
||||
|
|
@ -103,6 +104,7 @@ function WishGemBuyTenPanel:OnOpen(...)
|
|||
activityId=args[4]
|
||||
local lv=0
|
||||
--宝箱等级
|
||||
local showLv = PlayerPrefs.GetInt(PlayerManager.uid.."newGem"..activityId)
|
||||
local actconfigs=ActivityGiftManager.GetActivityInfoByType(activityId)
|
||||
local progresss=0
|
||||
if actconfigs then
|
||||
|
|
@ -114,8 +116,10 @@ function WishGemBuyTenPanel:OnOpen(...)
|
|||
end
|
||||
end
|
||||
end
|
||||
if lv>0 and lv>isShowLv then
|
||||
isShowLv=lv
|
||||
if lv>0 and lv>showLv then
|
||||
CheckRedPointStatus(RedPointType.Gem_1)
|
||||
CheckRedPointStatus(RedPointType.Gem_2)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."newGem"..activityId,lv)
|
||||
UIManager.OpenPanel(UIName.GemBoxLvUpPopup,lv)
|
||||
end
|
||||
LogError("costid============"..costId)
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@ function ItemView:InitComponent()
|
|||
Util.GetGameObject(self.gameObject, "item/heroShow/posIcon"):SetActive(false)
|
||||
self.name = Util.GetGameObject(self.gameObject, "name")
|
||||
self.resetLv = Util.GetGameObject(self.gameObject, "item/resetLv")
|
||||
self.upImg = Util.GetGameObject(self.gameObject, "item/upImg")
|
||||
self.upImg:SetActive(false)
|
||||
self.resetLvText = self.resetLv:GetComponent("Text")
|
||||
self.rightUplv = Util.GetGameObject(self.gameObject, "item/rightUplv"):GetComponent("Text")
|
||||
self.middleDownLv = Util.GetGameObject(self.gameObject, "item/middleDownLv")
|
||||
|
|
@ -145,6 +147,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
|||
self.time:SetActive(false)
|
||||
self.homeLv.text = ""
|
||||
self.homeProLv.text = ""
|
||||
self.upImg:SetActive(false)
|
||||
|
||||
self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById( _itemData.configData.Name),4)
|
||||
|
||||
|
|
@ -300,6 +303,12 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
|||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,_itemData.backData.itemId,nil,self.isRewardItemPop,true)
|
||||
end)
|
||||
elseif _itemData.configData.ItemType == ItemType.Gem then
|
||||
if _itemData.isReplace then
|
||||
self.upImg:SetActive(true)
|
||||
end
|
||||
if _itemData.backData.isReplace then
|
||||
self.upImg:SetActive(true)
|
||||
end
|
||||
Util.AddOnceClick(self.frameBtn, function()
|
||||
UIManager.OpenPanel(UIName.RewardGemSingleShowPopup, _itemData.backData.itemId,3)
|
||||
end)
|
||||
|
|
@ -439,6 +448,9 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
|||
UIManager.OpenPanel(UIName.RewardRideShowPopup, _itemData.backData.itemId,nil)
|
||||
end)
|
||||
elseif _itemData.ItemType == ItemType.Gem then
|
||||
if _itemData.isReplace then
|
||||
self.upImg:SetActive(true)
|
||||
end
|
||||
if effectLayer > 0 and _itemData.configData.Quantity1 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity1 == 5 or _itemData.configData.Quantity1 == 4)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Quantity1 == 6)
|
||||
|
|
@ -896,6 +908,9 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
|||
UIManager.OpenPanel(UIName.RewardRideShowPopup, itemSId,nil)
|
||||
end)
|
||||
elseif itemDataConFig.ItemType == ItemType.Gem then--命石
|
||||
-- if _itemData.backData.isReplace then
|
||||
-- self.upImg:SetActive(true)
|
||||
-- end
|
||||
self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
|
||||
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
|
||||
Util.AddOnceClick(self.frameBtn, function()
|
||||
|
|
|
|||
Loading…
Reference in New Issue