root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【家园】摘星阁装备属性加持+战斗力

dev_chengFeng
ZhangBiao 2021-12-31 13:44:11 +08:00
parent bd2d5ccd50
commit cf9cbc5ac9
15 changed files with 209 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab
View File

@ -7025,6 +7025,8 @@ GameObject:
- component: {fileID: 8467694386051670500}
- component: {fileID: 3349980846674454655}
- component: {fileID: 3265480430236186537}
- component: {fileID: 8283649193842371600}
- component: {fileID: 6533341279713584110}
m_Layer: 5
m_Name: OneKey
m_TagString: Untagged
@ -7088,6 +7090,67 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &8283649193842371600
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3798289723787056569}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3265480430236186537}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &6533341279713584110
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3798289723787056569}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &3829441240879432340
GameObject:
m_ObjectHideFlags: 0
@ -7209,16 +7272,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3869393060676697140}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7431433220277542726}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 95.1, y: 0}
m_AnchoredPosition: {x: -90, y: 0}
m_SizeDelta: {x: 60, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6082064838074469466
@ -12044,7 +12107,7 @@ RectTransform:
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: -8.899975, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 238, y: 258}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5534688131019206973

43
Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
View File

@ -161,6 +161,7 @@ GameObject:
- component: {fileID: 7201162672333464944}
- component: {fileID: 1721252305471819752}
- component: {fileID: 3626300263077417343}
- component: {fileID: 2006024394686747280}
m_Layer: 5
m_Name: Mask
m_TagString: Untagged
@ -224,6 +225,48 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &2006024394686747280
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 212626389828960318}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3626300263077417343}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &268274835063990578
GameObject:
m_ObjectHideFlags: 0

27
Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
View File

@ -60,6 +60,7 @@ EQUIP_ISLOCKED_FIELD = protobuf.FieldDescriptor();
EQUIP_EXP_FIELD = protobuf.FieldDescriptor();
EQUIP_TREELV_FIELD = protobuf.FieldDescriptor();
EQUIP_FOURSPIRIT_FIELD = protobuf.FieldDescriptor();
EQUIP_HOMEEQUIPLV_FIELD = protobuf.FieldDescriptor();
SOULPOS = protobuf.Descriptor();
SOULPOS_EQUIPID_FIELD = protobuf.FieldDescriptor();
SOULPOS_POSITION_FIELD = protobuf.FieldDescriptor();
@ -780,6 +781,7 @@ HELPFIGHTLIST_STATE_FIELD = protobuf.FieldDescriptor();
HELPFIGHTLIST_JEWELS_FIELD = protobuf.FieldDescriptor();
HELPFIGHTLIST_TREELEVEL_FIELD = protobuf.FieldDescriptor();
HELPFIGHTLIST_FOURTOTAL_FIELD = protobuf.FieldDescriptor();
HELPFIGHTLIST_EQUIPS_FIELD = protobuf.FieldDescriptor();
RELIC = protobuf.Descriptor();
RELIC_ID_FIELD = protobuf.FieldDescriptor();
RELIC_STATUS_FIELD = protobuf.FieldDescriptor();
@ -1399,11 +1401,21 @@ EQUIP_FOURSPIRIT_FIELD.default_value = 0
EQUIP_FOURSPIRIT_FIELD.type = 5
EQUIP_FOURSPIRIT_FIELD.cpp_type = 1
EQUIP_HOMEEQUIPLV_FIELD.name = "homeEquipLv"
EQUIP_HOMEEQUIPLV_FIELD.full_name = ".rpc.protocols.Equip.homeEquipLv"
EQUIP_HOMEEQUIPLV_FIELD.number = 12
EQUIP_HOMEEQUIPLV_FIELD.index = 11
EQUIP_HOMEEQUIPLV_FIELD.label = 3
EQUIP_HOMEEQUIPLV_FIELD.has_default_value = false
EQUIP_HOMEEQUIPLV_FIELD.default_value = {}
EQUIP_HOMEEQUIPLV_FIELD.type = 5
EQUIP_HOMEEQUIPLV_FIELD.cpp_type = 1
EQUIP.name = "Equip"
EQUIP.full_name = ".rpc.protocols.Equip"
EQUIP.nested_types = {}
EQUIP.enum_types = {}
EQUIP.fields = {EQUIP_ID_FIELD, EQUIP_EQUIPID_FIELD, EQUIP_MAINATTRIBUTE_FIELD, EQUIP_SECONDATTRIBUTE_FIELD, EQUIP_REBUILDLEVEL_FIELD, EQUIP_CREATETIME_FIELD, EQUIP_SKILLID_FIELD, EQUIP_ISLOCKED_FIELD, EQUIP_EXP_FIELD, EQUIP_TREELV_FIELD, EQUIP_FOURSPIRIT_FIELD}
EQUIP.fields = {EQUIP_ID_FIELD, EQUIP_EQUIPID_FIELD, EQUIP_MAINATTRIBUTE_FIELD, EQUIP_SECONDATTRIBUTE_FIELD, EQUIP_REBUILDLEVEL_FIELD, EQUIP_CREATETIME_FIELD, EQUIP_SKILLID_FIELD, EQUIP_ISLOCKED_FIELD, EQUIP_EXP_FIELD, EQUIP_TREELV_FIELD, EQUIP_FOURSPIRIT_FIELD, EQUIP_HOMEEQUIPLV_FIELD}
EQUIP.is_extendable = false
EQUIP.extensions = {}
SOULPOS_EQUIPID_FIELD.name = "equipId"
@ -8280,11 +8292,22 @@ HELPFIGHTLIST_FOURTOTAL_FIELD.default_value = 0
HELPFIGHTLIST_FOURTOTAL_FIELD.type = 5
HELPFIGHTLIST_FOURTOTAL_FIELD.cpp_type = 1
HELPFIGHTLIST_EQUIPS_FIELD.name = "equips"
HELPFIGHTLIST_EQUIPS_FIELD.full_name = ".rpc.protocols.HelpFightList.equips"
HELPFIGHTLIST_EQUIPS_FIELD.number = 10
HELPFIGHTLIST_EQUIPS_FIELD.index = 9
HELPFIGHTLIST_EQUIPS_FIELD.label = 3
HELPFIGHTLIST_EQUIPS_FIELD.has_default_value = false
HELPFIGHTLIST_EQUIPS_FIELD.default_value = {}
HELPFIGHTLIST_EQUIPS_FIELD.message_type = EQUIP
HELPFIGHTLIST_EQUIPS_FIELD.type = 11
HELPFIGHTLIST_EQUIPS_FIELD.cpp_type = 10
HELPFIGHTLIST.name = "HelpFightList"
HELPFIGHTLIST.full_name = ".rpc.protocols.HelpFightList"
HELPFIGHTLIST.nested_types = {}
HELPFIGHTLIST.enum_types = {}
HELPFIGHTLIST.fields = {HELPFIGHTLIST_UID_FIELD, HELPFIGHTLIST_USERNAME_FIELD, HELPFIGHTLIST_GUILDNAME_FIELD, HELPFIGHTLIST_TRAILTYPE_FIELD, HELPFIGHTLIST_HERO_FIELD, HELPFIGHTLIST_STATE_FIELD, HELPFIGHTLIST_JEWELS_FIELD, HELPFIGHTLIST_TREELEVEL_FIELD, HELPFIGHTLIST_FOURTOTAL_FIELD}
HELPFIGHTLIST.fields = {HELPFIGHTLIST_UID_FIELD, HELPFIGHTLIST_USERNAME_FIELD, HELPFIGHTLIST_GUILDNAME_FIELD, HELPFIGHTLIST_TRAILTYPE_FIELD, HELPFIGHTLIST_HERO_FIELD, HELPFIGHTLIST_STATE_FIELD, HELPFIGHTLIST_JEWELS_FIELD, HELPFIGHTLIST_TREELEVEL_FIELD, HELPFIGHTLIST_FOURTOTAL_FIELD, HELPFIGHTLIST_EQUIPS_FIELD}
HELPFIGHTLIST.is_extendable = false
HELPFIGHTLIST.extensions = {}
RELIC_ID_FIELD.name = "id"

24
Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
View File

@ -419,8 +419,6 @@ VIEWHEROINFORESPONSE_EQUIP_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFORESPONSE_SPECIALEFFECTS_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFORESPONSE_FORCE_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFORESPONSE_GUILDSKILL_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFORESPONSE_TREELEVEL_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFORESPONSE_HOMEEQUIPLV_FIELD = protobuf.FieldDescriptor();
RANKREQUEST = protobuf.Descriptor();
RANKREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
RANKREQUEST_ACTIVITEID_FIELD = protobuf.FieldDescriptor();
@ -4524,31 +4522,11 @@ VIEWHEROINFORESPONSE_GUILDSKILL_FIELD.default_value = 0
VIEWHEROINFORESPONSE_GUILDSKILL_FIELD.type = 5
VIEWHEROINFORESPONSE_GUILDSKILL_FIELD.cpp_type = 1
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.name = "treeLevel"
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.full_name = ".rpc.protocols.ViewHeroInfoResponse.treeLevel"
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.number = 6
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.index = 5
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.label = 1
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.has_default_value = false
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.default_value = 0
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.type = 5
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.cpp_type = 1
VIEWHEROINFORESPONSE_HOMEEQUIPLV_FIELD.name = "homeEquipLv"
VIEWHEROINFORESPONSE_HOMEEQUIPLV_FIELD.full_name = ".rpc.protocols.ViewHeroInfoResponse.homeEquipLv"
VIEWHEROINFORESPONSE_HOMEEQUIPLV_FIELD.number = 7
VIEWHEROINFORESPONSE_HOMEEQUIPLV_FIELD.index = 6
VIEWHEROINFORESPONSE_HOMEEQUIPLV_FIELD.label = 3
VIEWHEROINFORESPONSE_HOMEEQUIPLV_FIELD.has_default_value = false
VIEWHEROINFORESPONSE_HOMEEQUIPLV_FIELD.default_value = {}
VIEWHEROINFORESPONSE_HOMEEQUIPLV_FIELD.type = 5
VIEWHEROINFORESPONSE_HOMEEQUIPLV_FIELD.cpp_type = 1
VIEWHEROINFORESPONSE.name = "ViewHeroInfoResponse"
VIEWHEROINFORESPONSE.full_name = ".rpc.protocols.ViewHeroInfoResponse"
VIEWHEROINFORESPONSE.nested_types = {}
VIEWHEROINFORESPONSE.enum_types = {}
VIEWHEROINFORESPONSE.fields = {VIEWHEROINFORESPONSE_HERO_FIELD, VIEWHEROINFORESPONSE_EQUIP_FIELD, VIEWHEROINFORESPONSE_SPECIALEFFECTS_FIELD, VIEWHEROINFORESPONSE_FORCE_FIELD, VIEWHEROINFORESPONSE_GUILDSKILL_FIELD, VIEWHEROINFORESPONSE_TREELEVEL_FIELD, VIEWHEROINFORESPONSE_HOMEEQUIPLV_FIELD}
VIEWHEROINFORESPONSE.fields = {VIEWHEROINFORESPONSE_HERO_FIELD, VIEWHEROINFORESPONSE_EQUIP_FIELD, VIEWHEROINFORESPONSE_SPECIALEFFECTS_FIELD, VIEWHEROINFORESPONSE_FORCE_FIELD, VIEWHEROINFORESPONSE_GUILDSKILL_FIELD}
VIEWHEROINFORESPONSE.is_extendable = false
VIEWHEROINFORESPONSE.extensions = {}
RANKREQUEST_TYPE_FIELD.name = "type"

10
Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua
View File

@ -55,12 +55,14 @@ function this.InitUpdateEquipData(id, upHeroDid, isFindHandBook)
equipdata.star = equipStarsConfig[equipdata.equipConfig.Star].Stars
-- --摘星阁加持
equipdata.HomeLv = function()
equipdata.HomeEquipLv = function()
local data = HomeLandManager.EquipData[equipdata.position]
-- return {data.configData.Level,data.configPro.Level}
return {23,2}
if data and data.configData and data.configPro then
return {data.configData.Level,data.configPro.Level}
end
return {0,0}
end
equipdata.homeLv = equipdata.HomeLv()
equipdata.homeEquipLv = equipdata.HomeEquipLv()
this.equipDatas[id] = equipdata
if not this.equipDatas[id].upHeroDidList then

4
Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua
View File

@ -720,8 +720,8 @@ end
function this.InitUpdateEquipData(_equipData)
local equipdata={}
equipdata.equipConfig = equipConfig[_equipData.equipId]
equipdata.homeEquipLv = _equipData.homeEquipLv
LogWarn("--远征 摘星阁加持："..tostring(_equipData.homeEquipLv[1])..tostring(_equipData.homeEquipLv[2]))
equipdata.homeEquipLv = HomeLandManager.IdToLevel(_equipData.homeEquipLv[1],_equipData.homeEquipLv[2])
-- LogWarn("--远征 摘星阁加持："..tostring(_equipData.homeEquipLv[1])..tostring(_equipData.homeEquipLv[2]))
if equipdata.equipConfig~=nil then
equipdata.itemConfig=itemConfig[equipdata.equipConfig.Id]
equipdata.did = equipdata.equipConfig.Id

4
Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua
View File

@ -568,8 +568,8 @@ function this.InitUpdateEquipData(_equipData, heroData)
equipdata.did = _equipData.equipId
equipdata.id = equipdata.equipConfig.Id
equipdata.homeEquipLv = _equipData.homeEquipLv--摘星阁等级，1试强化2是突破
LogWarn("--好友 摘星阁加持："..tostring(_equipData.homeEquipLv[1])..tostring(_equipData.homeEquipLv[2]))
equipdata.homeEquipLv = {23,2}
-- LogWarn("--好友 摘星阁加持："..tostring(_equipData.homeEquipLv[1]).." "..tostring(_equipData.homeEquipLv[2]))
equipdata.homeEquipLv = HomeLandManager.IdToLevel(_equipData.homeEquipLv[1],_equipData.homeEquipLv[2])
if itemConfig[equipdata.id] then
equipdata.icon = GetResourcePath(itemConfig[equipdata.id].ResourceID)
else

3
Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua
View File

@ -180,6 +180,9 @@ Hero_Prop_Func = {
else
addAllProVal[id] = value
end
if propertyConfig[id].Style == 1 and curEquip.homeEquipLv then--摘星阁加持
addAllProVal[id] = addAllProVal[id] + addAllProVal[id] * HomeLandManager.LevelToValue(curEquip.homeEquipLv,curEquip.position)/100
end
end
end
end

18
Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua
View File

@ -192,4 +192,22 @@ function this.GetAllCanUpgradeWithPopup()
return false
end
--通过两个id计算两个等级
function this.IdToLevel(id1,id2)
return {EquipStrengthen[id1].Level,EquipRankUp[id2].Level}
end
function this.LevelToId()
local num1 = ConfigManager.GetConfigDataByKey(ConfigName.EquipStrengthen,"Level",self.equipData.homeEquipLv[1]).Id
local num2 = ConfigManager.GetConfigDataByKey(ConfigName.EquipRankUp,"Level",self.equipData.homeEquipLv[2]).Id
return {num1,num2}
end
--通过两个等级计算加成
function this.LevelToValue(ids,position)
local num1 = ConfigManager.GetConfigDataByKey(ConfigName.EquipStrengthen,"Level",ids[1]).Rate
local num2 = ConfigManager.GetConfigDataByKey(ConfigName.EquipRankUp,"Level",ids[2]).Rate[position]
return num1 + num2
end
return HomeLandManager

18
Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandPanel.lua
View File

@ -23,6 +23,7 @@ function HomeLand:InitComponent()
--btns
self.taskBtn = Util.GetGameObject(self.RightUp,"Task")
self.yunYouBtn = Util.GetGameObject(self.RightUp,"YunYou")
self.oneKey = Util.GetGameObject(self.RightDown,"OneKey")
--产出详情框
self.GainDetail = Util.GetGameObject(self.map,"GainDetail")
@ -47,6 +48,7 @@ function HomeLand:InitComponent()
self.mapData[i] = {}
self.mapData[i].Obj = Util.GetGameObject(self.Bg,"Map ("..i..")")
self.mapData[i].Name = Util.GetGameObject(self.mapData[i].Obj,"Title/Text"):GetComponent("Text")
self.mapData[i].NameImg = Util.GetGameObject(self.mapData[i].Obj,"Title/Image")
self.mapData[i].CanGet = Util.GetGameObject(self.mapData[i].Obj,"CanGet")
-- self.mapData[i].Icon = Util.GetGameObject(self.mapData[i].Obj,"Title/Image"):GetComponent("Image")
self.mapData[i].Icon = Util.GetGameObject(self.mapData[i].Obj,"CanGet/Image"):GetComponent("Image")
@ -115,7 +117,7 @@ function HomeLand:BindEvent()
LogGreen("需要16："..tostring(value).." 现有："..tostring(BagManager.GetTotalItemNum(16)))
if BagManager.GetTotalItemNum(16) >= value then
MsgPanel.ShowTwo(string.format("是否花费%s妖晶立即升级？",value),function() end,function()
NetManager.ArchitectureOperateRequest({HomeLandManager.BuildData[i].dataMain.Id},2,0,function ()
NetManager.ArchitectureOperateRequest({HomeLandManager.BuildData[i].dataMain.Id},4,0,function ()
self.mapData[i].leftTime = -1
self:OnShow()
end)
@ -152,6 +154,11 @@ function HomeLand:BindEvent()
bool = not bool
self:SetDetailBar()
end)
Util.AddClick(self.oneKey, function()
NetManager.HomeAllGainRequset(0,function ()
self:OnShow()
end)
end)
--右侧按钮们
Util.AddClick(self.taskBtn, function()
@ -258,7 +265,7 @@ function HomeLand:SetBuildsState()
curObj.btnUpgrade:SetActive(false)
curObj.btnCancel:SetActive(false)
curObj.btnSpeedUp:SetActive(false)
-- curObj.Icon.gameObject:SetActive(false)
curObj.NameImg:SetActive(true)
curObj.upgradeImg:SetActive(false)
curObj.updateTime:SetActive(false)
curObj.CanGet:SetActive(false)
@ -277,7 +284,6 @@ function HomeLand:SetBuildsState()
if data.dataSingle then
if data.dataSingle.Gain then--有产出的才需要icon
curObj.Icon.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(data.dataSingle.Gain[1]))
-- curObj.Icon.gameObject:SetActive(true)
if not curObj.OpenLimit.activeInHierarchy then
curObj.showTime = data.startTime + 60
curObj.CanGet:SetActive(data.startTime + 60 < GetTimeStamp())
@ -304,11 +310,17 @@ function HomeLand:SetBuildsState()
end
if data.dataSingle and data.dataMain.IsOpen == 1 then--需要升级的才显示等级
curObj.Name.text = string.format("%s级",data.dataSingle.level)
curObj.NameImg:SetActive(true)
else--部分没有等级所以不需要显示等级
curObj.NameImg:SetActive(false)
curObj.Name.text = ""
end
Util.AddOnceClick(curObj.CanGet,function ()
if data.dataSingle.Storage[2][2] <= BagManager.GetTotalItemNum(data.dataSingle.Storage[2][1]) then
PopupTipPanel.ShowTip("当前资源，已达储藏上限，提升建筑等级，可增加储藏上限！")
return
end
NetManager.HomeAllGainRequset(data.dataMain.Id,function ()
self:OnShow()
end)

1
Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
View File

@ -6341,6 +6341,7 @@ function NetManager.HomeInfoRequest(func)
msg:ParseFromString(data)
HomeLandManager.GetServerData(msg,function ()
if func then
HeroPropManager.SetFuncPropDirty(Hero_Prop_Type.Equip)
func(msg)
end
end)

14
Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
View File

@ -228,13 +228,12 @@ function RewardEquipSingleShowPopup2:OnShow()
EquipManager.SetEquipStarShow(self.spLoader, self.star,equipConfigData.Id)
self.equipType.text=Language[11089]..GetEquipPosStrByEquipPosNum(equipConfigData.Position)
--摘星阁加持
self.hLv.text = ""
self.hProLv.text = ""
if HomeLandManager.EquipData[self.equipData.position] then
-- local level = HomeLandManager.EquipData[self.equipData.position].configData.Level
-- local level2 = EquipRankUp[HomeLandManager.levelProId].Level
-- self.hLv.text = level > 0 and level or ""
-- self.hProLv.text = level2 > 0 and level2 or ""
if self.equipData.homeEquipLv and self.equipData.homeEquipLv[1] > 0 then
self.hLv.text = self.equipData.homeEquipLv[1] > 0 and self.equipData.homeEquipLv[1] or ""
self.hProLv.text = self.equipData.homeEquipLv[2] > 0 and self.equipData.homeEquipLv[2] or ""
end
--下部按钮信息
self.effectbaijin:SetActive(equipConfigData.Quality==7)
@ -278,9 +277,8 @@ function RewardEquipSingleShowPopup2:OnShow()
--摘星阁加持
local hText = Util.GetGameObject(vText.gameObject, "homeValue"):GetComponent("Text")
hText.text = ""
if HomeLandManager.EquipData[self.equipData.position] and HomeLandManager.EquipData[self.equipData.position].configData.Level > 0 and proConfigData.Style == 1 then
local num = EquipStrengthen[HomeLandManager.EquipData[self.equipData.position].Id].Rate + EquipRankUp[HomeLandManager.levelProId].Rate[self.equipData.position]
hText.text = string.format("(摘星阁加持：%s",num).."%)"
if self.equipData.homeEquipLv and self.equipData.homeEquipLv[1] > 0 and proConfigData.Style == 1 then
hText.text = string.format("(摘星阁加持：%s",HomeLandManager.LevelToValue(self.equipData.homeEquipLv,self.equipData.position)).."%)"
end
end
end

8
Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
View File

@ -22,6 +22,7 @@ function RoleInfoPopup:InitComponent()
this.content = Util.GetGameObject(self.transform, "Panel/Scroll View/Viewport/Content"):GetComponent("RectTransform")
this.backBtn = Util.GetGameObject(self.transform, "Panel/BackBtn")
this.maskBtn = Util.GetGameObject(self.transform, "Mask")
this.roleInfo0 = Util.GetGameObject(self.transform, "Panel/Scroll View/Viewport/Content/RoleInfo0")
this.head = Util.GetGameObject(this.roleInfo0, "Head")
@ -124,6 +125,10 @@ function RoleInfoPopup:BindEvent()
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
self:ClosePanel()
end)
Util.AddClick(this.maskBtn, function()
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
self:ClosePanel()
end)
Util.AddClick(this.skill1, function()
if Game.GlobalEvent:HasEvent(GameEvent.UI.OnClose, triggerCallBack) then
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnClose, triggerCallBack)
@ -407,7 +412,8 @@ function this.EquipInfo()
end
this.treasureDatas[pos].gameObject:SetActive(true)
this.treasureDatas[pos].transform:SetAsFirstSibling()
this.treasureDatas[pos]:OnOpen(false, {curEquipData.id,0}, 0.8, false, false, false, 0)
LogRed(tostring(curEquipData.homeEquipLv[1]).." "..tostring(curEquipData.homeEquipLv[2]))
this.treasureDatas[pos]:OnOpen(false, {curEquipData.id,0}, 0.8, false, false, false, 0,nil,curEquipData)
end
local frameBtn = Util.GetGameObject(pos, "mask")

2
Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
View File

@ -634,7 +634,7 @@ function this:SingleDataShow(go,index)
if curHeroEquipDatas[index] then
this.equipPreList2[go].gameObject:SetActive(true)
mask.gameObject:SetActive(false)
this.equipPreList2[go]:OnOpen(false,{curHeroEquipDatas[index].id,0}, 1, false, false, false, 0)
this.equipPreList2[go]:OnOpen(false,{curHeroEquipDatas[index].id,0}, 1, false, false, false, 0,nil,curHeroEquipDatas[index])
if HarmonyManager:IsShowGongMingEqiup(curHeroData.dynamicId) and curHeroData.harmonyGongMing then
-- body
Util.GetGameObject(go.transform, "HongMenging"):SetActive(true)

28
Assets/ManagedResources/~Lua/View/ItemView.lua
View File

@ -91,8 +91,9 @@ end
--isShowAddImage 是否显示道具不足加号（默认不显示）
--isPlayAnim 是否播放获得动画（默认不播）
--effectLayer 当前界面层级（显示粒子特效用）
--_allData 整个物品的数据（装备、宝物、等等等（目前只有装备））
--界面打开时调用（用于子类重写）
function ItemView:OnOpen(isGet, itemDatas, _scale, isShowName, isShowAddImage, isPlayAnim, effectLayer,Did)
function ItemView:OnOpen(isGet, itemDatas, _scale, isShowName, isShowAddImage, isPlayAnim, effectLayer,Did,_allData)
isShowName = isShowName or false
isShowAddImage = isShowAddImage or false
isPlayAnim = isPlayAnim or false
@ -103,6 +104,7 @@ function ItemView:OnOpen(isGet, itemDatas, _scale, isShowName, isShowAddImage, i
self.gameObject:GetComponent("PlayFlyAnim").enabled = isPlayAnim
self.scale = _scale or 1
self.Did = Did
self.allData = _allData
--self.gameObject:GetComponent("RectTransform").localScale = Vector2.New(scale, scale)
self.gameObject:GetComponent("RectTransform").sizeDelta = Vector2.New(135, 135)
if isGet and itemDatas then
@ -228,11 +230,9 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Quantity1 == 7)
end
--摘星阁加成
if HomeLandManager.EquipData[_itemData.position] then
-- local level = HomeLandManager.EquipData[_itemData.position].configData.Level
-- local level2 = EquipRankUp[HomeLandManager.levelProId].Level
-- self.homeLv.text = level > 0 and level or ""
-- self.homeProLv.text = level2 > 0 and level2 or ""
if self.allData and self.allData.homeEquipLv and self.allData.homeEquipLv[1] > 0 then
self.homeLv.text = self.allData.homeEquipLv[1] > 0 and self.allData.homeEquipLv[1] or ""
self.homeProLv.text = self.allData.homeEquipLv[2] > 0 and self.allData.homeEquipLv[2] or ""
end
elseif _itemData.configData.ItemType == ItemType.Blueprint then
local lanTuData = WorkShopManager.GetLanTuIsOpenLock(_itemData.backData.itemId)
@ -346,11 +346,9 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Star == 7)
end
--摘星阁加成
if HomeLandManager.EquipData[_itemData.position] then
-- local level = HomeLandManager.EquipData[_itemData.position].configData.Level
-- local level2 = EquipRankUp[HomeLandManager.levelProId].Level
-- self.homeLv.text = level > 0 and level or ""
-- self.homeProLv.text = level2 > 0 and level2 or ""
if self.allData and self.allData.homeEquipLv and self.allData.homeEquipLv[1] > 0 then
self.homeLv.text = self.allData.homeEquipLv[1] > 0 and self.allData.homeEquipLv[1] or ""
self.homeProLv.text = self.allData.homeEquipLv[2] > 0 and self.allData.homeEquipLv[2] or ""
end
elseif _itemData.itemType == 4 then
--法宝
@ -582,11 +580,9 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, _itemData,0,true,true,nil)
end)
--摘星阁加成
if HomeLandManager.EquipData[equipConfig[itemDataConFig.Id].Position] then
-- local level = HomeLandManager.EquipData[equipConfig[itemDataConFig.Id].Position].configData.Level
-- local level2 = EquipRankUp[HomeLandManager.levelProId].Level
-- self.homeLv.text = level > 0 and level or ""
-- self.homeProLv.text = level2 > 0 and level2 or ""
if self.allData and self.allData.homeEquipLv and self.allData.homeEquipLv[1] > 0 then
self.homeLv.text = self.allData.homeEquipLv[1] > 0 and self.allData.homeEquipLv[1] or ""
self.homeProLv.text = self.allData.homeEquipLv[2] > 0 and self.allData.homeEquipLv[2] or ""
end
elseif itemDataConFig.ItemType == ItemType.Pokemon then
--异妖配件